Settings activity toolbar and display name editing refactoring.

2025-10-19 03:22:34 +00:00 · 2020-08-20 17:48:41 +10:00
parent 37a3ae9c32
commit 6aaa2dbabd
7 changed files with 131 additions and 124 deletions
--- a/res/drawable/ic_qr_code.xml
+++ b/res/drawable/ic_qr_code.xml
@@ -2,14 +2,15 @@
    android:width="25dp"
    android:height="25dp"
    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:viewportHeight="25"
+    android:tint="?attr/colorControlNormal">
  <group>
    <clip-path android:pathData="M7.81,7.81H1.56V1.56h6.25V7.81zM9.38,0H0v9.38h9.38V0z M 0,0"/>
    <group>
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-5,-5h19.38v19.38h-19.38z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -18,7 +19,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-1.88,-1.88h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -27,7 +28,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-5,10.62h19.38v19.38h-19.38z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -36,7 +37,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-1.88,13.75h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -45,7 +46,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M10.62,-5h19.38v19.38h-19.38z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -54,7 +55,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M13.75,-1.88h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -63,7 +64,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-5,5.94h14.69v13.12h-14.69z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -72,7 +73,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M5.94,9.06h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -81,7 +82,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M-0.31,5.94h13.12v11.56h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -90,7 +91,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M5.94,13.75h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -99,7 +100,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M2.81,5.94h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -108,7 +109,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M7.5,1.25h11.56v13.12h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -117,7 +118,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M7.5,5.94h14.69v13.12h-14.69z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -126,7 +127,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M5.94,4.38h11.56v11.56h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -135,7 +136,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M9.06,16.88h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -144,7 +145,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M5.94,16.88h11.56v13.12h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -153,7 +154,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M9.06,12.19h11.56v11.56h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -162,7 +163,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M5.94,-5h13.12v16.25h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -171,7 +172,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M13.75,16.88h11.56v13.12h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -180,7 +181,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M13.75,13.75h13.12v11.56h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -189,7 +190,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M12.19,15.31h11.56v11.56h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -198,7 +199,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M10.62,13.75h11.56v11.56h-11.56z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -207,7 +208,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M16.88,10.62h13.12v13.12h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -216,7 +217,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M16.88,15.31h13.12v14.69h-13.12z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -225,7 +226,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M10.62,9.06h14.69v13.12h-14.69z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
  <group>
@@ -234,7 +235,7 @@
      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
      <path
          android:pathData="M13.75,5.94h16.25v13.12h-16.25z"
-          android:fillColor="#FFFFFF"/>
+          android:fillColor="@android:color/white"/>
    </group>
  </group>
 </vector>
--- a/res/drawable/icon_qr_code.xml
+++ b/res/drawable/icon_qr_code.xml
@@ -1,9 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="512"
-    android:viewportWidth="448" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="448"
+    android:viewportHeight="512">
    <group
        android:scaleX="0.88"
        android:scaleY="0.88"
        android:translateX="64">
-        <path android:fillColor="?attr/pref_icon_tint" android:pathData="M0,224h192L192,32L0,32v192zM64,96h64v64L64,160L64,96zM256,32v192h192L448,32L256,32zM384,160h-64L320,96h64v64zM0,480h192L192,288L0,288v192zM64,352h64v64L64,416v-64zM416,288h32v128h-96v-32h-32v96h-64L256,288h96v32h64v-32zM416,448h32v32h-32v-32zM352,448h32v32h-32v-32z"/>
+        <path
+            android:fillColor="?attr/pref_icon_tint"
+            android:pathData="M0,224h192L192,32L0,32v192zM64,96h64v64L64,160L64,96zM256,32v192h192L448,32L256,32zM384,160h-64L320,96h64v64zM0,480h192L192,288L0,288v192zM64,352h64v64L64,416v-64zM416,288h32v128h-96v-32h-32v96h-64L256,288h96v32h64v-32zM416,448h32v32h-32v-32zM352,448h32v32h-32v-32z"/>
    </group>
 </vector>
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -20,59 +20,6 @@
            android:orientation="vertical"
            android:gravity="center_horizontal">

-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:minHeight="?attr/actionBarSize"
-                app:contentInsetLeft="20dp"
-                app:contentInsetRight="20dp"
-                android:theme="?attr/actionBarStyle">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/cancelButton"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_close_white_24dp"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/titleTextView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/activity_settings_title"
-                        android:textColor="@color/text"
-                        android:textSize="@dimen/very_large_font_size"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1" />
-
-                    <ImageView
-                        android:id="@+id/saveButton"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_check_white_24dp"
-                        android:visibility="gone" />
-
-                    <ImageView
-                        android:id="@+id/showQRCodeButton"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_qr_code" />
-
-                </LinearLayout>
-
-            </androidx.appcompat.widget.Toolbar>
-
            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                android:id="@+id/profilePictureView"
                android:layout_width="@dimen/large_profile_picture_size"
--- a/res/menu/menu_apply.xml
+++ b/res/menu/menu_apply.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <item
--- a/res/menu/settings_general.xml
+++ b/res/menu/settings_general.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_qr_code"
+        android:title=""
+        android:icon="@drawable/ic_qr_code"
+        app:showAsAction="always" />
+
+</menu>