Enhance "Move card" dialog

3 files changed, 24 insertions, 8 deletions

diff --git a/app/src/main/res/layout/dialog_move_card.xml b/app/src/main/res/layout/dialog_move_card.xml
index daa82a6e7..221ea2f57 100644
--- a/app/src/main/res/layout/dialog_move_card.xml
+++ b/app/src/main/res/layout/dialog_move_card.xml
@@ -5,12 +5,26 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="@dimen/spacer_1hx">
+    android:paddingStart="@dimen/spacer_2x"
+    android:paddingTop="@dimen/spacer_2x"
+    android:paddingEnd="@dimen/spacer_2x"
+    android:paddingBottom="@dimen/spacer_1x">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextAppearance.AppCompat.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacer_1x"
+        android:layout_marginEnd="@dimen/spacer_1x"
+        tools:text="@string/action_card_move_title" />
 
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title"
+        android:layout_marginTop="@dimen/spacer_2x">
 
         <FrameLayout
             android:id="@+id/fragment_container"
@@ -44,7 +58,7 @@
 
         <Button
             android:id="@+id/cancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -54,7 +68,7 @@
 
         <Button
             android:id="@+id/submit"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/app/src/main/res/layout/item_prepare_create_account.xml b/app/src/main/res/layout/item_prepare_create_account.xml
index f21c71326..9a76b898e 100644
--- a/app/src/main/res/layout/item_prepare_create_account.xml
+++ b/app/src/main/res/layout/item_prepare_create_account.xml
@@ -14,7 +14,7 @@
         android:layout_marginEnd="@dimen/spacer_2x"
         android:contentDescription="@null"
         app:srcCompat="@drawable/ic_person_grey600_24dp"
-        tools:srcCompat="@tools:sample/avatars" />
+        tools:src="@tools:sample/avatars" />
 
 
     <LinearLayout
@@ -37,8 +37,10 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
+            android:ellipsize="middle"
+            android:singleLine="true"
             android:textAppearance="?attr/textAppearanceListItemSecondary"
-            tools:text="https://example.com/" />
+            tools:text="example.com" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_prepare_create_stack.xml b/app/src/main/res/layout/item_prepare_create_stack.xml
index f5a1f97b1..516941997 100644
--- a/app/src/main/res/layout/item_prepare_create_stack.xml
+++ b/app/src/main/res/layout/item_prepare_create_stack.xml
@@ -6,9 +6,9 @@
     android:layout_height="wrap_content"
     android:ellipsize="middle"
     android:paddingStart="72dp"
-    android:paddingTop="@dimen/spacer_2x"
+    android:paddingTop="20dp"
     android:paddingEnd="@dimen/spacer_2x"
-    android:paddingBottom="@dimen/spacer_2x"
+    android:paddingBottom="20dp"
     android:singleLine="true"
     android:textAppearance="?attr/textAppearanceListItem"
     tools:text="@tools:sample/full_names" />