diff --git a/app/src/leanback/res/layout/dialog_subtitle.xml b/app/src/leanback/res/layout/dialog_subtitle.xml index aa2b42c7c..fa01a0147 100644 --- a/app/src/leanback/res/layout/dialog_subtitle.xml +++ b/app/src/leanback/res/layout/dialog_subtitle.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="8dp"> + android:padding="16dp"> @@ -20,6 +21,7 @@ android:layout_height="wrap_content" android:background="@drawable/selector_subtitle" android:focusable="true" + android:focusableInTouchMode="true" android:padding="8dp" android:src="@drawable/ic_subtitle_small" /> @@ -29,6 +31,7 @@ android:layout_height="wrap_content" android:background="@drawable/selector_subtitle" android:focusable="true" + android:focusableInTouchMode="true" android:padding="8dp" android:src="@drawable/ic_subtitle_up" /> @@ -38,6 +41,7 @@ android:layout_height="wrap_content" android:background="@drawable/selector_subtitle" android:focusable="true" + android:focusableInTouchMode="true" android:padding="8dp" android:src="@drawable/ic_subtitle_down" /> @@ -47,6 +51,7 @@ android:layout_height="wrap_content" android:background="@drawable/selector_subtitle" android:focusable="true" + android:focusableInTouchMode="true" android:padding="8dp" android:src="@drawable/ic_subtitle_reset" /> 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 0761d1a26..f0978be76 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,7 @@ 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.getSubtitlePosition() != 0) exo.getSubtitleView().setBottomPosition(Setting.getSubtitlePosition()); if (Setting.getSubtitleTextSize() != 0) exo.getSubtitleView().setFractionalTextSize(Setting.getSubtitleTextSize()); } 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 612386586..2c19baaea 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.subPosition(ResUtil.dp2px(4)); - Setting.putSubtitlePosition(subtitleView.getTranslationY()); + subtitleView.addPosition(0.005f); + Setting.putSubtitlePosition(subtitleView.getPosition()); } private void onDown(View view) { - subtitleView.addPosition(ResUtil.dp2px(4)); - Setting.putSubtitlePosition(subtitleView.getTranslationY()); + subtitleView.subPosition(0.005f); + Setting.putSubtitlePosition(subtitleView.getPosition()); } private void onLarge(View view) { @@ -91,7 +91,7 @@ public final class SubtitleDialog extends BaseDialog { private void onReset(View view) { Setting.putSubtitleTextSize(0.0f); Setting.putSubtitlePosition(0.0f); - subtitleView.setTranslationY(0.0f); + subtitleView.setBottomPosition(0.0f); subtitleView.setUserDefaultTextSize(); } @@ -99,6 +99,6 @@ public final class SubtitleDialog extends BaseDialog { public void onResume() { super.onResume(); if (full) setDimAmount(0.5f); - getDialog().getWindow().setLayout(ResUtil.dp2px(216), -1); + getDialog().getWindow().setLayout(ResUtil.dp2px(full ? 232 : 216), -1); } } \ No newline at end of file diff --git a/catvod/src/main/java/com/github/catvod/utils/Prefers.java b/catvod/src/main/java/com/github/catvod/utils/Prefers.java index 8ece6d38f..4700c4b1d 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Prefers.java +++ b/catvod/src/main/java/com/github/catvod/utils/Prefers.java @@ -18,7 +18,7 @@ import java.util.Map; public class Prefers { - private static final List floats = Arrays.asList("speed"); + private static final List floats = Arrays.asList("speed", "subtitle_position", "subtitle_text_size"); private static SharedPreferences getPrefers() { return PreferenceManager.getDefaultSharedPreferences(Init.context());