From 4fcf39659133c0c35709b69d9284feda33de0130 Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Tue, 18 Jul 2023 22:35:17 +0200
Subject: [PATCH] bug fix + white filler button

---
 .../cloudstream3/ui/result/EpisodeAdapter.kt        |  8 +++++---
 .../cloudstream3/ui/result/ResultFragmentPhone.kt   |  9 ---------
 .../cloudstream3/ui/result/ResultFragmentTv.kt      |  8 --------
 app/src/main/res/layout/result_episode.xml          |  2 +-
 app/src/main/res/layout/result_episode_large.xml    |  3 ++-
 app/src/main/res/layout/result_episode_large_tv.xml |  2 +-
 app/src/main/res/layout/result_episode_tv.xml       |  2 +-
 app/src/main/res/values/styles.xml                  | 13 +++++++++++++
 8 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 14a2a2a5..d6e8273f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -159,9 +159,11 @@ class EpisodeAdapter(
         fun bind(card: ResultEpisode) {
             localCard = card
 
-            binding.episodeLinHolder.layoutParams.apply {
-                width = if(isTvSettings()) ViewGroup.LayoutParams.WRAP_CONTENT else ViewGroup.LayoutParams.MATCH_PARENT
-            }
+            val setWidth = if(isTvSettings()) ViewGroup.LayoutParams.WRAP_CONTENT else ViewGroup.LayoutParams.MATCH_PARENT
+
+            binding.episodeLinHolder.layoutParams.width = setWidth
+            binding.episodeHolderLarge.layoutParams.width = setWidth
+            binding.episodeHolder.layoutParams.width = setWidth
 
             val isTrueTv = isTrueTvSettings()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 1dc7b69d..04fb2614 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -53,11 +53,9 @@ import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
@@ -70,13 +68,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.download_button.result_download_movie
-import kotlinx.android.synthetic.main.fragment_result.download_button
-import kotlinx.android.synthetic.main.fragment_result.result_episode_loading
-import kotlinx.android.synthetic.main.fragment_result.result_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_play_movie
-import kotlinx.android.synthetic.main.fragment_result_tv.temporary_no_focus
-import kotlinx.coroutines.delay
 
 
 open class ResultFragmentPhone : ResultFragment(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index ce7b6850..66090642 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -22,13 +21,11 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -39,11 +36,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.fragment_result.download_button
-import kotlinx.android.synthetic.main.fragment_result.result_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_play_movie
-import kotlinx.android.synthetic.main.fragment_result_tv.temporary_no_focus
 import kotlinx.coroutines.delay
 
 class ResultFragmentTv : ResultFragment() {
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index ac437268..80ff4bec 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -67,7 +67,7 @@
         <!--marquee_forever-->
         <com.google.android.material.button.MaterialButton
             android:id="@+id/episode_filler"
-            style="@style/SmallBlackButton"
+            style="@style/SmallWhiteButton"
             android:layout_gravity="center"
             android:text="@string/filler" />
 
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index c8319356..75292965 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -14,6 +14,7 @@
     app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <LinearLayout
+        android:id="@+id/episode_holder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
@@ -77,7 +78,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/episode_filler"
-                        style="@style/SmallBlackButton"
+                        style="@style/SmallWhiteButton"
                         android:layout_gravity="start"
                         android:layout_marginEnd="10dp"
                         android:text="@string/filler" />
diff --git a/app/src/main/res/layout/result_episode_large_tv.xml b/app/src/main/res/layout/result_episode_large_tv.xml
index debfc01a..5a9dee30 100644
--- a/app/src/main/res/layout/result_episode_large_tv.xml
+++ b/app/src/main/res/layout/result_episode_large_tv.xml
@@ -73,7 +73,7 @@
 
                     <com.google.android.material.button.MaterialButton
                             android:layout_gravity="start"
-                            style="@style/SmallBlackButton"
+                            style="@style/SmallWhiteButton"
                             android:layout_marginEnd="10dp"
                             android:text="@string/filler"
                             android:id="@+id/episode_filler" />
diff --git a/app/src/main/res/layout/result_episode_tv.xml b/app/src/main/res/layout/result_episode_tv.xml
index 418eb43a..53590b6b 100644
--- a/app/src/main/res/layout/result_episode_tv.xml
+++ b/app/src/main/res/layout/result_episode_tv.xml
@@ -37,7 +37,7 @@
                 tools:visibility="visible"
                 android:gravity="center"
                 android:layout_gravity="center"
-                style="@style/SmallBlackButton"
+                style="@style/SmallWhiteButton"
                 android:text="@string/filler"
                 android:id="@+id/episode_filler" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8c7a94e9..c029eb8a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -606,6 +606,19 @@
         <item name="android:minWidth">0dp</item>
     </style>
 
+    <style name="SmallWhiteButton" parent="WhiteButton">
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="iconPadding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:minWidth">0dp</item>
+    </style>
+
     <style name="RoundedSelectableButtonIcon" parent="RoundedSelectableButton">
         <item name="minWidth">0dp</item>
         <item name="iconTint">?attr/textColor</item>