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 6dda726f0..f9bbf74bb 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -257,12 +257,12 @@ public class Setting { Prefers.put("subtitle_text_size", value); } - public static float getSubtitleBottomPadding() { - return Prefers.getFloat("subtitle_bottom_padding"); + public static float getSubtitlePosition() { + return Prefers.getFloat("subtitle_position"); } - public static void putSubtitleBottomPadding(float value) { - Prefers.put("subtitle_bottom_padding", value); + public static void putSubtitlePosition(float value) { + Prefers.put("subtitle_position", 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 e24d756fe..135689ab1 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 @@ -94,8 +94,8 @@ public class ExoUtil { exo.getSubtitleView().setStyle(getCaptionStyle()); exo.getSubtitleView().setApplyEmbeddedFontSizes(false); exo.getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption()); + if (Setting.getSubtitlePosition() != 0) exo.getSubtitleView().setTranslationY(Setting.getSubtitlePosition()); 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 0cc1ccf8d..612386586 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 @@ -69,13 +69,13 @@ public final class SubtitleDialog extends BaseDialog { } private void onUp(View view) { - subtitleView.addBottomPadding(0.005f); - Setting.putSubtitleBottomPadding(subtitleView.getBottomPadding()); + subtitleView.subPosition(ResUtil.dp2px(4)); + Setting.putSubtitlePosition(subtitleView.getTranslationY()); } private void onDown(View view) { - subtitleView.subBottomPadding(0.005f); - Setting.putSubtitleBottomPadding(subtitleView.getBottomPadding()); + subtitleView.addPosition(ResUtil.dp2px(4)); + Setting.putSubtitlePosition(subtitleView.getTranslationY()); } private void onLarge(View view) { @@ -89,10 +89,10 @@ public final class SubtitleDialog extends BaseDialog { } private void onReset(View view) { - Setting.putSubtitleTextSize(0); - Setting.putSubtitleBottomPadding(0); + Setting.putSubtitleTextSize(0.0f); + Setting.putSubtitlePosition(0.0f); + subtitleView.setTranslationY(0.0f); subtitleView.setUserDefaultTextSize(); - subtitleView.setBottomPaddingFraction(SubtitleView.DEFAULT_BOTTOM_PADDING_FRACTION); } @Override