From 3571b68ee732a546d0eb8d8a384ce89bafb08129 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 24 Mar 2023 12:08:29 +0800 Subject: [PATCH] [mobile] update to Material3 - part 3 --- 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/SettingFragment.java | 19 ++++++++++++------- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 70bc677de..4d244239e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -132,6 +132,7 @@ + 特大 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 473607271..33fb9dbad 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -132,6 +132,7 @@ + 特大 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec070f09c..91a4fa0c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -137,6 +137,7 @@ Small Medium Large + Extra diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index 45518f481..28e7c1316 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -32,6 +32,7 @@ import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.Prefers; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.permissionx.guolindev.PermissionX; public class SettingFragment extends BaseFragment implements ConfigCallback, SiteCallback, LiveCallback { @@ -192,18 +193,22 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit } private void setScale() { - int index = Prefers.getScale(); String[] array = ResUtil.getStringArray(R.array.select_scale); - Prefers.putScale(index = index == array.length - 1 ? 0 : ++index); - mBinding.scaleText.setText(array[index]); + new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(array, Prefers.getScale(), (dialog, which) -> { + mBinding.scaleText.setText(array[which]); + Prefers.putScale(which); + dialog.dismiss(); + }).show(); } private void setSize() { - int index = Prefers.getSize(); String[] array = ResUtil.getStringArray(R.array.select_size); - Prefers.putSize(index = index == array.length - 1 ? 0 : ++index); - mBinding.sizeText.setText(array[index]); - RefreshEvent.size(); + new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_size).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(array, Prefers.getSize(), (dialog, which) -> { + mBinding.sizeText.setText(array[which]); + Prefers.putSize(which); + RefreshEvent.size(); + dialog.dismiss(); + }).show(); } private void setWallDefault() {