couple more dialog style updates

app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt

@@ -33,6 +33,8 @@ class PickDirectoryDialog(
             spanCount = if (isGridViewType) activity.config.dirColumnCnt else 1
         }
 
+        view.directories_fastscroller.updateColors(activity.getAdjustedPrimaryColor())
+
         val builder = AlertDialog.Builder(activity)
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
@@ -124,27 +126,9 @@ class PickDirectoryDialog(
         }
 
         val scrollHorizontally = activity.config.scrollHorizontally && isGridViewType
-        val sorting = activity.config.directorySorting
-        val dateFormat = activity.config.dateFormat
-        val timeFormat = activity.getTimeFormat()
         view.apply {
             directories_grid.adapter = adapter
-
+            directories_fastscroller.setScrollVertically(!scrollHorizontally)
-            /*directories_vertical_fastscroller.isHorizontal = false
-            directories_vertical_fastscroller.beGoneIf(scrollHorizontally)
-
-            directories_horizontal_fastscroller.isHorizontal = true
-            directories_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
-
-            if (scrollHorizontally) {
-                directories_horizontal_fastscroller.setViews(directories_grid) {
-                    directories_horizontal_fastscroller.updateBubbleText(dirs[it].getBubbleText(sorting, activity, dateFormat, timeFormat))
-                }
-            } else {
-                directories_vertical_fastscroller.setViews(directories_grid) {
-                    directories_vertical_fastscroller.updateBubbleText(dirs[it].getBubbleText(sorting, activity, dateFormat, timeFormat))
-                }
-            }*/
         }
     }
 

app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt

@@ -3,7 +3,7 @@ package com.simplemobiletools.gallery.pro.dialogs
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getTimeFormat
+import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
 import com.simplemobiletools.commons.views.MyGridLayoutManager
@@ -30,6 +30,8 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
             spanCount = if (isGridViewType) activity.config.mediaColumnCnt else 1
         }
 
+        view.media_fastscroller.updateColors(activity.getAdjustedPrimaryColor())
+
         dialog = AlertDialog.Builder(activity)
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
@@ -72,29 +74,9 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
         }
 
         val scrollHorizontally = activity.config.scrollHorizontally && isGridViewType
-        val sorting = activity.config.getFolderSorting(if (path.isEmpty()) SHOW_ALL else path)
-        val dateFormat = activity.config.dateFormat
-        val timeFormat = activity.getTimeFormat()
         view.apply {
             media_grid.adapter = adapter
-
+            media_fastscroller.setScrollVertically(!scrollHorizontally)
-            /*media_vertical_fastscroller.isHorizontal = false
-            media_vertical_fastscroller.beGoneIf(scrollHorizontally)
-
-            media_horizontal_fastscroller.isHorizontal = true
-            media_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
-
-            if (scrollHorizontally) {
-                media_horizontal_fastscroller.setViews(media_grid) {
-                    val medium = (media[it] as? Medium)
-                    media_horizontal_fastscroller.updateBubbleText(medium?.getBubbleText(sorting, activity, dateFormat, timeFormat) ?: "")
-                }
-            } else {
-                media_vertical_fastscroller.setViews(media_grid) {
-                    val medium = (media[it] as? Medium)
-                    media_vertical_fastscroller.updateBubbleText(medium?.getBubbleText(sorting, activity, dateFormat, timeFormat) ?: "")
-                }
-            }*/
         }
     }
 }

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/grouping_dialog_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -86,8 +85,7 @@
 
         </RadioGroup>
 
-        <include
+        <include layout="@layout/divider" />
-            layout="@layout/divider"/>
 
         <RadioGroup
             android:id="@+id/grouping_dialog_radio_order"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/change_view_type_dialog_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialog_confirm_delete_folder_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/aspect_ratio_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/delete_remember_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -12,6 +11,7 @@
         android:id="@+id/delete_remember_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/small_margin"
         android:paddingBottom="@dimen/activity_margin"
         android:text="@string/proceed_with_deletion"
         android:textSize="@dimen/bigger_text_size" />

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/exclude_folder_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -6,7 +6,7 @@
     android:paddingTop="@dimen/activity_margin">
 
     <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-        android:id="@+id/directories_fastscroller"
