diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index c8f29bf76..b9d59f043 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -369,7 +369,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List @Override public void onSubtitleClick() { App.post(this::hideControl, 200); - App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).end(true).show(this), 200); } @Override diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 786ff7cba..1d3a760f7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -641,7 +641,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onSubtitleClick() { App.post(this::hideControl, 200); - App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).end(true).show(this), 200); } @Override diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index adc7055b6..96bb53ec4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1015,7 +1015,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Override public void onSubtitleClick() { App.post(this::hideControl, 200); - App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).end(isFullscreen()).show(this), 200); } @Override 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 00ae6a97b..e6bb5f9e6 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 @@ -1,5 +1,6 @@ package com.fongmi.android.tv.ui.dialog; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,6 +21,7 @@ public final class SubtitleDialog extends BaseDialog { private DialogSubtitleBinding binding; private SubtitleView subtitleView; + private boolean end; public static SubtitleDialog create() { return new SubtitleDialog(); @@ -30,6 +32,11 @@ public final class SubtitleDialog extends BaseDialog { return this; } + public SubtitleDialog end(boolean end) { + this.end = end; + return this; + } + public void show(FragmentActivity activity) { for (Fragment f : activity.getSupportFragmentManager().getFragments()) if (f instanceof BottomSheetDialogFragment) return; show(activity.getSupportFragmentManager(), null); @@ -79,6 +86,7 @@ public final class SubtitleDialog extends BaseDialog { @Override public void onResume() { super.onResume(); + if (end) getDialog().getWindow().setGravity(Gravity.END); getDialog().getWindow().setLayout(ResUtil.dp2px(216), -1); } } \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index e9585168d..f731e849f 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -689,7 +689,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onSubtitleClick() { App.post(this::hideControl, 200); - App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).end(true).show(this), 200); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index dae51bd43..c5f162eee 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1031,7 +1031,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onSubtitleClick() { App.post(this::hideControl, 200); - App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).end(isFullscreen()).show(this), 200); } @Override