- Updated Account view

- Added comments to some files

Author: grigorevmp

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

@@ -193,6 +193,7 @@ class AccountActivity : AppCompatActivity() {
             var crNum = 0
             var faNum = 0
             var tlNum = 0
+            var pinNum = 0
 
             // First scan to analyze same passes
             if (pCursor.moveToFirst()) {
@@ -240,9 +241,10 @@ class AccountActivity : AppCompatActivity() {
                     if (realQuality[j] != "1")
                         qualityNum = "2"
 
-
-                    if (dbCipherIndex != "crypted" && pass.length == 4)
+                    if (dbCipherIndex != "crypted" && pass.length == 4) {
                         qualityNum = "4"
+                        pinNum += 1
+                    }
 
                     j++
 
@@ -285,6 +287,7 @@ class AccountActivity : AppCompatActivity() {
             afText.text = faNum.toString()
             tlText.text = tlNum.toString()
             crText.text = crNum.toString()
+            pinText.text = pinNum.toString()
             allPass.text = (correctNum+ inCorrectNum + midCorrectNum).toString()
 
             realPoints.text = ((correctNum.toFloat() + midCorrectNum.toFloat()/2 + inCorrectNum.toFloat()*0 + tlNum.toFloat() + faNum.toFloat())

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

@@ -89,6 +89,11 @@ class PasswordManager {
         return (factor*length)/(maxPasswordFactor*max(maxPasswordLength, length.toFloat()))
     }
 
+    fun evaluatePin(passwordToTest: String) : Float {
+
+        return 0F
+    }
+
     fun evaluatePasswordString(passwordToTest: String) : String {
 
         var factor = 0

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

@@ -35,13 +35,13 @@
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/crypted"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="20dp"
+
                 android:clickable="true"
                 android:focusable="true"
-
                 android:foreground="?android:attr/selectableItemBackground"
                 app:cardBackgroundColor="@color/white"
                 app:cardCornerRadius="15dp"
@@ -84,6 +84,22 @@
                                 android:layout_marginStart="15dp"
                                 android:text="@string/no_text" />
 
+                            <com.google.android.material.chip.Chip
+                                style="@style/Widget.MaterialComponents.Chip.Choice"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="20dp"
+                                android:clickable="false"
+                                android:text="@string/pin" />
+
+                            <TextView
+                                android:id="@+id/pinText"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginEnd="15dp"
+                                android:text="@string/crypted" />
+
                         </LinearLayout>
 
                     </LinearLayout>
@@ -121,7 +137,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:layout_marginTop="40dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginEnd="20dp"
                 app:boxCornerRadiusBottomEnd="15dp"
                 app:boxCornerRadiusBottomStart="15dp"

app/src/main/res/values-ru/strings.xml

@@ -158,4 +158,5 @@
     <string name="set_pin_helper">Вам необходимо ввести 4 цифры</string>
     <string name="mail_description">Если вы забудете пароль, он будет отправлен на вашу электронную почту</string>
     <string name="slowloading">Включение шифрования замедляет загрузку списка паролей</string>
+    <string name="pin">PIN</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -173,4 +173,5 @@
     <string name="set_pin_helper">You should input 4 numbers</string>
     <string name="mail_description">If you forget your password, it will be sent to your email</string>
     <string name="slowloading">Enabling encryption slows down the loading of the password list</string>
+    <string name="pin">PIN</string>
 </resources>