From 899d5fcc5370dab1b14e4fb9d38d06f15cd9a51b Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Tue, 16 Jan 2018 11:56:49 -0600 Subject: [PATCH] Created buttons style to make them comply with Carbon's video --- .../main/res/layout/fragment_accounts_settings.xml | 12 ++++-------- .../main/res/layout/fragment_backups_settings.xml | 9 +++------ app/src/main/res/values/styles.xml | 9 +++++++++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml index 09f053b..c9ba6b6 100644 --- a/app/src/main/res/layout/fragment_accounts_settings.xml +++ b/app/src/main/res/layout/fragment_accounts_settings.xml @@ -23,8 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/upgrade" android:textStyle="bold" android:textColor="@color/white" @@ -48,8 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/import_" android:textStyle="bold" android:textColor="@color/white" @@ -73,8 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/refresh" android:textStyle="bold" android:textColor="@color/white" @@ -98,8 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/remove" android:textStyle="bold" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml index 69474cb..f8377bf 100644 --- a/app/src/main/res/layout/fragment_backups_settings.xml +++ b/app/src/main/res/layout/fragment_backups_settings.xml @@ -23,8 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/create_a_backup" android:textStyle="bold" android:textColor="@color/white" @@ -48,8 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/view_and_copy" android:textStyle="bold" android:textColor="@color/white" @@ -73,8 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + style="@style/Widget.Button" android:text="@string/view_and_copy" android:textStyle="bold" android:textColor="@color/white" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7ab8ddb..a5ddb74 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -102,4 +102,13 @@ @anim/accounts_in @anim/accounts_out + +