From 99887534327c86bcc653dfbc84a24917d34b0fe5 Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Thu, 2 Feb 2023 01:15:24 +0100
Subject: [PATCH] Library and Light mode improvements.

---
 .../lagradost/cloudstream3/ui/library/LibraryFragment.kt    | 4 +++-
 .../com/lagradost/cloudstream3/ui/result/ResultFragment.kt  | 1 +
 app/src/main/res/layout/fragment_library.xml                | 6 +++---
 app/src/main/res/layout/search_result_grid_expanded.xml     | 2 +-
 app/src/main/res/values/styles.xml                          | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index 1c6af447..d7c06c4e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -333,8 +333,10 @@ class LibraryFragment : Fragment() {
                     handler.postDelayed(stopLoading, 300)
 
                     savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
+                        if (currentPos < 0) return@let
                         viewpager?.setCurrentItem(currentPos, false)
-                        savedInstanceState.remove(VIEWPAGER_ITEM_KEY)
+                        // Using remove() sets the key to 0 instead of removing it
+                        savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
                     }
 
                     // Since the animation to scroll multiple items is so much its better to just hide
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 2e2e46b7..68dd1c0e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -974,6 +974,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                             chip.isCheckable = false
                             chip.isFocusable = false
                             chip.isClickable = false
+                            chip.setTextColor(context.colorFromAttribute(R.attr.textColor))
                             addView(chip)
                         }
                     }
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index f9012148..985d055d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -166,12 +166,12 @@
         app:layout_scrollFlags="noScroll"
         app:tabGravity="center"
         app:tabIndicator="@drawable/indicator_background"
-        app:tabIndicatorColor="@color/textColor"
+        app:tabIndicatorColor="?attr/white"
         app:tabIndicatorGravity="center"
         app:tabIndicatorHeight="30dp"
         app:tabMode="scrollable"
-        app:tabSelectedTextColor="@color/lightTextColor"
+        app:tabSelectedTextColor="?attr/primaryBlackBackground"
         app:tabTextAppearance="@style/TabNoCaps"
-        app:tabTextColor="@color/textColor" />
+        app:tabTextColor="?attr/textColor" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index 47fd7cd3..cf6ab3b2 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -23,7 +23,7 @@
             android:elevation="10dp"
             app:cardBackgroundColor="?attr/primaryGrayBackground"
             app:cardCornerRadius="@dimen/rounded_image_radius"
-            app:layout_constraintDimensionRatio="1:1.414"
+            app:layout_constraintDimensionRatio="1:1.5"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2540bf34..78c62c69 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -100,6 +100,7 @@
     <style name="ChipParent">
         <item name="chipSpacingVertical">5dp</item>
         <item name="chipSpacingHorizontal">5dp</item>
+        <item name="textColor">?attr/textColor</item>
     </style>
 
     <style name="AmoledMode">