refactor(android): use material widgets/styles and default to DayNight theme

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/Theme.Titanium.App" 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>

android/build.gradle

@@ -6,15 +6,15 @@
  */
 
 buildscript {
-	ext.kotlin_version = '1.4.10'
+	ext.kotlin_version = '1.4.30'
 
 	repositories {
 		google()
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.1.0'
-		classpath 'com.google.gms:google-services:4.3.4'
+		classpath 'com.android.tools.build:gradle:4.1.2'
+		classpath 'com.google.gms:google-services:4.3.5'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
@@ -28,7 +28,7 @@ allprojects {
 	// Load plugin used to enforce our Java coding style guidelines.
 	project.apply plugin: 'checkstyle'
 	checkstyle {
-		toolVersion = '8.36.2'
+		toolVersion = '8.38'
 		configFile file("${rootDir}/checkstyle.xml");
 		ignoreFailures false
 		showViolations true

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,13 +3249,20 @@ AndroidBuilder.prototype.generateTheme = async function generateTheme() {
 	const xmlFilePath = path.join(valuesDirPath, 'ti_styles.xml');
 	this.logger.info(__('Generating theme file: %s', xmlFilePath.cyan));
 
-	// 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;
+	// Set default theme to be used in "AndroidManifest.xml" and style resources.
+	let defaultAppThemeName = 'Theme.Titanium.DayNight';
+	if (this.tiapp.fullscreen || this.tiapp['statusbar-hidden']) {
+		defaultAppThemeName = 'Theme.Titanium.DayNight.Fullscreen';
+	} else if (this.tiapp['navbar-hidden']) {
+		defaultAppThemeName = 'Theme.Titanium.DayNight.NoTitleBar';
+	}
+
+	// Set up "Theme.AppDerived" to use the <application/> defined theme, if assigned.
+	let actualAppTheme = 'Theme.Titanium.App';
 	if (this.customAndroidManifest) {
 		const appTheme = this.customAndroidManifest.getAppAttribute('android:theme');
-		if (appTheme && !appTheme.startsWith('@style/Theme.Titanium') && !appTheme.startsWith('@style/Base.Theme.Titanium')) {
-			customizableParentThemeName = appTheme;
+		if (appTheme && !appTheme.startsWith('@style/Theme.AppDerived') && (appTheme !== '@style/Theme.Titanium')) {
+			actualAppTheme = appTheme;
 		}
 	}
 
@@ -3272,11 +3271,11 @@ 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.Customizable" parent="${customizableParentThemeName}"/>`,
+		`	<style name="Theme.Titanium.App" parent="${defaultAppThemeName}"/>`,
+		`	<style name="Theme.AppDerived" parent="${actualAppTheme}"/>`,
 		'',
 		'	<!-- Theme used by "TiRootActivity" derived class which displays the splash screen. -->',
-		'	<style name="Theme.Titanium" parent="@style/Base.Theme.Titanium.Splash">',
+		'	<style name="Theme.Titanium" parent="Base.Theme.Titanium.Splash">',
 		'		<item name="android:windowBackground">@drawable/background</item>',
 		'	</style>',
 		'</resources>'
@@ -3513,7 +3512,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,

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

android/gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

android/modules/android/src/java/ti/modules/titanium/android/quicksettings/QuickSettingsServiceProxy.java

@@ -1,12 +1,11 @@
 package ti.modules.titanium.android.quicksettings;
 
 import android.annotation.TargetApi;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.graphics.drawable.Icon;
 import android.service.quicksettings.TileService;
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollRuntime;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -27,7 +26,7 @@ public class QuickSettingsServiceProxy extends ServiceProxy
 	private TileService tileService;
 	//workaround for dealing with Icon class
 	private Object pathObject = null;
-	private AlertDialog.Builder builder;
+	private MaterialAlertDialogBuilder builder;
 
 	public QuickSettingsServiceProxy(TileService serviceInstance)
 	{
@@ -134,7 +133,7 @@ public void run()
 
 	private Dialog createDialogFromDictionary(KrollDict krollDict)
 	{
-		builder = new AlertDialog.Builder(tileService.getApplicationContext());
+		builder = new MaterialAlertDialogBuilder(tileService.getApplicationContext());
 		String[] buttonText = null;
 		if (krollDict.containsKey(TiC.PROPERTY_TITLE)) {
 			builder.setTitle(krollDict.getString(TiC.PROPERTY_TITLE));

android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java

@@ -168,7 +168,10 @@ public void onCreate(Bundle savedInstanceState)
 		previewHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
 
 		// set preview overlay
-		localOverlayProxy = overlayProxy;
+		this.localOverlayProxy = overlayProxy;
+		if (this.localOverlayProxy != null) {
+			this.localOverlayProxy.setActivity(this);
+		}
 
 		// set overall layout - will populate in onResume
 		previewLayout = new PreviewLayout(this);

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"/>

android/modules/ui/res/layout/titanium_ui_drawer_layout.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-           <androidx.appcompat.widget.Toolbar
+           <com.google.android.material.appbar.MaterialToolbar
                xmlns:app="http://schemas.android.com/apk/res-auto"
                android:id="@+id/drawer_layout_toolbar"
                android:visibility="gone"

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"
 />

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"/>

android/modules/ui/res/layout/titanium_ui_toolbar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:visibility="gone"