From 054ab8fb1cb17053ee1bd446e5ddc5c7d965ee84 Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Wed, 1 Mar 2017 00:36:15 -0500
Subject: [PATCH] Several minor layout issues fixed, overlapping text on
 different device resolutions.

---
 app/src/main/res/layout/item_blocked_user.xml | 20 ++++++++--------
 app/src/main/res/layout/item_follow.xml       | 23 +++++++++++--------
 .../main/res/layout/item_report_status.xml    | 16 ++++---------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
index 90c7f56e9..2c2aa87ae 100644
--- a/app/src/main/res/layout/item_blocked_user.xml
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -11,11 +11,21 @@
         android:padding="@dimen/status_avatar_padding"
         android:layout_alignParentLeft="true" />
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/blocked_user_unblock"
+        android:layout_gravity="center_vertical"
+        android:text="@string/action_unblock"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true" />
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="64dp"
         android:orientation="vertical"
-        android:layout_toRightOf="@id/blocked_user_avatar">
+        android:layout_toRightOf="@id/blocked_user_avatar"
+        android:layout_toLeftOf="@id/blocked_user_unblock">
 
         <Space
             android:layout_width="wrap_content"
@@ -47,12 +57,4 @@
 
     </LinearLayout>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/blocked_user_unblock"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:text="@string/action_unblock" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml
index ddc9a0caf..4f732fb40 100644
--- a/app/src/main/res/layout/item_follow.xml
+++ b/app/src/main/res/layout/item_follow.xml
@@ -42,14 +42,25 @@
             android:layout_height="64dp"
             android:id="@+id/notification_avatar"
             android:scaleType="fitCenter"
-            android:padding="@dimen/status_avatar_padding"
+            android:paddingLeft="@dimen/status_avatar_padding"
+            android:paddingRight="@dimen/status_avatar_padding"
+            android:paddingBottom="@dimen/status_avatar_padding"
             android:layout_alignParentLeft="true" />
 
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/notification_follow_button"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:text="@string/action_follow" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="64dp"
             android:orientation="vertical"
-            android:layout_toRightOf="@id/notification_avatar">
+            android:layout_toRightOf="@id/notification_avatar"
+            android:layout_toLeftOf="@id/notification_follow_button">
 
             <Space
                 android:layout_width="wrap_content"
@@ -81,14 +92,6 @@
 
         </LinearLayout>
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/notification_follow_button"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:text="@string/action_follow" />
-
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_report_status.xml b/app/src/main/res/layout/item_report_status.xml
index 6f9ab2557..8a0e42491 100644
--- a/app/src/main/res/layout/item_report_status.xml
+++ b/app/src/main/res/layout/item_report_status.xml
@@ -11,17 +11,11 @@
         android:layout_weight="1"
         android:padding="8dp" />
 
-    <RelativeLayout
+    <CheckBox
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/report_status_check_box"
-            android:layout_centerVertical="true"
-            android:layout_margin="16dp" />
-
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        android:id="@+id/report_status_check_box"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="16dp" />
 
 </LinearLayout>
\ No newline at end of file