Skip to content

Commit

Permalink
Theme number picker text (disappearing messages)
Browse files Browse the repository at this point in the history
Fixes signalapp#5659
Closes signalapp#5667
// FREEBIE
  • Loading branch information
FeuRenard authored and moxie0 committed Sep 14, 2016
1 parent 3432db3 commit 677f80b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion res/layout/expiration_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
android:layout_alignParentTop="true"
app:npv_WrapSelectorWheel="false"
app:npv_DividerColor="#cbc8ea"
app:npv_TextColorSelected="@color/black"
app:npv_TextColorNormal="?conversation_number_picker_text_color_normal"
app:npv_TextColorSelected="?conversation_number_picker_text_color_selected"
app:npv_ItemPaddingVertical="20dp"
app:npv_TextColorHint="@color/grey_600"
app:npv_TextSizeNormal="16sp"
Expand Down
2 changes: 2 additions & 0 deletions res/values/attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
<attr name="conversation_attach_sound" format="reference"/>
<attr name="conversation_attach_contact_info" format="reference"/>
<attr name="conversation_attach" format="reference"/>
<attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
<attr name="conversation_number_picker_text_color_selected" format="reference|color"/>

<attr name="emoji_tab_strip_background" format="color" />
<attr name="emoji_tab_indicator" format="color" />
Expand Down
4 changes: 4 additions & 0 deletions res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
<item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
<item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
<item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
<item name="conversation_number_picker_text_color_normal">@color/gray65</item>
<item name="conversation_number_picker_text_color_selected">@color/black</item>

<item name="emoji_tab_strip_background">@color/gray12</item>
<item name="emoji_tab_indicator">#66555555</item>
Expand Down Expand Up @@ -262,6 +264,8 @@
<item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
<item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
<item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
<item name="conversation_number_picker_text_color_normal">@color/gray13</item>
<item name="conversation_number_picker_text_color_selected">@color/white</item>

<item name="emoji_tab_strip_background">@color/gray95</item>
<item name="emoji_tab_indicator">@color/gray65</item>
Expand Down

0 comments on commit 677f80b

Please sign in to comment.