Renamed XML attributes of CardStackView

yuyakaido · yuyakaido · commit a5d7fd3d6787 · 2017-08-13T04:07:27.000+09:00
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -92,9 +92,9 @@ public CardStackView(Context context, AttributeSet attrs, int defStyle) {
         setVisibleCount(array.getInt(R.styleable.CardStackView_visibleCount, option.visibleCount));
         setSwipeThreshold(array.getFloat(R.styleable.CardStackView_swipeThreshold, option.swipeThreshold));
         setStackFrom(StackFrom.values()[array.getInt(R.styleable.CardStackView_stackFrom, option.stackFrom.ordinal())]);
-        setElevationEnabled(array.getBoolean(R.styleable.CardStackView_isElevationEnabled, option.isElevationEnabled));
-        setSwipeEnabled(array.getBoolean(R.styleable.CardStackView_isSwipeEnabled, option.isSwipeEnabled));
-        setEnableSwipeDirections(SwipeDirection.from(array.getInt(R.styleable.CardStackView_enableSwipeDirections, 0)));
+        setElevationEnabled(array.getBoolean(R.styleable.CardStackView_elevationEnabled, option.isElevationEnabled));
+        setSwipeEnabled(array.getBoolean(R.styleable.CardStackView_swipeEnabled, option.isSwipeEnabled));
+        setSwipeDirection(SwipeDirection.from(array.getInt(R.styleable.CardStackView_swipeDirection, 0)));
         setLeftOverlay(array.getResourceId(R.styleable.CardStackView_leftOverlay, 0));
         setRightOverlay(array.getResourceId(R.styleable.CardStackView_rightOverlay, 0));
         array.recycle();
@@ -279,7 +279,7 @@ private void moveToTop(CardContainerView container, View child) {
         }
     }
 
