From a022e0a43421c043e664a068f37007f4f381547a Mon Sep 17 00:00:00 2001
From: Kasun <kasun@tuta.io>
Date: Sat, 16 Nov 2019 14:50:10 +0530
Subject: [PATCH] label bar changes

---
 .../activities/ShowAccountActivity.java       |   2 -
 app/src/main/res/drawable/green_border.xml    |   2 +-
 app/src/main/res/drawable/red_border.xml      |   2 +-
 .../layout-sw600dp/activity_show_account.xml  | 123 +++++++++--------
 .../main/res/layout/activity_show_account.xml | 126 +++++++++---------
 app/src/main/res/values/strings.xml           |   1 +
 6 files changed, 133 insertions(+), 123 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
index c6dab6d53..33f1abb14 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
@@ -877,8 +877,6 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
                             TextView instance_info = findViewById(R.id.instance_info);
                             instance_info.setText(instanceNodeInfo.getName());
                             instance_info.setVisibility(View.VISIBLE);
-                            TextView seperator = findViewById(R.id.seperator);
-                            seperator.setVisibility(View.VISIBLE);
                         }
                     }
                 });
diff --git a/app/src/main/res/drawable/green_border.xml b/app/src/main/res/drawable/green_border.xml
index 52ba23b5c..7cd9ec943 100644
--- a/app/src/main/res/drawable/green_border.xml
+++ b/app/src/main/res/drawable/green_border.xml
@@ -4,7 +4,7 @@
     <stroke
         android:width="1dip"
         android:color="@color/verified_text" />
-    <corners android:radius="2dp"></corners>
+    <corners android:radius="2dp" />
     <padding
         android:bottom="1dip"
         android:left="4dip"
diff --git a/app/src/main/res/drawable/red_border.xml b/app/src/main/res/drawable/red_border.xml
index bc97c685f..24f709aeb 100644
--- a/app/src/main/res/drawable/red_border.xml
+++ b/app/src/main/res/drawable/red_border.xml
@@ -4,7 +4,7 @@
     <stroke
         android:width="1dip"
         android:color="@color/red_1" />
-    <corners android:radius="2dp"></corners>
+    <corners android:radius="2dp" />
     <padding
         android:bottom="1dip"
         android:left="4dip"
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 29fcb743a..4cd12f50f 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -211,36 +211,6 @@
                                 android:textColor="@color/red"
                                 android:visibility="gone" />
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/account_followed_by"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:background="@drawable/green_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/followed_by"
-                                    android:textColor="@color/verified_text"
-                                    android:visibility="gone" />
-
-                                <TextView
-                                    android:id="@+id/account_follow_request"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:background="@drawable/blue_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/request_sent"
-                                    android:textColor="@color/mastodonC4"
-                                    android:visibility="gone" />
-                            </LinearLayout>
-
                             <TextView
                                 android:id="@+id/account_moved"
                                 android:layout_width="wrap_content"
@@ -263,42 +233,79 @@
                         android:gravity="center"
                         android:padding="10dp" />
 
-                    <LinearLayout
+                    <HorizontalScrollView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:layout_marginBottom="10dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:fillViewport="true"
+                        android:scrollbars="none">
 
-                        <TextView
-                            android:id="@+id/instance_info"
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:background="@drawable/blue_border"
-                            android:gravity="center"
-                            android:textColor="@color/mastodonC4"
-                            android:visibility="gone" />
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            android:id="@+id/seperator"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:gravity="center"
-                            android:text="-"
-                            android:visibility="gone" />
+                            <TextView
+                                android:id="@+id/instance_info"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
 
-                        <TextView
-                            android:id="@+id/account_date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center" />
-                    </LinearLayout>
+                            <TextView
+                                android:id="@+id/account_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4" />
+
+                            <TextView
+                                android:id="@+id/account_followed_by"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/green_border"
+                                android:maxLines="1"
+                                android:text="@string/followed_by"
+                                android:textColor="@color/verified_text"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/account_follow_request"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:text="@string/request_sent"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/label_blocked"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/red_border"
+                                android:maxLines="1"
+                                android:text="@string/blocked"
+                                android:textColor="@color/red_1"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </HorizontalScrollView>
                     <!-- Fields container -->
                     <LinearLayout
                         android:id="@+id/fields_container"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 3a90c1bec..c3859890e 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -219,38 +219,6 @@
                                 android:textColor="@color/red"
                                 android:visibility="gone" />
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/account_followed_by"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_marginTop="5dp"
-                                    android:background="@drawable/green_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/followed_by"
-                                    android:textColor="@color/verified_text"
-                                    android:visibility="gone" />
-
-                                <TextView
-                                    android:id="@+id/account_follow_request"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_marginTop="5dp"
-                                    android:background="@drawable/blue_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/request_sent"
-                                    android:textColor="@color/mastodonC4"
-                                    android:visibility="gone" />
-                            </LinearLayout>
-
                             <TextView
                                 android:id="@+id/account_moved"
                                 android:layout_width="wrap_content"
@@ -274,43 +242,79 @@
                         android:gravity="center"
                         android:padding="10dp" />
 
-                    <LinearLayout
+                    <HorizontalScrollView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:layout_marginBottom="10dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:fillViewport="true"
+                        android:scrollbars="none">
 
-                        <TextView
-                            android:id="@+id/instance_info"
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:background="@drawable/blue_border"
-                            android:gravity="center"
-                            android:textColor="@color/mastodonC4"
-                            android:visibility="gone" />
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            android:id="@+id/seperator"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:gravity="center"
-                            android:text="-"
-                            android:visibility="gone"
-                            tools:ignore="HardcodedText" />
+                            <TextView
+                                android:id="@+id/instance_info"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
 
-                        <TextView
-                            android:id="@+id/account_date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center" />
-                    </LinearLayout>
+                            <TextView
+                                android:id="@+id/account_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4" />
+
+                            <TextView
+                                android:id="@+id/account_followed_by"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/green_border"
+                                android:maxLines="1"
+                                android:text="@string/followed_by"
+                                android:textColor="@color/verified_text"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/account_follow_request"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:text="@string/request_sent"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/label_blocked"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/red_border"
+                                android:maxLines="1"
+                                android:text="@string/blocked"
+                                android:textColor="@color/red_1"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </HorizontalScrollView>
                     <!-- Fields container -->
                     <LinearLayout
                         android:id="@+id/fields_container"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5b1914a7..51898a751 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1148,4 +1148,5 @@
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
     <string name="export_bookmarks">Export bookmarks to the instance</string>
     <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="blocked">Blocked</string>
 </resources>
\ No newline at end of file