From f480ae6e14e9d4627fdfa98dddc299d88cf9bab7 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 3 Mar 2017 23:33:06 +0100
Subject: [PATCH] get a list of parents at exclude folder dialog

---
 .../gallery/activities/MediaActivity.kt       |  5 +---
 .../gallery/adapters/DirectoryAdapter.kt      |  2 +-
 .../gallery/dialogs/ExcludeFolderDialog.kt    | 24 +++++++++++++++----
 .../main/res/layout/dialog_exclude_folder.xml |  4 +++-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 465425515..5e4dde7f1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -194,10 +194,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun tryExcludeFolder() {
-        val pathSet = HashSet<String>(1)
-        pathSet.add(mPath)
-
-        ExcludeFolderDialog(this, pathSet) {
+        ExcludeFolderDialog(this, arrayListOf(mPath)) {
             finish()
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 6e9567e1a..5bfa156b7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -197,7 +197,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
     }
 
     private fun tryExcludeFolder() {
-        ExcludeFolderDialog(activity, getSelectedPaths()) {
+        ExcludeFolderDialog(activity, getSelectedPaths().toList()) {
             listener?.refreshItems()
             actMode?.finish()
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt
index ed1863bec..87f25bfc7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt
@@ -3,12 +3,13 @@ package com.simplemobiletools.gallery.dialogs
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
 import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.getBasePath
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SimpleActivity
 import kotlinx.android.synthetic.main.dialog_exclude_folder.view.*
 
-class ExcludeFolderDialog(val activity: SimpleActivity, val selectedPaths: HashSet<String>, val callback: () -> Unit) {
+class ExcludeFolderDialog(val activity: SimpleActivity, val selectedPaths: List<String>, val callback: () -> Unit) {
     var dialog: AlertDialog? = null
 
     init {
@@ -30,11 +31,24 @@ class ExcludeFolderDialog(val activity: SimpleActivity, val selectedPaths: HashS
 
     }
 
-    private fun getAlternativePaths(): ArrayList<String> {
-        val parentsList = ArrayList<String>()
+    private fun getAlternativePaths(): List<String> {
+        val pathsList = ArrayList<String>()
         if (selectedPaths.size > 1)
-            return parentsList
+            return pathsList
 
-        return parentsList
+        val path = selectedPaths[0]
+        var basePath = path.getBasePath(activity)
+        val relativePath = path.substring(basePath.length)
+        val parts = relativePath.split("/").filter(String::isNotEmpty)
+        if (parts.isEmpty())
+            return pathsList
+
+        pathsList.add(basePath)
+        for (part in parts) {
+            basePath += "/$part"
+            pathsList.add(basePath)
+        }
+
+        return pathsList.reversed()
     }
 }
diff --git a/app/src/main/res/layout/dialog_exclude_folder.xml b/app/src/main/res/layout/dialog_exclude_folder.xml
index 7ed43c589..8cc0d5886 100644
--- a/app/src/main/res/layout/dialog_exclude_folder.xml
+++ b/app/src/main/res/layout/dialog_exclude_folder.xml
@@ -23,7 +23,9 @@
             android:id="@+id/exclude_folder_parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/exclude_folder_parent"/>
+            android:layout_marginTop="@dimen/activity_margin"
+            android:text="@string/exclude_folder_parent"
+            android:textSize="@dimen/normal_text_size"/>
 
         <RadioGroup
             android:id="@+id/exclude_folder_radio_group"