- pr request changes

dimagi · Nov 19, 2024 · f3b531b · f3b531b
1 parent 6b19387
commit f3b531b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml
@@ -23,14 +23,15 @@
             android:id="@+id/card"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="170dp">
 
             <org.commcare.views.SquareImageView
                 android:id="@+id/card_image"
-                android:layout_width="wrap_content"
-                android:padding="16dp"
-                android:layout_height="wrap_content"/>
+                android:layout_width="130dp"
+                android:layout_centerHorizontal="true"
+                android:paddingVertical="24dp"
+                android:layout_height="150dp"/>
 
             <org.commcare.views.ResizingTextView
                 android:id="@+id/card_text"
@@ -42,8 +43,8 @@
                 android:paddingBottom="@dimen/standard_spacer"
                 android:paddingLeft="@dimen/standard_spacer"
                 android:paddingRight="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_large"
-                app:text_size_small="@dimen/font_size_medium"
+                android:textSize="@dimen/font_size_xlarger"
+                app:text_size_small="@dimen/font_size_xlargest"
                 android:paddingStart="@dimen/standard_spacer"
                 android:paddingEnd="@dimen/standard_spacer" />
         </RelativeLayout>

diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
@@ -61,6 +61,7 @@
     <color name="very_light_blue">#AAE3ECFF</color>
     <color name="solid_dark_red">#BF3D3D</color>
     <color name="solid_dark_orange">#F57E20</color>
+    <color name="red_incomplete">#E44434</color>
 
     <color name="dark_brown">#5C4033</color>
 
@@ -146,4 +147,12 @@
     <!-- Button colors -->
     <color name="button_primary">#005ab2</color>
     <color name="button_disabled">#d0e3ff</color>
+
+    <color name="start_home_button">#6AB849</color>
+    <color name="start_save_button">#1B998B</color>
+    <color name="start_sync_button">#5D70D2</color>
+    <color name="start_sync_dark_button">#3b4fb6</color>
+    <color name="start_logout_button">#373534</color>
+
+
 </resources>
diff --git a/app/src/org/commcare/activities/HomeButtons.java b/app/src/org/commcare/activities/HomeButtons.java
@@ -51,27 +51,27 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get(homeMessageKey),
                         R.color.white,
                         R.drawable.home_start,
-                        R.color.cc_attention_positive_color,
+                        R.color.start_home_button,
                         getStartButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("training.root.title"), R.color.white,
                         R.drawable.home_training, R.color.cc_dark_cool_accent_color,
                         getTrainingButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("home.forms.saved"),
                         R.color.white,
                         R.drawable.home_saved,
-                        R.color.cc_light_cool_accent_color,
+                        R.color.start_save_button,
                         getViewOldFormsListener(activity)),
                 HomeCardDisplayData.homeCardDataWithDynamicText(Localization.get("home.forms.incomplete"), R.color.white,
                         R.drawable.home_incomplete,
-                        R.color.solid_dark_orange,
+                        R.color.red_incomplete,
                         getIncompleteButtonListener(activity),
                         null,
                         getIncompleteButtonTextSetter(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(syncKey), R.color.white,
                         R.color.white,
                         R.drawable.home_sync,
-                        R.color.cc_brand_color,
-                        R.color.cc_brand_text,
+                        R.color.start_sync_button,
+                        R.color.start_sync_dark_button,
                         getSyncButtonListener(activity),
                         getSyncButtonSubTextListener(activity),
                         getSyncButtonTextSetter(activity)),
@@ -80,7 +80,7 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                         getReportButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(logoutMessageKey), R.color.white,
                         R.color.white,
-                        R.drawable.home_logout, R.color.cc_neutral_color, R.color.cc_neutral_text,
+                        R.drawable.home_logout, R.color.start_logout_button, R.color.cc_neutral_text,
                         getLogoutButtonListener(activity),
                         null,
                         getLogoutButtonTextSetter(activity)),