From 7455b443c733c267f3c2a75dcb661528801eec76 Mon Sep 17 00:00:00 2001
From: AdiAr11 <aditya2000arora@gmail.com>
Date: Sun, 17 Oct 2021 22:58:58 +0530
Subject: [PATCH] Settings UI updated

---
 app/src/main/res/drawable/ic_about_us.xml     |  9 +++
 .../main/res/drawable/ic_settings_slack.xml   |  9 +++
 .../main/res/drawable/ic_settings_support.xml | 10 +++
 .../main/res/drawable/ic_settings_theme.xml   | 14 ++++
 app/src/main/res/layout/fragment_settings.xml | 65 ++++++++-----------
 5 files changed, 70 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_about_us.xml
 create mode 100644 app/src/main/res/drawable/ic_settings_slack.xml
 create mode 100644 app/src/main/res/drawable/ic_settings_support.xml
 create mode 100644 app/src/main/res/drawable/ic_settings_theme.xml

diff --git a/app/src/main/res/drawable/ic_about_us.xml b/app/src/main/res/drawable/ic_about_us.xml
new file mode 100644
index 0000000..8d88583
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_us.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1000dp"
+    android:height="1000dp"
+    android:viewportWidth="1000"
+    android:viewportHeight="1000">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M500,990C229.4,990 10,770.6 10,500C10,229.4 229.4,10 500,10c270.6,0 490,219.4 490,490C990,770.6 770.6,990 500,990zM500,80C268,80 80,268 80,500c0,232 188,420 420,420c232,0 420,-188 420,-420C920,268 732,80 500,80zM453.3,406.7h93.3v350h-93.3V406.7zM453.3,243.3h93.3v93.3h-93.3V243.3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_slack.xml b/app/src/main/res/drawable/ic_settings_slack.xml
new file mode 100644
index 0000000..669f8b5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_slack.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M31,24c-2.757,0 -5,-2.243 -5,-5V7c0,-2.757 2.243,-5 5,-5s5,2.243 5,5v12C36,21.757 33.757,24 31,24zM43,24h-4c-0.553,0 -1,-0.447 -1,-1v-4c0,-2.757 2.243,-5 5,-5s5,2.243 5,5S45.757,24 43,24zM19,24H7c-2.757,0 -5,-2.243 -5,-5s2.243,-5 5,-5h12c2.757,0 5,2.243 5,5S21.757,24 19,24zM23,12h-4c-2.757,0 -5,-2.243 -5,-5s2.243,-5 5,-5 5,2.243 5,5v4C24,11.553 23.553,12 23,12zM19,48c-2.757,0 -5,-2.243 -5,-5V31c0,-2.757 2.243,-5 5,-5s5,2.243 5,5v12C24,45.757 21.757,48 19,48zM7,36c-2.757,0 -5,-2.243 -5,-5s2.243,-5 5,-5h4c0.553,0 1,0.447 1,1v4C12,33.757 9.757,36 7,36zM43,36H31c-2.757,0 -5,-2.243 -5,-5s2.243,-5 5,-5h12c2.757,0 5,2.243 5,5S45.757,36 43,36zM31,48c-2.757,0 -5,-2.243 -5,-5v-4c0,-0.553 0.447,-1 1,-1h4c2.757,0 5,2.243 5,5S33.757,48 31,48z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_support.xml b/app/src/main/res/drawable/ic_settings_support.xml
new file mode 100644
index 0000000..c8784ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_support.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,0C229.12,0 0,229.12 0,512C0,738.56 146.56,929.92 350.08,997.76C375.68,1002.24 385.28,986.88 385.28,973.44C385.28,961.28 384.64,920.96 384.64,878.08C256,901.76 222.72,846.72 212.48,817.92C206.72,803.2 181.76,757.76 160,745.6C142.08,736 116.48,712.32 159.36,711.68C199.68,711.04 228.48,748.8 238.08,764.16C284.16,841.6 357.76,819.84 387.2,806.4C391.68,773.12 405.12,750.72 419.84,737.92C305.92,725.12 186.88,680.96 186.88,485.12C186.88,429.44 206.72,383.36 239.36,347.52C234.24,334.72 216.32,282.24 244.48,211.84C244.48,211.84 287.36,198.4 385.28,264.32C426.24,252.8 469.76,247.04 513.28,247.04C556.8,247.04 600.32,252.8 641.28,264.32C739.2,197.76 782.08,211.84 782.08,211.84C810.24,282.24 792.32,334.72 787.2,347.52C819.84,383.36 839.68,428.8 839.68,485.12C839.68,681.6 720,725.12 606.08,737.92C624.64,753.92 640.64,784.64 640.64,832.64C640.64,901.12 640,956.16 640,973.44C640,986.88 649.6,1002.88 675.2,997.76C877.44,929.92 1024,737.92 1024,512C1024,229.12 794.88,0 512,0Z"
+      android:fillColor="#1B1F23"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_theme.xml b/app/src/main/res/drawable/ic_settings_theme.xml
new file mode 100644
index 0000000..ea4e3a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_theme.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M241,8.9c-12.5,4 -15.5,6.3 -40.5,31.2l-24.1,23.9 -32.1,-0c-19.5,-0 -34.3,0.4 -37.5,1.1 -19.6,4 -36.7,20.7 -41.3,40 -1.1,5 -1.5,13.4 -1.5,38.9l0,32.4 -23.9,24.1c-25.1,25.3 -27.7,28.6 -31.5,41.4 -2.1,7.1 -2.1,21.1 0,28.2 3.8,12.8 6.4,16.1 31.5,41.4l23.9,24.1 0,32.4c0,36.1 0.6,40.6 6.2,51.4 4.8,9 14.7,18.5 23.8,22.8 4.1,2 9.9,4.1 12.8,4.7 3.2,0.7 18,1.1 37.5,1.1l32.1,-0 24.1,23.9c25.3,25.1 28.6,27.7 41.4,31.5 7.1,2.1 21.1,2.1 28.2,-0 12.8,-3.8 16.1,-6.4 41.4,-31.5l24.1,-23.9 32.4,-0c35.9,-0 40.2,-0.5 51.2,-6.1 13,-6.6 24.7,-22 27.7,-36.7 0.7,-3.2 1.1,-18 1.1,-37.5l0,-32.1 23.9,-24.1c25.1,-25.3 27.7,-28.6 31.5,-41.4 2.1,-7.1 2.1,-21.1 0,-28.2 -3.8,-12.8 -6.4,-16.1 -31.5,-41.4l-23.9,-24.1 0,-32.1c0,-19.5 -0.4,-34.3 -1.1,-37.5 -3,-14.7 -14.7,-30.1 -27.7,-36.7 -11,-5.6 -15.3,-6.1 -51.2,-6.1l-32.4,-0 -24.1,-23.9c-25.3,-25.1 -28.6,-27.7 -41.4,-31.5 -7.4,-2.2 -21.9,-2 -29.1,0.3zM269.6,31c3.6,1.7 11.7,9.1 30.7,27.9l25.8,25.6 37.7,0.5 37.7,0.5 5.5,2.6c8,3.7 12.5,8.1 16.2,15.7l3.3,6.7 0.5,37.7 0.5,37.7 25.6,25.8c29.7,29.9 30.4,31 30.4,44.3 0,13.3 -0.7,14.4 -30.4,44.3l-25.6,25.8 -0.5,37.7 -0.5,37.7 -2.6,5.5c-3.7,8 -8.1,12.5 -15.7,16.2l-6.7,3.3 -37.7,0.5 -37.7,0.5 -25.8,25.6c-29.9,29.7 -31,30.4 -44.3,30.4 -13.3,-0 -14.4,-0.7 -44.3,-30.4l-25.8,-25.6 -37.7,-0.5 -37.7,-0.5 -6.7,-3.3c-7.6,-3.7 -12,-8.2 -15.7,-16.2l-2.6,-5.5 -0.5,-37.7 -0.5,-37.7 -25.6,-25.8c-29.7,-29.9 -30.4,-31 -30.4,-44.3 0,-13.3 0.7,-14.4 30.4,-44.3l25.6,-25.8 0.5,-37.7 0.5,-37.7 3.3,-6.7c3.7,-7.6 8.2,-12 16.2,-15.7l5.5,-2.6 37.7,-0.5 37.8,-0.5 24.7,-24.6c26.1,-25.9 28.9,-28.3 35.6,-30.5 6.2,-2 17.3,-1.2 23.3,1.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M242,128.6c-20.7,2.6 -40.7,10.1 -58,21.7 -9.6,6.4 -27.3,24.1 -33.7,33.7 -9.5,14.2 -16.3,30.2 -19.9,47 -2.6,11.9 -2.6,38.1 0,50 5.6,25.9 16.7,46.2 35.5,65.1 18.5,18.6 39.3,29.9 65.1,35.5 11.4,2.5 39,2.5 50,-0 20.9,-4.7 28,-8.8 28,-16.5 0,-5.4 -2.3,-7.8 -11.7,-12.1 -32.1,-14.9 -54.9,-44 -60.8,-77.7 -8.5,-48.8 15.9,-95.5 60.8,-116.3 9.4,-4.3 11.7,-6.7 11.7,-12.1 0,-7.7 -7.5,-12.1 -28,-16.5 -7.3,-1.5 -32,-2.7 -39,-1.8zM263.7,149.6l5.1,0.7 -7.1,5.7c-43.6,34.9 -59.6,93 -40.1,145.5 7.7,20.6 22,40.1 40.1,54.5l7.2,5.8 -7.2,0.6c-14.8,1.4 -34.8,-2.5 -50.3,-9.8 -23.6,-11.2 -40.8,-28.3 -51.9,-51.9 -16.2,-34.3 -12.7,-74.1 9.4,-106 6.1,-8.8 18.1,-20.7 27,-26.6 19.9,-13.5 47.3,-20.9 67.8,-18.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 16ba4e0..e816fd1 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -40,8 +40,7 @@
                 android:layout_height="56dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:foreground="?selectableItemBackground"
