Skip to content

Commit 0dd0b57

Browse files
mahdiasdmahdiasd
committed
fix icon launcher conflict
1 parent 2a8b1ec commit 0dd0b57

File tree

6 files changed

+50
-29
lines changed

6 files changed

+50
-29
lines changed

‎FilePicker/src/main/java/com/mahdiasd/filepicker/FilePickerAdapter.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package com.mahdiasd.filepicker
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.content.Intent
6-
import android.content.res.ColorStateList
76
import android.net.Uri
8-
import android.util.Log.d
97
import android.view.View
108
import android.webkit.MimeTypeMap
119
import android.widget.ImageView
@@ -54,7 +52,7 @@ class FilePickerAdapter(
5452
it.subFolderCount = model.file.listFiles()?.size ?: 0
5553
it.stackListSize = stack.size
5654
it.activeColor = config.activeColor
57-
it.checkbox.buttonTintList = ColorStateList.valueOf(config.activeColor)
55+
it.deActiveColor = config.deActiveColor
5856
}
5957
}
6058
else -> {
@@ -63,9 +61,9 @@ class FilePickerAdapter(
6361
it.item = model
6462
glideSdCart(itemBinding.image, model.path)
6563
it.presenter = this
64+
it.activeColor = config.activeColor
65+
it.deActiveColor = config.deActiveColor
6666
it.type = config.selectedMode
67-
// it.checkbox.buttonTintList = ColorStateList.valueOf(config.activeColor)
68-
it.checkbox.setColorFilter(config.cardBackgroundColor)
6967
}
7068
}
7169
}
@@ -186,7 +184,6 @@ class FilePickerAdapter(
186184
intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
187185
context.startActivity(intent)
188186
} catch (e: java.lang.Exception) {
189-
d("TAG", "openFile: ${e.message}")
190187
Toast.makeText(
191188
context,
192189
context.resources.getString(R.string.mahdiasd_file_picker_failed_open_file),

‎FilePicker/src/main/res/drawable/ic_done.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<vector android:height="128dp" android:viewportHeight="64"
2-
android:viewportWidth="64" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
<path android:fillColor="#000000" android:pathData="M32,10c12.15,0 22,9.85 22,22s-9.85,22 -22,22s-22,-9.85 -22,-22S19.85,10 32,10zM42.679,25.486c0.601,-0.927 0.336,-2.166 -0.591,-2.766c-0.93,-0.6 -2.167,-0.336 -2.767,0.591l-9.709,14.986l-5.11,-5.809c-0.729,-0.829 -1.994,-0.911 -2.823,-0.18c-0.829,0.729 -0.91,1.993 -0.181,2.823l6.855,7.791c0.382,0.433 0.93,0.679 1.502,0.679c0.049,0 0.098,-0.002 0.146,-0.005c0.625,-0.046 1.191,-0.382 1.532,-0.907L42.679,25.486z"/>
1+
<vector android:height="128dp" android:viewportHeight="24"
2+
android:viewportWidth="24" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="#fff" android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10C22,6.5 17.5,2 12,2zM16.2,10.3l-4.8,4.8c-0.4,0.4 -1,0.4 -1.4,0l0,0l-2.2,-2.2c-0.4,-0.4 -0.4,-1 0,-1.4c0.4,-0.4 1,-0.4 1.4,0c0,0 0,0 0,0l1.5,1.5l4.1,-4.1c0.4,-0.4 1,-0.4 1.4,0C16.6,9.3 16.6,9.9 16.2,10.3z"/>
54
</vector>

‎FilePicker/src/main/res/layout/item_file_picker.xml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
<data>
66

7+
<variable
8+
name="activeColor"
9+
type="Integer" />
10+
11+
<variable
12+
name="deActiveColor"
13+
type="Integer" />
14+
715
<import type="android.view.View" />
816

917
<variable
@@ -48,7 +56,7 @@
4856
android:layout_width="48dp"
4957
android:layout_height="48dp"
5058
android:layout_centerInParent="true"
51-
android:elevation="5dp"
59+
android:elevation="3dp"
5260
android:onClick="@{(v) -> presenter.onClick(v , item)}"
5361
android:src="@drawable/ic_play"
5462
android:tint="@color/white"
@@ -58,17 +66,26 @@
5866
app:layout_constraintRight_toRightOf="@id/image"
5967
app:layout_constraintTop_toTopOf="@id/image" />
6068

69+
<View
70+
android:layout_width="16dp"
71+
android:layout_height="16dp"
72+
android:background="@drawable/shape_circle"
73+
android:backgroundTint="@color/white"
74+
app:layout_constraintBottom_toBottomOf="@id/checkbox"
75+
android:elevation="2dp"
76+
app:layout_constraintLeft_toLeftOf="@id/checkbox"
77+
app:layout_constraintRight_toRightOf="@id/checkbox"
78+
app:layout_constraintTop_toTopOf="@id/checkbox" />
79+
6180
<ImageView
6281
android:id="@+id/checkbox"
6382
android:layout_width="24dp"
6483
android:layout_height="24dp"
65-
android:background="@drawable/shape_circle"
66-
android:backgroundTint="@color/white"
67-
android:src="@{item.selected ? @drawable/ic_done : @drawable/shape_circle}"
68-
android:tint="@{config.activeColor}"
6984
android:layout_margin="4dp"
70-
android:elevation="6dp"
85+
android:elevation="3dp"
7186
android:onClick="@{(v) -> presenter.checkBox(v , item)}"
87+
android:src="@{item.selected ? @drawable/ic_done : @drawable/shape_circle}"
88+
android:tint="@{item.selected ? activeColor : @color/white}"
7289
app:layout_constraintRight_toRightOf="parent"
7390
app:layout_constraintTop_toTopOf="parent" />
7491
</androidx.constraintlayout.widget.ConstraintLayout>

‎FilePicker/src/main/res/layout/item_file_picker_manager.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
name="item"
1111
type="com.mahdiasd.filepicker.FileModel" />
1212

13+
<variable
14+
name="deActiveColor"
15+
type="Integer" />
16+
1317
<variable
1418
name="activeColor"
1519
type="Integer" />
@@ -114,14 +118,20 @@
114118
android:text="@{`(` + subFolderCount + `)`}"
115119
android:visibility="@{item.file.directory ? View.VISIBLE : View.GONE}" />
116120

117-
<com.google.android.material.checkbox.MaterialCheckBox
121+
122+
<ImageView
118123
android:id="@+id/checkbox"
119-
android:layout_width="28dp"
120-
android:layout_height="28dp"
124+
android:layout_width="24dp"
125+
android:layout_height="24dp"
121126
android:layout_gravity="center"
122-
android:checked="@{item.selected}"
127+
android:layout_margin="4dp"
128+
android:elevation="3dp"
123129
android:onClick="@{(v) -> presenter.checkBox(v , item)}"
124-
android:visibility="@{!item.file.directory ? View.VISIBLE : View.GONE}" />
130+
android:src="@{item.selected ? @drawable/ic_done : @drawable/shape_circle}"
131+
android:tint="@{item.selected ? activeColor : deActiveColor}"
132+
android:visibility="@{!item.file.directory ? View.VISIBLE : View.GONE}"
133+
app:layout_constraintRight_toRightOf="parent"
134+
app:layout_constraintTop_toTopOf="parent" />
125135
</FrameLayout>
126136

127137
</RelativeLayout>

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
[![](https://jitpack.io/v/mahdiasd/BottomDialogFilePicker.svg)](https://jitpack.io/#mahdiasd/BottomDialogFilePicker)
55

6-
A android bottom dialog picker like telegram for all version of android
6+
A android bottom dialog picker like telegram for all version of android (1 ... , 10 , 11 , 12 , 13)
77

88
Search in Files
99

10-
Support android 10+
10+
Support android 10+
1111

1212
Expandable and scrollable dialog
1313

14-
Full Customisable (Color / text / minimum and maximum selected file size / ...)
14+
Full Customisable (Color , text , minimum and maximum selected file size , ...)
1515

1616
No required runtime permission
1717

@@ -44,7 +44,7 @@ Add it in your root build.gradle at the end of repositories:
4444
4545
```bash
4646
dependencies {
47-
implementation 'com.github.mahdiasd:BottomDialogFilePicker:1.0.2'
47+
implementation 'com.github.mahdiasd:BottomDialogFilePicker:1.0.4'
4848
}
4949
```
5050
## Ho To Use
@@ -116,8 +116,8 @@ Add it in your root build.gradle at the end of repositories:
116116

117117
## This library uses the following libraries
118118

119-
- [Glide](https://github.com/bumptech/glide)
120-
- [Handle Path Oz](https://github.com/onimur/handle-path-oz)
119+
- [Glide](https://github.com/bumptech/glide)
120+
- [Handle Path Oz](https://github.com/onimur/handle-path-oz)
121121

122122
Thanks to the very powerful Glide and Handle Path Oz
123123

‎app/src/main/java/com/mahdiasd/sample/MainActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.mahdiasd.sample
22

33
import android.graphics.Color
44
import android.os.Bundle
5-
import android.util.Log
65
import android.view.View
76
import android.widget.Toast
87
import androidx.appcompat.app.AppCompatActivity
@@ -79,7 +78,6 @@ class MainActivity : AppCompatActivity() {
7978
.setActiveColor(Color.parseColor(activeColor))
8079
.setListener(object : FilePickerListener {
8180
override fun selectedFiles(list: List<FileModel>?) {
82-
Log.e("TAG", "selectedFiles: ${list.toString()}")
8381
}
8482
})
8583
.show()

0 commit comments

Comments
 (0)