From 6cc54e72b039e3d3f7836a6ef628dfe8e9cad87b Mon Sep 17 00:00:00 2001 From: parthmittal Date: Wed, 20 Nov 2024 03:26:24 +0530 Subject: [PATCH 1/6] -title bar color changes --- app/res/values/colors.xml | 1 + app/res/values/themes.xml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml index 0c287373b..a9c2a5475 100644 --- a/app/res/values/colors.xml +++ b/app/res/values/colors.xml @@ -149,6 +149,7 @@ #3A42C7 + #5d70D2 diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml index efc5fea37..abe50b235 100644 --- a/app/res/values/themes.xml +++ b/app/res/values/themes.xml @@ -60,7 +60,7 @@ diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java index fe513fd95..8fec9b008 100755 --- a/app/src/org/commcare/activities/CommCareActivity.java +++ b/app/src/org/commcare/activities/CommCareActivity.java @@ -28,6 +28,7 @@ import org.commcare.CommCareApplication; import org.commcare.android.database.user.models.ACase; +import org.commcare.dalvik.R; import org.commcare.fragments.BreadcrumbBarFragment; import org.commcare.fragments.ContainerFragment; import org.commcare.fragments.TaskConnectorFragment; @@ -162,7 +163,7 @@ protected void onCreate(Bundle savedInstanceState) { persistManagedUiState(fm); if (getSupportActionBar() != null) { - getSupportActionBar().setLogo(org.commcare.dalvik.R.mipmap.commcare_launcher); + getSupportActionBar().setLogo(org.commcare.dalvik.R.drawable.logo_spacing); } if (shouldShowBreadcrumbBar()) { From 8e070fda95a658606bbf87c7b294b8827ff340f1 Mon Sep 17 00:00:00 2001 From: parthmittal Date: Fri, 22 Nov 2024 11:01:33 +0530 Subject: [PATCH 4/6] -requested pr changes --- app/res/drawable/actionbar_modern_spacing.xml | 7 ------- app/res/drawable/{logo.xml => commcare_actionbar_logo.xml} | 0 ...ogo_spacing.xml => commcare_actionbar_logo_spacing.xml} | 2 +- app/res/values/themes.xml | 3 +-- app/src/org/commcare/activities/CommCareActivity.java | 3 +-- 5 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 app/res/drawable/actionbar_modern_spacing.xml rename app/res/drawable/{logo.xml => commcare_actionbar_logo.xml} (100%) rename app/res/drawable/{logo_spacing.xml => commcare_actionbar_logo_spacing.xml} (73%) diff --git a/app/res/drawable/actionbar_modern_spacing.xml b/app/res/drawable/actionbar_modern_spacing.xml deleted file mode 100644 index acf2c3d71..000000000 --- a/app/res/drawable/actionbar_modern_spacing.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/res/drawable/logo.xml b/app/res/drawable/commcare_actionbar_logo.xml similarity index 100% rename from app/res/drawable/logo.xml rename to app/res/drawable/commcare_actionbar_logo.xml diff --git a/app/res/drawable/logo_spacing.xml b/app/res/drawable/commcare_actionbar_logo_spacing.xml similarity index 73% rename from app/res/drawable/logo_spacing.xml rename to app/res/drawable/commcare_actionbar_logo_spacing.xml index 0c33c49f3..31f5d733b 100644 --- a/app/res/drawable/logo_spacing.xml +++ b/app/res/drawable/commcare_actionbar_logo_spacing.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml index 514e7e98c..d9923a21d 100644 --- a/app/res/values/themes.xml +++ b/app/res/values/themes.xml @@ -63,8 +63,7 @@ @color/title_bar_color @style/ActionBar.TitleTextStyle @style/ActionBarSubtitleTextStyle - @drawable/logo_spacing - @style/ActionButtonStyle + @drawable/commcare_actionbar_logo_spacing