From de7e6962c6140cb7048163d2096b5b87e609c433 Mon Sep 17 00:00:00 2001 From: CalvinKern Date: Mon, 9 Mar 2020 14:49:31 -0600 Subject: [PATCH] [Student][MBL-14023] Always use gray for pdf toolbar (#613) There are issues with theming the toolbar to the institution color when it is white. Rather than hack our way into a way to customize all the toolbar colors, just default to gray with white icons. --- .../instructure/student/activity/CandroidPSPDFActivity.kt | 5 ----- apps/student/src/main/res/values/styles.xml | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt index 7228bc91d2..e3de6f5947 100644 --- a/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt +++ b/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt @@ -83,11 +83,6 @@ class CandroidPSPDFActivity : PdfActivity(), ToolbarCoordinatorLayout.OnContextu override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setOnContextualToolbarLifecycleListener(this) - - ViewStyler.themeActionBar(this, supportActionBar, ThemePrefs.primaryColor) - - findViewById(R.id.pspdf__activity_thumbnail_bar)?.setBackgroundColor(ThemePrefs.brandColor) - findViewById(R.id.pspdf__activity_title_overlay)?.setBackgroundColor(ThemePrefs.brandColor) } override fun onPrepareOptionsMenu(menu: Menu): Boolean { diff --git a/apps/student/src/main/res/values/styles.xml b/apps/student/src/main/res/values/styles.xml index 05af8e5822..a0d48733b9 100644 --- a/apps/student/src/main/res/values/styles.xml +++ b/apps/student/src/main/res/values/styles.xml @@ -38,9 +38,9 @@