Merge branch 'release/v1.1.2'

mikepenz · Feb 24, 2016 · 04c3456 · 04c3456
2 parents 1d8cc28 + 88230d2
commit 04c3456
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -52,14 +52,14 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 
 The library is split up into core, and extensions. The core functions are included in the following dependency.
 ```gradle
-compile('com.mikepenz:fastadapter:1.1.1@aar') {
+compile('com.mikepenz:fastadapter:1.1.2@aar') {
 	transitive = true
 }
 ```
 
 All additions are included in the following dependency.
 ```gradle
-compile 'com.mikepenz:fastadapter-extensions:1.1.0@aar'
+compile 'com.mikepenz:fastadapter-extensions:1.1.2@aar'
 ```
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 111
-        versionName '1.1.1'
+        versionCode 112
+        versionName '1.1.2'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java
@@ -87,10 +87,10 @@ public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 Boolean res = mActionModeHelper.onClick(item, position);
 
                 if (res != null && res) {
-                    if (((IExpandable) item).isExpanded()) {
+                    if (!((IExpandable) item).isExpanded()) {
                         ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(0).start();
                     } else {
-                        ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(90).start();
+                        ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(180).start();
                     }
                 }
 
@@ -101,6 +101,13 @@ public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
         mFastAdapter.withOnPreLongClickListener(new FastAdapter.OnLongClickListener<IItem>() {
             @Override
             public boolean onLongClick(View v, IAdapter adapter, IItem item, int position) {
+                //we do not want expandable items to be selected
+                if (item instanceof IExpandable) {
+                    if (((IExpandable) item).getSubItems() != null) {
+                        return true;
+                    }
+                }
+
                 ActionMode actionMode = mActionModeHelper.onLongClick(AdvancedSampleActivity.this, position);
 
                 if (actionMode != null) {

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java
@@ -55,13 +55,11 @@ protected void onCreate(Bundle savedInstanceState) {
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 if (item instanceof ExpandableItem) {
                     if (((ExpandableItem) item).getSubItems() != null) {
-                        if (((IExpandable) item).isExpanded()) {
-                            ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(90).start();
+                        if (!((IExpandable) item).isExpanded()) {
+                            ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(180).start();
                         } else {
                             ViewCompat.animate(v.findViewById(R.id.material_drawer_icon)).rotation(0).start();
                         }
-
-                        fastItemAdapter.toggleExpandable(position);
                         return true;
                     }
                 }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/ExpandableItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/ExpandableItem.java
@@ -127,7 +127,7 @@ public void bindView(ViewHolder viewHolder) {
         if (isExpanded()) {
             ViewCompat.setRotation(viewHolder.icon, 0);
         } else {
-            ViewCompat.setRotation(viewHolder.icon, 90);
+            ViewCompat.setRotation(viewHolder.icon, 180);
         }
     }
 

diff --git a/app/src/main/res/layout/expandable_item.xml b/app/src/main/res/layout/expandable_item.xml
@@ -48,6 +48,6 @@
         android:layout_height="16dp"
         android:layout_marginTop="@dimen/material_drawer_vertical_padding"
         app:ico_color="@color/md_black_1000"
-        app:ico_icon="gmd-keyboard-arrow-down"
+        app:ico_icon="gmd-keyboard-arrow-up"
         app:ico_size="16dp" />
 </LinearLayout>
diff --git a/library-extensions/build.gradle b/library-extensions/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 110
-        versionName '1.1.0'
+        versionCode 112
+        versionName '1.1.2'
     }
     buildTypes {
         release {

diff --git a/library-extensions/gradle.properties b/library-extensions/gradle.properties
@@ -2,5 +2,5 @@ POM_NAME=FastAdapter Library-Extensions
 POM_ARTIFACT_ID=fastadapter-extensions
 POM_PACKAGING=aar
 
-VERSION_NAME=1.1.0
-VERSION_CODE=110
+VERSION_NAME=1.1.2
+VERSION_CODE=112
diff --git a/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java b/library-extensions/src/main/java/com/mikepenz/fastadapter_extensions/ActionModeHelper.java
@@ -52,8 +52,6 @@ public ActionMode getActionMode() {
     public Boolean onClick(IItem item, int position) {
         if (item instanceof IExpandable) {
             if (((IExpandable) item).getSubItems() != null) {
-                mFastAdapter.toggleExpandable(position);
-
                 //if we are in CAB mode and there are no selections afterwards we end the CAB mode
                 if (mActionMode != null && mFastAdapter.getSelections().size() == 0) {
                     mActionMode.finish();

diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 111
-        versionName '1.1.1'
+        versionCode 112
+        versionName '1.1.2'
     }
     buildTypes {
         release {

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -2,5 +2,5 @@ POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter
 POM_PACKAGING=aar
 
-VERSION_NAME=1.1.1
-VERSION_CODE=111
+VERSION_NAME=1.1.2
+VERSION_CODE=112
diff --git a/library/src/main/java/com/mikepenz/fastadapter/FastAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/FastAdapter.java
@@ -321,6 +321,14 @@ public void onClick(View v) {
                         if (mOnPreClickListener != null) {
                             consumed = mOnPreClickListener.onClick(v, relativeInfo.adapter, relativeInfo.item, pos);
                         }
+
+                        //if this is a expandable item :D
+                        if (relativeInfo.item instanceof IExpandable) {
+                            if (((IExpandable) relativeInfo.item).getSubItems() != null) {
+                                toggleExpandable(pos);
+                            }
+                        }
+
                         //handle the selection if the event was not yet consumed, and we are allowed to select an item (only occurs when we select with long click only)
                         if (!consumed && !mSelectOnLongClick && mSelectable) {
                             handleSelection(v, relativeInfo.item, pos);

diff --git a/library/src/main/res/values/library_fastadapter_strings.xml b/library/src/main/res/values/library_fastadapter_strings.xml
@@ -10,7 +10,7 @@
         <b>FastAdapter</b>, the bullet proof, fast and easy to use adapter library, which minimizes developing time to a fraction...
         ]]>
     </string>
-    <string name="library_fastadapter_libraryVersion">1.1.1</string>
+    <string name="library_fastadapter_libraryVersion">1.1.2</string>
     <string name="library_fastadapter_libraryWebsite">https://github.com/mikepenz/FastAdapter</string>
     <string name="library_fastadapter_licenseId">apache_2_0</string>
     <string name="library_fastadapter_isOpenSource">true</string>