From c57a11f9739e29f7e6a01e5b9767810f6536708a Mon Sep 17 00:00:00 2001 From: Joshua Quick Date: Tue, 18 Aug 2020 16:10:40 -0700 Subject: [PATCH] chore(android): update TIMOB-27714 based on feedback - Removed "app:popupTheme" from toolbar layouts so it would respect app theme. --- android/cli/commands/_build.js | 7 ++----- .../modules/ui/res/layout/titanium_ui_drawer_layout.xml | 3 +-- android/modules/ui/res/layout/titanium_ui_toolbar.xml | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js index 43398c061ba..fb28f1d1456 100644 --- a/android/cli/commands/_build.js +++ b/android/cli/commands/_build.js @@ -3422,11 +3422,8 @@ AndroidBuilder.prototype.generateTheme = async function generateTheme() { let customizableParentThemeName = this.defaultAppThemeName; if (this.customAndroidManifest) { const appTheme = this.customAndroidManifest.getAppAttribute('android:theme'); - if (appTheme) { - const appThemeWithoutPrefix = appTheme.replace('@style/', ''); - if (!appThemeWithoutPrefix.startsWith('Theme.Titanium') && !appThemeWithoutPrefix.startsWith('Base.Theme.Titanium')) { - customizableParentThemeName = appTheme; - } + if (appTheme && !appTheme.startsWith('@style/Theme.Titanium') && !appTheme.startsWith('@style/Base.Theme.Titanium')) { + customizableParentThemeName = appTheme; } } diff --git a/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml b/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml index 78744a5884f..dac117c2186 100644 --- a/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml +++ b/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml @@ -16,8 +16,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"/> + android:background="?attr/colorPrimary"/> \ No newline at end of file