From 86a704f3b682e79a197313d89df84040a1c94eb0 Mon Sep 17 00:00:00 2001
From: Joshua Quick <jquick@axway.com>
Date: Sat, 19 Dec 2020 01:15:36 -0800
Subject: [PATCH] feat(android): default to material DayNight theme

Fixes TIMOB-28301
---
 android/app/src/main/AndroidManifest.xml      |  2 +-
 android/cli/commands/_build.js                | 21 ++++---
 .../titanium_ui_date_picker_spinner.xml       |  1 -
 .../ui/res/layout/titanium_ui_edittext.xml    |  1 -
 .../ui/res/layout/titanium_ui_spinner.xml     |  1 -
 .../titanium_ui_time_picker_spinner.xml       |  1 -
 .../widget/tabgroup/TiUIAbstractTabGroup.java | 22 +++----
 android/templates/build/AndroidManifest.xml   |  2 +-
 android/titanium/res/values-night/values.xml  | 10 ++++
 android/titanium/res/values/values.xml        | 57 ++++++++++++++++---
 .../appcelerator/titanium/TiBaseActivity.java | 47 +++++++++++++--
 .../titanium/TiExceptionHandler.java          | 39 ++++++++++---
 .../titanium/proxy/TiWindowProxy.java         |  7 +--
 13 files changed, 158 insertions(+), 53 deletions(-)
 create mode 100644 android/titanium/res/values-night/values.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8f2261a4e50..36495a20247 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
 		</intent>
 	</queries>
 
