diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7fdffe1d4d..aee883f475 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,6 +50,7 @@ tools:ignore="ProtectedPermissions" /> + DialogHelper.showCanaryTipsDialog(requireActivity(), "当前版本是UI线路,可能包含各种不稳定因素")); mViewPager = view.findViewById(R.id.viewpager); registerCoordinateScrollView(mViewPager); Navigator.get(this).setTabSelectListener((menuItem, info) -> { 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 index 3c4f6b202d..361dc233c1 100644 --- 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 @@ -1,6 +1,7 @@ package com.sevtinge.hyperceiler.ui.settings.core.lifecycle; import android.content.Context; +import android.content.SharedPreferences; import android.os.Bundle; import androidx.annotation.Nullable; @@ -25,4 +26,13 @@ protected void setSharedPreferences(PreferenceManager preferenceManager) { preferenceManager.setSharedPreferencesMode(Context.MODE_PRIVATE); preferenceManager.setStorageDeviceProtected(); } + + + public SharedPreferences getSharedPreferences() { + return PrefsUtils.mSharedPreferences; + } + + public boolean hasKey(String key) { + return getSharedPreferences().contains(key); + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java index abc55373e7..74a1c48352 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/settings/utils/SettingsFeatures.java @@ -27,4 +27,8 @@ public static boolean isScreenLayoutLarge(Context context) { public static boolean isSplitTablet(Context context) { return isPadDevice() || (isFoldDevice() && isScreenLayoutLarge(context)); } + + public static boolean isMiuiXIISdkSupported() { + return BuildCompat.MIUI_VERSION_CODE >= 10; + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java index 245d48148c..6ba9420187 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/AodFragment.java @@ -21,13 +21,14 @@ 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.SwitchPreference; -public class AodFragment extends SettingsPreferenceFragment { +public class AodFragment extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.aod; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java index 7ea2bd2cc9..733edadcec 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CameraFragment.java @@ -21,12 +21,13 @@ 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; -public class CameraFragment extends SettingsPreferenceFragment { +public class CameraFragment extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return isMoreHyperOSVersion(1f) ? R.xml.camera_new : R.xml.camera; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java index 3b273247d7..377cce09d3 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/CustomBackgroundSettings.java @@ -21,6 +21,7 @@ import android.os.Bundle; 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; @@ -29,7 +30,7 @@ import fan.preference.SeekBarPreference; import fan.preference.SwitchPreference; -public class CustomBackgroundSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class CustomBackgroundSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { private String mKey = ""; private String mCustomBackgroundEnabledKey; @@ -48,7 +49,7 @@ public class CustomBackgroundSettings extends SettingsPreferenceFragment impleme private SeekBarPreference mBlurRadiusPreference; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.custom_background; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java index 784db46175..5efd795f18 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MainFragment.java @@ -44,6 +44,7 @@ import com.sevtinge.hyperceiler.prefs.PreferenceHeader; import com.sevtinge.hyperceiler.prefs.TipsPreference; import com.sevtinge.hyperceiler.ui.MainActivityContextHelper; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.ui.sub.helper.HomepageEntrance; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; @@ -59,7 +60,7 @@ import fan.preference.Preference; -public class MainFragment extends SettingsPreferenceFragment implements HomepageEntrance.EntranceState { +public class MainFragment extends DashboardFragment implements HomepageEntrance.EntranceState { Preference mSecurityCenter; Preference mMiLink; @@ -92,7 +93,7 @@ public void onCreate(Bundle savedInstanceState) { } @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.prefs_main; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java index 4a0c055470..d5adbf745f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiLinkFragment.java @@ -21,16 +21,17 @@ 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.SwitchPreference; -public class MiLinkFragment extends SettingsPreferenceFragment { +public class MiLinkFragment extends DashboardFragment { SwitchPreference mUnlockHMind; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.milink; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java index b14c1dde57..e0e0840c45 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MiShareFragment.java @@ -19,16 +19,17 @@ package com.sevtinge.hyperceiler.ui.sub; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SwitchPreference; -public class MiShareFragment extends SettingsPreferenceFragment { +public class MiShareFragment extends DashboardFragment { SwitchPreference mMiShareNotAuto; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.mishare; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java index 5ad06f85f2..3031052683 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/MultiActionSettings.java @@ -27,13 +27,14 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.SubPickerActivity; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; import fan.preference.Preference; import fan.preference.RadioButtonPreference; -public class MultiActionSettings extends SettingsPreferenceFragment { +public class MultiActionSettings extends DashboardFragment { Bundle args; String mKey = null; @@ -54,7 +55,7 @@ public class MultiActionSettings extends SettingsPreferenceFragment { Preference mAppSelector; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_multi_action; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java index 56323d0dbb..65225f6aef 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/NfcFragment.java @@ -22,13 +22,14 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class NfcFragment extends SettingsPreferenceFragment { +public class NfcFragment extends DashboardFragment { RecommendPreference mRecommend; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.nfc; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java index b16509b080..d1a7297909 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PersonalAssistantFragment.java @@ -21,6 +21,7 @@ import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; 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; @@ -29,7 +30,7 @@ import fan.preference.Preference; import fan.preference.SeekBarPreferenceCompat; -public class PersonalAssistantFragment extends SettingsPreferenceFragment +public class PersonalAssistantFragment extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mBlurBackground; @@ -38,7 +39,7 @@ public class PersonalAssistantFragment extends SettingsPreferenceFragment DropDownPreference mBlurBackgroundStyle; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.personal_assistant; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java index 41876ec695..a7fb6ea703 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/PhoneFragment.java @@ -19,16 +19,17 @@ package com.sevtinge.hyperceiler.ui.sub; 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.shell.ShellInit; import fan.preference.Preference; -public class PhoneFragment extends SettingsPreferenceFragment { +public class PhoneFragment extends DashboardFragment { Preference mPhone; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.phone; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java index 46bf869fc1..173854ee82 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SoGouFragment.java @@ -19,16 +19,17 @@ package com.sevtinge.hyperceiler.ui.sub; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class SoGouFragment extends SettingsPreferenceFragment { +public class SoGouFragment extends DashboardFragment { String[] all = new String[]{ "com.sohu.inputmethod.sogou.xiaomi", "com.sohu.inputmethod.sogou" }; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.sogou_xiaomi; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java index c739d77388..73f5769f43 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemFrameworkFragment.java @@ -21,6 +21,7 @@ import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion; 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.devicesdk.TelephonyManager; import com.sevtinge.hyperceiler.utils.prefs.PrefsUtils; @@ -28,7 +29,7 @@ import fan.preference.Preference; import fan.preference.SwitchPreference; -public class SystemFrameworkFragment extends SettingsPreferenceFragment { +public class SystemFrameworkFragment extends DashboardFragment { SwitchPreference mDisableCreak; SwitchPreference mShareUser; SwitchPreference mDisableIntegrity; @@ -36,7 +37,7 @@ public class SystemFrameworkFragment extends SettingsPreferenceFragment { Preference mNetwork; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java index 7930f89896..1615451f6f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/SystemSettingsFragment.java @@ -29,13 +29,15 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.utils.log.AndroidLogUtils; import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class SystemSettingsFragment extends SettingsPreferenceFragment { +public class SystemSettingsFragment extends DashboardFragment { + SwitchPreference mNewNfc; // 新版 NFC 界面 SwitchPreference mAreaScreenshot; // 区域截屏 SwitchPreference mHighMode; // 极致模式 @@ -46,7 +48,7 @@ public class SystemSettingsFragment extends SettingsPreferenceFragment { RecommendPreference mRecommend; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_settings; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java index 7d366d1fc7..cd10bd97b2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/TestFragment.java @@ -18,7 +18,13 @@ */ package com.sevtinge.hyperceiler.ui.sub; -import androidx.fragment.app.Fragment; -public class TestFragment extends Fragment { +import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; + +public class TestFragment extends DashboardFragment { + @Override + protected int getPreferenceScreenResId() { + return R.xml.xiaoai; + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java index e0d112cb70..741fc5ae36 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/DisplaySettings.java @@ -23,15 +23,16 @@ import com.sevtinge.hyperceiler.R; import fan.preference.SeekBarPreferenceCompat; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class DisplaySettings extends SettingsPreferenceFragment { +public class DisplaySettings extends DashboardFragment { SeekBarPreferenceCompat minBrightness; SeekBarPreferenceCompat maxBrightness; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework_display; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java index 57b9db6a72..b7e8f2cf11 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/FreeFormSettings.java @@ -24,16 +24,17 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SwitchPreference; -public class FreeFormSettings extends SettingsPreferenceFragment { +public class FreeFormSettings extends DashboardFragment { SwitchPreference mMoreFreeForm; // 多小窗 @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework_freeform; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java index b598ffd527..7a45a6a9d1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/NetworkSettings.java @@ -22,14 +22,15 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.sub.PhoneFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class NetworkSettings extends SettingsPreferenceFragment { +public class NetworkSettings extends DashboardFragment { RecommendPreference mRecommend; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework_phone; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java index 689fc92170..3207d7c69c 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/OtherSettings.java @@ -31,6 +31,7 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.ui.sub.AppPicker; import com.sevtinge.hyperceiler.utils.KillApp; @@ -42,7 +43,7 @@ import fan.preference.Preference; import fan.preference.SwitchPreference; -public class OtherSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class OtherSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { Preference mCleanShareApps; Preference mCleanOpenApps; @@ -59,7 +60,7 @@ public class OtherSettings extends SettingsPreferenceFragment implements Prefere Handler handler; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework_other; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java index 25e064d986..4c04d475db 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/framework/VolumeSettings.java @@ -24,18 +24,19 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.DropDownPreference; import fan.preference.SwitchPreference; -public class VolumeSettings extends SettingsPreferenceFragment { +public class VolumeSettings extends DashboardFragment { DropDownPreference mDefaultVolumeStream; SwitchPreference mVolumeSeparateControl; SwitchPreference mVolumeSeparateSlider; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.framework_volume; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java index 88a9e1e262..d533d6a53e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/CantSeeAppsFragment.java @@ -20,16 +20,17 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.PreferenceHeader; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.Preference; -public class CantSeeAppsFragment extends SettingsPreferenceFragment { +public class CantSeeAppsFragment extends DashboardFragment { Preference mHelpCantSeeApps; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.prefs_help_cant_see_apps; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java index 7c8760822e..2a6b007897 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/helper/HomepageEntrance.java @@ -6,6 +6,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.PackagesUtils; import com.sevtinge.hyperceiler.utils.ThreadPoolManager; @@ -20,7 +21,7 @@ import fan.preference.Preference; import fan.preference.SwitchPreference; -public class HomepageEntrance extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class HomepageEntrance extends DashboardFragment implements Preference.OnPreferenceChangeListener { public static final String ANDROID_NS = "http://schemas.android.com/apk/res/android"; private boolean isInit = false; @@ -28,7 +29,7 @@ public class HomepageEntrance extends SettingsPreferenceFragment implements Pref private static EntranceState entranceState = null; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.prefs_set_homepage_entrance; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java index 4e18492c4e..cbf0ec404e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDockSettings.java @@ -23,6 +23,7 @@ import android.view.View; 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; @@ -31,7 +32,7 @@ import fan.preference.Preference; import fan.preference.SwitchPreference; -public class HomeDockSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class HomeDockSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { SwitchPreference mDisableRecentIcon; Preference mDockBackgroundBlur; @@ -39,7 +40,7 @@ public class HomeDockSettings extends SettingsPreferenceFragment implements Pref ColorPickerPreference mDockBackgroundColor; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_dock; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java index 91918d6e4f..02234545b2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeDrawerSettings.java @@ -21,12 +21,13 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeDrawerSettings extends SettingsPreferenceFragment { +public class HomeDrawerSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_drawer; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java index fe4aca333c..5d12d96fc3 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeFolderSettings.java @@ -24,6 +24,7 @@ import android.view.View; 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; @@ -31,7 +32,7 @@ import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class HomeFolderSettings extends SettingsPreferenceFragment { +public class HomeFolderSettings extends DashboardFragment { DropDownPreference mFolderShade; SeekBarPreferenceCompat mFolderShadeLevel; @@ -45,7 +46,7 @@ public class HomeFolderSettings extends SettingsPreferenceFragment { SwitchPreference mSmallFolderIconBackgroundCustom3; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_folder; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java index 48407f01ba..17e7887303 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeGestureSettings.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeGestureSettings extends SettingsPreferenceFragment { +public class HomeGestureSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_gesture; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java index 73b5bd78f1..b7c0d67152 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeLayoutSettings.java @@ -21,12 +21,13 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeLayoutSettings extends SettingsPreferenceFragment { +public class HomeLayoutSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_layout; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java index f98f6b59bf..6d8e3f3b30 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeOtherSettings.java @@ -23,17 +23,18 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SwitchPreference; -public class HomeOtherSettings extends SettingsPreferenceFragment{ +public class HomeOtherSettings extends DashboardFragment { SwitchPreference mEnableMoreSettings; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_other; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java index 80f48261b1..c78f5cc0f2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeRecentSettings.java @@ -24,11 +24,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SwitchPreference; -public class HomeRecentSettings extends SettingsPreferenceFragment { +public class HomeRecentSettings extends DashboardFragment { SwitchPreference mDimming; SwitchPreference mShowMenInfo; @@ -36,7 +37,7 @@ public class HomeRecentSettings extends SettingsPreferenceFragment { SwitchPreference mNotHideCleanIcon; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_recent; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java index f623b3d78e..0066bdb550 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleAnimSettings.java @@ -23,15 +23,16 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.Preference; -public class HomeTitleAnimSettings extends SettingsPreferenceFragment { +public class HomeTitleAnimSettings extends DashboardFragment { Preference mPage1; Preference mPage9; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java index a329066471..b87d537565 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeTitleSettings.java @@ -27,13 +27,14 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.ui.sub.AppPicker; import fan.preference.Preference; import fan.preference.SwitchPreference; -public class HomeTitleSettings extends SettingsPreferenceFragment { +public class HomeTitleSettings extends DashboardFragment { SwitchPreference mDisableMonoChrome; SwitchPreference mDisableMonetColor; @@ -42,7 +43,7 @@ public class HomeTitleSettings extends SettingsPreferenceFragment { RecommendPreference mRecommend; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java index 8bf797c430..5d419a660f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/HomeWidgetSettings.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeWidgetSettings extends SettingsPreferenceFragment { +public class HomeWidgetSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_widget; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java index 88aef2444e..a5a05cae7a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim1Settings.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeTitleAnim1Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim1Settings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_1; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java index 14fa96e24e..012a9b4724 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim2Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim2Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim2Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -42,7 +43,7 @@ public class HomeTitleAnim2Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mSA; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_2; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java index eb17b994d6..4052158128 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim3Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim3Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim3Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -37,7 +38,7 @@ public class HomeTitleAnim3Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mDRR; SeekBarPreferenceCompat mSRR; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_3; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java index eae3aa2d05..741ee3a16a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim4Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim4Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim4Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -42,7 +43,7 @@ public class HomeTitleAnim4Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mSA; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_4; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java index 4bbbebc1b4..4633b355e7 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim5Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim5Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim5Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -42,7 +43,7 @@ public class HomeTitleAnim5Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mSA; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_5; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java index ac4760d631..395cff938b 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim6Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim6Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim6Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -42,7 +43,7 @@ public class HomeTitleAnim6Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mSA; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_6; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java index 5617f32c79..10ede5d6c9 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim7Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim7Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim7Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; SeekBarPreferenceCompat mDRCY; @@ -37,7 +38,7 @@ public class HomeTitleAnim7Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mDRR; SeekBarPreferenceCompat mSRR; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_7; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java index fc01e855b6..59efb4cf94 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim8Settings.java @@ -23,11 +23,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SeekBarPreferenceCompat; -public class HomeTitleAnim8Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim8Settings extends DashboardFragment { SeekBarPreferenceCompat mDRCX; SeekBarPreferenceCompat mSRCX; @@ -39,7 +40,7 @@ public class HomeTitleAnim8Settings extends SettingsPreferenceFragment { SeekBarPreferenceCompat mSRR; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_8; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java index 5054125f74..bb034bee52 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/home/anim/HomeTitleAnim9Settings.java @@ -3,11 +3,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class HomeTitleAnim9Settings extends SettingsPreferenceFragment { +public class HomeTitleAnim9Settings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.home_title_anim_9; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java index 527619b39e..5228655701 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/ApplicationsSettings.java @@ -1,11 +1,12 @@ package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; -public class ApplicationsSettings extends SecurityCenterBaseSettings { +public class ApplicationsSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.security_center_app; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java index e82a34ae5f..c6fcf21875 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/BatterySettings.java @@ -1,10 +1,11 @@ package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; -public class BatterySettings extends SecurityCenterBaseSettings { +public class BatterySettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.security_center_battery; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java index db847d1981..3574f9a167 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/OtherSettings.java @@ -1,11 +1,12 @@ package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; -public class OtherSettings extends SecurityCenterBaseSettings { +public class OtherSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.security_center_other; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java index 0cba8ff11a..2578e79561 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/PrivacySafetySettings.java @@ -7,16 +7,17 @@ import androidx.core.content.PermissionChecker; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import fan.preference.SwitchPreference; -public class PrivacySafetySettings extends SecurityCenterBaseSettings { +public class PrivacySafetySettings extends DashboardFragment { SwitchPreference mAiClipboard; SwitchPreference mBlurLocation; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.security_center_privacy_safety; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java deleted file mode 100644 index fe245c2df9..0000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SecurityCenterBaseSettings.java +++ /dev/null @@ -1,14 +0,0 @@ -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; - -import android.view.View; - -import com.sevtinge.hyperceiler.R; -import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; - -public abstract class SecurityCenterBaseSettings extends SettingsPreferenceFragment { - - String mSecurity; -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java index 29f9f026cd..7f88294785 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/securitycenter/SidebarSettings.java @@ -1,10 +1,11 @@ package com.sevtinge.hyperceiler.ui.sub.securitycenter; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; -public class SidebarSettings extends SecurityCenterBaseSettings { +public class SidebarSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.security_center_sidebar; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java index dbd5cf32cb..c18b32e63e 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/CardTileSettings.java @@ -4,17 +4,13 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class CardTileSettings extends SettingsPreferenceFragment { +public class CardTileSettings extends DashboardFragment { @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_control_center_card_tile; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java index f35fb95d37..3a6c9a139b 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/ControlCenterSettings.java @@ -27,6 +27,7 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; import com.sevtinge.hyperceiler.ui.SubPickerActivity; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import com.sevtinge.hyperceiler.ui.sub.AppPicker; import com.sevtinge.hyperceiler.utils.KillApp; @@ -40,7 +41,7 @@ import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class ControlCenterSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class ControlCenterSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { Preference mExpandNotification; PreferenceCategory mMusic; @@ -64,7 +65,7 @@ public class ControlCenterSettings extends SettingsPreferenceFragment implements Handler handler; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_control_center; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java index 84639d5751..68ba52bcf1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/LockScreenSettings.java @@ -26,18 +26,19 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.SwitchPreference; -public class LockScreenSettings extends SettingsPreferenceFragment { +public class LockScreenSettings extends DashboardFragment { SwitchPreference mShowSec; // 时钟显示秒数 SwitchPreference mForceSystemFonts; // 时钟使用系统字体 SwitchPreference mPasswordFree; // 开机免输入密码 SwitchPreference mChangingCVTime; // 充电信息显示刷新间隔 @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_lock_screen; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java index dd922a8574..10f9bd0ef6 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/NavigationSettings.java @@ -22,19 +22,20 @@ import android.view.View; 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 fan.preference.PreferenceCategory; import fan.preference.SwitchPreference; -public class NavigationSettings extends SettingsPreferenceFragment { +public class NavigationSettings extends DashboardFragment { SwitchPreference customNav; PreferenceCategory mNav; SwitchPreference navigation; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_navigation; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java index fa551281fe..349f8571de 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java @@ -26,12 +26,13 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.prefs.RecommendPreference; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.Preference; import fan.preference.PreferenceCategory; -public class StatusBarSettings extends SettingsPreferenceFragment { +public class StatusBarSettings extends DashboardFragment { Preference mClockStatus; // 时钟指示器 Preference mDeviceStatus; // 硬件指示器 @@ -41,7 +42,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment { RecommendPreference mRecommend; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java index ee17ff0b47..f4f134ca5f 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/SystemUIOtherSettings.java @@ -28,13 +28,14 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.DropDownPreference; import fan.preference.PreferenceCategory; import fan.preference.SwitchPreference; -public class SystemUIOtherSettings extends SettingsPreferenceFragment { +public class SystemUIOtherSettings extends DashboardFragment { DropDownPreference mChargeAnimationStyle; PreferenceCategory mChargeAnimationTitle; @@ -46,7 +47,7 @@ public class SystemUIOtherSettings extends SettingsPreferenceFragment { SwitchPreference mPctUseBlur; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_other; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java index 7b50ef1d64..3a1fa879c1 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryDetailIndicatorSettings.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class BatteryDetailIndicatorSettings extends SettingsPreferenceFragment { +public class BatteryDetailIndicatorSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_hardware_detail_indicator; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java index 8570de7484..81acbc7468 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryIndicatorSettings.java @@ -21,6 +21,7 @@ import android.content.Intent; 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,7 +29,7 @@ import fan.preference.DropDownPreference; import fan.preference.Preference; -public class BatteryIndicatorSettings extends SettingsPreferenceFragment { +public class BatteryIndicatorSettings extends DashboardFragment { DropDownPreference mBatteryIndicatorColor; ColorPickerPreference mBatteryIndicatorFullPower; @@ -38,7 +39,7 @@ public class BatteryIndicatorSettings extends SettingsPreferenceFragment { Preference mBatteryIndicatorTest; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_battery_indicator; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java index 2ff9c42a5f..570f03f2d2 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/BatteryStyleSettings.java @@ -21,9 +21,10 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class BatteryStyleSettings extends SettingsPreferenceFragment { +public class BatteryStyleSettings extends DashboardFragment { @Override - public int getContentResId() { return R.xml.system_ui_status_bar_battery_styles; } + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_battery_styles; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java index 3b0a11bbed..fced5a99c8 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/ClockIndicatorSettings.java @@ -21,6 +21,7 @@ import android.view.View; 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; @@ -29,7 +30,7 @@ import fan.preference.PreferenceCategory; import fan.preference.SeekBarPreferenceCompat; -public class ClockIndicatorSettings extends SettingsPreferenceFragment +public class ClockIndicatorSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mClockModePreference; @@ -38,7 +39,7 @@ public class ClockIndicatorSettings extends SettingsPreferenceFragment SeekBarPreferenceCompat mWidth; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_clock_indicator; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java index 3fd4b1967d..a7e70dfbbe 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/DoubleLineNetworkSettings.java @@ -21,17 +21,18 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; import fan.preference.DropDownPreference; import fan.preference.Preference; -public class DoubleLineNetworkSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { +public class DoubleLineNetworkSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mIconTheme; DropDownPreference mIconStyle; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_doubleline_network; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java index e880cdd363..aa9e803c09 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageNewSettings.java @@ -6,6 +6,7 @@ import android.view.View; 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; @@ -13,7 +14,7 @@ import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class IconManageNewSettings extends SettingsPreferenceFragment { +public class IconManageNewSettings extends DashboardFragment { DropDownPreference mAlarmClockIcon; SeekBarPreferenceCompat mAlarmClockIconN; @@ -23,7 +24,7 @@ public class IconManageNewSettings extends SettingsPreferenceFragment { SwitchPreference mBatteryPercentage; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_icon_manage_new; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java index e186d9a785..833966356b 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/IconManageSettings.java @@ -23,6 +23,7 @@ import android.view.View; 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; @@ -30,7 +31,7 @@ import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class IconManageSettings extends SettingsPreferenceFragment { +public class IconManageSettings extends DashboardFragment { DropDownPreference mAlarmClockIcon; SeekBarPreferenceCompat mAlarmClockIconN; @@ -40,7 +41,7 @@ public class IconManageSettings extends SettingsPreferenceFragment { SwitchPreference mBatteryPercentage; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_icon_manage; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java index 1df7782169..77ca9e6c4b 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/MobileNetworkTypeSettings.java @@ -21,6 +21,7 @@ import android.view.View; 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; @@ -29,7 +30,7 @@ import fan.preference.PreferenceCategory; import fan.preference.SwitchPreference; -public class MobileNetworkTypeSettings extends SettingsPreferenceFragment +public class MobileNetworkTypeSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { DropDownPreference mMobileMode; @@ -37,7 +38,7 @@ public class MobileNetworkTypeSettings extends SettingsPreferenceFragment SwitchPreference mMobileType; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_mobile_network_type; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java index fd89480fb4..604154c673 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NetworkSpeedIndicatorSettings.java @@ -24,6 +24,7 @@ import android.view.View; 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; @@ -32,7 +33,7 @@ import fan.preference.SeekBarPreferenceCompat; import fan.preference.SwitchPreference; -public class NetworkSpeedIndicatorSettings extends SettingsPreferenceFragment +public class NetworkSpeedIndicatorSettings extends DashboardFragment implements Preference.OnPreferenceChangeListener { SeekBarPreferenceCompat mNetworkSpeedWidth; // 固定宽度 @@ -45,7 +46,7 @@ public class NetworkSpeedIndicatorSettings extends SettingsPreferenceFragment DropDownPreference mNetworkIcon; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_network_speed_indicator; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java index 95da2b384c..a0b6ec35d9 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/NewClockIndicatorSettings.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class NewClockIndicatorSettings extends SettingsPreferenceFragment { +public class NewClockIndicatorSettings extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_new_clock_indicator; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java index 8a18531719..82f9dc9549 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/StrongToastSettings.java @@ -21,17 +21,18 @@ import android.view.View; 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.api.miuiStringToast.MiuiStringToast; import fan.preference.Preference; -public class StrongToastSettings extends SettingsPreferenceFragment { +public class StrongToastSettings extends DashboardFragment { Preference mShortToast; Preference mLongToast; @Override - public int getContentResId() { return R.xml.system_ui_status_bar_strong_toast; } + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_strong_toast; } @Override public void initPrefs() { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java index c88583dd22..e037a1f5b8 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/BigClock.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class BigClock extends SettingsPreferenceFragment { +public class BigClock extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_new_clock_indicator_2; } } \ No newline at end of file diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java index c6473e82e5..01bf978eda 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/SmallClock.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class SmallClock extends SettingsPreferenceFragment { +public class SmallClock extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_new_clock_indicator_3; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java index c69a07cb88..ca2c8c0b3a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/statusbar/clock/StatusBarClock.java @@ -21,11 +21,12 @@ import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class StatusBarClock extends SettingsPreferenceFragment { +public class StatusBarClock extends DashboardFragment { @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.system_ui_status_bar_new_clock_indicator_1; } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java index 642522f717..affea76521 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AOSPSettings.java @@ -1,27 +1,30 @@ /* - * This file is part of HyperCeiler. + * 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. + * 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. + * 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 . + * 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 -*/ + * Copyright (C) 2023-2024 HyperCeiler Contributions + */ package com.sevtinge.hyperceiler.ui.sub.various; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class AOSPSettings extends SettingsPreferenceFragment { +public class AOSPSettings extends DashboardFragment { @Override - public int getContentResId() { return R.xml.various_aosp; } + protected int getPreferenceScreenResId() { + return R.xml.various_aosp; + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java index 6c376fe95d..f41bf14299 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/AlertDialogSettings.java @@ -19,20 +19,21 @@ package com.sevtinge.hyperceiler.ui.sub.various; 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; import fan.preference.DropDownPreference; import fan.preference.SeekBarPreferenceCompat; -public class AlertDialogSettings extends SettingsPreferenceFragment { +public class AlertDialogSettings extends DashboardFragment { private DropDownPreference mDialogGravity; private SeekBarPreferenceCompat mDialogHorizontalMargin; private SeekBarPreferenceCompat mDialogBottomMargin; @Override - public int getContentResId() { + protected int getPreferenceScreenResId() { return R.xml.various_dialog; } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java index 6fd00dbaf7..806f4b28a5 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/various/MiPadSettings.java @@ -1,29 +1,32 @@ /* - * This file is part of HyperCeiler. + * 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. + * 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. + * 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 . + * 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 -*/ + * Copyright (C) 2023-2024 HyperCeiler Contributions + */ package com.sevtinge.hyperceiler.ui.sub.various; import android.view.View; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.dashboard.DashboardFragment; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; -public class MiPadSettings extends SettingsPreferenceFragment { +public class MiPadSettings extends DashboardFragment { @Override - public int getContentResId() { return R.xml.various_mipad; } + protected int getPreferenceScreenResId() { + return R.xml.various_mipad; + } } diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/CtaUtils.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/CtaUtils.java index 4c23e364e6..a804025393 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/utils/CtaUtils.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/utils/CtaUtils.java @@ -22,8 +22,10 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.widget.Toast; import com.sevtinge.hyperceiler.R; +import com.sevtinge.hyperceiler.ui.settings.utils.SettingsFeatures; public class CtaUtils { private static final String APP_PERMISSION_MANAGE_PKG = "com.miui.securitycenter"; @@ -51,27 +53,28 @@ public static boolean isCtaEnabled(Context context) { } public static boolean showCtaDialog(Activity activity, int requestCode) { - Intent intent = new Intent(); - int mActivities = activity.getPackageManager().queryIntentActivities(intent, 0).size(); - intent.setAction(mActivities > 0 ? ACTION_START_CTA_V2_NEW : ACTION_START_CTA_V2); - intent.setPackage(APP_PERMISSION_MANAGE_PKG); - intent.putExtra(KEY_MANDATORY_PERMISSION, true); + Intent intent = new Intent(ACTION_START_CTA_V2_NEW); intent.putExtra("all_purpose", activity.getString(R.string.new_cta_app_all_purpose_title)); - intent.putExtra("runtime_perm", getRuntimePermission()); - intent.putExtra("runtime_perm_desc", getRuntimePermissionDesc(activity)); - intent.putExtra(KEY_OPTIONAL_PERM, getOptionalPermission()); - intent.putExtra(KEY_OPTIONAL_PERM_DESC, getOptionalPermissionDesc(activity)); - intent.putExtra(KEY_OPTIONAL_PERM_SHOW, false); - intent.putExtra(KEY_AGREE_DESC, activity.getResources().getString(R.string.new_cta_agree_desc)); + intent.putExtra(KEY_MANDATORY_PERMISSION, false); + intent.putExtra(KEY_USE_NETWORK, false); + if (SettingsFeatures.isMiuiXIISdkSupported()) { + intent.putExtra(KEY_OPTIONAL_PERM, getOptionalPermission()); + intent.putExtra(KEY_OPTIONAL_PERM_DESC, getOptionalPermissionDesc(activity)); + intent.putExtra(KEY_OPTIONAL_PERM_SHOW, false); + intent.putExtra(KEY_AGREE_DESC, activity.getResources().getString(R.string.new_cta_agree_desc)); + } else { + intent.putExtra("runtime_perm", getRuntimePermission()); + intent.putExtra("runtime_perm_desc", getRuntimePermissionDesc(activity)); + } + intent.putExtra("user_agreement", "https://hyperceiler.sevtinge.cc/Protocol"); intent.putExtra("privacy_policy", "https://hyperceiler.sevtinge.cc/Privacy"); - intent.putExtra(KEY_USE_NETWORK, false); - intent.putExtra(KEY_SHOW_LOCK, false); + intent.setPackage(APP_PERMISSION_MANAGE_PKG); try { - /*if (!supportNewPermissionStyle() || activity.getPackageManager().queryIntentActivities(intent, 0).size() <= 0) { - return false; - }*/ - activity.startActivityForResult(intent, requestCode); + int mActivities = activity.getPackageManager().queryIntentActivities(intent, 0).size(); + if (mActivities > 0) { + activity.startActivityForResult(intent, requestCode); + } return true; } catch (Exception unused) { return false; diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/DialogHelper.java b/app/src/main/java/com/sevtinge/hyperceiler/utils/DialogHelper.java index c357c7040f..2580dd1443 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/utils/DialogHelper.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/utils/DialogHelper.java @@ -32,6 +32,14 @@ public class DialogHelper { + public static void showCanaryTipsDialog(Activity activity, String message) { + new AlertDialog.Builder(activity) + .setTitle(R.string.tip) + .setMessage(message) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + public static void showDialog(Activity activity, String title, String message) { showDialog(activity, title, message, null); } diff --git a/app/src/main/res/drawable/ic_test_tips_bg.xml b/app/src/main/res/drawable/ic_test_tips_bg.xml new file mode 100644 index 0000000000..e9a2e3dc92 --- /dev/null +++ b/app/src/main/res/drawable/ic_test_tips_bg.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml index 7976c075ef..57cbebf000 100644 --- a/app/src/main/res/layout/fragment_content.xml +++ b/app/src/main/res/layout/fragment_content.xml @@ -8,6 +8,27 @@ + android:layout_height="match_parent" + android:paddingBottom="120dp"/> + + + + + + diff --git a/app/src/main/res/xml/framework.xml b/app/src/main/res/xml/framework.xml index 70feb01f2d..8699304c39 100644 --- a/app/src/main/res/xml/framework.xml +++ b/app/src/main/res/xml/framework.xml @@ -1,5 +1,6 @@ - + @@ -75,7 +76,8 @@ android:defaultValue="false" android:key="prefs_key_system_framework_disable_low_api_check" android:summary="@string/system_framework_disable_low_api_check_desc" - android:title="@string/system_framework_disable_low_api_check" /> + android:title="@string/system_framework_disable_low_api_check" + app:controller="com.sevtinge.hyperceiler.controller.DisableLowApiCheckController"/> diff --git a/app/src/main/res/xml/home_header.xml b/app/src/main/res/xml/home_header.xml index 22e71eceaa..29f7652af2 100644 --- a/app/src/main/res/xml/home_header.xml +++ b/app/src/main/res/xml/home_header.xml @@ -1,5 +1,6 @@ +
+ android:title="@string/system_ui_control_center_card_tiles_customization_notice" />