From e3252b57628c01dfd5ab4d95e0e77ee3e8edf4cb Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@protonmail.com>
Date: Tue, 13 Sep 2022 02:19:58 -0500
Subject: [PATCH] Settings screen UI update, and other changes

---
 .../fragment/settings/SettingsFragment.java   | 11 +--
 app/src/main/res/layout/fragment_home.xml     |  5 +-
 .../main/res/layout/fragment_onboarding.xml   |  2 +-
 app/src/main/res/layout/fragment_settings.xml | 70 +++++++++++++------
 .../layout/password_bottom_sheet_dialog.xml   |  2 +-
 .../layout/receive_bottom_sheet_dialog.xml    |  2 +-
 .../res/layout/send_bottom_sheet_dialog.xml   |  2 +-
 app/src/main/res/values/strings.xml           |  5 +-
 app/src/main/res/values/styles.xml            |  1 +
 9 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java
index c9a47d3..ec3c704 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java
@@ -40,20 +40,10 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mViewModel = new ViewModelProvider(this).get(SettingsViewModel.class);
-        Wallet wallet = WalletManager.getInstance().getWallet();
-
         Button displaySeedButton = view.findViewById(R.id.display_seed_button);
-        TextView walletInfoTextView = view.findViewById(R.id.wallet_info_textview);
         SwitchCompat nightModeSwitch = view.findViewById(R.id.day_night_switch);
         SwitchCompat torSwitch = view.findViewById(R.id.tor_switch);
 
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("Private view-key: " + wallet.getSecretViewKey()+"\n\n");
-        stringBuilder.append("Restore height: " + wallet.getRestoreHeight() + "\n\n");
-        stringBuilder.append("Wallet height: " + wallet.getBlockChainHeight() + "\n\n");
-        stringBuilder.append("Daemon height: " + BlockchainService.getInstance().getDaemonHeight() + "\n\n");
-        walletInfoTextView.setText(stringBuilder.toString());
-
         nightModeSwitch.setChecked(NightmodeHelper.getPreferredNightmode() == DayNightMode.NIGHT);
         nightModeSwitch.setOnCheckedChangeListener((compoundButton, b) -> {
             if(b) {
@@ -67,6 +57,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
         torSwitch.setOnCheckedChangeListener((compoundButton, b) -> {
             PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_TOR, b).apply();
 
+            // TODO display "Advanced" settings mode when enabled to configure specific proxy address and port
             String proxy = b ? "127.0.0.1:9050" : "";
             WalletManager.getInstance().setProxy(proxy);
             WalletManager.getInstance().getWallet().setProxy(proxy);
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 177cd22..6451bf2 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -41,7 +41,7 @@
         tools:text="+ 100.000000000000 confirming"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/balance_unlocked_textview" />
+        app:layout_constraintTop_toBottomOf="@id/settings_imageview" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/transaction_history_recyclerview"
@@ -107,6 +107,9 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_settings"
         android:layout_marginEnd="24dp"
+        android:padding="8dp"
+        android:minHeight="24dp"
+        android:minWidth="24dp"
         app:layout_constraintTop_toTopOf="@id/balance_unlocked_textview"
         app:layout_constraintBottom_toBottomOf="@id/balance_unlocked_textview"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
index 1c5792c..9cec94d 100644
--- a/app/src/main/res/layout/fragment_onboarding.xml
+++ b/app/src/main/res/layout/fragment_onboarding.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="@string/create_wallet"
         android:layout_marginBottom="32dp"
-        android:textSize="24sp"
+        android:textSize="32sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index e0aca46..661e81e 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -11,40 +11,58 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/settings"
-        android:layout_marginBottom="32dp"
-        android:textSize="24sp"
+        android:textSize="32sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/display_seed_button"/>
+        app:layout_constraintBottom_toTopOf="@id/wallet_settings_textview"/>
 
-    <ImageView
-        android:id="@+id/monero_logo_imageview"
-        android:layout_width="wrap_content"
+    <TextView
+        android:id="@+id/wallet_settings_textview"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_monero_qr"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="@string/wallet"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginTop="32dp"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@id/settings_textview"
+        app:layout_constraintBottom_toTopOf="@id/display_seed_button"/>
 
     <Button
         android:id="@+id/display_seed_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/display_recovery_phrase"
-        android:background="@drawable/button_bg"
         android:layout_marginTop="16dp"
+        android:background="@drawable/button_bg"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/settings_textview" />
+        app:layout_constraintBottom_toTopOf="@id/appearance_settings_textview"
+        app:layout_constraintTop_toBottomOf="@id/wallet_settings_textview" />
+
+    <TextView
+        android:id="@+id/appearance_settings_textview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/appearance"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginTop="32dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/display_seed_button"
+        app:layout_constraintBottom_toTopOf="@id/day_night_switch"/>
 
     <TextView
         android:id="@+id/day_night_textview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/night_mode"
+        android:textSize="16sp"
         app:layout_constraintTop_toTopOf="@id/day_night_switch"
         app:layout_constraintBottom_toBottomOf="@id/day_night_switch"
         app:layout_constraintStart_toStartOf="parent"
@@ -54,14 +72,30 @@
         android:id="@+id/day_night_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/display_seed_button"
+        android:layout_marginTop="16dp"
+        app:layout_constraintBottom_toTopOf="@id/network_settings_textview"
+        app:layout_constraintTop_toBottomOf="@id/appearance_settings_textview"
         app:layout_constraintEnd_toEndOf="parent"/>
 
+    <TextView
+        android:id="@+id/network_settings_textview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/network"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginTop="32dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/day_night_switch"
+        app:layout_constraintBottom_toTopOf="@id/tor_switch"/>
+
     <TextView
         android:id="@+id/tor_textview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/tor_switch_label"
+        android:textSize="16sp"
         app:layout_constraintTop_toTopOf="@id/tor_switch"
         app:layout_constraintBottom_toBottomOf="@id/tor_switch"
         app:layout_constraintStart_toStartOf="parent"
@@ -72,14 +106,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@id/day_night_switch"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-    <TextView
-        android:id="@+id/wallet_info_textview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/tor_switch"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/network_settings_textview"
         app:layout_constraintEnd_toEndOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/password_bottom_sheet_dialog.xml b/app/src/main/res/layout/password_bottom_sheet_dialog.xml
index 78857a2..07379f7 100644
--- a/app/src/main/res/layout/password_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/password_bottom_sheet_dialog.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:text="@string/enter_password"
             android:layout_marginBottom="32dp"
-            android:textSize="24sp"
+            android:textSize="32sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/receive_bottom_sheet_dialog.xml b/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
index 71f4997..14f58ec 100644
--- a/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:text="@string/recv_monero"
             android:layout_marginBottom="32dp"
-            android:textSize="24sp"
+            android:textSize="32sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/send_bottom_sheet_dialog.xml b/app/src/main/res/layout/send_bottom_sheet_dialog.xml
index 21c62e5..d267648 100644
--- a/app/src/main/res/layout/send_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/send_bottom_sheet_dialog.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:text="@string/send_monero"
             android:layout_marginBottom="32dp"
-            android:textSize="24sp"
+            android:textSize="32sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e47f173..340268f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -548,7 +548,7 @@
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="night_mode">Night mode</string>
     <string name="display_recovery_phrase">Display recovery phrase</string>
-    <string name="tor_switch_label">Enable Tor (requires Orbot or similar app)</string>
+    <string name="tor_switch_label">Enable proxy</string>
     <string name="connection_failed">Connection failed</string>
     <string name="address">87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw</string>
     <string name="amount">0.00</string>
@@ -573,4 +573,7 @@
     <string name="sent_tx">Sent transaction!</string>
     <string name="no_camera_permission">No camera permission</string>
     <string name="settings">Settings</string>
+    <string name="wallet">Wallet</string>
+    <string name="appearance">Appearance</string>
+    <string name="network">Network</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 989cb64..325aa38 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,6 +36,7 @@
         <item name="android:textColorPrimary">@color/oled_textColorPrimary</item>
         <item name="android:textColorSecondary">@color/oled_textColorSecondary</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialog_Rounded</item>
+        <item name="colorControlActivated">@color/oled_colorSecondary</item>
     </style>
 
     <!-- BottomSheet Dialog-->