Merge pull request #7 from prolificinteractive/qc_chandelier

Chandelier
prolificinteractive · May 23, 2016 · c704974 · c704974
2 parents 59fe127 + 0b0c265
commit c704974
Show file tree

Hide file tree

Showing 27 changed files with 183 additions and 178 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Swipe Action Layout
-===================
+Chandelier
+==========
 
 A nice swipe layout that provides new actions with a material design look and feel.
 
@@ -9,23 +9,23 @@ A nice swipe layout that provides new actions with a material design look and fe
 Usage
 -----
 
-1. Add `compile 'com.prolificinteractive:swipe-action-layout:1.0.0'` to your dependencies.
-2. Wrap your list around `SwipeActionLayout` in your layouts or view hierarchy.
-3. Add a list of `ActionItem` using `SwipeActionLayout#populateActionItems()` method.
+1. Add `compile 'com.prolificinteractive:swipe-action-layout:0.0.1'` to your dependencies.
+2. Wrap your list around `ChandelierLayout` in your layouts or view hierarchy.
+3. Add a list of `ActionItem` using `ChandelierLayout#populateActionItems()` method.
 4. Set a `OnActionSelectedListener` to listen for selected action and update the view accordingly.
 
 Or
 
-1. Add `compile 'com.prolificinteractive:swipe-action-layout:1.0.0'` to your dependencies.
-2. Wrap your list around `SwipeActionLayout` in your layouts or view hierarchy.
-3. Create Objects that extend `ActionItem` and add them using `SwipeActionLayout#populateActionItems()` method.
+1. Add `compile 'com.prolificinteractive:swipe-action-layout:0.0.1'` to your dependencies.
+2. Wrap your list around `ChandelierLayout` in your layouts or view hierarchy.
+3. Create Objects that extend `ActionItem` and add them using `ChandelierLayout#populateActionItems()` method.
 4. Override `ActionItem#Execute()` method to execute the action when selected.
 
 Example:
 
 ```xml
-  <com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout
-      android:id="@+id/swipe_action_layout"
+  <com.prolificinteractive.chandelier.widget.ChandelierLayout
+      android:id="@+id/chandelier_layout"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       app:al_background="?attr/colorPrimary"
@@ -34,7 +34,7 @@ Example:
       <!-- Insert your list here -->
       <include layout="@layout/example_recycler_view" />
 
-  </com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout>
+  </com.prolificinteractive.chandelier.widget.ChandelierLayout>
 ```
 
 Customization
@@ -58,12 +58,12 @@ Would you like to contribute? Fork us and send a pull request! Be sure to checko
 
 ## License
 
