From 5d44ba658e020b18a3852f818ba8221241055fe5 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 3 Feb 2022 20:02:19 +0100
Subject: [PATCH] Move case sensitive filter

---
 .../kunzisoft/keepass/view/SearchFiltersView.kt  |  3 ++-
 app/src/main/res/layout/view_search_filters.xml  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt b/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt
index a45255f4e..1ecfdc0df 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt
@@ -176,9 +176,10 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
     }
 
     fun setCurrentGroupText(text: String) {
+        val maxChars = 12
         searchCurrentGroup.text = when {
             text.isEmpty() -> context.getString(R.string.current_group)
-            text.length > 8 -> text.substring(0, 8) + "…"
+            text.length > maxChars -> text.substring(0, maxChars) + "…"
             else -> text
         }
     }
diff --git a/app/src/main/res/layout/view_search_filters.xml b/app/src/main/res/layout/view_search_filters.xml
index 13a0bea02..1c0a75e20 100644
--- a/app/src/main/res/layout/view_search_filters.xml
+++ b/app/src/main/res/layout/view_search_filters.xml
@@ -48,14 +48,6 @@
                     style="@style/KeepassDXStyle.Chip.Filter.Icon"
                     android:text="@string/current_group"
                     app:closeIcon="@drawable/ic_current_folder_white_24dp" />
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/search_chip_case_sensitive"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="false"
-                    style="@style/KeepassDXStyle.Chip.Filter.Icon"
-                    android:text="@string/case_sensitive"
-                    app:closeIcon="@drawable/ic_case_sensitive_white_24dp" />
             </com.google.android.material.chip.ChipGroup>
         </HorizontalScrollView>
         <ImageButton
@@ -180,6 +172,14 @@
                 android:checked="false"
                 android:enabled="false"
                 android:text="@string/template"/>
+            <com.google.android.material.chip.Chip
+                android:id="@+id/search_chip_case_sensitive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                style="@style/KeepassDXStyle.Chip.Filter.Icon"
+                android:text="@string/case_sensitive"
+                app:closeIcon="@drawable/ic_case_sensitive_white_24dp" />
         </com.google.android.material.chip.ChipGroup>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file