diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/DualRowSignalHook.java b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/DualRowSignalHook.java index 6fff1db70b..68145a5bde 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/DualRowSignalHook.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/DualRowSignalHook.java @@ -33,6 +33,7 @@ public void init() { String[] colorModeList = {"", "dark", "tint"}; // String[] iconStyles = {"", "thick", "theme"}; String selectedIconStyle = mPrefsMap.getString("system_ui_status_mobile_network_icon_style", ""); // 图标样式 + int selectedIconTheme = mPrefsMap.getStringAsInt("system_ui_statusbar_iconmanage_mobile_network_icon_theme", 1); //图标主题 findAndHookMethod("com.android.systemui.SystemUIApplication", lpparam.classLoader, "onCreate", new MethodHook() { private boolean isHooked = false; @@ -47,10 +48,16 @@ protected void after(MethodHookParam param) throws Throwable { for (int slot = 1; slot <= 2; slot++) { for (int lvl = 0; lvl <= 5; lvl++) { for (String colorMode : colorModeList) { - if (!selectedIconStyle.equals("theme") || !colorMode.equals("tint")) { - String dualIconResName = "statusbar_signal_" + slot + "_" + lvl + (!colorMode.equals("") ? ("_" + colorMode) : "") + (!selectedIconStyle.equals("") ? ("_" + selectedIconStyle) : ""); + if (selectedIconTheme == 1) { + String dualIconResName = "statusbar_signal_classic_" + slot + "_" + lvl + (!colorMode.equals("") ? ("_" + colorMode) : ""); int iconResId = modRes.getIdentifier(dualIconResName, "drawable", Helpers.mAppModulePkg); dualSignalResMap.put(dualIconResName, mResHook.addResource(dualIconResName, iconResId)); + } else if (selectedIconTheme == 2) { + if (!selectedIconStyle.equals("theme") || !colorMode.equals("tint")) { + String dualIconResName = "statusbar_signal_oa_" + slot + "_" + lvl + (!colorMode.equals("") ? ("_" + colorMode) : "") + (!selectedIconStyle.equals("") ? ("_" + selectedIconStyle) : ""); + int iconResId = modRes.getIdentifier(dualIconResName, "drawable", Helpers.mAppModulePkg); + dualSignalResMap.put(dualIconResName, mResHook.addResource(dualIconResName, iconResId)); + } } } } @@ -161,8 +168,17 @@ protected void before(final MethodHookParam param) throws Throwable { if (!selectedIconStyle.equals("")) { iconStyle = "_" + selectedIconStyle; } - String sim1IconId = "statusbar_signal_1_" + level1 + colorMode + iconStyle; - String sim2IconId = "statusbar_signal_2_" + subStrengthId + colorMode + iconStyle; + String sim1IconId; + String sim2IconId; + if (selectedIconTheme == 1) { + sim1IconId = "statusbar_signal_classic_1_" + level1 + colorMode; + sim2IconId = "statusbar_signal_classic_2_" + subStrengthId + colorMode; + } else if (selectedIconTheme == 2) { + sim1IconId = "statusbar_signal_oa_1_" + level1 + colorMode + iconStyle; + sim2IconId = "statusbar_signal_oa_2_" + subStrengthId + colorMode + iconStyle; + } else { + throw new RuntimeException("Cannot get selectedIconTheme."); + } int sim1ResId = dualSignalResMap.get(sim1IconId); int sim2ResId = dualSignalResMap.get(sim2IconId); XposedHelpers.callMethod(mMobile, "setImageResource", sim1ResId); diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java index 4e7100ca99..d217b1fd66 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/home/HomeDockSettings.java @@ -48,19 +48,19 @@ public void initPrefs() { mDockBackgroundBlurRadius = findPreference("prefs_key_home_dock_bg_radius"); int mBlurMode = Integer.parseInt(PrefsUtils.getSharedStringPrefs(getContext(), "prefs_key_home_dock_add_blur", "0")); mDockBackgroundBlurEnable = findPreference("prefs_key_home_dock_add_blur"); - setBlurMode(mBlurMode); + setCanBeVisible(mBlurMode); mDockBackgroundBlurEnable.setOnPreferenceChangeListener(this); } @Override public boolean onPreferenceChange(Preference preference, Object o) { if (preference == mDockBackgroundBlurEnable) { - setBlurMode(Integer.parseInt((String) o)); + setCanBeVisible(Integer.parseInt((String) o)); } return true; } - private void setBlurMode(int mode) { + private void setCanBeVisible(int mode) { mDockBackgroundBlur.setVisible(mode == 2); mDockBackgroundBlurRadius.setVisible(mode == 1); } 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/fragment/systemui/statusbar/DoubleLineNetworkSettings.java index a5f96ed8f5..27831b68d5 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/DoubleLineNetworkSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/statusbar/DoubleLineNetworkSettings.java @@ -1,12 +1,23 @@ package com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar; +import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion; + import android.view.View; import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.base.BaseSettingsActivity; import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment; +import com.sevtinge.hyperceiler.utils.PrefsUtils; + +import moralnorm.preference.ColorPickerPreference; +import moralnorm.preference.DropDownPreference; +import moralnorm.preference.Preference; +import moralnorm.preference.SeekBarPreferenceEx; + +public class DoubleLineNetworkSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { -public class DoubleLineNetworkSettings extends SettingsPreferenceFragment { + DropDownPreference mIconTheme; + DropDownPreference mIconStyle; @Override public int getContentResId() { return R.xml.system_ui_status_bar_doubleline_network; @@ -19,4 +30,25 @@ public View.OnClickListener addRestartListener() { "com.android.systemui" ); } + + @Override + public void initPrefs() { + mIconTheme = findPreference("prefs_key_system_ui_statusbar_iconmanage_mobile_network_icon_theme"); + mIconStyle = findPreference("prefs_key_system_ui_status_mobile_network_icon_style"); + + //setCanBeVisible(mBlurMode); + mIconTheme.setOnPreferenceChangeListener(this); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object o) { + if (preference == mIconTheme) { + setCanBeVisible(Integer.parseInt((String) o)); + } + return true; + } + + private void setCanBeVisible(int mode) { + mIconStyle.setVisible(mode == 2); + } } diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_0.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_0.xml new file mode 100644 index 0000000000..e29b2149a7 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_0.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_0_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_0_dark.xml new file mode 100644 index 0000000000..124e6efc49 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_0_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_0_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_0_tint.xml new file mode 100644 index 0000000000..a337b3a50f --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_0_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_1.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_1.xml new file mode 100644 index 0000000000..eae2c710dd --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_1.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_1_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_1_dark.xml new file mode 100644 index 0000000000..b0359ba54f --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_1_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_1_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_1_tint.xml new file mode 100644 index 0000000000..73e5d4282d --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_1_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_2.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_2.xml new file mode 100644 index 0000000000..4e052d4e8f --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_2.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_2_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_2_dark.xml new file mode 100644 index 0000000000..020a23436c --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_2_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_2_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_2_tint.xml new file mode 100644 index 0000000000..941d36e4ce --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_2_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_3.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_3.xml new file mode 100644 index 0000000000..b83083e8f1 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_3.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_3_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_3_dark.xml new file mode 100644 index 0000000000..1b7387a585 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_3_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_3_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_3_tint.xml new file mode 100644 index 0000000000..7e6edfc225 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_3_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_4.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_4.xml new file mode 100644 index 0000000000..5b6aa09f68 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_4.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_4_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_4_dark.xml new file mode 100644 index 0000000000..7ceba30710 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_4_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_4_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_4_tint.xml new file mode 100644 index 0000000000..fb3b0407b0 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_4_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_5.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_5.xml new file mode 100644 index 0000000000..d3693936fa --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_5.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_5_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_5_dark.xml new file mode 100644 index 0000000000..4813c28b27 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_5_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_1_5_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_1_5_tint.xml new file mode 100644 index 0000000000..fc1cc3bf30 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_1_5_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_0.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_0.xml new file mode 100644 index 0000000000..3f73893ebc --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_0.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_0_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_0_dark.xml new file mode 100644 index 0000000000..b77949314f --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_0_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_0_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_0_tint.xml new file mode 100644 index 0000000000..df55cb6cc7 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_0_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_1.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_1.xml new file mode 100644 index 0000000000..e5fabe3667 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_1.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_1_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_1_dark.xml new file mode 100644 index 0000000000..3a22978ec2 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_1_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_1_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_1_tint.xml new file mode 100644 index 0000000000..aee06fcd81 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_1_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_2.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_2.xml new file mode 100644 index 0000000000..52adb3d5df --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_2.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_2_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_2_dark.xml new file mode 100644 index 0000000000..dfc65b1131 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_2_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_2_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_2_tint.xml new file mode 100644 index 0000000000..d9f3a2640b --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_2_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_3.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_3.xml new file mode 100644 index 0000000000..09c0435e13 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_3.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_3_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_3_dark.xml new file mode 100644 index 0000000000..af277a20bf --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_3_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_3_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_3_tint.xml new file mode 100644 index 0000000000..a321a310f2 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_3_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_4.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_4.xml new file mode 100644 index 0000000000..8fc1100b7c --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_4.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_4_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_4_dark.xml new file mode 100644 index 0000000000..35e3b89b1b --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_4_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_4_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_4_tint.xml new file mode 100644 index 0000000000..a574b9e1ad --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_4_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_5.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_5.xml new file mode 100644 index 0000000000..999dc0ffed --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_5.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_5_dark.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_5_dark.xml new file mode 100644 index 0000000000..c681eccf05 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_5_dark.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_classic_2_5_tint.xml b/app/src/main/res/drawable/statusbar_signal_classic_2_5_tint.xml new file mode 100644 index 0000000000..b58220b528 --- /dev/null +++ b/app/src/main/res/drawable/statusbar_signal_classic_2_5_tint.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/statusbar_signal_1_0.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_0_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_0_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_0_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_0_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_0_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_0_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_1_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_1_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_1_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_1_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_1_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_1_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_2_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_2_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_2_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_2_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_2_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_2_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_3_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_3_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_3_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_3_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_3_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_3_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_4_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_4_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_4_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_4_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_4_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_4_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_5_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_1_5_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_1_5_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_1_5_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_1_5_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_1_5_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_0_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_0_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_0_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_0_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_0_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_0_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_1_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_1_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_1_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_1_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_1_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_1_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_2_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_2_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_2_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_2_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_2_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_2_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_3_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_3_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_3_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_3_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_3_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_3_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_4_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_4_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_4_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_4_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_4_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_4_tint_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_dark.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5_dark.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_dark.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_dark.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_dark_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_5_dark_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_dark_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_dark_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_dark_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5_dark_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_dark_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_dark_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_theme.webp b/app/src/main/res/drawable/statusbar_signal_oa_2_5_theme.webp similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_theme.webp rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_theme.webp diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_thick.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_tint.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5_tint.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_tint.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_tint.xml diff --git a/app/src/main/res/drawable/statusbar_signal_2_5_tint_thick.xml b/app/src/main/res/drawable/statusbar_signal_oa_2_5_tint_thick.xml similarity index 100% rename from app/src/main/res/drawable/statusbar_signal_2_5_tint_thick.xml rename to app/src/main/res/drawable/statusbar_signal_oa_2_5_tint_thick.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 716dc8c020..4fbba73405 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -503,6 +503,9 @@ 双击状态栏锁屏 双排移动网络图标 + 图标主题 + 经典 + 圆滑 图标样式 图标缩放 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 4285442ed2..aa85781263 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -671,4 +671,14 @@ 4 + + @string/system_ui_statusbar_iconmanage_mobile_network_icon_theme_classic + @string/system_ui_statusbar_iconmanage_mobile_network_icon_theme_oa + + + + 1 + 2 + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7db661c93f..d38e0d62a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1362,6 +1362,9 @@ Custom device watermark Manufacturer Information Device Information + Icon themes + Classic + Origin Architecture Tip: Here\'s a tip! Tip: You can support us by donating in \"About - Support\". diff --git a/app/src/main/res/xml/system_ui_status_bar_doubleline_network.xml b/app/src/main/res/xml/system_ui_status_bar_doubleline_network.xml index 726b771259..4c10f9e969 100644 --- a/app/src/main/res/xml/system_ui_status_bar_doubleline_network.xml +++ b/app/src/main/res/xml/system_ui_status_bar_doubleline_network.xml @@ -7,6 +7,14 @@ android:key="prefs_key_system_ui_statusbar_network_icon_enable" android:title="@string/enable" /> + +