Merge branch 'master' into ios-background-tasks

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

@@ -19,7 +19,9 @@
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.util.Size;
+import android.view.OrientationEventListener;
 import android.view.ScaleGestureDetector;
+import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -112,6 +114,8 @@ public class TiCameraXActivity extends TiBaseActivity implements CameraXConfig.P
 	private ProcessCameraProvider cameraProvider;
 	static int targetResolutionWidth = -1;
 	static int targetResolutionHeight = -1;
+	private OrientationEventListener orientationEventListener;
+	private int lastDisplayOrientation = 0;
 
 	public static void takePicture()
 	{
@@ -417,6 +421,30 @@ private void startCamera()
 		int rotation = getWindowManager().getDefaultDisplay().getRotation();
 
 		Activity activity = TiApplication.getAppCurrentActivity();
+
+		orientationEventListener = new OrientationEventListener(activity)
+		{
+			@Override
+			public void onOrientationChanged(int orientation)
+			{
+				if (orientationEventListener == null || orientation == ORIENTATION_UNKNOWN) {
+					return;
+				}
+				int rotation = getWindowManager().getDefaultDisplay().getRotation();
+				if (lastDisplayOrientation != rotation) {
+					imageCapture.setTargetRotation(rotation);
+					lastDisplayOrientation = rotation;
+				}
+
+			}
+		};
+		if (orientationEventListener.canDetectOrientation()) {
+			orientationEventListener.enable();
+		} else {
+			orientationEventListener.disable();
+			orientationEventListener = null;
+		}
+
 		ListenableFuture cameraProviderFuture = ProcessCameraProvider.getInstance(activity);
 		cameraProviderFuture.addListener(() -> {
 			try {
@@ -493,8 +521,13 @@ private void startCamera()
 					}
 
 					if (targetResolutionWidth != -1 && targetResolutionHeight != -1) {
-						imageCaptureBuilder.setTargetResolution(
-							new Size(targetResolutionWidth, targetResolutionHeight));
+						if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
+							imageCaptureBuilder.setTargetResolution(
+								new Size(targetResolutionWidth, targetResolutionHeight));
+						} else {
+							imageCaptureBuilder.setTargetResolution(
+								new Size(targetResolutionHeight, targetResolutionWidth));
+						}
 					}
 
 					imageCapture = imageCaptureBuilder.build();
@@ -573,6 +606,11 @@ protected void onDestroy()
 		if (camera != null) {
 			camera = null;
 		}
+		if (orientationEventListener != null) {
+			orientationEventListener.disable();
+			orientationEventListener = null;
+		}
+
 		// Destroy this activity.
 		super.onDestroy();
 	}
@@ -581,6 +619,10 @@ protected void onDestroy()
 	public void finish()
 	{
 		overlayProxy = null;
+		if (orientationEventListener != null) {
+			orientationEventListener.disable();
+			orientationEventListener = null;
+		}
 		super.finish();
 	}
 

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

@@ -190,6 +190,7 @@ private void appendRowInternal(Object rows, KrollDict animation, boolean interna
 					row.getProperties().getString(TiC.PROPERTY_FOOTER)));
 
 			// Add row to section.
+			row.setParent(section);
 			section.add(row);
 		}
 

iphone/cli/commands/_build.js

@@ -5809,6 +5809,8 @@ iOSBuilder.prototype.createAppIconSetAndiTunesArtwork = async function createApp
 		'-76':          { height: 76,   width: 76,   scale: 1, idioms: [ 'ipad' ], required: true },
 		'-76@2x':       { height: 76,   width: 76,   scale: 2, idioms: [ 'ipad' ], required: true },
 		'-83.5@2x':     { height: 83.5, width: 83.5, scale: 2, idioms: [ 'ipad' ], minXcodeVer: '7.2' },
