theme

tidev · Oct 2, 2024 · 4978b22 · 4978b22
1 parent a89b6cd
commit 4978b22
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
@@ -324,6 +324,20 @@ protected void handleOpen(KrollDict options)
 		if (topActivity == null || topActivity.isFinishing()) {
 			return;
 		}
+
+		// set theme for XML layout
+		if (((Integer) getProperty(TiC.PROPERTY_STYLE)) == AndroidModule.TABS_STYLE_BOTTOM_NAVIGATION
+			&& getProperty(TiC.PROPERTY_THEME) != null) {
+			try {
+				String themeName = getProperty(TiC.PROPERTY_THEME).toString();
+				int theme = TiRHelper.getResource("style."
+					+ themeName.replaceAll("[^A-Za-z0-9_]", "_"));
+				topActivity.setTheme(theme);
+				topActivity.getApplicationContext().setTheme(theme);
+			} catch (Exception e) {
+			}
+		}
+
 		Intent intent = new Intent(topActivity, TiActivity.class);
 		fillIntent(topActivity, intent);
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigation.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigation.java
@@ -51,16 +51,6 @@ public class TiUIBottomNavigation extends TiUIAbstractTabGroup implements Bottom
 	public TiUIBottomNavigation(TabGroupProxy proxy, TiBaseActivity activity)
 	{
 		super(proxy, activity);
-		if (proxy.getProperty(TiC.PROPERTY_THEME) != null) {
-			try {
-				String themeName = proxy.getProperty(TiC.PROPERTY_THEME).toString();
-				int theme = TiRHelper.getResource("style."
-					+ themeName.replaceAll("[^A-Za-z0-9_]", "_"));
-				activity.setTheme(theme);
-				activity.getApplicationContext().setTheme(theme);
-			} catch (Exception e) {
-			}
-		}
 	}
 
 	// Overriding addTab method to provide a proper guard for trying to add more tabs than the limit