-                android:background="@color/secondary_background">
+                android:foreground="?selectableItemBackground">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -49,19 +48,17 @@
                     android:text="@string/change_theme"
                     android:fontFamily="sans-serif-medium"
                     android:textSize="16sp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
+                    android:layout_marginStart="70dp"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
                 <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:src="@drawable/ic_baseline_arrow_forward_ios_24"
-                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_width="25dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:src="@drawable/ic_settings_theme"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
@@ -71,8 +68,7 @@
                 android:id="@+id/about_settings"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                android:background="@color/secondary_background"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="5dp"
                 android:foreground="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true">
@@ -83,19 +79,18 @@
                     android:fontFamily="sans-serif-medium"
                     android:text="About"
                     android:textSize="16sp"
-                    android:layout_marginStart="15dp"
+                    android:layout_marginStart="70dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:src="@drawable/ic_baseline_arrow_forward_ios_24"
-                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_width="25dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:src="@drawable/ic_about_us"
                     app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -104,8 +99,7 @@
                 android:id="@+id/support_us_settings"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                android:background="@color/secondary_background"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="5dp"
                 android:foreground="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true">
@@ -116,18 +110,17 @@
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/support_us"
                     android:textSize="16sp"
-                    android:layout_marginStart="15dp"
+                    android:layout_marginStart="70dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:src="@drawable/ic_baseline_arrow_forward_ios_24"
-                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_width="25dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:src="@drawable/ic_settings_support"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
@@ -137,8 +130,7 @@
                 android:id="@+id/talk_to_us_settings"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                android:background="@color/secondary_background"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="5dp"
                 android:foreground="?selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true">
@@ -149,18 +141,17 @@
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/talk_to_us"
                     android:textSize="16sp"
-                    android:layout_marginStart="15dp"
+                    android:layout_marginStart="70dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="16dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:src="@drawable/ic_baseline_arrow_forward_ios_24"
-                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_width="25dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:src="@drawable/ic_settings_slack"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"/>