Merge pull request #21 from smartdevelopers-ir/v2.0.8

bug fixed

Author: smartdevelopers-ir

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/acitivties/FileBrowserMainActivity.java

@@ -62,11 +62,13 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.Insets;
 import androidx.core.graphics.drawable.DrawableKt;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.lifecycle.LiveData;
@@ -837,10 +839,7 @@ private AHBottomNavigationItem createNavItem(int colorAttr, int titleRes, int ic
                 value.data);
     }
     private void initViews(Bundle savedInstanceState) {
-//        ContextThemeWrapper wrapper = new ContextThemeWrapper(this,R.style.sfb_BaseAppTheme);
-//        Drawable okDrawable = VectorDrawableCompat.create(wrapper.getResources(),R.drawable.sfb_ic_circle_tick_filled,wrapper.getTheme());
-//        //okDrawable.setTintList(null);
-//        btnSelectionOk.setImageDrawable(okDrawable);
+
         int[] attrs={R.attr.SFBColorGallery,R.attr.SFBColorPDF,R.attr.SFBColorAudio,R.attr.SFBColorFile};
 
         if (mShowGalleryTab) {
@@ -863,6 +862,10 @@ private void initViews(Bundle savedInstanceState) {
         mBottomNavigationView.setColoredModeColors(colorActive,colorInactive);
         getTheme().resolveAttribute(R.attr.SFBBottomNavColorDisabled,value,true);
         int colorDisabled = value.data;
+        getTheme().resolveAttribute(com.google.android.material.R.attr.colorOnSurface,value,true);
+        int surfaceColor =value.data;
+        int dimColor = ColorUtils.setAlphaComponent(surfaceColor,59);
+        findViewById(R.id.fileBrowser_activity_main_albumPlaceHolderRoot).setBackgroundColor(dimColor);
         mBottomNavigationView.setItemDisableColor(colorDisabled);
         mBottomNavigationView.setOnTabSelectedListener(mOnMenuItemSelectionListener);
         mBottomNavigationView.setColored(true);

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/customClasses/SquareTextView.java

@@ -0,0 +1,58 @@
+package ir.smartdevelopers.smartfilebrowser.customClasses;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+public class SquareTextView extends AppCompatTextView {
+    private int size;
+    public SquareTextView(@NonNull Context context) {
+        this(context,null);
+    }
+
+    public SquareTextView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs,0);
+    }
+
+    public SquareTextView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        setGravity(Gravity.CENTER);
+    }
+
+
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+
+        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (widthSize == 0 && heightSize == 0) {
+            // If there are no constraints on size, let FrameLayout measure
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+            // Now use the smallest of the measured dimensions for both dimensions
+            final int minSize = Math.min(getMeasuredWidth(), getMeasuredHeight());
+            setMeasuredDimension(minSize, minSize);
+            return;
+        }
+
+        final int size;
+        if (widthSize == 0 || heightSize == 0) {
+            // If one of the dimensions has no restriction on size, set both dimensions to be the
+            // on that does
+            size = Math.max(widthSize, heightSize);
+        } else {
+            // Both dimensions have restrictions on size, set both dimensions to be the
+            // smallest of the two
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            size = Math.max(getMeasuredWidth(), getMeasuredHeight());
+        }
+
+        super.onMeasure(MeasureSpec.makeMeasureSpec(size,MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(size,MeasureSpec.EXACTLY));
+    }
+}

SmartFileBrowser/src/main/res/color/color_gallery_dim.xml

@@ -160,6 +160,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_margin="8dp"
        android:visibility="invisible"
+       tools:visibility="visible"
        android:clipChildren="false"
        >
        <ImageView
@@ -184,11 +185,11 @@
            android:layout_marginBottom="6dp"
            android:layout_marginEnd="2dp"
            />
-       <TextView
+       <ir.smartdevelopers.smartfilebrowser.customClasses.SquareTextView
            android:id="@+id/fileBrowser_activity_main_txtSelectionCount"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           tools:text="1"
+           tools:text="22"
            android:textSize="12sp"
            android:maxLines="1"
            app:layout_constraintBottom_toBottomOf="@id/fileBrowser_activity_main_txtSelectionCountPositionHelper"
@@ -210,9 +211,8 @@
        android:visibility="gone"
        tools:visibility="visible"
        android:translationZ="16dp"
-        android:backgroundTint="@color/color_gallery_dim"
-
        >
+
        <com.google.android.material.card.MaterialCardView
            android:id="@+id/fileBrowser_activity_main_albumPlaceHolder"
            android:layout_width="@dimen/sfb_max_album_menu_width"