add dark theme to emojiDrawer

Fixes #3240
Closes #3353
This commit is contained in:
agrajaghh
2015-06-08 17:54:16 +02:00
committed by Jake McGinty
parent 40af2a81db
commit ae4f6b1dd4
80 changed files with 132 additions and 37 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 458 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 808 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 883 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 861 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 585 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 990 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_emoticons_activated_dark" />
<item android:drawable="@drawable/ic_emoji_emoticons_normal_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"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_nature_activated_dark" />
<item android:drawable="@drawable/ic_emoji_nature_normal_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"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_objects_activated_dark" />
<item android:drawable="@drawable/ic_emoji_objects_normal_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"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_people_activated_dark" />
<item android:drawable="@drawable/ic_emoji_people_normal_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"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_places_activated_dark" />
<item android:drawable="@drawable/ic_emoji_places_normal_dark" />
</selector>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_recents_activated_dark" />
<item android:drawable="@drawable/ic_emoji_recents_normal_dark" />
</selector>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:enterFadeDuration="200"
android:exitFadeDuration="300">
<item android:state_selected="true" android:drawable="@drawable/ic_emoji_symbols_activated_dark" />
<item android:drawable="@drawable/ic_emoji_symbols_normal_dark" />
</selector>

View File

@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:background="@color/emoji_tab_strip_background"
<LinearLayout android:background="?emoji_tab_strip_background"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="40dp">
@@ -16,22 +16,22 @@
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@color/emoji_tab_strip_background"
android:background="?emoji_tab_strip_background"
app:pstsShouldExpand="true"
app:pstsTabPaddingLeftRight="@dimen/emoji_drawer_left_right_padding"
app:pstsUnderlineColor="@color/emoji_tab_underline"
app:pstsIndicatorColor="@color/emoji_tab_indicator"
app:pstsUnderlineColor="?emoji_tab_underline"
app:pstsIndicatorColor="?emoji_tab_indicator"
app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height" />
<View android:layout_width="1px"
android:layout_height="match_parent"
android:background="#ffcccccc"
android:background="?emoji_tab_seperator"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" />
<org.thoughtcrime.securesms.components.RepeatableImageKey
android:id="@+id/backspace"
android:background="@color/emoji_tab_strip_background"
android:background="?emoji_tab_strip_background"
android:src="@drawable/ic_backspace_grey600_24dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
@@ -45,6 +45,6 @@
android:visibility="visible"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffeeeeee" />
android:background="?emoji_background" />
</org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>

View File

@@ -41,6 +41,21 @@
<attr name="conversation_attach_photo" format="reference"/>
<attr name="conversation_attach" format="reference"/>
<attr name="emoji_tab_strip_background" format="color" />
<attr name="emoji_tab_indicator" format="color" />
<attr name="emoji_tab_underline" format="color" />
<attr name="emoji_tab_seperator" format="color" />
<attr name="emoji_background" format="color" />
<attr name="emoji_text_color" format="color" />
<attr name="emoji_category_recent" format="reference"/>
<attr name="emoji_category_people" format="reference"/>
<attr name="emoji_category_objects" format="reference"/>
<attr name="emoji_category_nature" format="reference"/>
<attr name="emoji_category_places" format="reference"/>
<attr name="emoji_category_symbol" format="reference"/>
<attr name="emoji_category_emoticons" format="reference"/>
<attr name="conversation_item_background" format="reference"/>
<attr name="conversation_item_received_background" format="reference" />
<attr name="conversation_item_sent_background" format="color" />

View File

@@ -9,9 +9,14 @@
<color name="black">#ff000000</color>
<color name="gray5">#ffeeeeee</color>
<color name="gray10">#ffdddddd</color>
<color name="gray12">#ffe0e0e0</color>
<color name="gray13">#ffababab</color>
<color name="gray20">#ffcccccc</color>
<color name="gray27">#ffbbbbbb</color>
<color name="gray50">#ff808080</color>
<color name="gray65">#ff595959</color>
<color name="gray70">#ff4d4d4d</color>
<color name="gray78">#ff383838</color>
<color name="gray95">#ff111111</color>
<color name="gray95_transparent50">#7F111111</color>
@@ -50,8 +55,4 @@
<color name="import_export_item_background_shadow_dark">#ff222222</color>
<color name="import_export_touch_highlight_light">#400099cc</color>
<color name="import_export_touch_highlight_dark">#40ffffff</color>
<color name="emoji_tab_strip_background">#ffe0e0e0</color>
<color name="emoji_tab_indicator">#66555555</color>
<color name="emoji_tab_underline">#44555555</color>
</resources>

View File

@@ -86,6 +86,21 @@
<item name="conversation_attach_photo">@drawable/ic_photo_camera_light</item>
<item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
<item name="emoji_tab_strip_background">@color/gray12</item>
<item name="emoji_tab_indicator">#66555555</item>
<item name="emoji_tab_underline">#44555555</item>
<item name="emoji_tab_seperator">@color/gray20</item>
<item name="emoji_background">@color/gray5</item>
<item name="emoji_text_color">@color/black</item>
<item name="emoji_category_recent">@drawable/emoji_category_recent_light</item>
<item name="emoji_category_people">@drawable/emoji_category_people_light</item>
<item name="emoji_category_objects">@drawable/emoji_category_objects_light</item>
<item name="emoji_category_nature">@drawable/emoji_category_nature_light</item>
<item name="emoji_category_places">@drawable/emoji_category_places_light</item>
<item name="emoji_category_symbol">@drawable/emoji_category_symbol_light</item>
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_light</item>
<item name="conversation_item_background">@drawable/conversation_item_background</item>
<item name="conversation_item_received_background">@color/conversation_item_received_background_light</item>
<item name="conversation_item_sent_background">@color/conversation_item_sent_background_light</item>
@@ -220,6 +235,21 @@
<item name="conversation_attach_photo">@drawable/ic_photo_camera_dark</item>
<item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
<item name="emoji_tab_strip_background">@color/gray95</item>
<item name="emoji_tab_indicator">@color/gray65</item>
<item name="emoji_tab_underline">@color/gray78</item>
<item name="emoji_tab_seperator">@color/gray70</item>
<item name="emoji_background">@color/black</item>
<item name="emoji_text_color">@color/white</item>
<item name="emoji_category_recent">@drawable/emoji_category_recent_dark</item>
<item name="emoji_category_people">@drawable/emoji_category_people_dark</item>
<item name="emoji_category_objects">@drawable/emoji_category_objects_dark</item>
<item name="emoji_category_nature">@drawable/emoji_category_nature_dark</item>
<item name="emoji_category_places">@drawable/emoji_category_places_dark</item>
<item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
<item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
<item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
<item name="menu_search_icon">@drawable/ic_search_white_24dp</item>