From 70c87b4067ce7d14fb5ee149851f294e24faaa66 Mon Sep 17 00:00:00 2001
From: Sadwhy <99601717+Sadwhy@users.noreply.github.com>
Date: Fri, 23 Feb 2024 09:32:46 +0600
Subject: [PATCH] A few ui changes (#204)

---
 .../main/res/layout/activity_extensions.xml   | 58 ++++++++++---------
 app/src/main/res/layout/fragment_login.xml    | 33 ++++++-----
 app/src/main/res/layout/item_extension.xml    | 10 ++--
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/app/src/main/res/layout/activity_extensions.xml b/app/src/main/res/layout/activity_extensions.xml
index c5f884b184..dcb67be60e 100644
--- a/app/src/main/res/layout/activity_extensions.xml
+++ b/app/src/main/res/layout/activity_extensions.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".settings.SettingsActivity">
 
     <LinearLayout
@@ -80,6 +81,20 @@
             app:tabPaddingStart="16dp"
             app:tabTextAppearance="@style/NavBarText" />
 
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <FrameLayout
+            android:id="@+id/fragmentExtensionsContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom"
+            android:layout_weight="1"
+            android:visibility="gone"></FrameLayout>
+
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/searchView"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -87,7 +102,7 @@
             android:layout_height="56dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
+            android:layout_gravity="bottom"
             android:transitionName="@string/search"
             app:boxBackgroundColor="@color/bg"
             app:boxBackgroundMode="outline"
@@ -98,34 +113,21 @@
             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"
+         <AutoCompleteTextView
+            android:id="@+id/searchViewText"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <FrameLayout
-            android:id="@+id/fragmentExtensionsContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:visibility="gone"></FrameLayout>
-
+            android:layout_gravity="bottom"
+            android:fontFamily="@font/poppins_bold"
+            android:imeOptions="actionSearch"
+            android:inputType="textPersonName"
+            android:hint="@string/search"
+            android:padding="8dp"
+            android:selectAllOnFocus="true"
+            android:textSize="14sp"
+            tools:ignore="LabelFor,TextContrastCheck" />
+        </com.google.android.material.textfield.TextInputLayout>
+        
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index c5007c36bf..ea6bed1137 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -50,20 +50,6 @@
             app:icon="@drawable/ic_anilist"
             app:iconTint="?attr/colorOnPrimaryContainer" />
 
-        <Button
-            android:id="@+id/importSettingsButton"
-            android:layout_width="156dp"
-            android:layout_height="64dp"
-            android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginBottom="32dp"
-            android:backgroundTint="?attr/colorPrimary"
-            android:fontFamily="@font/poppins_bold"
-            android:text="@string/import_settings"
-            android:textColor="?attr/colorOnPrimary"
-            app:cornerRadius="16dp"
-            app:icon="@drawable/ic_download_24"
-            app:iconTint="?attr/colorOnPrimary" />
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -103,6 +89,25 @@
                 tools:ignore="ContentDescription" />
 
         </LinearLayout>
+        
+        <LinearLayout
+              	android:layout_width="match_parent"
+              	android:layout_height="wrap_content"
+              	android:orientation="horizontal"
+              	android:padding="8dp"
+              	android:gravity="center">
+
+      	<TextView
+            		android:id="@+id/importSettingsButton"
+            		android:clickable="true"
+            		android:layout_width="wrap_content"
+            		android:layout_height="wrap_content"
+            		android:text="@string/import_settings_underline"
+            		android:textSize="11sp"
+            		android:textColor="?attr/colorOutline"
+            		android:fontFamily="@font/poppins_bold"/>
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_extension.xml b/app/src/main/res/layout/item_extension.xml
index 04db22a6a4..3c00a8695d 100644
--- a/app/src/main/res/layout/item_extension.xml
+++ b/app/src/main/res/layout/item_extension.xml
@@ -50,22 +50,22 @@
     </LinearLayout>
 
     <ImageView
-        android:id="@+id/settingsImageView"
+        android:id="@+id/closeTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="10dp"
         android:layout_weight="0"
-        android:src="@drawable/ic_round_dots_vertical_24"
+        android:src="@drawable/ic_round_delete_24"
         app:tint="?attr/colorOnBackground" />
 
     <ImageView
-        android:id="@+id/closeTextView"
+        android:id="@+id/settingsImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:layout_marginEnd="10dp"
         android:layout_weight="0"
-        android:src="@drawable/ic_round_delete_24"
+        android:src="@drawable/ic_round_dots_vertical_24"
         app:tint="?attr/colorOnBackground" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ffc52999fb..da14a6e5f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -657,6 +657,7 @@
     <string name="pinned_sources">Pinned Sources</string>
     <string name="import_export_settings">Import/Export Settings</string>
     <string name="import_settings">Import Settings</string>
+    <string name="import_settings_underline"><u>Import Settings</u></string>
     <string name="try_internal_cast_experimental">Try Internal Cast (Experimental)</string>
 
     <string name="comments">Comments</string>