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 b9d59f043..fa0857ce1 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()).end(true).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).full(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 1d3a760f7..e74f5784e 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()).end(true).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).full(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 96bb53ec4..8d620e746 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()).end(isFullscreen()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).full(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 e6bb5f9e6..3528e4772 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,6 +1,5 @@ package com.fongmi.android.tv.ui.dialog; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -21,7 +20,7 @@ public final class SubtitleDialog extends BaseDialog { private DialogSubtitleBinding binding; private SubtitleView subtitleView; - private boolean end; + private boolean full; public static SubtitleDialog create() { return new SubtitleDialog(); @@ -32,8 +31,8 @@ public final class SubtitleDialog extends BaseDialog { return this; } - public SubtitleDialog end(boolean end) { - this.end = end; + public SubtitleDialog full(boolean full) { + this.full = full; return this; } @@ -86,7 +85,6 @@ 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 f731e849f..0f9825ab8 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()).end(true).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).full(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 c5f162eee..3623e2bdb 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()).end(isFullscreen()).show(this), 200); + App.post(() -> SubtitleDialog.create().view(mBinding.exo.getSubtitleView()).full(isFullscreen()).show(this), 200); } @Override