Pārlūkot izejas kodu

Show parent folder name on 'go up' item, part of #1664.

Aidan Follestad 6 gadi atpakaļ
vecāks
revīzija
341fe7c653

+ 4 - 3
files/src/main/java/com/afollestad/materialdialogs/files/FileChooserAdapter.kt

@@ -21,10 +21,10 @@ import com.afollestad.materialdialogs.callbacks.onDismiss
 import com.afollestad.materialdialogs.files.utilext.betterParent
 import com.afollestad.materialdialogs.files.utilext.friendlyName
 import com.afollestad.materialdialogs.files.utilext.hasParent
-import com.afollestad.materialdialogs.utils.MDUtil.isColorDark
 import com.afollestad.materialdialogs.files.utilext.jumpOverEmulated
 import com.afollestad.materialdialogs.files.utilext.maybeSetTextColor
 import com.afollestad.materialdialogs.files.utilext.setVisible
+import com.afollestad.materialdialogs.utils.MDUtil.isColorDark
 import com.afollestad.materialdialogs.utils.MDUtil.resolveColor
 import com.afollestad.materialdialogs.utils.MDUtil.resolveDrawable
 import java.io.File
@@ -165,13 +165,14 @@ internal class FileChooserAdapter(
     holder: FileChooserViewHolder,
     position: Int
   ) {
-    if (currentFolder.hasParent() && position == goUpIndex()) {
+    val currentParent = currentFolder.betterParent()
+    if (currentParent != null && position == goUpIndex()) {
       // Go up
       holder.iconView.setImageResource(
           if (isLightTheme) R.drawable.icon_return_dark
           else R.drawable.icon_return_light
       )
-      holder.nameView.text = "..."
+      holder.nameView.text = currentParent.name
       holder.itemView.isActivated = false
       return
     }

+ 2 - 2
files/src/main/res/drawable/icon_return_dark.xml

@@ -1,9 +1,9 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+    android:height="36dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:width="24dp">
+    android:width="36dp">
   <path
       android:fillColor="#424242"
       android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

+ 2 - 2
files/src/main/res/drawable/icon_return_light.xml

@@ -1,9 +1,9 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+    android:height="36dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:width="24dp">
+    android:width="36dp">
   <path
       android:fillColor="#EEEEEE"
       android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>