Merge branch 'working' into 'develop'

some changes and fixes

Closes #662

See merge request tom79/mastalab!2247

2 files changed, 75 insertions, 41 deletions

diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 6177ced9b..a298c7053 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -91,6 +91,20 @@
                         android:layout_height="wrap_content" />
 
                     <ImageButton
+                        android:id="@+id/action_back"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:src="@drawable/ic_back"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="5dp"
+                        android:contentDescription="@string/go_back" />
+
+                    <ImageButton
                         android:id="@+id/account_menu"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:layout_alignParentTop="true"
@@ -436,7 +450,7 @@
                 android:text="@string/disclaimer_full"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-            </android.support.v7.widget.Toolbar>
+        </android.support.v7.widget.Toolbar>
         <android.support.design.widget.TabLayout
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_account_follow_request.xml b/app/src/main/res/layout/drawer_account_follow_request.xml
index 8790f1b3a..93e2d94c6 100644
--- a/app/src/main/res/layout/drawer_account_follow_request.xml
+++ b/app/src/main/res/layout/drawer_account_follow_request.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Thomas Schneider
 
     This file is a part of Mastalab
@@ -15,54 +14,75 @@
     You should have received a copy of the GNU General Public License along with Mastalab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/account_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/account_container"
     android:layout_marginTop="5dp"
-    android:layout_marginBottom="5dp"
-    android:orientation="horizontal">
+    android:layout_marginBottom="5dp">
+
     <ImageView
-        android:layout_gravity="center"
         android:id="@+id/account_pp"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:contentDescription="@string/profile_picture"/>
+        android:layout_gravity="center"
+        android:contentDescription="@string/profile_picture"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
-        android:id="@+id/account_un"
-        android:padding="5dp"
+        android:id="@+id/account_dn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
         android:maxLines="1"
-        android:gravity="center"
         android:textSize="16sp"
-        android:layout_gravity="center"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content" />
-    <LinearLayout
+        app:layout_constraintBottom_toTopOf="@id/account_un"
+        app:layout_constraintLeft_toRightOf="@id/account_pp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/account_un"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:maxLines="1"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@id/btn_top_barrier"
+        app:layout_constraintLeft_toRightOf="@id/account_pp"
+        app:layout_constraintTop_toBottomOf="@id/account_dn" />
+
+    <android.support.constraint.Barrier
+        android:id="@+id/btn_top_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="btn_authorize,btn_reject" />
+
+    <Button
+        android:id="@+id/btn_authorize"
+        style="@style/Base.Widget.AppCompat.Button.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:text="@string/authorize"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/btn_reject" />
+
+    <Button
+        android:id="@+id/btn_reject"
+        style="@style/Base.Widget.AppCompat.Button.Small"
         android:layout_width="wrap_content"
-        android:gravity="end"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <Button
-            android:id="@+id/btn_authorize"
-            android:text="@string/authorize"
-            android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_gravity="end"
-            android:gravity="center"
-            style="@style/Base.Widget.AppCompat.Button.Small"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-        <Button
-            android:id="@+id/btn_reject"
-            android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
-            android:text="@string/reject"
-            android:layout_gravity="end"
-            android:gravity="center"
-            style="@style/Base.Widget.AppCompat.Button.Small"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+        android:layout_gravity="end"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:text="@string/reject"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file