+		'-Dark':        { height: 1024, width: 1024, scale: 1, idioms: [ 'universal' ], required: true, minXcodeVer: '16.0' },
+		'-Tinted':      { height: 1024, width: 1024, scale: 1, idioms: [ 'universal' ], required: true, minXcodeVer: '16.0' },
 		'-Marketing':   { height: 1024, width: 1024, scale: 1, idioms: [ 'ios-marketing' ], required: true, minXcodeVer: '9.0' }
 	};
 	// Add macOS icons if target is macOS
@@ -5897,12 +5899,22 @@ iOSBuilder.prototype.createAppIconSetAndiTunesArtwork = async function createApp
 		let flatten = false;
 		if (pngInfo.alpha) {
 			if (defaultIcon && !defaultIconHasAlpha) {
-				this.logger.warn(__('Skipping %s because it has an alpha channel and generating one from %s', info.src.replace(this.projectDir + '/', ''), defaultIcon.replace(this.projectDir + '/', '')));
-				return;
+				if (filename === 'DefaultIcon-Dark.png' || filename === 'DefaultIcon-Tinted.png') {
+					// Do nothing
+				} else {
+					this.logger.warn(__('Skipping %s because it has an alpha channel and generating one from %s', info.src.replace(this.projectDir + '/', ''), defaultIcon.replace(this.projectDir + '/', '')));
+					return;
+				}
+			}
+
+			if (filename === 'DefaultIcon-Dark.png' || filename === 'DefaultIcon-Tinted.png') {
+				this.logger.warn(__('%s contains an alpha channel and will NOT BE flattened against a white background', info.src.replace(this.projectDir + '/', '')));
+				flatten = false;
+			} else {
+				this.logger.warn(__('%s contains an alpha channel and will be flattened against a white background', info.src.replace(this.projectDir + '/', '')));
+				flatten = true;
 			}
 
-			this.logger.warn(__('%s contains an alpha channel and will be flattened against a white background', info.src.replace(this.projectDir + '/', '')));
-			flatten = true;
 			flattenIcons.push(info);
 		}
 

iphone/iphone/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -103,6 +103,30 @@
       "idiom" : "ios-marketing",
       "filename" : "appicon-1024.png",
       "scale" : "1x"
+    },
+    {
+         "appearances" : [
+           {
+             "appearance" : "luminosity",
+             "value" : "dark"
+           }
+         ],
+         "filename" : "DefaultIcon-Dark.png",
+         "idiom" : "universal",
+         "platform" : "ios",
+         "size" : "1024x1024"
+       },
+    {
+        "appearances" : [
+        {
+            "appearance" : "luminosity",
+            "value" : "tinted"
+        }
+        ],
+        "filename" : "DefaultIcon-Tinted.png",
+        "idiom" : "universal",
+        "platform" : "ios",
+        "size" : "1024x1024"
     }
   ],
   "info" : {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "titanium-mobile",
   "description": "Titanium SDK",
-  "version": "12.6.0",
+  "version": "12.7.0",
   "moduleApiVersion": {
     "iphone": "2",
     "android": "4"
@@ -106,7 +106,7 @@
     "markdown": "0.5.0",
     "moment": "2.30.1",
     "node-appc": "1.1.7",
-    "node-titanium-sdk": "6.0.0",
+    "node-titanium-sdk": "6.0.1",
     "node-uuid": "1.4.8",
     "nodeify": "1.0.1",
     "p-limit": "3.1.0",

support/module/packaged/modules.json

@@ -54,8 +54,8 @@
 	"commonjs": {},
 	"hyperloop": {
 		"hyperloop": {
-			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.8/hyperloop-7.0.8.zip",
-			"integrity": "sha512-JM75vnzaJQR2ygN+M7hUKFVa64CKCgG9xCGHijfOpRq+BaSyVaDaagbMBDGgm2m9xlrHJetOKwcfwzfE0wXfkg=="
+			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.9/hyperloop-7.0.9.zip",
+			"integrity": "sha512-IhFR4zLLEGAuLz1rgkQprjL5nDuIUHLh0lcAXL+NJPJ3Roy9JsrCuH7JtrKrXelpyp1H6yXQlC+4Wqh1kQLhRg=="
 		}
 	}
 }