Added theme-dependant action keys color

This commit is contained in:
pdroidandroid@gmail.com 2021-01-23 20:47:23 +01:00 committed by Daniele Laudani
parent 4c8ffa6eaa
commit 062b7c4761
20 changed files with 71 additions and 58 deletions

View file

@ -4,7 +4,7 @@
android:shape="oval">
<solid
android:color="#FF3389e8"/>
android:color="@color/action_key_background_lxx_dark"/>
<size
android:width="35dp"

View file

@ -2,13 +2,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#1f1f1f" />
<solid android:color="@color/key_bottom_bevel_lxx_dark" />
<corners android:radius="5dp"/>
</shape>
</item>
<item android:bottom="3px">
<item android:bottom="1dp">
<shape android:shape="rectangle">
<solid android:color="#0075f6" />
<solid android:color="@color/action_key_background_lxx_dark" />
<corners android:radius="5dp" />
</shape>
</item>

View file

@ -4,7 +4,7 @@
android:shape="oval">
<solid
android:color="#DD0075f6"/>
android:color="@color/action_key_background_lxx_light"/>
<size
android:width="35dp"

View file

@ -2,13 +2,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#99888B8E" />
<solid android:color="@color/key_bottom_bevel_lxx_light" />
<corners android:radius="5dp"/>
</shape>
</item>
<item android:bottom="3px">
<item android:bottom="1dp">
<shape android:shape="rectangle">
<solid android:color="#0075f6" />
<solid android:color="@color/action_key_background_lxx_light" />
<corners android:radius="5dp" />
</shape>
</item>

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@color/action_key_background_pressed_lxx_dark"/>
<size
android:width="35dp"
android:height="35dp"/>
</shape>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#3389e8" />
<solid android:color="@color/action_key_background_pressed_lxx_dark" />
<corners android:radius="5dp" />
</shape>

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@color/action_key_background_pressed_lxx_light"/>
<size
android:width="35dp"
android:height="35dp"/>
</shape>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/action_key_background_pressed_lxx_light" />
<corners android:radius="5dp" />
</shape>

View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#1f1f1f" />
<corners android:radius="5dp"/>
</shape>
</item>
<item android:bottom="3px">
<shape android:shape="rectangle">
<solid android:color="#1f1f1f" />
<corners android:radius="5dp" />
</shape>
</item>
</layer-list>

View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle">
<solid android:color="#99888B8E" />
<corners android:radius="5dp"/>
</shape>
</item>
<item android:bottom="3px">
<shape android:shape="rectangle">
<solid android:color="#aab3be" />
<corners android:radius="5dp" />
</shape>
</item>
</layer-list>

View file

@ -14,9 +14,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark" />
<item android:state_active="true"
android:drawable="@drawable/btn_keyboard_key_active_lxx" />
android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

View file

@ -17,9 +17,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark_border" />
<item android:state_active="true"
android:drawable="@drawable/btn_keyboard_key_action_lxx_border" />
android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark_border" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

View file

@ -17,9 +17,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light" />
<item android:state_active="true"
android:drawable="@drawable/btn_keyboard_key_active_lxx" />
android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

View file

@ -17,9 +17,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light_border" />
<item android:state_active="true"
android:drawable="@drawable/btn_keyboard_key_action_lxx_border_light" />
android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light_border" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
<item android:drawable="@drawable/btn_keyboard_key_active_lxx" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark" />
<item android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light" />
<item android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light" />
</selector>

View file

@ -55,6 +55,8 @@
<color name="sliding_key_input_preview_color_lxx_light">#B34DB6AC</color>
<color name="key_background_lxx_light">#ECEFF1</color>
<color name="key_background_pressed_lxx_light">#2637474F</color>
<color name="action_key_background_lxx_light">#1A73E8</color>
<color name="action_key_background_pressed_lxx_light">#3683e8</color>
<color name="suggested_word_background_selected_lxx_light">#2637474F</color>
<color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
<color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
@ -73,7 +75,8 @@
<color name="sliding_key_input_preview_color_lxx_dark">#B380CBC4</color>
<color name="key_background_lxx_dark">#263238</color>
<color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
<color name="key_background_amoled">#000000</color>
<color name="action_key_background_lxx_dark">#5E97F6</color>
<color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
<color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
<color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
<color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>

View file

@ -19,7 +19,10 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.LXX_Dark" parent="KeyboardIcons.LXX_Dark">
<style
name="KeyboardTheme.LXX_Dark"
parent="KeyboardIcons.LXX_Dark"
>
<item name="inputViewStyle">@style/InputView.LXX</item>
<item name="keyboardStyle">@style/Keyboard.LXX_Dark</item>
<item name="keyboardViewStyle">@style/KeyboardView.LXX_Dark</item>
@ -120,7 +123,7 @@
parent="MoreKeysKeyboardView.LXX_Dark"
>
<item name="android:background">@android:color/transparent</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_dark</item>
<item name="divider">@null</item>
<item name="keyLabelFlags">keepBackgroundAspectRatio</item>
</style>

View file

@ -120,7 +120,7 @@
parent="MoreKeysKeyboardView.LXX_Light"
>
<item name="android:background">@android:color/transparent</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_light</item>
<item name="divider">@null</item>
<item name="keyLabelFlags">keepBackgroundAspectRatio</item>
</style>