Skip to content

Commit a6b299d

Browse files
committed
bugs fixed
1 parent 6fde638 commit a6b299d

File tree

11 files changed

+43
-74
lines changed

11 files changed

+43
-74
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This is Telegram like File Picker for android .
2121

2222
``` gradel
2323
dependencies {
24-
implementation 'com.github.smartdevelopers-ir:SmartFilePicker:2.0.3'
24+
implementation 'com.github.smartdevelopers-ir:SmartFilePicker:2.0.4'
2525
}
2626
```
2727

SmartFileBrowser/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
}
3535
}
3636
group = 'ir.smartdevelopers'
37-
version = '2.0.3'
37+
version = '2.0.4'
3838

3939
dependencies {
4040

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import android.Manifest;
2727
import android.animation.Animator;
2828
import android.animation.AnimatorListenerAdapter;
29+
import android.animation.AnimatorSet;
30+
import android.animation.ObjectAnimator;
31+
import android.animation.PropertyValuesHolder;
2932
import android.animation.ValueAnimator;
3033
import android.annotation.SuppressLint;
3134
import android.app.Activity;
@@ -38,6 +41,8 @@
3841
import android.graphics.Bitmap;
3942
import android.graphics.Color;
4043
import android.graphics.Rect;
44+
import android.graphics.RenderEffect;
45+
import android.graphics.Shader;
4146
import android.graphics.drawable.ColorDrawable;
4247
import android.net.Uri;
4348
import android.os.Build;
@@ -71,6 +76,7 @@
7176
import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
7277
import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
7378

79+
import com.google.android.material.animation.AnimatorSetCompat;
7480
import com.google.android.material.appbar.AppBarLayout;
7581
import com.google.android.material.bottomsheet.BottomSheetBehavior;
7682

@@ -1213,7 +1219,7 @@ public void onChanged(List<AlbumModel> albumModels) {
12131219
mAlbumListIsShowing = true;
12141220
int duration = animate ? 100 : 0;
12151221
FrameLayout albumPlaceHolderRoot = findViewById(R.id.fileBrowser_activity_main_albumPlaceHolderRoot);
1216-
1222+
albumPlaceHolderRoot.setAlpha(0);
12171223
mAlbumPlaceHolder.post(() -> {
12181224
AppCompatTextView spnSelectAlbum = findViewById(R.id.fileBrowser_activity_main_spnSelectAlbum);
12191225
int[] location = new int[2];
@@ -1223,6 +1229,18 @@ public void onChanged(List<AlbumModel> albumModels) {
12231229
mAlbumPlaceHolder.setX(x);
12241230
mAlbumPlaceHolder.setY(y);
12251231
mAlbumPlaceHolder.animate().setDuration(duration).scaleY(1).scaleX(1).alpha(1)
1232+
.setUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
1233+
@Override
1234+
public void onAnimationUpdate(@NonNull ValueAnimator animation) {
1235+
float alpha = 0;
1236+
if (mAlbumListIsShowing){
1237+
alpha = animation.getAnimatedFraction();
1238+
}else{
1239+
alpha = 1 - animation.getAnimatedFraction();
1240+
}
1241+
albumPlaceHolderRoot.setAlpha(alpha);
1242+
}
1243+
})
12261244
.withStartAction(() -> {
12271245
mAlbumPlaceHolder.setAlpha(0);
12281246
mAlbumPlaceHolder.setScaleY(0);
@@ -1237,6 +1255,9 @@ public void onChanged(List<AlbumModel> albumModels) {
12371255
@SuppressLint("ClickableViewAccessibility")
12381256
@Override
12391257
public boolean onTouch(View v, MotionEvent event) {
1258+
if (!mAlbumListIsShowing){
1259+
return false;
1260+
}
12401261
hideAlbumList(true);
12411262
return true;
12421263
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:color="@color/md_theme_onSurface"
4+
android:alpha="0.25"/>
5+
</selector>

SmartFileBrowser/src/main/res/layout/activity_file_browser_main.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,16 @@
210210
android:visibility="gone"
211211
tools:visibility="visible"
212212
android:translationZ="16dp"
213+
android:background="@color/color_gallery_dim"
213214

214215
>
215-
<FrameLayout
216+
<com.google.android.material.card.MaterialCardView
216217
android:id="@+id/fileBrowser_activity_main_albumPlaceHolder"
217-
android:layout_width="180dp"
218+
android:layout_width="@dimen/sfb_max_album_menu_width"
218219
android:layout_height="wrap_content"
219220
tools:layout_height="300dp"
220221
android:maxHeight="500dp"
221-
android:background="?attr/colorSurfaceContainerLow"
222-
222+
app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
223223
android:transformPivotX="0dp"
224224
android:transformPivotY="0dp"
225225
android:scaleX="0"
@@ -229,7 +229,7 @@
229229
android:visibility="invisible"
230230
tools:visibility="visible"
231231
android:focusable="true"
232-
android:translationZ="16dp"
232+
app:cardElevation="16dp"
233233
/>
234234
</FrameLayout>
235235
</androidx.constraintlayout.widget.ConstraintLayout>

SmartFileBrowser/src/main/res/layout/gallery_toolbar_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
app:layout_constraintBottom_toBottomOf="parent"
1616
tools:text="All media"
1717
android:layout_marginStart="16dp"
18-
android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
18+
android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title"
1919
app:drawableEndCompat="@drawable/sfb_ic_arrow_drop_down"
2020
/>
2121

@@ -28,7 +28,7 @@
2828
app:layout_constraintBottom_toBottomOf="parent"
2929
android:layout_marginEnd="16dp"
3030
app:srcCompat="@drawable/sfb_ic_vertical_more_dots"
31-
android:tint="#000000"
31+
app:tint="?attr/colorOnSurfaceVariant"
3232
android:background="?attr/selectableItemBackgroundBorderless"
3333
app:tooltipText="@string/sfb_pick_from_gallery"
3434
android:contentDescription="@string/sfb_pick_from_gallery"

SmartFileBrowser/src/main/res/layout/item_image_album_layout.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
/>
1818
<TextView
1919
android:id="@+id/item_album_list_txtAlbumName"
20-
android:layout_width="match_parent"
20+
android:layout_width="wrap_content"
2121
android:layout_height="wrap_content"
2222
android:maxLines="1"
2323
android:ellipsize="end"
2424
tools:text="asdasdsad"
2525
android:layout_gravity="center_vertical"
2626
android:layout_marginStart="16dp"
27+
android:layout_marginEnd="16dp"
28+
2729
/>
2830
</LinearLayout>

SmartFileBrowser/src/main/res/layout/sfb_album_recyclerview_layout.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="180dp"
3+
android:layout_width="@dimen/sfb_max_album_menu_width"
44
android:layout_height="wrap_content"
55
xmlns:app="http://schemas.android.com/apk/res-auto"
6-
android:background="@color/white"
7-
android:maxWidth="180dp"
6+
android:background="?attr/colorSurfaceContainerHighest"
7+
android:maxWidth="@dimen/sfb_max_album_menu_width"
88
android:maxHeight="500dp">
99

1010
<androidx.recyclerview.widget.RecyclerView

SmartFileBrowser/src/main/res/values/colors.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<color name="sfb_color_checkbox_tick">?attr/colorOnSecondary</color>
1818
<color name="sfb_color_checkbox_number">?attr/colorOnSecondary</color>
1919
<color name="black">#000000</color>
20-
2120
<!--Theme colors-->
2221
<color name="md_theme_primary">#006874</color>
2322
<color name="md_theme_onPrimary">#FFFFFF</color>

SmartFileBrowser/src/main/res/values/dimens.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
<dimen name="sfb_appbarSize">56dp</dimen>
99
<dimen name="sfb_expanded_margin_top">44dp</dimen>
1010
<dimen name="sfb_text_size_14">14sp</dimen>
11+
<dimen name="sfb_max_album_menu_width">250dp</dimen>
1112
</resources>

0 commit comments

Comments
 (0)