From d41bf5d7e73cad3bf3f9dd9679776e52d4c4440b Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sat, 5 Aug 2017 10:29:04 +0200
Subject: [PATCH] code cleanup, simplify AccountActivityLayout

---
 .../main/res/drawable/ic_hourglass_24dp.xml   |  9 ---
 .../res/drawable/ic_person_minus_24px.xml     | 12 ---
 app/src/main/res/layout/activity_account.xml  | 73 ++++++++-----------
 3 files changed, 32 insertions(+), 62 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_hourglass_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_person_minus_24px.xml

diff --git a/app/src/main/res/drawable/ic_hourglass_24dp.xml b/app/src/main/res/drawable/ic_hourglass_24dp.xml
deleted file mode 100644
index 22c1f349..00000000
--- a/app/src/main/res/drawable/ic_hourglass_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,2v6h0.01L6,8.01 10,12l-4,4 0.01,0.01L6,16.01L6,22h12v-5.99h-0.01L18,16l-4,-4 4,-3.99 -0.01,-0.01L18,8L18,2L6,2zM16,16.5L16,20L8,20v-3.5l4,-4 4,4zM12,11.5l-4,-4L8,4h8v3.5l-4,4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_person_minus_24px.xml b/app/src/main/res/drawable/ic_person_minus_24px.xml
deleted file mode 100644
index c8a7ea0b..00000000
--- a/app/src/main/res/drawable/ic_person_minus_24px.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/toolbar_icon_dark"
-        android:pathData="M14.4,12c2.7,0.4,5-1.9,4.6-4.6c-0.3-1.7-1.6-3.1-3.3-3.3c-2.7-0.4-5,1.9-4.6,4.6C11.3,10.3,12.7,11.7,14.4,12z
-M6,12h3v-2H6H4H1v2h3H6z M15,14c-2.7,0-8,1.3-8,4v2h16v-2C23,15.3,17.7,14,15,14z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index e0197e9d..bd1ecce0 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -84,52 +84,43 @@
                             android:layout_below="@id/follow_btn"
                             android:layout_marginEnd="10dp"
                             android:layout_marginRight="10dp"
-                            android:text="Follows you"
+                            android:text="@string/follows_you"
                             android:textColor="?android:textColorPrimary" />
 
-                        <LinearLayout
+                        <TextView
+                            android:id="@+id/account_display_name"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_below="@id/account_avatar"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/account_display_name"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:textColor="?android:textColorPrimary"
-                                android:textSize="18sp"
-                                android:textStyle="normal|bold" />
-
-                            <RelativeLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <TextView
-                                    android:id="@+id/account_username"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:ellipsize="end"
-                                    android:maxLines="1"
-                                    android:textColor="?android:textColorSecondary" />
-
-                                <ImageView
-                                    android:id="@+id/account_locked"
-                                    android:layout_width="16sp"
-                                    android:layout_height="16sp"
-                                    android:layout_centerVertical="true"
-                                    android:layout_marginLeft="4dp"
-                                    android:layout_marginStart="4dp"
-                                    android:layout_toEndOf="@id/account_username"
-                                    android:layout_toRightOf="@id/account_username"
-                                    android:contentDescription="@string/description_account_locked"
-                                    android:tint="?android:textColorSecondary"
-                                    android:visibility="gone"
-                                    app:srcCompat="@drawable/reblog_disabled_light" />
-                            </RelativeLayout>
-                        </LinearLayout>
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="18sp"
+                            android:textStyle="normal|bold" />
+
+                        <TextView
+                            android:id="@+id/account_username"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/account_display_name"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:textColor="?android:textColorSecondary" />
+
+                        <ImageView
+                            android:id="@+id/account_locked"
+                            android:layout_width="16sp"
+                            android:layout_height="16sp"
+                            android:layout_alignBaseline="@+id/account_username"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="4dp"
+                            android:layout_marginStart="4dp"
+                            android:layout_toEndOf="@id/account_username"
+                            android:layout_toRightOf="@id/account_username"
+                            android:contentDescription="@string/description_account_locked"
+                            android:tint="?android:textColorSecondary"
+                            android:visibility="gone"
+                            app:srcCompat="@drawable/reblog_disabled_light" />
 
                     </RelativeLayout>