Update keyboard colors to improve consistency.
This commit is contained in:
parent
c59006e06e
commit
f96eac96f9
11 changed files with 25 additions and 14 deletions
|
@ -1,7 +1,6 @@
|
|||
package org.thoughtcrime.securesms.keyboard.emoji.search
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Rect
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
|
|
14
app/src/main/res/drawable/keyboard_bottom_bar_background.xml
Normal file
14
app/src/main/res/drawable/keyboard_bottom_bar_background.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?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/signal_background_secondary" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:gravity="top">
|
||||
<shape android:shape="rectangle">
|
||||
<size android:height="1dp" />
|
||||
<solid android:color="@color/signal_inverse_transparent_10" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
|
@ -4,7 +4,7 @@
|
|||
<layer-list>
|
||||
<item android:top="8dp" android:left="8dp" android:bottom="8dp" android:right="8dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/keyboard_pager_fragment_category_selected" />
|
||||
<solid android:color="@color/signal_inverse_transparent_05" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/keyboard_pager_fragment_selected" />
|
||||
<solid android:color="@color/signal_inverse_transparent_05" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/signal_background_tertiary">
|
||||
android:background="@color/signal_background_secondary">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:id="@+id/emoji_keyboard_search_appbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/signal_background_tertiary"
|
||||
android:background="@color/signal_background_secondary"
|
||||
app:elevation="0dp"
|
||||
app:expanded="false">
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/signal_background_tertiary">
|
||||
android:background="@color/signal_background_secondary">
|
||||
|
||||
<org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView
|
||||
android:id="@+id/emoji_search_view"
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="?actionBarSize"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@color/signal_background_secondary"
|
||||
android:background="@drawable/keyboard_bottom_bar_background"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior">
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="?actionBarSize"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@color/signal_background_secondary"
|
||||
android:background="@drawable/keyboard_bottom_bar_background"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior">
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
|
||||
<color name="signal_inverse_transparent">@color/transparent</color>
|
||||
<color name="signal_inverse_transparent_05">@color/transparent_white_05</color>
|
||||
<color name="signal_inverse_transparent_08">@color/transparent_white_08</color>
|
||||
<color name="signal_inverse_transparent_10">@color/transparent_white_10</color>
|
||||
<color name="signal_inverse_transparent_15">@color/transparent_white_15</color>
|
||||
<color name="signal_inverse_transparent_20">@color/transparent_white_20</color>
|
||||
|
@ -139,7 +140,4 @@
|
|||
<color name="quote_view_background">@color/transparent_black_40</color>
|
||||
<color name="conversation_item_outgoing_footer_fg">@color/transparent_white_60</color>
|
||||
<color name="quote_preview_background">@color/core_grey_80</color>
|
||||
|
||||
<color name="keyboard_pager_fragment_selected">@color/core_grey_80</color>
|
||||
<color name="keyboard_pager_fragment_category_selected">@color/transparent_white_10</color>
|
||||
</resources>
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
<color name="signal_accent_green">#4CAF50</color>
|
||||
|
||||
<color name="transparent_black_05">#0D000000</color>
|
||||
<color name="transparent_black_08">#14000000</color>
|
||||
<color name="transparent_black_10">#18000000</color>
|
||||
<color name="transparent_black_15">#26000000</color>
|
||||
<color name="transparent_black_20">#33000000</color>
|
||||
|
@ -16,6 +17,7 @@
|
|||
<color name="transparent_black_90">#e6000000</color>
|
||||
|
||||
<color name="transparent_white_05">#0Dffffff</color>
|
||||
<color name="transparent_white_08">#14ffffff</color>
|
||||
<color name="transparent_white_10">#18ffffff</color>
|
||||
<color name="transparent_white_15">#26ffffff</color>
|
||||
<color name="transparent_white_20">#33ffffff</color>
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
|
||||
<color name="signal_inverse_transparent">@color/transparent_black</color>
|
||||
<color name="signal_inverse_transparent_05">@color/transparent_black_05</color>
|
||||
<color name="signal_inverse_transparent_08">@color/transparent_black_08</color>
|
||||
<color name="signal_inverse_transparent_10">@color/transparent_black_10</color>
|
||||
<color name="signal_inverse_transparent_15">@color/transparent_black_15</color>
|
||||
<color name="signal_inverse_transparent_20">@color/transparent_black_20</color>
|
||||
|
@ -139,7 +140,4 @@
|
|||
<color name="quote_view_background">@color/transparent_white_60</color>
|
||||
<color name="conversation_item_outgoing_footer_fg">@color/transparent_white_80</color>
|
||||
<color name="quote_preview_background">@color/core_grey_15</color>
|
||||
|
||||
<color name="keyboard_pager_fragment_selected">@color/core_grey_10</color>
|
||||
<color name="keyboard_pager_fragment_category_selected">@color/transparent_black_05</color>
|
||||
</resources>
|
||||
|
|
Loading…
Add table
Reference in a new issue