From 17e53a54af710a3a0d57690d1692be94d0a5c0f1 Mon Sep 17 00:00:00 2001
From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com>
Date: Tue, 5 Dec 2023 21:04:06 -0600
Subject: [PATCH] Aayush stuffs

---
 .../main/res/color/chip_background_color.xml  |  8 +++
 app/src/main/res/color/chip_text_color.xml    |  4 +-
 app/src/main/res/layout/activity_settings.xml | 54 ++++++++++---------
 app/src/main/res/layout/item_chip.xml         |  2 +-
 app/src/main/res/values-night/colors.xml      |  2 +-
 app/src/main/res/values/colors.xml            |  2 +-
 6 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/color/chip_background_color.xml

diff --git a/app/src/main/res/color/chip_background_color.xml b/app/src/main/res/color/chip_background_color.xml
new file mode 100644
index 00000000..b0838002
--- /dev/null
+++ b/app/src/main/res/color/chip_background_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Color when the chip is selected -->
+    <item android:color="@color/chip" android:state_selected="true"/>
+
+    <!-- Color when the chip is not selected -->
+    <item android:color="?attr/colorSurface"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/chip_text_color.xml b/app/src/main/res/color/chip_text_color.xml
index c9f34f3a..fbe928c3 100644
--- a/app/src/main/res/color/chip_text_color.xml
+++ b/app/src/main/res/color/chip_text_color.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Color when the chip is selected -->
-    <item android:color="#ffffff" android:state_selected="true"/>
+    <item android:color="?attr/colorSurface" android:state_selected="true"/>
     <!-- Color when the chip is not selected -->
-    <item android:color="#aaadab"/>
+    <item android:color="#858585"/>
 </selector>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 9e4d5f51..7d53c87e 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -341,6 +341,25 @@
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
                     tools:ignore="TextContrastCheck" />
 
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/settingsIncognito"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:drawableStart="@drawable/ic_incognito_24"
+                    android:drawablePadding="16dp"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/poppins_bold"
+                    android:minHeight="64dp"
+                    android:text="@string/incognito_mode"
+                    android:textAlignment="viewStart"
+                    android:textColor="?attr/colorOnBackground"
+                    android:layout_marginStart="4dp"
+                    app:cornerRadius="0dp"
+                    app:drawableTint="?attr/colorPrimary"
+                    app:showText="false"
+                    app:thumbTint="@color/button_switch_track" />
+
                 <LinearLayout
                     android:id="@+id/settingsAnilistLoginContainer"
                     android:layout_width="match_parent"
@@ -353,6 +372,7 @@
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="20dp"
                         android:contentDescription="@string/anilist"
+                        app:tint="?attr/colorPrimary"
                         app:srcCompat="@drawable/ic_anilist" />
 
                     <LinearLayout
@@ -371,7 +391,8 @@
                             android:fontFamily="@font/poppins_bold"
                             android:gravity="center"
                             android:text="@string/username"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            android:textColor="?attr/colorSecondary"/>
 
                         <TextView
                             android:id="@+id/settingsAnilistLogin"
@@ -383,7 +404,6 @@
                             android:fontFamily="@font/poppins_bold"
                             android:padding="16dp"
                             android:text="@string/logout"
-                            android:textColor="?attr/colorSecondary"
                             android:textSize="14sp" />
 
                     </LinearLayout>
@@ -419,6 +439,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="16dp"
                         android:contentDescription="@string/myanimelist"
+                        app:tint="?attr/colorPrimary"
                         app:srcCompat="@drawable/ic_myanimelist" />
 
                     <LinearLayout
@@ -447,7 +468,8 @@
                             android:fontFamily="@font/poppins_bold"
                             android:gravity="center"
                             android:text="@string/username"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            android:textColor="?attr/colorSecondary"/>
 
                         <TextView
                             android:id="@+id/settingsMALLogin"
@@ -459,7 +481,6 @@
                             android:fontFamily="@font/poppins_bold"
                             android:padding="16dp"
                             android:text="@string/logout"
-                            android:textColor="?attr/colorSecondary"
                             android:textSize="14sp" />
 
                     </LinearLayout>
@@ -495,7 +516,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginEnd="16dp"
                         android:src="@drawable/ic_discord"
-                        app:tint="?attr/colorOnBackground"
+                        app:tint="?attr/colorPrimary"
                         tools:ignore="ContentDescription" />
 
                     <LinearLayout
@@ -515,7 +536,8 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:text="@string/username"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            android:textColor="?attr/colorSecondary"/>
 
                         <TextView
                             android:id="@+id/settingsDiscordLogin"
@@ -527,7 +549,6 @@
                             android:fontFamily="@font/poppins_bold"
                             android:padding="16dp"
                             android:text="@string/logout"
-                            android:textColor="?attr/colorSecondary"
                             android:textSize="14sp" />
 
                     </LinearLayout>
@@ -573,25 +594,6 @@
                     app:drawableStartCompat="@drawable/ic_round_help_24"
                     app:drawableTint="?attr/colorPrimary" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/settingsIncognito"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:checked="false"
-                    android:drawableStart="@drawable/ic_incognito_24"
-                    android:drawablePadding="16dp"
-                    android:elegantTextHeight="true"
-                    android:fontFamily="@font/poppins_bold"
-                    android:minHeight="64dp"
-                    android:text="@string/incognito_mode"
-                    android:textAlignment="viewStart"
-                    android:textColor="?attr/colorOnBackground"
-                    app:cornerRadius="0dp"
-                    app:drawableTint="?attr/colorPrimary"
-                    app:showText="false"
-                    app:thumbTint="@color/button_switch_track" />
-
-
             </ani.dantotsu.others.Xpandable>
 
             <ani.dantotsu.others.Xpandable
diff --git a/app/src/main/res/layout/item_chip.xml b/app/src/main/res/layout/item_chip.xml
index 265c5c7e..e10fe96f 100644
--- a/app/src/main/res/layout/item_chip.xml
+++ b/app/src/main/res/layout/item_chip.xml
@@ -7,7 +7,7 @@
     android:layout_marginTop="-4dp"
     android:layout_marginEnd="4dp"
     android:layout_marginBottom="-4dp"
-    app:chipBackgroundColor="@color/bg_black"
+    app:chipBackgroundColor="@color/chip_background_color"
     android:elegantTextHeight="true"
     android:textAppearance="@style/Suffix"
     app:chipStrokeColor="?attr/colorPrimaryContainer"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d0c07b09..107e9568 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,6 +10,6 @@
     <color name="status">#54000000</color>
     <color name="nav_status">#80000000</color>
     <color name="filler">#29FF6B08</color>
-
+    <color name="chip">#b3aead</color>
     <color name="grey_nav">#E8222222</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9e915feb..d513c5e1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,7 +22,7 @@
     <color name="grey_60">#999999</color>
     <color name="darkest_Black">#000000</color>
     <color name="yt_red">#CD201F</color>
-
+    <color name="chip">#a3a2a2</color>
     <color name="grey_nav">#E8EDEDED</color>
 
     <!-- theme 1 -->