From 17d265eab0b1bb320f79c497daa2f4904506e43e Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 16 Jan 2024 14:17:17 +0800 Subject: [PATCH] [mobile] revert scale setting --- app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../tv/ui/fragment/SettingPlayerFragment.java | 15 +++++++++-- .../res/layout/fragment_setting_player.xml | 27 +++++++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2ee255e8c..22c1adebc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -81,6 +81,7 @@ 播放核心 渲染方式 + 缩放比例 字幕样式 字幕大小 弹幕速度 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c3c9962ec..afb750012 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -81,6 +81,7 @@ 播放核心 渲染方式 + 縮放比例 字幕樣式 字幕大小 彈幕速度 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 65c921ea9..dea04a735 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,6 +81,7 @@ Player Render + Scale Caption style Subtitle size Danmu speed diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java index f25fa1f15..acba0aa90 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java @@ -37,6 +37,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B private String[] caption; private String[] player; private String[] render; + private String[] scale; private String[] http; private String[] flag; @@ -65,6 +66,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2))); mBinding.flagText.setText((flag = ResUtil.getStringArray(R.array.select_flag))[Setting.getFlag()]); mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]); + mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]); mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]); mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]); @@ -77,6 +79,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.ua.setOnClickListener(this::onUa); mBinding.http.setOnClickListener(this::setHttp); mBinding.flag.setOnClickListener(this::setFlag); + mBinding.scale.setOnClickListener(this::onScale); mBinding.buffer.setOnClickListener(this::onBuffer); mBinding.player.setOnClickListener(this::setPlayer); mBinding.render.setOnClickListener(this::setRender); @@ -87,7 +90,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.danmuSize.setOnClickListener(this::onDanmuSize); mBinding.danmuLine.setOnClickListener(this::onDanmuLine); mBinding.danmuSpeed.setOnClickListener(this::onDanmuSpeed); - mBinding.background.setOnClickListener(this::setBackground); + mBinding.background.setOnClickListener(this::onBackground); } private void setVisible() { @@ -120,6 +123,14 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.flagText.setText(flag[index]); } + private void onScale(View view) { + new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(scale, Setting.getScale(), (dialog, which) -> { + mBinding.scaleText.setText(scale[which]); + Setting.putScale(which); + dialog.dismiss(); + }).show(); + } + private void onBuffer(View view) { BufferDialog.create(this).show(); } @@ -195,7 +206,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B }).show(); } - private void setBackground(View view) { + private void onBackground(View view) { new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_background).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(background, Setting.getBackground(), (dialog, which) -> { mBinding.backgroundText.setText(background[which]); Setting.putBackground(which); diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml index 857afd6b9..afa0873f8 100644 --- a/app/src/mobile/res/layout/fragment_setting_player.xml +++ b/app/src/mobile/res/layout/fragment_setting_player.xml @@ -98,6 +98,33 @@ + + + + + + + +