Update square tile layout

dimagi · Dec 3, 2024 · b79797c · b79797c
1 parent 7ea3cf6
commit b79797c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/app/res/layout/install_confirm_fragment.xml b/app/res/layout/install_confirm_fragment.xml
@@ -75,7 +75,6 @@
                                 android:id="@+id/btn_start_install"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="16dp"
                                 SquareButtonWithText:backgroundColor="@color/start_home_button"
                                 SquareButtonWithText:img="@drawable/install_start"
                                 SquareButtonWithText:subtitle="Start install"
@@ -96,7 +95,6 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
                                 android:gravity="end"
-                                android:padding="16dp"
                                 SquareButtonWithText:backgroundColor="@color/start_logout_button"
                                 SquareButtonWithText:img="@drawable/install_stop"
                                 SquareButtonWithText:subtitle="Start over"

diff --git a/app/res/layout/select_install_mode_fragment.xml b/app/res/layout/select_install_mode_fragment.xml
@@ -72,7 +72,6 @@
                             android:id="@+id/btn_fetch_uri"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:paddingHorizontal="24dp"
                             SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_barcode"
                             SquareButtonWithText:subtitle="Scan Application Barcode"
@@ -93,7 +92,6 @@
                             android:layout_height="match_parent"
                             android:background="@drawable/tile_drop_shadow_small_margins"
                             android:gravity="end"
-                            android:paddingHorizontal="18dp"
                             SquareButtonWithText:backgroundColor="@color/url_button_color"
                             SquareButtonWithText:img="@drawable/startup_url"
                             SquareButtonWithText:subtitle="Enter Code"

diff --git a/app/res/layout/square_button_text.xml b/app/res/layout/square_button_text.xml
@@ -10,7 +10,6 @@
     <org.commcare.views.SquareButton
         android:id="@+id/button"
         android:layout_width="match_parent"
-        android:padding="16dp"
         android:layout_height="wrap_content"
         android:background="@null"
         android:clickable="false"
@@ -22,7 +21,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/button"
-        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:gravity="center"
         android:paddingBottom="@dimen/standard_spacer"

diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml
@@ -24,14 +24,12 @@
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:layout_width="wrap_content"
-            android:layout_height="170dp">
+            android:layout_height="match_parent">
 
             <org.commcare.views.SquareImageView
                 android:id="@+id/card_image"
-                android:layout_width="130dp"
-                android:layout_centerHorizontal="true"
-                android:paddingVertical="24dp"
-                android:layout_height="150dp"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
 
             <org.commcare.views.ResizingTextView
                 android:id="@+id/card_text"