chore(android): update TIMOB-27714 based on feedback

- Removed "app:popupTheme" from toolbar layouts so it would respect app theme.
tidev · Sep 28, 2020 · c57a11f · c57a11f
1 parent bd07428
commit c57a11f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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"/>
 
            <org.appcelerator.titanium.view.TiCompositeLayout
                android:layout_width="match_parent"

diff --git a/android/modules/ui/res/layout/titanium_ui_toolbar.xml b/android/modules/ui/res/layout/titanium_ui_toolbar.xml
@@ -7,5 +7,4 @@
     android:layout_width="match_parent"
     android:minHeight="?attr/actionBarSize"
     android:background="?attr/colorPrimary"
-    app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"
     android:fitsSystemWindows="true"/>