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

Theme background color in device link screens 

Fixes #4611
Closes #5066
master
Luc Ritchie 2016-01-13 08:57:24 -05:00 committed by Moxie Marlinspike
parent 2e51073a79
commit f3f80f0c6e
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/device_add_fragment.xml
View File

@ -30,7 +30,7 @@
android:layout_weight="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:background="@color/gray5"
android:background="?android:windowBackground"
android:gravity="center">
<ImageView android:id="@+id/devices"
@ -44,7 +44,7 @@
<TextView android:text="@string/device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ff6d6d6d"/>
android:textColor="?android:textColorSecondary"/>
</LinearLayout>

3
res/layout/device_link_fragment.xml
View File

@ -22,7 +22,8 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="?device_link_item_card_background">
<TextView
android:layout_width="wrap_content"

2
res/values/attrs.xml
View File

@ -78,6 +78,8 @@
<attr name="contact_selection_label_text" format="reference|color" />
<attr name="contact_selection_header_text" format="reference|color" />
<attr name="device_link_item_card_background" format="reference|color" />
<attr name="import_export_item_background_color" format="reference|color" />
<attr name="import_export_item_background_shadow_color" format="reference|color" />
<attr name="import_export_item_card_background" format="reference" />

3
res/values/colors.xml
View File

@ -40,6 +40,9 @@
<color name="light_button">#33ffffff</color>
<color name="light_button_highlight">#66ffffff</color>
<color name="device_link_item_background_light">#ffffffff</color>
<color name="device_link_item_background_dark">#ff333333</color>
<color name="import_export_item_background_light">#ffeeeeee</color>
<color name="import_export_item_background_dark">#ff333333</color>
<color name="import_export_item_background_shadow_light">#ffd5d5d5</color>

4
res/values/themes.xml
View File

@ -155,6 +155,8 @@
<item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
<item name="dialog_alert_icon">@drawable/ic_warning_light</item>
<item name="device_link_item_card_background">@color/device_link_item_background_light</item>
<item name="import_export_item_background_color">@color/import_export_item_background_light</item>
<item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
<item name="import_export_item_card_background">@drawable/clickable_card_light</item>
@ -234,6 +236,8 @@
<item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
<item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
<item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
<item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
<item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
<item name="import_export_item_card_background">@drawable/clickable_card_dark</item>