-	<application android:name=".TitaniumTestApplication" android:icon="@drawable/appicon" android:label="TitaniumTest" android:theme="@style/Theme.MaterialComponents.Bridge" android:usesCleartextTraffic="true">
+	<application android:name=".TitaniumTestApplication" android:icon="@drawable/appicon" android:label="TitaniumTest" android:theme="@style/Base.Theme.Titanium" android:usesCleartextTraffic="true">
 		<!-- The root Titanium splash activity which hosts the JS runtime. -->
 		<activity android:name=".TitaniumTestActivity" android:theme="@style/Theme.Titanium" android:alwaysRetainTaskState="true" android:configChanges="${tiActivityConfigChanges}">
 			<intent-filter>
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
index 916fdb20c60..5640c6f846b 100644
--- a/android/cli/commands/_build.js
+++ b/android/cli/commands/_build.js
@@ -1648,14 +1648,6 @@ AndroidBuilder.prototype.initialize = async function initialize() {
 	const loadFromSDCardProp = this.tiapp.properties['ti.android.loadfromsdcard'];
 	this.loadFromSDCard = loadFromSDCardProp && loadFromSDCardProp.value === true;
 
-	// Set default theme to be used in "AndroidManifest.xml" and style resources.
-	this.defaultAppThemeName = 'Theme.MaterialComponents.Bridge';
-	if (this.tiapp.fullscreen || this.tiapp['statusbar-hidden']) {
-		this.defaultAppThemeName = 'Theme.MaterialComponents.Fullscreen.Bridge';
-	} else if (this.tiapp['navbar-hidden']) {
-		this.defaultAppThemeName = 'Theme.MaterialComponents.NoActionBar.Bridge';
-	}
-
 	// Array of gradle/maven compatible library reference names the app project depends on.
 	// Formatted as: "<group.id>:<artifact-id>:<version>"
 	// Example: "com.google.android.gms:play-services-base:11.0.4"
@@ -3257,9 +3249,17 @@ AndroidBuilder.prototype.generateTheme = async function generateTheme() {
 	const xmlFilePath = path.join(valuesDirPath, 'ti_styles.xml');
 	this.logger.info(__('Generating theme file: %s', xmlFilePath.cyan));
 
+	// Set default theme to be used in "AndroidManifest.xml" and style resources.
+	let defaultAppThemeName = 'Theme.MaterialComponents.DayNight.DarkActionBar';
+	if (this.tiapp.fullscreen || this.tiapp['statusbar-hidden']) {
+		defaultAppThemeName = 'Theme.MaterialComponents.DayNight.Fullscreen';
+	} else if (this.tiapp['navbar-hidden']) {
+		defaultAppThemeName = 'Theme.MaterialComponents.DayNight.NoActionBar';
+	}
+
 	// Set up "Base.Theme.Titanium.Customizable" inherited themes to use <application/> defined theme, if provided.
 	// Note: Do not assign it if set to a Titanium theme, which would cause a circular reference.
-	let customizableParentThemeName = this.defaultAppThemeName;
+	let customizableParentThemeName = 'Base.Theme.Titanium';
 	if (this.customAndroidManifest) {
 		const appTheme = this.customAndroidManifest.getAppAttribute('android:theme');
 		if (appTheme && !appTheme.startsWith('@style/Theme.Titanium') && !appTheme.startsWith('@style/Base.Theme.Titanium')) {
@@ -3272,7 +3272,7 @@ AndroidBuilder.prototype.generateTheme = async function generateTheme() {
 	let xmlLines = [
 		'<?xml version="1.0" encoding="utf-8"?>',
 		'<resources>',
-		`	<style name="Base.Theme.Titanium.Basic" parent="${this.defaultAppThemeName}"/>`,
+		`	<style name="Base.Theme.Titanium.RootStyle" parent="${defaultAppThemeName}"/>`,
 		`	<style name="Base.Theme.Titanium.Customizable" parent="${customizableParentThemeName}"/>`,
 		'',
 		'	<!-- Theme used by "TiRootActivity" derived class which displays the splash screen. -->',
@@ -3513,7 +3513,6 @@ AndroidBuilder.prototype.generateAndroidManifest = async function generateAndroi
 		appChildXmlLines: appChildXmlLines,
 		appIcon: '@drawable/' + this.tiapp.icon.replace(/((\.9)?\.(png|jpg))$/, ''),
 		appLabel: this.tiapp.name,
-		appTheme: `@style/${this.defaultAppThemeName}`,
 		classname: this.classname,
 		storagePermissionMaxSdkVersion: neededManifestSettings.storagePermissionMaxSdkVersion,
 		packageName: this.appid,
diff --git a/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml b/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml
index 2725eb86d78..b96dd5f32a9 100644
--- a/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml
+++ b/android/modules/ui/res/layout/titanium_ui_date_picker_spinner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ti.modules.titanium.ui.widget.picker.CustomDatePicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/titanium_ui_date_picker_spinner"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:datePickerMode ="spinner"/>
diff --git a/android/modules/ui/res/layout/titanium_ui_edittext.xml b/android/modules/ui/res/layout/titanium_ui_edittext.xml
index bdcb3c053d6..e956155dc02 100644
--- a/android/modules/ui/res/layout/titanium_ui_edittext.xml
+++ b/android/modules/ui/res/layout/titanium_ui_edittext.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ti.modules.titanium.ui.widget.TiUIEditText xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/titanium_ui_edittext"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
 />
\ No newline at end of file
diff --git a/android/modules/ui/res/layout/titanium_ui_spinner.xml b/android/modules/ui/res/layout/titanium_ui_spinner.xml
index 2ec2cf03292..38681f86b94 100644
--- a/android/modules/ui/res/layout/titanium_ui_spinner.xml
+++ b/android/modules/ui/res/layout/titanium_ui_spinner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/titanium_ui_spinner"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
 />
\ No newline at end of file
diff --git a/android/modules/ui/res/layout/titanium_ui_time_picker_spinner.xml b/android/modules/ui/res/layout/titanium_ui_time_picker_spinner.xml
index 52cf1bb6ea4..927a18dc384 100644
--- a/android/modules/ui/res/layout/titanium_ui_time_picker_spinner.xml
+++ b/android/modules/ui/res/layout/titanium_ui_time_picker_spinner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/titanium_ui_time_picker_spinner"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:timePickerMode ="spinner"/>
\ No newline at end of file
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java
index bfdc4654ca4..9f2d7baabf8 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java
@@ -8,6 +8,7 @@
 
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -149,13 +150,13 @@ public abstract class TiUIAbstractTabGroup extends TiUIView
 	protected boolean smoothScrollOnTabClick = true;
 	protected boolean tabsDisabled = false;
 	protected int numTabsWhenDisabled;
-	protected int colorPrimaryInt;
 	protected PagerAdapter tabGroupPagerAdapter;
 	protected ViewPager tabGroupViewPager;
 	protected TiInsetsProvider insetsProvider = new TiInsetsProvider();
 	// endregion
 
 	// region private fields
+	private int colorSurfaceInt;
 	private int textColorInt;
 	private int unselectedTextColorInt;
 	private AtomicLong fragmentIdGenerator = new AtomicLong();
@@ -169,20 +170,19 @@ public TiUIAbstractTabGroup(final TabGroupProxy proxy, TiBaseActivity activity)
 
 		// Fetch primary background and text colors from ActionBar style assigned to activity theme.
 		// Note: We use ActionBar style for backward compatibility with Titanium versions older than 8.0.0.
-		this.colorPrimaryInt = 0xFF212121; // Default to dark gray.
-		this.textColorInt = 0xFFFFFFFF;    // Default to white.
+		this.textColorInt = 0xFF212121; // Default to dark gray.
 		this.unselectedTextColorInt = 0xFFBBBBBB; // Default to light gray.
+		this.colorSurfaceInt = Color.TRANSPARENT;
 		try {
-			final int styleAttributeId = TiRHelper.getResource("attr.actionBarStyle");
 			final int[] idArray = new int[] {
 				TiRHelper.getResource("attr.colorPrimary"),
-				TiRHelper.getResource("attr.textColorPrimary"),
-				TiRHelper.getResource("attr.colorControlNormal")
+				TiRHelper.getResource("attr.colorSurface"),
+				TiRHelper.getResource("attr.colorOnSurface")
 			};
-			final TypedArray typedArray = activity.obtainStyledAttributes(null, idArray, styleAttributeId, 0);
+			final TypedArray typedArray =  activity.getTheme().obtainStyledAttributes(idArray);
 
-			this.colorPrimaryInt = typedArray.getColor(0, this.colorPrimaryInt);
-			this.textColorInt = typedArray.getColor(1, this.textColorInt);
+			this.textColorInt = typedArray.getColor(0, this.textColorInt);
+			this.colorSurfaceInt = typedArray.getColor(1, this.colorSurfaceInt);
 			this.unselectedTextColorInt = typedArray.getColor(2, this.unselectedTextColorInt);
 			typedArray.recycle();
 		} catch (Exception ex) {
@@ -318,7 +318,7 @@ protected Drawable createBackgroundDrawableForState(TiViewProxy tabProxy, int st
 		// If the TabGroup has backgroundColor property, use it. If not - use the primaryColor of the theme.
 		colorInt = proxy.hasPropertyAndNotNull(TiC.PROPERTY_TABS_BACKGROUND_COLOR)
 					   ? TiColorHelper.parseColor(proxy.getProperty(TiC.PROPERTY_TABS_BACKGROUND_COLOR).toString())
-					   : this.colorPrimaryInt;
+					   : this.colorSurfaceInt;
 		// If the Tab has its own backgroundColor property, use it instead.
 		colorInt = tabProxy.hasPropertyAndNotNull(TiC.PROPERTY_BACKGROUND_COLOR)
 					   ? TiColorHelper.parseColor(tabProxy.getProperty(TiC.PROPERTY_BACKGROUND_COLOR).toString())
@@ -430,7 +430,7 @@ public void processProperties(KrollDict d)
 		if (d.containsKeyAndNotNull(TiC.PROPERTY_TABS_BACKGROUND_COLOR)) {
 			setBackgroundColor(TiColorHelper.parseColor(d.get(TiC.PROPERTY_TABS_BACKGROUND_COLOR).toString()));
 		} else {
-			setBackgroundColor(this.colorPrimaryInt);
+			setBackgroundColor(this.colorSurfaceInt);
 		}
 		super.processProperties(d);
 	}
diff --git a/android/templates/build/AndroidManifest.xml b/android/templates/build/AndroidManifest.xml
index def9d80c226..be63483ee94 100644
--- a/android/templates/build/AndroidManifest.xml
+++ b/android/templates/build/AndroidManifest.xml
@@ -28,7 +28,7 @@
 		android:label="<%- appLabel %>"
 		android:name="<%- classname %>Application"
 		android:usesCleartextTraffic="true"
-		android:theme="<%- appTheme %>">
+		android:theme="@style/Base.Theme.Titanium.Customizable">
 
 		<activity
 			android:name=".<%- classname %>Activity"
diff --git a/android/titanium/res/values-night/values.xml b/android/titanium/res/values-night/values.xml
new file mode 100644
index 00000000000..76b576bc54d
--- /dev/null
+++ b/android/titanium/res/values-night/values.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- Titanium's dark theme colors. -->
+	<color name="ti_primary">#92B4F2</color>
+	<color name="ti_primary_dark">#000000</color>
+	<color name="ti_accent">#92B4F2</color>
+	<color name="ti_surface">#353639</color>
+	<color name="ti_background">#202124</color>
+	<color name="ti_navigation_bar">#000000</color>
+</resources>
\ No newline at end of file
diff --git a/android/titanium/res/values/values.xml b/android/titanium/res/values/values.xml
index 9ca4b5e7b0c..1696561cb94 100644
--- a/android/titanium/res/values/values.xml
+++ b/android/titanium/res/values/values.xml
@@ -1,15 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<!-- Base theme applied to Titanium's splash screen activity. -->
-	<!-- Our "_build.js" will replace it with ".NoActionBar" or ".Fullscreen" theme if set in "tiapp.xml" file. -->
-	<style name="Base.Theme.Titanium.Basic" parent="Theme.MaterialComponents.Bridge"/>
+	<!-- Theme colors used by Titanium's splash screen activity. -->
+	<color name="ti_splash_primary">#000000</color>
+	<color name="ti_splash_primary_dark">#000000</color>
+	<color name="ti_splash_navigation_bar">#000000</color>
 
-	<!-- Base theme applied to all Titanium opaque windows. -->
-	<!-- Our "_build.js" script will replace it if custom theme is applied to application in manifest. -->
-	<style name="Base.Theme.Titanium.Customizable" parent="Theme.AppCompat"/>
+	<!-- Titanium's light theme colors. -->
+	<color name="ti_primary">#3475E0</color>
+	<color name="ti_primary_dark">#303F9F</color>
+	<color name="ti_accent">#3273DB</color>
+	<color name="ti_surface">#FFFFFF</color>
+	<color name="ti_background">#FFFFFF</color>
+	<color name="ti_navigation_bar">#303F9F</color>
+
+	<!-- Root theme inherited by all other Titanium themes. -->
+	<!-- Our "_build.js" will replace parent with ".NoActionBar" or ".Fullscreen" if set in "tiapp.xml". -->
+	<style name="Base.Theme.Titanium.RootStyle" parent="Theme.MaterialComponents.DayNight.DarkActionBar"/>
+
+	<!-- Titanium's custom theme applied to all activities. This theme is used by default. -->
+	<style name="Base.Theme.Titanium" parent="Base.Theme.Titanium.RootStyle">
+		<item name="colorPrimary">@color/ti_primary</item>
+		<item name="colorPrimaryDark">@color/ti_primary_dark</item>
+		<item name="colorAccent">@color/ti_accent</item>
+		<item name="colorSurface">@color/ti_surface</item>
+		<item name="android:colorBackground">@color/ti_background</item>
+		<item name="android:navigationBarColor">@color/ti_navigation_bar</item>
+	</style>
+
+	<!-- Base theme applied to all Titanium activities except splash. -->
+	<!-- Our "_build.js" will replace parent if "AndroidManifest.xml" has custom application theme. -->
+	<style name="Base.Theme.Titanium.Customizable" parent="Base.Theme.Titanium"/>
 
 	<!-- Base theme to be used by the "TiRootActivity" class. -->
-	<style name="Base.Theme.Titanium.Splash" parent="Base.Theme.Titanium.Basic">
+	<style name="Base.Theme.Titanium.Splash" parent="Base.Theme.Titanium">
+		<item name="colorPrimary">@color/ti_splash_primary</item>
+		<item name="colorPrimaryDark">@color/ti_splash_primary_dark</item>
+		<item name="android:navigationBarColor">@color/ti_splash_navigation_bar</item>
 		<item name="android:windowActionBar">false</item>
 		<item name="android:windowNoTitle">true</item>
 		<item name="windowActionBar">false</item>
@@ -56,7 +82,18 @@
 		<item name="android:windowFullscreen">true</item>
 	</style>
 
+	<!-- Inherits Google's "Theme.MaterialComponents.DayNight.DarkActionBar" and removes top status and title bar. -->
+	<style name="Theme.MaterialComponents.DayNight.Fullscreen" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+		<item name="android:windowActionBar">false</item>
+		<item name="android:windowContentOverlay">@null</item>
+		<item name="android:windowFullscreen">true</item>
+		<item name="android:windowNoTitle">true</item>
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
+
 	<!-- Inherits Google's "Theme.MaterialComponents.Bridge" and removes top status and title bar. -->
+	<!-- DEPRECATED: Should use non-bridge version of MaterialComponents theme to avoid material widget issues. -->
 	<style name="Theme.MaterialComponents.Fullscreen.Bridge" parent="Theme.MaterialComponents.Bridge">
 		<item name="android:windowActionBar">false</item>
 		<item name="android:windowContentOverlay">@null</item>
@@ -66,6 +103,12 @@
 		<item name="windowNoTitle">true</item>
 	</style>
 
+	<!-- Simple error dialog theme with a dark red background and white text. -->
+	<!-- Note: Cannot derive from material theme in case it's displaying a theming error. -->
+	<style name="Theme.Titanium.Dialog.Error" parent="Theme.AppCompat.Dialog.Alert">
+		<item name="android:background">#8A0000</item>
+	</style>
+
 	<!-- Google's dark AppCompat activity theme without a top title bar. -->
 	<!-- DEPRECATED: Should use MaterialComponents theme instead in order to use material widgets. -->
 	<style name="Theme.AppCompat.NoTitleBar" parent="Theme.AppCompat">
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
index adc132ca75d..0c2e7ed25ae 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -96,6 +96,7 @@ public abstract class TiBaseActivity extends AppCompatActivity implements TiActi
 	private TiWeakList<OnPrepareOptionsMenuEvent> onPrepareOptionsMenuListeners =
 		new TiWeakList<OnPrepareOptionsMenuEvent>();
 	private boolean sustainMode = false;
+	private int lastUIModeFlags = 0;
 	private Intent launchIntent = null;
 	private TiActionBarStyleHandler actionBarStyleHandler;
 	private TiActivitySafeAreaMonitor safeAreaMonitor;
@@ -650,6 +651,25 @@ protected void onCreate(Bundle savedInstanceState)
 		this.launchIntent = getIntent();
 		this.safeAreaMonitor = new TiActivitySafeAreaMonitor(this);
 
+		// Fetch the current UI mode flags. Used to determine light/dark theme being used.
+		Configuration config = getResources().getConfiguration();
+		if (config != null) {
+			this.lastUIModeFlags = config.uiMode;
+		}
+
+		// If activity is being recreated/restored, then copy last saved intent extras.
+		// This is needed to acquire the Ti.UI.Window proxy ID this activity should be assigned to.
+		if ((this.launchIntent != null) && (savedInstanceState != null)) {
+			Bundle oldExtras = savedInstanceState.getBundle("tiLaunchIntentExtras");
+			if (oldExtras != null) {
+				Bundle newExtras = this.launchIntent.getExtras();
+				if (newExtras != null) {
+					oldExtras.putAll(newExtras);
+				}
+				this.launchIntent.putExtras(oldExtras);
+			}
+		}
+
 		TiApplication tiApp = getTiApp();
 		TiApplication.addToActivityStack(this);
 
@@ -768,7 +788,11 @@ public void onChanged(TiActivitySafeAreaMonitor monitor)
 		originalOrientationMode = getRequestedOrientation();
 
 		if (window != null) {
-			window.onWindowActivityCreated();
+			try {
+				window.onWindowActivityCreated();
+			} catch (Throwable t) {
+				Thread.getDefaultUncaughtExceptionHandler().uncaughtException(null, t);
+			}
 		}
 		if (activityProxy != null) {
 			dispatchCallback(TiC.PROPERTY_ON_CREATE, null);
@@ -1161,7 +1185,7 @@ public boolean onPrepareOptionsMenu(Menu menu)
 	}
 
 	@Override
-	public void onConfigurationChanged(Configuration newConfig)
+	public void onConfigurationChanged(@NonNull Configuration newConfig)
 	{
 		super.onConfigurationChanged(newConfig);
 
@@ -1181,6 +1205,13 @@ public void onConfigurationChanged(Configuration newConfig)
 				listener.get().onConfigurationChanged(this, newConfig);
 			}
 		}
+
+		// Recreate this activity if the OS has switched between light/dark theme.
+		final int NIGHT_MASK = Configuration.UI_MODE_NIGHT_MASK;
+		if ((newConfig.uiMode & NIGHT_MASK) != (this.lastUIModeFlags & NIGHT_MASK)) {
+			this.recreate();
+		}
+		this.lastUIModeFlags = newConfig.uiMode;
 	}
 
 	@Override
@@ -1580,10 +1611,14 @@ protected void onSaveInstanceState(Bundle outState)
 	{
 		super.onSaveInstanceState(outState);
 
-		// If the activity is forced to destroy by Android, save the supportHelperId so
-		// we can get it back when the activity is recovered.
-		if (!isFinishing() && supportHelper != null) {
-			outState.putInt("supportHelperId", supportHelperId);
+		// If activity is being temporarily destroyed, then save settings to be restored when activity is recreated.
+		if (!isFinishing()) {
+			if (supportHelper != null) {
+				outState.putInt("supportHelperId", supportHelperId);
+			}
+			if (this.launchIntent != null) {
+				outState.putBundle("tiLaunchIntentExtras", this.launchIntent.getExtras());
+			}
 		}
 
 		synchronized (instanceStateListeners.synchronizedList())
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiExceptionHandler.java b/android/titanium/src/java/org/appcelerator/titanium/TiExceptionHandler.java
index 00f6efc38f5..0db61a8d19b 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/TiExceptionHandler.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/TiExceptionHandler.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.graphics.Rect;
@@ -33,6 +32,7 @@
 import android.widget.RelativeLayout;
 import android.widget.Scroller;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 
 /**
  * A utility class for creating a dialog that displays Javascript errors
@@ -192,9 +192,24 @@ protected static void createDialog(final KrollDict error)
 			return;
 		}
 
-		final Context context = tiApp.getCurrentActivity();
+		final Activity activity = tiApp.getCurrentActivity();
+		if (activity == null) {
+			return;
+		}
 
-		final TextView errorView = new TextView(context);
+		// If this is a material theme exception, then show a simpler error without a trace.
+		if (error != null) {
+			String errorMessage = error.getString(ERROR_MESSAGE);
+			errorMessage = (errorMessage != null) ? errorMessage : "";
+			if (errorMessage.contains("theme to inherit from Theme.MaterialComponents")
+				|| errorMessage.contains("theme to be Theme.MaterialComponents")) {
+				dialogShowing = false;
+				showMaterialThemeErrorDialog(activity);
+				return;
+			}
+		}
+
+		final TextView errorView = new TextView(activity);
 		errorView.setBackgroundColor(0xFFF5F5F5);
 		errorView.setTextColor(0xFFE53935);
 		errorView.setPadding(5, 5, 5, 5);
@@ -202,7 +217,7 @@ protected static void createDialog(final KrollDict error)
 																LinearLayout.LayoutParams.MATCH_PARENT));
 		errorView.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE);
 		errorView.setSingleLine(false);
-		errorView.setScroller(new Scroller(context));
+		errorView.setScroller(new Scroller(activity));
 		errorView.setVerticalScrollBarEnabled(true);
 		errorView.setHorizontallyScrolling(true);
 		errorView.setHorizontalScrollBarEnabled(true);
@@ -210,7 +225,7 @@ protected static void createDialog(final KrollDict error)
 		errorView.setTypeface(Typeface.MONOSPACE);
 		errorView.setText(getError(error));
 
-		final RelativeLayout layout = new RelativeLayout(context);
+		final RelativeLayout layout = new RelativeLayout(activity);
 		layout.setPadding(0, 50, 0, 0);
 		RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
 			RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
@@ -230,7 +245,7 @@ public void onClick(DialogInterface dialog, int which)
 			}
 		};
 
-		final AlertDialog.Builder builder = new AlertDialog.Builder(context)
+		final AlertDialog.Builder builder = new AlertDialog.Builder(activity)
 												.setTitle(error.getString("title"))
 												.setView(layout)
 												.setPositiveButton("Kill", clickListener)
@@ -240,12 +255,22 @@ public void onClick(DialogInterface dialog, int which)
 		final AlertDialog dialog = builder.create();
 		dialog.show();
 
-		final Window window = ((Activity) context).getWindow();
+		final Window window = activity.getWindow();
 		Rect displayRect = new Rect();
 		window.getDecorView().getWindowVisibleDisplayFrame(displayRect);
 		dialog.getWindow().setLayout(displayRect.width(), (int) (displayRect.height() * 0.95));
 	}
 
+	private static void showMaterialThemeErrorDialog(@NonNull Activity activity)
+	{
+		AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.Theme_Titanium_Dialog_Error);
+		builder.setTitle("Developer Error");
+		builder.setMessage(
+			"As of Titanium 10.0.0, a custom theme applied to the app or activity window must derive "
+				+ "from 'Theme.MaterialComponents'.");
+		builder.create().show();
+	}
+
 	public boolean handleMessage(Message msg)
 	{
 		switch (msg.what) {
diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
index 8e33140382a..0d55d8ce7f0 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -498,11 +498,8 @@ public KrollDict getSafeAreaPadding()
 	protected void handlePostOpen()
 	{
 		if (postOpenListener != null) {
-			getMainHandler().post(new Runnable() {
-				public void run()
-				{
-					postOpenListener.onPostOpen(TiWindowProxy.this);
-				}
+			getMainHandler().post(() -> {
+				postOpenListener.onPostOpen(TiWindowProxy.this);
 			});
 		}