From b4975a2bbd30a0b256151eb16df6c77a3df2d0ba Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 26 Feb 2017 21:10:52 +0100
Subject: [PATCH] add a cross for removing excluded folders

---
 .../activities/ExcludedFoldersActivity.kt     |  8 ++++++++
 .../gallery/helpers/Config.kt                 |  6 ++++++
 .../main/res/layout/item_excluded_folder.xml  | 19 ++++++++++++++++---
 app/src/main/res/values-v21/styles.xml        |  3 +++
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/styles.xml            |  4 ++++
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt
index 192757792..c7fc0de3e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt
@@ -11,11 +11,19 @@ class ExcludedFoldersActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_excluded_folders)
+        addExcludedFolders()
+    }
 
+    private fun addExcludedFolders() {
+        excluded_folders_holder.removeAllViews()
         val folders = config.excludedFolders
         for (folder in folders) {
             layoutInflater.inflate(R.layout.item_excluded_folder, null, false).apply {
                 excluded_folder_title.text = folder
+                excluded_folders_icon.setOnClickListener {
+                    config.removeExcludedFolder(folder)
+                    addExcludedFolders()
+                }
                 excluded_folders_holder.addView(this)
             }
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index 864cd40ca..03dc06179 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -64,6 +64,12 @@ class Config(context: Context) : BaseConfig(context) {
         excludedFolders = currExcludedFolders
     }
 
+    fun removeExcludedFolder(path: String) {
+        val currExcludedFolders = HashSet<String>(excludedFolders)
+        currExcludedFolders.remove(path)
+        excludedFolders = currExcludedFolders
+    }
+
     var excludedFolders: MutableSet<String>
         get() = prefs.getStringSet(EXCLUDED_FOLDERS, HashSet<String>())
         set(excludedFolders) = prefs.edit().remove(EXCLUDED_FOLDERS).putStringSet(EXCLUDED_FOLDERS, excludedFolders).apply()
diff --git a/app/src/main/res/layout/item_excluded_folder.xml b/app/src/main/res/layout/item_excluded_folder.xml
index 69f87b613..8efeb10b5 100644
--- a/app/src/main/res/layout/item_excluded_folder.xml
+++ b/app/src/main/res/layout/item_excluded_folder.xml
@@ -4,13 +4,26 @@
     android:id="@+id/excluded_folder_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/medium_margin"
     android:padding="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/excluded_folder_title"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"/>
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/medium_margin"
+        android:layout_marginRight="@dimen/medium_margin"
+        android:layout_toLeftOf="@+id/excluded_folders_icon"
+        android:layout_toStartOf="@+id/excluded_folders_icon"/>
+
+    <com.simplemobiletools.gallery.views.MyImageView
+        android:id="@+id/excluded_folders_icon"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="@dimen/exclude_folder_img_size"
+        android:layout_height="@dimen/exclude_folder_img_size"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:padding="@dimen/medium_margin"
+        android:src="@drawable/ic_cross"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 78a798255..d0f0f9e07 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -4,4 +4,7 @@
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
+    <style name="MyBorderlessBackgroundStyle">
+        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 98352e4d1..035ba3688 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,4 +7,5 @@
     <dimen name="play_outline_size_big">160dp</dimen>
     <dimen name="timer_padding">24dp</dimen>
     <dimen name="tmb_shadow_height">50dp</dimen>
+    <dimen name="exclude_folder_img_size">48dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f730c8f58..f148da106 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,4 +15,8 @@
     <style name="MyFullScreenActionBar" parent="Widget.AppCompat.Light.ActionBar">
         <item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
     </style>
+
+    <style name="MyBorderlessBackgroundStyle">
+        <item name="android:background">?attr/selectableItemBackground</item>
+    </style>
 </resources>