From fe3e3beb3c2dbe2415d3c6e3d6c582980ced3b3e Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Tue, 3 Sep 2024 00:05:45 +0200
Subject: [PATCH] Little improvement of welcome screen

---
 src/monocleschat/res/drawable/main_logo.xml   | 31 ++++++++++++++-----
 .../res/layout/activity_welcome.xml           | 23 +++++++-------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/monocleschat/res/drawable/main_logo.xml b/src/monocleschat/res/drawable/main_logo.xml
index 2bdd1648ae..8569c4ecda 100644
--- a/src/monocleschat/res/drawable/main_logo.xml
+++ b/src/monocleschat/res/drawable/main_logo.xml
@@ -1,9 +1,24 @@
-<vector android:height="54dp" android:viewportHeight="240.94"
-    android:viewportWidth="566.93" android:width="127.06159dp" xmlns:android="http://schemas.android.com/apk/res/android">
-  <path android:fillColor="#FFFFFF" android:pathData="M261.94,136.91a27.49,27.49 0,0 1,-10.84 2.21c-14.76,0 -26.77,-11.55 -26.77,-25.74s12,-25.74 26.77,-25.74a27.66,27.66 0,0 1,10.84 2.21V77.15a40.76,40.76 0,0 0,-10.84 -1.47c-21.63,0 -39.22,16.91 -39.22,37.7s17.59,37.7 39.22,37.7a40.76,40.76 0,0 0,10.84 -1.47Z"/>
-  <path android:fillColor="#FFFFFF" android:pathData="M322.18,80.71c-12.78,-8.1 -22.72,-4.85 -29.95,-1.11a22.8,22.8 0,0 0,-3.23 2V41.4H275.41V151.08h13.83V111.54c0,-7.19 3.27,-16.52 9.34,-19.65 6.42,-3.32 10.36,-3.2 16.19,0.5 5,3.18 8.38,12.42 8.38,19.06v39.63H337V111.45C337,100.84 331.9,86.87 322.18,80.71Z"/>
-  <path android:fillColor="#FFFFFF" android:pathData="M392.21,81.31c-18.32,-9.18 -34.54,-4.28 -39.55,-3.37V91.33C355.76,91 374,85.91 384.88,93c3.07,2 6,3.94 8.17,8.42 -15.07,0.19 -31.17,1.79 -38.77,12.23 0,0 -9.75,11.83 -2.25,26.62 5.82,11.48 28.15,15.76 44,3v7.83H409.9V112.84C408.91,96.65 402.42,86.44 392.21,81.31ZM361.74,129c0,-10.36 15.55,-17.72 34,-17.93a41.29,41.29 0,0 1,0.32 5.21v16.36C381.42,144.25 361.74,139.37 361.74,129Z"/>
-  <path android:fillColor="#FFFFFF" android:pathData="M466.33,90.11V76.25H439.44l0,-34.42H425.57v72.24c1,16.19 7.48,26.4 17.69,31.52a51.21,51.21 0,0 0,23 5.49V137.65c-5.43,0 -11.19,-0.82 -15.71,-3.76 -3.07,-2 -6,-3.94 -8.18,-8.42 0,0 -2.91,-5.6 -3,-18.76l0,-16.6Z"/>
-  <path android:fillColor="#FFFFFF" android:pathData="M164.64,55.85a54.79,54.79 0,0 0,-51.74 72.81l-5,10.27 -7,14.36a2.49,2.49 0,0 0,2.41 3.59l16,-1.09 13.12,-0.91a54.78,54.78 0,1 0,32.3 -99ZM164.64,155.2a44.56,44.56 0,1 1,44.56 -44.56A44.61,44.61 0,0 1,164.64 155.2Z"/>
-  <path android:fillColor="#FFFFFF" android:pathData="M193.24,97.53a11.31,11.31 0,1 0,-0.83 6v19.21a1.63,1.63 0,0 1,-0.85 1.44,14.75 14.75,0 0,1 -7.32,1.94c-4,-0.09 -7.8,-2.79 -9.26,-3.94a17,17 0,0 0,-2.51 -1.66,10.62 10.62,0 0,0 -3.26,-1.22c-1.41,-0.24 -3,-0.51 -4.61,0.93 -1.62,-1.44 -3.21,-1.17 -4.61,-0.93a10.57,10.57 0,0 0,-3.27 1.22,16.22 16.22,0 0,0 -2.51,1.66c-1.46,1.15 -5.28,3.85 -9.26,3.94a14.91,14.91 0,0 1,-7.44 -2,1.43 1.43,0 0,1 -0.73,-1.26L136.78,103.32a11.28,11.28 0,1 0,-0.74 -5.79,1.52 1.52,0 0,0 -1.12,2.42v23a3.08,3.08 0,0 0,0.44 1.6c1.22,2 5.69,8.56 12.35,8.93 0.61,0 1.19,0.06 1.75,0.06a20.06,20.06 0,0 0,9.35 -2.28,12.15 12.15,0 0,0 5.79,-5.81 12.08,12.08 0,0 0,5.78 5.81,20.25 20.25,0 0,0 11.11,2.22c6.7,-0.37 11.18,-7 12.39,-9a2.81,2.81 0,0 0,0.39 -1.44v-23a1.48,1.48 0,0 0,0.39 -1A1.53,1.53 0,0 0,193.24 97.53ZM190.11,99.05a8.05,8.05 0,1 1,-8.05 -8A8.07,8.07 0,0 1,190.11 99.05ZM147.22,91.05a8.06,8.06 0,1 1,-8.05 8A8.07,8.07 0,0 1,147.22 91Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="566.93dp"
+    android:height="240.94dp"
+    android:viewportWidth="566.93"
+    android:viewportHeight="240.94">
+  <path
+      android:pathData="M261.94,136.91a27.49,27.49 0,0 1,-10.84 2.21c-14.76,0 -26.77,-11.55 -26.77,-25.74s12,-25.74 26.77,-25.74a27.66,27.66 0,0 1,10.84 2.21V77.15a40.76,40.76 0,0 0,-10.84 -1.47c-21.63,0 -39.22,16.91 -39.22,37.7s17.59,37.7 39.22,37.7a40.76,40.76 0,0 0,10.84 -1.47Z"
+      android:fillColor="#010101"/>
+  <path
+      android:pathData="M322.18,80.71c-12.78,-8.1 -22.72,-4.85 -29.95,-1.11a22.8,22.8 0,0 0,-3.23 2V41.4H275.41V151.08h13.83V111.54c0,-7.19 3.27,-16.52 9.34,-19.65 6.42,-3.32 10.36,-3.2 16.19,0.5 5,3.18 8.38,12.42 8.38,19.06v39.63H337V111.45C337,100.84 331.9,86.87 322.18,80.71Z"
+      android:fillColor="#010101"/>
+  <path
+      android:pathData="M392.21,81.31c-18.32,-9.18 -34.54,-4.28 -39.55,-3.37V91.33C355.76,91 374,85.91 384.88,93c3.07,2 6,3.94 8.17,8.42 -15.07,0.19 -31.17,1.79 -38.77,12.23 0,0 -9.75,11.83 -2.25,26.62 5.82,11.48 28.15,15.76 44,3v7.83H409.9V112.84C408.91,96.65 402.42,86.44 392.21,81.31ZM361.74,129c0,-10.36 15.55,-17.72 34,-17.93a41.29,41.29 0,0 1,0.32 5.21v16.36C381.42,144.25 361.74,139.37 361.74,129Z"
+      android:fillColor="#010101"/>
+  <path
+      android:pathData="M466.33,90.11V76.25H439.44l0,-34.42H425.57v72.24c1,16.19 7.48,26.4 17.69,31.52a51.21,51.21 0,0 0,23 5.49V137.65c-5.43,0 -11.19,-0.82 -15.71,-3.76 -3.07,-2 -6,-3.94 -8.18,-8.42 0,0 -2.91,-5.6 -3,-18.76l0,-16.6Z"
+      android:fillColor="#010101"/>
+  <path
+      android:pathData="M164.64,55.85a54.79,54.79 0,0 0,-51.74 72.81l-5,10.27 -7,14.36a2.49,2.49 0,0 0,2.41 3.59l16,-1.09 13.12,-0.91a54.78,54.78 0,1 0,32.3 -99ZM164.64,155.2a44.56,44.56 0,1 1,44.56 -44.56A44.61,44.61 0,0 1,164.64 155.2Z"
+      android:fillColor="#7189c5"/>
+  <path
+      android:pathData="M193.24,97.53a11.31,11.31 0,1 0,-0.83 6v19.21a1.63,1.63 0,0 1,-0.85 1.44,14.75 14.75,0 0,1 -7.32,1.94c-4,-0.09 -7.8,-2.79 -9.26,-3.94a17,17 0,0 0,-2.51 -1.66,10.62 10.62,0 0,0 -3.26,-1.22c-1.41,-0.24 -3,-0.51 -4.61,0.93 -1.62,-1.44 -3.21,-1.17 -4.61,-0.93a10.57,10.57 0,0 0,-3.27 1.22,16.22 16.22,0 0,0 -2.51,1.66c-1.46,1.15 -5.28,3.85 -9.26,3.94a14.91,14.91 0,0 1,-7.44 -2,1.43 1.43,0 0,1 -0.73,-1.26L136.78,103.32a11.28,11.28 0,1 0,-0.74 -5.79,1.52 1.52,0 0,0 -1.12,2.42v23a3.08,3.08 0,0 0,0.44 1.6c1.22,2 5.69,8.56 12.35,8.93 0.61,0 1.19,0.06 1.75,0.06a20.06,20.06 0,0 0,9.35 -2.28,12.15 12.15,0 0,0 5.79,-5.81 12.08,12.08 0,0 0,5.78 5.81,20.25 20.25,0 0,0 11.11,2.22c6.7,-0.37 11.18,-7 12.39,-9a2.81,2.81 0,0 0,0.39 -1.44v-23a1.48,1.48 0,0 0,0.39 -1A1.53,1.53 0,0 0,193.24 97.53ZM190.11,99.05a8.05,8.05 0,1 1,-8.05 -8A8.07,8.07 0,0 1,190.11 99.05ZM147.22,91.05a8.06,8.06 0,1 1,-8.05 8A8.07,8.07 0,0 1,147.22 91Z"
+      android:fillColor="#3e5ea2"/>
 </vector>
