wzray/tt9
1
0
Fork 0
Code Activity

fixed incorrect function key colors on Android 13 and 14

Browse source
This commit is contained in:
sspanak 2025-02-02 17:25:22 +02:00 • committed by Dimo Karaivanov
parent e6950c370c
commit 4bd6ddef89
9 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/res/layout/key_overlay_lf4.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView
style="@style/TTheme.Numpad.Key.Overlay.Icon"
android:tag="overlay_icon"
android:contentDescription="@null" />
<RelativeLayout style="@style/TTheme.Numpad.Key.Overlay.HoldIcon.Wrapper">
<ImageView
style="@style/TTheme.Numpad.Key.LF4.Overlay.HoldIcon"
android:tag="overlay_hold_icon"
android:contentDescription="@null" />
</RelativeLayout>
</merge>

2
app/src/main/res/layout/panel_numpad_left.xml
View file

@ -26,7 +26,7 @@
<RelativeLayout style="@style/TTheme.Numpad.Key.Overlay.Wrapper"> <RelativeLayout style="@style/TTheme.Numpad.Key.Overlay.Wrapper">
<io.github.sspanak.tt9.ui.main.keys.SoftKeyLF4 <io.github.sspanak.tt9.ui.main.keys.SoftKeyLF4
style="@style/TTheme.Numpad.Key.Large" style="@style/TTheme.Numpad.Key.LF4"
android:id="@+id/soft_key_lf4" /> android:id="@+id/soft_key_lf4" />
<include layout="@layout/key_overlay_icons" /> <include layout="@layout/key_overlay_icons" />
</RelativeLayout> </RelativeLayout>

8
app/src/main/res/values-night-v31/colors.xml
View file

@ -25,10 +25,10 @@
<color name="key_num_text">@color/keyboard_text</color> <color name="key_num_text">@color/keyboard_text</color>
<color name="key_num_alternative_text">@color/material_dynamic_neutral80</color> <!-- 'hold' functions --> <color name="key_num_alternative_text">@color/material_dynamic_neutral80</color> <!-- 'hold' functions -->
<color name="key_fn_background">@color/material_dynamic_secondary30</color> <color name="key_fn_background">@color/material_dynamic_neutral_variant30</color>
<color name="key_fn_ripple">@color/material_dynamic_secondary40</color> <color name="key_fn_ripple">@color/material_dynamic_neutral40</color>
<color name="key_fn_text">@color/material_dynamic_secondary90</color> <color name="key_fn_text">@color/material_dynamic_neutral90</color>
<color name="key_fn_alternative_text">@color/material_dynamic_secondary80</color> <!-- 'hold' functions --> <color name="key_fn_alternative_text">@color/material_dynamic_neutral80</color> <!-- 'hold' functions -->
<color name="key_ok_background">@color/suggestion_selected_background</color> <color name="key_ok_background">@color/suggestion_selected_background</color>
<color name="key_ok_ripple">@color/material_dynamic_primary50</color> <color name="key_ok_ripple">@color/material_dynamic_primary50</color>

7
app/src/main/res/values-night-v33/colors.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="key_lf4_background">@color/material_dynamic_secondary30</color>
<color name="key_lf4_ripple">@color/material_dynamic_secondary40</color>
<color name="key_lf4_text">@color/keyboard_text</color>
<color name="key_lf4_alternative_text">@color/material_dynamic_secondary80</color> <!-- 'hold' functions -->
</resources>

10
app/src/main/res/values-night-v35/colors.xml
View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="key_fn_background">@color/material_dynamic_secondary30</color>
<color name="key_fn_ripple">@color/material_dynamic_secondary40</color>
<color name="key_fn_text">@color/material_dynamic_secondary90</color>
<color name="key_fn_alternative_text">@color/material_dynamic_secondary80</color> <!-- 'hold' functions -->
<color name="key_lf4_background">@color/key_fn_background</color>
<color name="key_lf4_ripple">@color/key_fn_ripple</color>
<color name="key_lf4_text">@color/key_fn_text</color>
<color name="key_lf4_alternative_text">@color/key_fn_alternative_text</color> <!-- 'hold' functions -->
<color name="key_ok_background">@color/key_fn_background</color> <color name="key_ok_background">@color/key_fn_background</color>
<color name="key_ok_ripple">@color/key_fn_ripple</color> <color name="key_ok_ripple">@color/key_fn_ripple</color>
<color name="key_ok_text">@color/key_fn_text</color> <color name="key_ok_text">@color/key_fn_text</color>

