From 45ae6002898e132653372c242dae445a2b8ac02b Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 2 Nov 2021 17:10:06 +0100
Subject: [PATCH] Change biometric views

---
 .../com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt   | 6 ++++--
 app/src/main/res/layout-v23/view_advanced_unlock.xml       | 6 ++----
 app/src/main/res/layout/fragment_progress.xml              | 2 +-
 app/src/main/res/layout/fragment_set_otp.xml               | 2 +-
 app/src/main/res/values/styles.xml                         | 7 ++++++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
index fa492037f..26af9c974 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
@@ -104,10 +104,12 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
             return unlockMessageTextView?.text?.toString() ?: ""
         }
         set(value) {
-            if (value == null || value.isEmpty())
+            if (value == null || value.isEmpty()) {
                 unlockMessageTextView?.visibility = GONE
-            else
+            } else {
                 unlockMessageTextView?.visibility = VISIBLE
+                stopIconViewAnimation()
+            }
             unlockMessageTextView?.text = value ?: ""
         }
 
diff --git a/app/src/main/res/layout-v23/view_advanced_unlock.xml b/app/src/main/res/layout-v23/view_advanced_unlock.xml
index 829da8559..28cbc84fb 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -52,8 +52,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/biometric_message"
         tools:text="@string/advanced_unlock_prompt_store_credential_title"
-        style="@style/KeepassDXStyle.TextAppearance.Default.TextOnPrimary"
-        android:textSize="14sp"
+        style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
         android:gravity="center" />
 
     <TextView
@@ -67,7 +66,6 @@
         app:layout_constraintTop_toBottomOf="@+id/biometric_title"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Sample error"
-        style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
-        android:textSize="12sp"
+        style="@style/KeepassDXStyle.TextAppearance.Warning.TextOnPrimary"
         android:gravity="center" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_progress.xml b/app/src/main/res/layout/fragment_progress.xml
index a72a5cbb3..b3f79e265 100644
--- a/app/src/main/res/layout/fragment_progress.xml
+++ b/app/src/main/res/layout/fragment_progress.xml
@@ -56,7 +56,7 @@
         android:layout_marginRight="20dp"
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
-        style="@style/KeepassDXStyle.TextAppearance.WarningTextStyle"/>
+        style="@style/KeepassDXStyle.TextAppearance.Warning"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_dialog_bar"
diff --git a/app/src/main/res/layout/fragment_set_otp.xml b/app/src/main/res/layout/fragment_set_otp.xml
index 0e2e414b8..3fc3e46a1 100644
--- a/app/src/main/res/layout/fragment_set_otp.xml
+++ b/app/src/main/res/layout/fragment_set_otp.xml
@@ -63,7 +63,7 @@
             android:layout_marginEnd="@dimen/card_view_margin_horizontal"
             android:layout_marginRight="@dimen/card_view_margin_horizontal"
             android:text="@string/error_otp_type"
-            style="@style/KeepassDXStyle.TextAppearance.WarningTextStyle"/>
+            style="@style/KeepassDXStyle.TextAppearance.Warning"/>
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_view_otp_selection"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f133a6d60..f7fe15881 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -304,6 +304,11 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">italic</item>
     </style>
+    <style name="KeepassDXStyle.TextAppearance.Warning.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
+        <item name="android:textColor">?attr/textColorInverse</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">italic</item>
+    </style>
     <style name="KeepassDXStyle.TextAppearance.Title.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
@@ -339,7 +344,7 @@
     <style name="KeepassDXStyle.TextAppearance.Tiny" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">12sp</item>
     </style>
-	<style name="KeepassDXStyle.TextAppearance.WarningTextStyle" parent="KeepassDXStyle.TextAppearance">
+	<style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance">
 		<item name="android:textColor">?attr/colorAccent</item>
 	</style>