redesign secondary button, for light and dark mode

This commit is contained in:
B. Petersen
2022-04-30 13:56:28 +02:00
committed by bjoern
parent 4c449535dc
commit a334fa5495
6 changed files with 25 additions and 0 deletions
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- TODO - Consolidate using attr if we move away from API 19 -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<stroke android:width="2dp" android:color="@color/gray50"/>
<corners android:radius="8dp"/>
</shape>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- TODO - Consolidate using attr if we move away from API 19 -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<stroke android:width="2px" android:color="@color/delta_primary"/>
<corners android:radius="8dp"/>
</shape>
+3
View File
@@ -52,14 +52,17 @@
android:text="@string/login_header"/>
<Button
style="@style/ButtonSecondary"
android:id="@+id/backup_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:layout_marginBottom="16dp"
android:text="@string/import_backup_title"/>
<Button
style="@style/ButtonSecondary"
android:id="@+id/scan_qr_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+1
View File
@@ -20,6 +20,7 @@
<attr name="conversation_group_member_name" format="reference|color"/>
<attr name="conversation_received_card_background" format="reference|color"/>
<attr name="secondary_button_fg" format="reference"/>
<attr name="send_button_bg" format="reference"/>
<attr name="floating_mini_bg" format="reference"/>
+7
View File
@@ -90,6 +90,13 @@
<item name="android:background">@drawable/button_background</item>
</style>
<style name="ButtonSecondary">
<item name="android:textColor">?attr/secondary_button_fg</item>
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingRight">8dp</item>
<item name="android:background">@drawable/button_secondary_background</item>
</style>
<style name="PreferenceThemeOverlay.Fix" parent="PreferenceThemeOverlay.v14.Material">
</style>
+2
View File
@@ -73,6 +73,7 @@
<item name="conversation_list_item_unread_color">@color/core_black</item>
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
<item name="secondary_button_fg">@color/delta_primary</item>
<item name="send_button_bg">@drawable/send_button_bg_light</item>
<item name="floating_mini_bg">@drawable/floating_mini_bg_light</item>
@@ -221,6 +222,7 @@
<item name="conversation_list_item_unread_color">@color/core_white</item>
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
<item name="secondary_button_fg">@color/gray10</item>
<item name="send_button_bg">@drawable/send_button_bg_dark</item>
<item name="floating_mini_bg">@drawable/floating_mini_bg_dark</item>