diff --git a/src/monocleschat/res/layout/activity_welcome.xml b/src/monocleschat/res/layout/activity_welcome.xml
index 1b82d18f2f..9f6e657b00 100644
--- a/src/monocleschat/res/layout/activity_welcome.xml
+++ b/src/monocleschat/res/layout/activity_welcome.xml
@@ -222,49 +222,48 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/register_new_account"
-                        style="@style/Widget.Material3.Button.TextButton"
+                        style="@style/Widget.Material3.Button.TonalButton"
                         android:textAllCaps="false"
                         android:textSize="20sp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="10dp"
                         android:layout_gravity="center"
-                        android:fontFamily="@font/poppins"
                         android:text="@string/create_new_account" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/use_existing"
-                        style="@style/Widget.Material3.Button.TextButton"
+                        style="@style/Widget.Material3.Button.TonalButton"
                         android:textAllCaps="false"
                         android:textSize="20sp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="10dp"
                         android:layout_gravity="center"
-                        android:fontFamily="@font/poppins"
                         android:text="@string/i_already_have_an_account" />
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/use_snikket"
-                        style="@style/Widget.Material3.Button.TextButton"
+                        android:id="@+id/use_backup"
+                        style="@style/Widget.Material3.Button.TonalButton"
                         android:textAllCaps="false"
                         android:textSize="20sp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="20dp"
                         android:layout_gravity="center"
-                        android:fontFamily="@font/poppins"
-                        android:text="@string/i_am_snikket_user" />
+                        android:text="@string/restore_backup" />
+
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/use_backup"
-                        style="@style/Widget.Material3.Button.TextButton"
+                        android:id="@+id/use_snikket"
+                        style="@style/Widget.Material3.Button.TonalButton"
                         android:textAllCaps="false"
                         android:textSize="20sp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:fontFamily="@font/poppins"
-                        android:text="@string/restore_backup" />
+                        android:layout_marginBottom="10dp"
+                        android:text="@string/i_am_snikket_user" />
                 </LinearLayout>
             </LinearLayout>
         </ScrollView>