From 2fc351f57a2a994f9f992743be521a2004c97ecd Mon Sep 17 00:00:00 2001
From: aayush262 <99584765+aayush2622@users.noreply.github.com>
Date: Mon, 13 Nov 2023 10:38:14 +0530
Subject: [PATCH] Fixed Mono icon not loading/Extension page customization
 (#44)

---
 .../dantotsu/settings/ExtensionsActivity.kt   |   6 -
 .../main/res/layout/activity_extensions.xml   | 111 +++++++++---------
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   1 +
 app/src/main/res/values-night/themes.xml      |   2 +-
 4 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
index a4f9a0d6..f6a765dc 100644
--- a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
@@ -92,12 +92,6 @@ class ExtensionsActivity : AppCompatActivity()  {
             bottomMargin = navBarHeight
         }
 
-        onBackPressedDispatcher.addCallback(this, restartMainActivity)
-
-        binding.settingsBack.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-
 
     }
 
diff --git a/app/src/main/res/layout/activity_extensions.xml b/app/src/main/res/layout/activity_extensions.xml
index fd0be2be..bdfc2e63 100644
--- a/app/src/main/res/layout/activity_extensions.xml
+++ b/app/src/main/res/layout/activity_extensions.xml
@@ -19,8 +19,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
+                android:layout_height="match_parent"
                 android:orientation="horizontal">
 
                 <androidx.cardview.widget.CardView
@@ -31,29 +30,23 @@
                     app:cardElevation="0dp"
                     >
 
-                    <ImageButton
-                        android:id="@+id/settingsBack"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
-                        android:background="@color/nav_bg_inv"
-                        android:padding="16dp"
-                        app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
-                        app:tint="?attr/colorOnBackground"
-                        tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
                 </androidx.cardview.widget.CardView>
 
                 <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:textAlignment="center"
-                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginEnd="32dp"
+                    android:fontFamily="@font/poppins_bold"
+                    android:gravity="center"
                     android:text="@string/extensions"
-                    android:textSize="28sp" />
+                    android:textColor="?attr/colorPrimary"
+                    android:textSize="16sp" />
 
                 <Space
-                    android:layout_width="80dp"
-                    android:layout_height="80dp" />
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"  />
 
             </LinearLayout>
 
@@ -65,49 +58,17 @@
                 tools:ignore="UseCompoundDrawables">
             </LinearLayout>
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/searchView"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="8dp"
-                android:transitionName="@string/search"
-                app:boxBackgroundColor="@color/bg"
-                app:boxBackgroundMode="outline"
-                app:boxCornerRadiusBottomEnd="28dp"
-                app:boxCornerRadiusBottomStart="28dp"
-                app:boxCornerRadiusTopEnd="28dp"
-                app:boxCornerRadiusTopStart="28dp"
-                app:endIconDrawable="@drawable/ic_round_search_24"
-                app:hintAnimationEnabled="true">
-
-                <AutoCompleteTextView
-                    android:id="@+id/searchViewText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/poppins_bold"
-                    android:imeOptions="actionSearch"
-                    android:inputType="textPersonName"
-                    android:selectAllOnFocus="true"
-                    android:padding="8dp"
-                    android:textSize="14sp"
-                    app:boxStrokeColor="@color/text_input_layout_stroke_color"
-                    tools:ignore="LabelFor,TextContrastCheck" />
-            </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
 
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabMode="fixed"
-            app:tabTextColor="?attr/colorOnBackground"
-            selectedTabIndicatorColor="?attr/colorPrimary"
-            app:tabIndicatorColor="?attr/colorPrimary"
+            android:layout_height="48dp"
+            app:tabContentStart="32dp"
+            app:tabMode="scrollable"
+            app:tabPaddingEnd="16dp"
+            app:tabPaddingStart="16dp"
+            app:tabTextAppearance="@style/NavBarText"
             app:tabGravity="fill">
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
@@ -124,9 +85,43 @@
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Available Manga"/>
+                android:text="Available Manga"
+                tools:ignore="HardcodedText" />
         </com.google.android.material.tabs.TabLayout>
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/searchView"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            android:transitionName="@string/search"
+            app:boxBackgroundColor="@color/bg"
+            app:boxBackgroundMode="outline"
+            app:boxCornerRadiusBottomEnd="28dp"
+            app:boxCornerRadiusBottomStart="28dp"
+            app:boxCornerRadiusTopEnd="28dp"
+            app:boxCornerRadiusTopStart="28dp"
+            app:endIconDrawable="@drawable/ic_round_search_24"
+            app:hintAnimationEnabled="true">
+
+            <AutoCompleteTextView
+                android:id="@+id/searchViewText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:fontFamily="@font/poppins_bold"
+                android:imeOptions="actionSearch"
+                android:inputType="textPersonName"
+                android:padding="8dp"
+                android:selectAllOnFocus="true"
+                android:textSize="14sp"
+
+                tools:ignore="LabelFor,TextContrastCheck" />
+        </com.google.android.material.textfield.TextInputLayout>
+
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index bbd3e021..636da759 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/mono"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index ac50a372..e810dfc0 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -226,7 +226,7 @@
         <item name="colorErrorContainer">@color/md_theme_dark_5_errorContainer</item>
         <item name="colorOnError">@color/md_theme_dark_5_onError</item>
         <item name="colorOnErrorContainer">@color/md_theme_dark_5_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_dark_5_background</item>
+        <item name="android:colorBackground">@color/md_1_theme_dark_background</item>
         <item name="colorOnBackground">@color/md_theme_dark_5_onBackground</item>
         <item name="colorSurface">@color/md_theme_dark_5_surface</item>
         <item name="colorOnSurface">@color/md_theme_dark_5_onSurface</item>