From ff2f58419e835451cfb7e3f683d9345073496eae Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 9 Aug 2022 15:27:01 +0200
Subject: [PATCH] Improve profile layouting

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../main/res/layout/controller_profile.xml    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/controller_profile.xml b/app/src/main/res/layout/controller_profile.xml
index a7c31c312..2d0d668b3 100644
--- a/app/src/main/res/layout/controller_profile.xml
+++ b/app/src/main/res/layout/controller_profile.xml
@@ -30,7 +30,7 @@
         android:id="@+id/avatarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/standard_padding">
+        android:layout_marginBottom="@dimen/standard_margin">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/avatar_image"
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/userinfo_fullName"
             android:layout_centerHorizontal="true"
-            android:layout_margin="4dp"
+            android:layout_margin="@dimen/standard_quarter_margin"
             android:ellipsize="end"
             android:lines="2"
             android:textColor="@color/medium_emphasis_text"
@@ -72,7 +72,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/userinfo_baseurl"
             android:layout_centerInParent="true"
-            android:layout_centerHorizontal="true"
             android:orientation="horizontal"
             android:visibility="invisible"
             tools:visibility="visible">
@@ -81,44 +80,45 @@
                 android:id="@+id/avatar_upload"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/upload_new_avatar_from_device"
                 android:tint="@android:color/white"
-                app:fabCustomSize="@dimen/min_size_clickable_area"
+                app:fabSize="mini"
                 app:srcCompat="@drawable/upload" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/avatar_choose"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/choose_avatar_from_cloud"
+                android:paddingBottom="@dimen/standard_padding"
                 android:tint="@android:color/white"
-                app:fabCustomSize="@dimen/min_size_clickable_area"
+                app:fabSize="mini"
                 app:srcCompat="@drawable/ic_mimetype_folder" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/avatar_camera"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/set_avatar_from_camera"
                 android:tint="@android:color/white"
-                app:fabCustomSize="@dimen/min_size_clickable_area"
+                app:fabSize="mini"
                 app:srcCompat="@drawable/ic_baseline_photo_camera_24" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/avatar_delete"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/delete_avatar"
                 android:tint="@android:color/white"
-                app:fabCustomSize="@dimen/min_size_clickable_area"
+                app:fabSize="mini"
                 app:srcCompat="@drawable/trashbin" />
 
         </LinearLayout>