From 4f6035dc49bce68f34731bfd5a2f6d9d3e9d5020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Sat, 6 Jun 2020 12:59:36 +0200
Subject: [PATCH] Add lockscreen overhaul

---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../aegis/ui/AuthActivity.java                |  34 ++++-
 .../res/drawable/button_rounded_corners.xml   |  11 ++
 app/src/main/res/drawable/ic_aegis_iconx.png  | Bin 0 -> 19843 bytes
 app/src/main/res/layout/activity_auth.xml     | 125 +++++++++++-------
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/strings.xml           |   5 +
 app/src/main/res/values/styles.xml            |  46 ++++++-
 9 files changed, 174 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_rounded_corners.xml
 create mode 100644 app/src/main/res/drawable/ic_aegis_iconx.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce16d47d..9cf0aeff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,8 @@
         <activity
             android:name=".ui.IntroActivity"
             android:theme="@style/Theme.Intro" />
-        <activity android:name=".ui.AuthActivity" />
+        <activity android:name=".ui.AuthActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.PreferencesActivity"
             android:label="@string/title_activity_preferences" />
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
index fb4c3c1a..475c4a96 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
@@ -2,6 +2,7 @@ package com.beemdevelopment.aegis.ui;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -14,6 +15,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -24,6 +26,7 @@ import com.beemdevelopment.aegis.AegisApplication;
 import com.beemdevelopment.aegis.CancelAction;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
 import com.beemdevelopment.aegis.crypto.MasterKey;
