Fix spacing in Move dialog

2 files changed, 118 insertions, 124 deletions

diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml
index 0b16d54e..8e8634b2 100644
--- a/app/src/main/res/layout/dialog_account_switcher.xml
+++ b/app/src/main/res/layout/dialog_account_switcher.xml
@@ -6,70 +6,66 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <FrameLayout
+
+    <LinearLayout
+        android:id="@+id/accountLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/spacer_activity_sides"
-        android:paddingEnd="@dimen/spacer_activity_sides">
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/spacer_2x"
+        android:paddingStart="@dimen/spacer_1x"
+        android:paddingEnd="@dimen/spacer_1x">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/currentAccountItemAvatar"
+            android:layout_width="@dimen/avatar_size"
+            android:layout_height="@dimen/avatar_size"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
+            android:contentDescription="@null"
+            android:focusable="false"
+            android:scaleType="center"
+            app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
+
 
         <LinearLayout
-            android:id="@+id/accountLayout"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:padding="@dimen/spacer_2x"
-            android:paddingStart="@dimen/spacer_1x"
-            android:paddingEnd="@dimen/spacer_1x">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/currentAccountItemAvatar"
-                android:layout_width="@dimen/avatar_size"
-                android:layout_height="@dimen/avatar_size"
-                android:contentDescription="@null"
-                android:focusable="false"
-                android:scaleType="center"
-                app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
-
-
-            <LinearLayout
-                android:layout_width="0dp"
+            android:layout_marginStart="@dimen/spacer_1x"
+            android:layout_marginEnd="@dimen/spacer_2x"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/accountName"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/spacer_1x"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/accountName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="middle"
-                    android:singleLine="true"
-                    android:textAppearance="?attr/textAppearanceListItem"
-                    tools:text="@tools:sample/full_names" />
-
-                <TextView
-                    android:id="@+id/accountHost"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="middle"
-                    android:singleLine="true"
-                    android:textAppearance="?attr/textAppearanceListItemSecondary"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/check"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:contentDescription="@null"
-                android:focusable="false"
-                android:scaleType="center"
-                app:srcCompat="@drawable/check" />
+                android:ellipsize="middle"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceListItem"
+                tools:text="@tools:sample/full_names" />
+
+            <TextView
+                android:id="@+id/accountHost"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="middle"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceListItemSecondary"
+                tools:text="@tools:sample/full_names" />
         </LinearLayout>
-    </FrameLayout>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/check"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:contentDescription="@null"
+            android:focusable="false"
+            android:scaleType="center"
+            app:srcCompat="@drawable/check" />
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml
index bc02aa68..8f321800 100644
--- a/app/src/main/res/layout/item_account_choose.xml
+++ b/app/src/main/res/layout/item_account_choose.xml
@@ -1,83 +1,81 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/accountLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingStart="@dimen/spacer_activity_sides"
-    android:paddingEnd="@dimen/spacer_activity_sides">
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="@dimen/spacer_2x"
+    android:paddingStart="@dimen/spacer_1x"
+    android:paddingEnd="@dimen/spacer_1x">
 
-    <LinearLayout
-        android:id="@+id/accountLayout"
-        android:layout_width="match_parent"
+    <FrameLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="@dimen/spacer_2x"
-        android:paddingStart="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_1x">
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacer_1hx">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/accountItemAvatar"
-                android:layout_width="@dimen/avatar_size"
-                android:layout_height="@dimen/avatar_size"
-                android:contentDescription="@null"
-                android:focusable="false"
-                android:scaleType="center"
-                app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/currentAccountIndicator"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
-                android:layout_gravity="end|bottom"
-                android:visibility="gone"
-                app:srcCompat="@drawable/check"
-                tools:visibility="visible" />
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_1x"
-            android:layout_marginEnd="@dimen/spacer_2x"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/accountName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:textAppearance="?attr/textAppearanceListItem"
-                tools:text="@tools:sample/full_names" />
-
-            <TextView
-                android:id="@+id/accountHost"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:textAppearance="?attr/textAppearanceListItemSecondary"
-                tools:text="@tools:sample/full_names" />
-        </LinearLayout>
+        android:layout_marginEnd="@dimen/spacer_1hx">
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/delete"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:id="@+id/accountItemAvatar"
+            android:layout_width="@dimen/avatar_size"
+            android:layout_height="@dimen/avatar_size"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
             android:contentDescription="@null"
             android:focusable="false"
             android:scaleType="center"
+            app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/currentAccountIndicator"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_gravity="end|bottom"
             android:visibility="gone"
-            app:srcCompat="@drawable/ic_delete_grey600_24dp"
+            app:srcCompat="@drawable/check"
             tools:visibility="visible" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacer_1x"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/accountName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceListItem"
+            tools:text="@tools:sample/full_names" />
+
+        <TextView
+            android:id="@+id/accountHost"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceListItemSecondary"
+            tools:text="@tools:sample/full_names" />
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/delete"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@null"
+        android:focusable="false"
+        android:scaleType="center"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_delete_grey600_24dp"
+        tools:visibility="visible" />
+
+    <View
+        android:layout_width="@dimen/spacer_activity_sides"
+        android:layout_height="0dp" />
+</LinearLayout>
\ No newline at end of file