From 9cfda3bad8dbfed2cf09553db526c342ca27d7e4 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sun, 27 Mar 2022 21:33:44 +0200
Subject: [PATCH] Fix small bugs

---
 .../res/layout/fragment_generate_password.xml | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/fragment_generate_password.xml b/app/src/main/res/layout/fragment_generate_password.xml
index b67860960..f78173967 100644
--- a/app/src/main/res/layout/fragment_generate_password.xml
+++ b/app/src/main/res/layout/fragment_generate_password.xml
@@ -25,37 +25,45 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:importantForAutofill="noExcludeDescendants"
+    android:paddingTop="@dimen/card_view_margin_vertical"
+    android:paddingBottom="@dimen/card_view_margin_vertical"
     tools:targetApi="o">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
-        android:layout_marginLeft="@dimen/default_margin"
-        android:layout_marginRight="@dimen/default_margin">
-
-        <com.kunzisoft.keepass.view.PasswordView
-            android:id="@+id/password_view"
-            android:layout_width="0dp"
+        android:layout_marginStart="@dimen/card_view_margin_horizontal"
+        android:layout_marginEnd="@dimen/card_view_margin_horizontal"
+        android:layout_marginLeft="@dimen/card_view_margin_horizontal"
+        android:layout_marginRight="@dimen/card_view_margin_horizontal"
+        android:layout_marginTop="@dimen/card_view_margin_vertical"
+        android:layout_marginBottom="@dimen/card_view_margin_vertical"
+        app:cardCornerRadius="4dp">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/password_copy_button" />
+            android:layout_margin="@dimen/card_view_padding">
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/password_copy_button"
-            style="@style/KeepassDXStyle.ImageButton.Simple"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:contentDescription="@string/menu_copy"
-            android:src="@drawable/ic_content_copy_white_24dp" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <com.kunzisoft.keepass.view.PasswordView
+                android:id="@+id/password_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/password_copy_button" />
+
+            <androidx.appcompat.widget.AppCompatImageButton
+                android:id="@+id/password_copy_button"
+                style="@style/KeepassDXStyle.ImageButton.Simple"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:contentDescription="@string/menu_copy"
+                android:src="@drawable/ic_content_copy_white_24dp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
 
     <ScrollView
         android:id="@+id/ScrollView"
@@ -65,7 +73,12 @@
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/default_margin"
+            android:layout_marginStart="@dimen/card_view_margin_horizontal"
+            android:layout_marginEnd="@dimen/card_view_margin_horizontal"
+            android:layout_marginLeft="@dimen/card_view_margin_horizontal"
+            android:layout_marginRight="@dimen/card_view_margin_horizontal"
+            android:layout_marginTop="@dimen/card_view_margin_vertical"
+            android:layout_marginBottom="@dimen/card_view_margin_vertical"
             app:cardCornerRadius="4dp">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -88,9 +101,12 @@
                         android:layout_toLeftOf="@+id/length"
                         android:contentDescription="@string/content_description_password_length"
                         android:stepSize="1"
+                        android:value="@string/default_password_length"
                         android:valueFrom="@string/min_password_length"
                         android:valueTo="@string/max_password_length"
-                        android:value="@string/default_password_length" />
+                        app:thumbColor="?attr/chipFilterBackgroundColor"
+                        app:trackColorActive="?attr/chipFilterBackgroundColor"
+                        app:trackColorInactive="?attr/chipFilterBackgroundColorDisabled" />
 
                     <EditText
                         android:id="@+id/length"
@@ -189,6 +205,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        app:fabSize="mini"
         android:layout_margin="8dp"
         android:contentDescription="@string/generate_password"
         android:src="@drawable/ic_generate_password_white_24dp"/>