From 0b3e57b96462f13ac86d5396a8ec334c77c04fdf Mon Sep 17 00:00:00 2001 From: Fan <732388462@qq.com> Date: Thu, 23 May 2024 22:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并小爱同学设置页 --- app/src/main/AndroidManifest.xml | 2 +- .../data/adapter/AppDataAdapter.java | 2 +- .../prefs/RecommendPreference.java | 2 +- .../hyperceiler/ui/BaseCeilerTabActivity.java | 8 +- .../hyperceiler/ui/SubPickerActivity.java | 7 +- .../hyperceiler/ui/base/BaseActivity.java | 103 --------------- .../dashboard/DashboardFragment.java | 17 ++- .../dashboard/DynamicDataObserver.java | 4 +- .../fragment/base/BasePreferenceFragment.java | 95 -------------- .../base/SettingsPreferenceFragment.java | 8 +- .../settings/core/BaseSettingsController.java | 4 - .../ObservablePreferenceFragment.java | 10 -- .../various/fragment/VariousFragment.java | 95 -------------- .../ui/navigator/page/BasePageFragment.java | 6 +- .../ui/navigator/page/HomePageFragment.java | 8 +- .../ui/page/utils/HeaderUtils.java | 2 +- .../settings/SelfAvailablePreference.java | 2 +- .../settings/SettingsActivity.java | 14 +- .../settings/SettingsPreferenceFragment.java | 10 +- .../{fragment => }/settings/SubSettings.java | 2 +- .../settings/adapter/HeaderAdapter.java | 10 +- .../settings/adapter/PreferenceHeader.java | 2 +- .../adapter/ProxyHeaderViewAdapter.java | 2 +- .../adapter/viewholder/HeaderViewHolder.java | 4 +- .../core/AbstractPreferenceController.java | 2 +- .../core/BasePreferenceController.java | 4 +- .../settings/core/BaseSettingsController.java | 4 + .../core/InstrumentedPreferenceFragment.java | 4 +- .../core/OnActivityResultListener.java | 4 +- .../core/PreferenceControllerListHelper.java | 10 +- .../core/PreferenceXmlParserUtils.java | 2 +- .../settings/core/SettingsBaseActivity.java | 2 +- .../settings/core/SubSettingLauncher.java | 20 +-- .../core/gateway/SettingsGateway.java | 2 +- .../ObservablePreferenceFragment.java | 28 ++++ .../settings/utils/BitmapUtils.java | 2 +- .../settings/utils/SettingsFeatures.java | 2 +- .../settings/utils/ThreadUtils.java | 2 +- .../{fragment => }/settings/utils/Utils.java | 2 +- .../HighlightablePreferenceGroupAdapter.java | 6 +- .../settings/widget/LayoutPreference.java | 2 +- .../ui/{fragment => sub}/AodFragment.java | 4 +- .../ui/{fragment => }/sub/AppPicker.java | 2 +- .../ui/{fragment => sub}/CameraFragment.java | 4 +- .../ui/{fragment => sub}/CommonFragment.java | 9 +- .../ContentExtensionFragment.java | 4 +- .../sub/CustomBackgroundSettings.java | 4 +- .../ui/{fragment => sub}/MainFragment.java | 4 +- .../ui/{fragment => sub}/MiLinkFragment.java | 4 +- .../ui/{fragment => sub}/MiShareFragment.java | 4 +- .../sub/MultiActionSettings.java | 2 +- .../ui/{fragment => sub}/NfcFragment.java | 3 +- .../PersonalAssistantFragment.java | 4 +- .../ui/{fragment => sub}/PhoneFragment.java | 4 +- .../ui/{fragment => sub}/SoGouFragment.java | 4 +- .../SystemFrameworkFragment.java | 2 +- .../SystemSettingsFragment.java | 3 +- .../ui/{fragment => sub}/TestFragment.java | 2 +- .../ui/{fragment => sub}/UpdaterFragment.java | 7 +- .../ui/{fragment => sub}/VariousFragment.java | 7 +- .../ui/{fragment => sub}/WeatherFragment.java | 8 +- .../hyperceiler/ui/sub/XiaoAiFragment.java | 12 ++ .../framework/DisplaySettings.java | 2 +- .../framework/FreeFormSettings.java | 2 +- .../framework/NetworkSettings.java | 5 +- .../framework/OtherSettings.java | 4 +- .../framework/VolumeSettings.java | 2 +- .../helper/CantSeeAppsFragment.java | 3 +- .../helper/HomepageEntrance.java | 2 +- .../home/HomeDockSettings.java | 2 +- .../home/HomeDrawerSettings.java | 2 +- .../home/HomeFolderSettings.java | 2 +- .../home/HomeGestureSettings.java | 2 +- .../home/HomeLayoutSettings.java | 2 +- .../home/HomeOtherSettings.java | 2 +- .../home/HomeRecentSettings.java | 2 +- .../home/HomeTitleAnimSettings.java | 2 +- .../home/HomeTitleSettings.java | 5 +- .../home/HomeWidgetSettings.java | 2 +- .../home/anim/HomeTitleAnim1Settings.java | 2 +- .../home/anim/HomeTitleAnim2Settings.java | 2 +- .../home/anim/HomeTitleAnim3Settings.java | 2 +- .../home/anim/HomeTitleAnim4Settings.java | 2 +- .../home/anim/HomeTitleAnim5Settings.java | 2 +- .../home/anim/HomeTitleAnim6Settings.java | 2 +- .../home/anim/HomeTitleAnim7Settings.java | 2 +- .../home/anim/HomeTitleAnim8Settings.java | 2 +- .../home/anim/HomeTitleAnim9Settings.java | 2 +- .../securitycenter/ApplicationsSettings.java | 2 +- .../securitycenter/BatterySettings.java | 2 +- .../securitycenter/OtherSettings.java | 2 +- .../securitycenter/PrivacySafetySettings.java | 2 +- .../SecurityCenterBaseSettings.java | 2 +- .../securitycenter/SidebarSettings.java | 2 +- .../systemui/CardTileSettings.java | 2 +- .../systemui/ControlCenterSettings.java | 5 +- .../systemui/LockScreenSettings.java | 2 +- .../systemui/NavigationSettings.java | 2 +- .../systemui/StatusBarSettings.java | 3 +- .../systemui/SystemUIOtherSettings.java | 2 +- .../prefs/CardTileEditPreference.java | 2 +- .../BatteryDetailIndicatorSettings.java | 2 +- .../statusbar/BatteryIndicatorSettings.java | 4 +- .../statusbar/BatteryStyleSettings.java | 2 +- .../statusbar/ClockIndicatorSettings.java | 2 +- .../statusbar/DoubleLineNetworkSettings.java | 2 +- .../statusbar/IconManageNewSettings.java | 2 +- .../statusbar/IconManageSettings.java | 2 +- .../statusbar/MobileNetworkTypeSettings.java | 2 +- .../NetworkSpeedIndicatorSettings.java | 2 +- .../statusbar/NewClockIndicatorSettings.java | 2 +- .../statusbar/StrongToastSettings.java | 2 +- .../systemui/statusbar/clock/BigClock.java | 2 +- .../systemui/statusbar/clock/SmallClock.java | 2 +- .../statusbar/clock/StatusBarClock.java | 2 +- .../various/AOSPSettings.java | 2 +- .../various/AlertDialogSettings.java | 2 +- .../various/MiPadSettings.java | 2 +- .../hyperceiler/utils/prefs/PrefsUtils.java | 50 +++++++ .../utils/search/SearchHelper.java | 31 ++--- .../main/res/drawable/ic_xiaoai_translate.png | Bin 0 -> 4145 bytes .../main/res/drawable/ic_xiaoai_visual.png | Bin 0 -> 1569 bytes app/src/main/res/drawable/ic_xiaoai_voice.png | Bin 0 -> 6764 bytes app/src/main/res/values-es-rES/strings.xml | 1 + app/src/main/res/values-in-rID/strings.xml | 1 + app/src/main/res/values-it-rIT/strings.xml | 1 + app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ru-rRU/strings.xml | 1 + app/src/main/res/values-tr-rTR/strings.xml | 1 + app/src/main/res/values-vi-rVN/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 3 +- app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/framework.xml | 10 +- app/src/main/res/xml/home.xml | 18 +-- app/src/main/res/xml/home_dock.xml | 2 +- app/src/main/res/xml/home_folder.xml | 8 +- app/src/main/res/xml/home_gesture.xml | 22 ++-- app/src/main/res/xml/home_header.xml | 122 +++++++----------- app/src/main/res/xml/home_title.xml | 2 +- app/src/main/res/xml/home_title_anim.xml | 18 +-- .../main/res/xml/prefs_help_cant_see_apps.xml | 3 +- app/src/main/res/xml/prefs_main.xml | 28 ++-- .../res/xml/prefs_set_homepage_entrance.xml | 2 +- app/src/main/res/xml/prefs_settings.xml | 2 +- app/src/main/res/xml/security_center.xml | 10 +- app/src/main/res/xml/system_ui.xml | 10 +- .../main/res/xml/system_ui_control_center.xml | 2 +- app/src/main/res/xml/system_ui_status_bar.xml | 6 +- .../xml/system_ui_status_bar_icon_manage.xml | 8 +- .../system_ui_status_bar_icon_manage_new.xml | 8 +- ...stem_ui_status_bar_new_clock_indicator.xml | 6 +- app/src/main/res/xml/various.xml | 6 +- app/src/main/res/xml/various_dialog.xml | 2 +- app/src/main/res/xml/xiaoai.xml | 30 +++++ .../xml/{aiasst.xml => xiaoai_translate.xml} | 16 +-- .../xml/{scanner.xml => xiaoai_visual.xml} | 39 +++--- .../xml/{voiceassist.xml => xiaoai_voice.xml} | 5 +- 160 files changed, 492 insertions(+), 729 deletions(-) delete mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/base/BaseActivity.java rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment/settings => }/dashboard/DashboardFragment.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment/settings => }/dashboard/DynamicDataObserver.java (91%) delete mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/BasePreferenceFragment.java delete mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BaseSettingsController.java delete mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/lifecycle/ObservablePreferenceFragment.java delete mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/fragment/VariousFragment.java rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/SelfAvailablePreference.java (86%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/SettingsActivity.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/SettingsPreferenceFragment.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/SubSettings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/adapter/HeaderAdapter.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/adapter/PreferenceHeader.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/adapter/ProxyHeaderViewAdapter.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/adapter/viewholder/HeaderViewHolder.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/AbstractPreferenceController.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/BasePreferenceController.java (98%) create mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BaseSettingsController.java rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/InstrumentedPreferenceFragment.java (91%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/OnActivityResultListener.java (75%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/PreferenceControllerListHelper.java (89%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/PreferenceXmlParserUtils.java (99%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/SettingsBaseActivity.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/SubSettingLauncher.java (86%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/core/gateway/SettingsGateway.java (81%) create mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/lifecycle/ObservablePreferenceFragment.java rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/utils/BitmapUtils.java (88%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/utils/SettingsFeatures.java (92%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/utils/ThreadUtils.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/utils/Utils.java (92%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/widget/HighlightablePreferenceGroupAdapter.java (90%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/settings/widget/LayoutPreference.java (99%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/AodFragment.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/sub/AppPicker.java (99%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/CameraFragment.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/CommonFragment.java (55%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/ContentExtensionFragment.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/sub/CustomBackgroundSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/MainFragment.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/MiLinkFragment.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/MiShareFragment.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => }/sub/MultiActionSettings.java (99%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/NfcFragment.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/PersonalAssistantFragment.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/PhoneFragment.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/SoGouFragment.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/SystemFrameworkFragment.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/SystemSettingsFragment.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/TestFragment.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/UpdaterFragment.java (90%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/VariousFragment.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/WeatherFragment.java (85%) create mode 100644 app/src/main/java/com/sevtinge/hyperceiler/ui/sub/XiaoAiFragment.java rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/framework/DisplaySettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/framework/FreeFormSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/framework/NetworkSettings.java (92%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/framework/OtherSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/framework/VolumeSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/helper/CantSeeAppsFragment.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/helper/HomepageEntrance.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeDockSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeDrawerSettings.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeFolderSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeGestureSettings.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeLayoutSettings.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeOtherSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeRecentSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeTitleAnimSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeTitleSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/HomeWidgetSettings.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim1Settings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim2Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim3Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim4Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim5Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim6Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim7Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim8Settings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/home/anim/HomeTitleAnim9Settings.java (84%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/ApplicationsSettings.java (77%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/BatterySettings.java (77%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/OtherSettings.java (76%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/PrivacySafetySettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/SecurityCenterBaseSettings.java (87%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/securitycenter/SidebarSettings.java (77%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/CardTileSettings.java (89%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/ControlCenterSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/LockScreenSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/NavigationSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/StatusBarSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/SystemUIOtherSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/prefs/CardTileEditPreference.java (99%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/BatteryDetailIndicatorSettings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/BatteryIndicatorSettings.java (95%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/BatteryStyleSettings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/ClockIndicatorSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/DoubleLineNetworkSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/IconManageNewSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/IconManageSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/MobileNetworkTypeSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/NetworkSpeedIndicatorSettings.java (98%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/NewClockIndicatorSettings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/StrongToastSettings.java (96%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/clock/BigClock.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/clock/SmallClock.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/systemui/statusbar/clock/StatusBarClock.java (93%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/various/AOSPSettings.java (94%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/various/AlertDialogSettings.java (97%) rename app/src/main/java/com/sevtinge/hyperceiler/ui/{fragment => sub}/various/MiPadSettings.java (94%) create mode 100644 app/src/main/res/drawable/ic_xiaoai_translate.png create mode 100644 app/src/main/res/drawable/ic_xiaoai_visual.png create mode 100644 app/src/main/res/drawable/ic_xiaoai_voice.png create mode 100644 app/src/main/res/xml/xiaoai.xml rename app/src/main/res/xml/{aiasst.xml => xiaoai_translate.xml} (51%) rename app/src/main/res/xml/{scanner.xml => xiaoai_visual.xml} (50%) rename app/src/main/res/xml/{voiceassist.xml => xiaoai_voice.xml} (71%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cd1eb76b06..7fdffe1d4d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,7 +105,7 @@ diff --git a/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/AppDataAdapter.java b/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/AppDataAdapter.java index ad3194bac7..e21b969f88 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/AppDataAdapter.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/AppDataAdapter.java @@ -32,7 +32,7 @@ import com.sevtinge.hyperceiler.callback.IEditCallback; import com.sevtinge.hyperceiler.data.AppData; -import com.sevtinge.hyperceiler.ui.fragment.sub.AppPicker; +import com.sevtinge.hyperceiler.ui.sub.AppPicker; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/prefs/RecommendPreference.java b/app/src/main/java/com/sevtinge/hyperceiler/prefs/RecommendPreference.java index d5209d6530..1deb2f45f7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/prefs/RecommendPreference.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/prefs/RecommendPreference.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.settings.SubSettings; +import com.sevtinge.hyperceiler.ui.settings.SubSettings; import com.sevtinge.hyperceiler.utils.SettingLauncherHelper; import java.util.ArrayList; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/BaseCeilerTabActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/BaseCeilerTabActivity.java index 3ef9649168..ecdddfd5b8 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/BaseCeilerTabActivity.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/BaseCeilerTabActivity.java @@ -11,9 +11,10 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.callback.IResult; import com.sevtinge.hyperceiler.ui.navigator.ContentFragment; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.PreferenceHeader; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.SubSettingLauncher; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.SettingsFeatures; +import com.sevtinge.hyperceiler.ui.settings.adapter.PreferenceHeader; +import com.sevtinge.hyperceiler.ui.settings.core.SubSettingLauncher; +import com.sevtinge.hyperceiler.ui.settings.utils.SettingsFeatures; +import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; import java.util.List; @@ -47,6 +48,7 @@ public void checkTheme() { protected void onCreate(Bundle savedInstanceState) { checkTheme(); super.onCreate(savedInstanceState); + PrefsUtils.registerSharedPrefsObserver(this); initializeViews(savedInstanceState); hideActionBar(); } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/SubPickerActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/SubPickerActivity.java index 48cfd301fe..0b23a04e04 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/SubPickerActivity.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/SubPickerActivity.java @@ -18,11 +18,8 @@ */ package com.sevtinge.hyperceiler.ui; -import android.content.Intent; - -import com.sevtinge.hyperceiler.callback.IAppSelectCallback; -import com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity; -import com.sevtinge.hyperceiler.ui.fragment.sub.AppPicker; +import com.sevtinge.hyperceiler.ui.settings.SettingsActivity; +import com.sevtinge.hyperceiler.ui.sub.AppPicker; public class SubPickerActivity extends SettingsActivity { AppPicker mAppSelectFragment = new AppPicker(); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/base/BaseActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/base/BaseActivity.java deleted file mode 100644 index d9f8cfae35..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/base/BaseActivity.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * This file is part of HyperCeiler. - - * HyperCeiler is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - - * Copyright (C) 2023-2024 HyperCeiler Contributions -*/ -package com.sevtinge.hyperceiler.ui.base; - -import android.app.backup.BackupManager; -import android.content.SharedPreferences; -import android.net.Uri; -import android.os.Bundle; -import android.os.FileObserver; -import android.util.Log; -import android.view.View; -import android.widget.ImageView; - -import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; - -import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.provider.SharedPrefsProvider; -import com.sevtinge.hyperceiler.utils.Helpers; -import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; - -import java.util.Set; - -import fan.appcompat.app.AppCompatActivity; - -public abstract class BaseActivity extends AppCompatActivity { - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initActionBar(); - registerObserver(); - } - - protected void initActionBar() { - - } - - public void setDisplayHomeAsUpEnabled(boolean isEnable) { - getAppCompatActionBar().setDisplayHomeAsUpEnabled(isEnable); - } - - public void setActionBarEndView(View view) { - getAppCompatActionBar().setEndView(view); - } - - private void registerObserver() { - PrefsUtils.mSharedPreferences.registerOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener); - Helpers.fixPermissionsAsync(getApplicationContext()); - registerFileObserver(); - } - - SharedPreferences.OnSharedPreferenceChangeListener mSharedPreferenceChangeListener = (sharedPreferences, s) -> { - Log.i("prefs", "Changed: " + s); - requestBackup(); - Object val = sharedPreferences.getAll().get(s); - String path = ""; - if (val instanceof String) - path = "string/"; - else if (val instanceof Set) - path = "stringset/"; - else if (val instanceof Integer) - path = "integer/"; - else if (val instanceof Boolean) - path = "boolean/"; - getContentResolver().notifyChange(Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/" + path + s), null); - if (!path.isEmpty()) getContentResolver().notifyChange(Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/pref/" + path + s), null); - }; - - private void registerFileObserver() { - try { - FileObserver mFileObserver = new FileObserver(PrefsUtils.getSharedPrefsPath(), FileObserver.CLOSE_WRITE) { - @Override - public void onEvent(int event, String path) { - Helpers.fixPermissionsAsync(getApplicationContext()); - } - }; - mFileObserver.startWatching(); - } catch (Throwable t) { - Log.e("prefs", "Failed to start FileObserver!"); - } - } - - public void requestBackup() { - new BackupManager(getApplicationContext()).dataChanged(); - } -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DashboardFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DashboardFragment.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DashboardFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DashboardFragment.java index 704eafef50..5d46082462 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DashboardFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DashboardFragment.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.dashboard; +package com.sevtinge.hyperceiler.ui.dashboard; import android.app.Activity; import android.content.ContentResolver; @@ -13,10 +13,10 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.sevtinge.hyperceiler.ui.fragment.settings.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.AbstractPreferenceController; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.BasePreferenceController; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.PreferenceControllerListHelper; +import com.sevtinge.hyperceiler.ui.settings.SettingsPreferenceFragment; +import com.sevtinge.hyperceiler.ui.settings.core.AbstractPreferenceController; +import com.sevtinge.hyperceiler.ui.settings.core.BasePreferenceController; +import com.sevtinge.hyperceiler.ui.settings.core.PreferenceControllerListHelper; import java.util.ArrayList; import java.util.Collection; @@ -95,8 +95,11 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { // Give all controllers a chance to handle click. //preference.getExtras().putInt(CATEGORY, getMetricsCategory()); }); + initPrefs(); } + public void initPrefs() {} + @Override public void onResume() { super.onResume(); @@ -174,7 +177,9 @@ protected void addPreferenceController(AbstractPreferenceController controller) /** * Get the tag string for logging. */ - protected abstract String getLogTag(); + protected String getLogTag() { + return getClass().getSimpleName(); + } /** * Get a list of {@link AbstractPreferenceController} for this fragment. diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DynamicDataObserver.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DynamicDataObserver.java similarity index 91% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DynamicDataObserver.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DynamicDataObserver.java index a445937336..8c0f4609f5 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/dashboard/DynamicDataObserver.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/dashboard/DynamicDataObserver.java @@ -1,11 +1,11 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.dashboard; +package com.sevtinge.hyperceiler.ui.dashboard; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.ThreadUtils; +import com.sevtinge.hyperceiler.ui.settings.utils.ThreadUtils; import java.util.concurrent.CountDownLatch; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/BasePreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/BasePreferenceFragment.java deleted file mode 100644 index 27a2d8c45b..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/BasePreferenceFragment.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This file is part of HyperCeiler. - - * HyperCeiler is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - - * Copyright (C) 2023-2024 HyperCeiler Contributions - */ -package com.sevtinge.hyperceiler.ui.fragment.base; - -import android.content.Context; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.graphics.Insets; -import androidx.core.view.OnApplyWindowInsetsListener; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; - -import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; - -import fan.preference.Preference; -import fan.preference.PreferenceFragment; -import fan.preference.PreferenceManager; - -public class BasePreferenceFragment extends PreferenceFragment { - - private PreferenceManager mPreferenceManager; - - @Override - public void onCreatePreferences(Bundle bundle, String s) { - mPreferenceManager = getPreferenceManager(); - mPreferenceManager.setSharedPreferencesName(PrefsUtils.mPrefsName); - mPreferenceManager.setSharedPreferencesMode(Context.MODE_PRIVATE); - mPreferenceManager.setStorageDeviceProtected(); - } - - public void setTitle(int titleResId) { - setTitle(getResources().getString(titleResId)); - } - - public void setTitle(String title) { - if (!TextUtils.isEmpty(title)) { - getActivity().setTitle(title); - } - } - - public String getFragmentName(Fragment fragment) { - return fragment.getClass().getName(); - } - - public String getPreferenceTitle(Preference preference) { - return preference.getTitle().toString(); - } - - public String getPreferenceKey(Preference preference) { - return preference.getKey(); - } - - public void finish() { - getActivity().finish(); - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - RecyclerView recyclerView = view.findViewById(fan.preference.R.id.recycler_view); - ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new OnApplyWindowInsetsListener() { - @NonNull - @Override - public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) { - Insets inset = Insets.max(insets.getInsets(WindowInsetsCompat.Type.systemBars()), - insets.getInsets(WindowInsetsCompat.Type.displayCutout())); - v.setPadding(inset.left, 0, inset.right, inset.bottom); - return insets; - } - }); - } -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/SettingsPreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/SettingsPreferenceFragment.java index f38fae3818..eaf85888d1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/SettingsPreferenceFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/base/SettingsPreferenceFragment.java @@ -32,7 +32,7 @@ import androidx.annotation.Nullable; import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.settings.SubSettings; +import com.sevtinge.hyperceiler.ui.settings.SubSettings; import com.sevtinge.hyperceiler.utils.log.AndroidLogUtils; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; import com.sevtinge.hyperceiler.utils.shell.ShellInit; @@ -40,8 +40,9 @@ import java.util.ArrayList; import fan.appcompat.app.AlertDialog; +import fan.preference.PreferenceFragment; -public abstract class SettingsPreferenceFragment extends BasePreferenceFragment { +public abstract class SettingsPreferenceFragment extends PreferenceFragment { public final String TAG = getClass().getSimpleName(); public MenuItem mRestartMenu; @@ -68,7 +69,6 @@ public void onCreate(Bundle savedInstanceState) { @Override public void onCreatePreferences(Bundle bundle, String s) { - super.onCreatePreferences(bundle, s); Bundle args = getArguments(); if (args != null) { mTitle = args.getString(":fragment:show_title"); @@ -76,8 +76,6 @@ public void onCreatePreferences(Bundle bundle, String s) { mPreferenceKey = args.getString(":settings:fragment_args_key"); mContentResId = args.getInt("contentResId"); } - if (mTitleResId != 0) setTitle(mTitleResId); - if (!TextUtils.isEmpty(mTitle)) setTitle(mTitle); mContentResId = mContentResId != 0 ? mContentResId : getContentResId(); if (mContentResId > 0) { setPreferencesFromResource(mContentResId, s); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BaseSettingsController.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BaseSettingsController.java deleted file mode 100644 index f69b1df0b0..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BaseSettingsController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; - -public class BaseSettingsController { -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/lifecycle/ObservablePreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/lifecycle/ObservablePreferenceFragment.java deleted file mode 100644 index ea6dcb17ed..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/lifecycle/ObservablePreferenceFragment.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core.lifecycle; - -import androidx.lifecycle.Lifecycle; - -import fan.preference.PreferenceFragment; - -public abstract class ObservablePreferenceFragment extends PreferenceFragment { - - private Lifecycle mLifecycle = null; -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/fragment/VariousFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/fragment/VariousFragment.java deleted file mode 100644 index 0fb2d087a7..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/fragment/VariousFragment.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This file is part of HyperCeiler. - - * HyperCeiler is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - - * Copyright (C) 2023-2024 HyperCeiler Contributions -*/ -package com.sevtinge.hyperceiler.ui.fragment.various.fragment; - -import android.os.Bundle; -import android.util.Log; - -import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; - -import fan.preference.DropDownPreference; -import fan.preference.PreferenceCategory; -import fan.preference.PreferenceFragment; -import fan.preference.SeekBarPreference; -import fan.preference.SwitchPreference; - -public class VariousFragment extends PreferenceFragment { - - public String TAG = "VariousFragment"; - - private SeekBarPreference mDialogHorizontalMargin; - private SeekBarPreference mDialogBottomMargin; - - private PreferenceCategory mBlurEnabledCat; - private PreferenceCategory mBlurCustomCat; - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - Bundle args = getArguments(); - assert args != null; - String sub = args.getString("sub"); - if (sub == null) return; - - Log.d(TAG, "MoralNorm: " + getArguments()); - - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - } - - @Override - public void onCreatePreferences(Bundle bundle, String s) { - - DropDownPreference mDialogGravity = findPreference("prefs_key_various_dialog_gravity"); - mDialogHorizontalMargin = findPreference("prefs_key_various_dialog_horizontal_margin"); - mDialogBottomMargin = findPreference("prefs_key_various_dialog_bottom_margin"); - - SwitchPreference mBlurEnabled = findPreference("prefs_key_various_blur_enabled"); - mBlurEnabledCat = findPreference("prefs_key_various_blur_enabled_cat"); - mBlurCustomCat = findPreference("prefs_key_various_blur_custom"); - - int gialogGravity = Integer.parseInt(PrefsUtils.getSharedStringPrefs(getActivity(), "prefs_key_various_dialog_gravity", "0")); - - mDialogHorizontalMargin.setVisible(gialogGravity != 0); - mDialogBottomMargin.setVisible(gialogGravity == 2); - - mDialogGravity.setOnPreferenceChangeListener((preference, o) -> { - int i = Integer.parseInt((String) o); - mDialogHorizontalMargin.setVisible(i != 0); - mDialogBottomMargin.setVisible(i == 2); - return true; - }); - - - boolean bluEnabled = PrefsUtils.getSharedBoolPrefs(getActivity(), "prefs_key_various_blur_enabled", false); - mBlurEnabledCat.setVisible(bluEnabled); - mBlurCustomCat.setVisible(bluEnabled); - - mBlurEnabled.setOnPreferenceChangeListener((preference, o) -> { - mBlurEnabledCat.setVisible((Boolean) o); - mBlurCustomCat.setVisible((Boolean) o); - return true; - }); - } -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/BasePageFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/BasePageFragment.java index 1fe1d7b819..bb2165572e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/BasePageFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/BasePageFragment.java @@ -15,9 +15,9 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.CeilerTabActivity; import com.sevtinge.hyperceiler.ui.page.utils.HeaderUtils; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.HeaderAdapter; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.PreferenceHeader; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.ProxyHeaderViewAdapter; +import com.sevtinge.hyperceiler.ui.settings.adapter.HeaderAdapter; +import com.sevtinge.hyperceiler.ui.settings.adapter.PreferenceHeader; +import com.sevtinge.hyperceiler.ui.settings.adapter.ProxyHeaderViewAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/HomePageFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/HomePageFragment.java index e28dbf0d6f..197ff861fd 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/HomePageFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/navigator/page/HomePageFragment.java @@ -11,18 +11,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.graphics.Insets; -import androidx.core.view.OnApplyWindowInsetsListener; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.LinearLayoutManager; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.data.ModData; import com.sevtinge.hyperceiler.data.adapter.ModSearchAdapter; import com.sevtinge.hyperceiler.ui.CeilerTabActivity; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.HeaderAdapter; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.ProxyHeaderViewAdapter; +import com.sevtinge.hyperceiler.ui.settings.adapter.HeaderAdapter; +import com.sevtinge.hyperceiler.ui.settings.adapter.ProxyHeaderViewAdapter; import com.sevtinge.hyperceiler.utils.SettingLauncher; import com.sevtinge.hyperceiler.utils.search.SearchModeHelper; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/page/utils/HeaderUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/page/utils/HeaderUtils.java index 66b9332f3c..27f9b2ba44 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/page/utils/HeaderUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/page/utils/HeaderUtils.java @@ -12,7 +12,7 @@ import com.android.internal.graphics.util.XmlUtils; import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.PreferenceHeader; +import com.sevtinge.hyperceiler.ui.settings.adapter.PreferenceHeader; import org.xmlpull.v1.XmlPullParserException; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SelfAvailablePreference.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SelfAvailablePreference.java similarity index 86% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SelfAvailablePreference.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SelfAvailablePreference.java index a48cb96d71..44b361cf78 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SelfAvailablePreference.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SelfAvailablePreference.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings; +package com.sevtinge.hyperceiler.ui.settings; import android.content.Context; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsActivity.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsActivity.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsActivity.java index 7990875ced..cd61944aef 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsActivity.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings; +package com.sevtinge.hyperceiler.ui.settings; import android.content.Context; import android.content.Intent; @@ -15,12 +15,12 @@ import androidx.fragment.app.FragmentTransaction; import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.SubSettingLauncher; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.gateway.SettingsGateway; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.SettingsFeatures; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.Utils; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.OnActivityResultListener; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.SettingsBaseActivity; +import com.sevtinge.hyperceiler.ui.settings.core.SubSettingLauncher; +import com.sevtinge.hyperceiler.ui.settings.core.gateway.SettingsGateway; +import com.sevtinge.hyperceiler.ui.settings.utils.SettingsFeatures; +import com.sevtinge.hyperceiler.ui.settings.utils.Utils; +import com.sevtinge.hyperceiler.ui.settings.core.OnActivityResultListener; +import com.sevtinge.hyperceiler.ui.settings.core.SettingsBaseActivity; import java.util.List; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsPreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsPreferenceFragment.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsPreferenceFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsPreferenceFragment.java index 293bfe0011..1dbc64a563 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SettingsPreferenceFragment.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings; +package com.sevtinge.hyperceiler.ui.settings; import android.app.Activity; import android.app.admin.DevicePolicyManager; @@ -21,10 +21,10 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.CeilerTabActivity; -import com.sevtinge.hyperceiler.ui.fragment.settings.widget.HighlightablePreferenceGroupAdapter; -import com.sevtinge.hyperceiler.ui.fragment.settings.widget.LayoutPreference; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.InstrumentedPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.SubSettingLauncher; +import com.sevtinge.hyperceiler.ui.settings.widget.HighlightablePreferenceGroupAdapter; +import com.sevtinge.hyperceiler.ui.settings.widget.LayoutPreference; +import com.sevtinge.hyperceiler.ui.settings.core.InstrumentedPreferenceFragment; +import com.sevtinge.hyperceiler.ui.settings.core.SubSettingLauncher; import fan.appcompat.app.Fragment; import fan.preference.Preference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SubSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SubSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SubSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SubSettings.java index b89c7a9901..c24cff3207 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/SubSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/SubSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings; +package com.sevtinge.hyperceiler.ui.settings; import android.os.Bundle; import android.util.Log; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/HeaderAdapter.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/HeaderAdapter.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/HeaderAdapter.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/HeaderAdapter.java index 7c8744d50d..86dcc41dd3 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/HeaderAdapter.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/HeaderAdapter.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.adapter; +package com.sevtinge.hyperceiler.ui.settings.adapter; import android.content.Context; import android.content.res.Resources; @@ -17,10 +17,10 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.CeilerTabActivity; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.SettingsFeatures; -import com.sevtinge.hyperceiler.ui.fragment.settings.adapter.viewholder.HeaderViewHolder; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.BaseSettingsController; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.BitmapUtils; +import com.sevtinge.hyperceiler.ui.settings.utils.SettingsFeatures; +import com.sevtinge.hyperceiler.ui.settings.adapter.viewholder.HeaderViewHolder; +import com.sevtinge.hyperceiler.ui.settings.core.BaseSettingsController; +import com.sevtinge.hyperceiler.ui.settings.utils.BitmapUtils; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/PreferenceHeader.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/PreferenceHeader.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/PreferenceHeader.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/PreferenceHeader.java index 16a23574cf..7d5c203140 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/PreferenceHeader.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/PreferenceHeader.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.adapter; +package com.sevtinge.hyperceiler.ui.settings.adapter; import android.content.Intent; import android.content.res.Resources; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/ProxyHeaderViewAdapter.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/ProxyHeaderViewAdapter.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/ProxyHeaderViewAdapter.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/ProxyHeaderViewAdapter.java index 3050035f58..dbd50a1dee 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/ProxyHeaderViewAdapter.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/ProxyHeaderViewAdapter.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.adapter; +package com.sevtinge.hyperceiler.ui.settings.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/viewholder/HeaderViewHolder.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/viewholder/HeaderViewHolder.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/viewholder/HeaderViewHolder.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/viewholder/HeaderViewHolder.java index 6c72bb9dce..8fe7ad0b31 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/adapter/viewholder/HeaderViewHolder.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/adapter/viewholder/HeaderViewHolder.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.adapter.viewholder; +package com.sevtinge.hyperceiler.ui.settings.adapter.viewholder; import android.view.View; import android.view.ViewGroup; @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.settings.utils.SettingsFeatures; +import com.sevtinge.hyperceiler.ui.settings.utils.SettingsFeatures; public class HeaderViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/AbstractPreferenceController.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/AbstractPreferenceController.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/AbstractPreferenceController.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/AbstractPreferenceController.java index 1444ed6697..25c914993c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/AbstractPreferenceController.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/AbstractPreferenceController.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.app.admin.DevicePolicyManager; import android.content.Context; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BasePreferenceController.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BasePreferenceController.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BasePreferenceController.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BasePreferenceController.java index 1cc78b903e..b4a5cc83f3 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/BasePreferenceController.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BasePreferenceController.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.content.Context; import android.os.UserHandle; @@ -7,7 +7,7 @@ import androidx.annotation.IntDef; import androidx.annotation.Nullable; -import com.sevtinge.hyperceiler.ui.fragment.settings.dashboard.DashboardFragment; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BaseSettingsController.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BaseSettingsController.java new file mode 100644 index 0000000000..e731895d8f --- /dev/null +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/BaseSettingsController.java @@ -0,0 +1,4 @@ +package com.sevtinge.hyperceiler.ui.settings.core; + +public class BaseSettingsController { +} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/InstrumentedPreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/InstrumentedPreferenceFragment.java similarity index 91% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/InstrumentedPreferenceFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/InstrumentedPreferenceFragment.java index 1776959e5d..e0a872820c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/InstrumentedPreferenceFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/InstrumentedPreferenceFragment.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.content.Context; import android.os.Bundle; @@ -7,7 +7,7 @@ import androidx.annotation.XmlRes; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.lifecycle.ObservablePreferenceFragment; +import com.sevtinge.hyperceiler.ui.settings.core.lifecycle.ObservablePreferenceFragment; import fan.preference.Preference; import fan.preference.PreferenceScreen; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/OnActivityResultListener.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/OnActivityResultListener.java similarity index 75% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/OnActivityResultListener.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/OnActivityResultListener.java index 65d4001586..e6d4668e2f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/OnActivityResultListener.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/OnActivityResultListener.java @@ -1,9 +1,9 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.app.Activity; import android.content.Intent; -import com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity; +import com.sevtinge.hyperceiler.ui.settings.SettingsActivity; /** * This interface marks a class that it wants to listen to diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceControllerListHelper.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceControllerListHelper.java similarity index 89% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceControllerListHelper.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceControllerListHelper.java index c0a2e033d4..3b5cf4405f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceControllerListHelper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceControllerListHelper.java @@ -1,8 +1,8 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; -import static com.sevtinge.hyperceiler.ui.fragment.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; -import static com.sevtinge.hyperceiler.ui.fragment.settings.core.PreferenceXmlParserUtils.METADATA_FOR_WORK; -import static com.sevtinge.hyperceiler.ui.fragment.settings.core.PreferenceXmlParserUtils.METADATA_KEY; +import static com.sevtinge.hyperceiler.ui.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; +import static com.sevtinge.hyperceiler.ui.settings.core.PreferenceXmlParserUtils.METADATA_FOR_WORK; +import static com.sevtinge.hyperceiler.ui.settings.core.PreferenceXmlParserUtils.METADATA_KEY; import android.content.Context; import android.os.Bundle; @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.XmlRes; -import com.sevtinge.hyperceiler.ui.fragment.settings.core.PreferenceXmlParserUtils.MetadataFlag; +import com.sevtinge.hyperceiler.ui.settings.core.PreferenceXmlParserUtils.MetadataFlag; import org.xmlpull.v1.XmlPullParserException; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceXmlParserUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceXmlParserUtils.java similarity index 99% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceXmlParserUtils.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceXmlParserUtils.java index a60964d09a..a78f428b34 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/PreferenceXmlParserUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/PreferenceXmlParserUtils.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SettingsBaseActivity.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SettingsBaseActivity.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SettingsBaseActivity.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SettingsBaseActivity.java index f0c0cb2bcf..54e30c0e43 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SettingsBaseActivity.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SettingsBaseActivity.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; import android.app.ActivityManager; import android.os.Bundle; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SubSettingLauncher.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SubSettingLauncher.java similarity index 86% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SubSettingLauncher.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SubSettingLauncher.java index 0325fe9e2f..57d11ea457 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/SubSettingLauncher.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/SubSettingLauncher.java @@ -1,13 +1,13 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core; +package com.sevtinge.hyperceiler.ui.settings.core; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME; -import static com.sevtinge.hyperceiler.ui.fragment.settings.core.SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE; -import static com.sevtinge.hyperceiler.ui.fragment.settings.core.SettingsBaseActivity.EXTRA_SOURCE_METRICS_CATEGORY; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME; +import static com.sevtinge.hyperceiler.ui.settings.core.SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE; +import static com.sevtinge.hyperceiler.ui.settings.core.SettingsBaseActivity.EXTRA_SOURCE_METRICS_CATEGORY; import android.content.Context; import android.content.Intent; @@ -19,7 +19,7 @@ import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; -import com.sevtinge.hyperceiler.ui.fragment.settings.SubSettings; +import com.sevtinge.hyperceiler.ui.settings.SubSettings; public class SubSettingLauncher { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/gateway/SettingsGateway.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/gateway/SettingsGateway.java similarity index 81% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/gateway/SettingsGateway.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/gateway/SettingsGateway.java index c83ab0c9b4..92d686e06a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/core/gateway/SettingsGateway.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/gateway/SettingsGateway.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.core.gateway; +package com.sevtinge.hyperceiler.ui.settings.core.gateway; public class SettingsGateway { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/lifecycle/ObservablePreferenceFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/lifecycle/ObservablePreferenceFragment.java new file mode 100644 index 0000000000..3c4f6b202d --- /dev/null +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/core/lifecycle/ObservablePreferenceFragment.java @@ -0,0 +1,28 @@ +package com.sevtinge.hyperceiler.ui.settings.core.lifecycle; + +import android.content.Context; +import android.os.Bundle; + +import androidx.annotation.Nullable; +import androidx.lifecycle.Lifecycle; + +import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; + +import fan.preference.PreferenceFragment; +import fan.preference.PreferenceManager; + +public abstract class ObservablePreferenceFragment extends PreferenceFragment { + + private Lifecycle mLifecycle = null; + + @Override + public void onCreatePreferences(@Nullable Bundle bundle, @Nullable String s) { + setSharedPreferences(getPreferenceManager()); + } + + protected void setSharedPreferences(PreferenceManager preferenceManager) { + preferenceManager.setSharedPreferencesName(PrefsUtils.mPrefsName); + preferenceManager.setSharedPreferencesMode(Context.MODE_PRIVATE); + preferenceManager.setStorageDeviceProtected(); + } +} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/BitmapUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/BitmapUtils.java similarity index 88% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/BitmapUtils.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/BitmapUtils.java index 10fd067021..109debea7c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/BitmapUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.utils; +package com.sevtinge.hyperceiler.ui.settings.utils; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/SettingsFeatures.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java similarity index 92% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/SettingsFeatures.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java index ab81339c12..abc55373e7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/SettingsFeatures.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.utils; +package com.sevtinge.hyperceiler.ui.settings.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/ThreadUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/ThreadUtils.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/ThreadUtils.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/ThreadUtils.java index 3ec4d25140..a0aeade8bc 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/ThreadUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/ThreadUtils.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.utils; +package com.sevtinge.hyperceiler.ui.settings.utils; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/Utils.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/Utils.java similarity index 92% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/Utils.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/Utils.java index 15b23a5189..9cefe00fab 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/utils/Utils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/Utils.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.utils; +package com.sevtinge.hyperceiler.ui.settings.utils; import android.app.Activity; import android.os.Bundle; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/HighlightablePreferenceGroupAdapter.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/HighlightablePreferenceGroupAdapter.java similarity index 90% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/HighlightablePreferenceGroupAdapter.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/HighlightablePreferenceGroupAdapter.java index f9116d17cd..409584094e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -1,6 +1,6 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.widget; +package com.sevtinge.hyperceiler.ui.settings.widget; -import static com.sevtinge.hyperceiler.ui.fragment.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; +import static com.sevtinge.hyperceiler.ui.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; -import com.sevtinge.hyperceiler.ui.fragment.settings.SettingsPreferenceFragment; +import com.sevtinge.hyperceiler.ui.settings.SettingsPreferenceFragment; import fan.preference.PreferenceGroup; import fan.preference.PreferenceGroupAdapter; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/LayoutPreference.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/LayoutPreference.java similarity index 99% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/LayoutPreference.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/LayoutPreference.java index 38b3987d0a..ac5ae2ec9c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/widget/LayoutPreference.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/widget/LayoutPreference.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.settings.widget; +package com.sevtinge.hyperceiler.ui.settings.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/AodFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/AodFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java index 3a69b38231..245d48148c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/AodFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java @@ -16,12 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; -import android.view.View; - import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/AppPicker.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AppPicker.java similarity index 99% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/AppPicker.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AppPicker.java index ab50cd662c..af1ae26897 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/AppPicker.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AppPicker.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.sub; +package com.sevtinge.hyperceiler.ui.sub; import android.content.Intent; import android.content.pm.PackageManager; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CameraFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CameraFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java index f923eab601..7ea2bd2cc9 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CameraFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java @@ -16,12 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; -import android.view.View; - import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CommonFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CommonFragment.java similarity index 55% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CommonFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CommonFragment.java index b081ea9a24..c11c744d13 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/CommonFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CommonFragment.java @@ -1,6 +1,6 @@ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; -import com.sevtinge.hyperceiler.ui.fragment.settings.dashboard.DashboardFragment; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.utils.ResourcesCompat; public class CommonFragment extends DashboardFragment { @@ -9,9 +9,4 @@ public class CommonFragment extends DashboardFragment { protected int getPreferenceScreenResId() { return ResourcesCompat.getXml(requireContext(), getArguments().getString("contentResId")); } - - @Override - protected String getLogTag() { - return getClass().getSimpleName(); - } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/ContentExtensionFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/ContentExtensionFragment.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/ContentExtensionFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/ContentExtensionFragment.java index 4ab84aef8e..f100b7b8d6 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/ContentExtensionFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/ContentExtensionFragment.java @@ -16,12 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; -import android.view.View; - import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/CustomBackgroundSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/CustomBackgroundSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java index 107c3890c6..3b273247d7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/CustomBackgroundSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.sub; +package com.sevtinge.hyperceiler.ui.sub; import android.os.Bundle; @@ -67,7 +67,7 @@ public void initPrefs() { mBlurEnabledKey = mKey + "_blur_enabled"; mBlurRadiusKey = mKey + "_blur_radius"; } else { - finish(); + getActivity().finish(); } mCustomEnabledPreference = findPreference("prefs_key_custom_background_enabled"); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MainFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MainFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java index 7f481f22cf..784db46175 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MainFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.DisplayUtils.dp2px; import static com.sevtinge.hyperceiler.utils.devicesdk.DisplayUtils.sp2px; @@ -45,7 +45,7 @@ import com.sevtinge.hyperceiler.prefs.TipsPreference; import com.sevtinge.hyperceiler.ui.MainActivityContextHelper; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.helper.HomepageEntrance; +import com.sevtinge.hyperceiler.ui.sub.helper.HomepageEntrance; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; import com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt; import com.sevtinge.hyperceiler.utils.log.AndroidLogUtils; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiLinkFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiLinkFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java index 08488e3a9a..4a0c055470 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiLinkFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java @@ -16,12 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; -import android.view.View; - import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiShareFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiShareFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java index 5cf344dc47..b14c1dde57 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MiShareFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java @@ -16,9 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; - -import android.view.View; +package com.sevtinge.hyperceiler.ui.sub; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/MultiActionSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java similarity index 99% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/MultiActionSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java index 0c257ce571..5ad06f85f2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/MultiActionSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.sub; +package com.sevtinge.hyperceiler.ui.sub; import android.content.ComponentName; import android.content.Context; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/NfcFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/NfcFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java index 68b33f1145..56323d0dbb 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/NfcFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java @@ -16,10 +16,9 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import android.os.Bundle; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PersonalAssistantFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PersonalAssistantFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java index 06a465009b..b16509b080 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PersonalAssistantFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java @@ -16,12 +16,10 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; -import android.view.View; - import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PhoneFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PhoneFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java index e977c3030b..41876ec695 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/PhoneFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java @@ -16,9 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; - -import android.view.View; +package com.sevtinge.hyperceiler.ui.sub; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SoGouFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SoGouFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java index a543f9a7e5..46bf869fc1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SoGouFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java @@ -16,9 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; - -import android.view.View; +package com.sevtinge.hyperceiler.ui.sub; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemFrameworkFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemFrameworkFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java index 19a91b5b27..c739d77388 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemFrameworkFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemSettingsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemSettingsFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java index 1bad24f604..7930f89896 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/SystemSettingsFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; @@ -26,7 +26,6 @@ import android.os.Bundle; import android.provider.Settings; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/TestFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/TestFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java index 03d6bc5fd9..7d366d1fc7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/TestFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/UpdaterFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/UpdaterFragment.java similarity index 90% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/UpdaterFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/UpdaterFragment.java index 10fbb246bd..42ae76d05b 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/UpdaterFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/UpdaterFragment.java @@ -16,11 +16,12 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import androidx.annotation.NonNull; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; @@ -28,14 +29,14 @@ import fan.preference.EditTextPreference; import fan.preference.Preference; -public class UpdaterFragment extends SettingsPreferenceFragment +public class UpdaterFragment extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mUpdateMode; EditTextPreference mBigVersion; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.updater; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/VariousFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/VariousFragment.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/VariousFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/VariousFragment.java index dc250c41b1..05eaff556d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/VariousFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/VariousFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; @@ -25,6 +25,7 @@ import androidx.annotation.NonNull; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.utils.KillApp; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; @@ -36,7 +37,7 @@ import fan.preference.SwitchPreference; -public class VariousFragment extends SettingsPreferenceFragment +public class VariousFragment extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mSuperModePreference; @@ -47,7 +48,7 @@ public class VariousFragment extends SettingsPreferenceFragment Handler handler; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.various; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/WeatherFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/WeatherFragment.java similarity index 85% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/WeatherFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/WeatherFragment.java index 06274267aa..e3740e7d23 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/WeatherFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/WeatherFragment.java @@ -16,20 +16,22 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment; +package com.sevtinge.hyperceiler.ui.sub; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.DropDownPreference; -public class WeatherFragment extends SettingsPreferenceFragment { +public class WeatherFragment extends DashboardFragment { DropDownPreference mCardDisplayType; + @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.weather; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/XiaoAiFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/XiaoAiFragment.java new file mode 100644 index 0000000000..9014942d6e --- /dev/null +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/XiaoAiFragment.java @@ -0,0 +1,12 @@ +package com.sevtinge.hyperceiler.ui.sub; + +import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; + +public class XiaoAiFragment extends DashboardFragment { + + @Override + protected int getPreferenceScreenResId() { + return R.xml.xiaoai; + } +} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/DisplaySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/DisplaySettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java index 03150cc3bb..e0d112cb70 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/DisplaySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.framework; +package com.sevtinge.hyperceiler.ui.sub.framework; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/FreeFormSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/FreeFormSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java index c74ab44d52..57b9db6a72 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/FreeFormSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.framework; +package com.sevtinge.hyperceiler.ui.sub.framework; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreMiuiVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/NetworkSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java similarity index 92% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/NetworkSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java index b6d2917a7d..b598ffd527 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/NetworkSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java @@ -16,14 +16,13 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.framework; +package com.sevtinge.hyperceiler.ui.sub.framework; import android.os.Bundle; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; -import com.sevtinge.hyperceiler.ui.fragment.PhoneFragment; +import com.sevtinge.hyperceiler.ui.sub.PhoneFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; public class NetworkSettings extends SettingsPreferenceFragment { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/OtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/OtherSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java index c4f0a56418..689fc92170 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/OtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.framework; +package com.sevtinge.hyperceiler.ui.sub.framework; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; @@ -32,7 +32,7 @@ import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.sub.AppPicker; +import com.sevtinge.hyperceiler.ui.sub.AppPicker; import com.sevtinge.hyperceiler.utils.KillApp; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/VolumeSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/VolumeSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java index 33f032efbc..25e064d986 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/framework/VolumeSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.framework; +package com.sevtinge.hyperceiler.ui.sub.framework; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/CantSeeAppsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/CantSeeAppsFragment.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java index c0c0e72364..88a9e1e262 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/CantSeeAppsFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.helper; +package com.sevtinge.hyperceiler.ui.sub.helper; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.PreferenceHeader; @@ -35,7 +35,6 @@ public int getContentResId() { @Override public void initPrefs() { - setTitle(R.string.help); mHelpCantSeeApps = findPreference("prefs_key_textview_help_cant_see_apps"); if (mHelpCantSeeApps != null) { if (!PreferenceHeader.mUninstallApp.isEmpty() && !PreferenceHeader.mDisableOrHiddenApp.isEmpty()) { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/HomepageEntrance.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/HomepageEntrance.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java index 9cd6bdf199..7c8760822e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/helper/HomepageEntrance.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.helper; +package com.sevtinge.hyperceiler.ui.sub.helper; import android.content.res.Resources; import android.content.res.XmlResourceParser; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java index 8491452e2c..4e18492c4e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDrawerSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDrawerSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java index c635e53997..91918d6e4f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDrawerSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeFolderSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeFolderSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java index 178e050e24..fe4aca333c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeFolderSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeGestureSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeGestureSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java index 3913bddb70..48407f01ba 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeGestureSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeLayoutSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeLayoutSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java index 4e0328d91d..73b5bd78f1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeLayoutSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeOtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeOtherSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java index 4daf274756..f98f6b59bf 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeOtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeRecentSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeRecentSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java index 3436be6ed9..80f48261b1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeRecentSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleAnimSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleAnimSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java index 9badb265d5..f623b3d78e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleAnimSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java index a0f7312242..a329066471 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeTitleSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java @@ -16,20 +16,19 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; import android.content.Intent; import android.os.Bundle; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.sub.AppPicker; +import com.sevtinge.hyperceiler.ui.sub.AppPicker; import fan.preference.Preference; import fan.preference.SwitchPreference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeWidgetSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeWidgetSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java index 449aa8fbb2..8bf797c430 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeWidgetSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home; +package com.sevtinge.hyperceiler.ui.sub.home; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim1Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim1Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java index 385816dfc1..88aef2444e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim1Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim2Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim2Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java index 982031f429..14fa96e24e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim2Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim3Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim3Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java index 0c590a8b48..eb17b994d6 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim3Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim4Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim4Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java index d573f643dc..eae3aa2d05 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim4Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim5Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim5Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java index 66aad81807..4bbbebc1b4 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim5Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim6Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim6Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java index 221d9e4f32..ac4760d631 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim6Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim7Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim7Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java index 4f4a87ff12..5617f32c79 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim7Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim8Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim8Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java index 6be5914550..fc01e855b6 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim8Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim9Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java similarity index 84% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim9Settings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java index 559861015c..5054125f74 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/anim/HomeTitleAnim9Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.home.anim; +package com.sevtinge.hyperceiler.ui.sub.home.anim; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/ApplicationsSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java similarity index 77% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/ApplicationsSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java index cc13a6a9a4..527619b39e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/ApplicationsSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/BatterySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java similarity index 77% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/BatterySettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java index c9aa8be788..e82a34ae5f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/BatterySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/OtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java similarity index 76% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/OtherSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java index 6379b3fd43..db847d1981 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/OtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/PrivacySafetySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/PrivacySafetySettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java index c90022589b..0cba8ff11a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/PrivacySafetySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import android.Manifest; import android.provider.Settings; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SecurityCenterBaseSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java similarity index 87% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SecurityCenterBaseSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java index e351e78f98..fe245c2df9 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SecurityCenterBaseSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SidebarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java similarity index 77% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SidebarSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java index b8bebe6c1a..29f9f026cd 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/securitycenter/SidebarSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.securitycenter; +package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/CardTileSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java similarity index 89% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/CardTileSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java index c8db8c86dd..dbd5cf32cb 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/CardTileSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/ControlCenterSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/ControlCenterSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java index 5e18132cc5..f35fb95d37 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/ControlCenterSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java @@ -16,20 +16,19 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.sub.AppPicker; +import com.sevtinge.hyperceiler.ui.sub.AppPicker; import com.sevtinge.hyperceiler.utils.KillApp; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; import com.sevtinge.hyperceiler.utils.devicesdk.TelephonyManager; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/LockScreenSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/LockScreenSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java index caf18aede7..84639d5751 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/LockScreenSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import static com.sevtinge.hyperceiler.utils.api.OldFunApisKt.isDeviceEncrypted; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/NavigationSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/NavigationSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java index b7a3a1ba76..dd922a8574 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/NavigationSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import android.provider.Settings; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/StatusBarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/StatusBarSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java index 26e8db8de9..fa551281fe 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/StatusBarSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java @@ -16,14 +16,13 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isHyperOSVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; import android.os.Bundle; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/SystemUIOtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/SystemUIOtherSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java index dad4a51085..ee17ff0b47 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/SystemUIOtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui; +package com.sevtinge.hyperceiler.ui.sub.systemui; import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMiuiVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/prefs/CardTileEditPreference.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/prefs/CardTileEditPreference.java similarity index 99% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/prefs/CardTileEditPreference.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/prefs/CardTileEditPreference.java index 55d2b671e4..9e1174767d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/prefs/CardTileEditPreference.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/prefs/CardTileEditPreference.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.systemui.prefs; +package com.sevtinge.hyperceiler.ui.sub.systemui.prefs; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryDetailIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryDetailIndicatorSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java index 9c2eb6354c..7b50ef1d64 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryDetailIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java similarity index 95% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryIndicatorSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java index 0bad43ab67..8570de7484 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java @@ -16,14 +16,12 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.content.Intent; -import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -import com.sevtinge.hyperceiler.ui.fragment.settings.SubSettings; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; import fan.preference.ColorPickerPreference; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryStyleSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryStyleSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java index e7524f6f54..2ff9c42a5f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/BatteryStyleSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/ClockIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/ClockIndicatorSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java index 3c7f9b9304..3b0a11bbed 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/ClockIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/DoubleLineNetworkSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/DoubleLineNetworkSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java index 5ddd74d166..3fd4b1967d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/DoubleLineNetworkSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageNewSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageNewSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java index 22f321aa0d..e880cdd363 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageNewSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java @@ -1,4 +1,4 @@ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java index 37af983892..e186d9a785 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/IconManageSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/MobileNetworkTypeSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/MobileNetworkTypeSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java index 8812484006..1df7782169 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/MobileNetworkTypeSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NetworkSpeedIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java similarity index 98% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NetworkSpeedIndicatorSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java index 8153ceeb73..fd89480fb4 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NetworkSpeedIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isHyperOSVersion; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NewClockIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NewClockIndicatorSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java index 70aff39bca..95da2b384c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/NewClockIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/StrongToastSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java similarity index 96% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/StrongToastSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java index 07f2710b6e..8a18531719 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/StrongToastSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/BigClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/BigClock.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java index 8c4c00a4ed..c88583dd22 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/BigClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.clock; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.clock; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/SmallClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/SmallClock.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java index b50c63f6d7..c6473e82e5 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/SmallClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.clock; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.clock; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/StatusBarClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java similarity index 93% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/StatusBarClock.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java index f85b0b8d25..c69a07cb88 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/clock/StatusBarClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.clock; +package com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.clock; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AOSPSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AOSPSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java index 425a2d59fe..642522f717 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AOSPSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.various; +package com.sevtinge.hyperceiler.ui.sub.various; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AlertDialogSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java similarity index 97% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AlertDialogSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java index c6da54be34..6c376fe95d 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/AlertDialogSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.various; +package com.sevtinge.hyperceiler.ui.sub.various; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/MiPadSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java similarity index 94% rename from app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/MiPadSettings.java rename to app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java index e0106f11c0..6fd00dbaf7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/various/MiPadSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java @@ -16,7 +16,7 @@ * Copyright (C) 2023-2024 HyperCeiler Contributions */ -package com.sevtinge.hyperceiler.ui.fragment.various; +package com.sevtinge.hyperceiler.ui.sub.various; import android.view.View; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/prefs/PrefsUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/prefs/PrefsUtils.java index eb6140a1ec..1254ba4344 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/utils/prefs/PrefsUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/utils/prefs/PrefsUtils.java @@ -18,12 +18,19 @@ */ package com.sevtinge.hyperceiler.utils.prefs; +import android.app.backup.BackupManager; +import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; +import android.os.FileObserver; +import android.util.Log; + +import androidx.annotation.Nullable; import com.sevtinge.hyperceiler.XposedInit; +import com.sevtinge.hyperceiler.provider.SharedPrefsProvider; import com.sevtinge.hyperceiler.utils.Helpers; import com.sevtinge.hyperceiler.utils.api.ProjectApi; import com.sevtinge.hyperceiler.utils.log.XposedLogUtils; @@ -186,4 +193,47 @@ public static boolean getSharedBoolPrefs(Context context, String name, boolean d else return defValue; } + + public static void registerSharedPrefsObserver(Context context) { + registerOnSharedPrefsChangeListener(context); + Helpers.fixPermissionsAsync(context); + registerPrefsFileObserver(context); + } + + private static void registerOnSharedPrefsChangeListener(Context context) { + ContentResolver resolver = context.getContentResolver(); + mSharedPreferences.registerOnSharedPreferenceChangeListener((sharedPreferences, key) -> { + Log.i("prefs", "Changed: " + key); + requestBackup(context); + Object val = sharedPreferences.getAll().get(key); + String path = ""; + if (val instanceof String) + path = "string/"; + else if (val instanceof Set) + path = "stringset/"; + else if (val instanceof Integer) + path = "integer/"; + else if (val instanceof Boolean) + path = "boolean/"; + resolver.notifyChange(Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/" + path + key), null); + if (!path.isEmpty()) resolver.notifyChange(Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/pref/" + path + key), null); + }); + } + + private static void registerPrefsFileObserver(Context context) { + try { + new FileObserver(PrefsUtils.getSharedPrefsPath(), FileObserver.CLOSE_WRITE) { + @Override + public void onEvent(int event, @Nullable String path) { + Helpers.fixPermissionsAsync(context); + } + }.startWatching(); + } catch (Throwable t) { + Log.e("prefs", "Failed to start FileObserver!"); + } + } + + private static void requestBackup(Context context) { + new BackupManager(context).dataChanged(); + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java index c6f2ba57af..32e4076c20 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/utils/search/SearchHelper.java @@ -240,14 +240,14 @@ public static void getAllMods(Context context, boolean force) { // 设置相关 parsePrefXml(context, R.xml.system_settings, - "com.sevtinge.hyperceiler.ui.fragment.SystemSettingsFragment"); + "com.sevtinge.hyperceiler.ui.sub.SystemSettingsFragment"); // 其他杂项 parsePrefXml(context, R.xml.browser, "com.sevtinge.hyperceiler.ui.fragment.BrowserFragment"); parsePrefXml(context, !isMoreHyperOSVersion(1f) ? R.xml.camera : R.xml.camera_new, - !isMoreHyperOSVersion(1f) ? "com.sevtinge.hyperceiler.ui.fragment.CameraFragment" : "com.sevtinge.hyperceiler.ui.fragment.CameraNewFragment"); + !isMoreHyperOSVersion(1f) ? "com.sevtinge.hyperceiler.ui.sub.CameraFragment" : "com.sevtinge.hyperceiler.ui.fragment.CameraNewFragment"); parsePrefXml(context, R.xml.fileexplorer, "com.sevtinge.hyperceiler.ui.fragment.FileExplorerFragment"); @@ -259,16 +259,16 @@ public static void getAllMods(Context context, boolean force) { "com.sevtinge.hyperceiler.ui.fragment.MmsFragment"); parsePrefXml(context, R.xml.nfc, - "com.sevtinge.hyperceiler.ui.fragment.NfcFragment"); + "com.sevtinge.hyperceiler.ui.sub.NfcFragment"); parsePrefXml(context, R.xml.phone, - "com.sevtinge.hyperceiler.ui.fragment.PhoneFragment"); + "com.sevtinge.hyperceiler.ui.sub.PhoneFragment"); parsePrefXml(context, R.xml.downloads, "com.sevtinge.hyperceiler.ui.fragment.DownloadsFragment"); parsePrefXml(context, R.xml.updater, - "com.sevtinge.hyperceiler.ui.fragment.UpdaterFragment"); + "com.sevtinge.hyperceiler.ui.sub.UpdaterFragment"); if (!isMoreHyperOSVersion(1f)) { parsePrefXml(context, R.xml.lbe_security, @@ -276,13 +276,13 @@ public static void getAllMods(Context context, boolean force) { } parsePrefXml(context, R.xml.milink, - "com.sevtinge.hyperceiler.ui.fragment.MiLinkFragment"); + "com.sevtinge.hyperceiler.ui.sub.MiLinkFragment"); parsePrefXml(context, R.xml.aod, - "com.sevtinge.hyperceiler.ui.fragment.AodFragment"); + "com.sevtinge.hyperceiler.ui.sub.AodFragment"); parsePrefXml(context, R.xml.content_extension, - "com.sevtinge.hyperceiler.ui.fragment.ContentExtensionFragment"); + "com.sevtinge.hyperceiler.ui.sub.ContentExtensionFragment"); parsePrefXml(context, R.xml.gallery, "com.sevtinge.hyperceiler.ui.fragment.GalleryFragment"); @@ -294,7 +294,7 @@ public static void getAllMods(Context context, boolean force) { "com.sevtinge.hyperceiler.ui.fragment.MediaEditorFragment"); parsePrefXml(context, R.xml.mishare, - "com.sevtinge.hyperceiler.ui.fragment.MiShareFragment"); + "com.sevtinge.hyperceiler.ui.sub.MiShareFragment"); parsePrefXml(context, R.xml.miwallpaper, "com.sevtinge.hyperceiler.ui.fragment.MiWallpaperFragment"); @@ -335,9 +335,9 @@ public static void getAllMods(Context context, boolean force) { "com.sevtinge.hyperceiler.ui.fragment.TsmClientFragment"); parsePrefXml(context, R.xml.weather, - "com.sevtinge.hyperceiler.ui.fragment.WeatherFragment"); + "com.sevtinge.hyperceiler.ui.sub.WeatherFragment"); - parsePrefXml(context, R.xml.aiasst, + parsePrefXml(context, R.xml.xiaoai, "com.sevtinge.hyperceiler.ui.fragment.AiAsstFragment"); parsePrefXml(context, R.xml.tsmclient, @@ -355,9 +355,6 @@ public static void getAllMods(Context context, boolean force) { parsePrefXml(context, R.xml.mtb, "com.sevtinge.hyperceiler.ui.fragment.MtbFragment"); - parsePrefXml(context, R.xml.scanner, - "com.sevtinge.hyperceiler.ui.fragment.ScannerFragment"); - parsePrefXml(context, R.xml.micloud_service, "com.sevtinge.hyperceiler.ui.fragment.MiCloudServiceFragment"); @@ -377,7 +374,7 @@ public static void getAllMods(Context context, boolean force) { "com.sevtinge.hyperceiler.ui.fragment.CalendarFragment"); parsePrefXml(context, R.xml.various, - "com.sevtinge.hyperceiler.ui.fragment.VariousFragment"); + "com.sevtinge.hyperceiler.ui.sub.VariousFragment"); parsePrefXml(context, R.xml.various_aosp, "com.sevtinge.hyperceiler.ui.fragment.various.AOSPSettings", @@ -385,7 +382,7 @@ public static void getAllMods(Context context, boolean force) { if (isPad()) { parsePrefXml(context, R.xml.various_mipad, - "com.sevtinge.hyperceiler.ui.fragment.VariousFragment", + "com.sevtinge.hyperceiler.ui.sub.VariousFragment", R.string.various); } @@ -394,7 +391,7 @@ public static void getAllMods(Context context, boolean force) { "com.sevtinge.hyperceiler.ui.fragment.ThemeManagerFragment"); parsePrefXml(context, R.xml.personal_assistant, - "com.sevtinge.hyperceiler.ui.fragment.PersonalAssistantFragment"); + "com.sevtinge.hyperceiler.ui.sub.PersonalAssistantFragment"); } private static void parsePrefXml(Context context, int xmlResId, String catPrefsFragment, int... internalId) { diff --git a/app/src/main/res/drawable/ic_xiaoai_translate.png b/app/src/main/res/drawable/ic_xiaoai_translate.png new file mode 100644 index 0000000000000000000000000000000000000000..5069abafa289f743a88105c57262f58e8a9b3b41 GIT binary patch literal 4145 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 cc~@TOQ4qL4 z(=;z-nP`b_YiVNi(7;FD%1Q-{%(BNGV6zgqXzaB8vFFU4JNKKp-}lY;J2P3~te}Y$ zCkg;yVo30cweX$z?Ln+z|MA%KHUO-O!dI_fY2jaRRJA!O+u?wwlG9XemJAW9!5x)y zv`0==%TbNol7XQ(ZsB7zm4d32TX+~mXsQROMus#S5t#uZRJDTW1eQz@Y_$G1*dtOS zB&1Xkwo;R^1Camwq^addvzaV4IrJ-RrG#zM2qGoOO-7npfk;i?7n>dea;4FdiNPsq zKg0>!W&&w4ki`Vi4xkot#Q<&C-6D`?lbv`J#Vi)SXcPy;LqHLm;4G!e{B0K!3nVdj z05cAtJxC5+QI!fqCm>aQwq#y_X5cU136Wa{6ErC{K?JEbQ^ccoRo_G{I56OVQf)?V z8pu^9(k;T&3CPt16e8V%BqG};BiuM_-v_o*BlM5TEJPQ8DH%Ed)OA!VfXqUc5)h2n-A0DVG@0OfyGjBU1t#!cXx~DB9x4-K%OT3&zm~O*jWf3Ka2$=H>*+i+oD;(k z)}k6ZtP-x_Vlt*4=Lm6}D`B%a+c+`}F41r}G7QUO${2K}h@shrVqutwE|H-zOfII8 z2xAyry`C8(;%PL@a3K$+bLkp}NXBF6YuPf6P$)rh5fjs(xD1O4XX9)kV1<`>0AO7o zvLayp?ibp=zc)Gr&;Vy{>k935k0F8?dOab)!Ex5Yb|k$hV$*ICViK*U<}X+`Zpv4! zcWi9R=9FE19X00%eUg_=N*_tp`RddgLUpp^$C6I%a2}i{_kQ4|`ztvkFNn*P%*hW4 zs%zM0y1zwCOKIx1)!dZ%=M~>4MQm*qR1UokX3Hlg-~DoN!MiA*U4suAHU!zd-OTKG$9Gnxk%e_Ryc&T$IW*d)o#eLHzw%~a>t&n!Npyovd=2lbU|ML;IaX-S z>mh3)#W{aCJEI{itv|C?FmrOeq-6al z?f|J%lO_+SXT2J4<^00KFrfBp*=yZ!<)mxbICjc#Pv@!FdFJAVG-CycV=QwW-T%)1 z5+~Qeg{hvxOMbk#qQ}GiUZ40-%e4azil{U9`W@DLtsaPYSt^N3+l0oY_q;6SE9@5q z7%L8c09z@bCivA7(yFwOs5bYvmy%fJ>f6%<}{xY%9YUGOKxv zaCYju>+14J#&Zci=X+y$wBN!8)zM?b``K(3wV~wF0l~$)A>BSva~%)(WQ@;S^LE#x zlEU(qat@`@>hqAzo~DuFuI3#9O0|ySZPP55V7JB}^Lvt+A}2fa@1i*`E8XuljBrJJ-ldni~P z3FKK(sn0m;PaJRb^p?MgORsW0>y_8xR;AkVrB%={9e5rcp@{cLfH`>0Ql*D4Pqn=C z{O7@4DV^Pqy%@!AHzsVfPbJ-{chxNzQr%cReJL`m1Y{g$ncuiK-eIh}~TekY^iIyr3T?H^K_U-6@B z$4M)Gx!P>=V(4o@0j4u0oZeUN7Q}Y>=R;wSKIit+LkVY|1O0|e@8`|wO-~F-W|ef6 zVZyq@J7!!vjs57(9}IjG?wn&^_7?wb!NHyT7xi>!iG2@TDDI*LF7HklJsG`*722&^ zI2Pe8|9SfE_{faXYj-zI)oS=0rTBfEa!ea>L><1o#7BdSxP_Xlg@uD_&SOPBp*CJn4&6pFsPe8~@){2_In9P3x%!?#l literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_xiaoai_voice.png b/app/src/main/res/drawable/ic_xiaoai_voice.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4895924c782d369fbf07944d31a575c3c25e27 GIT binary patch literal 6764 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 375f9853b5..347f3e0a85 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1498,4 +1498,5 @@ La fuente de ROM puede no ser oficial de Xiaomi, pero tal vez algunas funciones no funcionen. Póngase en contacto con el proveedor de ROM para obtener más información. La verificación de la firma falló, y la versión actual que está utilizando puede no ser de la versión oficial de Re.chronoRain, que puede contener código malicioso. Consejo: Aquí está el consejo predeterminado. Si puede verlo, significa que hay un problema con HyperCeiler, por favor envíelo al desarrollador a tiempo de manera efectiva. + 小爱同学 diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index ac4ff3f357..f2b74fc736 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -1556,4 +1556,5 @@ Sumber ROM yang Anda gunakan mungkin tidak resmi dari Xiaomi, dan beberapa fungsi mungkin tidak berfungsi, silakan hubungi penyedia yang Anda gunakan untuk detailnya. Verifikasi tanda tangan gagal, dan versi yang Anda gunakan saat ini mungkin bukan dari versi resmi Re.chronoRain, dan mungkin berisi kode berbahaya. Tip: Ini tip default. Jika Anda dapat melihat saya, berarti ada masalah dengan HyperCeiler, harap laporkan kepada pengembang secara tepat waktu dan sopan. + 小爱同学 diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 1ea19682cd..74a4bdc664 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -1583,4 +1583,5 @@ La verifica della firma non è riuscita e il la versione corrente che stai utilizzando potrebbe non provenire dalla versione ufficiale di Re.chronoRain e potrebbe contenere codice dannoso. Suggerimento: ecco il suggerimento predefinito. Se riesci a vedermi significa che c\'è un problema con HyperCeiler, segnalalo allo sviluppatore in modo tempestivo ed efficace. Cerchi qualcos\'altro? + 小爱同学 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index ce6ef4c572..2dc84eec6f 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1611,4 +1611,5 @@ スタックトレース ヒント: デフォルトのヒントはこちらです。 このメッセージが出るということは HyperCeiler に問題があります。 出たら開発者に教えてください。 何か他のものをお探しですか? + 小爱同学 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 68c271be99..972cc14b2f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1619,4 +1619,5 @@ Rastreamento de erros Dica: Aqui está a dica padrão. Se você puder me ver, significa que há um problema com o HyperCeiler. Por favor, informe o desenvolvedor de maneira oportuna e eficaz. Precisa de outras configurações? + 小爱同学 diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 603fd2a917..e5b6cd35a6 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -1446,4 +1446,5 @@ Источник прошивки, который вы используете, может не быть официальным от Xiaomi, и некоторые функции могут не работать, пожалуйста, свяжитесь с автором источника для получения более подробной информации. Сбой проверки подписи и используемая вами версия не может быть из официальной версии Re.chronoRain, и может содержать вредоносный код. Совет: Вот подсказка по умолчанию. Если вы видите меня, это означает, что есть проблема с HyperCeiler, доложите об этом разработчику своевременно и развернуто. + 小爱同学 diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 155074065b..213e4c5168 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -841,4 +841,5 @@ Yöntem 2 (önerilir) Kanca ekle Modu seç + 小爱同学 diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index f9be27139a..72d2e2f55b 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -1652,4 +1652,5 @@ Hãy đảm bảo rằng các ứng dụng hệ thống có siêu dữ liệu is Cài đặt Chế độ máy bay Độ sáng tự động + 小爱同学 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ae32018d2a..b39f31bc79 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1558,7 +1558,8 @@ 解锁提取 PPT 解锁扫文件 - 小爱同学 + 小爱同学 + 小爱语音 禁用对话界面水印 其他 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 582a416f6a..2a70bf349b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1619,4 +1619,5 @@ 堆疊追蹤 提示：這是預設提示。如果你能看到我，則表示 HyperCeiler 有問題，請及時有效地向開發者報告。 在找什麼嗎？ + 小爱同学 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 12deb9bf60..773856432a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1458,6 +1458,7 @@ 解鎖提取 PPT 解鎖掃文件 + 小爱同学 小愛同學 停用聊天浮水印 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0e688caf46..53d0aa59a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1706,4 +1706,5 @@ Auto Brightness VoWiFi SIM1 VoWiFi SIM2 + 小爱同学 diff --git a/app/src/main/res/xml/framework.xml b/app/src/main/res/xml/framework.xml index a4dbd28bc8..70feb01f2d 100644 --- a/app/src/main/res/xml/framework.xml +++ b/app/src/main/res/xml/framework.xml @@ -4,24 +4,24 @@ diff --git a/app/src/main/res/xml/home.xml b/app/src/main/res/xml/home.xml index b9dea693b2..4836ed155b 100644 --- a/app/src/main/res/xml/home.xml +++ b/app/src/main/res/xml/home.xml @@ -5,47 +5,47 @@ + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeGestureSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeLayoutSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeFolderSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeDrawerSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeTitleSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeRecentSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeWidgetSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeDockSettings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.HomeOtherSettings" /> diff --git a/app/src/main/res/xml/home_dock.xml b/app/src/main/res/xml/home_dock.xml index bb8249523d..7689e99709 100644 --- a/app/src/main/res/xml/home_dock.xml +++ b/app/src/main/res/xml/home_dock.xml @@ -54,7 +54,7 @@ diff --git a/app/src/main/res/xml/home_folder.xml b/app/src/main/res/xml/home_folder.xml index 668972029a..0982c97140 100644 --- a/app/src/main/res/xml/home_folder.xml +++ b/app/src/main/res/xml/home_folder.xml @@ -10,7 +10,7 @@ @@ -35,7 +35,7 @@ @@ -68,7 +68,7 @@ @@ -101,7 +101,7 @@ diff --git a/app/src/main/res/xml/home_gesture.xml b/app/src/main/res/xml/home_gesture.xml index 9405ab8b2f..6ce2d9e395 100644 --- a/app/src/main/res/xml/home_gesture.xml +++ b/app/src/main/res/xml/home_gesture.xml @@ -36,61 +36,61 @@ @@ -99,7 +99,7 @@ android:key="prefs_key_home_gesture_swipe_and_stop" android:title="@string/home_gesture_swipe_and_stop" android:summary="@string/home_gesture_swipe_and_stop_desc" - android:fragment="com.sevtinge.hyperceiler.ui.fragment.sub.MultiActionSettings"/--> + android:fragment="com.sevtinge.hyperceiler.ui.sub.MultiActionSettings"/-->
- -
- -
- -
- -
diff --git a/app/src/main/res/xml/home_title.xml b/app/src/main/res/xml/home_title.xml index d8a79fb95c..e7c8aaf5b8 100644 --- a/app/src/main/res/xml/home_title.xml +++ b/app/src/main/res/xml/home_title.xml @@ -86,7 +86,7 @@ android:title="@string/home_title_fix_animation" /> diff --git a/app/src/main/res/xml/home_title_anim.xml b/app/src/main/res/xml/home_title_anim.xml index 2fe5a0c33c..209e731831 100644 --- a/app/src/main/res/xml/home_title_anim.xml +++ b/app/src/main/res/xml/home_title_anim.xml @@ -13,55 +13,55 @@ android:key="prefs_key_home_title_custom_anim_param_9_title" android:title="@string/home_title_custom_anim_param_9_title" android:dependency="prefs_key_home_title_custom_anim_param_main" - android:fragment="com.sevtinge.hyperceiler.ui.fragment.home.anim.HomeTitleAnim9Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim9Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim1Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim2Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim3Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim4Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim5Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim6Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim7Settings" /> + android:fragment="com.sevtinge.hyperceiler.ui.sub.home.anim.HomeTitleAnim8Settings" /> \ No newline at end of file diff --git a/app/src/main/res/xml/prefs_help_cant_see_apps.xml b/app/src/main/res/xml/prefs_help_cant_see_apps.xml index 6f28254087..0feb519748 100644 --- a/app/src/main/res/xml/prefs_help_cant_see_apps.xml +++ b/app/src/main/res/xml/prefs_help_cant_see_apps.xml @@ -1,5 +1,6 @@ - + diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml index e138818352..059b30bdea 100644 --- a/app/src/main/res/xml/prefs_main.xml +++ b/app/src/main/res/xml/prefs_main.xml @@ -17,7 +17,7 @@ app:isPreferenceVisible="false" />