-Swipe Action Layout is Copyright (c) 2016 Prolific Interactive. It may be redistributed under the terms specified in the [LICENSE] file.
+Chandelier is Copyright (c) 2016 Prolific Interactive. It may be redistributed under the terms specified in the [LICENSE] file.
 
 [LICENSE]: /LICENSE
 
 ## Maintainers
 
 ![prolific](https://s3.amazonaws.com/prolificsitestaging/logos/Prolific_Logo_Full_Color.png)
 
-Swipe Action Layout is maintained and funded by Prolific Interactive. The names and logos are trademarks of Prolific Interactive.
+Chandelier is maintained and funded by Prolific Interactive. The names and logos are trademarks of Prolific Interactive.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.prolificinteractive.swipeactionlayout"
+        applicationId "com.prolificinteractive.chandelier"
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 1

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.prolificinteractive.swipeactionlayout.sample"
+    package="com.prolificinteractive.chandelier.sample"
     >
 
   <uses-permission android:name="android.permission.INTERNET" />
@@ -32,7 +32,7 @@
 
       <intent-filter>
         <action android:name="android.intent.action.RUN"/>
-        <category android:name="com.prolificinteractive.swipeactionlayout.sample.SAMPLE"/>
+        <category android:name="com.prolificinteractive.chandelier.sample.SAMPLE"/>
       </intent-filter>
     </activity>
     <activity
@@ -42,7 +42,7 @@
         >
       <intent-filter>
         <action android:name="android.intent.action.RUN"/>
-        <category android:name="com.prolificinteractive.swipeactionlayout.sample.SAMPLE"/>
+        <category android:name="com.prolificinteractive.chandelier.sample.SAMPLE"/>
       </intent-filter>
     </activity>
   </application>

diff --git a/...wipeactionlayout/sample/MainActivity.java → ...ctive/chandelier/sample/MainActivity.java b/...wipeactionlayout/sample/MainActivity.java → ...ctive/chandelier/sample/MainActivity.java
@@ -1,4 +1,4 @@
-package com.prolificinteractive.swipeactionlayout.sample;
+package com.prolificinteractive.chandelier.sample;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -18,7 +18,7 @@
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
-  private static final String CATEGORY_SAMPLE = "com.prolificinteractive.swipeactionlayout.sample.SAMPLE";
+  private static final String CATEGORY_SAMPLE = "com.prolificinteractive.chandelier.sample.SAMPLE";
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

diff --git a/...onlayout/sample/RecyclerViewActivity.java → ...andelier/sample/RecyclerViewActivity.java b/...onlayout/sample/RecyclerViewActivity.java → ...andelier/sample/RecyclerViewActivity.java
@@ -1,4 +1,4 @@
-package com.prolificinteractive.swipeactionlayout.sample;
+package com.prolificinteractive.chandelier.sample;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -12,13 +12,13 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.prolificinteractive.swipeactionlayout.widget.ActionItem;
-import com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout;
+import com.prolificinteractive.chandelier.widget.Ornament;
+import com.prolificinteractive.chandelier.widget.ChandelierLayout;
 import java.util.Arrays;
 
 public class RecyclerViewActivity extends AppCompatActivity {
 
-  private SwipeActionLayout swipeActionLayout;
+  private ChandelierLayout chandelierLayout;
   private RecyclerView list;
   private DummyAdapter adapter;
 
@@ -31,9 +31,9 @@ protected void onCreate(Bundle savedInstanceState) {
     final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
 
-    swipeActionLayout = (SwipeActionLayout) findViewById(R.id.swipe_action_layout);
-    swipeActionLayout.setOnActionSelectedListener(new SwipeActionLayout.OnActionListener() {
-      @Override public void onActionSelected(int index, ActionItem action) {
+    chandelierLayout = (ChandelierLayout) findViewById(R.id.chandelier_layout);
+    chandelierLayout.setOnActionSelectedListener(new ChandelierLayout.OnActionListener() {
+      @Override public void onActionSelected(int index, Ornament action) {
         Toast.makeText(RecyclerViewActivity.this, String.format("%d", index), Toast.LENGTH_SHORT)
             .show();
       }
@@ -44,10 +44,10 @@ protected void onCreate(Bundle savedInstanceState) {
     list.setLayoutManager(new LinearLayoutManager(this));
     list.setAdapter(adapter);
 
-    swipeActionLayout.populateActionItems(Arrays.asList(
-        new ActionItem(R.drawable.ic_close),
-        new ActionItem(R.drawable.ic_add),
-        new ActionItem(R.drawable.ic_check)
+    chandelierLayout.populateActionItems(Arrays.asList(
+        new Ornament(R.drawable.ic_close),
+        new Ornament(R.drawable.ic_add),
+        new Ornament(R.drawable.ic_check)
     ));
   }
 
@@ -97,7 +97,7 @@ public int getItemCount() {
     }
 
     @Override public boolean onLongClick(View v) {
-      swipeActionLayout.showActions();
+      chandelierLayout.showActions();
       return true;
     }
   }

diff --git a/...ctionlayout/sample/SampleApplication.java → .../chandelier/sample/SampleApplication.java b/...ctionlayout/sample/SampleApplication.java → .../chandelier/sample/SampleApplication.java
@@ -1,4 +1,4 @@
-package com.prolificinteractive.swipeactionlayout.sample;
+package com.prolificinteractive.chandelier.sample;
 
 import android.app.Application;
 import com.squareup.leakcanary.LeakCanary;

diff --git a/...eactionlayout/sample/WebViewActivity.java → ...ve/chandelier/sample/WebViewActivity.java b/...eactionlayout/sample/WebViewActivity.java → ...ve/chandelier/sample/WebViewActivity.java
@@ -1,4 +1,4 @@
-package com.prolificinteractive.swipeactionlayout.sample;
+package com.prolificinteractive.chandelier.sample;
 
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
@@ -12,8 +12,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
-import com.prolificinteractive.swipeactionlayout.widget.ActionItem;
-import com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout;
+import com.prolificinteractive.chandelier.widget.Ornament;
+import com.prolificinteractive.chandelier.widget.ChandelierLayout;
 import java.util.Arrays;
 
 public class WebViewActivity extends AppCompatActivity {
@@ -23,7 +23,7 @@ public class WebViewActivity extends AppCompatActivity {
   public static final String GITHUB_PULLS_URL = GITHUB_URL + "pulls";
   public static final String GITHUB_SEARCH_URL = GITHUB_URL + "search";
 
-  private SwipeActionLayout swipeActionLayout;
+  private ChandelierLayout chandelierLayout;
   private WebView webView;
 
   @Override
@@ -51,13 +51,13 @@ protected void onCreate(Bundle savedInstanceState) {
     });
     webView.loadUrl(GITHUB_URL);
 
-    swipeActionLayout = (SwipeActionLayout) findViewById(R.id.swipe_action_layout);
-    swipeActionLayout.setOnActionSelectedListener(new SwipeActionLayout.OnActionListener() {
-      @Override public void onActionSelected(int index, ActionItem action) {
+    chandelierLayout = (ChandelierLayout) findViewById(R.id.chandelier_layout);
+    chandelierLayout.setOnActionSelectedListener(new ChandelierLayout.OnActionListener() {
+      @Override public void onActionSelected(int index, Ornament action) {
         action.execute();
       }
     });
-    swipeActionLayout.populateActionItems(Arrays.asList(
+    chandelierLayout.populateActionItems(Arrays.asList(
         new GitHubAction.Builder()
             .setDrawableResId(R.drawable.ic_notifications)
             .setUrl(GITHUB_NOTIFICATIONS_URL)
@@ -84,7 +84,7 @@ public void onClick(View view) {
     });
   }
 
-  static class GitHubAction extends ActionItem {
+  static class GitHubAction extends Ornament {
     private String url;
     private WebView webView;
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.prolificinteractive.swipeactionlayout.sample.MainActivity">
+    tools:context="com.prolificinteractive.chandelier.sample.MainActivity">
 
   <android.support.design.widget.AppBarLayout
       android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/activity_recycler_view.xml b/app/src/main/res/layout/activity_recycler_view.xml
@@ -10,13 +10,13 @@
 
   <include layout="@layout/include_toolbar" />
 
-  <com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout
-      android:id="@+id/swipe_action_layout"
+  <com.prolificinteractive.chandelier.widget.ChandelierLayout
+      android:id="@+id/chandelier_layout"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:layout_below="@id/toolbar"
-      app:al_background="?attr/colorPrimary"
+      app:chandelier_background="?attr/colorPrimary"
       >
     <include layout="@layout/content_recycler_view" />
-  </com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout>
+  </com.prolificinteractive.chandelier.widget.ChandelierLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
@@ -6,52 +6,56 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.prolificinteractive.swipeactionlayout.sample.WebViewActivity">
+    tools:context="com.prolificinteractive.chandelier.sample.WebViewActivity"
+    >
 
   <android.support.design.widget.AppBarLayout
-      android:layout_height="wrap_content"
       android:layout_width="match_parent"
-      android:theme="@style/AppTheme.AppBarOverlay">
+      android:layout_height="wrap_content"
+      android:theme="@style/AppTheme.AppBarOverlay"
+      >
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        app:popupTheme="@style/AppTheme.PopupOverlay"/>
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        />
 
   </android.support.design.widget.AppBarLayout>
-    <com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout
-        android:id="@+id/swipe_action_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:al_selected_size="40dp"
-        app:al_selector="@drawable/al_github_selector"
+  <com.prolificinteractive.chandelier.widget.ChandelierLayout
+      android:id="@+id/chandelier_layout"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      app:chandelier_selected_size="40dp"
+      app:chandelier_selector="@drawable/al_github_selector"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior"
+      >
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         >
-        <android.support.v4.widget.NestedScrollView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            >
-            <include layout="@layout/content_web_view"/>
-        </android.support.v4.widget.NestedScrollView>
-    </com.prolificinteractive.swipeactionlayout.widget.SwipeActionLayout>
+      <include layout="@layout/content_web_view"/>
+    </android.support.v4.widget.NestedScrollView>
+  </com.prolificinteractive.chandelier.widget.ChandelierLayout>
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_marginTop="-7dp"
-        android:elevation="4dp"
-        android:max="100"
-        />
+  <ProgressBar
+      android:id="@+id/progress_bar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="-7dp"
+      android:elevation="4dp"
+      android:max="100"
+      style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+      />
   <android.support.design.widget.FloatingActionButton
       android:id="@+id/fab"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="bottom|end"
       android:layout_margin="@dimen/fab_margin"
-      android:src="@drawable/ic_search"/>
+      android:src="@drawable/ic_search"
+      />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -12,6 +12,6 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/activity_main"
-    tools:context="com.prolificinteractive.swipeactionlayout.sample.MainActivity">
+    tools:context="com.prolificinteractive.chandelier.sample.MainActivity">
 
 </android.support.v7.widget.RecyclerView>
diff --git a/app/src/main/res/layout/content_web_view.xml b/app/src/main/res/layout/content_web_view.xml
@@ -7,5 +7,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:showIn="@layout/activity_web_view"
-    tools:context="com.prolificinteractive.swipeactionlayout.sample.WebViewActivity">
+    tools:context="com.prolificinteractive.chandelier.sample.WebViewActivity">
 </WebView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -5,5 +5,5 @@
   <dimen name="fab_margin">16dp</dimen>
   <dimen name="elevation">4dp</dimen>
   <dimen name="action_selected_size">40dp</dimen>
-  <dimen name="swipe_action_margin">16dp</dimen>
+  <dimen name="chandelier_margin">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
-    <string name="app_name">SwipeActionLayout</string>
-    <string name="action_settings">Settings</string>
+  <string name="app_name">Chandelier</string>
+  <string name="action_settings">Settings</string>
+
   <string name="title_activity_web_view">WebViewActivity</string>
   <string name="title_activity_recycler_view">RecyclerViewActivity</string>
 </resources>
diff --git a/...ve/swipeactionlayout/ExampleUnitTest.java → ...teractive/chandelier/ExampleUnitTest.java b/...ve/swipeactionlayout/ExampleUnitTest.java → ...teractive/chandelier/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.prolificinteractive.swipeactionlayout;
+package com.prolificinteractive.chandelier;
 
 import org.junit.Test;