+        android:id="@+id/media_fastscroller"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/other_aspect_ratio_dialog_scrollview"
     android:layout_width="match_parent"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/resize_image_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,6 +12,7 @@
         android:id="@+id/image_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/width" />
 
     <com.simplemobiletools.commons.views.MyEditText
@@ -33,6 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_toEndOf="@+id/image_width_label"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/height" />
 
     <com.simplemobiletools.commons.views.MyEditText

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/resize_image_with_path_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,6 +13,7 @@
         android:id="@+id/image_width_label"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/width"
         android:textSize="@dimen/normal_text_size" />
 
@@ -32,6 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_toEndOf="@+id/image_width_label"
+        android:paddingStart="@dimen/tiny_margin"
         android:text="@string/height"
         android:textSize="@dimen/normal_text_size" />
 
@@ -52,6 +55,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_height"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginTop="@dimen/activity_margin"
         android:text="@string/path"
         android:textSize="@dimen/normal_text_size" />
@@ -61,11 +65,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_path_label"
-        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/small_margin"
         android:paddingEnd="@dimen/small_margin"
-        android:textSize="@dimen/normal_text_size" />
+        android:textSize="@dimen/normal_text_size"
+        tools:text="@string/internal" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/image_name"
@@ -82,6 +87,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_name"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:text="@string/extension"
         android:textSize="@dimen/normal_text_size" />
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/save_as_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,6 +11,7 @@
         android:id="@+id/save_as_path_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:text="@string/path"
         android:textSize="@dimen/smaller_text_size" />
 
@@ -18,10 +19,11 @@
         android:id="@+id/save_as_path"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:layout_marginBottom="@dimen/activity_margin"
         android:paddingTop="@dimen/small_margin"
-        android:paddingEnd="@dimen/small_margin"/>
+        android:paddingEnd="@dimen/small_margin"
+        tools:text="@string/internal" />
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/save_as_name"
@@ -36,6 +38,7 @@
         android:id="@+id/save_as_extension_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/tiny_margin"
         android:text="@string/extension" />
 
     <com.simplemobiletools.commons.views.MyEditText

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/slideshow_scrollview"
     android:layout_width="match_parent"
@@ -10,15 +9,15 @@
         android:id="@+id/slideshow_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:orientation="vertical">
-        android:padding="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/interval_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/medium_margin"
+            android:layout_marginTop="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin"
             android:paddingBottom="@dimen/activity_margin"
             android:text="@string/interval" />
 
@@ -27,6 +26,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/normal_margin"
+            android:layout_marginEnd="@dimen/bigger_margin"
             android:ems="5"
             android:gravity="end"
             android:imeOptions="actionDone"
@@ -42,7 +43,9 @@
             android:layout_below="@+id/interval_label"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
+            android:paddingStart="@dimen/medium_margin"
             android:paddingTop="@dimen/bigger_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -69,100 +72,85 @@
 
         <RelativeLayout
             android:id="@+id/include_videos_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/animation_holder"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackground">
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/include_videos"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
                 android:text="@string/include_videos" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/include_gifs_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_videos_holder"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackground">
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/include_gifs"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
                 android:text="@string/include_gifs" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/random_order_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/include_gifs_holder"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackground">
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/random_order"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
                 android:text="@string/random_order" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/move_backwards_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/random_order_holder"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackground">
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/move_backwards"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
                 android:text="@string/move_backwards" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/loop_slideshow_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/move_backwards_holder"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackground">
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingBottom="@dimen/activity_margin">
 
-            <com.simplemobiletools.commons.views.MySwitchCompat
+            <com.simplemobiletools.commons.views.MyAppCompatCheckbox
                 android:id="@+id/loop_slideshow"
+                style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
                 android:text="@string/loop_slideshow" />
 
         </RelativeLayout>