diff options
6 files changed, 48 insertions, 27 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml index aeda03f5d..98bffe02e 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml @@ -111,8 +111,11 @@ android:layout_weight="1" android:text="@string/btn_back" android:clickable="true" - android:background="?android:selectableItemBackground" android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -133,11 +136,12 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:textAllCaps="true" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="center_vertical|right" android:clickable="true" - android:background="?android:selectableItemBackground" + style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml index 33b7a6fb0..a8aa2c856 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml @@ -155,7 +155,10 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - android:background="?android:selectableItemBackground" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -176,11 +179,12 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:drawableRight="@drawable/ic_person_add_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:gravity="center_vertical|right" android:clickable="true" - android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml index 6122eb6df..66b8d2c4f 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml @@ -106,8 +106,11 @@ android:layout_weight="1" android:text="@string/btn_back" android:clickable="true" - android:background="?android:selectableItemBackground" android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -128,11 +131,12 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:textAllCaps="true" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="center_vertical|right" + style="?android:attr/borderlessButtonStyle" android:clickable="true" - android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index 72cce7310..c319072c4 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -159,7 +159,10 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - android:background="?android:selectableItemBackground" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -180,11 +183,11 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_done_grey_24dp" + android:textAllCaps="true" + android:drawableRight="@drawable/ic_person_add_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" + style="?android:attr/borderlessButtonStyle" + android:gravity="center_vertical|right" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index d4df74e37..d51555ccd 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml @@ -98,8 +98,11 @@ android:layout_weight="1" android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:clickable="true" - android:background="?android:selectableItemBackground" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -120,11 +123,11 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" + android:gravity="center_vertical|right" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml index c5adac4b0..a88b1a6ff 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml @@ -162,9 +162,12 @@ android:layout_weight="1" android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> <View @@ -184,11 +187,11 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_done_grey_24dp" + android:textAllCaps="true" + android:drawableRight="@drawable/ic_person_add_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" + style="?android:attr/borderlessButtonStyle" + android:gravity="center_vertical|right" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file |