diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 8 | ||||
-rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 6 | ||||
-rw-r--r-- | src/main/res/layout/contact_key.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/message_content.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/presence_template.xml | 2 | ||||
-rw-r--r-- | src/main/res/values-v21/dimens.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/dimens.xml | 2 |
9 files changed, 13 insertions, 14 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 01b7bc0fc..d2dfd6deb 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -209,7 +209,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 9b9611e99..5b4f9a7c3 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -529,7 +529,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:alpha="1.0" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_remove" android:visibility="visible" /> @@ -574,7 +574,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/copy_otr_clipboard_description" android:padding="@dimen/image_button_padding" android:src="?attr/icon_copy" @@ -625,7 +625,7 @@ android:id="@+id/action_copy_axolotl_to_clipboard" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/copy_omemo_clipboard_description" android:padding="@dimen/image_button_padding" android:src="?attr/icon_copy" @@ -635,7 +635,7 @@ android:id="@+id/action_regenerate_omemo_key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/regenerate_omemo_key" android:padding="@dimen/image_button_padding" android:src="?attr/icon_refresh" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 3196693e1..bf7accfd5 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -66,7 +66,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_settings" /> </RelativeLayout> @@ -94,7 +94,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> @@ -190,7 +190,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_edit_dark" /> </RelativeLayout> diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 99d8732c3..1da9f132a 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -63,7 +63,7 @@ android:id="@+id/button_remove" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_remove" android:layout_marginRight="16dp" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 74afeae16..fe5eec4a3 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -18,7 +18,7 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:orientation="horizontal" android:padding="8dp"> diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index 9bfa661e8..df6e8500d 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -48,7 +48,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> android:layout_height="wrap_content" android:layout_centerVertical="true" android:alpha="1.0" - android:background="?android:selectableItemBackground"/> + android:background="?attr/selectableItemBackgroundBorderless"/> <TextView android:id="@+id/runtime" diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml index 22ce44147..b305f18db 100644 --- a/src/main/res/layout/presence_template.xml +++ b/src/main/res/layout/presence_template.xml @@ -47,7 +47,7 @@ android:layout_centerVertical="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:background="?android:selectableItemBackground" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_remove" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml index 37ee278ce..a82d69bef 100644 --- a/src/main/res/values-v21/dimens.xml +++ b/src/main/res/values-v21/dimens.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <!-- 48dp + 15dp --> - <dimen name="image_button_padding">12dp</dimen> </resources>
\ No newline at end of file diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index cb92f725e..08861f6d5 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -3,6 +3,6 @@ <dimen name="activity_horizontal_margin">8dp</dimen> <dimen name="activity_vertical_margin">8dp</dimen> <dimen name="infocard_padding">16dp</dimen> - <dimen name="image_button_padding">8dp</dimen> + <dimen name="image_button_padding">12dp</dimen> <dimen name="audio_player_width">224dp</dimen> </resources> |