From 31723cef9944015ea90fc6c6c3498cdc84a1db0b Mon Sep 17 00:00:00 2001 From: Mazda-- Date: Tue, 22 Oct 2019 18:00:21 +0530 Subject: [PATCH] Cherish:Lockscreen Clock Widget Fonts [2/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hưng Phan --- res/values/cherish_arrays.xml | 79 +++++++++++++++++++ res/values/cherish_strings.xml | 41 ++++++++++ res/xml/cherish_settings_lockscreen.xml | 9 +++ .../fragments/LockScreenSettings.java | 17 ++++ 4 files changed, 146 insertions(+) diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml index 147130a..73205e8 100644 --- a/res/values/cherish_arrays.xml +++ b/res/values/cherish_arrays.xml @@ -289,4 +289,83 @@ 0 1 + + + + @string/lock_clock_font_stock + @string/lock_clock_font_italic + @string/lock_clock_font_bold + @string/lock_clock_font_bold_italic + @string/lock_clock_font_light_italic + @string/lock_clock_font_light + @string/lock_clock_font_thin_italic + @string/lock_clock_font_thin + @string/lock_clock_font_condensed_normal + @string/lock_clock_font_condensed_italic + @string/lock_clock_font_condensed_bold + @string/lock_clock_font_condensed_bold_italic + @string/lock_clock_font_condensed_light + @string/lock_clock_font_condensed_light_italic + @string/lock_clock_font_medium_normal + @string/lock_clock_font_medium_italic + @string/lock_clock_font_black + @string/lock_clock_font_black_italic + @string/lock_clock_font_dancingscript + @string/lock_clock_font_dancingscript_bold + @string/lock_clock_font_comingsoon + @string/lock_clock_font_notoserif + @string/lock_clock_font_notoserif_italic + @string/lock_clock_font_notoserif_bold + @string/lock_clock_font_notoserif_bold_italic + @string/lock_clock_font_gobold + @string/lock_clock_font_roadrage + @string/lock_clock_font_snowstorm + @string/lock_clock_font_googlesans + @string/lock_clock_font_neoneon + @string/lock_clock_font_themeable + @string/lock_clock_font_samsung + @string/lock_clock_font_mexcellent + @string/lock_clock_font_burnstown + @string/lock_clock_font_dumbledor + @string/lock_clock_font_phantombold + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 3164bfa..6ee5ceb 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -375,4 +375,45 @@ Drag selection on the area you want to take as a screenshot Screenshot options Customize screenshot attributes like time, delay,type etc + + + Clock font options + Change the default font of the lockscreen clock widget + Select lock clock font + Normal (default) + Bold + Italic + Bold Italic + Light Italic + Thin Italic + Light + Thin + Condensed + Condensed Italic + Condensed Bold + Condensed Bold Italic + Condensed Light + Condensed Light Italic + Medium + Medium Italic + Black + Black Italic + DancingScript + DancingScript Bold + ComingSoon + NotoSerif Normal + NotoSerif Italic + NotoSerif Bold + NotoSerif Bold Italic + GoBold Light + Road Rage + Snowstorm + Google Sans + Neoneon + Themeable (or VCR OSD Mono) + Shamshung + Mexcellent + Burnstown + Dumbledor + PhantomBold diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml index 19f34bf..7b2214b 100644 --- a/res/xml/cherish_settings_lockscreen.xml +++ b/res/xml/cherish_settings_lockscreen.xml @@ -44,6 +44,15 @@ android:key="lockscreen_category" android:title="@string/lockscreen_category"> + + diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java index 2bcf7c0..ab12f08 100644 --- a/src/com/cherish/settings/fragments/LockScreenSettings.java +++ b/src/com/cherish/settings/fragments/LockScreenSettings.java @@ -43,6 +43,9 @@ import com.cherish.settings.preferences.SystemSettingListPreference; public class LockScreenSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { + private static final String LOCK_CLOCK_FONTS = "lock_clock_fonts"; + private ListPreference mLockClockFonts; + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -51,11 +54,25 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements ContentResolver resolver = getActivity().getContentResolver(); final PreferenceScreen prefScreen = getPreferenceScreen(); Resources resources = getResources(); + + // Lockscren Clock Fonts + mLockClockFonts = (ListPreference) findPreference(LOCK_CLOCK_FONTS); + mLockClockFonts.setValue(String.valueOf(Settings.System.getInt( + getContentResolver(), Settings.System.LOCK_CLOCK_FONTS, 34))); + mLockClockFonts.setSummary(mLockClockFonts.getEntry()); + mLockClockFonts.setOnPreferenceChangeListener(this); } public boolean onPreferenceChange(Preference preference, Object newValue) { ContentResolver resolver = getActivity().getContentResolver(); + if (preference == mLockClockFonts) { + Settings.System.putInt(getContentResolver(), Settings.System.LOCK_CLOCK_FONTS, + Integer.valueOf((String) newValue)); + mLockClockFonts.setValue(String.valueOf(newValue)); + mLockClockFonts.setSummary(mLockClockFonts.getEntry()); + return true; + } return false; }