feat(android): collapse toolbar menu support

CHANGELOG.md

@@ -1,3 +1,93 @@
+# [12.5.0](https://github.com/tidev/titanium_mobile/compare/12_4_X...12.5.0) (2024-09-16)
+
+## About this release
+
+Titanium SDK 12.5.0 is a minor release of the SDK, adding new features and platform updates. It also adds stable support for
+iOS 18 and Xcode 16, the latest software in the Apple ecosystem.
+
+## Community Credits
+
+* Michael Gangolf
+  * forward --sdk in module build process ([07f435d](https://github.com/tidev/titanium_mobile/commit/07f435d836f644ec469f9f7485682b74d25e0699))
+  * more log output ([694766b](https://github.com/tidev/titanium_mobile/commit/694766b63323e3fee70e64abee07841b267fdce7))
+  * statusBarColor for Window ([91499ef](https://github.com/tidev/titanium_mobile/commit/91499efadc6cc1c9a8fd2c82cdddf4ddd340f213))
+  * flatten ListView layout ([b9fd683](https://github.com/tidev/titanium_mobile/commit/b9fd68326f1dca7f7dc4eeb20e9fffa881dbce6d))
+  * add maxImages and pathOnly to openPhotoGallery ([3eda594](https://github.com/tidev/titanium_mobile/commit/3eda594e2721651a412a9557f6a05830c19efb29))
+  * fire `selected` event again when clicking the same Tab again ([dfb1b5c](https://github.com/tidev/titanium_mobile/commit/dfb1b5c312cbfac159fbae4d7277330dad71d6e0))
+  * enable Signature Scheme v3 ([c719bcd](https://github.com/tidev/titanium_mobile/commit/c719bcd5cd061cccaefe888b8edaf7f25143f412))
+  * update cmake, checkstyle ([8846f07](https://github.com/tidev/titanium_mobile/commit/8846f07955e0157ff134c122bd544f66c2fdb501))
+  * fix tintColor and activeTintColor in a TabbedBar ([2e92f1d](https://github.com/tidev/titanium_mobile/commit/2e92f1ddd00b9610ff9a6fc14775545b7cdf089e))
+  * set targetSDK to Android 34 ([5fc81f0](https://github.com/tidev/titanium_mobile/commit/5fc81f08bdb3f9ba64d9cb4972848c8523f2d190))
+  * fix Actionbar backgroundImage doc and improve setter ([803bd04](https://github.com/tidev/titanium_mobile/commit/803bd04350df89f2197842d110ad3c0384a97c7f))
+  * keep Tab tintColor when changing icons ([51be366](https://github.com/tidev/titanium_mobile/commit/51be36662445ad4755438a7f1b511a837196df69))
+  * fix titleAttribute when it's not a creation parameter ([017c052](https://github.com/tidev/titanium_mobile/commit/017c0524dc1a76527a8ba342964ea881633492d5))
+
+* Hans Knöchel
+  * add “interactiveDismissModeEnabled” API ([1d2cdd5](https://github.com/tidev/titanium_mobile/commit/1d2cdd5ff802fcc628ab67cd1a882117b1e74c00))
+  * textfield padding ([d75fc9e](https://github.com/tidev/titanium_mobile/commit/d75fc9efb225aa798101388d6ba50d9751a2847a))
+  * Revert "fix(ios): fix unbalanced view controller transitions causing issues on iOS 16+ (#13586)" ([b9932b2](https://github.com/tidev/titanium_mobile/commit/b9932b2f3929a19523a29a453710afecb84ea7f7))
+  * bump master to 12.5.0 ([52cab42](https://github.com/tidev/titanium_mobile/commit/52cab4293d6c9a0472428f4ed0d0fb7566ebb530))
+  * add 12.5.0 changelog ([e5e3f33](https://github.com/tidev/titanium_mobile/commit/e5e3f33323e65593f69eda2fc56f750e7611ec7a))
+
+* Abdullah Al-Faqeir
+  * pause returns false ([e577bce](https://github.com/tidev/titanium_mobile/commit/e577bce9b640974ce92a9ad209846fa2f5b7915b))
+
+## Bug Fixes
+
+### Android platform
+
+* fix Actionbar backgroundImage doc and improve setter ([803bd04](https://github.com/tidev/titanium_mobile/commit/803bd04350df89f2197842d110ad3c0384a97c7f))
+* fix tintColor and activeTintColor in a TabbedBar ([2e92f1d](https://github.com/tidev/titanium_mobile/commit/2e92f1ddd00b9610ff9a6fc14775545b7cdf089e))
+* fix titleAttribute when it's not a creation parameter ([017c052](https://github.com/tidev/titanium_mobile/commit/017c0524dc1a76527a8ba342964ea881633492d5))
+* keep Tab tintColor when changing icons ([51be366](https://github.com/tidev/titanium_mobile/commit/51be36662445ad4755438a7f1b511a837196df69))
+* textfield padding ([d75fc9e](https://github.com/tidev/titanium_mobile/commit/d75fc9efb225aa798101388d6ba50d9751a2847a))
+
+### iOS platform
+
+* pause returns false ([e577bce](https://github.com/tidev/titanium_mobile/commit/e577bce9b640974ce92a9ad209846fa2f5b7915b))
+
+### Multiple platforms
+
+* sdk build on windows needs shell: true to run batch files ([f3e5a0b](https://github.com/tidev/titanium_mobile/commit/f3e5a0bd90eb75dfa7ec0c5e6a4b4cc39ac4b95a))
+
+## Features
+
+### Multiple platforms
+
+* add 12.4.0.GA changelog ([9388600](https://github.com/tidev/titanium_mobile/commit/9388600a951db750e188eaca6c14b6e1683ffd7c))
+* add 12.5.0 changelog ([e5e3f33](https://github.com/tidev/titanium_mobile/commit/e5e3f33323e65593f69eda2fc56f750e7611ec7a))
+
+### Android platform
+
+* add maxImages and pathOnly to openPhotoGallery ([3eda594](https://github.com/tidev/titanium_mobile/commit/3eda594e2721651a412a9557f6a05830c19efb29))
+* enable Signature Scheme v3 ([c719bcd](https://github.com/tidev/titanium_mobile/commit/c719bcd5cd061cccaefe888b8edaf7f25143f412))
+* fire `selected` event again when clicking the same Tab again ([dfb1b5c](https://github.com/tidev/titanium_mobile/commit/dfb1b5c312cbfac159fbae4d7277330dad71d6e0))
+* flatten ListView layout ([b9fd683](https://github.com/tidev/titanium_mobile/commit/b9fd68326f1dca7f7dc4eeb20e9fffa881dbce6d))
+* more log output ([694766b](https://github.com/tidev/titanium_mobile/commit/694766b63323e3fee70e64abee07841b267fdce7))
+* set targetSDK to Android 34 ([5fc81f0](https://github.com/tidev/titanium_mobile/commit/5fc81f08bdb3f9ba64d9cb4972848c8523f2d190))
+* statusBarColor for Window ([91499ef](https://github.com/tidev/titanium_mobile/commit/91499efadc6cc1c9a8fd2c82cdddf4ddd340f213))
+
+### iOS platform
+
+* add “interactiveDismissModeEnabled” API ([1d2cdd5](https://github.com/tidev/titanium_mobile/commit/1d2cdd5ff802fcc628ab67cd1a882117b1e74c00))
+
+## BREAKING CHANGES
+
+
+## SDK Module Versions
+
+| Module      | Android version | iOS Version |
+| ----------- | --------------- | ----------- |
+| facebook | 12.1.0 | 14.0.0 |
+| ti.map | 5.6.1 | 7.3.1 |
+| ti.webdialog | 2.3.0 | 3.0.2 |
+| ti.playservices | 18.3.0 | n/a |
+| ti.identity | 3.1.0 | 5.0.0 |
+| urlSession | n/a | 4.0.1 |
+| ti.coremotion | n/a | 4.0.1 |
+| ti.applesignin | n/a | 3.1.2 |
+| hyperloop | 7.0.6 | 7.0.6 |
+
 # [12.4.0](https://github.com/tidev/titanium_mobile/compare/12_3_X...12.4.0) (2024-07-17)
 
 ## About this release

android/cli/commands/_buildModule.js

@@ -58,6 +58,7 @@ AndroidModuleBuilder.prototype.migrate = async function migrate() {
 	const manifestModuleAPIVersion = this.manifest.apiversion;
 	const manifestTemplateFile = path.join(this.platformPath, 'templates', 'module', 'default', 'template', 'android', 'manifest.ejs');
 	let newVersion = semver.inc(this.manifest.version, 'major');
+	this.tiSdkVersion = cliSDKVersion;
 
 	// Determine if the "manifest" file's "apiversion" needs updating.
 	let isApiVersionUpdateRequired = false;
@@ -873,6 +874,7 @@ AndroidModuleBuilder.prototype.runModule = async function (cli) {
 			'-u', 'localhost',
 			'-d', tmpDir,
 			'-p', 'android',
+			'--sdk', this.tiSdkVersion,
 			'--force'
 		],
 		this.logger
@@ -917,7 +919,7 @@ AndroidModuleBuilder.prototype.runModule = async function (cli) {
 
 	// Run the temp app.
 	this.logger.debug(__('Running example project...', tmpDir.cyan));
-	let buildArgs = [ process.argv[1], 'build', '-p', 'android', '-d', tmpProjectDir ];
+	let buildArgs = [ process.argv[1], 'build', '-p', 'android', '-d', tmpProjectDir, '--sdk', this.tiSdkVersion ];
 	if (this.target) {
 		buildArgs.push('-T');
 		buildArgs.push(this.target);

android/cli/hooks/run.js

@@ -268,7 +268,11 @@ exports.init = function (logger, config, cli) {
 						}
 
 						// ignore some Android logs in info log level
-						if (ignoreLog.some(ignoreItem => line.includes(ignoreItem))) {
+						if (typeof ignoreLog === 'string') {
+							if (line.includes(ignoreLog)) {
+								return;
+							}
+						} else if (ignoreLog.some(ignoreItem => line.includes(ignoreItem))) {
 							return;
 						}
 

android/modules/app/src/java/ti/modules/titanium/app/AppModule.java

@@ -13,6 +13,7 @@
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.ITiAppInfo;
 import org.appcelerator.titanium.TiApplication;
+import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiSensorHelper;
@@ -155,6 +156,16 @@ public boolean getAccessibilityEnabled()
 		return TiApplication.getInstance().getAccessibilityManager().isEnabled();
 	}
 
+	@Kroll.getProperty
+	public boolean getKeyboardVisible()
+	{
+		TiBaseActivity activity = (TiBaseActivity) TiApplication.getAppCurrentActivity();
+		if (activity == null) {
+			return false;
+		}
+		return TiConvert.toBoolean(activity.keyboardVisible, false);
+	}
+
 	@Kroll.method(name = "_restart")
 	public void restart()
 	{

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

@@ -29,7 +29,9 @@
 			android:id="@+id/collapseToolbarLayout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
+			app:layout_scrollFlags="scroll|snap|exitUntilCollapsed"
+			app:titleCentered="true"
+			app:collapsedTitleGravity="center|center_horizontal">
 
 			<ImageView
 				android:id="@+id/collapseImageView"

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="false">
+
+	<androidx.core.widget.NestedScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+		<org.appcelerator.titanium.view.TiCompositeLayout
+			android:id="@+id/collapseContent"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent">
+			<!-- main content -->
+		</org.appcelerator.titanium.view.TiCompositeLayout>
+
+	</androidx.core.widget.NestedScrollView>
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBarLayout"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+		<!-- toolbar -->
+
+		<com.google.android.material.appbar.CollapsingToolbarLayout
+			android:id="@+id/collapseToolbarLayout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			app:layout_scrollFlags="scroll|snap|exitUntilCollapsed"
+			app:titleCentered="true"
+			app:collapsedTitleGravity="center|center_horizontal">
+
+			<ImageView
+				android:id="@+id/collapseImageView"
+				android:layout_width="match_parent"
+				android:layout_height="250dp"
+				android:scaleType="centerCrop"
+				android:visibility="invisible"
+				app:layout_collapseMode="parallax" />
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:layout_collapseMode="pin" 
+				app:titleCentered="true"/>
+
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -12,9 +12,8 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:addStatesFromChildren="true"
-		app:layout_constraintBottom_toTopOf="@+id/titanium_ui_listview_holder_footer_title"
 		app:layout_constraintStart_toEndOf="@id/titanium_ui_listview_holder_left_image"
-		app:layout_constraintTop_toBottomOf="@+id/titanium_ui_listview_holder_header_title" />
+		app:layout_constraintTop_toBottomOf="@+id/barrierHeader" />
 
 	<ImageView
 		android:id="@+id/titanium_ui_listview_holder_left_image"
@@ -24,9 +23,9 @@
 		android:focusableInTouchMode="false"
 		android:paddingStart="6dp"
 		android:paddingEnd="0dp"
-		app:layout_constraintBottom_toTopOf="@id/titanium_ui_listview_holder_footer_title"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_header_title" />
+		app:layout_constraintTop_toTopOf="@id/titanium_ui_listview_holder_content"
+		app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_content" />
 
 	<ImageView
 		android:id="@+id/titanium_ui_listview_holder_right_image"
@@ -35,9 +34,9 @@
 		android:layout_marginEnd="6dp"
 		android:focusable="false"
 		android:focusableInTouchMode="false"
-		app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_footer_title"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_header_title" />
+		app:layout_constraintTop_toTopOf="@id/titanium_ui_listview_holder_content"
+		app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_content" />
 
 	<TextView
 		android:id="@+id/titanium_ui_listview_holder_header_title"
@@ -63,10 +62,16 @@
 		android:minHeight="18dp"
 		android:paddingLeft="5dp"
 		android:paddingRight="5dp"
-		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent" />
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_content" />
 
+	<androidx.constraintlayout.widget.Barrier
+		android:id="@+id/barrierHeader"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:barrierDirection="bottom"
+		app:constraint_referenced_ids="titanium_ui_listview_holder_header,titanium_ui_listview_holder_header_title" />
 
 	<org.appcelerator.titanium.view.TiCompositeLayout
 		android:id="@+id/titanium_ui_listview_holder_header"
@@ -84,7 +89,7 @@
 		android:layout_height="wrap_content"
 		android:focusable="false"
 		android:focusableInTouchMode="false"
-		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_content"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent" />
 

android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java

@@ -69,8 +69,10 @@
 		TiC.PROPERTY_MODAL,
 		TiC.PROPERTY_WINDOW_PIXEL_FORMAT,
 		TiC.PROPERTY_FLAG_SECURE,
-		TiC.PROPERTY_BAR_COLOR
+		TiC.PROPERTY_BAR_COLOR,
+		TiC.PROPERTY_STATUS_BAR_COLOR
 	})
+
 public class WindowProxy extends TiWindowProxy implements TiActivityWindow
 {
 	private static final String TAG = "WindowProxy";
@@ -320,6 +322,12 @@ public void windowCreated(TiBaseActivity activity, Bundle savedInstanceState)
 			}
 		}
 
+		if (hasProperty(TiC.PROPERTY_STATUS_BAR_COLOR)) {
+			int colorInt = TiColorHelper.parseColor(
+				TiConvert.toString(getProperty(TiC.PROPERTY_STATUS_BAR_COLOR)), activity);
+			win.setStatusBarColor(colorInt);
+		}
+
 		// Handle titleAttributes property.
 		if (hasProperty(TiC.PROPERTY_TITLE_ATTRIBUTES)) {
 			KrollDict innerAttributes = getProperties().getKrollDict(TiC.PROPERTY_TITLE_ATTRIBUTES);
@@ -446,6 +454,14 @@ public void onPropertyChanged(String name, Object value)
 			}
 		}
 
+		if (name.equals(TiC.PROPERTY_STATUS_BAR_COLOR)) {
+			if (windowActivity != null && windowActivity.get() != null) {
+				AppCompatActivity activity = windowActivity.get();
+				int colorInt = TiColorHelper.parseColor(TiConvert.toString(value), activity);
+				activity.getWindow().setStatusBarColor(colorInt);
+			}
+		}
+
 		if (name.equals(TiC.PROPERTY_TITLE_ATTRIBUTES)) {
 			if (windowActivity != null && windowActivity.get() != null) {
 				// Get a reference to the ActionBar.

android/modules/ui/src/java/ti/modules/titanium/ui/android/CollapseToolbarProxy.java

@@ -101,4 +101,29 @@ public void setNavigationIconColor(String value)
 	{
 		collapseToolbar.setNavigationIconColor(TiConvert.toColor(value, TiApplication.getAppCurrentActivity()));
 	}
+
+	@Kroll.method
+	public void addMenuItem(int itemId, String title, boolean showAsAction)
+	{
+		// int iconResId = TiDrawableReference.fromObject(this, iconPath).getBitmap(false)
+		collapseToolbar.addMenuItem(itemId, title, showAsAction);
+	}
+
+	@Kroll.method
+	public void removeMenuItem(int itemId)
+	{
+		collapseToolbar.removeMenuItem(itemId);
+	}
+
+	@Kroll.method
+	public void clearMenu()
+	{
+		collapseToolbar.clearMenu();
+	}
+
+	@Kroll.method
+	public void setOnMenuItemClickListener(KrollFunction function)
+	{
+		collapseToolbar.setOnMenuItemClickListener(function);
+	}
 }