Merge pull request #147 from ProMode7/master

If only 1 PickType is given then automatically open the camera/gallery
jrvansuita · Aug 25, 2021 · 2374266 · 2374266
2 parents 0a660a3 + 3760d58
commit 2374266
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 30 deletions.
diff --git a/library/src/main/java/com/vansuita/pickimage/dialog/PickImageBaseDialog.java b/library/src/main/java/com/vansuita/pickimage/dialog/PickImageBaseDialog.java
@@ -5,11 +5,13 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.DialogFragment;
 import androidx.cardview.widget.CardView;
 import androidx.appcompat.widget.LinearLayoutCompat;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -196,50 +198,57 @@ public void onClick(View view) {
 
 
     private void onSetup() {
-        if (setup.getBackgroundColor() != android.R.color.white) {
-            card.setCardBackgroundColor(setup.getBackgroundColor());
+        if (showCamera && !showGallery) {
+            launchCamera();
+        } else if (showGallery && !showCamera) {
+            launchGallery();
+        } else {
+            card.setVisibility(View.VISIBLE);
+            if (setup.getBackgroundColor() != android.R.color.white) {
+                card.setCardBackgroundColor(setup.getBackgroundColor());
 
-            if (showCamera)
-                Util.background(tvCamera, Util.getAdaptiveRippleDrawable(setup.getBackgroundColor()));
+                if (showCamera)
+                    Util.background(tvCamera, Util.getAdaptiveRippleDrawable(setup.getBackgroundColor()));
 
-            if (showGallery)
-                Util.background(tvGallery, Util.getAdaptiveRippleDrawable(setup.getBackgroundColor()));
-        }
+                if (showGallery)
+                    Util.background(tvGallery, Util.getAdaptiveRippleDrawable(setup.getBackgroundColor()));
+            }
 
-        tvTitle.setTextColor(setup.getTitleColor());
+            tvTitle.setTextColor(setup.getTitleColor());
 
-        if (setup.getButtonTextColor() != 0) {
-            tvCamera.setTextColor(setup.getButtonTextColor());
-            tvGallery.setTextColor(setup.getButtonTextColor());
-        }
+            if (setup.getButtonTextColor() != 0) {
+                tvCamera.setTextColor(setup.getButtonTextColor());
+                tvGallery.setTextColor(setup.getButtonTextColor());
+            }
 
-        if (setup.getProgressTextColor() != 0)
-            tvProgress.setTextColor(setup.getProgressTextColor());
+            if (setup.getProgressTextColor() != 0)
+                tvProgress.setTextColor(setup.getProgressTextColor());
 
-        if (setup.getCancelTextColor() != 0)
-            tvCancel.setTextColor(setup.getCancelTextColor());
+            if (setup.getCancelTextColor() != 0)
+                tvCancel.setTextColor(setup.getCancelTextColor());
 
-        if (setup.getCameraButtonText() != null)
-            tvCamera.setText(setup.getCameraButtonText());
+            if (setup.getCameraButtonText() != null)
+                tvCamera.setText(setup.getCameraButtonText());
 
-        if (setup.getGalleryButtonText() != null)
-            tvGallery.setText(setup.getGalleryButtonText());
+            if (setup.getGalleryButtonText() != null)
+                tvGallery.setText(setup.getGalleryButtonText());
 
-        tvCancel.setText(setup.getCancelText());
-        tvTitle.setText(setup.getTitle());
-        tvProgress.setText(setup.getProgressText());
+            tvCancel.setText(setup.getCancelText());
+            tvTitle.setText(setup.getTitle());
+            tvProgress.setText(setup.getProgressText());
 
-        showProgress(false);
+            showProgress(false);
 
-        Util.gone(tvCamera, !showCamera);
-        Util.gone(tvGallery, !showGallery);
+            Util.gone(tvCamera, !showCamera);
+            Util.gone(tvGallery, !showGallery);
 
-        llButtons.setOrientation(setup.getButtonOrientation() == LinearLayoutCompat.HORIZONTAL ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
+            llButtons.setOrientation(setup.getButtonOrientation() == LinearLayoutCompat.HORIZONTAL ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
 
-        Util.setIcon(tvCamera, setup.getCameraIcon(), setup.getIconGravity());
-        Util.setIcon(tvGallery, setup.getGalleryIcon(), setup.getIconGravity());
+            Util.setIcon(tvCamera, setup.getCameraIcon(), setup.getIconGravity());
+            Util.setIcon(tvGallery, setup.getGalleryIcon(), setup.getIconGravity());
 
-        Util.setDimAmount(setup.getDimAmount(), getDialog());
+            Util.setDimAmount(setup.getDimAmount(), getDialog());
+        }
     }
 
 

diff --git a/library/src/main/res/layout/dialog.xml b/library/src/main/res/layout/dialog.xml
@@ -12,6 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
+        android:visibility="gone"
         android:layout_gravity="center"
         card_view:cardBackgroundColor="@android:color/white"
         card_view:cardCornerRadius="4dp"