darsh2 · mois3sk9 · Dec 2, 2016 · Dec 3, 2016 · Dec 3, 2016
diff --git a/multipleimageselect/multipleimageselect.iml b/multipleimageselect/multipleimageselect.iml
@@ -33,12 +33,14 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -82,7 +84,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -102,11 +103,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

diff --git a/...ageselect/src/main/java/com/darsh/multipleimageselect/activities/ImageSelectActivity.java b/...ageselect/src/main/java/com/darsh/multipleimageselect/activities/ImageSelectActivity.java
@@ -10,6 +10,7 @@
 import android.os.Message;
 import android.os.Process;
 import android.provider.MediaStore;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
@@ -43,6 +44,8 @@ public class ImageSelectActivity extends HelperActivity {
 
     private TextView errorDisplay;
 
+    private FloatingActionButton doneButton;
+
     private ProgressBar progressBar;
     private GridView gridView;
     private CustomImageSelectAdapter adapter;
@@ -56,6 +59,7 @@ public class ImageSelectActivity extends HelperActivity {
     private Handler handler;
     private Thread thread;
 
+
     private final String[] projection = new String[]{ MediaStore.Images.Media._ID, MediaStore.Images.Media.DISPLAY_NAME, MediaStore.Images.Media.DATA };
 
     @Override
@@ -80,24 +84,34 @@ protected void onCreate(Bundle savedInstanceState) {
         if (intent == null) {
             finish();
         }
+
+        actionMode = ImageSelectActivity.this.startActionMode(callback);
+
         album = intent.getStringExtra(Constants.INTENT_EXTRA_ALBUM);
 
         errorDisplay = (TextView) findViewById(R.id.text_view_error);
         errorDisplay.setVisibility(View.INVISIBLE);
 
+        doneButton = (FloatingActionButton) findViewById(R.id.done_button);
+        doneButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                sendIntent();
+            }
+        });
+
         progressBar = (ProgressBar) findViewById(R.id.progress_bar_image_select);
         gridView = (GridView) findViewById(R.id.grid_view_image_select);
         gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (actionMode == null) {
-                    actionMode = ImageSelectActivity.this.startActionMode(callback);
-                }
                 toggleSelection(position);
-                actionMode.setTitle(countSelected + " " + getString(R.string.selected));
-
-                if (countSelected == 0) {
-                    actionMode.finish();
+                if (countSelected > 0) {
+                    doneButton.setVisibility(View.VISIBLE);
+                    actionMode.setTitle(countSelected + " " + getString(R.string.selected));
+                } else {
+                    doneButton.setVisibility(View.GONE);
+                    actionMode.setTitle(getString(R.string.image_view));
                 }
             }
         });
@@ -253,9 +267,12 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
         }
 
         @Override
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {int i = item.getItemId();
-            if (i == R.id.menu_item_add_image) {
-                sendIntent();
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+
+            int i = item.getItemId();
+
+            if(i == R.id.menu_select_all_images) {
+                selectAll();
                 return true;
             }
             return false;
@@ -289,7 +306,26 @@ private void toggleSelection(int position) {
         adapter.notifyDataSetChanged();
     }
 
+
+    private void selectAll() {
+
+        for (int i = 0, l = images.size(); i < l; i++) {
+            if(!images.get(i).isSelected && countSelected < Constants.limit) {
+                images.get(i).isSelected = true;
+                countSelected++;
+            }
+        }
+
+        if(countSelected > 0) {
+            doneButton.setVisibility(View.VISIBLE);
+        }
+
+        adapter.notifyDataSetChanged();
+    }
+
+
     private void deselectAll() {
+
         for (int i = 0, l = images.size(); i < l; i++) {
             images.get(i).isSelected = false;
         }

diff --git a/multipleimageselect/src/main/res/layout/activity_image_select.xml b/multipleimageselect/src/main/res/layout/activity_image_select.xml
@@ -1,36 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_image_select"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include
-        android:id="@+id/toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/toolbar"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <include
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            layout="@layout/toolbar"/>
+        <GridView
+            android:id="@+id/grid_view_image_select"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/toolbar"
+            android:paddingTop="1dp"
+            android:paddingBottom="1dp"
+            android:paddingLeft="1dp"
+            android:paddingRight="1dp"
+            android:stretchMode="columnWidth"/>
+    </LinearLayout>
+
+
 
     <ProgressBar
         android:id="@+id/progress_bar_image_select"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center"
         android:layout_centerInParent="true"/>
 
     <TextView
         android:id="@+id/text_view_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:text="@string/error_null_cursor"/>
+        android:text="@string/error_null_cursor"
+        android:layout_gravity="center_vertical|center"/>
 
-    <GridView
-        android:id="@+id/grid_view_image_select"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
-        android:stretchMode="columnWidth"/>
-</RelativeLayout>
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/done_button"
+        android:layout_margin="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_done_white"
+        android:visibility="gone"
+        android:layout_gravity="bottom|end"/>
+
+</FrameLayout>
diff --git a/multipleimageselect/src/main/res/menu/menu_contextual_action_bar.xml b/multipleimageselect/src/main/res/menu/menu_contextual_action_bar.xml
@@ -3,9 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_item_add_image"
+        android:id="@+id/menu_select_all_images"
         app:showAsAction="always"
-        android:title="@string/add"
+        android:title="@string/select_all_label"
         android:orderInCategory="100"/>
-
 </menu>
diff --git a/multipleimageselect/src/main/res/values-es/strings.xml b/multipleimageselect/src/main/res/values-es/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="add">Agregar</string>
+    <string name="album_view">Selecciona un álbum</string>
+    <string name="app_name">Multiple Image Select</string>
+    <string name="image_view">Toca para seleccionar</string>
+    <string name="limit_exceeded">Puedes seleccionar un máximo de %d imagenes</string>
+    <string name="permission_denied">Permiso denegado</string>
+    <string name="permission_denied_albums"></string>
+    <string name="permission_force">La App requiere de permisos de almacenamiento para ver las imagenes. Pincha configuraciones para otorgarle permisos</string>
+    <string name="permission_info">La App requiere permisos de almacenamiento para ver imagenes</string>
+    <string name="permission_ok">Aceptar</string>
+    <string name="permission_settings">Configuraciones</string>
+    <string name="selected">Seleccionadas</string>
+    <string name="select_all_label">Todas</string>
+</resources>
diff --git a/multipleimageselect/src/main/res/values-fr/strings.xml b/multipleimageselect/src/main/res/values-fr/strings.xml
@@ -12,4 +12,5 @@
     <string name="permission_denied">Permission refusée!</string>
     <string name="permission_denied_albums">Veuillez permettre l\'accès aux photos, médias et fichiers sur votre appareil pour afficher les albums</string>
     <string name="permission_denied_images">Veuillez permettre l\'accès aux photos, médias et fichiers sur votre appareil pour afficher les images</string>
+    <string name="permission_force"></string>
 </resources>
diff --git a/multipleimageselect/src/main/res/values/strings.xml b/multipleimageselect/src/main/res/values/strings.xml
@@ -8,11 +8,14 @@
 
     <string name="error_null_cursor">Oops, something went wrong!</string>
 
+    <string name="select_all_label">Select all</string>
+
     <!--Request Permission-->
     <string name="permission_info">App requires permission to Storage to view images.</string>
     <string name="permission_force">App requires permission to Storage to view images. Tap Settings and go to Permissions to grant permission.</string>
     <string name="permission_ok">OK</string>
     <string name="permission_settings">Settings</string>
     <string name="permission_package">package</string>
 
+
 </resources>