From 567be370453e0ff43e215cb115cb8a0e14aa946e Mon Sep 17 00:00:00 2001 From: Felipe Erias Date: Tue, 20 Feb 2024 13:32:46 +0900 Subject: [PATCH] Display China license number in the Settings --- .../ui/widgets/settings/SettingsWidget.java | 26 +++++++++++++------ app/src/main/res/layout/settings.xml | 19 +++++++++++++- app/src/main/res/values/non_L10n.xml | 4 +++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/settings/SettingsWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/settings/SettingsWidget.java index 0cc866319e..ea5e1f94ca 100644 --- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/settings/SettingsWidget.java +++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/settings/SettingsWidget.java @@ -45,6 +45,7 @@ import com.igalia.wolvic.ui.widgets.dialogs.ClearUserDataDialogWidget; import com.igalia.wolvic.ui.widgets.dialogs.RestartDialogWidget; import com.igalia.wolvic.ui.widgets.dialogs.UIDialog; +import com.igalia.wolvic.utils.DeviceType; import com.igalia.wolvic.utils.RemoteProperties; import com.igalia.wolvic.utils.StringUtils; @@ -202,14 +203,23 @@ public void updateUI() { return view.performClick(); }); - mBinding.surveyLink.setOnClickListener(v -> { - if (mAudio != null) { - mAudio.playSound(AudioEngine.Sound.CLICK); - } - - mWidgetManager.openNewTabForeground(getResources().getString(R.string.survey_link)); - exitWholeSettings(); - }); + if (DeviceType.getStoreType() == DeviceType.StoreType.MAINLAND_CHINA) { + mBinding.chinaLicenseNumber.setOnClickListener(v -> { + if (mAudio != null) { + mAudio.playSound(AudioEngine.Sound.CLICK); + } + mWidgetManager.openNewTabForeground(getResources().getString(R.string.rCN_license_link)); + exitWholeSettings(); + }); + } else { + mBinding.surveyLink.setOnClickListener(v -> { + if (mAudio != null) { + mAudio.playSound(AudioEngine.Sound.CLICK); + } + mWidgetManager.openNewTabForeground(getResources().getString(R.string.survey_link)); + exitWholeSettings(); + }); + } mBinding.helpButton.setOnClickListener(view -> { if (mAudio != null) { diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml index 278f3c89f2..785f12c5c6 100644 --- a/app/src/main/res/layout/settings.xml +++ b/app/src/main/res/layout/settings.xml @@ -7,6 +7,7 @@ name="settingsmodel" type="com.igalia.wolvic.ui.viewmodel.SettingsViewModel" /> + + android:textSize="@dimen/text_smaller_size" + app:visibleGone="@{DeviceType.getStoreType() != DeviceType.StoreType.MAINLAND_CHINA}" /> + + settings_key_web_apps_data + + ICP备案号:京ICP备2022006476号-10A + https://beian.miit.gov.cn/ +