blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use proper icon and theme for camera button.

master
Greyson Parrelli 2019-07-30 16:26:58 -04:00
parent a46e7541d0
commit af8042c5f4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/conversation_list_fragment.xml
View File

@ -75,10 +75,10 @@
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="88dp"
android:src="@drawable/ic_camera_alt_white_24dp"
android:tint="@color/core_grey_60"
android:src="@drawable/ic_camera_filled_24"
android:tint="?conversation_list_camera_icon_tint"
android:focusable="true"
app:backgroundTint="@color/core_white"/>
app:backgroundTint="?conversation_list_camera_button_background"/>
<org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
android:id="@+id/fab"

2
res/values/attrs.xml
View File

@ -16,6 +16,8 @@
<attr name="conversation_list_item_divider" format="reference"/>
<attr name="conversation_list_toolbar_background" format="reference"/>
<attr name="conversation_list_typing_tint" format="color"/>
<attr name="conversation_list_camera_icon_tint" format="color"/>
<attr name="conversation_list_camera_button_background" format="color"/>
<attr name="conversation_sent_card_background" format="reference|color"/>
<attr name="conversation_group_member_name" format="reference|color"/>

4
res/values/themes.xml
View File

@ -151,6 +151,8 @@
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
<item name="conversation_list_toolbar_background">@color/core_blue</item>
<item name="conversation_list_typing_tint">@color/core_grey_60</item>
<item name="conversation_list_camera_icon_tint">@color/core_grey_60</item>
<item name="conversation_list_camera_button_background">@color/core_white</item>
<item name="fab_color">@color/textsecure_primary</item>
<item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
@ -336,6 +338,8 @@
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
<item name="conversation_list_toolbar_background">@color/core_grey_90</item>
<item name="conversation_list_typing_tint">@color/core_white</item>
<item name="conversation_list_camera_icon_tint">@color/core_white</item>
<item name="conversation_list_camera_button_background">@color/core_grey_85</item>
<item name="conversation_group_member_name">#99ffffff</item>