From d2118b976c783df29b907f7d61e8a1342fb8e921 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 19 Mar 2023 17:36:21 +0800
Subject: [PATCH] [mobile] episode more - part 3

---
 .../tv/ui/custom/dialog/EpisodeDialog.java       |  4 ++--
 .../mobile/res/drawable/shape_bottom_sheet.xml   |  4 ----
 app/src/mobile/res/layout/dialog_episode.xml     | 11 +++++------
 app/src/mobile/res/layout/dialog_filter.xml      |  4 ++++
 app/src/mobile/res/layout/dialog_track.xml       |  6 ++++--
 app/src/mobile/res/layout/fragment_episode.xml   | 16 ++++++----------
 6 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeDialog.java
index e4627741f..0c50c5866 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeDialog.java
@@ -57,8 +57,8 @@ public class EpisodeDialog extends BaseDialog {
     }
 
     private void setTitles() {
-        if (reverse) for (int i = episodes.size() + 1; i > 0; i -= 50) titles.add((i - 1) + "-" + Math.max(i - 50, 1));
-        else for (int i = 0; i < episodes.size(); i += 50) titles.add((i + 1) + "-" + Math.min(i + 50, episodes.size()));
+        if (reverse) for (int i = episodes.size() + 1; i > 0; i -= 50) titles.add((i - 1) + " - " + Math.max(i - 50, 1));
+        else for (int i = 0; i < episodes.size(); i += 50) titles.add((i + 1) + " - " + Math.min(i + 50, episodes.size()));
     }
 
     @Override
diff --git a/app/src/mobile/res/drawable/shape_bottom_sheet.xml b/app/src/mobile/res/drawable/shape_bottom_sheet.xml
index 9e7396996..f95f9d322 100644
--- a/app/src/mobile/res/drawable/shape_bottom_sheet.xml
+++ b/app/src/mobile/res/drawable/shape_bottom_sheet.xml
@@ -8,8 +8,4 @@
         android:topLeftRadius="12dp"
         android:topRightRadius="12dp" />
 
-    <padding
-        android:bottom="8dp"
-        android:top="8dp" />
-
 </shape>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_episode.xml b/app/src/mobile/res/layout/dialog_episode.xml
index df2bafbf0..b7966c471 100644
--- a/app/src/mobile/res/layout/dialog_episode.xml
+++ b/app/src/mobile/res/layout/dialog_episode.xml
@@ -2,17 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
         android:text="@string/detail_episode"
         android:textColor="@color/black"
         android:textSize="16sp" />
@@ -21,6 +19,7 @@
         android:id="@+id/tabs"
         android:layout_width="match_parent"
         android:layout_height="32dp"
+        android:layout_marginTop="8dp"
         android:background="@color/transparent"
         app:tabIndicatorAnimationMode="elastic"
         app:tabIndicatorColor="@color/accent"
@@ -33,6 +32,6 @@
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_filter.xml b/app/src/mobile/res/layout/dialog_filter.xml
index 8943daeda..140fe8d4b 100644
--- a/app/src/mobile/res/layout/dialog_filter.xml
+++ b/app/src/mobile/res/layout/dialog_filter.xml
@@ -4,4 +4,8 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_track.xml b/app/src/mobile/res/layout/dialog_track.xml
index 6e721c1d4..066566203 100644
--- a/app/src/mobile/res/layout/dialog_track.xml
+++ b/app/src/mobile/res/layout/dialog_track.xml
@@ -4,9 +4,11 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
     android:paddingStart="12dp"
-    android:paddingTop="8dp"
+    android:paddingTop="16dp"
     android:paddingEnd="12dp"
-    android:paddingBottom="8dp"
+    android:paddingBottom="16dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="212dp" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/fragment_episode.xml b/app/src/mobile/res/layout/fragment_episode.xml
index db793303e..ee93038f5 100644
--- a/app/src/mobile/res/layout/fragment_episode.xml
+++ b/app/src/mobile/res/layout/fragment_episode.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="12dp" />
-
-</FrameLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="12dp" />