@@ -68,7 +71,7 @@ public class AuthActivity extends AegisActivity {
         _textPassword = findViewById(R.id.text_password);
         LinearLayout boxBiometricInfo = findViewById(R.id.box_biometric_info);
         Button decryptButton = findViewById(R.id.button_decrypt);
-        Button biometricsButton = findViewById(R.id.button_biometrics);
+        TextView biometricsButton = findViewById(R.id.button_biometrics);
 
         _textPassword.setOnEditorActionListener((v, actionId, event) -> {
             if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
@@ -126,6 +129,7 @@ public class AuthActivity extends AegisActivity {
             // display a help message if a matching invalidated keystore entry was found
             if (invalidated) {
                 boxBiometricInfo.setVisibility(View.VISIBLE);
+                biometricsButton.setVisibility(View.GONE);
             }
         }
 
@@ -144,6 +148,34 @@ public class AuthActivity extends AegisActivity {
         });
     }
 
+    @Override
+    protected void setPreferredTheme(Theme theme) {
+        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
+            // set the theme based on the system theme
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    theme = Theme.LIGHT;
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
+                    break;
+            }
+        }
+
+        switch (theme) {
+            case LIGHT:
+                setTheme(R.style.AppTheme_Light_NoActionBar);
+                break;
+            case DARK:
+                setTheme(R.style.AppTheme_Dark_NoActionBar);
+                break;
+            case AMOLED:
+                setTheme(R.style.AppTheme_TrueBlack_NoActionBar);
+                break;
+        }
+    }
+
     private void selectPassword() {
         _textPassword.selectAll();
 
diff --git a/app/src/main/res/drawable/button_rounded_corners.xml b/app/src/main/res/drawable/button_rounded_corners.xml
new file mode 100644
index 00000000..20b385ab
--- /dev/null
+++ b/app/src/main/res/drawable/button_rounded_corners.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/auth_button"/>
+            <stroke android:color="@color/auth_button" android:width="1dp" />
+            <!--corners allow us to make the rounded corners button-->
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_aegis_iconx.png b/app/src/main/res/drawable/ic_aegis_iconx.png
new file mode 100644
index 0000000000000000000000000000000000000000..4924a55d0800eb4540db607714e6ba119764e36d
GIT binary patch
literal 19843
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%0A`6avddvN
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
index e9a7745e..b725c792 100644
--- a/app/src/main/res/layout/activity_auth.xml
+++ b/app/src/main/res/layout/activity_auth.xml
@@ -7,37 +7,44 @@
     android:fitsSystemWindows="true"
     android:background="?attr/background"
     tools:context="com.beemdevelopment.aegis.ui.AuthActivity">
+
     <LinearLayout
-        android:orientation="vertical"
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        tools:layout_editor_absoluteY="8dp"
-        tools:layout_editor_absoluteX="8dp">
+        android:layout_height="match_parent"
+        android:layout_margin="48dp"
+        android:orientation="vertical"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="8dp">
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="20dp"
+            app:srcCompat="@drawable/ic_aegis_iconx" />
+
         <TextView
-            android:text="@string/authentication"
-            android:textColor="?attr/primaryText"
+            android:id="@+id/textView2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="24sp"
-            android:id="@+id/textView2" />
+            android:fontFamily="sans-serif-light"
+            android:singleLine="false"
+            android:text="@string/authentication_multiline"
+            android:textColor="?attr/authText"
+            android:textFontWeight="500"
+            android:textSize="46sp" />
+
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="12dp">
-
-            <TextView
-                android:id="@+id/textView4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/authentication_enter_password"
-                android:textColor="?attr/secondaryText" />
+            android:layout_marginTop="12dp"
+            android:orientation="vertical">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:paddingBottom="25dp"
                 app:hintEnabled="false"
                 app:passwordToggleEnabled="true"
                 app:passwordToggleTint="#949494">
@@ -46,48 +53,72 @@
                     android:id="@+id/text_password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textPassword" />
+                    android:hint="@string/password"
+                    android:inputType="textPassword"
+                    android:textColor="?attr/primaryText"
+                    android:textColorHint="?attr/authText"
+                    app:backgroundTint="?attr/authText" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingBottom="25dp">
+
                 <Button
                     android:id="@+id/button_decrypt"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:minWidth="125dp"
-                    android:text="@string/unlock" />
-                <Button
-                    android:id="@+id/button_biometrics"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@drawable/button_rounded_corners"
                     android:minWidth="125dp"
-                    android:text="@string/biometrics"
-                    android:visibility="gone" />
-            </LinearLayout>
-
-        </LinearLayout>
+                    android:text="@string/unlock"
+                    android:textColor="@color/primary_text_inverted"
+                    android:textStyle="bold" />
 
-        <LinearLayout
-            android:id="@+id/box_biometric_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="12dp"
-            android:visibility="gone">
+            </LinearLayout>
 
-            <ImageView
+            <TextView
+                android:id="@+id/button_biometrics"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_info_outline_black_24dp"
-                android:layout_marginEnd="15dp"/>
+                android:layout_gravity="center"
+                android:minWidth="125dp"
+                android:text="@string/auth_use_biometrics"
+                android:textColor="?attr/authText"
+                android:visibility="gone" />
 
-            <TextView
+            <LinearLayout
+                android:id="@+id/box_biometric_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/invalidated_biometrics"/>
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_info_outline_black_24dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/invalidated_biometrics" />
+            </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:textStyle="bold"
+        android:textAllCaps="true"
+        android:text="@string/app_name_full"
+        android:paddingBottom="50dp"
+        android:textColor="@color/divider" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 9ff655eb..77341174 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,6 +2,7 @@
 <resources>
     <attr name="primaryText" format="color" />
     <attr name="secondaryText" format="color" />
+    <attr name="authText" format="color" />
     <attr name="backgroundColor" format="color" />
     <attr name="cardBackground" format="color" />
     <attr name="cardBackgroundFocused" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7ee8c818..0ac0043f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,8 @@
     <color name="colorAccentPressed">#FF5252</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#A0A0A0</color>
+    <color name="auth_text">#4c4c4c</color>
+    <color name="auth_button">#0d86c1</color>
     <color name="icon_about">#757575</color>
     <color name="extra_info_text">#8e8e8e</color>
     <color name="primary_text_inverted">#ffffff</color>
@@ -34,6 +36,7 @@
     <color name="hint_text_dark">#a7a7a7</color>
     <color name="secondary_text_dark">#FF5252</color>
     <color name="background_dark">#212121</color>
+    <color name="background_dark_statusbar">#101010</color>
     <color name="background_true_dark">#000000</color>
 
     <color name="warning_color">#f4511e</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8cd4f826..1609241b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,6 +72,11 @@
     <string name="authentication_method_set_password">Password</string>
     <string name="authentication_enter_password">Enter your password</string>
     <string name="authentication">Unlock the vault</string>
+
+    <!-- The newline (\n) on the following line is just for aesthetic purposes !-->
+    <string name="authentication_multiline">Unlock\nthe vault</string>
+
+    <string name="auth_use_biometrics">Or tap here to use <font fgcolor='#FF0D86C1'>biometrics</font></string>
     <string name="set_password">Please enter a password</string>
     <string name="set_group">Please enter a group name</string>
     <string name="set_number">Please enter a number</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d094a5f0..87a315a8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,6 +41,47 @@
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
     </style>
 
+    <style name="AppTheme.Light.NoActionBar" parent="AppTheme">
+        <item name="android:statusBarColor">@color/background</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="primaryText">@color/primary_text</item>
+        <item name="background">@color/card_background</item>
+        <item name="authText">@color/auth_text</item>
+
+        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@color/background</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="o_mr1">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="AppTheme.Dark.NoActionBar" parent="AppTheme">
+        <item name="android:statusBarColor">@color/background_dark_statusbar</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="primaryText">@color/primary_text_dark</item>
+        <item name="background">@color/background_dark</item>
+        <item name="authText">@color/primary_text_inverted</item>
+
+        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@color/background_dark</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="AppTheme.TrueBlack.NoActionBar" parent="AppTheme">
+        <item name="android:statusBarColor">@color/background_true_dark</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="primaryText">@color/primary_text_dark</item>
+        <item name="background">@color/background_true_dark</item>
+        <item name="authText">@color/primary_text_inverted</item>
+
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/background_true_dark</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+
+    </style>
+
     <style name="ActionModeStyle" parent="@style/Widget.AppCompat.Light.ActionMode.Inverse">
         <item name="background">@color/colorPrimary</item>
         <item name="titleTextStyle">@style/ActionModeTitleTextStyle</item>
@@ -125,11 +166,6 @@
         <item name="android:windowBackground">@color/background_true_dark</item>
     </style>
 
-    <style name="AppTheme.Dark.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
     <style name="AppTheme.Dark.TransparentActionBar">
         <item name="android:actionBarStyle">@style/ThemeActionBar</item>
         <item name="android:windowActionBarOverlay">true</item>