From a71d2161e055d009127d07962bbcd7ce45912b0c Mon Sep 17 00:00:00 2001 From: Dave Viggiano Date: Fri, 22 Nov 2024 13:12:03 -0500 Subject: [PATCH 1/5] Updated UI for progress bar and forward/back/close nav buttons in form delivery page. --- app/res/drawable/icon_chevron_left_white.xml | 4 +++ app/res/drawable/icon_chevron_right_white.xml | 4 +++ app/res/drawable/icon_close_white.xml | 4 +++ app/res/drawable/progressbar_modern.xml | 14 ++++---- app/res/layout/screen_form_entry.xml | 33 ++++++++++--------- app/res/values/colors.xml | 2 ++ .../components/FormNavigationUI.java | 4 +-- 7 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 app/res/drawable/icon_chevron_left_white.xml create mode 100644 app/res/drawable/icon_chevron_right_white.xml create mode 100644 app/res/drawable/icon_close_white.xml diff --git a/app/res/drawable/icon_chevron_left_white.xml b/app/res/drawable/icon_chevron_left_white.xml new file mode 100644 index 0000000000..da62f057f0 --- /dev/null +++ b/app/res/drawable/icon_chevron_left_white.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/res/drawable/icon_chevron_right_white.xml b/app/res/drawable/icon_chevron_right_white.xml new file mode 100644 index 0000000000..e8d8ed9a60 --- /dev/null +++ b/app/res/drawable/icon_chevron_right_white.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/res/drawable/icon_close_white.xml b/app/res/drawable/icon_close_white.xml new file mode 100644 index 0000000000..e74616b87d --- /dev/null +++ b/app/res/drawable/icon_close_white.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/res/drawable/progressbar_modern.xml b/app/res/drawable/progressbar_modern.xml index 781e4be638..c816eafb60 100644 --- a/app/res/drawable/progressbar_modern.xml +++ b/app/res/drawable/progressbar_modern.xml @@ -2,20 +2,22 @@ + - + + - + \ No newline at end of file diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml index 654f1bcff1..406102f85f 100644 --- a/app/res/layout/screen_form_entry.xml +++ b/app/res/layout/screen_form_entry.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/nav_badge" - android:background="@color/cc_core_bg" + android:background="@color/cc_brand_color" android:minHeight="@dimen/new_progressbar_minheight" android:paddingLeft="@dimen/content_start" android:paddingRight="@dimen/content_start" @@ -70,40 +70,40 @@ android:id="@+id/nav_btn_prev" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:layout_alignParentLeft="true" android:background="@drawable/selector_button_press" android:minHeight="@dimen/new_progressbar_button_minheight" android:minWidth="@dimen/new_progressbar_button_minwidth" android:paddingLeft="@dimen/content_start" android:paddingRight="@dimen/new_progressbar_button_padding" - app:srcCompat="@drawable/icon_chevron_left_brand" + app:srcCompat="@drawable/icon_chevron_left_white" android:paddingStart="@dimen/content_start" android:layout_alignParentStart="true" android:paddingEnd="@dimen/new_progressbar_button_padding" /> + android:progressDrawable="@drawable/progressbar_modern" /> diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml index 0b3bdd1533..21d086c516 100644 --- a/app/res/values/colors.xml +++ b/app/res/values/colors.xml @@ -154,5 +154,7 @@ #3b4fb6 #373534 + + #33000000 diff --git a/app/src/org/commcare/activities/components/FormNavigationUI.java b/app/src/org/commcare/activities/components/FormNavigationUI.java index 6411b078bd..75cb520e39 100644 --- a/app/src/org/commcare/activities/components/FormNavigationUI.java +++ b/app/src/org/commcare/activities/components/FormNavigationUI.java @@ -62,10 +62,10 @@ public static void updateNavigationCues(CommCareActivity activity, findViewById(R.id.nav_btn_finish); if (!details.relevantBeforeCurrentScreen) { - prevButton.setImageResource(R.drawable.icon_close_darkwarm); + prevButton.setImageResource(R.drawable.icon_close_white); prevButton.setTag(FormEntryConstants.NAV_STATE_QUIT); } else { - prevButton.setImageResource(R.drawable.icon_chevron_left_brand); + prevButton.setImageResource(R.drawable.icon_chevron_left_white); prevButton.setTag(FormEntryConstants.NAV_STATE_BACK); } From 59da77c2a3319709fcf18e820d7ad107a4142cdf Mon Sep 17 00:00:00 2001 From: parthmittal Date: Tue, 3 Dec 2024 10:17:27 +0530 Subject: [PATCH 2/5] - background color change of progress bar --- app/res/layout/screen_form_entry.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml index 406102f85f..bab82092c8 100644 --- a/app/res/layout/screen_form_entry.xml +++ b/app/res/layout/screen_form_entry.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/nav_badge" - android:background="@color/cc_brand_color" + android:background="@color/start_sync_button" android:minHeight="@dimen/new_progressbar_minheight" android:paddingLeft="@dimen/content_start" android:paddingRight="@dimen/content_start" From 2a55fd8a42f851fdb5a57b0a5005e5e1c2686e4f Mon Sep 17 00:00:00 2001 From: parthmittal Date: Tue, 3 Dec 2024 15:51:40 +0530 Subject: [PATCH 3/5] -progress bar color change --- app/res/drawable/progressbar_modern_blue.xml | 23 +++++++++++++++++++ app/res/layout-land/update_activity.xml | 2 +- .../layout/progress_dialog_determinate.xml | 2 +- app/res/layout/update_activity.xml | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 app/res/drawable/progressbar_modern_blue.xml diff --git a/app/res/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml new file mode 100644 index 0000000000..3362af1acb --- /dev/null +++ b/app/res/drawable/progressbar_modern_blue.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/res/layout-land/update_activity.xml b/app/res/layout-land/update_activity.xml index c767b199fb..0a097bbbc2 100644 --- a/app/res/layout-land/update_activity.xml +++ b/app/res/layout-land/update_activity.xml @@ -62,7 +62,7 @@ diff --git a/app/res/layout/update_activity.xml b/app/res/layout/update_activity.xml index 7b0830dd16..7ed6f81be1 100644 --- a/app/res/layout/update_activity.xml +++ b/app/res/layout/update_activity.xml @@ -62,7 +62,7 @@ android:layout_marginLeft="@dimen/content_min_margin" android:layout_marginRight="@dimen/content_min_margin" android:gravity="center" - android:progressDrawable="@drawable/progressbar_modern" + android:progressDrawable="@drawable/progressbar_modern_blue" android:layout_marginStart="@dimen/content_min_margin" android:layout_marginEnd="@dimen/content_min_margin" /> From 5259fadaa2740b27f4ea6f84237266e96a864730 Mon Sep 17 00:00:00 2001 From: parthmittal Date: Wed, 4 Dec 2024 09:38:51 +0530 Subject: [PATCH 4/5] -radius correction in progress bar --- app/res/drawable/progressbar_modern_blue.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/res/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml index 3362af1acb..aa3937eed2 100644 --- a/app/res/drawable/progressbar_modern_blue.xml +++ b/app/res/drawable/progressbar_modern_blue.xml @@ -2,7 +2,7 @@ - + Date: Wed, 4 Dec 2024 12:07:19 +0530 Subject: [PATCH 5/5] -radius correction in progress bar --- app/res/drawable/progressbar_modern.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/res/drawable/progressbar_modern.xml b/app/res/drawable/progressbar_modern.xml index c816eafb60..01fb1a2324 100644 --- a/app/res/drawable/progressbar_modern.xml +++ b/app/res/drawable/progressbar_modern.xml @@ -2,7 +2,7 @@ - +