- Quality checker improved

Author: grigorevmp

app/src/main/java/com/mikhailgrigorev/quickpass/SignActivity.kt

@@ -106,15 +106,9 @@ class SignActivity : AppCompatActivity() {
         // Start animation
         loginFab.show()
 
-        // Checking prefs
-        val sharedPref = getSharedPreferences(_preferenceFile, Context.MODE_PRIVATE)
-        val username = sharedPref.getString(_keyBio, "none")
-        if(username != "none"){
-            finger.visibility = View.VISIBLE
-            finger.isClickable = true
-            val intent = Intent(this, PassGenActivity::class.java)
-            executor = ContextCompat.getMainExecutor(this)
-            biometricPrompt = BiometricPrompt(this, executor,
+        val intent = Intent(this, PassGenActivity::class.java)
+        executor = ContextCompat.getMainExecutor(this)
+        biometricPrompt = BiometricPrompt(this, executor,
                 object : BiometricPrompt.AuthenticationCallback() {
 
                     override fun onAuthenticationSucceeded(
@@ -127,11 +121,19 @@ class SignActivity : AppCompatActivity() {
 
                 })
 
-            promptInfo = BiometricPrompt.PromptInfo.Builder()
-                    .setTitle(getString(R.string.biometricLogin))
-                    .setSubtitle(getString(R.string.logWithBio))
-                    .setNegativeButtonText(getString(R.string.usePass))
-                    .build()
+        promptInfo = BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.biometricLogin))
+                .setSubtitle(getString(R.string.logWithBio))
+                .setNegativeButtonText(getString(R.string.usePass))
+                .build()
+
+
+        // Checking prefs
+        val sharedPref = getSharedPreferences(_preferenceFile, Context.MODE_PRIVATE)
+        val username = sharedPref.getString(_keyBio, "none")
+        if(username != "none"){
+            finger.visibility = View.VISIBLE
+            finger.isClickable = true
 
             // Prompt appears when user clicks "Log in".
             // Consider integrating with the keystore to unlock cryptographic operations,

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

@@ -131,6 +131,30 @@
                 app:layout_constraintStart_toEndOf="@+id/warning2"
                 app:layout_constraintTop_toBottomOf="@+id/passView" />
 
+
+            <ImageView
+                android:id="@+id/warning"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="20dp"
+                android:contentDescription="@string/no_text"
+                app:layout_constraintBottom_toBottomOf="@+id/passQualityText"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/passQualityText"
+                app:srcCompat="@drawable/alert_circle_outline"
+                app:tint="@color/black" />
+
+            <ImageView
+                android:id="@+id/warning2"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="20dp"
+                android:contentDescription="@string/no_text"
+                app:layout_constraintBottom_toBottomOf="@+id/passQualityText"
+                app:layout_constraintStart_toEndOf="@+id/warning"
+                app:layout_constraintTop_toTopOf="@+id/passQualityText"
+                app:srcCompat="@drawable/alert_circle_check_outline"
+                app:tint="@color/black" />
             <TextView
                 android:id="@+id/passQuality"
                 android:layout_width="wrap_content"
@@ -442,17 +466,6 @@
 
             </com.google.android.material.chip.ChipGroup>
 
-            <ImageView
-                android:id="@+id/warning"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="20dp"
-                android:contentDescription="@string/no_text"
-                app:layout_constraintBottom_toBottomOf="@+id/passQualityText"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/passQualityText"
-                app:srcCompat="@drawable/alert_circle_outline"
-                app:tint="@color/black" />
 
             <ImageView
                 android:id="@+id/tooEasyImg"
@@ -480,17 +493,6 @@
                 app:srcCompat="@drawable/database_lock_outline"
                 app:tint="@color/black" />
 
-            <ImageView
-                android:id="@+id/warning2"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="20dp"
-                android:contentDescription="@string/no_text"
-                app:layout_constraintBottom_toBottomOf="@+id/passQualityText"
-                app:layout_constraintStart_toEndOf="@+id/warning"
-                app:layout_constraintTop_toTopOf="@+id/passQualityText"
-                app:srcCompat="@drawable/alert_circle_check_outline"
-                app:tint="@color/black" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>