7
app/src/main/res/values-v33/colors.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="key_lf4_background">@color/material_dynamic_secondary70</color>
<color name="key_lf4_ripple">@color/material_dynamic_secondary60</color>
<color name="key_lf4_text">@color/material_dynamic_secondary10</color>
<color name="key_lf4_alternative_text">@color/material_dynamic_secondary20</color> <!-- 'hold' functions -->
</resources>

5
app/src/main/res/values-v35/colors.xml
View file

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="key_lf4_background">@color/key_fn_background</color>
<color name="key_lf4_ripple">@color/key_fn_ripple</color>
<color name="key_lf4_text">@color/key_fn_text</color>
<color name="key_lf4_alternative_text">@color/key_fn_alternative_text</color> <!-- 'hold' functions -->
<color name="key_ok_background">@color/key_fn_background</color> <color name="key_ok_background">@color/key_fn_background</color>
<color name="key_ok_ripple">@color/key_fn_ripple</color> <color name="key_ok_ripple">@color/key_fn_ripple</color>
<color name="key_ok_text">@color/key_fn_text</color> <color name="key_ok_text">@color/key_fn_text</color>

5
app/src/main/res/values/colors.xml
View file

@ -21,6 +21,11 @@
<color name="key_fn_text">@color/keyboard_text</color> <color name="key_fn_text">@color/keyboard_text</color>
<color name="key_fn_alternative_text">#4e4e50</color> <!-- 'hold' functions --> <color name="key_fn_alternative_text">#4e4e50</color> <!-- 'hold' functions -->
<color name="key_lf4_background">@color/key_fn_background</color>
<color name="key_lf4_ripple">@color/key_fn_ripple</color>
<color name="key_lf4_text">@color/key_fn_text</color>
<color name="key_lf4_alternative_text">@color/key_fn_alternative_text</color> <!-- 'hold' functions -->
<color name="key_ok_background">#1a73e8</color> <color name="key_ok_background">#1a73e8</color>
<color name="key_ok_ripple">#0961d6</color> <color name="key_ok_ripple">#0961d6</color>
<color name="key_ok_text">#fff</color> <color name="key_ok_text">#fff</color>

9
app/src/main/res/values/styles.xml
View file

@ -264,6 +264,10 @@
<item name="android:tint">@color/key_fn_alternative_text</item> <item name="android:tint">@color/key_fn_alternative_text</item>
</style> </style>
<style name="TTheme.Numpad.Key.LF4.Overlay.HoldIcon" parent="TTheme.Numpad.Key.Overlay.HoldIcon">
<item name="android:tint">@color/key_lf4_alternative_text</item>
</style>
<!-- Overlay: Hold Text --> <!-- Overlay: Hold Text -->
<style name="TTheme.Numpad.Key.Overlay.Text" parent="TTheme.Numpad.Key.Overlay.Element"> <style name="TTheme.Numpad.Key.Overlay.Text" parent="TTheme.Numpad.Key.Overlay.Element">
<item name="android:textSize">@dimen/numpad_key_overlay_side_text_size</item> <item name="android:textSize">@dimen/numpad_key_overlay_side_text_size</item>
@ -332,6 +336,11 @@
<item name="android:insetBottom">@dimen/numpad_key_spacing</item> <item name="android:insetBottom">@dimen/numpad_key_spacing</item>
</style> </style>
<style name="TTheme.Numpad.Key.LF4" parent="TTheme.Numpad.Key.Large">
<item name="android:textColor">@color/key_lf4_text</item>
<item name="backgroundTint">@color/key_lf4_background</item>
<item name="rippleColor">@color/key_lf4_ripple</item>
</style>
<style name="TTheme.Numpad.Key.Number" parent="TTheme.Numpad.Key.Large"> <style name="TTheme.Numpad.Key.Number" parent="TTheme.Numpad.Key.Large">
<item name="android:textColor">@color/key_num_text</item> <item name="android:textColor">@color/key_num_text</item>