Merge branch 'release/v0.5.6'

mikepenz · Jan 10, 2016 · 9ab18a4 · 9ab18a4
2 parents 01fc364 + 608320e
commit 9ab18a4
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -25,14 +25,9 @@ Beside being blazing fast, minimizing the code you need to write, it is also rea
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:0.5.5@aar') {
+compile('com.mikepenz:fastadapter:0.5.6@aar') {
 	transitive = true
 }
-
-//only on the SNAPSHOT repo right now:
-repositories {
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-}
 ```
 
 ##How to use

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

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SimpleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SimpleActivity.java
@@ -8,6 +8,7 @@
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
@@ -101,4 +102,17 @@ protected void onSaveInstanceState(Bundle outState) {
         outState = fastAdapter.saveInstanceState(outState);
         super.onSaveInstanceState(outState);
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        //handle the click on the back arrow click
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -19,8 +19,8 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 
 # Maven stuff
-VERSION_NAME=0.5.5
-VERSION_CODE=55
+VERSION_NAME=0.5.6
+VERSION_CODE=56
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=FastAdapter Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 55
-        versionName '0.5.5'
+        versionCode 56
+        versionName '0.5.6'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/fastadapter/FastAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/FastAdapter.java
@@ -492,7 +492,10 @@ private void handleSelection(Item item, int position) {
         if (!mMultiSelect) {
             Iterator<Integer> entries = mSelections.iterator();
             while (entries.hasNext()) {
-                deselect(entries.next(), entries);
+                Integer pos = entries.next();
+                if (pos != position) {
+                    deselect(pos, entries);
+                }
             }
         }
 

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">0.5.5</string>
+    <string name="library_fastadapter_libraryVersion">0.5.6</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>