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..01fb1a2324 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/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml new file mode 100644 index 0000000000..aa3937eed2 --- /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/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml index 654f1bcff1..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_core_bg" + android:background="@color/start_sync_button" 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/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" /> 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); }