From 17876008cf7d58240265fee9415ba21ca43df4da Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sat, 5 Aug 2017 10:52:58 +0200
Subject: [PATCH] improve buttons in follow request/muted users/saved
 toots/blocked users

---
 app/src/main/res/layout/item_blocked_user.xml | 64 +++++++-------
 .../main/res/layout/item_follow_request.xml   | 85 ++++++++++---------
 app/src/main/res/layout/item_muted_user.xml   | 61 ++++++-------
 app/src/main/res/layout/item_saved_toot.xml   |  9 +-
 4 files changed, 116 insertions(+), 103 deletions(-)

diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
index 592164dc..93c6c7a1 100644
--- a/app/src/main/res/layout/item_blocked_user.xml
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -1,65 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
+    android:gravity="center_vertical"
     android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:gravity="center_vertical">
+    android:paddingRight="16dp">
 
     <com.pkmmte.view.CircularImageView
+        android:id="@+id/blocked_user_avatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:id="@+id/blocked_user_avatar"
-        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
-        android:layout_centerVertical="true"
         android:contentDescription="@string/action_view_profile" />
 
     <ImageButton
-        app:srcCompat="@drawable/ic_clear_24dp"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
         android:id="@+id/blocked_user_unblock"
-        android:layout_gravity="center_vertical"
         style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/action_unblock" />
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_unblock"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_clear_24dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_toStartOf="@id/blocked_user_unblock"
-        android:layout_toLeftOf="@id/blocked_user_unblock"
         android:layout_toEndOf="@id/blocked_user_avatar"
-        android:layout_toRightOf="@id/blocked_user_avatar">
+        android:layout_toLeftOf="@id/blocked_user_unblock"
+        android:layout_toRightOf="@id/blocked_user_avatar"
+        android:layout_toStartOf="@id/blocked_user_unblock"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/blocked_user_display_name"
-            android:text="Display name"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textSize="16sp"
-            android:textColor="?android:textColorPrimary"
-            android:textStyle="normal|bold" />
-        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="\@username"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="14sp"
+            android:maxLines="1"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp"
+            android:textStyle="normal|bold"
+            tools:text="Display name" />
+
+        <TextView
             android:id="@+id/blocked_user_username"
-            android:textColor="?android:textColorSecondary" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="14sp"
+            tools:text="\@username" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_follow_request.xml b/app/src/main/res/layout/item_follow_request.xml
index 4f549dd9..441f2f7c 100644
--- a/app/src/main/res/layout/item_follow_request.xml
+++ b/app/src/main/res/layout/item_follow_request.xml
@@ -1,80 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_vertical"
     android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:gravity="center_vertical">
+    android:paddingRight="16dp">
 
     <com.pkmmte.view.CircularImageView
+        android:id="@+id/follow_request_avatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:id="@+id/follow_request_avatar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginRight="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_centerVertical="true"
+        android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         android:contentDescription="@string/action_view_profile" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_toRightOf="@id/follow_request_avatar"
         android:layout_toEndOf="@id/follow_request_avatar"
         android:layout_toLeftOf="@+id/follow_request_accept"
-        android:layout_toStartOf="@id/follow_request_accept">
+        android:layout_toRightOf="@id/follow_request_avatar"
+        android:layout_toStartOf="@id/follow_request_accept"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/follow_request_display_name"
-            android:text="Display name"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textSize="16sp"
-            android:textColor="?android:textColorPrimary"
-            android:textStyle="normal|bold" />
-
-        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="\@username"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="14sp"
+            android:maxLines="1"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp"
+            android:textStyle="normal|bold"
+            tools:text="Display name" />
+
+        <TextView
             android:id="@+id/follow_request_username"
-            android:textColor="?android:textColorSecondary" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="14sp"
+            tools:text="\@username" />
 
     </LinearLayout>
 
     <ImageButton
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        style="?attr/image_button_style"
         android:id="@+id/follow_request_accept"
-        app:srcCompat="@drawable/ic_check_24dp"
+        style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp"
         android:layout_toLeftOf="@+id/follow_request_reject"
         android:layout_toStartOf="@id/follow_request_reject"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_centerVertical="true"
-        android:contentDescription="@string/action_accept" />
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_accept"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_check_24dp" />
 
     <ImageButton
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        style="?attr/image_button_style"
         android:id="@id/follow_request_reject"
-        app:srcCompat="@drawable/ic_reject_24dp"
-        android:layout_alignParentRight="true"
+        style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_alignParentEnd="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
+        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/action_reject" />
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_reject"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_reject_24dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_muted_user.xml b/app/src/main/res/layout/item_muted_user.xml
index 446ee07b..65f26a22 100644
--- a/app/src/main/res/layout/item_muted_user.xml
+++ b/app/src/main/res/layout/item_muted_user.xml
@@ -1,67 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
+    android:gravity="center_vertical"
     android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:gravity="center_vertical">
+    android:paddingRight="16dp">
 
     <com.pkmmte.view.CircularImageView
+        android:id="@+id/muted_user_avatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:id="@+id/muted_user_avatar"
-        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
-        android:layout_centerVertical="true"
         android:contentDescription="@string/action_view_profile" />
 
     <ImageButton
-        app:srcCompat="@drawable/ic_unmute_24dp"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
         android:id="@+id/muted_user_unmute"
-        android:layout_gravity="center_vertical"
         style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/action_unmute" />
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_unmute"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_unmute_24dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
         android:layout_toEndOf="@id/muted_user_avatar"
+        android:layout_toLeftOf="@id/muted_user_unmute"
         android:layout_toRightOf="@id/muted_user_avatar"
         android:layout_toStartOf="@id/muted_user_unmute"
-        android:layout_toLeftOf="@id/muted_user_unmute">
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/muted_user_display_name"
-            android:text="Display name"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textSize="16sp"
-            android:textColor="?android:textColorPrimary"
-            android:textStyle="normal|bold" />
-
-        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="\@username"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="14sp"
+            android:maxLines="1"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp"
+            android:textStyle="normal|bold"
+            tools:text="Display name" />
+
+        <TextView
             android:id="@+id/muted_user_username"
-            android:textColor="?android:textColorSecondary" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="14sp"
+            tools:text="\@username" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_saved_toot.xml b/app/src/main/res/layout/item_saved_toot.xml
index 8e020977..0d2b9d11 100644
--- a/app/src/main/res/layout/item_saved_toot.xml
+++ b/app/src/main/res/layout/item_saved_toot.xml
@@ -15,12 +15,13 @@
     <ImageButton
         android:id="@+id/suppr"
         style="?attr/image_button_style"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_gravity="center_vertical"
-        android:padding="16dp"
-        android:layout_margin="16dp"
+        android:layout_margin="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_delete"
+        android:padding="4dp"
         app:srcCompat="@drawable/ic_clear_24dp" />
 
 </LinearLayout>
\ No newline at end of file