Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2bb1c8 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

LatinIME: Material You theme fixes 

* We really want to apply a theme to the shift key
* And to the emoji category ...

Change-Id: Ibd69d0f980c13343b7b333506213f51b32b519f5
parent 5afab31b

java/res/drawable/btn_keyboard_key_you.xml

+16 −0
Original line number Diff line number Diff line
@@ -21,6 +21,22 @@ 
    <item android:state_active="true"

          android:drawable="@drawable/btn_keyboard_key_action_normal_you" />



    <!-- 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_pressed_you" />

    <item android:state_checkable="true" android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_functional_pressed_you" />

    <item android:state_checkable="true" android:state_checked="true"

          android:drawable="@drawable/btn_keyboard_key_functional_pressed_you" />

    <item android:state_checkable="true"

          android:drawable="@drawable/btn_keyboard_key_functional_normal_you" />



    <!-- Empty background keys. -->

    <item android:state_empty="true" android:state_pressed="true"

          android:drawable="@color/keyboard_key_pressed_color_you" />

    <item android:state_empty="true"

          android:drawable="@android:color/transparent" />



    <!-- Normal keys. -->

    <item android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_pressed_you" />

java/res/values-night/themes-you-colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
    <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_0</color>

    <!-- Misc -->

    <color name="highlight_color_you">@color/highlight_color_lxx_dark</color>

    <color name="category_page_indicator_color_you">@android:color/system_accent3_200</color>

    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>

</resources>

java/res/values/themes-you-colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
    <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_1000</color>

    <!-- Misc -->

    <color name="highlight_color_you">@color/highlight_color_lxx_light</color>

    <color name="category_page_indicator_color_you">@android:color/system_accent3_200</color>

    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>

</resources>

java/res/values/themes-you.xml

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
        <item name="keyTextInactivatedColor">@color/keyboard_key_functional_text_color_you</item>

        <item name="functionalTextColor">@color/keyboard_key_functional_text_color_you</item>

        <item name="keyHintLetterColor">@color/key_hint_letter_color_you</item>

        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>

        <item name="keyHintLabelColor">@color/key_hint_letter_color_you</item>

        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>

        <item name="keyPreviewTextColor">@color/keyboard_key_text_color_you</item>
@@ -111,8 +111,8 @@ 
        parent="MainKeyboardView.You"

    >

        <item name="categoryIndicatorEnabled">false</item>

        <item name="categoryPageIndicatorColor">@color/category_page_indicator_color_you</item>

        <item name="categoryPageIndicatorBackground">@null</item>

        <item name="categoryPageIndicatorColor">@color/highlight_color_you</item>

        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_you</item>

        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_dark</item>

        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_dark</item>

        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_dark</item>