Cherish:Comeback DU Themes
@hungphan2001: Bring for CherishOS v2.x Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
committed by
Hưng Phan
parent
e6308bab52
commit
3f235e368a
@@ -12,4 +12,23 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
|
|
||||||
|
<!-- Themes -->
|
||||||
|
<string-array name="theme_type_titles">
|
||||||
|
<item>@string/theme_type_light</item>
|
||||||
|
<item>@string/theme_type_pitch_black</item>
|
||||||
|
<item>@string/theme_type_solarized_dark</item>
|
||||||
|
<item>@string/theme_type_baked_green</item>
|
||||||
|
<item>@string/theme_type_choco_x</item>
|
||||||
|
<item>@string/theme_type_du_pitchblack</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="theme_type_values">
|
||||||
|
<item>1</item>
|
||||||
|
<item>2</item>
|
||||||
|
<item>3</item>
|
||||||
|
<item>4</item>
|
||||||
|
<item>5</item>
|
||||||
|
<item>6</item>
|
||||||
|
</string-array>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -87,4 +87,14 @@
|
|||||||
|
|
||||||
<!-- Lockscreen -->
|
<!-- Lockscreen -->
|
||||||
<string name="lockscreen_category">Lockscreen</string>
|
<string name="lockscreen_category">Lockscreen</string>
|
||||||
|
|
||||||
|
<!-- Themes -->
|
||||||
|
<string name="theme_type_title">System theme</string>
|
||||||
|
<string name="theme_type_summary">Select theme</string>
|
||||||
|
<string name="theme_type_light">Light</string>
|
||||||
|
<string name="theme_type_pitch_black">Google dark</string>
|
||||||
|
<string name="theme_type_solarized_dark">Solarized dark</string>
|
||||||
|
<string name="theme_type_baked_green">Baked Green</string>
|
||||||
|
<string name="theme_type_choco_x">Choco X</string>
|
||||||
|
<string name="theme_type_du_pitchblack">Pitch black</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -17,4 +17,14 @@
|
|||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:title="@string/theme_title"
|
android:title="@string/theme_title"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:key="theme_switch"
|
||||||
|
android:icon="@drawable/ic_system_theme"
|
||||||
|
android:title="@string/theme_type_title"
|
||||||
|
android:summary="%s"
|
||||||
|
android:dialogTitle="@string/theme_type_summary"
|
||||||
|
android:entries="@array/theme_type_titles"
|
||||||
|
android:entryValues="@array/theme_type_values"
|
||||||
|
android:defaultValue="1"/>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
@@ -16,5 +16,4 @@
|
|||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|||||||
@@ -43,6 +43,11 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
|
|||||||
|
|
||||||
public class ThemeSettings extends SettingsPreferenceFragment implements
|
public class ThemeSettings extends SettingsPreferenceFragment implements
|
||||||
OnPreferenceChangeListener {
|
OnPreferenceChangeListener {
|
||||||
|
private static final String PREF_THEME_SWITCH = "theme_switch";
|
||||||
|
|
||||||
|
private IOverlayManager mOverlayService;
|
||||||
|
private UiModeManager mUiModeManager;
|
||||||
|
private ListPreference mThemeSwitch;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
@@ -52,13 +57,140 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
|
|||||||
|
|
||||||
PreferenceScreen prefScreen = getPreferenceScreen();
|
PreferenceScreen prefScreen = getPreferenceScreen();
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
|
|
||||||
|
mUiModeManager = getContext().getSystemService(UiModeManager.class);
|
||||||
|
|
||||||
|
mOverlayService = IOverlayManager.Stub
|
||||||
|
.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
|
||||||
|
|
||||||
|
setupThemeSwitchPref();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
public boolean onPreferenceChange(Preference preference, Object objValue) {
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
|
if (preference == mThemeSwitch) {
|
||||||
|
String theme_switch = (String) objValue;
|
||||||
|
final Context context = getContext();
|
||||||
|
switch (theme_switch) {
|
||||||
|
case "1":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "2":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "3":
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "4":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "5":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "6":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "7":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "8":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
case "9":
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.BAKED_GREEN);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.CHOCO_X);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.PITCH_BLACK);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.DARK_GREY);
|
||||||
|
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.MATERIAL_OCEAN);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
|
||||||
|
mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
|
||||||
|
mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
|
||||||
|
} catch (RemoteException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
private void setupThemeSwitchPref() {
|
||||||
|
mThemeSwitch = (ListPreference) findPreference(PREF_THEME_SWITCH);
|
||||||
|
mThemeSwitch.setOnPreferenceChangeListener(this);
|
||||||
|
if (CherishUtils.isThemeEnabled("com.android.theme.darkgrey.system")) {
|
||||||
|
mThemeSwitch.setValue("7");
|
||||||
|
} else if (CherishUtils.isThemeEnabled("com.android.theme.pitchblack.system")) {
|
||||||
|
mThemeSwitch.setValue("6");
|
||||||
|
} else if (CherishUtils.isThemeEnabled("com.android.theme.materialocean.system")) {
|
||||||
|
mThemeSwitch.setValue("8");
|
||||||
|
} else if (CherishUtils.isThemeEnabled("com.android.theme.chocox.system")) {
|
||||||
|
mThemeSwitch.setValue("5");
|
||||||
|
} else if (CherishUtils.isThemeEnabled("com.android.theme.bakedgreen.system")) {
|
||||||
|
mThemeSwitch.setValue("4");
|
||||||
|
} else if (CherishUtils.isThemeEnabled("com.android.theme.solarizeddark.system")) {
|
||||||
|
mThemeSwitch.setValue("3");
|
||||||
|
} else if (mUiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES) {
|
||||||
|
mThemeSwitch.setValue("2");
|
||||||
|
} else {
|
||||||
|
mThemeSwitch.setValue("1");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleBackgrounds(Boolean state, Context context, int mode, String[] overlays) {
|
||||||
|
if (context != null) {
|
||||||
|
Objects.requireNonNull(context.getSystemService(UiModeManager.class))
|
||||||
|
.setNightMode(mode);
|
||||||
|
}
|
||||||
|
for (int i = 0; i < overlays.length; i++) {
|
||||||
|
String background = overlays[i];
|
||||||
|
try {
|
||||||
|
mOverlayService.setEnabled(background, state, USER_SYSTEM);
|
||||||
|
} catch (RemoteException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user