From f3b531b18da74ac52320397e7571c44e63f22c7c Mon Sep 17 00:00:00 2001 From: parthmittal Date: Tue, 19 Nov 2024 21:04:02 +0530 Subject: [PATCH] - pr request changes --- app/res/layout/square_card.xml | 15 ++++++++------- app/res/values/colors.xml | 9 +++++++++ app/src/org/commcare/activities/HomeButtons.java | 12 ++++++------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml index 7ba70775dd..95bbfebae4 100644 --- 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"> + android:layout_width="130dp" + android:layout_centerHorizontal="true" + android:paddingVertical="24dp" + android:layout_height="150dp"/> diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml index 5f9214660f..0b3bdd1533 100644 --- a/app/res/values/colors.xml +++ b/app/res/values/colors.xml @@ -61,6 +61,7 @@ #AAE3ECFF #BF3D3D #F57E20 + #E44434 #5C4033 @@ -146,4 +147,12 @@ #005ab2 #d0e3ff + + #6AB849 + #1B998B + #5D70D2 + #3b4fb6 + #373534 + + diff --git a/app/src/org/commcare/activities/HomeButtons.java b/app/src/org/commcare/activities/HomeButtons.java index ca6cb6957f..a9904f9472 100644 --- a/app/src/org/commcare/activities/HomeButtons.java +++ b/app/src/org/commcare/activities/HomeButtons.java @@ -51,7 +51,7 @@ 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, @@ -59,19 +59,19 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit 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)),