mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-06-10 08:29:34 +00:00
switch material pressed key color to same as unpressed, remove some unnecessary files
same color when pressed because the old (darker) color was counter-acting the brighter pressed state color when using a dark theme
This commit is contained in:
Helium314
parent
975a815c4f
commit
3a01d59ac6
17 changed files with 18 additions and 120 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 463 B |
Binary file not shown.
|
Before Width: | Height: | Size: 355 B |
Binary file not shown.
|
Before Width: | Height: | Size: 589 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
|
|
@ -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="@color/key_bottom_bevel_lxx_base" />
|
||||
<corners android:radius="5dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item android:bottom="1dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/action_key_background_lxx_base" />
|
||||
<corners android:radius="5dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
android:shape="oval">
|
||||
|
||||
<solid
|
||||
android:color="@color/action_key_background_pressed_lxx_base"/>
|
||||
android:color="@color/key_background_lxx_base"/>
|
||||
|
||||
<size
|
||||
android:width="35dp"
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<?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_base" />
|
||||
<corners android:radius="5dp" />
|
||||
</shape>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2013 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Functional keys. -->
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_klp_dark" />
|
||||
<item android:drawable="@drawable/btn_keyboard_key_normal_holo_dark" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Functional keys. -->
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@color/key_background_pressed_lxx_base" />
|
||||
<item android:drawable="@color/key_background_lxx_base" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2013 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Functional keys. -->
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
|
||||
<item android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
|
||||
</selector>
|
||||
|
|
@ -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="@color/key_bottom_bevel_lxx_base" />
|
||||
<corners android:radius="5dp"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item android:bottom="1dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/key_background_functional_lxx_base_border" />
|
||||
<corners android:radius="5dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -23,22 +23,22 @@
|
|||
|
||||
<!-- Toggle keys. Use checkable/checked state. -->
|
||||
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
|
||||
android:drawable="@color/key_background_pressed_lxx_base" />
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
<item android:state_checkable="true" android:state_pressed="true"
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
<item android:state_checkable="true" android:state_checked="true"
|
||||
android:drawable="@color/key_background_pressed_lxx_base" />
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
<item android:state_checkable="true"
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
|
||||
<!-- Empty background keys. -->
|
||||
<item android:state_empty="true" android:state_pressed="true"
|
||||
android:drawable="@color/key_background_pressed_lxx_base" />
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
<item android:state_empty="true"
|
||||
android:drawable="@android:color/transparent" />
|
||||
|
||||
<!-- Normal keys. -->
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@color/key_background_pressed_lxx_base" />
|
||||
android:drawable="@color/key_background_lxx_base" />
|
||||
<item android:drawable="@color/key_background_lxx_base" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@
|
|||
<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_base_border" />
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
|
||||
<item android:state_active="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_base_border" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
|
||||
|
||||
<!-- Toggle keys. Use checkable/checked state. -->
|
||||
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
|
||||
<item android:state_checkable="true" android:state_pressed="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
|
||||
<item android:state_checkable="true" android:state_checked="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
|
||||
<item android:state_checkable="true"
|
||||
android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
|
||||
android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
|
||||
|
||||
<!-- Empty background keys. -->
|
||||
<item android:state_empty="true" android:state_pressed="true"
|
||||
|
|
|
|||
|
|
@ -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="@color/key_background_pressed_lxx_base_border" />
|
||||
<solid android:color="@color/key_background_normal_lxx_base_border" />
|
||||
<corners android:radius="5dp" />
|
||||
</shape>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<item android:state_pressed="true">
|
||||
<inset android:insetTop="25%p" android:insetBottom="25%p">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/key_background_pressed_lxx_base" />
|
||||
<solid android:color="@color/key_background_lxx_base" />
|
||||
<corners android:radius="5dp" />
|
||||
</shape>
|
||||
</inset>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
parent="KeyboardView.LXX_Base">
|
||||
<item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
</style>
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
parent="MainKeyboardView.LXX_Base">
|
||||
<item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
</style>
|
||||
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base_border</item>
|
||||
<item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
</style>
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
parent="ClipboardHistoryView.LXX_Base">
|
||||
<item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
|
||||
</style>
|
||||
|
||||
<style
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
name="KeyboardView.LXX_Base"
|
||||
parent="KeyboardView.LXX"
|
||||
>
|
||||
<item name="android:background">@drawable/keyboard_background_lxx_base</item>
|
||||
<item name="android:background">@color/keyboard_background_lxx_base</item>
|
||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_base</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base</item>
|
||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base</item>
|
||||
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
|
||||
<item name="keyTextColor">@color/key_text_color_lxx_light</item>
|
||||
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue