Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved Pastel Themes (Compartibility at moret (Material you) #783

Closed
wants to merge 19 commits into from
Closed

Improved Pastel Themes (Compartibility at moret (Material you) #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
911a13f
Add Pastel color (Dark | Blue)
RetrogisusDEV Oct 5, 2024
243b031
Added New theme Pastel dark
RetrogisusDEV Oct 5, 2024
6b1d2b2
added new theme
RetrogisusDEV Oct 5, 2024
f10cb3f
Read Comment
RetrogisusDEV Oct 5, 2024
f2410a2
Other friki change
RetrogisusDEV Oct 5, 2024
d092008
Added Pastel Light and WindowsPhone theme
RetrogisusDEV Oct 5, 2024
85cebb5
Small tiny fix
RetrogisusDEV Oct 5, 2024
86dc0eb
Fix's in (you life)
RetrogisusDEV Oct 5, 2024
c8966b9
Actualizar arrays.xml
RetrogisusDEV Oct 5, 2024
5c0b295
waza
RetrogisusDEV Oct 5, 2024
75ad7cd
Actualizar themes.xml
RetrogisusDEV Oct 5, 2024
2ac671f
Actualizar arrays.xml
RetrogisusDEV Oct 5, 2024
24f83e7
Added Folder from API 31 (Android 12)
RetrogisusDEV Oct 5, 2024
cf85365
Added new code theme for V31
RetrogisusDEV Oct 5, 2024
0fe5b56
fixed?
RetrogisusDEV Oct 5, 2024
f56fc3a
Improved Pastel themes
RetrogisusDEV Oct 5, 2024
02365e0
Another Ultra max power tiny fix
RetrogisusDEV Oct 5, 2024
18cf82e
Compila NJD!!!
RetrogisusDEV Oct 5, 2024
1dc7b02
@n't?
RetrogisusDEV Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions res/values-v31/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="PastelDark" parent="@style/BaseTheme">
<item name="android:isLightTheme">false</item>
<item name="colorKeyboard">#333334</item>
<item name="colorKey">@android:color/system_accent1_900</item>
<item name="colorKeyActivated">@android:color/system_accent1_700</item>
<item name="colorLabel">@android:color/system_accent1_50</item>
<item name="colorLabelActivated">@android:color/system_accent1_200</item>
<item name="colorLabelLocked">@android:color/system_accent1_100</item>
<item name="colorSubLabel">@android:color/system_accent1_200</item>
<item name="keyBorderWidth">0dip</item>
<item name="keyBorderWidthActivated">0dip</item>
<item name="keyBorderColorLeft">@android:color/system_accent1_50</item>
<item name="keyBorderColorTop">@android:color/system_accent1_50</item>
<item name="keyBorderColorRight">@android:color/system_accent1_50</item>
<item name="keyBorderColorBottom">@android:color/system_accent1_50</item>
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">@android:color/system_accent1_50</item>
</style>
<style name="PastelLight" parent="@style/BaseTheme">
<item name="android:isLightTheme">true</item>
<item name="colorKeyboard">#E6E6E6</item>
<item name="colorKey">@android:color/system_accent1_50</item>
<item name="colorKeyActivated">@android:color/system_accent1_100</item>
<item name="colorLabel">@android:color/system_accent1_900</item>
<item name="colorLabelActivated">@android:color/system_accent1_700</item>
<item name="colorLabelLocked">@android:color/system_accent1_800</item>
<item name="colorSubLabel">@android:color/system_accent1_800</item>
<item name="keyBorderWidth">0dip</item>
<item name="keyBorderWidthActivated">0dip</item>
<item name="keyBorderColorLeft">@android:color/system_accent1_900</item>
<item name="keyBorderColorTop">@android:color/system_accent1_900</item>
<item name="keyBorderColorRight">@android:color/system_accent1_900</item>
<item name="keyBorderColorBottom">@android:color/system_accent1_900</item>
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">@android:color/system_accent1_900</item>
</style>
</resources>
6 changes: 6 additions & 0 deletions res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<item>@string/pref_theme_e_monet</item>
<item>@string/pref_theme_e_monetlight</item>
<item>@string/pref_theme_e_monetdark</item>
<item>@string/pref_theme_e_pasteldark</item>
<item>@string/pref_theme_e_pastellight</item>
<item>@string/pref_theme_e_windowsphone</item>
</string-array>
<string-array name="pref_theme_values">
<item>system</item>
Expand All @@ -45,6 +48,9 @@
<item>monet</item>
<item>monetlight</item>
<item>monetdark</item>
<item>pasteldark</item>
<item>pastellight</item>
<item>windowsphone</item>
</string-array>
<string-array name="pref_swipe_dist_entries">
<item>@string/pref_swipe_dist_e_very_short</item>
Expand Down
3 changes: 3 additions & 0 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="pref_theme_e_monet">Monet (System)</string>
<string name="pref_theme_e_monetlight">Monet (Light)</string>
<string name="pref_theme_e_monetdark">Monet (Dark)</string>
<string name="pref_theme_e_pasteldark">Pastel Dark</string>
<string name="pref_theme_e_pastellight">Pastel light</string>
<string name="pref_theme_e_windowsphone">Windows Phone Style</string>
<string name="pref_swipe_dist_e_very_short">Very short</string>
<string name="pref_swipe_dist_e_short">Short</string>
<string name="pref_swipe_dist_e_default">Normal</string>
Expand Down
52 changes: 52 additions & 0 deletions res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,56 @@
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">@android:color/system_accent1_900</item>
</style>
<style name="PastelDark" parent="@style/BaseTheme">
<item name="android:isLightTheme">false</item>
<item name="colorKeyboard">#333334</item>
<item name="colorKey">#11111B</item>
<item name="colorKeyActivated">#22222A</item>
<item name="colorLabel">#CDD6F4</item>
<item name="colorLabelActivated">#ffffff</item>
<item name="colorLabelLocked">#8AADF4</item>
<item name="colorSubLabel">#DEE5E3</item>
<item name="keyBorderWidth">0dip</item>
<item name="keyBorderWidthActivated">0dip</item>
<item name="keyBorderColorLeft">#8AADF4</item>
<item name="keyBorderColorTop">#8AADF4</item>
<item name="keyBorderColorRight">#8AADF4</item>
<item name="keyBorderColorBottom">#8AADF4</item>
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">#000000</item>
</style>
<style name="PastelLight" parent="@style/BaseTheme">
<item name="android:isLightTheme">true</item>
<item name="colorKeyboard">#E6E9EF</item>
<item name="colorKey">#DCE0E8</item>
<item name="colorKeyActivated">#EFF1F5</item>
<item name="colorLabel">#4C4F69</item>
<item name="colorLabelActivated">#9CA0B0</item>
<item name="colorLabelLocked">#437FF7</item>
<item name="colorSubLabel">#EFF1F5</item>
<item name="keyBorderWidth">0dip</item>
<item name="keyBorderWidthActivated">0dip</item>
<item name="keyBorderColorLeft">#9CA0B0</item>
<item name="keyBorderColorTop">#9CA0B0</item>
<item name="keyBorderColorRight">#9CA0B0</item>
<item name="keyBorderColorBottom">#9CA0B0</item>
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">#000000</item>
</style>
<style name="WindowsPhone" parent="BaseTheme">
<item name="android:isLightTheme">false</item>
<item name="colorKeyboard">#2B2B2C</item>
<item name="colorKey">#3C3C3C</item>
<item name="colorKeyActivated">#1A1A1A</item>
<item name="keyBorderRadius">0dp</item>
<item name="keyBorderWidth">0dp</item>
<item name="keyBorderWidthActivated">0dp</item>
<item name="keyBorderColorBottom">#404040</item>
<item name="colorLabel">#FFFFFF</item>
<item name="colorLabelActivated">#DDDDDD</item>
<item name="colorLabelLocked">#437FF7</item>
<item name="colorSubLabel">#CCCCCC</item>
<item name="emoji_button_bg" type="color">#2B2B2C</item>
<item name="emoji_color" type="color">#ffffff</item>
</style>
</resources>
3 changes: 3 additions & 0 deletions srcs/juloo.keyboard2/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ private int getThemeId(Resources res, String theme_name)
case "jungle": return R.style.Jungle;
case "monetlight": return R.style.MonetLight;
case "monetdark": return R.style.MonetDark;
case "pasteldark" : return R.style.PastelDark;
case "pastellight" : return R.style.PastelLight;
case "windowsphone" : return R.style.WindowsPhone;
case "monet":
if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
return R.style.MonetLight;
Expand Down
Loading