多文件选择优化

Author: dida-logistics

app/src/main/java/pizzk/media/picker/demo/MainActivity.kt

@@ -22,11 +22,11 @@ class MainActivity : AppCompatActivity() {
         PickControl.authority(getString(R.string.file_provider))
         //多张选择示例
         val photoGroup: PhotoGroupView = findViewById(R.id.photoGroup)
-        val size: Int = resources.getDimensionPixelSize(R.dimen.x75)
+        val size: Int = resources.getDimensionPixelSize(R.dimen.x110)
         val tvHint: TextView = findViewById(R.id.tvHint)
-        val lp: ViewGroup.LayoutParams = ViewGroup.LayoutParams(size, size)
-        val special: PhotoGroupView.Special = PhotoGroupView.Special(this@MainActivity, lp = lp, limit = 4, column = 4)
-        photoGroup.setup(special, emptyList(), false) {
+        val lp: ViewGroup.LayoutParams = ViewGroup.LayoutParams(size, ViewGroup.LayoutParams.WRAP_CONTENT)
+        val special: PhotoGroupView.Special = PhotoGroupView.Special(this@MainActivity, lp = lp, limit = 20, column = 4)
+        photoGroup.setup(special, emptyList(), readOnly = false, appendText = "添加文件") {
             tvHint.text = "(${it.selectCount()}/${special.limit})"
         }
         //单张选择示例

app/src/main/res/layout/activity_main.xml

@@ -11,9 +11,9 @@
         android:id="@+id/tvTitleMulti"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/pick_media_activity_margin"
         android:layout_marginLeft="@dimen/pick_media_activity_margin"
         android:layout_marginTop="90dp"
+        android:layout_marginBottom="@dimen/pick_media_activity_margin"
         android:text="@string/pick_demo_show"
         android:textColor="@color/pick_chose_text_color"
         android:textSize="18sp"/>
@@ -34,19 +34,19 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/tvTitleMulti"
         android:background="#00ffffff"
-        android:paddingBottom="@dimen/pick_media_activity_margin"
         android:paddingLeft="@dimen/pick_media_activity_margin"
+        android:paddingTop="@dimen/pick_media_activity_margin"
         android:paddingRight="@dimen/pick_media_activity_margin"
-        android:paddingTop="@dimen/pick_media_activity_margin"/>
+        android:paddingBottom="@dimen/pick_media_activity_margin"/>
 
     <TextView
         android:id="@+id/tvTitleSingle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/photoGroup"
-        android:layout_marginBottom="@dimen/pick_media_activity_margin"
         android:layout_marginLeft="@dimen/pick_media_activity_margin"
         android:layout_marginTop="25dp"
+        android:layout_marginBottom="@dimen/pick_media_activity_margin"
         android:text="@string/pick_sigle_photo"
         android:textColor="@color/pick_chose_text_color"
         android:textSize="18sp"/>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="x75">75dp</dimen>
+    <dimen name="x110">110dp</dimen>
 </resources>

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.21'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Oct 28 13:51:41 CST 2018
+#Mon Mar 25 15:24:11 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,7 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
     : CommonListAdapter<PhotoItem>(context) {
     private var readOnly: Boolean = false
     val isAppend: Boolean
+    private var appendText: String = ""
     private val lp: ViewGroup.LayoutParams
     private var changeBlock: (PhotoGroupAdapter) -> Unit = { _ -> }
 
@@ -37,6 +38,10 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
 
     fun isReadOnly() = readOnly
 
+    fun setAppendText(text: String) {
+        appendText = text
+    }
+
     fun setChangeBlock(block: (PhotoGroupAdapter) -> Unit) {
         this.changeBlock = block
     }
@@ -107,15 +112,11 @@ class PhotoGroupAdapter(context: Context, fixedList: List<PhotoItem>?, lp: ViewG
         holder.itemView.layoutParams = lp
         val el: PhotoItem = getList()[position]
         if (isAppend) {
-            holder.setVisibility(R.id.tvHint, View.GONE)
-            holder.setText(R.id.tvHint, "")
+            val isLast: Boolean = el.path.isEmpty() && position == getList().size - 1
+            holder.setText(R.id.tvHint, if (isLast) appendText else "")
         } else {
-            if (null == el.desc) {
-                holder.setVisibility(R.id.tvHint, View.GONE)
-            } else {
-                holder.setVisibility(R.id.tvHint, View.VISIBLE)
-                holder.setText(R.id.tvHint, el.desc)
-            }
+            val hintText: String = el.desc ?: ""
+            holder.setText(R.id.tvHint, hintText)
         }
         if (el.path.isEmpty()) {
             holder.setVisibility(R.id.imgHint, View.VISIBLE)

picker/src/main/java/pizzk/media/picker/adapter/PhotoGroupAdapter.kt

@@ -36,7 +36,10 @@ class PhotoGroupView : RecyclerView {
             context.getString(R.string.pick_chose_album)
     )
 
-    fun setup(special: Special, exists: List<String>? = null, readOnly: Boolean,
+    fun setup(special: Special,
+              exists: List<String>? = null,
+              readOnly: Boolean,
+              appendText: String = "",
               changed: (PhotoGroupAdapter) -> Unit = {}) {
         val manager = object : GridLayoutManager(context, special.column) {
             override fun isAutoMeasureEnabled(): Boolean = true
@@ -45,6 +48,7 @@ class PhotoGroupView : RecyclerView {
         val pAdapter = PhotoGroupAdapter(context, special.fixed, special.lp)
         pAdapter.setReadOnly(readOnly)
         pAdapter.setChangeBlock(changed)
+        pAdapter.setAppendText(appendText)
         if (!pAdapter.update(exists, special.limit)) {
             changed(pAdapter)
         }