From 244174e49403fec57d2e284d0879813f7331f127 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 7 Jul 2023 23:53:01 +0200
Subject: [PATCH] fix: Fingerprint button

---
 .../biometric/AdvancedUnlockFragment.kt       |  2 +-
 .../keepass/view/AdvancedUnlockInfoView.kt    | 23 ++++++-------------
 .../res/layout-v23/view_advanced_unlock.xml   | 21 +++--------------
 .../res/layout/activity_main_credential.xml   |  4 +++-
 app/src/main/res/values/styles.xml            |  7 +++++-
 5 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
index baffaf973..afded046c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -629,7 +629,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
     @RequiresApi(Build.VERSION_CODES.M)
     private fun setAdvancedUnlockedMessageView(text: CharSequence) {
         lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.message = text
+            mAdvancedUnlockInfoView?.setMessage(text)
         }
     }
 
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 c91a7a9da..a5c5bcb0a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
@@ -27,6 +27,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.kunzisoft.keepass.R
@@ -41,7 +42,6 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
     private val unlockContainerView: View
     private var unlockAnimatedVector: FingerPrintAnimatedVector? = null
     private var unlockTitleTextView: TextView? = null
-    private var unlockMessageTextView: TextView? = null
     private var unlockIconImageView: ImageView? = null
 
     init {
@@ -51,7 +51,6 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
 
         unlockContainerView = findViewById(R.id.fingerprint_container)
         unlockTitleTextView = findViewById(R.id.biometric_title)
-        unlockMessageTextView = findViewById(R.id.biometric_message)
         unlockIconImageView = findViewById(R.id.biometric_image)
     }
 
@@ -85,6 +84,7 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
             unlockContainerView.alpha = 0.8f
         }
         unlockIconImageView?.setOnClickListener(listener)
+        unlockTitleTextView?.setOnClickListener(listener)
     }
 
     var title: CharSequence
@@ -99,22 +99,13 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
         title = context.getString(textId)
     }
 
-    var message: CharSequence?
-        get() {
-            return unlockMessageTextView?.text?.toString() ?: ""
-        }
-        set(value) {
-            if (value == null || value.isEmpty()) {
-                unlockMessageTextView?.visibility = GONE
-            } else {
-                unlockMessageTextView?.visibility = VISIBLE
-                stopIconViewAnimation()
-            }
-            unlockMessageTextView?.text = value ?: ""
-        }
+    fun setMessage(text: CharSequence) {
+        if (text.isNotEmpty())
+            Toast.makeText(context, text, Toast.LENGTH_LONG).show()
+    }
 
     fun setMessage(@StringRes textId: Int) {
-        message = context.getString(textId)
+        Toast.makeText(context, textId, Toast.LENGTH_LONG).show()
     }
 
 }
\ No newline at end of file
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 d8293a60d..5ddc51d45 100644
--- a/app/src/main/res/layout-v23/view_advanced_unlock.xml
+++ b/app/src/main/res/layout-v23/view_advanced_unlock.xml
@@ -26,38 +26,23 @@
     android:layout_height="wrap_content"
     android:filterTouchesWhenObscured="true">
 
-    <TextView
-        android:id="@+id/biometric_message"
-        style="@style/KeepassDXStyle.TextAppearance.Warning.TextOnPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:layout_marginBottom="8dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/biometric_image"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Sample error" />
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/biometric_image"
         android:layout_width="42dp"
         android:layout_height="42dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:elevation="8dp"
-        android:layout_margin="4dp"
         android:src="@drawable/fingerprint"
         android:background="@drawable/background_image"
         android:backgroundTint="?attr/colorAccent" />
 
     <TextView
         android:id="@+id/biometric_title"
-        style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:orientation="vertical"
+        style="@style/KeepassDXStyle.TextAppearance.Tiny.Secondary"
+        android:layout_margin="8dp"
+        android:gravity="start|center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/biometric_image"
diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index a4dbb9be3..2b398b14e 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -175,7 +175,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/fragment_advanced_unlock_container_view"
                 android:layout_width="0dp"
@@ -190,6 +191,7 @@
                 android:focusable="true"
                 android:text="@string/unlock"
                 app:icon="@drawable/ic_lock_open_white_24dp"
+                app:layout_constraintStart_toEndOf="@+id/fragment_advanced_unlock_container_view"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f751c41a5..bcb7b8047 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -479,7 +479,12 @@
     <style name="KeepassDXStyle.TextAppearance.Tiny" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">12sp</item>
     </style>
-	<style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance">
+    <style name="KeepassDXStyle.TextAppearance.Tiny.Secondary" parent="KeepassDXStyle.TextAppearance">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance">
 		<item name="android:textColor">?attr/colorAccent</item>
 	</style>