-    private void reorderForDiscard() {
+    private void reorderForSwipe() {
         moveToBottom(getTopView());
         containers.addLast(containers.removeFirst());
     }
@@ -298,7 +298,7 @@ private void executePreSwipeTask() {
     }
 
     private void executePostSwipeTask(Point point) {
-        reorderForDiscard();
+        reorderForSwipe();
 
         state.lastPoint = point;
 
@@ -370,22 +370,22 @@ public void setStackFrom(StackFrom stackFrom) {
         }
     }
 
-    public void setElevationEnabled(boolean elevationEnabled) {
-        option.isElevationEnabled = elevationEnabled;
+    public void setElevationEnabled(boolean isElevationEnabled) {
+        option.isElevationEnabled = isElevationEnabled;
         if (adapter != null) {
             initialize(false);
         }
     }
 
-    public void setSwipeEnabled(boolean swipeEnabled) {
-        option.isSwipeEnabled = swipeEnabled;
+    public void setSwipeEnabled(boolean isSwipeEnabled) {
+        option.isSwipeEnabled = isSwipeEnabled;
         if (adapter != null) {
             initialize(false);
         }
     }
 
-    public void setEnableSwipeDirections(List<SwipeDirection> enableSwipeDirections) {
-        option.enableSwipeDirections = enableSwipeDirections;
+    public void setSwipeDirection(List<SwipeDirection> swipeDirection) {
+        option.swipeDirection = swipeDirection;
         if (adapter != null) {
             initialize(false);
         }
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java
@@ -162,7 +162,7 @@ private void handleActionUp(MotionEvent event) {
             }
 
             if (Math.abs(percent) > option.swipeThreshold) {
-                if (option.enableSwipeDirections.contains(direction)) {
+                if (option.swipeDirection.contains(direction)) {
                     if (containerEventListener != null) {
                         containerEventListener.onContainerSwiped(point);
                     }
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackOption.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackOption.java
@@ -13,5 +13,5 @@ public class CardStackOption {
     public boolean isSwipeEnabled = true;
     public int leftOverlay = 0;
     public int rightOverlay = 0;
-    public List<SwipeDirection> enableSwipeDirections = SwipeDirection.FREEDOM;
+    public List<SwipeDirection> swipeDirection = SwipeDirection.FREEDOM;
 }
diff --git a/cardstackview/src/main/res/values/attrs.xml b/cardstackview/src/main/res/values/attrs.xml
@@ -8,9 +8,9 @@
             <enum name="bottom" value="0"/>
             <enum name="top" value="1"/>
         </attr>
-        <attr name="isElevationEnabled" format="boolean"/>
-        <attr name="isSwipeEnabled" format="boolean"/>
-        <attr name="enableSwipeDirections" format="enum">
+        <attr name="elevationEnabled" format="boolean"/>
+        <attr name="swipeEnabled" format="boolean"/>
+        <attr name="swipeDirection" format="enum">
             <enum name="freedom" value="0"/>
             <enum name="horizontal" value="1"/>
             <enum name="vertical" value="2"/>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -7,12 +7,6 @@
     android:layout_height="match_parent"
     android:clipChildren="false">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom|top">
-    </LinearLayout>
-
     <com.yuyakaido.android.cardstackview.CardStackView
         android:id="@+id/activity_main_card_stack_view"
         android:layout_width="match_parent"
@@ -23,9 +17,9 @@
         app:visibleCount="3"
         app:swipeThreshold="0.75"
         app:stackFrom="top"
-        app:isElevationEnabled="true"
-        app:isSwipeEnabled="true"
-        app:enableSwipeDirections="horizontal"
+        app:elevationEnabled="true"
+        app:swipeEnabled="true"
+        app:swipeDirection="horizontal"
         app:leftOverlay="@layout/view_overlay_left"
         app:rightOverlay="@layout/view_overlay_right"/>
 

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ public CardStackView(Context context, AttributeSet attrs, int defStyle) {`
`92`	`92`	`setVisibleCount(array.getInt(R.styleable.CardStackView_visibleCount, option.visibleCount));`
`93`	`93`	`setSwipeThreshold(array.getFloat(R.styleable.CardStackView_swipeThreshold, option.swipeThreshold));`
`94`	`94`	`setStackFrom(StackFrom.values()[array.getInt(R.styleable.CardStackView_stackFrom, option.stackFrom.ordinal())]);`
`95`		`- setElevationEnabled(array.getBoolean(R.styleable.CardStackView_isElevationEnabled, option.isElevationEnabled));`
`96`		`- setSwipeEnabled(array.getBoolean(R.styleable.CardStackView_isSwipeEnabled, option.isSwipeEnabled));`
`97`		`- setEnableSwipeDirections(SwipeDirection.from(array.getInt(R.styleable.CardStackView_enableSwipeDirections, 0)));`
	`95`	`+ setElevationEnabled(array.getBoolean(R.styleable.CardStackView_elevationEnabled, option.isElevationEnabled));`
	`96`	`+ setSwipeEnabled(array.getBoolean(R.styleable.CardStackView_swipeEnabled, option.isSwipeEnabled));`
	`97`	`+ setSwipeDirection(SwipeDirection.from(array.getInt(R.styleable.CardStackView_swipeDirection, 0)));`
`98`	`98`	`setLeftOverlay(array.getResourceId(R.styleable.CardStackView_leftOverlay, 0));`
`99`	`99`	`setRightOverlay(array.getResourceId(R.styleable.CardStackView_rightOverlay, 0));`
`100`	`100`	`array.recycle();`
`@@ -279,7 +279,7 @@ private void moveToTop(CardContainerView container, View child) {`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`		`- private void reorderForDiscard() {`
	`282`	`+ private void reorderForSwipe() {`
`283`	`283`	`moveToBottom(getTopView());`
`284`	`284`	`containers.addLast(containers.removeFirst());`
`285`	`285`	`}`
`@@ -298,7 +298,7 @@ private void executePreSwipeTask() {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`private void executePostSwipeTask(Point point) {`
`301`		`- reorderForDiscard();`
	`301`	`+ reorderForSwipe();`
`302`	`302`
`303`	`303`	`state.lastPoint = point;`
`304`	`304`
`@@ -370,22 +370,22 @@ public void setStackFrom(StackFrom stackFrom) {`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- public void setElevationEnabled(boolean elevationEnabled) {`
`374`		`- option.isElevationEnabled = elevationEnabled;`
	`373`	`+ public void setElevationEnabled(boolean isElevationEnabled) {`
	`374`	`+ option.isElevationEnabled = isElevationEnabled;`
`375`	`375`	`if (adapter != null) {`
`376`	`376`	`initialize(false);`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
`380`		`- public void setSwipeEnabled(boolean swipeEnabled) {`
`381`		`- option.isSwipeEnabled = swipeEnabled;`
	`380`	`+ public void setSwipeEnabled(boolean isSwipeEnabled) {`
	`381`	`+ option.isSwipeEnabled = isSwipeEnabled;`
`382`	`382`	`if (adapter != null) {`
`383`	`383`	`initialize(false);`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`
`387`		`- public void setEnableSwipeDirections(List<SwipeDirection> enableSwipeDirections) {`
`388`		`- option.enableSwipeDirections = enableSwipeDirections;`
	`387`	`+ public void setSwipeDirection(List<SwipeDirection> swipeDirection) {`
	`388`	`+ option.swipeDirection = swipeDirection;`
`389`	`389`	`if (adapter != null) {`
`390`	`390`	`initialize(false);`
`391`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private void handleActionUp(MotionEvent event) {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if (Math.abs(percent) > option.swipeThreshold) {`
`165`		`- if (option.enableSwipeDirections.contains(direction)) {`
	`165`	`+ if (option.swipeDirection.contains(direction)) {`
`166`	`166`	`if (containerEventListener != null) {`
`167`	`167`	`containerEventListener.onContainerSwiped(point);`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public class CardStackOption {`
`13`	`13`	`public boolean isSwipeEnabled = true;`
`14`	`14`	`public int leftOverlay = 0;`
`15`	`15`	`public int rightOverlay = 0;`
`16`		`- public List<SwipeDirection> enableSwipeDirections = SwipeDirection.FREEDOM;`
	`16`	`+ public List<SwipeDirection> swipeDirection = SwipeDirection.FREEDOM;`
`17`	`17`	`}`