Title will always be show as long as nothing is selected and title is…

… explicitly set #70 Breaking changes: ImagePickerConfigFactory.create() and ImagePicker.init() don't take Context anymore
esafirm · Sep 2, 2017 · 512e833 · 512e833 · iNoles · Sep 2, 2017
1 parent ccba881
commit 512e833
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 21 deletions.
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePicker.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePicker.java
@@ -33,7 +33,7 @@ public static class ImagePickerWithActivity extends ImagePicker {
 
         public ImagePickerWithActivity(Activity activity) {
             this.activity = activity;
-            init(activity);
+            init();
         }
 
         @Override
@@ -49,7 +49,7 @@ public static class ImagePickerWithFragment extends ImagePicker {
 
         public ImagePickerWithFragment(Fragment fragment) {
             this.fragment = fragment;
-            init(fragment.getActivity());
+            init();
         }
 
         @Override
@@ -63,8 +63,8 @@ public void start(int requestCode) {
     /* > Stater */
     /* --------------------------------------------------- */
 
-    public void init(Context context) {
-        config = ImagePickerConfigFactory.createDefault(context);
+    public void init() {
+        config = ImagePickerConfigFactory.createDefault();
     }
 
     public static ImagePickerWithActivity create(Activity activity) {

diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java
@@ -80,7 +80,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ImagePickerConfig config = getConfig();
         setTheme(config.getTheme());
         setContentView(R.layout.ef_activity_image_picker);
-        setupView(config);
+        setupView();
         setupComponents(config);
     }
 
@@ -91,7 +91,7 @@ private ImagePickerConfig getConfig() {
         return config;
     }
 
-    private void setupView(ImagePickerConfig config) {
+    private void setupView() {
         progressBar = (ProgressWheel) findViewById(R.id.progress_bar);
         emptyTextView = (TextView) findViewById(R.id.tv_empty_images);
         recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
@@ -102,7 +102,6 @@ private void setupView(ImagePickerConfig config) {
         actionBar = getSupportActionBar();
 
         if (actionBar != null) {
-            actionBar.setTitle(config.isFolderMode() ? config.getFolderTitle() : config.getImageTitle());
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back);
             actionBar.setDisplayShowTitleEnabled(true);

diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfigFactory.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfigFactory.java
@@ -1,22 +1,17 @@
 package com.esafirm.imagepicker.features;
 
-import android.content.Context;
-
-import com.esafirm.imagepicker.R;
 import com.esafirm.imagepicker.features.imageloader.DefaultImageLoader;
 
 import java.util.ArrayList;
 
 public class ImagePickerConfigFactory {
 
-    public static ImagePickerConfig createDefault(Context context) {
+    public static ImagePickerConfig createDefault() {
         ImagePickerConfig config = new ImagePickerConfig();
         config.setMode(ImagePicker.MODE_MULTIPLE);
         config.setLimit(ImagePicker.MAX_LIMIT);
         config.setShowCamera(true);
         config.setFolderMode(false);
-        config.setFolderTitle(context.getString(R.string.ef_title_folder));
-        config.setImageTitle(context.getString(R.string.ef_title_select_image));
         config.setSelectedImages(new ArrayList<>());
         config.setSavePath(ImagePickerSavePath.DEFAULT);
         config.setReturnAfterFirst(true);

diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/camera/DefaultCameraModule.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/camera/DefaultCameraModule.java
@@ -22,7 +22,7 @@ public class DefaultCameraModule implements CameraModule, Serializable {
     protected String currentImagePath;
 
     public Intent getCameraIntent(Context context) {
-        return getCameraIntent(context, ImagePickerConfigFactory.createDefault(context));
+        return getCameraIntent(context, ImagePickerConfigFactory.createDefault());
     }
 
     @Override

diff --git a/...epicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.java b/...epicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.java
@@ -13,6 +13,8 @@
 import com.esafirm.imagepicker.features.ImagePicker;
 import com.esafirm.imagepicker.features.ImagePickerConfig;
 import com.esafirm.imagepicker.features.imageloader.ImageLoader;
+import com.esafirm.imagepicker.helper.ConfigUtils;
+import com.esafirm.imagepicker.helper.ImagePickerUtils;
 import com.esafirm.imagepicker.listeners.OnFolderClickListener;
 import com.esafirm.imagepicker.listeners.OnImageClickListener;
 import com.esafirm.imagepicker.listeners.OnImageSelectedListener;
@@ -109,17 +111,22 @@ private boolean isDisplayingFolderView() {
 
     public String getTitle() {
         if (isDisplayingFolderView()) {
-            return config.getFolderTitle();
+            return ConfigUtils.getFolderTitle(context, config);
         }
 
-        if (config.getMode() == ImagePicker.MODE_MULTIPLE) {
-            int imageSize = imageAdapter.getSelectedImages().size();
-            return config.getLimit() == ImagePicker.MAX_LIMIT
-                    ? String.format(context.getString(R.string.ef_selected), imageSize)
-                    : String.format(context.getString(R.string.ef_selected_with_limit), imageSize, config.getLimit());
+        if (config.getMode() == ImagePicker.MODE_SINGLE) {
+            return ConfigUtils.getImageTitle(context, config);
         }
 
-        return config.getImageTitle();
+        final int imageSize = imageAdapter.getSelectedImages().size();
+        final boolean useDefaultTitle = !ImagePickerUtils.isStringEmpty(config.getImageTitle()) && imageSize == 0;
+
+        if (useDefaultTitle) {
+            return ConfigUtils.getImageTitle(context, config);
+        }
+        return config.getLimit() == ImagePicker.MAX_LIMIT
+                ? String.format(context.getString(R.string.ef_selected), imageSize)
+                : String.format(context.getString(R.string.ef_selected_with_limit), imageSize, config.getLimit());
     }
 
     public void setImageAdapter(List<Image> images) {

diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.java b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.java
@@ -1,5 +1,8 @@
 package com.esafirm.imagepicker.helper;
 
+import android.content.Context;
+
+import com.esafirm.imagepicker.R;
 import com.esafirm.imagepicker.features.ImagePicker;
 import com.esafirm.imagepicker.features.ImagePickerConfig;
 
@@ -24,4 +27,18 @@ public static ImagePickerConfig checkConfig(ImagePickerConfig config) {
     public static boolean isReturnAfterFirst(ImagePickerConfig config) {
         return config.getMode() == ImagePicker.MODE_SINGLE && config.isReturnAfterFirst();
     }
+
+    public static String getFolderTitle(Context context, ImagePickerConfig config) {
+        final String folderTitle = config.getFolderTitle();
+        return ImagePickerUtils.isStringEmpty(folderTitle)
+                ? context.getString(R.string.ef_title_folder)
+                : folderTitle;
+    }
+
+    public static String getImageTitle(Context context, ImagePickerConfig config) {
+        final String configImageTitle = config.getImageTitle();
+        return ImagePickerUtils.isStringEmpty(configImageTitle)
+                ? context.getString(R.string.ef_title_select_image)
+                : configImageTitle;
+    }
 }
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.java b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.java
@@ -6,6 +6,7 @@
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Environment;
+import android.support.annotation.Nullable;
 
 import com.esafirm.imagepicker.features.ImagePickerSavePath;
 import com.esafirm.imagepicker.model.Image;
@@ -19,6 +20,10 @@
 
 public class ImagePickerUtils {
 
+    public static boolean isStringEmpty(@Nullable String str) {
+        return str == null || str.length() == 0;
+    }
+
     public static File createImageFile(ImagePickerSavePath savePath) {
         // External sdcard location
         final String path = savePath.getPath();