From 24d059970f26ff0e29326f8a432d6bbdc679bf35 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 3 Sep 2024 00:57:44 +0800
Subject: [PATCH] Keep bottom padding

---
 app/src/main/java/com/fongmi/android/tv/Setting.java | 12 ++++++++++--
 .../com/fongmi/android/tv/player/exo/ExoUtil.java    |  3 ++-
 .../fongmi/android/tv/ui/dialog/SubtitleDialog.java  |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java
index 326f0a36c..4ce770c44 100644
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@@ -261,8 +261,16 @@ public class Setting {
         return Prefers.getFloat("subtitle_text_size");
     }
 
-    public static void putSubtitleTextSize(float size) {
-        Prefers.put("subtitle_text_size", size);
+    public static void putSubtitleTextSize(float value) {
+        Prefers.put("subtitle_text_size", value);
+    }
+
+    public static float getSubtitleBottomPadding() {
+        return Prefers.getFloat("subtitle_bottom_padding");
+    }
+
+    public static void putSubtitleBottomPadding(float value) {
+        Prefers.put("subtitle_bottom_padding", value);
     }
 
     public static float getThumbnail() {
diff --git a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
index 1465cb202..fb5ef2c08 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
@@ -90,7 +90,8 @@ public class ExoUtil {
         exo.getSubtitleView().setStyle(getCaptionStyle());
         exo.getSubtitleView().setApplyEmbeddedFontSizes(false);
         exo.getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
-        if (Setting.getSubtitleTextSize() > 0) exo.getSubtitleView().setFractionalTextSize(Setting.getSubtitleTextSize());
+        if (Setting.getSubtitleTextSize() != 0) exo.getSubtitleView().setFractionalTextSize(Setting.getSubtitleTextSize());
+        if (Setting.getSubtitleBottomPadding() != 0) exo.getSubtitleView().setBottomPaddingFraction(Setting.getSubtitleBottomPadding());
     }
 
     public static String getMimeType(String path) {
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java
index fe23b7631..00ae6a97b 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java
@@ -51,10 +51,12 @@ public final class SubtitleDialog extends BaseDialog {
 
     private void onUp(View view) {
         subtitleView.addBottomPadding(0.005f);
+        Setting.putSubtitleBottomPadding(subtitleView.getBottomPadding());
     }
 
     private void onDown(View view) {
         subtitleView.subBottomPadding(0.005f);
+        Setting.putSubtitleBottomPadding(subtitleView.getBottomPadding());
     }
 
     private void onLarge(View view) {
@@ -69,6 +71,7 @@ public final class SubtitleDialog extends BaseDialog {
 
     private void onReset(View view) {
         Setting.putSubtitleTextSize(0);
+        Setting.putSubtitleBottomPadding(0);
         subtitleView.setUserDefaultTextSize();
         subtitleView.setBottomPaddingFraction(SubtitleView.DEFAULT_BOTTOM_PADDING_FRACTION);
     }