From 7e1ff0497a498b6680b494b5030a2a8c3751b3ab Mon Sep 17 00:00:00 2001
From: Kasun <kasun@tuta.io>
Date: Fri, 2 Aug 2019 21:36:30 +0530
Subject: [PATCH] change profile layout

---
 .../layout-sw600dp/activity_show_account.xml  | 100 ++++++++---------
 .../main/res/layout/activity_show_account.xml | 102 +++++++++---------
 2 files changed, 101 insertions(+), 101 deletions(-)

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 6920d3eda..65c422f64 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -41,84 +41,84 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <RelativeLayout
+
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/top_banner"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/layout_height_header">
+                    android:layout_height="wrap_content">
+
                     <ImageView
                         android:id="@+id/banner_pp"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="@dimen/layout_height_header"
+                        android:contentDescription="@string/profile_banner"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
-                        android:contentDescription="@string/profile_banner" />
+                        app:layout_constraintTop_toTopOf="parent" />
+
                     <ImageView
-                        android:padding="1dp"
-                        android:layout_margin="10dp"
                         android:id="@+id/account_pp"
-                        android:layout_width="130dp"
-                        android:layout_height="130dp"
-                        app:layout_scrollFlags="scroll"
-                        android:background="@drawable/circle_background_white"
-                        android:layout_centerInParent="true"
-                        android:contentDescription="@string/profile_picture" />
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_margin="10dp"
+                        android:contentDescription="@string/profile_picture"
+                        android:padding="1dp"
+                        app:layout_constraintBottom_toBottomOf="@id/banner_pp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp"
+                        app:layout_scrollFlags="scroll" />
+
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/account_follow"
-                        android:visibility="gone"
-                        app:fabSize="mini"
-                        android:textAllCaps="false"
-                        android:layout_toRightOf="@id/account_pp"
-                        android:layout_toEndOf="@id/account_pp"
-                        app:layout_anchorGravity="center_vertical|right"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        />
-                    <com.google.android.material.floatingactionbutton.FloatingActionButton
-                        android:id="@+id/header_edit_profile"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:textAllCaps="false"
                         android:visibility="gone"
                         app:fabSize="mini"
-                        android:textAllCaps="false"
-                        android:src="@drawable/ic_edit"
-                        android:layout_marginStart="-50dp"
-                        android:layout_marginLeft="-50dp"
-                        android:layout_marginTop="100dp"
-                        android:layout_toRightOf="@id/account_pp"
-                        android:layout_toEndOf="@id/account_pp"
-                        android:layout_alignTop="@+id/account_pp"
+                        app:layout_constraintStart_toEndOf="@id/account_pp"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp" />
+
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton
+                        android:id="@+id/header_edit_profile"
                         android:layout_width="40dp"
-                        android:layout_height="40dp" />
+                        android:layout_height="40dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:src="@drawable/ic_edit"
+                        android:textAllCaps="false"
+                        android:visibility="gone"
+                        app:fabSize="mini"
+                        app:layout_constraintStart_toEndOf="@id/account_pp"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp" />
 
                     <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" />
+                        android:layout_marginEnd="10dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/go_back"
+                        android:src="@drawable/ic_back"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageButton
                         android:id="@+id/account_menu"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:src="@drawable/ic_more_vert"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginEnd="10dp"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:layout_marginTop="5dp"
-                        android:contentDescription="@string/open_menu" />
-                </RelativeLayout>
+                        android:layout_marginEnd="10dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/open_menu"
+                        android:src="@drawable/ic_more_vert"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <LinearLayout
                     android:layout_below="@+id/top_banner"
                     android:id="@+id/main_header_container"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index e23bb72cc..95bb850bc 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -40,84 +40,84 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <RelativeLayout
+
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/top_banner"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/layout_height_header">
+                    android:layout_height="wrap_content">
+
                     <ImageView
                         android:id="@+id/banner_pp"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="@dimen/layout_height_header"
+                        android:contentDescription="@string/profile_banner"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
-                        android:contentDescription="@string/profile_banner"/>
-                    <ImageView
-                        android:padding="1dp"
-                        android:layout_margin="10dp"
-                        android:id="@+id/account_pp"
-                        android:layout_width="130dp"
-                        android:layout_height="130dp"
-                        app:layout_scrollFlags="scroll"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/account_pp"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_margin="10dp"
+                        android:contentDescription="@string/profile_picture"
+                        android:padding="1dp"
+                        app:layout_constraintBottom_toBottomOf="@id/banner_pp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp"
+                        app:layout_scrollFlags="scroll" />
 
-                        android:layout_centerInParent="true"
-                        android:contentDescription="@string/profile_picture" />
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/account_follow"
-                        android:visibility="gone"
-                        app:fabSize="mini"
-                        android:textAllCaps="false"
-                        android:layout_toRightOf="@id/account_pp"
-                        android:layout_toEndOf="@id/account_pp"
-                        app:layout_anchorGravity="center_vertical|right"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        />
-                    <com.google.android.material.floatingactionbutton.FloatingActionButton
-                        android:id="@+id/header_edit_profile"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:textAllCaps="false"
                         android:visibility="gone"
                         app:fabSize="mini"
-                        android:textAllCaps="false"
-                        android:src="@drawable/ic_edit"
-                        android:layout_marginStart="-50dp"
-                        android:layout_marginLeft="-50dp"
-                        android:layout_marginTop="90dp"
-                        android:layout_toRightOf="@id/account_pp"
-                        android:layout_toEndOf="@id/account_pp"
-                        android:layout_alignTop="@+id/account_pp"
+                        app:layout_constraintStart_toEndOf="@id/account_pp"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp" />
+
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton
+                        android:id="@+id/header_edit_profile"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:src="@drawable/ic_edit"
+                        android:textAllCaps="false"
+                        android:visibility="gone"
+                        app:fabSize="mini"
+                        app:layout_constraintStart_toEndOf="@id/account_pp"
+                        app:layout_constraintTop_toBottomOf="@id/banner_pp" />
 
                     <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" />
+                        android:layout_marginEnd="10dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/go_back"
+                        android:src="@drawable/ic_back"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageButton
                         android:id="@+id/account_menu"
-                        android:background="?attr/selectableItemBackgroundBorderless"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:src="@drawable/ic_more_vert"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginEnd="10dp"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:layout_marginTop="5dp"
-                        android:contentDescription="@string/open_menu" />
-                </RelativeLayout>
+                        android:layout_marginEnd="10dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/open_menu"
+                        android:src="@drawable/ic_more_vert"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <LinearLayout
                     android:layout_below="@+id/top_banner"
                     android:id="@+id/main_header_container"