From 7e370bb6e787a722840f2afed5962731d64c3eab Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Sat, 13 Jul 2024 00:06:32 +0000
Subject: [PATCH 01/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a509f65fbb..020044ccfa2 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/AvinashDalvi89"><img src="https://github.com/AvinashDalvi89.png" width="60px" alt="Avinash Dalvi" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/AvinashDalvi89"><img src="https://github.com/AvinashDalvi89.png" width="60px" alt="Avinash Dalvi" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/williekwok"><img src="https://github.com/williekwok.png" width="60px" alt="Willie Kwok" /></a><!-- sponsors -->
 
 ## Features
 

From d999024678db60117762377bd6fec256acb46eb8 Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Mon, 15 Jul 2024 00:06:24 +0000
Subject: [PATCH 02/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 020044ccfa2..1aeaff191fa 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/AvinashDalvi89"><img src="https://github.com/AvinashDalvi89.png" width="60px" alt="Avinash Dalvi" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/williekwok"><img src="https://github.com/williekwok.png" width="60px" alt="Willie Kwok" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/williekwok"><img src="https://github.com/williekwok.png" width="60px" alt="Willie Kwok" /></a><!-- sponsors -->
 
 ## Features
 

From 7593940da3bd2772d09c9e4210cbede9dcf3bdf3 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:29:31 +0200
Subject: [PATCH 03/55] fix(android): focus event in TabGroup (#14083)

---
 .../ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c1849cdc9de..ce97a31f23c 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
@@ -569,7 +569,7 @@ public void onTabSelected(TabProxy tabProxy)
 		tabProxy.onSelectionChanged(true);
 		tabProxy.onFocusChanged(true, focusEventData);
 
-		tabProxy.fireEvent(TiC.EVENT_SELECTED, focusEventData, false);
+		tabProxy.fireEvent(TiC.EVENT_SELECTED, focusEventData.clone(), false);
 	}
 
 	@Override

From 595e698450737792db4b1570a2bf2938f261edcc Mon Sep 17 00:00:00 2001
From: Ewan Harris <ewanharris93@gmail.com>
Date: Mon, 15 Jul 2024 21:57:44 +0100
Subject: [PATCH 04/55] chore: update ioslib to fix node-ios-device x64 issue

---
 package-lock.json | 74 +++++++++++++++++++++++++++++++++++------------
 package.json      |  2 +-
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8e1c2c4b90d..fd968703387 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "ejs": "3.1.9",
         "fields": "0.1.24",
         "fs-extra": "11.2.0",
-        "ioslib": "1.7.36",
+        "ioslib": "1.7.37",
         "liveview": "1.5.6",
         "lodash.merge": "4.6.2",
         "markdown": "0.5.0",
@@ -2285,6 +2285,7 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
       "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "detect-libc": "^2.0.0",
         "https-proxy-agent": "^5.0.0",
@@ -2305,6 +2306,7 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
       "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
       "deprecated": "This package is no longer supported.",
+      "license": "ISC",
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^3.6.0"
@@ -2318,6 +2320,7 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
       "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
       "deprecated": "This package is no longer supported.",
+      "license": "ISC",
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
         "color-support": "^1.1.2",
@@ -2337,6 +2340,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
       "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
       "dependencies": {
         "abbrev": "1"
       },
@@ -2352,6 +2356,7 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
       "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
       "deprecated": "This package is no longer supported.",
+      "license": "ISC",
       "dependencies": {
         "are-we-there-yet": "^2.0.0",
         "console-control-strings": "^1.1.0",
@@ -3744,7 +3749,8 @@
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/@yarnpkg/parsers": {
       "version": "3.0.0-rc.41",
@@ -5192,7 +5198,8 @@
     "node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "license": "MIT"
     },
     "node_modules/clang-format": {
       "version": "1.6.0",
@@ -6493,6 +6500,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
       "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
       }
@@ -7590,6 +7598,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
       "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "micromatch": "^4.0.2"
       }
@@ -8813,9 +8822,10 @@
       }
     },
     "node_modules/ioslib": {
-      "version": "1.7.36",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.36.tgz",
-      "integrity": "sha512-LxmVa7TrKPXOE2IWxlNyNASTonSLjizxfG1dO8wZwGWowng+9/YBeIbPcQxaFgT8GMGeSMkkK1Npi2XUl7iiVQ==",
+      "version": "1.7.37",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.37.tgz",
+      "integrity": "sha512-D4SrH3QocN2GBlzSBcv9V1WKpmcOVUk3F6rjHafWXtrAFs7ZrsPtyR0nA4t1ubqjOYwkTZLgMliEUrs5bpfqXQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
@@ -8823,7 +8833,7 @@
         "debug": "^4.3.4",
         "mkdirp": "0.5.1",
         "node-appc": "1.1.6",
-        "node-ios-device": "1.12.0"
+        "node-ios-device": "^1.12.1"
       },
       "engines": {
         "node": ">=10.13"
@@ -8982,6 +8992,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "license": "MIT",
       "dependencies": {
         "ci-info": "^2.0.0"
       },
@@ -9019,6 +9030,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -9302,6 +9314,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -9799,6 +9812,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
       "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.11"
       }
@@ -11429,7 +11443,8 @@
     "node_modules/nan": {
       "version": "2.20.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+      "license": "MIT"
     },
     "node_modules/nanoid": {
       "version": "3.3.1",
@@ -11694,10 +11709,11 @@
       }
     },
     "node_modules/node-ios-device": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/node-ios-device/-/node-ios-device-1.12.0.tgz",
-      "integrity": "sha512-ewGLYmcW1LbsTqs5UYmlLcm/52GCmGcuFTysWBqWnHPp88PfOh7uVm4zonb9r4MR/Nublt0vt0mNDIum0R71pw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/node-ios-device/-/node-ios-device-1.12.1.tgz",
+      "integrity": "sha512-qcCfQw5qXek1l4NDuKt19w4gCZK4Sra4AM2PXQrpW5NhhCCl0pGfDKknBNzB0UmVd+lRm5CF5Wvy8c2Nor2jEQ==",
       "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@mapbox/node-pre-gyp": "^1.0.10",
         "debug": "^4.3.4",
@@ -11713,6 +11729,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/node-pre-gyp-init/-/node-pre-gyp-init-1.2.1.tgz",
       "integrity": "sha512-gbC2fERRmWbJFvj54f4yyiY/O6J1kkLrN7jkwRvzNmgMgPCufZLv76l2luzWjj+Ge0xQF6zDalZ6iIgzCHJ95Q==",
+      "license": "MIT",
       "dependencies": {
         "@mapbox/node-pre-gyp": "^1.0.1"
       }
@@ -12383,6 +12400,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12476,6 +12494,7 @@
       "version": "7.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
       "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -12864,6 +12883,7 @@
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz",
       "integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==",
+      "license": "MIT",
       "dependencies": {
         "@yarnpkg/lockfile": "^1.1.0",
         "chalk": "^4.1.2",
@@ -12892,6 +12912,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12906,6 +12927,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12921,6 +12943,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12931,12 +12954,14 @@
     "node_modules/patch-package/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/patch-package/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "license": "MIT",
       "dependencies": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -12952,6 +12977,7 @@
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -12967,6 +12993,7 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -12986,6 +13013,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12994,6 +13022,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -13003,6 +13032,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13014,6 +13044,7 @@
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -13022,6 +13053,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^1.0.0"
       },
@@ -13033,6 +13065,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13041,6 +13074,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13052,6 +13086,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -14543,6 +14578,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -22690,9 +22726,9 @@
       }
     },
     "ioslib": {
-      "version": "1.7.36",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.36.tgz",
-      "integrity": "sha512-LxmVa7TrKPXOE2IWxlNyNASTonSLjizxfG1dO8wZwGWowng+9/YBeIbPcQxaFgT8GMGeSMkkK1Npi2XUl7iiVQ==",
+      "version": "1.7.37",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.37.tgz",
+      "integrity": "sha512-D4SrH3QocN2GBlzSBcv9V1WKpmcOVUk3F6rjHafWXtrAFs7ZrsPtyR0nA4t1ubqjOYwkTZLgMliEUrs5bpfqXQ==",
       "requires": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
@@ -22700,7 +22736,7 @@
         "debug": "^4.3.4",
         "mkdirp": "0.5.1",
         "node-appc": "1.1.6",
-        "node-ios-device": "1.12.0"
+        "node-ios-device": "^1.12.1"
       },
       "dependencies": {
         "@xmldom/xmldom": {
@@ -24852,9 +24888,9 @@
       }
     },
     "node-ios-device": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/node-ios-device/-/node-ios-device-1.12.0.tgz",
-      "integrity": "sha512-ewGLYmcW1LbsTqs5UYmlLcm/52GCmGcuFTysWBqWnHPp88PfOh7uVm4zonb9r4MR/Nublt0vt0mNDIum0R71pw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/node-ios-device/-/node-ios-device-1.12.1.tgz",
+      "integrity": "sha512-qcCfQw5qXek1l4NDuKt19w4gCZK4Sra4AM2PXQrpW5NhhCCl0pGfDKknBNzB0UmVd+lRm5CF5Wvy8c2Nor2jEQ==",
       "requires": {
         "@mapbox/node-pre-gyp": "^1.0.10",
         "debug": "^4.3.4",
diff --git a/package.json b/package.json
index 7afa00d6aed..543a66416e7 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "ejs": "3.1.9",
     "fields": "0.1.24",
     "fs-extra": "11.2.0",
-    "ioslib": "1.7.36",
+    "ioslib": "1.7.37",
     "liveview": "1.5.6",
     "lodash.merge": "4.6.2",
     "markdown": "0.5.0",

From 9388600a951db750e188eaca6c14b6e1683ffd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Wed, 17 Jul 2024 20:20:41 +0200
Subject: [PATCH 05/55] feat: add 12.4.0.GA changelog

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8acc98e268b..ca98a09d798 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,132 @@
+# [12.4.0](https://github.com/tidev/titanium_mobile/compare/12_3_X...12.4.0) (2024-07-17)
+
+## About this release
+
+Titanium SDK 12.4.0 is a minor release of the SDK, adding new features and platform updates.
+
+## Community Credits
+
+* Hans Knöchel
+  * add 12.4.0 changelog ([874e5f2](https://github.com/tidev/titanium_mobile/commit/874e5f2a86a1a58f99f4de50378c824e5b67029f))
+  * add missing “Calendar.Event.remove” method ([d1bbe8a](https://github.com/tidev/titanium_mobile/commit/d1bbe8ac2d5fc8530858bcaa48b56d94b9c407e4))
+  * add swipe actions support for Ti.UI.TableView ([40808cd](https://github.com/tidev/titanium_mobile/commit/40808cd5ffed82abaeb7e7523100f901f336298f))
+  * add iOS 17+ symbol effects ([84ccadb](https://github.com/tidev/titanium_mobile/commit/84ccadbdcbe9b800ebc08dbac8ae5eaeac36a7f8))
+  * update changelog ([9f144c1](https://github.com/tidev/titanium_mobile/commit/9f144c12c28fe6ead59237759c53c40509f3d4cc))
+  * bump master to 12.4.0 ([2f1212f](https://github.com/tidev/titanium_mobile/commit/2f1212fd9e46a4a8aeae0af7a850aaa7bff34e52))
+  * address all whitespace-related linting issues part 2 ([8c92dc7](https://github.com/tidev/titanium_mobile/commit/8c92dc7521219efebad8943a5305348014bd32e4))
+  * address all whitespace-related linting issues ([e2bf653](https://github.com/tidev/titanium_mobile/commit/e2bf653d406b772deeafb504a0b9f68e363cf3e5))
+  * fix linting issues ([bf24bf2](https://github.com/tidev/titanium_mobile/commit/bf24bf26ae07ebda2e2d70c23de198bac6b2ba8e))
+  * Revert "feat(ios): support multi-scene applications (#13941)" ([82203d7](https://github.com/tidev/titanium_mobile/commit/82203d782fd499a33723bf86b41e1019e50bc99d))
+  * fix some open issues related to scenes ([a0a3aea](https://github.com/tidev/titanium_mobile/commit/a0a3aeaf666b864fbcb75e57f011a142dbae715c))
+  * fix debug issues with scenes ([8bcd5c3](https://github.com/tidev/titanium_mobile/commit/8bcd5c31a8dc86415c231a6086c1d83bbb183565))
+  * Revert "feat(ios): support multi-scene applications (#13941)" ([4a1d20f](https://github.com/tidev/titanium_mobile/commit/4a1d20f43c82296dd21bfd760fa63b65927e98fd))
+
+* Michael Gangolf
+  * optionBar color properties ([d5cff3c](https://github.com/tidev/titanium_mobile/commit/d5cff3c32d33b2df2469af949c54c4bab1734676))
+  * fix webpack command name issue ([420ccdc](https://github.com/tidev/titanium_mobile/commit/420ccdceadff8658803e02bb6144e853c8767a20))
+  * new Android Studio settings xml ([ceda65e](https://github.com/tidev/titanium_mobile/commit/ceda65eb73492c671b6dc74639dee072fa512439))
+  * track color of the Ti.UI.Switch ([07df689](https://github.com/tidev/titanium_mobile/commit/07df6890e2a363f40e44757147287bf307e86808))
+  * prepare SDK for Android 34 ([ada10bb](https://github.com/tidev/titanium_mobile/commit/ada10bb065851d4b8c55e1342b2a888a776ad381))
+  * add iOS WebViewConfiguration link ([9f85623](https://github.com/tidev/titanium_mobile/commit/9f85623fa45dda478124a9b52794c77eb60bd5ac))
+  * ioslib update ([7b82317](https://github.com/tidev/titanium_mobile/commit/7b82317907a492b57c52059d8a648ad0e07fb834))
+  * new event for empty TextFields ([29964cf](https://github.com/tidev/titanium_mobile/commit/29964cf5a6830948b802810a41e42230c3b1e820))
+  * textAlignment for DatePicker ([afb253e](https://github.com/tidev/titanium_mobile/commit/afb253e697442cb6bafdb430a9d8d3539235d58e))
+  * add source to webView fireEvent ([960d40c](https://github.com/tidev/titanium_mobile/commit/960d40cd153fc3ee9e0cad09e5171a7a65c62253))
+  * remove some dead analytics code ([6926f0d](https://github.com/tidev/titanium_mobile/commit/6926f0d9bfc177fe74e43fa1242adc8f30972cae))
+  * update ti.playservice to 18.3.0 ([dc180b9](https://github.com/tidev/titanium_mobile/commit/dc180b94f05aa810aa1f302958ee3f6b36ae69c4))
+  * expose contentOffset getter in TableView/ListView ([1f75084](https://github.com/tidev/titanium_mobile/commit/1f7508484839ec20626f6c189e94068fca042f08))
+  * ndk update ([a852835](https://github.com/tidev/titanium_mobile/commit/a852835f7612d9c0ab034872a0439461dddde488))
+  * add moveToBackground method ([229ef10](https://github.com/tidev/titanium_mobile/commit/229ef10fcfba15ad3050af9266aca8f2c2012448))
+  * videoPlayer speed property ([7b9a4e9](https://github.com/tidev/titanium_mobile/commit/7b9a4e92b2e26cc6d8816c1f7fbfda06316997b6))
+  * bundle webp res files ([6552a2c](https://github.com/tidev/titanium_mobile/commit/6552a2ccb0c11d01a6bcf185f228dcac709b0453))
+  * adaptive icons in default template ([2e0e2e5](https://github.com/tidev/titanium_mobile/commit/2e0e2e5dfa8a726561d2f15daad65a9fec7afa3a))
+  * attributedString link example ([cb69378](https://github.com/tidev/titanium_mobile/commit/cb6937849970ac8417ea87f950b03467668672cd))
+  * update TabbedBar Android properties ([f5dfa92](https://github.com/tidev/titanium_mobile/commit/f5dfa923fcf649a10e861251d87a073526af2896))
+  * node-appc update ([644831f](https://github.com/tidev/titanium_mobile/commit/644831f18e6f35e987992da3f72e294e0d9649be))
+  * create alloy project with spaces with --alloy ([c601e7e](https://github.com/tidev/titanium_mobile/commit/c601e7e7579b7b527cc2321b63c82232b169faf4))
+  * improve accessibility text ([3171e14](https://github.com/tidev/titanium_mobile/commit/3171e140fd106afb3b42f09076b1cc0a0b86f895))
+  * remove some deprecated classes ([e1f2dc1](https://github.com/tidev/titanium_mobile/commit/e1f2dc1e4b246c7156e31fd68a287ca04cc4b752))
+  * raise android max sdk support ([eb87849](https://github.com/tidev/titanium_mobile/commit/eb87849b67b68205567247e20e30c7d43e8ea990))
+  * add overrideUserInterfaceStyle to Picker ([0c93fa7](https://github.com/tidev/titanium_mobile/commit/0c93fa77aa911e92d3dfbae312e2884706414753))
+  * fixing typos ([a298387](https://github.com/tidev/titanium_mobile/commit/a2983877b5a7d6c14bdfdc5426a82e2aca590074))
+  * improve the ScrollableView clipView description ([940ca9e](https://github.com/tidev/titanium_mobile/commit/940ca9e959aad1010cc42c6196d9a21a92febc0b))
+  * npm packages ([48afddf](https://github.com/tidev/titanium_mobile/commit/48afddf5652602ae2f8cc376d9a37156c828d9c1))
+  * hide scrollbars in WebView ([6642ed1](https://github.com/tidev/titanium_mobile/commit/6642ed16ec984331cafa62658a887b33c6a9cd2f))
+  * indent log correctly ([a7b145d](https://github.com/tidev/titanium_mobile/commit/a7b145d5668b661f903fdfe53b380bd35a82265a))
+  * backgroundColor for RefreshControl ([4f78a79](https://github.com/tidev/titanium_mobile/commit/4f78a79cc51b9a90fa7eb2226e98fad471a6db8d))
+  * defaultLang option in tiapp.xml ([07e9a6a](https://github.com/tidev/titanium_mobile/commit/07e9a6ac58a72178c35bda6fdf298860d7786885))
+  * pass platform to tiappxml ([760ca45](https://github.com/tidev/titanium_mobile/commit/760ca45c9b63c0aa06940a36010d051b7bb2cbed))
+  * try/catch around unlink snapshots ([115bbb2](https://github.com/tidev/titanium_mobile/commit/115bbb24214374228d06a299ce720e72661785cb))
+  * update gradle ([e41650c](https://github.com/tidev/titanium_mobile/commit/e41650cd9d088435e8e9641ceae5a2802223a3d2))
+  * add info about iOS foreground notifications ([4e5ca53](https://github.com/tidev/titanium_mobile/commit/4e5ca53bf58db474d968bbe1616fcca6d18b2b90))
+  * link idleTimerDisabled and keepScreenOn ([bd5c5e7](https://github.com/tidev/titanium_mobile/commit/bd5c5e71d24b04691b510f96b1567da16a5b8283))
+  * fix some doc errors ([cf14a9b](https://github.com/tidev/titanium_mobile/commit/cf14a9b4ed83cef111e80d87189cc3e89a906d11))
+  * update ti.map ([5eb950c](https://github.com/tidev/titanium_mobile/commit/5eb950ce1c3392f26496a6c6317b5dea24eee9e4))
+
+## Bug Fixes
+
+### Multiple platforms
+
+* address all whitespace-related linting issues ([e2bf653](https://github.com/tidev/titanium_mobile/commit/e2bf653d406b772deeafb504a0b9f68e363cf3e5))
+* address all whitespace-related linting issues part 2 ([8c92dc7](https://github.com/tidev/titanium_mobile/commit/8c92dc7521219efebad8943a5305348014bd32e4))
+* create alloy project with spaces with --alloy ([c601e7e](https://github.com/tidev/titanium_mobile/commit/c601e7e7579b7b527cc2321b63c82232b169faf4))
+* fix linting issues ([bf24bf2](https://github.com/tidev/titanium_mobile/commit/bf24bf26ae07ebda2e2d70c23de198bac6b2ba8e))
+
+### Android platform
+
+* add missing “Calendar.Event.remove” method ([d1bbe8a](https://github.com/tidev/titanium_mobile/commit/d1bbe8ac2d5fc8530858bcaa48b56d94b9c407e4))
+* bundle webp res files ([6552a2c](https://github.com/tidev/titanium_mobile/commit/6552a2ccb0c11d01a6bcf185f228dcac709b0453))
+* remove some deprecated classes ([e1f2dc1](https://github.com/tidev/titanium_mobile/commit/e1f2dc1e4b246c7156e31fd68a287ca04cc4b752))
+
+### iOS platform
+
+* fix debug issues with scenes ([8bcd5c3](https://github.com/tidev/titanium_mobile/commit/8bcd5c31a8dc86415c231a6086c1d83bbb183565))
+* fix some open issues related to scenes ([a0a3aea](https://github.com/tidev/titanium_mobile/commit/a0a3aeaf666b864fbcb75e57f011a142dbae715c))
+
+## Features
+
+### Multiple platforms
+
+* add swipe actions support for Ti.UI.TableView ([40808cd](https://github.com/tidev/titanium_mobile/commit/40808cd5ffed82abaeb7e7523100f901f336298f))
+
+### Android platform
+
+* adaptive icons in default template ([2e0e2e5](https://github.com/tidev/titanium_mobile/commit/2e0e2e5dfa8a726561d2f15daad65a9fec7afa3a))
+* add moveToBackground method ([229ef10](https://github.com/tidev/titanium_mobile/commit/229ef10fcfba15ad3050af9266aca8f2c2012448))
+* add source to webView fireEvent ([960d40c](https://github.com/tidev/titanium_mobile/commit/960d40cd153fc3ee9e0cad09e5171a7a65c62253))
+* defaultLang option in tiapp.xml ([07e9a6a](https://github.com/tidev/titanium_mobile/commit/07e9a6ac58a72178c35bda6fdf298860d7786885))
+* expose contentOffset getter in TableView/ListView ([1f75084](https://github.com/tidev/titanium_mobile/commit/1f7508484839ec20626f6c189e94068fca042f08))
+* hide scrollbars in WebView ([6642ed1](https://github.com/tidev/titanium_mobile/commit/6642ed16ec984331cafa62658a887b33c6a9cd2f))
+* improve accessibility text ([3171e14](https://github.com/tidev/titanium_mobile/commit/3171e140fd106afb3b42f09076b1cc0a0b86f895))
+* indent log correctly ([a7b145d](https://github.com/tidev/titanium_mobile/commit/a7b145d5668b661f903fdfe53b380bd35a82265a))
+* new event for empty TextFields ([29964cf](https://github.com/tidev/titanium_mobile/commit/29964cf5a6830948b802810a41e42230c3b1e820))
+* optionBar color properties ([d5cff3c](https://github.com/tidev/titanium_mobile/commit/d5cff3c32d33b2df2469af949c54c4bab1734676))
+* textAlignment for DatePicker ([afb253e](https://github.com/tidev/titanium_mobile/commit/afb253e697442cb6bafdb430a9d8d3539235d58e))
+* track color of the Ti.UI.Switch ([07df689](https://github.com/tidev/titanium_mobile/commit/07df6890e2a363f40e44757147287bf307e86808))
+* update gradle ([e41650c](https://github.com/tidev/titanium_mobile/commit/e41650cd9d088435e8e9641ceae5a2802223a3d2))
+* update ti.playservice to 18.3.0 ([dc180b9](https://github.com/tidev/titanium_mobile/commit/dc180b94f05aa810aa1f302958ee3f6b36ae69c4))
+* videoPlayer speed property ([7b9a4e9](https://github.com/tidev/titanium_mobile/commit/7b9a4e92b2e26cc6d8816c1f7fbfda06316997b6))
+
+### iOS platform
+
+* add iOS 17+ symbol effects ([84ccadb](https://github.com/tidev/titanium_mobile/commit/84ccadbdcbe9b800ebc08dbac8ae5eaeac36a7f8))
+* add overrideUserInterfaceStyle to Picker ([0c93fa7](https://github.com/tidev/titanium_mobile/commit/0c93fa77aa911e92d3dfbae312e2884706414753))
+* backgroundColor for RefreshControl ([4f78a79](https://github.com/tidev/titanium_mobile/commit/4f78a79cc51b9a90fa7eb2226e98fad471a6db8d))
+
+## 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.3.1](https://github.com/tidev/titanium_mobile/compare/12_3_0_GA...12.3.1) (2024-06-12)
 
 ## About this release

From 9eed7f9de52949510e27e8056eeec96c3a863677 Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Mon, 12 Aug 2024 00:06:43 +0000
Subject: [PATCH 06/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1aeaff191fa..8a8daa39497 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/williekwok"><img src="https://github.com/williekwok.png" width="60px" alt="Willie Kwok" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><!-- sponsors -->
 
 ## Features
 

From f3e5a0bd90eb75dfa7ec0c5e6a4b4cc39ac4b95a Mon Sep 17 00:00:00 2001
From: Chris Barber <chris@cb1inc.com>
Date: Thu, 15 Aug 2024 09:01:01 -0500
Subject: [PATCH 07/55] fix: sdk build on windows needs shell: true to run
 batch files (#14095)

---
 build/lib/android/index.js | 6 +++++-
 build/lib/docs.js          | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/lib/android/index.js b/build/lib/android/index.js
index 5e6a731b2ba..7da8a8faa16 100644
--- a/build/lib/android/index.js
+++ b/build/lib/android/index.js
@@ -173,7 +173,11 @@ class Android {
 
 async function gradlew(args) {
 	await new Promise((resolve, reject) => {
-		const childProcess = spawn(GRADLEW_FILE_PATH, args, { cwd: TITANIUM_ANDROID_PATH, stdio: 'inherit' });
+		const childProcess = spawn(GRADLEW_FILE_PATH, args, {
+			cwd: TITANIUM_ANDROID_PATH,
+			shell: process.platform === 'win32',
+			stdio: 'inherit'
+		});
 		childProcess.on('error', reject);
 		childProcess.on('exit', (exitCode) => {
 			if (exitCode === 0) {
diff --git a/build/lib/docs.js b/build/lib/docs.js
index 6b10a836e11..67e054a4533 100644
--- a/build/lib/docs.js
+++ b/build/lib/docs.js
@@ -23,7 +23,10 @@ class Documentation {
 		const outputFile = path.join(this.outputDir, filename);
 
 		return new Promise((resolve, reject) => {
-			const prc = spawn(cmdPath, args, { cwd: DOC_DIR });
+			const prc = spawn(cmdPath, args, {
+				cwd: DOC_DIR,
+				shell: process.platform === 'win32'
+			});
 			prc.stdout.on('data', data => console.log(data.toString().trim()));
 			prc.stderr.on('data', data => console.error(data.toString().trim()));
 			prc.on('close', code => {

From b0e14c65fbd7447615fc92722014bf7bfa212584 Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Fri, 16 Aug 2024 00:06:10 +0000
Subject: [PATCH 08/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8a8daa39497..8f761235fa5 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https://github.com/Yackens.png" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
 
 ## Features
 

From 017c0524dc1a76527a8ba342964ea881633492d5 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:08:15 +0200
Subject: [PATCH 09/55] fix(android): fix titleAttribute when it's not a
 creation parameter (#14090)

---
 .../src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java  | 1 +
 1 file changed, 1 insertion(+)

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 a7546b6ab63..237924bbb95 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -51,6 +51,7 @@
 	TiC.PROPERTY_ON_BACK,
 	TiC.PROPERTY_TITLE,
 	TiC.PROPERTY_TITLEID,
+	TiC.PROPERTY_TITLE_ATTRIBUTES,
 	TiC.PROPERTY_WINDOW_SOFT_INPUT_MODE
 })
 public abstract class TiWindowProxy extends TiViewProxy

From 51be36662445ad4755438a7f1b511a837196df69 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:08:42 +0200
Subject: [PATCH 10/55] fix(android): keep Tab tintColor when changing icons
 (#14080)

* fix(android): keep Tab tintColor when changing icons

* Update TiUIBottomNavigationTabGroup.java
---
 .../ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java         | 1 +
 .../titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java
index f63c4790757..1ead9f66615 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java
@@ -501,6 +501,7 @@ public void updateTabIcon(int index)
 
 		final Drawable drawable = TiUIHelper.getResourceDrawable(tabProxy.getProperty(TiC.PROPERTY_ICON));
 		this.mBottomNavigationView.getMenu().getItem(index).setIcon(drawable);
+		updateIconTint();
 	}
 
 	@Override
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
index 4023d321162..a4d35f234a3 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
@@ -361,6 +361,7 @@ public void updateTabIcon(int index)
 		TabLayout.Tab tab = this.mTabLayout.getTabAt(index);
 		tab.setIcon(TiUIHelper.getResourceDrawable(tabProxy.getProperty(TiC.PROPERTY_ICON)));
 		scaleIconToFit(tab);
+		updateIconTint();
 	}
 
 	@Override

From 803bd04350df89f2197842d110ad3c0384a97c7f Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:09:19 +0200
Subject: [PATCH 11/55] fix(android): fix Actionbar backgroundImage doc and
 improve setter (#14044)

---
 .../appcelerator/titanium/proxy/ActionBarProxy.java  | 12 ++++++++++++
 apidoc/Titanium/Android/ActionBar.yml                | 11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
index 988e87c6746..3d29ce309e2 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
@@ -15,6 +15,7 @@
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiUIHelper;
+import org.appcelerator.titanium.view.TiDrawableReference;
 
 @SuppressWarnings("deprecation")
 @Kroll.proxy(propertyAccessors = { TiC.PROPERTY_ON_HOME_ICON_ITEM_SELECTED, TiC.PROPERTY_CUSTOM_VIEW })
@@ -102,6 +103,17 @@ public void setBackgroundImage(String url)
 			actionBar.setDisplayShowTitleEnabled(showTitleEnabled);
 
 			actionBar.setBackgroundDrawable(backgroundImage);
+		} else {
+			// fallback check with TiDrawableReference
+			TiDrawableReference source = TiDrawableReference.fromUrl(this, url);
+			if (source.getDrawable() != null) {
+				actionBar.setDisplayShowTitleEnabled(!showTitleEnabled);
+				actionBar.setDisplayShowTitleEnabled(showTitleEnabled);
+				actionBar.setBackgroundDrawable(source.getDrawable());
+			} else {
+				// fail - show error
+				Log.e(TAG, "Image " + url + " not found");
+			}
 		}
 	}
 
diff --git a/apidoc/Titanium/Android/ActionBar.yml b/apidoc/Titanium/Android/ActionBar.yml
index 2450257cbde..db9f36e9bb5 100644
--- a/apidoc/Titanium/Android/ActionBar.yml
+++ b/apidoc/Titanium/Android/ActionBar.yml
@@ -55,6 +55,15 @@ examples:
         </Alloy>
         ```
 
+
+        `app/controllers/index.js`:
+        ```
+        function doMenuClick() {}
+        function openSettings() {}
+        function doSearch() {}
+        $.index.open();
+        ```
+
         `app/styles/index.tss`:
         ```
         "MenuItem": {
@@ -85,7 +94,7 @@ examples:
             win.activity.onCreate = () => {
                 const actionBar = win.activity.actionBar;
                 if (actionBar) {
-                    actionBar.backgroundImage = "/bg.png";
+                    actionBar.backgroundImage = Ti.Filesystem.getFile(Ti.Filesystem.resourcesDirectory, 'bg.png').nativePath;
                     actionBar.title = "New Title";
                     actionBar.onHomeIconItemSelected = () => {
                         Ti.API.info("Home icon clicked!");

From 5fc81f08bdb3f9ba64d9cb4972848c8523f2d190 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:03:11 +0200
Subject: [PATCH 12/55] feat(android): set targetSDK to Android 34 (#14068)

---
 android/app/build.gradle      | 2 +-
 android/titanium/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 22de0c84364..f9ee6f9cdb1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -13,7 +13,7 @@ android {
 	defaultConfig {
 		applicationId 'com.titanium.test'
 		minSdkVersion 21
-		targetSdkVersion 33
+		targetSdkVersion 34
 		versionCode 1
 		versionName '1.0'
 		manifestPlaceholders = project.ext.tiManifestPlaceholders
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index d92e05cf820..4288d2e211b 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -44,7 +44,7 @@ android {
 	compileSdkVersion 33
 	defaultConfig {
 		minSdkVersion 21
-		targetSdkVersion 33
+		targetSdkVersion 34
 		versionName tiBuildVersionString
 		versionCode tiBuildVersionCode
 		buildConfigField('int', 'VERSION_CODE', tiBuildVersionCode.toString())

From 2e92f1ddd00b9610ff9a6fc14775545b7cdf089e Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:32:38 +0200
Subject: [PATCH 13/55] fix(android): fix tintColor and activeTintColor in a
 TabbedBar (#14088)

* fix(android): fix tintColor and activeTintColor in a TabbedBar

* apidocs

* use method and add guards

* more functions

---------

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 .../titanium/ui/widget/TiUITabbedBar.java     | 26 +++++++++++++++++--
 apidoc/Titanium/UI/TabbedBar.yml              |  8 +++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
index 0486e21cd6e..8ca71d59e4b 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
@@ -10,6 +10,7 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.view.MenuItem;
 import androidx.annotation.ColorInt;
@@ -133,9 +134,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b)
 				// no selected color specified but a text color -> use that
 				selectedTextColor = textColor;
 			}
-
 			this.tabLayout.setTabTextColors(textColor, selectedTextColor);
 		}
+		if (getProxy().hasPropertyAndNotNull(TiC.PROPERTY_ACTIVE_TINT_COLOR)) {
+			setTintColor(this.tabLayout.getTabAt(0), TiC.PROPERTY_ACTIVE_TINT_COLOR);
+		}
 		setNativeView(this.tabLayout);
 	}
 
@@ -261,6 +264,10 @@ private void addItem(Object value)
 					if (value instanceof Drawable) {
 						tab.setIcon(((Drawable) value));
 						TiUITabLayoutTabGroup.scaleIconToFit(tab);
+
+						if (proxy.hasPropertyAndNotNull(TiC.PROPERTY_TINT_COLOR)) {
+							setTintColor(tab, TiC.PROPERTY_TINT_COLOR);
+						}
 					} else {
 						tab.setText(value.toString());
 					}
@@ -282,6 +289,14 @@ private void addItem(Object value)
 		}
 	}
 
+	private void setTintColor(TabLayout.Tab tab, String color)
+	{
+		if (tab != null && tab.getIcon() != null) {
+			tab.getIcon().setColorFilter(TiConvert.toColor(proxy.getProperty(color),
+				TiApplication.getAppCurrentActivity()), PorterDuff.Mode.SRC_IN);
+		}
+	}
+
 	// Handle switching styles after creation
 	public void setNewStyle(int newStyle)
 	{
@@ -394,6 +409,10 @@ private void onTabIndexChangedTo(int index)
 			// First, update the proxy's "index" property.
 			proxy.setProperty(TiC.PROPERTY_INDEX, index);
 
+			if (proxy.hasPropertyAndNotNull(TiC.PROPERTY_ACTIVE_TINT_COLOR)) {
+				setTintColor(this.tabLayout.getTabAt(index), TiC.PROPERTY_ACTIVE_TINT_COLOR);
+			}
+
 			// Last, fire a "click" event.
 			if (!skipClickEvent) {
 				KrollDict data = new KrollDict();
@@ -406,7 +425,10 @@ private void onTabIndexChangedTo(int index)
 	@Override
 	public void onTabUnselected(TabLayout.Tab tab)
 	{
-		// No override
+		// set old tint color again
+		if (proxy.hasPropertyAndNotNull(TiC.PROPERTY_TINT_COLOR)) {
+			setTintColor(tab, TiC.PROPERTY_TINT_COLOR);
+		}
 	}
 
 	@Override
diff --git a/apidoc/Titanium/UI/TabbedBar.yml b/apidoc/Titanium/UI/TabbedBar.yml
index 0e846c3b578..6857a5eda60 100644
--- a/apidoc/Titanium/UI/TabbedBar.yml
+++ b/apidoc/Titanium/UI/TabbedBar.yml
@@ -56,6 +56,12 @@ properties:
     availability: creation
     platforms: [iphone, ipad, android, macos]
     since: {iphone: "9.0.0", ipad: "9.0.0", android: "12.0.0"}
+  - name: activeTintColor
+    summary: Icon tint color of the selected tab
+    type: [ String, Titanium.UI.Color ]
+    availability: creation
+    platforms: [android]
+    since: {android: "12.5.0"}
   - name: style
     summary: Style of the tabbed bar.
     description: |
@@ -66,7 +72,7 @@ properties:
 
         The `BAR` style specifies a more compact style and allows the bar's background
         color or gradient to show through.
-        
+
         For Android use [Titanium.UI.TABS_STYLE_DEFAULT](Titanium.UI.TABS_STYLE_DEFAULT) or
         [Titanium.UI.TABS_STYLE_BOTTOM_NAVIGATION](Titanium.UI.TABS_STYLE_BOTTOM_NAVIGATION) and
         it is only supported in the creation dictionary of the proxy.

From 8846f07955e0157ff134c122bd544f66c2fdb501 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 18:10:56 +0200
Subject: [PATCH 14/55] chore(android): update cmake, checkstyle (#13966)

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 android/build.gradle                          |   2 +-
 .../titanium/contacts/PersonProxy.java        |  37 ++--
 .../titanium/media/VideoPlayerProxy.java      |  52 ++---
 .../modules/titanium/network/CookieProxy.java |  17 +-
 .../titanium/network/HTTPClientProxy.java     |  36 ++--
 .../titanium/ui/ActivityIndicatorProxy.java   |   7 +-
 .../modules/titanium/ui/AlertDialogProxy.java |   8 +-
 .../modules/titanium/ui/AnimationProxy.java   |   2 +-
 .../ti/modules/titanium/ui/ButtonProxy.java   |   5 +-
 .../modules/titanium/ui/EmailDialogProxy.java |  38 ++--
 .../modules/titanium/ui/ImageViewProxy.java   |  16 +-
 .../ti/modules/titanium/ui/LabelProxy.java    |   5 +-
 .../modules/titanium/ui/MaskedImageProxy.java |   4 +-
 .../titanium/ui/OptionDialogProxy.java        |   6 +-
 .../titanium/ui/PickerColumnProxy.java        |  14 +-
 .../ti/modules/titanium/ui/PickerProxy.java   |  98 +++++-----
 .../modules/titanium/ui/ProgressBarProxy.java |   5 +-
 .../titanium/ui/RefreshControlProxy.java      | 129 +++++++------
 .../modules/titanium/ui/ScrollViewProxy.java  |  22 ++-
 .../titanium/ui/ScrollableViewProxy.java      |  41 ++--
 .../modules/titanium/ui/SearchBarProxy.java   |  11 +-
 .../ti/modules/titanium/ui/SliderProxy.java   |   5 +-
 .../ti/modules/titanium/ui/SwitchProxy.java   |   6 +-
 .../ti/modules/titanium/ui/TabGroupProxy.java |  50 +++--
 .../ti/modules/titanium/ui/TextAreaProxy.java |   5 +-
 .../modules/titanium/ui/TextFieldProxy.java   |   5 +-
 .../ti/modules/titanium/ui/TiDialogProxy.java |   9 +-
 .../ti/modules/titanium/ui/ToolbarProxy.java  |   8 +-
 .../ti/modules/titanium/ui/WebViewProxy.java  | 178 +++++++++---------
 .../ti/modules/titanium/ui/WindowProxy.java   | 100 +++++-----
 .../titanium/ui/android/CardViewProxy.java    |   5 +-
 .../ui/android/ProgressIndicatorProxy.java    |   5 +-
 .../titanium/ui/android/SearchViewProxy.java  |   5 +-
 android/package.json                          |   4 +-
 android/runtime/v8/src/native/CMakeLists.txt  |   2 +-
 android/titanium/build.gradle                 |   2 +-
 .../titanium/proxy/ActionBarProxy.java        |  70 +++----
 .../titanium/util/TiNinePatchHelper.java      |  20 +-
 .../java/ti/modules/titanium/BufferProxy.java |  14 +-
 39 files changed, 547 insertions(+), 501 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 580edafef28..319eec9c71a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -29,7 +29,7 @@ allprojects {
 	// Load plugin used to enforce our Java coding style guidelines.
 	project.apply plugin: 'checkstyle'
 	checkstyle {
-		toolVersion = '8.38'
+		toolVersion = '10.11.0'
 		configFile file("${rootDir}/checkstyle.xml");
 		ignoreFailures false
 		showViolations true
diff --git a/android/modules/contacts/src/java/ti/modules/titanium/contacts/PersonProxy.java b/android/modules/contacts/src/java/ti/modules/titanium/contacts/PersonProxy.java
index 5b21d6648f4..b681ce02485 100644
--- a/android/modules/contacts/src/java/ti/modules/titanium/contacts/PersonProxy.java
+++ b/android/modules/contacts/src/java/ti/modules/titanium/contacts/PersonProxy.java
@@ -7,9 +7,8 @@
 
 package ti.modules.titanium.contacts;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import android.graphics.Bitmap;
+import android.util.Log;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
@@ -17,8 +16,9 @@
 import org.appcelerator.titanium.TiBlob;
 import org.appcelerator.titanium.TiC;
 
-import android.graphics.Bitmap;
-import android.util.Log;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @Kroll.proxy(parentModule = ContactsModule.class,
 	propertyAccessors = {
@@ -44,18 +44,17 @@
 		TiC.PROPERTY_LASTPHONETIC,
 		TiC.PROPERTY_JOBTITLE,
 		TiC.PROPERTY_DEPARTMENT
-})
+	})
 public class PersonProxy extends KrollProxy
 {
 	private static final String TAG = "Person";
+	// Contact Modifications
+	private final HashMap<String, Boolean> modified = new HashMap<>();
+	protected boolean hasImage = false;
 	private TiBlob image = null;
 	private boolean imageFetched; // lazy load these bitmap images
-	protected boolean hasImage = false;
 	private String fullName = "";
 
-	// Contact Modifications
-	private final HashMap<String, Boolean> modified = new HashMap<>();
-
 	public PersonProxy()
 	{
 		super();
@@ -189,15 +188,15 @@ public void onPropertyChanged(String name, Object value)
 			|| name.equals(TiC.PROPERTY_LASTNAME)) {
 			modified.put(TiC.PROPERTY_NAME, true);
 		} else if (name.equals(TiC.PROPERTY_BIRTHDAY) || name.equals(TiC.PROPERTY_ORGANIZATION)
-				   || name.equals(TiC.PROPERTY_NOTE) || name.equals(TiC.PROPERTY_NICKNAME)
-				   || name.equals(TiC.PROPERTY_PHONE) || name.equals(TiC.PROPERTY_ADDRESS)
-				   || name.equals(TiC.PROPERTY_INSTANTMSG) || name.equals(TiC.PROPERTY_URL)
-				   || name.equals(TiC.PROPERTY_EMAIL) || name.equals(TiC.PROPERTY_RELATED_NAMES)
-				   || name.equals(TiC.PROPERTY_DATE) || name.equals(TiC.PROPERTY_KIND)
-				   || name.equals(TiC.PROPERTY_PREFIX) || name.equals(TiC.PROPERTY_SUFFIX)
-				   || name.equals(TiC.PROPERTY_FIRSTPHONETIC) || name.equals(TiC.PROPERTY_MIDDLEPHONETIC)
-				   || name.equals(TiC.PROPERTY_LASTPHONETIC) || name.equals(TiC.PROPERTY_JOBTITLE)
-				   || name.equals(TiC.PROPERTY_DEPARTMENT)) {
+			|| name.equals(TiC.PROPERTY_NOTE) || name.equals(TiC.PROPERTY_NICKNAME)
+			|| name.equals(TiC.PROPERTY_PHONE) || name.equals(TiC.PROPERTY_ADDRESS)
+			|| name.equals(TiC.PROPERTY_INSTANTMSG) || name.equals(TiC.PROPERTY_URL)
+			|| name.equals(TiC.PROPERTY_EMAIL) || name.equals(TiC.PROPERTY_RELATED_NAMES)
+			|| name.equals(TiC.PROPERTY_DATE) || name.equals(TiC.PROPERTY_KIND)
+			|| name.equals(TiC.PROPERTY_PREFIX) || name.equals(TiC.PROPERTY_SUFFIX)
+			|| name.equals(TiC.PROPERTY_FIRSTPHONETIC) || name.equals(TiC.PROPERTY_MIDDLEPHONETIC)
+			|| name.equals(TiC.PROPERTY_LASTPHONETIC) || name.equals(TiC.PROPERTY_JOBTITLE)
+			|| name.equals(TiC.PROPERTY_DEPARTMENT)) {
 
 			modified.put(name, true);
 		}
diff --git a/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java b/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java
index f7fd67028c4..34185dcf79c 100644
--- a/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java
+++ b/android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java
@@ -6,7 +6,14 @@
  */
 package ti.modules.titanium.media;
 
-import java.lang.ref.WeakReference;
+import android.app.Activity;
+import android.content.Intent;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.webkit.URLUtil;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollFunction;
@@ -23,15 +30,9 @@
 import org.appcelerator.titanium.view.TiCompositeLayout;
 import org.appcelerator.titanium.view.TiUIView;
 
+import java.lang.ref.WeakReference;
+
 import ti.modules.titanium.media.TiThumbnailRetriever.ThumbnailResponseHandler;
-import android.app.Activity;
-import android.content.Intent;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Messenger;
-import android.webkit.URLUtil;
 
 @Kroll.proxy(creatableInModule = MediaModule.class,
 	propertyAccessors = {
@@ -43,14 +44,15 @@
 		TiC.PROPERTY_PLAYABLE_DURATION,
 		TiC.PROPERTY_VOLUME,
 		TiC.PROPERTY_SHOWS_CONTROLS,
-})
+	})
 public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifecycleEvent
 {
-	private static final String TAG = "VideoPlayerProxy";
-
+	// The player doesn't automatically preserve its current location and seek back to
+	// there when being resumed.  This internal property lets us track that.
+	public static final String PROPERTY_SEEK_TO_ON_RESUME = "__seek_to_on_resume__";
 	protected static final int CONTROL_MSG_ACTIVITY_AVAILABLE = 101;
 	protected static final int CONTROL_MSG_CONFIG_CHANGED = 102;
-
+	private static final String TAG = "VideoPlayerProxy";
 	private static final int MSG_FIRST_ID = TiViewProxy.MSG_LAST_ID + 1;
 	private static final int MSG_PLAY = MSG_FIRST_ID + 101;
 	private static final int MSG_STOP = MSG_FIRST_ID + 102;
@@ -64,16 +66,10 @@ public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifec
 	private static final int MSG_HIDE_MEDIA_CONTROLLER = MSG_FIRST_ID + 110;
 	private static final int MSG_SET_VIEW_FROM_ACTIVITY = MSG_FIRST_ID + 111;
 	private static final int MSG_REPEAT_CHANGE = MSG_FIRST_ID + 112;
-
 	// Keeping these out of TiC because I believe we'll stop supporting them
 	// in favor of the documented property, which is "mediaControlStyle".
 	private static final String PROPERTY_MOVIE_CONTROL_MODE = "movieControlMode";
 	private static final String PROPERTY_MOVIE_CONTROL_STYLE = "movieControlStyle";
-
-	// The player doesn't automatically preserve its current location and seek back to
-	// there when being resumed.  This internal property lets us track that.
-	public static final String PROPERTY_SEEK_TO_ON_RESUME = "__seek_to_on_resume__";
-
 	protected int mediaControlStyle = MediaModule.VIDEO_CONTROL_DEFAULT;
 	protected int scalingMode = MediaModule.VIDEO_SCALING_RESIZE_ASPECT;
 	private int loadState = MediaModule.VIDEO_LOAD_STATE_UNKNOWN;
@@ -127,6 +123,7 @@ public void setActivity(Activity activity)
 	 * a TiUIVideoView so we have on common interface to the VideoView
 	 * and so we can handle child views in our standard way without any
 	 * extra code beyond this here.
+	 *
 	 * @param layout The content view of the TiVideoActivity. It already contains a VideoView.
 	 */
 	//
@@ -192,11 +189,13 @@ private void launchVideoActivity(KrollDict options)
 
 	/**
 	 * Create handler used for communication from TiVideoActivity to this proxy.
+	 *
 	 * @return Returns the handler used to send commands to the video view.
 	 */
 	private Handler createControlHandler()
 	{
-		return new Handler(new Handler.Callback() {
+		return new Handler(new Handler.Callback()
+		{
 			@Override
 			public boolean handleMessage(Message msg)
 			{
@@ -613,7 +612,7 @@ public void onPlaybackReady(int duration)
 		setProperty(TiC.PROPERTY_DURATION, duration);
 		setProperty(TiC.PROPERTY_PLAYABLE_DURATION, duration);
 		setProperty(TiC.PROPERTY_END_PLAYBACK_TIME,
-					duration); // Currently we're not doing anything else with this property in Android.
+			duration); // Currently we're not doing anything else with this property in Android.
 		if (!hasProperty(TiC.PROPERTY_INITIAL_PLAYBACK_TIME)) {
 			setProperty(TiC.PROPERTY_INITIAL_PLAYBACK_TIME, 0);
 		}
@@ -778,7 +777,7 @@ public void requestThumbnailImagesAtTimes(Object[] times, Object option, KrollFu
 			Uri uri = Uri.parse(url);
 			mTiThumbnailRetriever.setUri(uri);
 			mTiThumbnailRetriever.getBitmap(TiConvert.toIntArray(times), TiConvert.toInt(option),
-											createThumbnailResponseHandler(callback));
+				createThumbnailResponseHandler(callback));
 		}
 	}
 
@@ -795,14 +794,15 @@ public void cancelAllThumbnailImageRequests()
 	 * Convenience method for creating a response handler that is used when getting a
 	 * bitmap.
 	 *
-	 * @param callback          Javascript function that the response handler will invoke
-	 *                          once the bitmap response is ready
-	 * @return                  the bitmap response handler
+	 * @param callback Javascript function that the response handler will invoke
+	 *                 once the bitmap response is ready
+	 * @return the bitmap response handler
 	 */
 	private ThumbnailResponseHandler createThumbnailResponseHandler(final KrollFunction callback)
 	{
 		final VideoPlayerProxy videoPlayerProxy = this;
-		return new ThumbnailResponseHandler() {
+		return new ThumbnailResponseHandler()
+		{
 			@Override
 			public void handleThumbnailResponse(KrollDict bitmapResponse)
 			{
diff --git a/android/modules/network/src/java/ti/modules/titanium/network/CookieProxy.java b/android/modules/network/src/java/ti/modules/titanium/network/CookieProxy.java
index 1862fdc3d15..d7f8b4084b2 100644
--- a/android/modules/network/src/java/ti/modules/titanium/network/CookieProxy.java
+++ b/android/modules/network/src/java/ti/modules/titanium/network/CookieProxy.java
@@ -7,10 +7,6 @@
 
 package ti.modules.titanium.network;
 
-import java.net.HttpCookie;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -18,6 +14,10 @@
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 
+import java.net.HttpCookie;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
 @Kroll.proxy(creatableInModule = NetworkModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_VALUE,
@@ -28,14 +28,15 @@
 		TiC.PROPERTY_SECURE,
 		TiC.PROPERTY_HTTP_ONLY,
 		TiC.PROPERTY_VERSION
-})
+	})
 public class CookieProxy extends KrollProxy
 {
+	public static final SimpleDateFormat systemExpiryDateFormatter =
+		new SimpleDateFormat("EEE, dd-MMM-yyyy HH:mm:ss 'GMT'");
 	private static final String TAG = "CookieProxy";
 	private static final TimeZone timezone = TimeZone.getTimeZone("GMT");
 	private static final SimpleDateFormat httpExpiryDateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-	public static final SimpleDateFormat systemExpiryDateFormatter =
-		new SimpleDateFormat("EEE, dd-MMM-yyyy HH:mm:ss 'GMT'");
+
 	static
 	{
 		httpExpiryDateFormatter.setTimeZone(timezone);
@@ -53,7 +54,7 @@ public CookieProxy(HttpCookie cookie)
 	{
 		super();
 		if (cookie instanceof HttpCookie) {
-			httpCookie = (HttpCookie) cookie;
+			httpCookie = cookie;
 			setProperty(TiC.PROPERTY_NAME, httpCookie.getName());
 			setProperty(TiC.PROPERTY_VALUE, httpCookie.getValue());
 			setProperty(TiC.PROPERTY_DOMAIN, httpCookie.getDomain());
diff --git a/android/modules/network/src/java/ti/modules/titanium/network/HTTPClientProxy.java b/android/modules/network/src/java/ti/modules/titanium/network/HTTPClientProxy.java
index cceab6df10d..397ccf9d2e6 100644
--- a/android/modules/network/src/java/ti/modules/titanium/network/HTTPClientProxy.java
+++ b/android/modules/network/src/java/ti/modules/titanium/network/HTTPClientProxy.java
@@ -6,7 +6,7 @@
  */
 package ti.modules.titanium.network;
 
-import java.io.UnsupportedEncodingException;
+import android.os.Build;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
@@ -15,8 +15,9 @@
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 
+import java.io.UnsupportedEncodingException;
+
 import ti.modules.titanium.xml.DocumentProxy;
-import android.os.Build;
 
 @Kroll.proxy(creatableInModule = NetworkModule.class,
 	propertyAccessors = {
@@ -26,7 +27,7 @@
 		TiC.PROPERTY_ONERROR,
 		TiC.PROPERTY_ONREADYSTATECHANGE,
 		TiC.PROPERTY_ONDATASTREAM
-})
+	})
 public class HTTPClientProxy extends KrollProxy
 {
 	@Kroll.constant
@@ -39,9 +40,8 @@ public class HTTPClientProxy extends KrollProxy
 	public static final int LOADING = TiHTTPClient.READY_STATE_LOADING;
 	@Kroll.constant
 	public static final int DONE = TiHTTPClient.READY_STATE_DONE;
-
-	private static final String TAG = "TiHTTPClientProxy";
 	public static final String PROPERTY_SECURITY_MANAGER = "securityManager";
+	private static final String TAG = "TiHTTPClientProxy";
 	private TiHTTPClient client;
 
 	public HTTPClientProxy()
@@ -82,7 +82,7 @@ public void handleCreationDict(KrollDict dict)
 				} else {
 					throw new IllegalArgumentException(
 						"Invalid argument passed to securityManager property."
-						+ " Does not conform to SecurityManagerProtocol");
+							+ " Does not conform to SecurityManagerProtocol");
 				}
 			}
 		}
@@ -241,12 +241,6 @@ public void setValidatesSecureCertificate(boolean value)
 		this.setProperty("validatesSecureCertificate", value);
 	}
 
-	@Kroll.setProperty
-	public void setUsername(String value)
-	{
-		this.setProperty(TiC.PROPERTY_USERNAME, value);
-	}
-
 	@Kroll.getProperty
 	public String getUsername()
 	{
@@ -257,9 +251,9 @@ public String getUsername()
 	}
 
 	@Kroll.setProperty
-	public void setPassword(String value)
+	public void setUsername(String value)
 	{
-		this.setProperty(TiC.PROPERTY_PASSWORD, value);
+		this.setProperty(TiC.PROPERTY_USERNAME, value);
 	}
 
 	@Kroll.getProperty
@@ -272,9 +266,9 @@ public String getPassword()
 	}
 
 	@Kroll.setProperty
-	public void setDomain(String value)
+	public void setPassword(String value)
 	{
-		this.setProperty(TiC.PROPERTY_DOMAIN, value);
+		this.setProperty(TiC.PROPERTY_PASSWORD, value);
 	}
 
 	@Kroll.getProperty
@@ -287,9 +281,9 @@ public String getDomain()
 	}
 
 	@Kroll.setProperty
-	public void setTlsVersion(int tlsVersion)
+	public void setDomain(String value)
 	{
-		client.setTlsVersion(tlsVersion);
+		this.setProperty(TiC.PROPERTY_DOMAIN, value);
 	}
 
 	@Kroll.getProperty
@@ -309,6 +303,12 @@ public int getTlsVersion()
 		return tlsVersion;
 	}
 
+	@Kroll.setProperty
+	public void setTlsVersion(int tlsVersion)
+	{
+		client.setTlsVersion(tlsVersion);
+	}
+
 	@Override
 	public String getApiName()
 	{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ActivityIndicatorProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ActivityIndicatorProxy.java
index 44f8400ae49..379119eff3c 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ActivityIndicatorProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ActivityIndicatorProxy.java
@@ -6,6 +6,9 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+import android.os.Message;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -13,8 +16,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIActivityIndicator;
-import android.app.Activity;
-import android.os.Message;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -24,7 +25,7 @@
 		TiC.PROPERTY_FONT,
 		TiC.PROPERTY_STYLE,
 		TiC.PROPERTY_INDICATOR_COLOR
-})
+	})
 @Kroll.dynamicApis(methods = { "hide", "show" })
 public class ActivityIndicatorProxy extends TiViewProxy
 {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/AlertDialogProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/AlertDialogProxy.java
index 8727e95e3b2..84c38669b9e 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/AlertDialogProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/AlertDialogProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -14,7 +16,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIDialog;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -29,7 +30,7 @@
 		TiC.PROPERTY_OK,
 		TiC.PROPERTY_OKID,
 		TiC.PROPERTY_PERSISTENT
-})
+	})
 public class AlertDialogProxy extends TiViewProxy
 {
 	public AlertDialogProxy()
@@ -63,7 +64,8 @@ protected void handleShow(KrollDict options)
 		// dialog should occur above the "topmost" activity, so if activity
 		// stack transitions are occurring, try to give them a chance to "settle"
 		// before determining which Activity should be the context for the AlertDialog.
-		TiUIHelper.runUiDelayedIfBlock(new Runnable() {
+		TiUIHelper.runUiDelayedIfBlock(new Runnable()
+		{
 			@Override
 			public void run()
 			{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/AnimationProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/AnimationProxy.java
index cc80f1d48b0..73e03fe0c84 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/AnimationProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/AnimationProxy.java
@@ -27,7 +27,7 @@
 		TiC.PROPERTY_WIDTH,
 		TiC.PROPERTY_HEIGHT,
 		TiC.PROPERTY_BACKGROUND_COLOR
-})
+	})
 public class AnimationProxy extends TiAnimation
 {
 	@Override
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ButtonProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ButtonProxy.java
index 5b64456d758..7be131fa2c6 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ButtonProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ButtonProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -13,7 +15,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIButton;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -30,7 +31,7 @@
 		TiC.PROPERTY_SHADOW_COLOR,
 		TiC.PROPERTY_SHADOW_RADIUS,
 		TiC.PROPERTY_TINT_COLOR
-})
+	})
 public class ButtonProxy extends TiViewProxy
 {
 	public ButtonProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/EmailDialogProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/EmailDialogProxy.java
index 34e53a758af..4dab5f3abb2 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/EmailDialogProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/EmailDialogProxy.java
@@ -6,17 +6,21 @@
  */
 package ti.modules.titanium.ui;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.text.Html;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiApplication.ActivityTransitionListener;
 import org.appcelerator.titanium.TiBlob;
+import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.io.TiBaseFile;
 import org.appcelerator.titanium.io.TiFile;
 import org.appcelerator.titanium.io.TiFileFactory;
@@ -29,14 +33,11 @@
 import org.appcelerator.titanium.util.TiMimeTypeHelper;
 import org.appcelerator.titanium.view.TiUIView;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import ti.modules.titanium.filesystem.FileProxy;
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.text.Html;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -46,12 +47,10 @@
 		"messageBody",
 		"subject",
 		"toRecipients"
-})
+	})
 public class EmailDialogProxy extends TiViewProxy implements ActivityTransitionListener
 {
 
-	private static final String TAG = "EmailDialogProxy";
-
 	@Kroll.constant
 	public static final int CANCELLED = 0;
 	@Kroll.constant
@@ -60,7 +59,7 @@ public class EmailDialogProxy extends TiViewProxy implements ActivityTransitionL
 	public static final int SENT = 2;
 	@Kroll.constant
 	public static final int FAILED = 3;
-
+	private static final String TAG = "EmailDialogProxy";
 	private ArrayList<Object> attachments;
 	private String privateDataDirectoryPath = null;
 
@@ -103,9 +102,9 @@ public void addAttachment(Object attachment)
 		} else {
 			// silently ignore?
 			Log.d(TAG,
-				  "addAttachment for type " + attachment.getClass().getName()
-					  + " ignored. Only files and blobs may be attached.",
-				  Log.DEBUG_MODE);
+				"addAttachment for type " + attachment.getClass().getName()
+					+ " ignored. Only files and blobs may be attached.",
+				Log.DEBUG_MODE);
 		}
 	}
 
@@ -149,7 +148,8 @@ public void doOpen()
 			TiActivitySupport activitySupport = (TiActivitySupport) activity;
 			final int code = activitySupport.getUniqueResultCode();
 
-			activitySupport.launchActivityForResult(choosingIntent, code, new TiActivityResultHandler() {
+			activitySupport.launchActivityForResult(choosingIntent, code, new TiActivityResultHandler()
+			{
 				@Override
 				public void onResult(Activity activity, int requestCode, int resultCode, Intent data)
 				{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ImageViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ImageViewProxy.java
index b1546041d2d..41419f4a825 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ImageViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ImageViewProxy.java
@@ -7,10 +7,12 @@
 package ti.modules.titanium.ui;
 
 import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiBlob;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.view.TiUIView;
+
 import ti.modules.titanium.media.MediaModule;
 import ti.modules.titanium.ui.widget.TiUIImageView;
 
@@ -27,7 +29,7 @@
 		TiC.PROPERTY_IMAGES,
 		TiC.PROPERTY_REPEAT_COUNT,
 		TiC.PROPERTY_SCALING_MODE
-})
+	})
 public class ImageViewProxy extends ViewProxy
 {
 	public ImageViewProxy()
@@ -108,18 +110,18 @@ public TiBlob toBlob()
 		return getImageView().toBlob();
 	}
 
-	@Kroll.setProperty(runOnUiThread = true)
-	public void setTintColor(String color)
-	{
-		getImageView().setTintColor(color);
-	}
-
 	@Kroll.getProperty
 	public int getTintColor()
 	{
 		return getImageView().getTintColor();
 	}
 
+	@Kroll.setProperty(runOnUiThread = true)
+	public void setTintColor(String color)
+	{
+		getImageView().setTintColor(color);
+	}
+
 	@Override
 	public String getApiName()
 	{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java
index 61e2ab2d739..a2cb6669b01 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -13,7 +15,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUILabel;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -38,7 +39,7 @@
 		TiC.PROPERTY_MINIMUM_FONT_SIZE,
 		TiC.PROPERTY_BREAK_STRATEGY,
 		TiC.PROPERTY_HYPHENATION_FREQUENCY
-})
+	})
 public class LabelProxy extends TiViewProxy
 {
 	private static final String TAG = "LabelProxy";
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/MaskedImageProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/MaskedImageProxy.java
index 1194e53aef8..40600c13a93 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/MaskedImageProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/MaskedImageProxy.java
@@ -7,9 +7,11 @@
 package ti.modules.titanium.ui;
 
 import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.view.TiUIView;
+
 import ti.modules.titanium.ui.widget.TiUIMaskedImage;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
@@ -19,7 +21,7 @@
 		TiC.PROPERTY_MODE,
 		TiC.PROPERTY_TINT,
 		TiC.PROPERTY_TINT_COLOR
-})
+	})
 public class MaskedImageProxy extends ViewProxy
 {
 	public MaskedImageProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/OptionDialogProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/OptionDialogProxy.java
index 02dba5586cb..da9391fd199 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/OptionDialogProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/OptionDialogProxy.java
@@ -6,13 +6,15 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIDialog;
-import android.app.Activity;
+
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_ANDROID_VIEW,
@@ -22,7 +24,7 @@
 		TiC.PROPERTY_TITLE,
 		TiC.PROPERTY_TITLEID,
 		TiC.PROPERTY_PERSISTENT
-})
+	})
 public class OptionDialogProxy extends TiDialogProxy
 {
 	public OptionDialogProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java
index a0333188283..df6f2bd18f0 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java
@@ -7,22 +7,20 @@
 package ti.modules.titanium.ui;
 
 import android.util.Log;
-import java.util.ArrayList;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 
+import java.util.ArrayList;
+
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_WIDTH,
-})
+	})
 public class PickerColumnProxy extends KrollProxy implements PickerRowProxy.OnChangedListener
 {
-	public interface OnChangedListener {
-		void onChanged(PickerColumnProxy proxy);
-	}
-
 	private static final String TAG = "PickerColumnProxy";
 	private final ArrayList<PickerRowProxy> rowList = new ArrayList<>();
 	private final ArrayList<PickerColumnProxy.OnChangedListener> listeners = new ArrayList<>();
@@ -222,4 +220,8 @@ public String getApiName()
 	{
 		return "Ti.UI.PickerColumn";
 	}
+
+	public interface OnChangedListener {
+		void onChanged(PickerColumnProxy proxy);
+	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
index 7bbaaca3649..d2536898cfc 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
@@ -6,31 +6,6 @@
  */
 package ti.modules.titanium.ui;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.TimeZone;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.appcelerator.kroll.KrollDict;
-import org.appcelerator.kroll.KrollFunction;
-import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.titanium.R;
-import org.appcelerator.titanium.TiApplication;
-import org.appcelerator.titanium.TiC;
-import org.appcelerator.titanium.TiDimension;
-import org.appcelerator.titanium.proxy.TiViewProxy;
-import org.appcelerator.titanium.util.TiConvert;
-import org.appcelerator.titanium.util.TiUIHelper;
-import org.appcelerator.titanium.view.TiUIView;
-
-import ti.modules.titanium.ui.widget.picker.TiUIDatePicker;
-import ti.modules.titanium.ui.widget.picker.TiUIPlainDropDownPicker;
-import ti.modules.titanium.ui.widget.picker.TiUIPlainPicker;
-import ti.modules.titanium.ui.widget.picker.TiUIPlainSpinnerPicker;
-import ti.modules.titanium.ui.widget.picker.TiUITimePicker;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Color;
@@ -56,6 +31,31 @@
 import com.google.android.material.timepicker.MaterialTimePicker;
 import com.google.android.material.timepicker.TimeFormat;
 
+import org.appcelerator.kroll.KrollDict;
+import org.appcelerator.kroll.KrollFunction;
+import org.appcelerator.kroll.annotations.Kroll;
+import org.appcelerator.titanium.R;
+import org.appcelerator.titanium.TiApplication;
+import org.appcelerator.titanium.TiC;
+import org.appcelerator.titanium.TiDimension;
+import org.appcelerator.titanium.proxy.TiViewProxy;
+import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.util.TiUIHelper;
+import org.appcelerator.titanium.view.TiUIView;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.TimeZone;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import ti.modules.titanium.ui.widget.picker.TiUIDatePicker;
+import ti.modules.titanium.ui.widget.picker.TiUIPlainDropDownPicker;
+import ti.modules.titanium.ui.widget.picker.TiUIPlainPicker;
+import ti.modules.titanium.ui.widget.picker.TiUIPlainSpinnerPicker;
+import ti.modules.titanium.ui.widget.picker.TiUITimePicker;
+
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_CALENDAR_VIEW_SHOWN,
@@ -66,13 +66,13 @@
 		TiC.PROPERTY_MAX_DATE,
 		TiC.PROPERTY_SELECTION_OPENS,
 		TiC.PROPERTY_VALUE
-})
+	})
 public class PickerProxy extends TiViewProxy implements PickerColumnProxy.OnChangedListener
 {
 	private static final String TAG = "PickerProxy";
-	private int type = UIModule.PICKER_TYPE_PLAIN;
 	private final ArrayList<PickerColumnProxy> columnList = new ArrayList<>();
 	private final ArrayList<Integer> selectedRows = new ArrayList<>();
+	private int type = UIModule.PICKER_TYPE_PLAIN;
 	private boolean useSpinner = false;
 	private boolean canFireColumnEvents = true;
 
@@ -83,6 +83,26 @@ public PickerProxy()
 		defaultValues.put(TiC.PROPERTY_DATE_PICKER_STYLE, UIModule.DATE_PICKER_STYLE_AUTOMATIC);
 	}
 
+	/**
+	 * Trim hour, minute, second and millisecond from the date
+	 *
+	 * @param inDate input date
+	 * @return return the trimmed date
+	 */
+	private static Date createDateWithoutTime(Date inDate)
+	{
+		if (inDate == null) {
+			return null;
+		}
+		Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+		cal.setTime(inDate);
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTime();
+	}
+
 	@Override
 	public void handleCreationDict(KrollDict dict)
 	{
@@ -187,17 +207,20 @@ public TextInputLayout createTextInputLayout()
 		editText.setSingleLine();
 		editText.setMaxLines(1);
 		editText.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
-		editText.setKeyListener(new BaseKeyListener() {
+		editText.setKeyListener(new BaseKeyListener()
+		{
 			@Override
 			public int getInputType()
 			{
 				return InputType.TYPE_NULL;
 			}
+
 			@Override
 			public boolean backspace(View view, Editable content, int keyCode, KeyEvent event)
 			{
 				return false;
 			}
+
 			@Override
 			public boolean forwardDelete(View view, Editable content, int keyCode, KeyEvent event)
 			{
@@ -635,25 +658,6 @@ public void showDatePickerDialog(Object[] args)
 		picker.show(appCompatActivity.getSupportFragmentManager(), picker.toString());
 	}
 
-	/**
-	 * Trim hour, minute, second and millisecond from the date
-	 * @param inDate input date
-	 * @return return the trimmed date
-	 */
-	private static Date createDateWithoutTime(Date inDate)
-	{
-		if (inDate == null) {
-			return null;
-		}
-		Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-		cal.setTime(inDate);
-		cal.set(Calendar.HOUR_OF_DAY, 0);
-		cal.set(Calendar.MINUTE, 0);
-		cal.set(Calendar.SECOND, 0);
-		cal.set(Calendar.MILLISECOND, 0);
-		return cal.getTime();
-	}
-
 	// This is meant to be a kind of "static" method, in the sense that
 	// it doesn't use any state except for context.  It's a quick hit way
 	// of getting a date dialog up, in other words.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ProgressBarProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ProgressBarProxy.java
index aeaaed67488..b6b0a5f4346 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ProgressBarProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ProgressBarProxy.java
@@ -6,13 +6,14 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIProgressBar;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -24,7 +25,7 @@
 		TiC.PROPERTY_COLOR,
 		TiC.PROPERTY_TINT_COLOR,
 		TiC.PROPERTY_TRACK_TINT_COLOR,
-})
+	})
 public class ProgressBarProxy extends TiViewProxy
 {
 	public ProgressBarProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/RefreshControlProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/RefreshControlProxy.java
index 67a5141eb77..f4a8fd62783 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/RefreshControlProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/RefreshControlProxy.java
@@ -7,23 +7,28 @@
 package ti.modules.titanium.ui;
 
 import android.graphics.Color;
-import java.util.HashSet;
-import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.kroll.common.Log;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
+import org.appcelerator.kroll.annotations.Kroll;
+import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiColorHelper;
+
+import java.util.HashSet;
+
 import ti.modules.titanium.ui.widget.TiSwipeRefreshLayout;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_TINT_COLOR,
 		TiC.PROPERTY_TITLE,
-})
+	})
 public class RefreshControlProxy extends KrollProxy
 {
-	/** The default Android log tag name to be used by this class. */
+	/**
+	 * The default Android log tag name to be used by this class.
+	 */
 	private static final String TAG = "RefreshControlProxy";
 
 	/**
@@ -39,7 +44,9 @@ public class RefreshControlProxy extends KrollProxy
 	 */
 	private static final HashSet<RefreshControlProxy> assignedControls = new HashSet<>();
 
-	/** Color integer value to be applied to the refresh layout's progress indicator. */
+	/**
+	 * Color integer value to be applied to the refresh layout's progress indicator.
+	 */
 	private int tintColor = DEFAULT_TINT_COLOR;
 
 	/**
@@ -48,14 +55,55 @@ public class RefreshControlProxy extends KrollProxy
 	 */
 	private TiSwipeRefreshLayout swipeRefreshLayout;
 
-	/** Creates a new Titanium "RefreshControl" proxy binding. */
+	/**
+	 * Creates a new Titanium "RefreshControl" proxy binding.
+	 */
 	public RefreshControlProxy()
 	{
 		super();
 	}
 
+	/**
+	 * Unassigns the given view from a RefreshControlProxy instance that was once assigned to
+	 * it via the assignTo() method. A view is expected to call this method when removed from the
+	 * window or to disable pull-down refresh support.
+	 *
+	 * @param view The view to be unassigned from a refresh control, if currently assigned. Can be null.
+	 */
+	public static void unassignFrom(TiSwipeRefreshLayout view)
+	{
+		// Validate argument.
+		if (view == null) {
+			return;
+		}
+
+		// Attempt to find a refresh control that is currently assigned to the given view.
+		RefreshControlProxy proxy = null;
+		for (RefreshControlProxy nextProxy : RefreshControlProxy.assignedControls) {
+			if ((nextProxy != null) && (nextProxy.swipeRefreshLayout == view)) {
+				proxy = nextProxy;
+				break;
+			}
+		}
+		if (proxy == null) {
+			return;
+		}
+
+		// Remove the refresh event listener.
+		proxy.swipeRefreshLayout.setOnRefreshListener(null);
+
+		// Disable pull-down refresh support.
+		proxy.endRefreshing();
+		proxy.swipeRefreshLayout.setSwipeRefreshEnabled(false);
+
+		// Unassign the view from the refresh control.
+		RefreshControlProxy.assignedControls.remove(proxy);
+		proxy.swipeRefreshLayout = null;
+	}
+
 	/**
 	 * Fetches the JavaScript type name of this proxy object.
+	 *
 	 * @return Returns the unique type name of this proxy object.
 	 */
 	@Override
@@ -69,6 +117,7 @@ public String getApiName()
 	 * <p>
 	 * Expected to be called on the runtime thread when the
 	 * JavaScript Ti.UI.createRefreshControl() function has been invoked.
+	 *
 	 * @param properties Dictionary of property settings.
 	 */
 	@Override
@@ -94,7 +143,8 @@ public void handleCreationDict(KrollDict properties)
 	/**
 	 * Called when a single property setting has been changed.
 	 * Expected to be called on the JavaScript runtime thread.
-	 * @param name The unique name of the property that was changed.
+	 *
+	 * @param name  The unique name of the property that was changed.
 	 * @param value The property new value. Can be null.
 	 */
 	@Override
@@ -116,9 +166,9 @@ public void onPropertyChanged(String name, Object value)
 
 	/**
 	 * Stores the given tint color value to be applied to the refresh progress indicator.
-	 * @param colorName
-	 * The color value to be applied. Expected to be a string such as "red", "blue", "#00FF00", etc.
-	 * Can be null, in which case, the progress indicator will revert back to its default color.
+	 *
+	 * @param colorName The color value to be applied. Expected to be a string such as "red", "blue", "#00FF00", etc.
+	 *                  Can be null, in which case, the progress indicator will revert back to its default color.
 	 */
 	private void onTintColorChanged(Object colorName)
 	{
@@ -141,7 +191,9 @@ private void onTintColorChanged(Object colorName)
 		this.swipeRefreshLayout.setColorSchemeColors(tintColor);
 	}
 
-	/** Displays the refresh progress indicator if a SwipeRefreshLayout is currently assigned. */
+	/**
+	 * Displays the refresh progress indicator if a SwipeRefreshLayout is currently assigned.
+	 */
 	@Kroll.method
 	public void beginRefreshing()
 	{
@@ -162,7 +214,9 @@ public void beginRefreshing()
 		fireEvent(TiC.EVENT_REFRESH_START, null);
 	}
 
-	/** Hides the refresh progress indicator if a SwipeRefreshLayout is currently assigned. */
+	/**
+	 * Hides the refresh progress indicator if a SwipeRefreshLayout is currently assigned.
+	 */
 	@Kroll.method
 	public void endRefreshing()
 	{
@@ -195,10 +249,10 @@ public void endRefreshing()
 	 * <p>
 	 * If this refresh control is currently assigned to another view, then it will be automatically
 	 * unassigned from the previous view before being assigned the given view.
-	 * @param view
-	 * The view to be assigned to this refresh control.
-	 * <p>
-	 * Can be null, in which case, this method will do nothing.
+	 *
+	 * @param view The view to be assigned to this refresh control.
+	 *             <p>
+	 *             Can be null, in which case, this method will do nothing.
 	 */
 	public void assignTo(TiSwipeRefreshLayout view)
 	{
@@ -222,7 +276,8 @@ public void assignTo(TiSwipeRefreshLayout view)
 		// Set up the given view for pull-down refresh support.
 		view.setColorSchemeColors(this.tintColor);
 		view.setSwipeRefreshEnabled(true);
-		view.setOnRefreshListener(new TiSwipeRefreshLayout.OnRefreshListener() {
+		view.setOnRefreshListener(new TiSwipeRefreshLayout.OnRefreshListener()
+		{
 			@Override
 			public void onRefresh()
 			{
@@ -232,42 +287,4 @@ public void onRefresh()
 			}
 		});
 	}
-
-	/**
-	 * Unassigns the given view from a RefreshControlProxy instance that was once assigned to
-	 * it via the assignTo() method. A view is expected to call this method when removed from the
-	 * window or to disable pull-down refresh support.
-	 * @param view
-	 * The view to be unassigned from a refresh control, if currently assigned. Can be null.
-	 */
-	public static void unassignFrom(TiSwipeRefreshLayout view)
-	{
-		// Validate argument.
-		if (view == null) {
-			return;
-		}
-
-		// Attempt to find a refresh control that is currently assigned to the given view.
-		RefreshControlProxy proxy = null;
-		for (RefreshControlProxy nextProxy : RefreshControlProxy.assignedControls) {
-			if ((nextProxy != null) && (nextProxy.swipeRefreshLayout == view)) {
-				proxy = nextProxy;
-				break;
-			}
-		}
-		if (proxy == null) {
-			return;
-		}
-
-		// Remove the refresh event listener.
-		proxy.swipeRefreshLayout.setOnRefreshListener(null);
-
-		// Disable pull-down refresh support.
-		proxy.endRefreshing();
-		proxy.swipeRefreshLayout.setSwipeRefreshEnabled(false);
-
-		// Unassign the view from the refresh control.
-		RefreshControlProxy.assignedControls.remove(proxy);
-		proxy.swipeRefreshLayout = null;
-	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollViewProxy.java
index d8a48cd4f0b..81ee8644f2d 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollViewProxy.java
@@ -6,17 +6,19 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
-import org.appcelerator.titanium.view.TiUIView;
 import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.view.TiUIView;
 
-import ti.modules.titanium.ui.widget.TiUIScrollView;
-import android.app.Activity;
 import java.util.HashMap;
 
+import ti.modules.titanium.ui.widget.TiUIScrollView;
+
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_CONTENT_HEIGHT,
@@ -28,7 +30,7 @@
 		TiC.PROPERTY_CAN_CANCEL_EVENTS,
 		TiC.PROPERTY_OVER_SCROLL_MODE,
 		TiC.PROPERTY_REFRESH_CONTROL
-})
+	})
 public class ScrollViewProxy extends TiViewProxy
 {
 	private static final int MSG_FIRST_ID = TiViewProxy.MSG_LAST_ID + 1;
@@ -65,18 +67,18 @@ public void scrollTo(int x, int y, @Kroll.argument(optional = true) HashMap args
 		handleScrollTo(x, y, animated);
 	}
 
-	@Kroll.setProperty
-	public void setScrollingEnabled(Object enabled)
-	{
-		getScrollView().setScrollingEnabled(enabled);
-	}
-
 	@Kroll.getProperty
 	public boolean getScrollingEnabled()
 	{
 		return getScrollView().getScrollingEnabled();
 	}
 
+	@Kroll.setProperty
+	public void setScrollingEnabled(Object enabled)
+	{
+		getScrollView().setScrollingEnabled(enabled);
+	}
+
 	@Kroll.method
 	public void scrollToBottom()
 	{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java
index 0f0ab6a1925..b3ab5c08940 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java
@@ -6,9 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
+import android.app.Activity;
+import android.os.Message;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -17,9 +16,11 @@
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.view.TiUIView;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import ti.modules.titanium.ui.widget.TiUIScrollableView;
-import android.app.Activity;
-import android.os.Message;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -28,11 +29,11 @@
 		TiC.PROPERTY_PADDING,
 		TiC.PROPERTY_SHOW_PAGING_CONTROL,
 		TiC.PROPERTY_OVER_SCROLL_MODE
-})
+	})
 public class ScrollableViewProxy extends TiViewProxy
 {
+	public static final int MIN_CACHE_SIZE = 3;
 	private static final String TAG = "TiScrollableView";
-
 	private static final int MSG_FIRST_ID = TiViewProxy.MSG_LAST_ID + 1;
 	public static final int MSG_HIDE_PAGER = MSG_FIRST_ID + 101;
 	public static final int MSG_MOVE_PREV = MSG_FIRST_ID + 102;
@@ -41,12 +42,9 @@ public class ScrollableViewProxy extends TiViewProxy
 	public static final int MSG_SET_CURRENT = MSG_FIRST_ID + 107;
 	public static final int MSG_SET_ENABLED = MSG_FIRST_ID + 109;
 	public static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
-
 	private static final int DEFAULT_PAGING_CONTROL_TIMEOUT = 3000;
-	public static final int MIN_CACHE_SIZE = 3;
-
 	protected AtomicBoolean inScroll;
-	private List<TiViewProxy> views = new ArrayList<>();
+	private final List<TiViewProxy> views = new ArrayList<>();
 	private TiUIScrollableView scrollableView;
 
 	public ScrollableViewProxy()
@@ -351,6 +349,13 @@ public void fireScroll(int currentPage, float currentPageAsFloat, TiViewProxy cu
 		}
 	}
 
+	@Kroll.getProperty
+	public boolean getScrollingEnabled()
+	{
+		return (scrollableView != null) ? scrollableView.getEnabled()
+			: getProperties().optBoolean(TiC.PROPERTY_SCROLLING_ENABLED, true);
+	}
+
 	@Kroll.setProperty
 	public void setScrollingEnabled(boolean value)
 	{
@@ -358,11 +363,12 @@ public void setScrollingEnabled(boolean value)
 			scrollableView.setEnabled(value);
 		}
 	}
+
 	@Kroll.getProperty
-	public boolean getScrollingEnabled()
+	public int getCurrentPage()
 	{
-		return (scrollableView != null) ? scrollableView.getEnabled()
-			: getProperties().optBoolean(TiC.PROPERTY_SCROLLING_ENABLED, true);
+		return (scrollableView != null) ? scrollableView.getCurrentPage()
+			: getProperties().optInt(TiC.PROPERTY_CURRENT_PAGE, 0);
 	}
 
 	@Kroll.setProperty
@@ -375,13 +381,6 @@ public void setCurrentPage(int currentPage)
 		}
 	}
 
-	@Kroll.getProperty
-	public int getCurrentPage()
-	{
-		return (scrollableView != null) ? scrollableView.getCurrentPage()
-			: getProperties().optInt(TiC.PROPERTY_CURRENT_PAGE, 0);
-	}
-
 	@Override
 	public void releaseViews()
 	{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/SearchBarProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/SearchBarProxy.java
index 59b8002414c..0bfadaae48c 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/SearchBarProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/SearchBarProxy.java
@@ -1,11 +1,7 @@
-/**
- * Titanium SDK
- * Copyright TiDev, Inc. 04/07/2022-Present. All Rights Reserved.
- * Licensed under the terms of the Apache Public License
- * Please see the LICENSE included with this distribution for details.
- */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -14,7 +10,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.searchbar.TiUISearchBar;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -30,7 +25,7 @@
 		TiC.PROPERTY_PROMPT,
 		TiC.PROPERTY_PROMPT_ID,
 		TiC.PROPERTY_VALUE
-})
+	})
 public class SearchBarProxy extends TiViewProxy
 {
 	public SearchBarProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java
index d6349387c34..eff016c99ed 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java
@@ -6,13 +6,14 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUISlider;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -27,7 +28,7 @@
 		TiC.PROPERTY_TINT_COLOR,
 		TiC.PROPERTY_TRACK_TINT_COLOR,
 		TiC.PROPERTY_VALUE
-})
+	})
 public class SliderProxy extends TiViewProxy
 {
 	public SliderProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/SwitchProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/SwitchProxy.java
index 3bdcac73f38..f3758a97fa9 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/SwitchProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/SwitchProxy.java
@@ -6,12 +6,14 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
+
 import ti.modules.titanium.ui.widget.TiUISwitch;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -28,7 +30,7 @@
 		TiC.PROPERTY_VERTICAL_ALIGN,
 		TiC.PROPERTY_ON_THUMB_COLOR,
 		TiC.PROPERTY_THUMB_COLOR
-})
+	})
 public class SwitchProxy extends TiViewProxy
 {
 	public SwitchProxy()
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
index ce97a31f23c..0c76925eb2e 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
@@ -6,9 +6,15 @@
  */
 package ti.modules.titanium.ui;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -27,20 +33,15 @@
 import org.appcelerator.titanium.util.TiRHelper;
 import org.appcelerator.titanium.util.TiUIHelper;
 
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import ti.modules.titanium.ui.android.AndroidModule;
 import ti.modules.titanium.ui.widget.tabgroup.TiUIAbstractTabGroup;
 import ti.modules.titanium.ui.widget.tabgroup.TiUIBottomNavigationTabGroup;
 import ti.modules.titanium.ui.widget.tabgroup.TiUITabLayoutTabGroup;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import android.view.LayoutInflater;
-
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_TABS_BACKGROUND_COLOR,
@@ -49,27 +50,24 @@
 		TiC.PROPERTY_AUTO_TAB_TITLE,
 		TiC.PROPERTY_EXIT_ON_CLOSE,
 		TiC.PROPERTY_SMOOTH_SCROLL_ON_TAB_CLICK
-})
+	})
 public class TabGroupProxy extends TiWindowProxy implements TiActivityWindow
 {
 	private static final String TAG = "TabGroupProxy";
 	private static final String PROPERTY_POST_TAB_GROUP_CREATED = "postTabGroupCreated";
 	private static final int MSG_FIRST_ID = TiWindowProxy.MSG_LAST_ID + 1;
-
+	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
 	private static final int MSG_ADD_TAB = MSG_FIRST_ID + 100;
 	private static final int MSG_REMOVE_TAB = MSG_FIRST_ID + 101;
 	private static final int MSG_SET_ACTIVE_TAB = MSG_FIRST_ID + 102;
 	private static final int MSG_GET_ACTIVE_TAB = MSG_FIRST_ID + 103;
 	private static final int MSG_SET_TABS = MSG_FIRST_ID + 104;
 	private static final int MSG_DISABLE_TAB_NAVIGATION = MSG_FIRST_ID + 105;
-
-	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
-
-	private ArrayList<TabProxy> tabs = new ArrayList<>();
+	private static int id_toolbar;
+	private final ArrayList<TabProxy> tabs = new ArrayList<>();
 	private WeakReference<AppCompatActivity> tabGroupActivity = new WeakReference<>(null);
 	private Object selectedTab; // NOTE: Can be TabProxy or Number
 	private String tabGroupTitle = null;
-	private static int id_toolbar;
 	private boolean autoTabTitle = false;
 
 	public TabGroupProxy()
@@ -167,12 +165,6 @@ public Object getActiveTab()
 		}
 	}
 
-	private TabProxy getActiveTabProxy()
-	{
-		Object activeTab = getActiveTab();
-		return (activeTab != null) ? parseTab(activeTab) : null;
-	}
-
 	@Kroll.setProperty
 	public void setActiveTab(Object tabOrIndex)
 	{
@@ -197,6 +189,12 @@ public void setActiveTab(Object tabOrIndex)
 		}
 	}
 
+	private TabProxy getActiveTabProxy()
+	{
+		Object activeTab = getActiveTab();
+		return (activeTab != null) ? parseTab(activeTab) : null;
+	}
+
 	@Kroll.getProperty(name = "activity")
 	public ActivityProxy _getActivity()
 	{
@@ -337,7 +335,7 @@ protected void handleOpen(KrollDict options)
 			topActivity.startActivity(intent);
 			topActivity.overridePendingTransition(0, 0);
 		} else if (options.containsKey(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION)
-				   || options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
+			|| options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
 			topActivity.startActivity(intent);
 			int enterAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION), 0);
 			int exitAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION), 0);
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TextAreaProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TextAreaProxy.java
index 1661afb3a4d..d88956f5f91 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/TextAreaProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/TextAreaProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollModule;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -15,7 +17,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIText;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -46,7 +47,7 @@
 		TiC.PROPERTY_VERTICAL_ALIGN,
 		TiC.PROPERTY_PADDING,
 		TiC.PROPERTY_RETURN_KEY_TYPE
-})
+	})
 public class TextAreaProxy extends TiViewProxy
 {
 	public TextAreaProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TextFieldProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TextFieldProxy.java
index 65b1f153690..b594c7fadbb 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/TextFieldProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/TextFieldProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollModule;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -15,7 +17,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUIText;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -46,7 +47,7 @@
 		TiC.PROPERTY_VERTICAL_ALIGN,
 		TiC.PROPERTY_RETURN_KEY_TYPE,
 		TiC.PROPERTY_PADDING
-})
+	})
 public class TextFieldProxy extends TiViewProxy
 {
 	public TextFieldProxy()
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TiDialogProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TiDialogProxy.java
index 0f4b3bf5f88..2fe493d11a0 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/TiDialogProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/TiDialogProxy.java
@@ -6,14 +6,14 @@
  */
 package ti.modules.titanium.ui;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.CurrentActivityListener;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.util.TiUIHelper;
 
-import android.app.Activity;
-
 @Kroll.proxy(parentModule = UIModule.class,
 	propertyAccessors = {
 		"title",
@@ -24,7 +24,7 @@
 		"options",
 		"selectedIndex",
 		"cancel"
-})
+	})
 public abstract class TiDialogProxy extends TiViewProxy
 {
 	protected boolean showing = false;
@@ -38,7 +38,8 @@ public TiDialogProxy()
 	public void show(final KrollDict options)
 	{
 		showing = true;
-		TiUIHelper.waitForCurrentActivity(new CurrentActivityListener() {
+		TiUIHelper.waitForCurrentActivity(new CurrentActivityListener()
+		{
 			@Override
 			public void onCurrentActivityReady(Activity activity)
 			{
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ToolbarProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ToolbarProxy.java
index ec1cd8a6912..0599bdf2f09 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/ToolbarProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/ToolbarProxy.java
@@ -1,13 +1,16 @@
 package ti.modules.titanium.ui;
 
 import android.app.Activity;
-import androidx.appcompat.widget.Toolbar;
 import android.view.View;
+
+import androidx.appcompat.widget.Toolbar;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiToolbarProxy;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
+
 import ti.modules.titanium.ui.widget.TiToolbar;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
@@ -26,7 +29,7 @@
 		TiC.PROPERTY_SUBTITLE_TEXT_COLOR,
 		TiC.PROPERTY_CONTENT_INSET_END_WITH_ACTIONS,
 		TiC.PROPERTY_CONTENT_INSET_START_WITH_NAVIGATION
-})
+	})
 public class ToolbarProxy extends TiToolbarProxy
 {
 	private static final java.lang.String TAG = "Toolbar";
@@ -53,6 +56,7 @@ public TiUIView createView(Activity activity)
 
 	/**
 	 * Sets the activity this proxy's view should be attached to.
+	 *
 	 * @param activity The activity this proxy's view should be attached to.
 	 */
 	@Override
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java
index 8be6063b52b..d0506b36a19 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java
@@ -56,28 +56,25 @@
 		TiC.PROPERTY_LIGHT_TOUCH_ENABLED,
 		TiC.PROPERTY_ON_LINK,
 		TiC.PROPERTY_SCROLLBARS
-})
+	})
+
 public class WebViewProxy extends ViewProxy implements Handler.Callback, OnLifecycleEvent, interceptOnBackPressedEvent
 {
+	public static final String OPTIONS_IN_SETHTML = "optionsInSetHtml";
 	private static final String TAG = "WebViewProxy";
 	private static final int MSG_FIRST_ID = ViewProxy.MSG_LAST_ID + 1;
-
+	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
 	private static final int MSG_GO_BACK = MSG_FIRST_ID + 101;
 	private static final int MSG_GO_FORWARD = MSG_FIRST_ID + 102;
 	private static final int MSG_RELOAD = MSG_FIRST_ID + 103;
 	private static final int MSG_STOP_LOADING = MSG_FIRST_ID + 104;
 	private static final int MSG_RELEASE = MSG_FIRST_ID + 110;
-
-	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
+	private static final Map<Integer, EvalJSRunnable> fevalJSRequests = new HashMap<>();
+	private static final int frequestID = 0;
 	private static String fusername;
 	private static String fpassword;
-	private static int frequestID = 0;
-	private static final Map<Integer, EvalJSRunnable> fevalJSRequests = new HashMap<>();
-
-	private Message postCreateMessage;
 	PrintManager printManager;
-
-	public static final String OPTIONS_IN_SETHTML = "optionsInSetHtml";
+	private Message postCreateMessage;
 
 	public WebViewProxy()
 	{
@@ -89,6 +86,15 @@ public WebViewProxy()
 		defaultValues.put(TiC.PROPERTY_ZOOM_LEVEL, 1.0);
 	}
 
+	private static void sendPostCreateMessage(WebView view, Message postCreateMessage)
+	{
+		WebView.WebViewTransport transport = (WebView.WebViewTransport) postCreateMessage.obj;
+		if (transport != null) {
+			transport.setWebView(view);
+		}
+		postCreateMessage.sendToTarget();
+	}
+
 	@Override
 	public TiUIView createView(Activity activity)
 	{
@@ -131,40 +137,6 @@ public Object evalJS(String code, @Kroll.argument(optional = true) KrollFunction
 		return view.getJSValue(code);
 	}
 
-	private static class EvalJSRunnable implements Runnable
-	{
-		private final TiUIWebView view;
-		private final KrollObject krollObject;
-		private final String code;
-		private final KrollFunction callback;
-
-		public EvalJSRunnable(TiUIWebView view, KrollObject krollObject, String code, KrollFunction callback)
-		{
-			this.view = view;
-			this.krollObject = krollObject;
-			this.code = code;
-			this.callback = callback;
-		}
-
-		public void run()
-		{
-			// Runs the "old" API we built
-			String result = view.getJSValue(code);
-			callback.callAsync(krollObject, new Object[] { result });
-		}
-
-		public void runAsync()
-		{
-			// Runs the newer API provided by Android
-			view.getWebView().evaluateJavascript(code, new ValueCallback<String>() {
-				public void onReceiveValue(String value)
-				{
-					callback.callAsync(krollObject, new Object[] { value });
-				}
-			});
-		}
-	}
-
 	@Kroll.getProperty
 	public String getHtml()
 	{
@@ -243,6 +215,16 @@ public void setBasicAuthentication(String username, String password)
 		getWebView().setBasicAuthentication(username, password);
 	}
 
+	@Kroll.getProperty
+	public String getUserAgent()
+	{
+		TiUIWebView currWebView = getWebView();
+		if (currWebView != null) {
+			return currWebView.getUserAgentString();
+		}
+		return "";
+	}
+
 	@Kroll.setProperty
 	public void setUserAgent(String userAgent)
 	{
@@ -253,13 +235,13 @@ public void setUserAgent(String userAgent)
 	}
 
 	@Kroll.getProperty
-	public String getUserAgent()
+	public HashMap getRequestHeaders()
 	{
 		TiUIWebView currWebView = getWebView();
 		if (currWebView != null) {
-			return currWebView.getUserAgentString();
+			return currWebView.getRequestHeaders();
 		}
-		return "";
+		return new HashMap<String, String>();
 	}
 
 	@Kroll.setProperty
@@ -273,16 +255,6 @@ public void setRequestHeaders(HashMap params)
 		}
 	}
 
-	@Kroll.getProperty
-	public HashMap getRequestHeaders()
-	{
-		TiUIWebView currWebView = getWebView();
-		if (currWebView != null) {
-			return currWebView.getRequestHeaders();
-		}
-		return new HashMap<String, String>();
-	}
-
 	@Kroll.method
 	public boolean canGoBack()
 	{
@@ -432,9 +404,17 @@ public int getPluginState()
 	}
 
 	@Kroll.setProperty
-	public void setDisableContextMenu(boolean disableContextMenu)
+	public void setPluginState(int pluginState)
 	{
-		setPropertyAndFire(TiC.PROPERTY_DISABLE_CONTEXT_MENU, disableContextMenu);
+		switch (pluginState) {
+			case TiUIWebView.PLUGIN_STATE_OFF:
+			case TiUIWebView.PLUGIN_STATE_ON:
+			case TiUIWebView.PLUGIN_STATE_ON_DEMAND:
+				setPropertyAndFire(TiC.PROPERTY_PLUGIN_STATE, pluginState);
+				break;
+			default:
+				setPropertyAndFire(TiC.PROPERTY_PLUGIN_STATE, TiUIWebView.PLUGIN_STATE_OFF);
+		}
 	}
 
 	@Kroll.getProperty
@@ -447,17 +427,9 @@ public boolean getDisableContextMenu()
 	}
 
 	@Kroll.setProperty
-	public void setPluginState(int pluginState)
+	public void setDisableContextMenu(boolean disableContextMenu)
 	{
-		switch (pluginState) {
-			case TiUIWebView.PLUGIN_STATE_OFF:
-			case TiUIWebView.PLUGIN_STATE_ON:
-			case TiUIWebView.PLUGIN_STATE_ON_DEMAND:
-				setPropertyAndFire(TiC.PROPERTY_PLUGIN_STATE, pluginState);
-				break;
-			default:
-				setPropertyAndFire(TiC.PROPERTY_PLUGIN_STATE, TiUIWebView.PLUGIN_STATE_OFF);
-		}
+		setPropertyAndFire(TiC.PROPERTY_DISABLE_CONTEXT_MENU, disableContextMenu);
 	}
 
 	@Kroll.method
@@ -476,12 +448,6 @@ public void resume()
 		}
 	}
 
-	@Kroll.setProperty(runOnUiThread = true)
-	public void setEnableZoomControls(boolean enabled)
-	{
-		setPropertyAndFire(TiC.PROPERTY_ENABLE_ZOOM_CONTROLS, enabled);
-	}
-
 	@Kroll.getProperty
 	public boolean getEnableZoomControls()
 	{
@@ -493,6 +459,12 @@ public boolean getEnableZoomControls()
 		return enabled;
 	}
 
+	@Kroll.setProperty(runOnUiThread = true)
+	public void setEnableZoomControls(boolean enabled)
+	{
+		setPropertyAndFire(TiC.PROPERTY_ENABLE_ZOOM_CONTROLS, enabled);
+	}
+
 	@Kroll.getProperty
 	public float getZoomLevel()
 	{
@@ -517,12 +489,6 @@ public void setZoomLevel(float value)
 		}
 	}
 
-	@Kroll.setProperty
-	public void setAllowFileAccess(boolean enabled)
-	{
-		setPropertyAndFire(TiC.PROPERTY_ALLOW_FILE_ACCESS, enabled);
-	}
-
 	@Kroll.getProperty
 	public boolean getAllowFileAccess()
 	{
@@ -534,6 +500,12 @@ public boolean getAllowFileAccess()
 		return enabled;
 	}
 
+	@Kroll.setProperty
+	public void setAllowFileAccess(boolean enabled)
+	{
+		setPropertyAndFire(TiC.PROPERTY_ALLOW_FILE_ACCESS, enabled);
+	}
+
 	@Kroll.getProperty
 	public double getProgress()
 	{
@@ -570,15 +542,6 @@ public void setPostCreateMessage(Message postCreateMessage)
 		}
 	}
 
-	private static void sendPostCreateMessage(WebView view, Message postCreateMessage)
-	{
-		WebView.WebViewTransport transport = (WebView.WebViewTransport) postCreateMessage.obj;
-		if (transport != null) {
-			transport.setWebView(view);
-		}
-		postCreateMessage.sendToTarget();
-	}
-
 	/**
 	 * Don't release the web view when it's removed. TIMOB-7808
 	 */
@@ -656,4 +619,39 @@ public String getApiName()
 	{
 		return "Ti.UI.WebView";
 	}
+
+	private static class EvalJSRunnable implements Runnable
+	{
+		private final TiUIWebView view;
+		private final KrollObject krollObject;
+		private final String code;
+		private final KrollFunction callback;
+
+		public EvalJSRunnable(TiUIWebView view, KrollObject krollObject, String code, KrollFunction callback)
+		{
+			this.view = view;
+			this.krollObject = krollObject;
+			this.code = code;
+			this.callback = callback;
+		}
+
+		public void run()
+		{
+			// Runs the "old" API we built
+			String result = view.getJSValue(code);
+			callback.callAsync(krollObject, new Object[] { result });
+		}
+
+		public void runAsync()
+		{
+			// Runs the newer API provided by Android
+			view.getWebView().evaluateJavascript(code, new ValueCallback<String>()
+			{
+				public void onReceiveValue(String value)
+				{
+					callback.callAsync(krollObject, new Object[] { value });
+				}
+			});
+		}
+	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
index 02d2eaafcaa..73dbe8f5f67 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
@@ -7,30 +7,6 @@
 
 package ti.modules.titanium.ui;
 
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-
-import org.appcelerator.kroll.KrollDict;
-import org.appcelerator.kroll.KrollPromise;
-import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.TiActivity;
-import org.appcelerator.titanium.TiActivityWindow;
-import org.appcelerator.titanium.TiActivityWindows;
-import org.appcelerator.titanium.TiApplication;
-import org.appcelerator.titanium.TiBaseActivity;
-import org.appcelerator.titanium.TiC;
-import org.appcelerator.titanium.TiDimension;
-import org.appcelerator.titanium.TiRootActivity;
-import org.appcelerator.titanium.TiTranslucentActivity;
-import org.appcelerator.titanium.proxy.ActivityProxy;
-import org.appcelerator.titanium.proxy.TiWindowProxy;
-import org.appcelerator.titanium.util.TiColorHelper;
-import org.appcelerator.titanium.util.TiConvert;
-import org.appcelerator.titanium.util.TiRHelper;
-import org.appcelerator.titanium.view.TiUIView;
-import ti.modules.titanium.ui.widget.TiView;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -40,12 +16,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Message;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
@@ -63,23 +33,53 @@
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import org.appcelerator.kroll.KrollDict;
+import org.appcelerator.kroll.KrollPromise;
+import org.appcelerator.kroll.annotations.Kroll;
+import org.appcelerator.kroll.common.Log;
+import org.appcelerator.titanium.TiActivity;
+import org.appcelerator.titanium.TiActivityWindow;
+import org.appcelerator.titanium.TiActivityWindows;
+import org.appcelerator.titanium.TiApplication;
+import org.appcelerator.titanium.TiBaseActivity;
+import org.appcelerator.titanium.TiC;
+import org.appcelerator.titanium.TiDimension;
+import org.appcelerator.titanium.TiRootActivity;
+import org.appcelerator.titanium.TiTranslucentActivity;
+import org.appcelerator.titanium.proxy.ActivityProxy;
+import org.appcelerator.titanium.proxy.TiWindowProxy;
+import org.appcelerator.titanium.util.TiColorHelper;
+import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.util.TiRHelper;
+import org.appcelerator.titanium.view.TiUIView;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+
+import ti.modules.titanium.ui.widget.TiView;
+
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
 		TiC.PROPERTY_MODAL,
 		TiC.PROPERTY_WINDOW_PIXEL_FORMAT,
 		TiC.PROPERTY_FLAG_SECURE,
 		TiC.PROPERTY_BAR_COLOR
-})
+	})
 public class WindowProxy extends TiWindowProxy implements TiActivityWindow
 {
 	private static final String TAG = "WindowProxy";
 	private static final String PROPERTY_POST_WINDOW_CREATED = "postWindowCreated";
 
 	private static final int MSG_FIRST_ID = TiWindowProxy.MSG_LAST_ID + 1;
+	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
 	private static final int MSG_SET_PIXEL_FORMAT = MSG_FIRST_ID + 100;
 	private static final int MSG_SET_TITLE = MSG_FIRST_ID + 101;
-	protected static final int MSG_LAST_ID = MSG_FIRST_ID + 999;
-
 	private static int id_toolbar;
 	private int barColor = -1;
 
@@ -156,7 +156,7 @@ protected void handleOpen(KrollDict options)
 			topActivity.startActivity(intent);
 			topActivity.overridePendingTransition(0, 0);
 		} else if (options.containsKey(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION)
-				   || options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
+			|| options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
 			topActivity.startActivity(intent);
 			int enterAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION), 0);
 			int exitAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION), 0);
@@ -211,7 +211,7 @@ protected void handleClose(@NonNull KrollDict options)
 		if (!animated) {
 			activity.overridePendingTransition(0, 0);
 		} else if (options.containsKey(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION)
-				   || options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
+			|| options.containsKey(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION)) {
 			int enterAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_ENTER_ANIMATION), 0);
 			int exitAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION), 0);
 			activity.overridePendingTransition(enterAnimation, exitAnimation);
@@ -397,7 +397,7 @@ protected void fillIntent(Activity activity, Intent intent)
 		}
 		if (hasProperty(TiC.PROPERTY_WINDOW_PIXEL_FORMAT)) {
 			intent.putExtra(TiC.PROPERTY_WINDOW_PIXEL_FORMAT,
-							TiConvert.toInt(getProperty(TiC.PROPERTY_WINDOW_PIXEL_FORMAT), PixelFormat.UNKNOWN));
+				TiConvert.toInt(getProperty(TiC.PROPERTY_WINDOW_PIXEL_FORMAT), PixelFormat.UNKNOWN));
 		}
 
 		// Set the splitActionBar property
@@ -418,7 +418,7 @@ public void onPropertyChanged(String name, Object value)
 			} else if (TiC.PROPERTY_TITLE.equals(name)) {
 				getMainHandler().obtainMessage(MSG_SET_TITLE, value).sendToTarget();
 			} else if (TiC.PROPERTY_TOP.equals(name) || TiC.PROPERTY_BOTTOM.equals(name)
-					   || TiC.PROPERTY_LEFT.equals(name) || TiC.PROPERTY_RIGHT.equals(name)) {
+				|| TiC.PROPERTY_LEFT.equals(name) || TiC.PROPERTY_RIGHT.equals(name)) {
 				// The "top", "bottom", "left" and "right" properties do not work for heavyweight windows.
 				return;
 			} else if (TiC.PROPERTY_HIDES_BACK_BUTTON.equals(name)) {
@@ -465,6 +465,12 @@ public void onPropertyChanged(String name, Object value)
 		super.onPropertyChanged(name, value);
 	}
 
+	@Kroll.getProperty
+	public boolean getSustainedPerformanceMode()
+	{
+		return TiConvert.toBoolean(getProperty(TiC.PROPERTY_SUSTAINED_PERFORMANCE_MODE), false);
+	}
+
 	@Kroll.setProperty
 	public void setSustainedPerformanceMode(boolean mode)
 	{
@@ -475,12 +481,6 @@ public void setSustainedPerformanceMode(boolean mode)
 		}
 	}
 
-	@Kroll.getProperty
-	public boolean getSustainedPerformanceMode()
-	{
-		return TiConvert.toBoolean(getProperty(TiC.PROPERTY_SUSTAINED_PERFORMANCE_MODE), false);
-	}
-
 	@Override
 	@Kroll.setProperty(retain = false)
 	public void setWidth(Object width)
@@ -518,7 +518,7 @@ public boolean handleMessage(Message msg)
 				if (activity != null) {
 					Window win = activity.getWindow();
 					if (win != null) {
-						win.setFormat(TiConvert.toInt((Object) (msg.obj), PixelFormat.UNKNOWN));
+						win.setFormat(TiConvert.toInt(msg.obj, PixelFormat.UNKNOWN));
 						win.getDecorView().invalidate();
 					}
 				}
@@ -527,21 +527,21 @@ public boolean handleMessage(Message msg)
 			case MSG_SET_TITLE: {
 				Activity activity = getWindowActivity();
 				if (activity != null) {
-					activity.setTitle(TiConvert.toString((Object) (msg.obj), ""));
+					activity.setTitle(TiConvert.toString(msg.obj, ""));
 
 					if (windowActivity != null && windowActivity.get() != null
 						&& windowActivity.get().getSupportActionBar() != null) {
 						ActionBar actionBar = windowActivity.get().getSupportActionBar();
 						if (actionBar.getTitle() instanceof SpannableStringBuilder) {
 							SpannableStringBuilder stringBuilder =
-								new SpannableStringBuilder(TiConvert.toString((Object) (msg.obj), ""));
+								new SpannableStringBuilder(TiConvert.toString(msg.obj, ""));
 							if (barColor != -1) {
 								stringBuilder.setSpan(new ForegroundColorSpan(barColor),
 									0, stringBuilder.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 							}
 							actionBar.setTitle(stringBuilder);
 						} else {
-							actionBar.setTitle(TiConvert.toString((Object) (msg.obj), ""));
+							actionBar.setTitle(TiConvert.toString(msg.obj, ""));
 						}
 					}
 				}
@@ -581,7 +581,8 @@ private void setWindowWidthHeight(Object width, Object height)
 
 	/**
 	 * Helper method to apply activity transitions.
-	 * @param win The window holding the activity.
+	 *
+	 * @param win   The window holding the activity.
 	 * @param props The property dictionary.
 	 */
 	private void applyActivityTransitions(Window win, KrollDict props)
@@ -627,8 +628,9 @@ private void applyActivityTransitions(Window win, KrollDict props)
 
 	/**
 	 * Creates a transition for the supplied transition type.
+	 *
 	 * @param props The property dictionary.
-	 * @param key The transition type
+	 * @param key   The transition type
 	 * @return A Transition or null if UIModule.TRANSITION_NONE or unknown transition is specified.
 	 */
 	@SuppressLint({ "InlinedApi", "RtlHardcoded" })
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/android/CardViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/android/CardViewProxy.java
index caf6767d816..e1c2db91a01 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/android/CardViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/android/CardViewProxy.java
@@ -6,13 +6,14 @@
  */
 package ti.modules.titanium.ui.android;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiUICardView;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = AndroidModule.class,
 	propertyAccessors = {
@@ -26,7 +27,7 @@
 		TiC.PROPERTY_PADDING_LEFT,
 		TiC.PROPERTY_PADDING_RIGHT,
 		TiC.PROPERTY_PADDING_TOP
-})
+	})
 public class CardViewProxy extends TiViewProxy
 {
 	private static final int MSG_FIRST_ID = TiViewProxy.MSG_LAST_ID + 1;
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java
index d5f26372070..f596f29d3c3 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java
@@ -6,6 +6,8 @@
  */
 package ti.modules.titanium.ui.android;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
@@ -13,7 +15,6 @@
 
 import ti.modules.titanium.ui.TiDialogProxy;
 import ti.modules.titanium.ui.widget.TiUIProgressIndicator;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = AndroidModule.class,
 	propertyAccessors = {
@@ -26,7 +27,7 @@
 		TiC.PROPERTY_MAX,
 		TiC.PROPERTY_CANCELABLE,
 		TiC.PROPERTY_CANCELED_ON_TOUCH_OUTSIDE
-})
+	})
 @Kroll.dynamicApis(methods = { "hide", "show" })
 public class ProgressIndicatorProxy extends TiDialogProxy
 {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/android/SearchViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/android/SearchViewProxy.java
index b8fbd13c8d6..d120d62e76d 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/android/SearchViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/android/SearchViewProxy.java
@@ -6,13 +6,14 @@
  */
 package ti.modules.titanium.ui.android;
 
+import android.app.Activity;
+
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.searchview.TiUISearchView;
-import android.app.Activity;
 
 @Kroll.proxy(creatableInModule = AndroidModule.class,
 	propertyAccessors = {
@@ -22,7 +23,7 @@
 		TiC.PROPERTY_HINT_TEXT,
 		TiC.PROPERTY_HINT_TEXT_COLOR,
 		TiC.PROPERTY_VALUE
-})
+	})
 public class SearchViewProxy extends TiViewProxy
 {
 	private static final String TAG = "SearchProxy";
diff --git a/android/package.json b/android/package.json
index ad6f5134f67..cb890f2d580 100644
--- a/android/package.json
+++ b/android/package.json
@@ -20,9 +20,9 @@
 	"compileSDKVersion": "33",
 	"vendorDependencies": {
 		"android sdk": ">=23.x <=34.x",
-		"android build tools": ">=30.0.2 <=33.x",
+		"android build tools": ">=30.0.2 <=34.x",
 		"android platform tools": "33.x",
-		"android tools": "<=26.x",
+		"android tools": "<=34.x",
 		"android ndk": ">=r21 <=r22b",
 		"java": ">=11.x"
 	},
diff --git a/android/runtime/v8/src/native/CMakeLists.txt b/android/runtime/v8/src/native/CMakeLists.txt
index fb6fdb9953a..4c363604f1b 100644
--- a/android/runtime/v8/src/native/CMakeLists.txt
+++ b/android/runtime/v8/src/native/CMakeLists.txt
@@ -5,7 +5,7 @@
 # Please see the LICENSE included with this distribution for details.
 ################################################################################
 
-cmake_minimum_required(VERSION 3.10.2)
+cmake_minimum_required(VERSION 3.22.1)
 
 # Set project/library name and have it use the C++ compiler.
 # Note: Built library will be named "lib${PROJECT_NAME}.so".
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index 4288d2e211b..97fac679e34 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -74,7 +74,7 @@ android {
 	}
 	externalNativeBuild {
 		cmake {
-			version '3.10.2'
+			version '3.22.1'
 			path "${projectDir}/../runtime/v8/src/native/CMakeLists.txt"
 		}
 	}
diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
index 3d29ce309e2..e49244cc65c 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/proxy/ActionBarProxy.java
@@ -7,8 +7,10 @@
 package org.appcelerator.titanium.proxy;
 
 import android.graphics.drawable.Drawable;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.Log;
@@ -24,7 +26,7 @@ public class ActionBarProxy extends KrollProxy
 	private static final String TAG = "ActionBarProxy";
 	private static final String ACTION_BAR_NOT_AVAILABLE_MESSAGE = "ActionBar is not enabled";
 
-	private ActionBar actionBar;
+	private final ActionBar actionBar;
 	private boolean showTitleEnabled = true;
 
 	public ActionBarProxy(AppCompatActivity activity)
@@ -34,7 +36,7 @@ public ActionBarProxy(AppCompatActivity activity)
 		// Guard against calls to ActionBar made before inflating the ActionBarView
 		if (actionBar != null) {
 			actionBar.setDisplayOptions(ActionBar.DISPLAY_USE_LOGO | ActionBar.DISPLAY_SHOW_HOME
-										| ActionBar.DISPLAY_SHOW_TITLE);
+				| ActionBar.DISPLAY_SHOW_TITLE);
 		} else {
 			Log.w(TAG, "Trying to get a reference to ActionBar before its container was inflated.");
 		}
@@ -77,16 +79,6 @@ public void setHomeButtonEnabled(boolean homeButtonEnabled)
 		}
 	}
 
-	@Kroll.setProperty
-	public void setNavigationMode(int navigationMode)
-	{
-		if (actionBar != null) {
-			actionBar.setNavigationMode(navigationMode);
-		} else {
-			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
-		}
-	}
-
 	@Kroll.setProperty
 	public void setBackgroundImage(String url)
 	{
@@ -117,27 +109,6 @@ public void setBackgroundImage(String url)
 		}
 	}
 
-	@Kroll.setProperty
-	public void setTitle(String title)
-	{
-		if (actionBar != null) {
-			actionBar.setTitle(title);
-		} else {
-			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
-		}
-	}
-
-	@Kroll.setProperty
-	public void setSubtitle(String subTitle)
-	{
-		if (actionBar != null) {
-			actionBar.setDisplayShowTitleEnabled(true);
-			actionBar.setSubtitle(subTitle);
-		} else {
-			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
-		}
-	}
-
 	@Kroll.method
 	public void setDisplayShowHomeEnabled(boolean show)
 	{
@@ -164,6 +135,17 @@ public String getSubtitle()
 		return (String) actionBar.getSubtitle();
 	}
 
+	@Kroll.setProperty
+	public void setSubtitle(String subTitle)
+	{
+		if (actionBar != null) {
+			actionBar.setDisplayShowTitleEnabled(true);
+			actionBar.setSubtitle(subTitle);
+		} else {
+			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
+		}
+	}
+
 	@Kroll.getProperty
 	public String getTitle()
 	{
@@ -173,13 +155,33 @@ public String getTitle()
 		return (String) actionBar.getTitle();
 	}
 
+	@Kroll.setProperty
+	public void setTitle(String title)
+	{
+		if (actionBar != null) {
+			actionBar.setTitle(title);
+		} else {
+			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
+		}
+	}
+
 	@Kroll.getProperty
 	public int getNavigationMode()
 	{
 		if (actionBar == null) {
 			return 0;
 		}
-		return (int) actionBar.getNavigationMode();
+		return actionBar.getNavigationMode();
+	}
+
+	@Kroll.setProperty
+	public void setNavigationMode(int navigationMode)
+	{
+		if (actionBar != null) {
+			actionBar.setNavigationMode(navigationMode);
+		} else {
+			Log.w(TAG, ACTION_BAR_NOT_AVAILABLE_MESSAGE);
+		}
 	}
 
 	@Kroll.method
diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiNinePatchHelper.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiNinePatchHelper.java
index 652820f4b8c..0509e6ef62c 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/util/TiNinePatchHelper.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/util/TiNinePatchHelper.java
@@ -6,8 +6,6 @@
  */
 package org.appcelerator.titanium.util;
 
-import java.util.ArrayList;
-
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -15,15 +13,11 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 
+import java.util.ArrayList;
+
 @SuppressWarnings("deprecation")
 public class TiNinePatchHelper
 {
-	private static class SegmentColor
-	{
-		int index;
-		int color;
-	}
-
 	public Drawable process(Drawable d)
 	{
 		Drawable nd = d;
@@ -199,8 +193,8 @@ byte[] createChunk(Bitmap b)
 		numColors = colors.size();
 
 		// Figure out the size / looks like padded to 32bits.
-		int size = 32 + // wasDeserialized, numXDivs, numYDivs, numColors, padLeft, padRight, padTop, padBottom
-				   numXDivs * 32 + numYDivs * 32 + numColors * 32;
+		int size = 32 // wasDeserialized, numXDivs, numYDivs, numColors, padLeft, padRight, padTop, padBottom
+			+ numXDivs * 32 + numYDivs * 32 + numColors * 32;
 
 		chunk = new byte[size];
 		chunk[0] = 0;
@@ -245,4 +239,10 @@ private void toBytes(byte[] a, int offset, int v)
 		a[offset + 2] = (byte) ((0x00FF0000 & v) >> 16);
 		a[offset + 3] = (byte) ((0xFF000000 & v) >> 24);
 	}
+
+	private static class SegmentColor
+	{
+		int index;
+		int color;
+	}
 }
diff --git a/android/titanium/src/java/ti/modules/titanium/BufferProxy.java b/android/titanium/src/java/ti/modules/titanium/BufferProxy.java
index a0422f7dcbb..1825b2082df 100644
--- a/android/titanium/src/java/ti/modules/titanium/BufferProxy.java
+++ b/android/titanium/src/java/ti/modules/titanium/BufferProxy.java
@@ -6,9 +6,6 @@
  */
 package ti.modules.titanium;
 
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollModule;
 import org.appcelerator.kroll.KrollProxy;
@@ -18,6 +15,9 @@
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
 import ti.modules.titanium.codec.CodecModule;
 
 /**
@@ -28,7 +28,7 @@
 		TiC.PROPERTY_BYTE_ORDER,
 		TiC.PROPERTY_TYPE,
 		TiC.PROPERTY_VALUE
-})
+	})
 public class BufferProxy extends KrollProxy
 {
 	private static final String TAG = "BufferProxy";
@@ -170,13 +170,14 @@ protected void validateOffsetAndLength(int offset, int length, int bufferLength)
 	{
 		if (length > offset + bufferLength) {
 			throw new IllegalArgumentException("offset of " + offset + " and length of " + length
-											   + " is larger than the buffer length: " + bufferLength);
+				+ " is larger than the buffer length: " + bufferLength);
 		}
 	}
 
 	/**
 	 * Writes data from sourceBuffer into this.
-	 * @param position the offset position of this buffer.
+	 *
+	 * @param position     the offset position of this buffer.
 	 * @param sourceBuffer the source buffer to write from.
 	 * @param sourceOffset the offset position of the sourceBuffer.
 	 * @param sourceLength the length of the sourceBuffer.
@@ -372,6 +373,7 @@ public int getLength()
 	/**
 	 * Sets the length of this buffer proxy by either growing or shrinking
 	 * the allocated buffer space
+	 *
 	 * @param length The new length of this buffer proxy in bytes
 	 */
 	@Kroll.setProperty

From c719bcd5cd061cccaefe888b8edaf7f25143f412 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:14:37 +0200
Subject: [PATCH 15/55] feat(android): enable Signature Scheme v3 (#13938)

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 android/templates/build/app.build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/templates/build/app.build.gradle b/android/templates/build/app.build.gradle
index 4a1607f99fc..44f859dfa54 100644
--- a/android/templates/build/app.build.gradle
+++ b/android/templates/build/app.build.gradle
@@ -62,6 +62,7 @@ android {
 			storePassword tiKeystorePassword
 			keyAlias tiKeystoreAliasName
 			keyPassword tiKeystoreAliasPassword
+			enableV3Signing true
 		}
 	}
 	buildTypes {

From dfb1b5c312cbfac159fbae4d7277330dad71d6e0 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Wed, 21 Aug 2024 10:57:43 +0200
Subject: [PATCH 16/55] feat(android): fire `selected` event again when
 clicking the same Tab again (#14094)

* feat(android): new 'reselected' event on a Tab

* check for listener

* reselected -> selected

* docs
---
 .../ui/widget/tabgroup/TiUITabLayoutTabGroup.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
index a4d35f234a3..97d81da263e 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
@@ -6,6 +6,7 @@
  */
 package ti.modules.titanium.ui.widget.tabgroup;
 
+import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.titanium.TiC;
@@ -412,6 +413,17 @@ public void onTabUnselected(TabLayout.Tab tab)
 	@Override
 	public void onTabReselected(TabLayout.Tab tab)
 	{
+		if (tab != null) {
+			int index = tab.getPosition();
+			if ((index >= 0) && (index < this.tabs.size())) {
+				TiViewProxy tabProxy = this.tabs.get(index).getProxy();
+				if (tabProxy != null && tabProxy.hasListeners(TiC.EVENT_SELECTED)) {
+					KrollDict data = new KrollDict();
+					data.put("index", index);
+					tabProxy.fireEvent(TiC.EVENT_SELECTED, data, false);
+				}
+			}
+		}
 	}
 
 	public void setTabMode(int value)

From 3eda594e2721651a412a9557f6a05830c19efb29 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Wed, 21 Aug 2024 23:17:32 +0200
Subject: [PATCH 17/55] feat(android): add maxImages and pathOnly to
 openPhotoGallery (#14086)

* feat(android): add maxImages to openPhotoGallery

* pathOnly
---
 .../modules/titanium/media/MediaModule.java   | 23 ++++++++++++++++---
 .../java/org/appcelerator/titanium/TiC.java   |  2 ++
 apidoc/Titanium/Media/Media.yml               | 20 ++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java b/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
index 306c99ed35a..87ec0194fcf 100644
--- a/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
+++ b/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
@@ -241,6 +241,7 @@ public class MediaModule extends KrollModule implements Handler.Callback
 	private static String mediaType = MEDIA_TYPE_PHOTO;
 	private static ContentResolver contentResolver;
 	private boolean useCameraX = false;
+	private static boolean pathOnly = false;
 
 	public MediaModule()
 	{
@@ -1116,6 +1117,15 @@ public void openPhotoGallery(KrollDict options)
 		TiIntentWrapper galleryIntent = new TiIntentWrapper(new Intent());
 		galleryIntent.getIntent().setAction(Intent.ACTION_GET_CONTENT);
 
+		if (options.containsKeyAndNotNull(TiC.PROPERTY_MAX_IMAGES)
+			&& options.containsKey(TiC.PROPERTY_ALLOW_MULTIPLE)
+				&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			// set max image count
+			galleryIntent = new TiIntentWrapper(new Intent(MediaStore.ACTION_PICK_IMAGES));
+			galleryIntent.getIntent()
+				.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, options.getInt(TiC.PROPERTY_MAX_IMAGES));
+		}
+
 		boolean isSelectingPhoto = false;
 		boolean isSelectingVideo = false;
 		if (options.containsKey(TiC.PROPERTY_MEDIA_TYPES)) {
@@ -1163,6 +1173,11 @@ public void openPhotoGallery(KrollDict options)
 			galleryIntent.getIntent().putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultiple);
 		}
 
+		pathOnly = false;
+		if (options.containsKeyAndNotNull(TiC.PROPERTY_PATH_ONLY)) {
+			pathOnly = options.getBoolean(TiC.PROPERTY_PATH_ONLY);
+		}
+
 		final int code = allowMultiple ? PICK_IMAGE_MULTIPLE : PICK_IMAGE_SINGLE;
 
 		activitySupport.launchActivityForResult(galleryIntent.getIntent(), code, new TiActivityResultHandler() {
@@ -1401,16 +1416,18 @@ protected static KrollDict createDictForImage(TiBlob imageData, String mimeType)
 		d.put("width", width);
 		d.put("height", height);
 
-		// Add the image/video's crop dimensiosn to the dictionary.
+		// Add the image/video's crop dimension to the dictionary.
 		KrollDict cropRect = new KrollDict();
 		cropRect.put("x", 0);
 		cropRect.put("y", 0);
 		cropRect.put("width", width);
 		cropRect.put("height", height);
 		d.put("cropRect", cropRect);
-
+		d.put("path", imageData.getNativePath());
 		// Add the blob to the dictionary.
-		d.put("media", imageData);
+		if (!pathOnly) {
+			d.put("media", imageData);
+		}
 		return d;
 	}
 
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
index 4f219b4c308..c7da4f79aa8 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/TiC.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -560,6 +560,7 @@ public class TiC
 	public static final String PROPERTY_MAX_AGE = "maxAge";
 	public static final String PROPERTY_MAX_CLASSNAME = "maxClassname";
 	public static final String PROPERTY_MAX_ELEVATION = "maxElevation";
+	public static final String PROPERTY_MAX_IMAGES = "maxImages";
 	public static final String PROPERTY_MAX_LENGTH = "maxLength";
 	public static final String PROPERTY_MAX_LINES = "maxLines";
 	public static final String PROPERTY_MAX_ROW_HEIGHT = "maxRowHeight";
@@ -640,6 +641,7 @@ public class TiC
 	public static final String PROPERTY_PASSWORD = "password";
 	public static final String PROPERTY_PASSWORD_MASK = "passwordMask";
 	public static final String PROPERTY_PATH = "path";
+	public static final String PROPERTY_PATH_ONLY = "pathOnly";
 	public static final String PROPERTY_PERSISTENT = "persistent";
 	public static final String PROPERTY_PHONE = "phone";
 	public static final String PROPERTY_PIN_IMAGE = "pinImage";
diff --git a/apidoc/Titanium/Media/Media.yml b/apidoc/Titanium/Media/Media.yml
index 8f093d29dac..8e6a97e518e 100644
--- a/apidoc/Titanium/Media/Media.yml
+++ b/apidoc/Titanium/Media/Media.yml
@@ -2235,6 +2235,20 @@ properties:
     osver: {ios: {min: "14.0"}}
     since: { android: "6.0.0", iphone: "9.2.0", ipad: "9.2.0" }
 
+  - name: maxImages
+    summary: Specifies the number of images a user can select at maximum.
+    description: |
+        Only available on Android API 21 and above and with `allowMultiple:true`
+    type: Boolean
+    platforms: [android]
+    since: { android: "12.5.0" }
+
+  - name: pathOnly
+    summary: Do not include the blob in the result
+    type: Boolean
+    platforms: [android]
+    since: { android: "12.5.0" }
+
   - name: selectionLimit
     summary: Specifies number of media item that can be selected.
     description: |
@@ -2284,6 +2298,12 @@ properties:
     summary: The media object, as a [Blob](Titanium.Blob).
     type: Titanium.Blob
 
+  - name: path
+    summary: The path of the image when returning data from the gallery.
+    type: String
+    platforms: [android]
+    since: "12.5.0"
+
   - name: mediaType
     summary: The type of media, either `MEDIA_TYPE_PHOTO`, `MEDIA_TYPE_LIVEPHOTO` or `MEDIA_TYPE_VIDEO` defined in <Titanium.Media>.
     type: String

From b9fd68326f1dca7f7dc4eeb20e9fffa881dbce6d Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:32:08 +0200
Subject: [PATCH 18/55] feat(android): flatten ListView layout (#14037)

* feat(android): flatten ListView layout

* change layout order

* adjust right padding

* fix footer/headerView

* update library, move to async updates
---
 .../layout/titanium_ui_listview_holder.xml    | 167 +++++++++---------
 .../ui/widget/listview/ListViewAdapter.java   |   4 +-
 .../ui/widget/listview/ListViewHolder.java    |  29 ++-
 .../listview/TiRecyclerViewAdapter.java       |   6 +-
 android/titanium/build.gradle                 |   2 +-
 5 files changed, 113 insertions(+), 95 deletions(-)

diff --git a/android/modules/ui/res/layout/titanium_ui_listview_holder.xml b/android/modules/ui/res/layout/titanium_ui_listview_holder.xml
index 88cab51e45a..de8cfbe1581 100644
--- a/android/modules/ui/res/layout/titanium_ui_listview_holder.xml
+++ b/android/modules/ui/res/layout/titanium_ui_listview_holder.xml
@@ -1,96 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/titanium_ui_listview_holder"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:outlineProvider="bounds">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/titanium_ui_listview_holder"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:clipToPadding="false"
+	android:outlineProvider="bounds">
 
-    <!-- Header Container -->
-    <RelativeLayout
-        android:id="@+id/titanium_ui_listview_holder_header_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true">
+	<org.appcelerator.titanium.view.TiCompositeLayout
+		android:id="@+id/titanium_ui_listview_holder_content"
+		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" />
 
-        <org.appcelerator.titanium.view.TiCompositeLayout
-            android:id="@+id/titanium_ui_listview_holder_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:focusableInTouchMode="false"/>
-        <TextView
-            android:id="@+id/titanium_ui_listview_holder_header_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="18dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:gravity="center_vertical"
-            android:focusable="false"
-            android:focusableInTouchMode="false"/>
-    </RelativeLayout>
+	<ImageView
+		android:id="@+id/titanium_ui_listview_holder_left_image"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		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" />
 
-    <!-- Outer Content Container -->
-    <RelativeLayout
-        android:id="@+id/titanium_ui_listview_holder_outer_content_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/titanium_ui_listview_holder_header_container"
-        android:addStatesFromChildren="true">
+	<ImageView
+		android:id="@+id/titanium_ui_listview_holder_right_image"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		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" />
 
-            <ImageView
-                android:id="@+id/titanium_ui_listview_holder_left_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="6dp"
-                android:focusable="false"
-                android:focusableInTouchMode="false"/>
+	<TextView
+		android:id="@+id/titanium_ui_listview_holder_header_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
+		android:gravity="center_vertical"
+		android:minHeight="18dp"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
 
-            <org.appcelerator.titanium.view.TiCompositeLayout
-                android:id="@+id/titanium_ui_listview_holder_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/titanium_ui_listview_holder_left_image"
-                android:addStatesFromChildren="true"/>
+	<TextView
+		android:id="@+id/titanium_ui_listview_holder_footer_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
+		android:gravity="center_vertical"
+		android:minHeight="18dp"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent" />
 
-            <ImageView
-                android:id="@+id/titanium_ui_listview_holder_right_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="6dp"
-                android:focusable="false"
-                android:focusableInTouchMode="false"/>
 
-    </RelativeLayout>
+	<org.appcelerator.titanium.view.TiCompositeLayout
+		android:id="@+id/titanium_ui_listview_holder_header"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
 
-    <!-- Footer Container -->
-    <RelativeLayout
-        android:id="@+id/titanium_ui_listview_holder_footer_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@id/titanium_ui_listview_holder_outer_content_container">
+	<org.appcelerator.titanium.view.TiCompositeLayout
+		android:id="@+id/titanium_ui_listview_holder_footer"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent" />
 
-        <org.appcelerator.titanium.view.TiCompositeLayout
-            android:id="@+id/titanium_ui_listview_holder_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:focusableInTouchMode="false"/>
-        <TextView
-            android:id="@+id/titanium_ui_listview_holder_footer_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="18dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:gravity="center_vertical"
-            android:focusable="false"
-            android:focusableInTouchMode="false" />
-    </RelativeLayout>
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewAdapter.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewAdapter.java
index 5b641c8ed3d..dc59801541c 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewAdapter.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewAdapter.java
@@ -16,9 +16,9 @@
 
 import android.content.Context;
 import android.view.ViewGroup;
-import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 public class ListViewAdapter extends TiRecyclerViewAdapter<ListViewHolder, ListItemProxy>
 {
@@ -112,7 +112,7 @@ public void onBindViewHolder(@NonNull ListViewHolder holder, int position)
 	public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
 	{
 		// Create new TableViewHolder instance.
-		final RelativeLayout layout = (RelativeLayout) inflater.inflate(id_holder, null);
+		final ConstraintLayout layout = (ConstraintLayout) inflater.inflate(id_holder, null);
 		return new ListViewHolder(parent.getContext(), layout);
 	}
 
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
index 6b7defa8ae1..0a400cd4705 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
@@ -18,6 +18,7 @@
 import org.appcelerator.titanium.view.TiCompositeLayout;
 import org.appcelerator.titanium.view.TiUIView;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,6 +34,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.lang.ref.WeakReference;
@@ -70,7 +73,7 @@ public ListViewHolder(final Context context, final ViewGroup viewGroup)
 		// Header attributes.
 		setTitleAttributes("header", context, this.headerTitle);
 
-		this.container = viewGroup.findViewById(R.id.titanium_ui_listview_holder_outer_content_container);
+		this.container = viewGroup.findViewById(R.id.titanium_ui_listview_holder);
 
 		this.leftImage = viewGroup.findViewById(R.id.titanium_ui_listview_holder_left_image);
 
@@ -92,6 +95,7 @@ public ListViewHolder(final Context context, final ViewGroup viewGroup)
 	 * @param proxy    ListItemProxy to bind.
 	 * @param selected Is row selected.
 	 */
+	@SuppressLint("ClickableViewAccessibility")
 	public void bind(final ListItemProxy proxy, final boolean selected)
 	{
 		reset();
@@ -165,7 +169,6 @@ public void bind(final ListItemProxy proxy, final boolean selected)
 			this.rightImage.setVisibility(View.VISIBLE);
 
 			RecyclerView.ViewHolder mViewHolder = this;
-
 			this.rightImage.setOnTouchListener(new View.OnTouchListener()
 			{
 				@Override
@@ -252,7 +255,7 @@ public boolean onTouch(View view, MotionEvent motionEvent)
 					borderView.setAddStatesFromChildren(true);
 
 					// Amend maximum size for content to parent ListView measured height.
-					this.content.setChildFillHeight(nativeListView.getMeasuredHeight());
+					this.container.setMinimumHeight(nativeListView.getMeasuredHeight());
 
 					// Add ListViewItem to content.
 					this.content.addView(borderView, view.getLayoutParams());
@@ -362,6 +365,16 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 						this.header.addView(headerView, view.getLayoutParams());
 						this.header.setVisibility(View.VISIBLE);
+
+						ConstraintSet constraintSet = new ConstraintSet();
+						constraintSet.clone((ConstraintLayout) this.container);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_content, ConstraintSet.TOP,
+							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.TOP,
+							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.TOP,
+							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
+						constraintSet.applyTo((ConstraintLayout) this.container);
 					}
 				}
 			}
@@ -396,6 +409,16 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 						this.footer.addView(footerView, view.getLayoutParams());
 						this.footer.setVisibility(View.VISIBLE);
+
+						ConstraintSet constraintSet = new ConstraintSet();
+						constraintSet.clone((ConstraintLayout) this.container);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_content, ConstraintSet.BOTTOM,
+							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.BOTTOM,
+							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
+						constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.BOTTOM,
+							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
+						constraintSet.applyTo((ConstraintLayout) this.container);
 					}
 				}
 			}
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewAdapter.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewAdapter.java
index 56eab7ada66..cca19084f9b 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewAdapter.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewAdapter.java
@@ -117,7 +117,7 @@ public void update(List<V> newModels, boolean force)
 			return;
 		}
 
-		final var diffResult = DiffUtil.calculateDiff(new DiffCallback(newModelsClone, this.models));
+		final var diffResult = DiffUtil.calculateDiff(new AsyncListDiffer(newModelsClone, this.models));
 
 		// Update models.
 		this.models = newModelsClone;
@@ -129,13 +129,13 @@ public void update(List<V> newModels, boolean force)
 	/**
 	 * Define DiffUtil.Callback to optimize updating the adapter.
 	 */
-	private class DiffCallback extends DiffUtil.Callback
+	private class AsyncListDiffer extends DiffUtil.Callback
 	{
 
 		List<V> newViews;
 		List<V> oldViews;
 
-		public DiffCallback(List<V> newViews, List<V> oldViews)
+		public AsyncListDiffer(List<V> newViews, List<V> oldViews)
 		{
 			this.newViews = newViews;
 			this.oldViews = oldViews;
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index 97fac679e34..160a9417a4d 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -254,7 +254,7 @@ dependencies {
 	implementation 'androidx.exifinterface:exifinterface:1.3.6'
 	implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
 	implementation 'androidx.media:media:1.6.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.1'
+	implementation 'androidx.recyclerview:recyclerview:1.3.2'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.transition:transition:1.4.1'

From 5b274a769b10fc3f25d2c746d6ec24aec6b5e014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Tue, 27 Aug 2024 15:01:40 +0200
Subject: [PATCH 19/55] chore: bump master to 12.6.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fd968703387..97000a2d7b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "titanium-mobile",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "titanium-mobile",
-      "version": "12.5.0",
+      "version": "12.6.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 543a66416e7..57779acbd5f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "titanium-mobile",
   "description": "Titanium SDK",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "moduleApiVersion": {
     "iphone": "2",
     "android": "4"

From 266b6d5ed1d2b9ac77d5de999d5ab2a352f2fa1f Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Wed, 28 Aug 2024 00:06:24 +0000
Subject: [PATCH 20/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f761235fa5..1d5222cd372 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/jasonkneen"><img src="https://github.com/jasonkneen.png" width="60px" alt="Jason Kneen" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https://github.com/Yackens.png" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https://github.com/Yackens.png" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
 
 ## Features
 

From 1bbcc5bc02591facf3543d5e01315b3d1f8c7e0d Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Mon, 2 Sep 2024 00:06:44 +0000
Subject: [PATCH 21/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d5222cd372..f2ce0db7e75 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https://github.com/Topener.png" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https://github.com/phobeous.png" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https://github.com/de1mat.png" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https://github.com/dlewis23.png" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https://github.com/dethier1958.png" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https://github.com/zenjoe.png" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https://github.com/desarrollogotit.png" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https://github.com/Astrovic.png" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https://github.com/Arood.png" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https://github.com/Rearmachine.png" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https://github.com/alexlarocca.png" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https://github.com/reshopper.png" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https://github.com/safadig.png" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https://github.com/designbymind.png" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https://github.com/greatschism.png" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https://github.com/enzoq.png" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https://github.com/mighty-office.png" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https://github.com/Fruugul.png" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https://github.com/korelogic.png" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https://github.com/eddyinet.png" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https://github.com/gouldjw.png" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https://github.com/Yackens.png" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;7c5bd52413a071a9d5f6c9f8c0dab6c299e62f15&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;58727874?v&#x3D;4" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
 
 ## Features
 

From d98f6a6fbf5d6406ceb20492ba89410400b6a95c Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:02:24 +0200
Subject: [PATCH 22/55] docs: add responseDictionary to HTTPClient
 documentation (#14101)

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 apidoc/Titanium/Network/HTTPClient.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apidoc/Titanium/Network/HTTPClient.yml b/apidoc/Titanium/Network/HTTPClient.yml
index 21f72dc2e05..d758baa8a6c 100644
--- a/apidoc/Titanium/Network/HTTPClient.yml
+++ b/apidoc/Titanium/Network/HTTPClient.yml
@@ -493,6 +493,13 @@ properties:
     type: String
     permission: read-only
 
+  - name: responseDictionary
+    summary: Response as JSON object.
+    description: Set to `null` if the content type returned by the server was not a JSON or if the content could
+        not be parsed.
+    type: String
+    permission: read-only
+
   - name: responseXML
     summary: Response object as an XML DOM Document object.
     description:

From 3db8223a9052dc607ca9c435b8532370207056d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Tue, 10 Sep 2024 15:52:13 +0200
Subject: [PATCH 23/55] Revert "fix(ios): fix unbalanced view controller
 transitions causing issues on iOS 16+ (#13586)"

This reverts commit 50814d717910f5b42b6f61972b30f8d10f85a268.
---
 iphone/Classes/TiUINavigationWindowProxy.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/iphone/Classes/TiUINavigationWindowProxy.m b/iphone/Classes/TiUINavigationWindowProxy.m
index d6f2f9ac4c2..1c47611fb7b 100644
--- a/iphone/Classes/TiUINavigationWindowProxy.m
+++ b/iphone/Classes/TiUINavigationWindowProxy.m
@@ -393,14 +393,14 @@ - (void)viewWillAppear:(BOOL)animated
     UIViewController *parentController = [self windowHoldingController];
     [parentController addChildViewController:navController];
     [navController didMoveToParentViewController:parentController];
-    [navController beginAppearanceTransition:YES animated:animated];
+    [navController viewWillAppear:animated];
   }
   [super viewWillAppear:animated];
 }
 - (void)viewWillDisappear:(BOOL)animated
 {
   if ([self viewAttached]) {
-    [navController endAppearanceTransition];
+    [navController viewWillDisappear:animated];
   }
   [super viewWillDisappear:animated];
 }
@@ -408,14 +408,14 @@ - (void)viewWillDisappear:(BOOL)animated
 - (void)viewDidAppear:(BOOL)animated
 {
   if ([self viewAttached]) {
-    [navController beginAppearanceTransition:YES animated:animated];
+    [navController viewDidAppear:animated];
   }
   [super viewDidAppear:animated];
 }
 - (void)viewDidDisappear:(BOOL)animated
 {
   if ([self viewAttached]) {
-    [navController endAppearanceTransition];
+    [navController viewDidDisappear:animated];
   }
   [super viewDidDisappear:animated];
 }

From f3676e19e1eacadba532010f511f6123efc0f244 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:29:09 +0200
Subject: [PATCH 24/55] chore: update gradle files (#13888)

---
 android/app/build.gradle                      |  8 +--
 android/build.gradle                          |  2 +-
 android/kroll-apt/build.gradle                |  8 +--
 android/templates/build/root.build.gradle     |  2 +-
 .../templates/module/generated/build.gradle   |  2 +-
 android/titanium/build.gradle                 | 18 ++---
 android/untar.gradle                          | 72 +++++++++----------
 7 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f9ee6f9cdb1..d2ac439bee8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,17 +39,17 @@ android {
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
 // Customize all the Checkstyle tasks
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
 	// Specify all files that should be checked
 	classpath = files()
 	source android.sourceSets.main.java.srcDirs
 }
 // Execute Checkstyle on all files
-task checkJavaStyle(type: Checkstyle) {
+tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
 // Execute Checkstyle on all modified files
-task checkstyleChanged(type: Checkstyle) {
+tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
@@ -73,7 +73,7 @@ def getChangedFiles() {
 	files
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	dependsOn checkJavaStyle
 }
 
diff --git a/android/build.gradle b/android/build.gradle
index 319eec9c71a..325c0af0c32 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -39,6 +39,6 @@ allprojects {
 	project.apply from: "${rootDir}/templates/build/ti.constants.gradle"
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
 	delete rootProject.buildDir
 }
diff --git a/android/kroll-apt/build.gradle b/android/kroll-apt/build.gradle
index 8f5d9d6ddc6..addda9dcd4f 100644
--- a/android/kroll-apt/build.gradle
+++ b/android/kroll-apt/build.gradle
@@ -13,16 +13,16 @@ targetCompatibility = JavaVersion.VERSION_11
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
 // Customize all the Checkstyle tasks
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
 	// Specify all files that should be checked
 	classpath = files()
 	source 'src/main/java'
 }
 // Execute Checkstyle on all files
-task checkJavaStyle(type: Checkstyle) {
+tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
-task checkstyleChanged(type: Checkstyle) {
+tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
@@ -47,7 +47,7 @@ def getChangedFiles() {
 }
 
 // Hook into Java compile task.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	// Check Java code for mistakes before compiling.
 	dependsOn checkJavaStyle
 
diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle
index 8df90e3f35f..c8b563a07cc 100644
--- a/android/templates/build/root.build.gradle
+++ b/android/templates/build/root.build.gradle
@@ -21,6 +21,6 @@ allprojects {
 	project.apply from: "${rootDir}/ti.constants.gradle"
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
 	delete rootProject.buildDir
 }
diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
index 83bb889a7ba..35106af223b 100644
--- a/android/templates/module/generated/build.gradle
+++ b/android/templates/module/generated/build.gradle
@@ -164,7 +164,7 @@ project.afterEvaluate {
 }
 
 // Hook into Java compile task.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	// Log all Java linting errors/warnings.
 	options.compilerArgs << "-Xlint:all"
 
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index 160a9417a4d..2e78280442e 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -125,7 +125,7 @@ android {
 }
 
 // Downloads/extracts V8 library and creates a cmake file for it. To be executed before C/C++ "build" or "clean".
-task updateV8Library() {
+tasks.register('updateV8Library') {
 	def packageJson = new JsonSlurper().parse(file("${projectDir}/../package.json"))
 	def v8MakeFilePath = "${projectDir}/../runtime/v8/src/ndk-modules/libv8/V8Settings.cmake"
 	inputs.property 'v8.version', packageJson.v8.version
@@ -139,8 +139,8 @@ task updateV8Library() {
 		def v8MakeFile = file(v8MakeFilePath)
 		v8MakeFile.getParentFile().mkdirs()
 		v8MakeFile.text = [
-			"set(LIBV8_VERSION \"${packageJson.v8.version}\")",
-			"set(LIBV8_MODE \"${packageJson.v8.mode}\")"
+				"set(LIBV8_VERSION \"${packageJson.v8.version}\")",
+				"set(LIBV8_MODE \"${packageJson.v8.mode}\")"
 		].join('\n') + '\n'
 
 		// Download/install the V8 library referenced in our "package.json", if not already done.
@@ -152,24 +152,24 @@ task updateV8Library() {
 	}
 }
 preBuild.dependsOn updateV8Library
-tasks.withType(ExternalNativeCleanTask) {
+tasks.withType(ExternalNativeCleanTask).configureEach {
 	dependsOn updateV8Library
 }
 
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
 // Customize all the Checkstyle tasks
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
 	// Specify all files that should be checked
 	classpath = files()
 	source android.sourceSets.main.java.srcDirs
 }
 // Execute Checkstyle on all files
-task checkJavaStyle(type: Checkstyle) {
+tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
 // Execute Checkstyle on all modified files
-task checkstyleChanged(type: Checkstyle) {
+tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
@@ -196,7 +196,7 @@ def getChangedFiles() {
 // Performs a transpile/polyfill/rollup of our "titanium_mobile/common/Resources" directory tree's JS files,
 // takes a V8 snapshot of rolled-up files, and then generates a C++ header file of that snapshot to be compiled-in.
 // Note: This supports incremental builds. Only executes when JS files change or snapshot output file is missing.
-task snapshotTiCommonFiles() {
+tasks.register('snapshotTiCommonFiles') {
 	inputs.dir "${projectDir}/../../common/Resources"
 	inputs.file "${projectDir}/../../build/lib/builder.js"
 	inputs.file "${projectDir}/../../build/lib/android/index.js"
@@ -221,7 +221,7 @@ project.afterEvaluate {
 
 // Runs our "prebuild.js" script before the C/C++ compile, but after Java compile. (Mid-build script?)
 // Generates C/C++ files providing our Android-only JS files via byte arrays.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	dependsOn checkJavaStyle
 	dependsOn snapshotTiCommonFiles
 	doLast {
diff --git a/android/untar.gradle b/android/untar.gradle
index c8073c36141..145bb23b4eb 100644
--- a/android/untar.gradle
+++ b/android/untar.gradle
@@ -1,36 +1,36 @@
-/**
- * Titanium SDK
- * Copyright TiDev, Inc. 04/07/2022-Present
- * Licensed under the terms of the Apache Public License.
- * Please see the LICENSE included with this distribution for details.
- */
-
-// Extracts a "*.tar" file using the same parameters as the ant <untar/> task.
-// Used by our prebuild step to extract our "libv8-*.tar.bz2" file.
-task untar() {
-	// Throw an error if required gradle property has not been set.
-	if (!project.hasProperty('src')) {
-		throw new InvalidUserDataException('You must set a "src" property.')
-	}
-
-	// Assign a default value to any unassigned properties.
-	if (!project.hasProperty('compression')) {
-		project.ext.compression = 'none'
-	}
-	if (!project.hasProperty('overwrite')) {
-		project.ext.overwrite = 'true'
-	}
-	if (!project.hasProperty('dest')) {
-		def sourceFile = new File(src)
-		project.ext.dest = sourceFile.getParentFile().getPath()
-	}
-
-	// Use "ant" to extract the given tarball.
-	ant.untar(
-		compression: project.properties.compression,
-		overwrite: project.properties.overwrite,
-		src: project.properties.src,
-		dest: project.properties.dest)
-}
-
-defaultTasks 'untar'
+/**
+ * Titanium SDK
+ * Copyright TiDev, Inc. 04/07/2022-Present
+ * Licensed under the terms of the Apache Public License.
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+// Extracts a "*.tar" file using the same parameters as the ant <untar/> task.
+// Used by our prebuild step to extract our "libv8-*.tar.bz2" file.
+tasks.register('untar') {
+	// Throw an error if required gradle property has not been set.
+	if (!project.hasProperty('src')) {
+		throw new InvalidUserDataException('You must set a "src" property.')
+	}
+
+	// Assign a default value to any unassigned properties.
+	if (!project.hasProperty('compression')) {
+		project.ext.compression = 'none'
+	}
+	if (!project.hasProperty('overwrite')) {
+		project.ext.overwrite = 'true'
+	}
+	if (!project.hasProperty('dest')) {
+		def sourceFile = new File(src)
+		project.ext.dest = sourceFile.getParentFile().getPath()
+	}
+
+	// Use "ant" to extract the given tarball.
+	ant.untar(
+			compression: project.properties.compression,
+			overwrite: project.properties.overwrite,
+			src: project.properties.src,
+			dest: project.properties.dest)
+}
+
+defaultTasks 'untar'
\ No newline at end of file

From 78bf085340df90c3b10196cbef8bbec2cd8cbfa4 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Sat, 14 Sep 2024 00:33:02 +0200
Subject: [PATCH 25/55] feat(android): statusBarColor for Window (#14089)

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 .../ti/modules/titanium/ui/WindowProxy.java    | 18 +++++++++++++++++-
 .../java/org/appcelerator/titanium/TiC.java    |  1 +
 apidoc/Titanium/UI/Window.yml                  |  6 ++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
index 73dbe8f5f67..43d68e76c01 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
+++ b/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.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
index c7da4f79aa8..040d9a003fd 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/TiC.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -305,6 +305,7 @@ public class TiC
 	public static final String PROPERTY_TOUCH_FEEDBACK_COLOR = "touchFeedbackColor";
 	public static final String PROPERTY_TRANSITION_NAME = "transitionName";
 	public static final String PROPERTY_BAR_COLOR = "barColor";
+	public static final String PROPERTY_STATUS_BAR_COLOR = "statusBarColor";
 	public static final String PROPERTY_BASE_URL = "baseUrl";
 	public static final String PROPERTY_BASE_URL_WEBVIEW = "baseURL";
 	public static final String PROPERTY_BIG_TEXT = "bigText";
diff --git a/apidoc/Titanium/UI/Window.yml b/apidoc/Titanium/UI/Window.yml
index bbc3aef2a6f..9ebae2d4a9a 100644
--- a/apidoc/Titanium/UI/Window.yml
+++ b/apidoc/Titanium/UI/Window.yml
@@ -1353,6 +1353,12 @@ properties:
     platforms: [iphone, ipad, macos]
     since: {iphone: "3.1.3", ipad: "3.1.3", macos: "9.2.0"}
 
+  - name: statusBarColor
+    summary: The color of the status bar (top bar) for this window.
+    type: [Number]
+    platforms: [android]
+    since: {android: "12.5.0"}
+
   - name: sustainedPerformanceMode
     summary: Maintain a sustainable level of performance.
     description: |

From 4c1c067206f56d0c5862a2e9faf099dd417dbd3e Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Sat, 14 Sep 2024 18:01:14 +0200
Subject: [PATCH 26/55] chore(android): forward --sdk in module build process
 (#14112)

* chore(android): forward --sdk in module build process

* optimize code
---
 android/cli/commands/_buildModule.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
index 30e6f003cf5..1fdf5c78767 100644
--- a/android/cli/commands/_buildModule.js
+++ b/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);

From fac2c4b82f39b0d12ee2c42ace4bf6567f52b3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <hansemannn@users.noreply.github.com>
Date: Sat, 14 Sep 2024 18:06:13 +0200
Subject: [PATCH 27/55] fix(android): textfield padding (#13513)

* Revert "Revert "fix(android): textfield padding (#13279)" (#13512)"

This reverts commit 918388a75a98c3f5458d27f6ed035f11883b303e.

* fix(android): fix input value

* reset padding

---------

Co-authored-by: m1ga <migamiga@web.de>
Co-authored-by: Michael Gangolf <m1ga@users.noreply.github.com>
---
 .../modules/titanium/ui/widget/TiUIText.java  |  56 ++++++++++++------
 .../snapshots/textfieldPadding@2.75x.png      | Bin 0 -> 3469 bytes
 tests/Resources/ti.ui.textfield.test.js       |  37 ++++++++++++
 3 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 tests/Resources/android/snapshots/textfieldPadding@2.75x.png

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
index 0af9c82ac5d..da19265a5b2 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
@@ -67,6 +67,7 @@ public class TiUIText extends TiUIView implements TextWatcher, OnEditorActionLis
 	private int viewHeightInLines;
 	private int maxLines = Integer.MAX_VALUE;
 	private int hintTextPadding;
+	private HashMap<String, Object> defaultPadding = new HashMap<String, Object>();
 	private InputFilterHandler inputFilterHandler;
 
 	protected TiUIEditText tv;
@@ -159,6 +160,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event)
 		textInputLayout.addView(this.tv, new TextInputLayout.LayoutParams(
 			TextInputLayout.LayoutParams.MATCH_PARENT, TextInputLayout.LayoutParams.MATCH_PARENT));
 
+		// store default padding
+		this.defaultPadding.put(TiC.PROPERTY_TOP, this.tv.getPaddingTop());
+		this.defaultPadding.put(TiC.PROPERTY_RIGHT, this.tv.getPaddingRight());
+		this.defaultPadding.put(TiC.PROPERTY_BOTTOM, this.tv.getPaddingBottom());
+		this.defaultPadding.put(TiC.PROPERTY_LEFT, this.tv.getPaddingLeft());
 		setNativeView(textInputLayout);
 	}
 
@@ -326,28 +332,39 @@ private void updateTextField()
 
 	private void setTextPadding(HashMap<String, Object> d)
 	{
-		int paddingLeft = textInputLayout.getPaddingLeft();
-		int paddingRight = textInputLayout.getPaddingRight();
-		int paddingTop = textInputLayout.getPaddingTop();
-		int paddingBottom = textInputLayout.getPaddingBottom();
-
-		if (d.containsKey(TiC.PROPERTY_LEFT)) {
-			paddingLeft = TiConvert.toInt(d.get(TiC.PROPERTY_LEFT), 0);
-		}
+		int paddingLeft = tv.getPaddingLeft();
+		int paddingRight = tv.getPaddingRight();
+		int paddingTop = tv.getPaddingTop();
+		int paddingBottom = tv.getPaddingBottom();
+
+		if (d == null) {
+			// reset to default padding
+			paddingLeft = (int) this.defaultPadding.get(TiC.PROPERTY_LEFT);
+			paddingRight = (int) this.defaultPadding.get(TiC.PROPERTY_RIGHT);
+			paddingTop = (int) this.defaultPadding.get(TiC.PROPERTY_TOP);
+			paddingBottom = (int) this.defaultPadding.get(TiC.PROPERTY_BOTTOM);
+		} else {
+			if (d.containsKey(TiC.PROPERTY_LEFT)) {
+				paddingLeft = (int) TiConvert.toTiDimension(TiConvert.toInt(d.get(TiC.PROPERTY_LEFT), 0),
+					TiDimension.TYPE_LEFT).getAsPixels(textInputLayout);
+			}
 
-		if (d.containsKey(TiC.PROPERTY_RIGHT)) {
-			paddingRight = TiConvert.toInt(d.get(TiC.PROPERTY_RIGHT), 0);
-		}
+			if (d.containsKey(TiC.PROPERTY_RIGHT)) {
+				paddingRight = (int) TiConvert.toTiDimension(TiConvert.toInt(d.get(TiC.PROPERTY_RIGHT), 0),
+					TiDimension.TYPE_RIGHT).getAsPixels(textInputLayout);
+			}
 
-		if (d.containsKey(TiC.PROPERTY_TOP)) {
-			paddingTop = TiConvert.toInt(d.get(TiC.PROPERTY_TOP), 0);
-		}
+			if (d.containsKey(TiC.PROPERTY_TOP)) {
+				paddingTop = (int) TiConvert.toTiDimension(TiConvert.toInt(d.get(TiC.PROPERTY_TOP), 0),
+					TiDimension.TYPE_TOP).getAsPixels(textInputLayout);
+			}
 
-		if (d.containsKey(TiC.PROPERTY_BOTTOM)) {
-			paddingBottom = TiConvert.toInt(d.get(TiC.PROPERTY_BOTTOM), 0);
+			if (d.containsKey(TiC.PROPERTY_BOTTOM)) {
+				paddingBottom = (int) TiConvert.toTiDimension(TiConvert.toInt(d.get(TiC.PROPERTY_BOTTOM), 0),
+					TiDimension.TYPE_BOTTOM).getAsPixels(textInputLayout);
+			}
 		}
-
-		textInputLayout.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
+		tv.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
 	}
 
 	@Override
@@ -984,6 +1001,9 @@ public void setHintText(int type, CharSequence hintText)
 			this.textInputLayout.setHintEnabled(true);
 		}
 
+		this.defaultPadding.put(TiC.PROPERTY_TOP, (type == UIModule.HINT_TYPE_ANIMATED)
+			? this.hintTextPadding : this.defaultPadding.get(TiC.PROPERTY_BOTTOM));
+
 		this.tv.setPadding(
 			this.tv.getPaddingLeft(),
 			(type == UIModule.HINT_TYPE_ANIMATED) ? this.hintTextPadding : this.tv.getPaddingBottom(),
diff --git a/tests/Resources/android/snapshots/textfieldPadding@2.75x.png b/tests/Resources/android/snapshots/textfieldPadding@2.75x.png
new file mode 100644
index 0000000000000000000000000000000000000000..86e7eb32cc3a95839e6b3f63f17939893bc7deaa
GIT binary patch
literal 3469
zcmd6q`9D<u7ssasE#F8=iYTIFifol_%D!bOOBqWHvW3VtwhCFYlwD&8*}lU}6NWLC
zBI__Um|@1go5o0%@fq8EZ~wvf$It!YKJI-#-uIsKKIgojuk%i{Ff%xD?EEnh2z0{8
zQ1<}{bU+Ar_C3N2+z-2K{e3wQ_`pCLgeHkG{*DD|8(AFzu81S93BX6UjCAi=h32!y
zqD_a~#Q0W!oEtgnkn>9LfQed%%g1-==X(v^9+x$Em8c}%sln}EjJLSK^|B-7k|+|@
zZb?31Ap=1uLYSxRy~Fv-hj`4LXXA_gPfmRcf)wogkA<%6Xs(2BeBGPcqx-INCe}43
z7pF;Ek<lm-STYE-Umn&X4!Fb@dlYo!mBIngrIRwCi-+3|gJSRIf?l3HA_O{l(D@)p
z`=Tl6?va1XB#5<>llir*UJjiQg2BWeR*?RGJWDv~B=8j)vNBfm<_)ixpI`a6Z}&bx
zqP4Eu)h5_fJ-UaosV?R@E^JEh>lCT0t^GMq%&Ej+(%!szV~C;*z|u7JWo2bE^YcwF
zUE*@hsS^`st=xU}O*VUAY3Zt-zJ9t{dC6j7bb+Ll6gPxhV2=-o6XWL-6pV|Dv((mp
zz21z)-W*_V4pFK4^?s9OVe1Q)R#vA=%gP?u*?s8ZjIx5ge0_tnb+omw%E}s%8<O><
zQc_dZh$h+KqIhw*2X%2OmF6Q8^X=|1#;KeT^82q{&9!c+(`U~b$l0Plm73(F8<&2t
znY{OkN2JcKKf#b)I>;EQd{~~_KE3*1b3}h9DgRD;dV2a8Ta(O96uOez;gUxkfkL4)
zqI~Nzj{Ebc1)FRjf!*Javaz-8YPPkoP^b>-O-xAeXA{EK-8)5Kv$M0yZ{=H_ycND4
zpx!bxWEH%>%aPp?KX-1L4u;}P|1<;y2I6rkDJfccF>)C_-`T$>e+b{OzdgSNTVLp}
zLZeBjmKdY2aXnTN3*S){6^740=9<c6Bazh=lZm$a`n*gQYtw5iD=X_EZxQqC{#;K+
z%_$iMgVE=zh^?vucdSE#er1lfL<-6jFDlTSqW3z4<sFwPTeGXv?T*}!JTWgv`^jE)
znORwSWHQ-R6~S1WCk_n_eW%FYxKTzy*$#SRnpNGLVq#)8wwahgOzVE{b#r6m;^gH2
zBqb+b&gjvFHy4~26-EAbYVd!B^Py>5TU(zN5}JM9r=p^gnUSFb1YvA#ZqC)%$f#&_
z)&JMh(nmVo?!1IVd1t3S9UoZU6{WYtU=-!&i*0ij3lkFzOUOSvQ$zs=Qdh<ai(?MC
z%i|%FrHcjOsRdEnjK}9nt|+O*Q>ixe#vr-PjSYXIQ^X%V;P;p6?C#h5ju#h3Z6`Jo
z2*}^j|4he!dQe#b1a1m^=p|;b52~Z1V^5p*SBUxcbzpE1?-XBKtL$DwD_i#7S{b)T
zNSkDT4qPM|(eH@y+d!dmv=emPGtnBmYVj_D4^0v6U~GI0g+jrC2}o4<4*OZ~>eM}&
z6CsbTn76AIx_VJ5&(z+5FiyHACnrtd*VEJc61n3-)ZGvhf%UmyKW{RJ12>)E3~4Hr
zDpTpLilAX(U6)~=9v&7NTTf2<JI|Q;`C(iO+4MSZU#6|K_46PY3`R>4y;Wv!U~Vp8
zVrV!;zW|Af=v9pukjUO${KaG<zVy>-o<3DE)z;CW<taTa^Lc1#`K>N7EiGp}bIUq6
zA^#98IdX4v*nT{SNi~Y<w#To0aCdVHD|m78=m!PoWbEtL2UprP!r4_mn(^)56qS_l
zjc3lBNuvH4^=mc4xp#JUx-wJK(oER(KalF>9-2FB7NSmpvoUC{iNo4egH=_ty@x3j
z>B>cvg5VuK6s7l+kPseji*ei>X>Ff=f@xYiHoUUE$rK;udHb=E<jPr_x90%4{jzz(
zp-~s86VloT6>pDG+_NO=`@B3OXuWSxc8b0f5)$o*^VQKg6cik+M)V#=m)=LH%G&+N
zz79Q25pw=fpefFbjg7T{!`146ititK*CZ3b4-}*w6pEa`pdNfxO$*5XReAX|=mK0r
zK9^_gz(}P>ogG?3Ljw%O6cxRaTb!RK9}>{`7^;cK<E^Z%=fS{Idft%dVsN^;eocRP
z`w@%Loazm_*s%8#z~@^+?RmoQ0~<pBNZL-cL=tA6e*&oF>x-@d&oq9zD`=$@bmB0g
zUk3U^#gvM6U{c^V7{~ssD<sK=fD;+kD4Vc4@#xv@t-4W`*7=?d*}NF<+^fw?sR@SV
zgO;A2j1AtiQ@g*P1_;;I*9W>G%@(b98X9gV0aVEb*y9%Cy~fa%Ebe%FHoQ)J6<{7e
zx@v9%(nnTc{Q4EJuMP(Hv7|>=Dy*(0rKAL9SKG+#t^a_e!vT~}_X<FEKj%pCIOXn2
zeY8QzYG{nbmmC!fykRN=Q&v!z0u#iaS{j#-{pX{(d$td{Hgo%TIqT(hH*y^^S|z5Z
zrvrDQMCJSN3YL{tWA5J3(U6;+O)FiS;Fn{V;kLNr_%F;epQj3Cq9MGzya(4t-u<0>
zNfJJjcqN~Uv#VCVeS66|93U&}S|!D+C;ONnc{U9~%9;<3`^wcdFbJIQ2~ms*4^%X@
z#~3`<yvXe7N8Ivsb^ZR>vBo`Rxoq{Jxn@U}-&n&m1%A*{VfmECdY_U#ZSy6#8<F8W
z1HTr!#^YlQXhy(%U!N%r4sd?17v4O9+B{s$ClT>ZjzFMx72*rFTLb2kW^nE8?N$yB
ztcY_d`sDU?C}37mQL$m|)?|c^d(C4@D578gidp_t_Op@C_i$)t&X=mHWU%nt;?1ko
zi+<YL+708eK%vS`++WRs88e45i@l|#rAcWhho;c?s?X?i5qp2SB$RIIwkls~cV!He
zZY&`D)QI{e?^7ip=n58NupIyP0{|iE91n9tGqVMp9on(kcrtPe*%kB%EUflo>0R-k
ze@XyAp?9|?qr-h*3L+IvO%Y{p=CT029RwJOod5O9tA|=4)+v&endwg~h-5#Wo?W*E
z){>BL?D%n6W#vpc?ix}4A?~Kge>Nt<e?KPz8uOcdDlE%bkHg`NebEeO8={kuJ`oZ5
zzz3C$jr76OyV>3i;&%dc*+ZPzg#~v2M#H88L^(j5?ZXyH$gxNpv<Peifc0SgWE9gL
z(4*^j_7$gpK)9a<1|Br}Pq)>QWVWT9Cfu&l(;)lZ<5*75l|s|Utql#20#MvnhxkT-
z%;MqW<KxRq<dXC&rOn*^9r3O?|Jx%dOiORwpojAE2o_dVQ<Fhs1up=@U%!G-RaLH{
zsy^=`&ALn{RI03^qO^ud<5I^k4g{HVTsCVo@7oi9Ev{Q=XfA*hEMPd-v(AooCp>WY
z^U@uK&Jn0za|eaOcv02Vlz&1%K%F_l3Z?>Dx3;!+xez;6V=e-#0&<Lk+S^x!?(X}T
z#V1m{vLf&@j#w-ftf`6Y=;|W26lP?!>l+xHNkI_^qpWo|idWrojh=%<pOB$*n+Pm?
zYb6Wm_vlgXD4!@^OZ@Aw^T6b!JVz{H1)?skqLNh&txxUv{=J)o1w#F-6`huooS1kt
zsY`=I8y73y;X9rtu4x?4e_<v#EMdjzLG>`x&HT9V>C+ZQMu{`TDwvDQQoKaeJ28`s
zjjhmGIMT$?Q5>liNq?L7PvIdx{-3EA)GrhJ-IYS(7_pd^?WEw}6Pltr55ba>uX~9^
z>5vo9Y8x*fpHJJ{@E)lP85tRsWo4bLdts94V=YA#ub7$4?R<Wr;+>H9E2H&k9}oyx
z2&AyMxY(5m1QWi)ss}3B<i%XK-~$xJvDyHD*8Te@BH6U3zJB0{>A15MU%sT96=)b)
zT3V*RJbwAOF!*D7`YAvUOU}sIbW_P5%C+9ZH@rMOi$W&C;@jHV+`}>p0HL(h)8mQc
z?rmivku02}i;H9=XFkWu$w_{v<R%T+y;B;qrDTr^pn{fiBlS8SeHPmjY<Iz0K%t_W
zTU&!af1dPIJ`c1cpJHPVJKu_U46G8c(bA#?G$$nn5|NoRv$H@;VP?qPe{)kG*oA89
z>YhNUw6(X(0<i%U>(Gi!BhbwKZBSmlI-rQ?|3vX(0CjsAfG~yH(cOI{C@9GC#f#cG
r+}pcxfBXN1U0;4s!oUA0@Q=Vi)757U%!X#*NCh&|Gt)(DKY9H>D*3T>

literal 0
HcmV?d00001

diff --git a/tests/Resources/ti.ui.textfield.test.js b/tests/Resources/ti.ui.textfield.test.js
index 30bee55770d..7d33e739b92 100644
--- a/tests/Resources/ti.ui.textfield.test.js
+++ b/tests/Resources/ti.ui.textfield.test.js
@@ -144,6 +144,43 @@ describe('Titanium.UI.TextField', () => {
 			win.open();
 		});
 
+		it.android('android padding (visual check)', function (finish) {
+			this.timeout(5000);
+			const textField = Ti.UI.createTextField({
+				value: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec nec ullamcorper massa, eget tempor sapien. Phasellus nisi metus, tempus a magna nec, ultricies rutrum lacus. Aliquam sit amet augue suscipit, dignissim tellus eu, consectetur elit. Praesent ligula velit, blandit vel urna sit amet, suscipit euismod nunc.',
+				width: 100,
+				height: 40,
+				backgroundColor: 'white',
+				color: 'black',
+				padding: {
+					top: 10,
+					bottom: 10
+				}
+			});
+			const bgView = Ti.UI.createView({
+				width: 200,
+				height: 100,
+				backgroundColor: 'red'
+			});
+			win = Ti.UI.createWindow({
+				backgroundColor: '#eee'
+			});
+			bgView.add(textField);
+			win.add(bgView);
+
+			win.addEventListener('postlayout', function postlayout() { // FIXME: Support once!
+				win.removeEventListener('postlayout', postlayout); // only run once
+				try {
+					should(textField).matchImage('snapshots/textfieldPadding.png');
+				} catch (err) {
+					return finish(err);
+				}
+				finish();
+			});
+
+			win.open();
+		});
+
 		describe('.hintText', () => {
 			let textField;
 			beforeEach(() => {

From d1c05edf9efa759e5f0186dcca2f12b3a5979f71 Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Mon, 16 Sep 2024 00:07:09 +0000
Subject: [PATCH 28/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f2ce0db7e75..91ae530b24d 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;7c5bd52413a071a9d5f6c9f8c0dab6c299e62f15&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><a href="https://github.com/Yackens"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;58727874?v&#x3D;4" width="60px" alt="Joaquin Maroto" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;7c5bd52413a071a9d5f6c9f8c0dab6c299e62f15&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><!-- sponsors -->
 
 ## Features
 

From 7e5f1ade3bd9cdd1cd8159f069b9cce76dcc6592 Mon Sep 17 00:00:00 2001
From: Abdullah Al-Faqeir <abdullah.alfaqeir@gmail.com>
Date: Mon, 16 Sep 2024 12:00:23 +0300
Subject: [PATCH 29/55] fix(ios): pause returns false (#14114)

---
 iphone/Classes/TiMediaAudioPlayerProxy.m | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/iphone/Classes/TiMediaAudioPlayerProxy.m b/iphone/Classes/TiMediaAudioPlayerProxy.m
index 59e47ad36a9..12941a0c393 100644
--- a/iphone/Classes/TiMediaAudioPlayerProxy.m
+++ b/iphone/Classes/TiMediaAudioPlayerProxy.m
@@ -472,11 +472,7 @@ - (void)handleTimeControlStatusNotification:(NSNotification *)note
   if (_player.timeControlStatus == AVPlayerTimeControlStatusPlaying) {
     _state = TiAudioPlayerStatePlaying;
   } else if (_player.timeControlStatus == AVPlayerTimeControlStatusPaused) {
-    if (_player.currentItem.currentTime.value == 0.0 || oldState == TiAudioPlayerStateStopping) {
-      _state = TiAudioPlayerStateStopped;
-    } else {
-      _state = TiAudioPlayerStatePaused;
-    }
+    _state = TiAudioPlayerStatePaused;
   } else if (_player.timeControlStatus == AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate) {
     _state = TiAudioPlayerStateWaitingForQueueToStart;
   }

From cd0b55fd4a7263b96f31918f229cf3f1b6de0aa0 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:02:01 +0200
Subject: [PATCH 30/55] docs: update NotificationChannel example (#14107)

---
 apidoc/Titanium/Android/NotificationChannel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apidoc/Titanium/Android/NotificationChannel.yml b/apidoc/Titanium/Android/NotificationChannel.yml
index aeda2e4bfde..d108242eda1 100644
--- a/apidoc/Titanium/Android/NotificationChannel.yml
+++ b/apidoc/Titanium/Android/NotificationChannel.yml
@@ -25,7 +25,7 @@ examples:
                 icon: Ti.Android.R.drawable.ic_dialog_info,
                 contentTitle: 'TITLE',
                 contentText : 'This is a test',
-                channelId: channel.getId()
+                channelId: channel.id
             });
 
         Ti.Android.NotificationManager.notify(100, notification);

From 5baf6a1840c134c785f28bd224c1466757059cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <hansemannn@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:02:20 +0200
Subject: [PATCH 31/55] =?UTF-8?q?feat(ios):=20add=20=E2=80=9CinteractiveDi?=
 =?UTF-8?q?smissModeEnabled=E2=80=9D=20API=20(#14103)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(ios): add “interactiveDismissModeEnabled” API

* chore: add docs
---
 apidoc/Titanium/UI/NavigationWindow.yml    | 10 ++++++
 apidoc/Titanium/UI/TabGroup.yml            | 10 ++++++
 iphone/Classes/TiUINavigationWindowProxy.h |  2 ++
 iphone/Classes/TiUINavigationWindowProxy.m | 38 ++++++++++++++++++++++
 iphone/Classes/TiUITabProxy.h              |  2 ++
 iphone/Classes/TiUITabProxy.m              | 38 ++++++++++++++++++++++
 6 files changed, 100 insertions(+)

diff --git a/apidoc/Titanium/UI/NavigationWindow.yml b/apidoc/Titanium/UI/NavigationWindow.yml
index b173599898e..83e9098e85d 100644
--- a/apidoc/Titanium/UI/NavigationWindow.yml
+++ b/apidoc/Titanium/UI/NavigationWindow.yml
@@ -31,6 +31,16 @@ properties:
     availability: creation
     optional: false
 
+  - name: interactiveDismissModeEnabled
+    summary: |
+        A boolean indicating whether or not child windows of this navigation window
+        should have the ability to be swipe-to-closed over the full width of it's window or not.
+    type: Boolean
+    default: false
+    platforms: [iphone, ipad, macos]
+    since: "12.5.0"
+    availability: creation
+
 methods:
   - name: closeWindow
     summary: Closes a window and removes it from the navigation window.
diff --git a/apidoc/Titanium/UI/TabGroup.yml b/apidoc/Titanium/UI/TabGroup.yml
index c789b8a7624..66cbf4c1d4b 100644
--- a/apidoc/Titanium/UI/TabGroup.yml
+++ b/apidoc/Titanium/UI/TabGroup.yml
@@ -609,6 +609,16 @@ properties:
     platforms: [android, iphone, ipad, macos]
     since: "12.1.0"
 
+  - name: interactiveDismissModeEnabled
+    summary: |
+        A boolean indicating whether or not child windows of this tab group
+        should have the ability to be swipe-to-closed over the full width of it's window or not.
+    type: Boolean
+    default: false
+    platforms: [iphone, ipad, macos]
+    since: "12.5.0"
+    availability: creation
+
 examples:
   - title: Alloy XML Markup
     example: |
diff --git a/iphone/Classes/TiUINavigationWindowProxy.h b/iphone/Classes/TiUINavigationWindowProxy.h
index f5777d15981..f7324480351 100644
--- a/iphone/Classes/TiUINavigationWindowProxy.h
+++ b/iphone/Classes/TiUINavigationWindowProxy.h
@@ -16,6 +16,8 @@
   TiWindowProxy *current;
   BOOL transitionIsAnimating;
   BOOL transitionWithGesture;
+
+  UIPanGestureRecognizer *fullWidthBackGestureRecognizer;
 }
 
 // Private API
diff --git a/iphone/Classes/TiUINavigationWindowProxy.m b/iphone/Classes/TiUINavigationWindowProxy.m
index 1c47611fb7b..ac13e26b1c8 100644
--- a/iphone/Classes/TiUINavigationWindowProxy.m
+++ b/iphone/Classes/TiUINavigationWindowProxy.m
@@ -16,9 +16,16 @@ @implementation TiUINavigationWindowProxy
 
 - (void)_destroy
 {
+  if (fullWidthBackGestureRecognizer != nil) {
+    [fullWidthBackGestureRecognizer setDelegate:nil];
+    [navController.view removeGestureRecognizer:fullWidthBackGestureRecognizer];
+  }
+
   RELEASE_TO_NIL(rootWindow);
   RELEASE_TO_NIL(navController);
   RELEASE_TO_NIL(current);
+  RELEASE_TO_NIL(fullWidthBackGestureRecognizer);
+
   [super _destroy];
 }
 
@@ -88,14 +95,45 @@ - (UINavigationController *)controller
     [TiUtils configureController:navController withObject:self];
     [navController.interactivePopGestureRecognizer addTarget:self action:@selector(popGestureStateHandler:)];
     [[navController interactivePopGestureRecognizer] setDelegate:self];
+
+    BOOL interactiveDismissModeEnabled = [TiUtils boolValue:[self valueForKey:@"interactiveDismissModeEnabled"] def:NO];
+    if (interactiveDismissModeEnabled) {
+      [self configureFullWidthSwipeToClose];
+    }
   }
   return navController;
 }
 
+- (void)configureFullWidthSwipeToClose
+{
+  fullWidthBackGestureRecognizer = [[UIPanGestureRecognizer alloc] init];
+
+  if (navController.interactivePopGestureRecognizer == nil) {
+    return;
+  }
+
+  id targets = [navController.interactivePopGestureRecognizer valueForKey:@"targets"];
+  if (targets == nil) {
+    return;
+  }
+
+  [fullWidthBackGestureRecognizer setValue:targets forKey:@"targets"];
+  [fullWidthBackGestureRecognizer setDelegate:self];
+  [navController.view addGestureRecognizer:fullWidthBackGestureRecognizer];
+}
+
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
   BOOL isRootWindow = (current == rootWindow);
 
+  BOOL interactiveDismissModeEnabled = [TiUtils boolValue:[self valueForKey:@"interactiveDismissModeEnabled"] def:NO];
+  if (interactiveDismissModeEnabled && [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]) {
+    BOOL isSystemSwipeToCloseEnabled = navController.interactivePopGestureRecognizer.isEnabled == YES;
+    BOOL areThereStackedViewControllers = navController.viewControllers.count > 1;
+
+    return isSystemSwipeToCloseEnabled || areThereStackedViewControllers;
+  }
+
   if (current != nil && !isRootWindow) {
     return [TiUtils boolValue:[current valueForKey:@"swipeToClose"] def:YES];
   }
diff --git a/iphone/Classes/TiUITabProxy.h b/iphone/Classes/TiUITabProxy.h
index f44e5dadb20..f4ef08abe18 100644
--- a/iphone/Classes/TiUITabProxy.h
+++ b/iphone/Classes/TiUITabProxy.h
@@ -30,6 +30,8 @@
   BOOL activeIconOriginal;
 
   id<TiOrientationController> parentOrientationController;
+
+  UIPanGestureRecognizer *fullWidthBackGestureRecognizer;
 }
 
 - (void)setTabGroup:(TiUITabGroupProxy *)proxy;
diff --git a/iphone/Classes/TiUITabProxy.m b/iphone/Classes/TiUITabProxy.m
index c14e0ff3ce0..4f33b856b89 100644
--- a/iphone/Classes/TiUITabProxy.m
+++ b/iphone/Classes/TiUITabProxy.m
@@ -32,6 +32,11 @@ - (void)_destroy
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiTraitCollectionChanged object:nil];
 
+  if (fullWidthBackGestureRecognizer != nil) {
+    [fullWidthBackGestureRecognizer setDelegate:nil];
+    [controller.view removeGestureRecognizer:fullWidthBackGestureRecognizer];
+  }
+
   if (rootWindow != nil) {
     [self cleanNavStack:YES];
   }
@@ -39,6 +44,8 @@ - (void)_destroy
   RELEASE_TO_NIL(rootWindow);
   RELEASE_TO_NIL(controller);
   RELEASE_TO_NIL(current);
+  RELEASE_TO_NIL(fullWidthBackGestureRecognizer);
+
   [super _destroy];
 }
 
@@ -260,12 +267,43 @@ - (UINavigationController *)controller
     [controllerStack addObject:[self rootController]];
     [controller.interactivePopGestureRecognizer addTarget:self action:@selector(popGestureStateHandler:)];
     [[controller interactivePopGestureRecognizer] setDelegate:self];
+
+    BOOL interactiveDismissModeEnabled = [TiUtils boolValue:[tabGroup valueForKey:@"interactiveDismissModeEnabled"] def:NO];
+    if (interactiveDismissModeEnabled) {
+      [self configureFullWidthSwipeToClose];
+    }
   }
   return controller;
 }
 
+- (void)configureFullWidthSwipeToClose
+{
+  fullWidthBackGestureRecognizer = [[UIPanGestureRecognizer alloc] init];
+
+  if (controller.interactivePopGestureRecognizer == nil) {
+    return;
+  }
+
+  id targets = [controller.interactivePopGestureRecognizer valueForKey:@"targets"];
+  if (targets == nil) {
+    return;
+  }
+
+  [fullWidthBackGestureRecognizer setValue:targets forKey:@"targets"];
+  [fullWidthBackGestureRecognizer setDelegate:self];
+  [controller.view addGestureRecognizer:fullWidthBackGestureRecognizer];
+}
+
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
+  BOOL interactiveDismissModeEnabled = [TiUtils boolValue:[self valueForKey:@"interactiveDismissModeEnabled"] def:NO];
+  if (interactiveDismissModeEnabled && [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]) {
+    BOOL isSystemSwipeToCloseEnabled = controller.interactivePopGestureRecognizer.isEnabled == YES;
+    BOOL areThereStackedViewControllers = controller.viewControllers.count > 1;
+
+    return isSystemSwipeToCloseEnabled || areThereStackedViewControllers;
+  }
+
   if (current != nil) {
     return [TiUtils boolValue:[current valueForKey:@"swipeToClose"] def:YES];
   }

From 322b09bc09153c3e5adcd6570199b4d82c41f994 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:02:50 +0200
Subject: [PATCH 32/55] feat(android): more log output (#13999)

* feat(android): more log output

* remove if

* change for loop

* Update android/runtime/v8/src/native/modules/APIModule.cpp

Co-authored-by: Chris Barber <chris@cb1inc.com>

---------

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 android/runtime/v8/src/native/modules/APIModule.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/android/runtime/v8/src/native/modules/APIModule.cpp b/android/runtime/v8/src/native/modules/APIModule.cpp
index a2628327880..c460ac87dc2 100644
--- a/android/runtime/v8/src/native/modules/APIModule.cpp
+++ b/android/runtime/v8/src/native/modules/APIModule.cpp
@@ -115,7 +115,13 @@ void APIModule::logInfo(const FunctionCallbackInfo<Value>& args)
 	Isolate* isolate = args.GetIsolate();
 	HandleScope scope(isolate);
 	v8::String::Utf8Value message(isolate, APIModule::combineLogMessages(args));
-	APIModule::logInternal(LOG_LEVEL_INFO, LCAT, *message);
+
+	std::string cppStr(*message);
+
+	int maxChunk = 4050;
+	for (size_t i = 0, len = cppStr.length(); i < len; i+=maxChunk) {
+		APIModule::logInternal(LOG_LEVEL_INFO, LCAT, cppStr.substr(i , maxChunk).c_str());
+	}
 }
 
 void APIModule::logWarn(const FunctionCallbackInfo<Value>& args)

From abbd387dedeec56ce1841196bf04e92a7622e410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Mon, 16 Sep 2024 11:17:49 +0200
Subject: [PATCH 33/55] feat: add 12.5.0.GA changelog

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca98a09d798..584645fff44 100644
--- a/CHANGELOG.md
+++ b/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

From 6cc8830f874474a176cc181390e4d3c18f7b8b38 Mon Sep 17 00:00:00 2001
From: Abdullah Al-Faqeir <abdullah.alfaqeir@gmail.com>
Date: Mon, 16 Sep 2024 13:17:11 +0300
Subject: [PATCH 34/55] fix(android): ios click speed (#14115)

* fix(android): ios click speed

* fix(android): remove listener from touch end event
---
 iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
index f433f0bd01f..3f0331e6921 100644
--- a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
+++ b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
@@ -1312,6 +1312,7 @@ - (UITapGestureRecognizer *)singleTapRecognizer
 {
   if (singleTapRecognizer == nil) {
     singleTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(recognizedTap:)];
+    [singleTapRecognizer setNumberOfTapsRequired:1];
     [self configureGestureRecognizer:singleTapRecognizer];
     [self addGestureRecognizer:singleTapRecognizer];
     if (doubleTapRecognizer != nil) {
@@ -1434,6 +1435,8 @@ - (void)recognizedTap:(UITapGestureRecognizer *)recognizer
       [proxy fireEvent:@"dblclick" withObject:event propagate:YES];
     }
     [proxy fireEvent:@"doubletap" withObject:event];
+  } else if ([recognizer numberOfTapsRequired] == 1 && [proxy _hasListeners:@"click"]) {
+    [proxy fireEvent:@"click" withObject:event propagate:YES];
   } else {
     [proxy fireEvent:@"singletap" withObject:event];
   }
@@ -1609,12 +1612,7 @@ - (void)processTouchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
     // Click handling is special; don't propagate if we have a delegate,
     // but DO invoke the touch delegate.
     // clicks should also be handled by any control the view is embedded in.
-    if ([touch tapCount] == 1 && [proxy _hasListeners:@"click"]) {
-      if (touchDelegate == nil) {
-        [proxy fireEvent:@"click" withObject:evt propagate:YES];
-        return;
-      }
-    } else if ([touch tapCount] == 2 && [proxy _hasListeners:@"dblclick"]) {
+    if ([touch tapCount] == 2 && [proxy _hasListeners:@"dblclick"]) {
       [proxy fireEvent:@"dblclick" withObject:evt propagate:YES];
       return;
     }

From d084485ed0bd0c0bfcc84154ad543be4ccdd59cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Mon, 16 Sep 2024 13:38:39 +0200
Subject: [PATCH 35/55] feat: update hyperloop to 7.0.7

---
 support/module/packaged/modules.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/module/packaged/modules.json b/support/module/packaged/modules.json
index 2d69caef138..9c7bb9c9a84 100644
--- a/support/module/packaged/modules.json
+++ b/support/module/packaged/modules.json
@@ -54,8 +54,8 @@
 	"commonjs": {},
 	"hyperloop": {
 		"hyperloop": {
-			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.6/hyperloop-7.0.6.zip",
-			"integrity": "sha512-ZHmm7GINiCyrjvNMn232G1Tkby6PhwsmSxPZlPNDWH4jRn6iCpjIqX1Ha12MBedma01a4hlvARLaiUQ9j3SPow=="
+			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.7/hyperloop-7.0.7.zip",
+			"integrity": "sha512-+CF+1G1ClJZrY4VzrZMUCX37JT/tSGvnWWUXouiAtd6WLlPPvUI+Q7ytNoTm/q/g/hPwiiV6qzV9Rgm61qsXOg=="
 		}
 	}
 }

From 50d8604ea40b4c2aacb55ee1128a2706f421715c Mon Sep 17 00:00:00 2001
From: Abdullah Al-Faqeir <abdullah.alfaqeir@gmail.com>
Date: Tue, 17 Sep 2024 10:26:35 +0300
Subject: [PATCH 36/55] chore(android): gradle 8 (#14014)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(android): let there be gradle 8
chore(android): fixed deprecations in kroll-apt project
chore(android): made kroll-apt incremental to enhance build time

* fix(android): revert change to java files
fix(android): gradle 8 compatibility update to template build.gradle
fix(android): revert dependency updates
fix(android): revert minSdk and targetSdk

* fix(android): kitchensink-app not running after gradle 8
fix(android): update _build.js & _buildModule.js for new gradle

* Update android/app/build.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* Update android/templates/build/ti.constants.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* Update android/titanium/build.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* Update android/titanium/build.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* Update android/untar.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* Update android/titanium/build.gradle

Co-authored-by: Chris Barber <chris@cb1inc.com>

* fix material.r

* github action

* optimize material imports

* optimize material imports

* fix(android): fix module building

* fix(android): bump ndk version for generated modules

---------

Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>
Co-authored-by: Chris Barber <chris@cb1inc.com>
Co-authored-by: Michael Gangolf <migamiga@web.de>
Co-authored-by: Michael Gangolf <m1ga@users.noreply.github.com>
---
 .github/workflows/build.yml                   |  12 +-
 .github/workflows/release.yml                 |  10 +-
 android/.gitignore                            |   1 +
 android/.idea/codeStyles/Project.xml          |   3 +
 android/app/build.gradle                      |  14 +-
 android/build.gradle                          |   8 +-
 android/cli/commands/_build.js                |   6 +-
 android/cli/commands/_buildModule.js          |   6 -
 android/gradle.properties                     |   3 -
 .../gradle/wrapper/gradle-wrapper.properties  |   3 +-
 android/kroll-apt/build.gradle                |   7 +-
 .../generator/KrollJSONGenerator.java         |   2 +-
 .../gradle/incremental.annotation.processors  |   1 +
 .../ti/modules/titanium/ui/PickerProxy.java   |   2 +-
 .../titanium/ui/widget/TiImageView.java       |   2 +-
 .../ui/widget/TiUIActivityIndicator.java      |   2 +-
 .../titanium/ui/widget/TiUIButton.java        |   2 +-
 .../titanium/ui/widget/TiUIButtonBar.java     |   4 +-
 .../titanium/ui/widget/TiUIOptionBar.java     |  12 +-
 .../titanium/ui/widget/TiUITabbedBar.java     |   2 +-
 .../modules/titanium/ui/widget/TiUIText.java  |   2 +-
 .../widget/listview/TiRecyclerViewHolder.java |   5 +-
 .../ui/widget/searchbar/TiUISearchBar.java    |   2 +-
 .../widget/tabgroup/TiUIAbstractTabGroup.java |   2 +-
 android/settings.gradle                       |   4 +-
 android/templates/build/AndroidManifest.xml   |   1 -
 android/templates/build/app.build.gradle      |   8 +-
 android/templates/build/root.build.gradle     |   7 +-
 android/templates/build/ti.constants.gradle   |   3 +-
 .../templates/module/generated/build.gradle   |  33 ++--
 android/titanium/AndroidManifest.xml          |  27 +--
 android/titanium/build.gradle                 | 162 +++++++++++-------
 android/untar.gradle                          |  72 ++++----
 33 files changed, 238 insertions(+), 192 deletions(-)
 create mode 100644 android/kroll-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0c0afcb02d..7ee41f0c410 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,8 +21,8 @@ jobs:
       - name: Android build
         uses: ./.github/actions/build-android
         with:
-          node-version: '16.x'
-          java-version: '11'
+          node-version: '18.x'
+          java-version: '17'
 
   ios:
     runs-on: macos-13
@@ -39,7 +39,7 @@ jobs:
       - name: iOS build
         uses: ./.github/actions/build-ios
         with:
-          node-version: '16.x'
+          node-version: '18.x'
 
   js:
     runs-on: ubuntu-latest
@@ -50,10 +50,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Use Node.js 16.x
+    - name: Use Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: '16.x'
+        node-version: '18.x'
         cache: 'npm'
 
     - name: Install dependencies
@@ -84,5 +84,5 @@ jobs:
       uses: ./.github/actions/package
       with:
         node-version: '16.x'
-        java-version: '11'
+        java-version: '17'
         vtag: ${{ env.vtag }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9ab7e263666..120c547b08c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -77,8 +77,8 @@ jobs:
       - name: Android build
         uses: ./.github/actions/build-android
         with:
-          node-version: '16.x'
-          java-version: '11'
+          node-version: '18.x'
+          java-version: '17'
 
   ios:
     runs-on: macos-13
@@ -97,7 +97,7 @@ jobs:
       - name: iOS build
         uses: ./.github/actions/build-ios
         with:
-          node-version: '16.x'
+          node-version: '18.x'
 
   package:
     runs-on: macos-12
@@ -116,8 +116,8 @@ jobs:
     - name: Package
       uses: ./.github/actions/package
       with:
-        node-version: '16.x'
-        java-version: '11'
+        node-version: '18.x'
+        java-version: '17'
         vtag: ${{ env.vtag }}
 
   release:
diff --git a/android/.gitignore b/android/.gitignore
index 56cacb3ced2..b6bd8f6c33d 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -14,3 +14,4 @@ build/
 /kroll-apt/bin/
 /local.properties
 /titanium/assets/Resources/ti.internal/build.properties
+/.idea/
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
index 8d13c04b12c..36d210ea229 100644
--- a/android/.idea/codeStyles/Project.xml
+++ b/android/.idea/codeStyles/Project.xml
@@ -9,6 +9,9 @@
     <Objective-C>
       <option name="FUNCTION_BRACE_PLACEMENT" value="2" />
     </Objective-C>
+    <clangFormatSettings>
+      <option name="ENABLED" value="true" />
+    </clangFormatSettings>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d2ac439bee8..2577c868951 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -9,7 +9,8 @@ apply plugin: 'com.android.application'
 
 // Set up Android app project.
 android {
-	compileSdkVersion 33
+  compileSdkVersion 34
+	ndkVersion project.ext.tiNdkVersion
 	defaultConfig {
 		applicationId 'com.titanium.test'
 		minSdkVersion 21
@@ -19,9 +20,6 @@ android {
 		manifestPlaceholders = project.ext.tiManifestPlaceholders
 		manifestPlaceholders.put('localApplicationId', applicationId) // Legacy placeholder old AARs sometimes use.
 	}
-	lintOptions {
-		checkReleaseBuilds false
-	}
 	sourceSets {
 		main {
 			assets.srcDirs = [
@@ -31,8 +29,12 @@ android {
 		}
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
+	}
+	namespace 'com.titanium.test'
+	lint {
+		checkReleaseBuilds false
 	}
 }
 
diff --git a/android/build.gradle b/android/build.gradle
index 325c0af0c32..f03db25a724 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,17 +6,17 @@
  */
 
 buildscript {
-	ext.kotlin_version = '1.8.20'
+	ext.kotlin_version = '1.9.23'
 
 	repositories {
 		google()
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.0.4'
-		classpath 'com.google.gms:google-services:4.3.15'
+		classpath 'com.android.tools.build:gradle:8.3.1'
+		classpath 'com.google.gms:google-services:4.4.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-		classpath 'org.codehaus.groovy:groovy-json:3.0.11'
+		classpath 'org.codehaus.groovy:groovy-json:3.0.17'
 	}
 }
 
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
index ee4a6d17c9b..96411a1dd72 100644
--- a/android/cli/commands/_build.js
+++ b/android/cli/commands/_build.js
@@ -2042,7 +2042,6 @@ AndroidBuilder.prototype.generateLibProjectForModule = async function generateLi
 
 		// Load "AndroidManifest.xml", replace ${tiapp.properties['key']} variables, and save to above directories.
 		const manifest = await AndroidManifest.fromFilePath(sourceManifestFilePath);
-		manifest.setPackageName(moduleInfo.manifest.moduleid);
 		manifest.replaceTiPlaceholdersUsing(this.tiapp, this.appid);
 		await manifest.writeToFilePath(path.join(debugDirPath, 'AndroidManifest.xml'));
 		await manifest.writeToFilePath(path.join(releaseDirPath, 'AndroidManifest.xml'));
@@ -2065,7 +2064,6 @@ AndroidBuilder.prototype.generateLibProjectForModule = async function generateLi
 		this.logger.error(`Unable to load Android <manifest/> content from: ${tiModuleXmlFilePath}`);
 		throw ex;
 	}
-	mainManifest.setPackageName(moduleInfo.manifest.moduleid);
 	await mainManifest.writeToFilePath(path.join(projectSrcMainDirPath, 'AndroidManifest.xml'));
 
 	// Generate a "build.gradle" file for this project from the SDK's "lib.build.gradle" EJS template.
@@ -2157,6 +2155,7 @@ AndroidBuilder.prototype.generateRootProjectFiles = async function generateRootP
 	gradleProperties.push({ key: 'android.useAndroidX', value: 'true' });
 	gradleProperties.push({ key: 'android.enableJetifier', value: 'true' });
 	gradleProperties.push({ key: 'android.suppressUnsupportedCompileSdk', value: '33' });
+	gradleProperties.push({ key: 'android.nonTransitiveRClass', value: 'false' });
 	gradleProperties.push({ key: 'org.gradle.jvmargs', value: `-Xmx${this.javacMaxMemory}` });
 	await gradlew.writeGradlePropertiesFile(gradleProperties);
 
@@ -3681,9 +3680,6 @@ AndroidBuilder.prototype.generateAndroidManifest = async function generateAndroi
 
 	// Write secondary "AndroidManifest.xml" if not empty.
 	if (!secondaryManifest.isEmpty()) {
-		// Make sure package name is set in <manifest/> so that ".ClassName" references in XML can be resolved.
-		secondaryManifest.setPackageName(this.appid);
-
 		// Replace ${tiapp.properties['key']} placeholders in manifest.
 		secondaryManifest.replaceTiPlaceholdersUsing(this.tiapp, this.appid);
 
diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
index 1fdf5c78767..3405f072cc1 100644
--- a/android/cli/commands/_buildModule.js
+++ b/android/cli/commands/_buildModule.js
@@ -613,12 +613,6 @@ AndroidModuleBuilder.prototype.generateModuleProject = async function generateMo
 		this.logger.error('Unable to load Android <manifest/> content from "timodule.xml" file.');
 		throw err;
 	}
-	let packageName = moduleId;
-	if (packageName.indexOf('.') < 0) {
-		packageName = `ti.${packageName}`;
-	}
-	mainManifest.setPackageName(packageName);
-	await mainManifest.writeToFilePath(path.join(moduleMainDir, 'AndroidManifest.xml'));
 
 	// Generate Java file used to provide this module's JS source code to Titanium's JS runtime.
 	let fileContent = await fs.readFile(path.join(this.moduleTemplateDir, 'CommonJsSourceProvider.java'));
diff --git a/android/gradle.properties b/android/gradle.properties
index a5678e41a60..04ede8b4816 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -12,6 +12,3 @@ org.gradle.jvmargs=-Xmx1536m
 # Note: Jetifier is not needed for test app since it doesn't use Google's deprecated support libraries.
 android.useAndroidX=true
 android.enableJetifier=false
-
-# remove if com.android.tools.build:gradle can be raised in /android/build.gradle
-android.suppressUnsupportedCompileSdk=33,34
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e8be595e3c6..83dc05f6cc4 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Tue Mar 19 21:28:34 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/kroll-apt/build.gradle b/android/kroll-apt/build.gradle
index addda9dcd4f..3254ac8abe3 100644
--- a/android/kroll-apt/build.gradle
+++ b/android/kroll-apt/build.gradle
@@ -7,8 +7,10 @@
 
 apply plugin: 'java'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
 
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
@@ -55,6 +57,7 @@ tasks.withType(JavaCompile).configureEach {
 	// building with JDK newer than the Java version we're targeting. (Ex: Build with JDK 8, but target Java 7.)
 	// Note: Build tool wants a reference to runtime JAR of the same version we're targeting. Not going to happen.
 	options.compilerArgs << '-Xlint:-options'
+	options.incremental = true
 }
 
 // Bundle the below library dependencies within this project's built JAR.
diff --git a/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java b/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
index e97abe907c0..c87aa4cbc06 100644
--- a/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
+++ b/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
@@ -37,7 +37,7 @@
 
 import org.json.simple.JSONValue;
 
-@SupportedSourceVersion(SourceVersion.RELEASE_11)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 @SuppressWarnings("unchecked")
 @SupportedAnnotationTypes({
 	KrollJSONGenerator.Kroll_argument,
diff --git a/android/kroll-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors b/android/kroll-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 00000000000..ea6589826e0
--- /dev/null
+++ b/android/kroll-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+org.appcelerator.kroll.annotations.generator.KrollJSONGenerator,dynamic
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
index d2536898cfc..5d8fcda701e 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
@@ -30,11 +30,11 @@
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.timepicker.MaterialTimePicker;
 import com.google.android.material.timepicker.TimeFormat;
+import com.google.android.material.R;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollFunction;
 import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.TiDimension;
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
index 769de54feeb..3d2792f5bb0 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
@@ -29,11 +29,11 @@
 import com.google.android.material.color.MaterialColors;
 import java.lang.ref.WeakReference;
 import org.appcelerator.titanium.proxy.TiViewProxy;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.util.TiExifOrientation;
 import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.util.TiColorHelper;
 import ti.modules.titanium.media.MediaModule;
+import com.google.android.material.R;
 
 public class TiImageView extends ViewGroup
 {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIActivityIndicator.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIActivityIndicator.java
index 5f56dcb2dfc..8bccff9f97d 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIActivityIndicator.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIActivityIndicator.java
@@ -20,12 +20,12 @@
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.view.TiUIView;
+import com.google.android.material.R;
 
 public class TiUIActivityIndicator extends TiUIView
 {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java
index 6d5a773221e..a6b21eea233 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java
@@ -20,11 +20,11 @@
 import androidx.appcompat.widget.AppCompatButton;
 
 import com.google.android.material.button.MaterialButton;
+import com.google.android.material.R;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButtonBar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButtonBar.java
index cc9f66c6c3c..97aaf7a05ec 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButtonBar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButtonBar.java
@@ -156,10 +156,10 @@ private void addButton(String title, String accessibilityLabel, Drawable imageDr
 
 		// Create a button with given settings and add it to view group.
 		Context context = buttonGroup.getContext();
-		int attributeId = R.attr.materialButtonOutlinedStyle;
+		int attributeId = com.google.android.material.R.attr.materialButtonOutlinedStyle;
 		if (title.isEmpty() && (imageDrawable != null)) {
 			context = new ContextThemeWrapper(context, R.style.Widget_Titanium_OutlinedButton_IconOnly);
-			attributeId = R.attr.materialButtonToggleGroupStyle;
+			attributeId = com.google.android.material.R.attr.materialButtonToggleGroupStyle;
 		}
 		MaterialButton button = new MaterialButton(context, null, attributeId);
 		button.setText(title);
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIOptionBar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIOptionBar.java
index cc18e9b3e95..6d7f70b8e52 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIOptionBar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIOptionBar.java
@@ -200,10 +200,10 @@ private void addButton(String title, String accessibilityLabel, Drawable imageDr
 
 		// Create a button with given settings and add it to view group.
 		Context context = buttonGroup.getContext();
-		int attributeId = R.attr.materialButtonOutlinedStyle;
+		int attributeId = com.google.android.material.R.attr.materialButtonOutlinedStyle;
 		if (title.isEmpty() && (imageDrawable != null)) {
 			context = new ContextThemeWrapper(context, R.style.Widget_Titanium_OutlinedButton_IconOnly);
-			attributeId = R.attr.materialButtonToggleGroupStyle;
+			attributeId = com.google.android.material.R.attr.materialButtonToggleGroupStyle;
 		}
 		MaterialButton button = new MaterialButton(context, null, attributeId);
 		button.setEnabled(isEnabled);
@@ -217,8 +217,8 @@ private void addButton(String title, String accessibilityLabel, Drawable imageDr
 					new int[] { android.R.attr.state_checked },
 				},
 				new int[] {
-					oldColors.getColorForState(new int[] { -android.R.attr.state_checked }, R.attr.colorOnSurface),
-					col
+					oldColors.getColorForState(new int[] { -android.R.attr.state_checked },
+						com.google.android.material.R.attr.colorOnSurface), col
 				}
 			);
 			button.setBackgroundTintList(trackStates);
@@ -232,8 +232,8 @@ private void addButton(String title, String accessibilityLabel, Drawable imageDr
 					new int[] { android.R.attr.state_checked },
 				},
 				new int[] {
-					oldColors.getColorForState(new int[] { -android.R.attr.state_checked }, R.attr.colorOnSurface),
-					col
+					oldColors.getColorForState(new int[] { -android.R.attr.state_checked },
+						com.google.android.material.R.attr.colorOnSurface), col
 				}
 			);
 			button.setStrokeColor(trackStates);
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
index 8ca71d59e4b..24685db76f5 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java
@@ -451,6 +451,6 @@ private int getTabCount()
 	@ColorInt
 	private static int getTabRippleColorFrom(Context context)
 	{
-		return MaterialColors.getColor(context, R.attr.colorPrimary, Color.DKGRAY);
+		return MaterialColors.getColor(context, com.google.android.material.R.attr.colorPrimary, Color.DKGRAY);
 	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
index da19265a5b2..6de91925c5e 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
@@ -15,7 +15,6 @@
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.TiDimension;
@@ -57,6 +56,7 @@
 import android.widget.TextView.OnEditorActionListener;
 import androidx.appcompat.view.ContextThemeWrapper;
 import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.R;
 
 public class TiUIText extends TiUIView implements TextWatcher, OnEditorActionListener, OnFocusChangeListener
 {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
index ed14fd3f194..e0a223b7ce6 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiRecyclerViewHolder.java
@@ -64,8 +64,9 @@ public TiRecyclerViewHolder(final Context context, final ViewGroup viewGroup)
 	{
 		super(viewGroup);
 
-		COLOR_NORMAL = MaterialColors.getColor(context, R.attr.colorButtonNormal, Color.DKGRAY);
-		COLOR_PRIMARY = MaterialColors.getColor(context, R.attr.colorPrimary, Color.DKGRAY);
+		COLOR_NORMAL = MaterialColors.getColor(context, com.google.android.material
+			.R.attr.colorButtonNormal, Color.DKGRAY);
+		COLOR_PRIMARY = MaterialColors.getColor(context, com.google.android.material.R.attr.colorPrimary, Color.DKGRAY);
 		COLOR_SELECTED = ColorUtils.setAlphaComponent(COLOR_PRIMARY, 20);
 
 		if (resources == null) {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/searchbar/TiUISearchBar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/searchbar/TiUISearchBar.java
index 9730dc4f64a..db672c19881 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/searchbar/TiUISearchBar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/searchbar/TiUISearchBar.java
@@ -19,7 +19,6 @@
 import androidx.appcompat.widget.SearchView;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
@@ -27,6 +26,7 @@
 import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.view.TiUIView;
 import ti.modules.titanium.ui.UIModule;
+import com.google.android.material.R;
 
 public class TiUISearchBar extends TiUIView
 {
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 67957c1309b..57d27a4ebab 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
@@ -33,7 +33,6 @@
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
-import org.appcelerator.titanium.R;
 import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.ActivityProxy;
@@ -51,6 +50,7 @@
 
 import ti.modules.titanium.ui.TabGroupProxy;
 import ti.modules.titanium.ui.TabProxy;
+import com.google.android.material.R;
 
 /**
  *  Abstract class representing Tab Navigation in Titanium. Abstract methods in it
diff --git a/android/settings.gradle b/android/settings.gradle
index 8f0aafe7ada..80822af59ec 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,4 +1,2 @@
 rootProject.name = 'TitaniumSDK'
-include ':app'
-include ':kroll-apt'
-include ':titanium'
+include ':app', ':kroll-apt', ':titanium'
diff --git a/android/templates/build/AndroidManifest.xml b/android/templates/build/AndroidManifest.xml
index 13b2d98ca66..c74fc72ff2b 100644
--- a/android/templates/build/AndroidManifest.xml
+++ b/android/templates/build/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	package="<%- packageName %>"
 	android:versionCode="1">
 
 <% if (usesPermissions) { for (const nextPermission of usesPermissions) { %>
diff --git a/android/templates/build/app.build.gradle b/android/templates/build/app.build.gradle
index 44f859dfa54..dcb91f38827 100644
--- a/android/templates/build/app.build.gradle
+++ b/android/templates/build/app.build.gradle
@@ -14,6 +14,7 @@ repositories {
 
 android {
 	compileSdkVersion <%- compileSdkVersion %>
+	namespace '<%- applicationId %>'
 	defaultConfig {
 		applicationId '<%- applicationId %>'
 		minSdkVersion <%- minSdkVersion %>
@@ -35,8 +36,11 @@ android {
 <% } %>
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
+	}
+	buildFeatures {
+		buildConfig true
 	}
 	signingConfigs {
 		def tiKeystoreFilePath = <%- "'" + tiSdkAndroidDir.replace(/\\/g, '\\\\') + "/dev_keystore'" %>
diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle
index c8b563a07cc..d400cc80468 100644
--- a/android/templates/build/root.build.gradle
+++ b/android/templates/build/root.build.gradle
@@ -1,14 +1,13 @@
-
 buildscript {
-	ext.kotlin_version = '1.8.20'
+	ext.kotlin_version = '1.9.23'
 
 	repositories {
 		google()
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.0.4'
-		classpath 'com.google.gms:google-services:4.3.10'
+		classpath 'com.android.tools.build:gradle:8.3.1'
+		classpath 'com.google.gms:google-services:4.4.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
diff --git a/android/templates/build/ti.constants.gradle b/android/templates/build/ti.constants.gradle
index 503c2f006f1..6988acc5601 100644
--- a/android/templates/build/ti.constants.gradle
+++ b/android/templates/build/ti.constants.gradle
@@ -6,7 +6,8 @@
  */
 
 project.ext {
-	tiAndroidXAppCompatLibVersion = '1.6.1'
+	tiNdkVersion = '26.2.11394342'
+	tiAndroidXAppCompatLibVersion = '1.4.1'
 	tiAndroidXCoreLibVersion = '1.9.0'
 	tiAndroidXFragmentLibVersion = '1.5.7'
 	tiMaterialLibVersion = '1.6.1'
diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
index 35106af223b..9a54bd32738 100644
--- a/android/templates/module/generated/build.gradle
+++ b/android/templates/module/generated/build.gradle
@@ -16,9 +16,10 @@ def tiModuleBindingsJsonPath = "${buildDir}/ti-generated/json/<%- moduleName %>.
 
 android {
 	compileSdkVersion <%- compileSdkVersion %>
-	ndkVersion '22.1.7171670'
+	namespace '<%- moduleId %>'
+	ndkVersion '26.2.11394342'
 	defaultConfig {
-		minSdkVersion 19
+		minSdkVersion 21
 		targetSdkVersion <%- compileSdkVersion %>
 		versionName '<%- moduleVersion %>'
 
@@ -69,6 +70,9 @@ android {
 			abiFilters <%- "'" + moduleArchitectures.join("','") + "'" %>
 		}
 	}
+	buildFeatures {
+		buildConfig true
+	}
 	externalNativeBuild {
 		ndkBuild {
 			path "${projectDir}/src/main/jni/Android.mk"
@@ -124,11 +128,11 @@ android {
 		}
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 	kotlinOptions {
-		jvmTarget = "11"
+		jvmTarget = "17"
 	}
 	// Exclude the C++ runtime and Titanium kroll libraries for all architectures when packaging the AAR file.
 	// Avoids app build failure due to library file name collision. (Apps will use "titanium.aar" bundled *.so files.)
@@ -157,10 +161,19 @@ preBuild.doFirst {
 // Set up project to compile Java side before compiling the C/C++ side.
 // We must do this because our "kroll-apt" Java annotation processor generates C++ source files.
 project.afterEvaluate {
-	externalNativeBuildDebug.dependsOn compileDebugJavaWithJavac
-	externalNativeBuildRelease.dependsOn compileReleaseJavaWithJavac
-	buildNdkBuildDebug.dependsOn compileDebugJavaWithJavac
-	buildNdkBuildRelease.dependsOn compileReleaseJavaWithJavac
+	tasks.configureEach {
+		if (it.name == 'compileReleaseJavaWithJavac') {
+			externalNativeBuildRelease.mustRunAfter it
+		} else if (it.name == 'compileDebugJavaWithJavac') {
+			externalNativeBuildDebug.mustRunAfter it
+		} else if (it.name == 'buildNdkBuildRelease[armeabi-v7a]' || it.name == 'buildNdkBuildRelease[arm64-v8a]' || it.name == 'buildNdkBuildRelease[x86]' || it.name == 'buildNdkBuildRelease[x86_64]') {
+			it.mustRunAfter('compileReleaseJavaWithJavac')
+		} else if (it.name == 'buildNdkBuildDebug[armeabi-v7a]' || it.name == 'buildNdkBuildDebug[arm64-v8a]' || it.name == 'buildNdkBuildDebug[x86]' || it.name == 'buildNdkBuildDebug[x86_64]') {
+			it.mustRunAfter('compileDebugJavaWithJavac')
+		} else if (it.name == 'generateReleaseAssets') {
+			it.dependsOn generateReleaseRFile
+		}
+	}
 }
 
 // Hook into Java compile task.
@@ -178,7 +191,7 @@ tasks.withType(JavaCompile).configureEach {
 			environment 'TI_MODULE_GENERATED_JS_DIR', "${projectDir}/build/ti-generated/js"
 			environment 'TI_MODULE_ID', '<%- moduleId %>'
 			environment 'TI_MODULE_NAMESPACE', '<%- moduleId.toLowerCase() %>'
-			environment 'TI_MODULE_TEMPLATE_DIR', '<%- tiSdkModuleTemplateDir.replace(/\\/g, '\\\\') %>'
+			environment 'TI_MODULE_TEMPLATE_DIR', '<%- tiSdkModuleTemplateDir.replace(/\\/g, ' \ \ \ \ ') %>'
 			executable = 'node'
 			workingDir = projectDir
 			args = ['generate-cpp-files.js']
diff --git a/android/titanium/AndroidManifest.xml b/android/titanium/AndroidManifest.xml
index 300b87bd3b2..98a8989b5f8 100644
--- a/android/titanium/AndroidManifest.xml
+++ b/android/titanium/AndroidManifest.xml
@@ -1,39 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.appcelerator.titanium">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
 	<application>
 		<activity
 			android:name="org.appcelerator.titanium.TiActivity"
-			android:exported="false"
-			android:configChanges="${tiActivityConfigChanges}"/>
+			android:configChanges="${tiActivityConfigChanges}"
+			android:exported="false" />
 		<activity
 			android:name="org.appcelerator.titanium.TiTranslucentActivity"
-			android:exported="false"
 			android:configChanges="${tiActivityConfigChanges}"
-			android:theme="@style/Theme.AppDerived.Translucent"/>
+			android:exported="false"
+			android:theme="@style/Theme.AppDerived.Translucent" />
 		<activity
 			android:name="ti.modules.titanium.media.TiCameraActivity"
-			android:exported="false"
 			android:configChanges="${tiActivityConfigChanges}"
-			android:theme="@style/Theme.Titanium.Dark.Fullscreen"/>
+			android:exported="false"
+			android:theme="@style/Theme.Titanium.Dark.Fullscreen" />
 		<activity
 			android:name="ti.modules.titanium.media.TiCameraXActivity"
-			android:exported="false"
 			android:configChanges="${tiActivityConfigChanges}"
-			android:theme="@style/Theme.Titanium.Dark.Fullscreen"/>
+			android:exported="false"
+			android:theme="@style/Theme.Titanium.Dark.Fullscreen" />
 		<activity
 			android:name="ti.modules.titanium.media.TiVideoActivity"
-			android:exported="false"
 			android:configChanges="${tiActivityConfigChanges}"
-			android:theme="@style/Theme.AppDerived.Fullscreen"/>
+			android:exported="false"
+			android:theme="@style/Theme.AppDerived.Fullscreen" />
 		<activity
 			android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"
-			android:exported="false"/>
+			android:exported="false" />
 
 		<provider
 			android:name="org.appcelerator.titanium.io.TiFileProvider"
 			android:authorities="${applicationId}.tifileprovider"
 			android:exported="false"
-			android:grantUriPermissions="true"/>
+			android:grantUriPermissions="true" />
 
 	</application>
 </manifest>
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index 2e78280442e..c3078c48701 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -1,4 +1,5 @@
 import com.android.build.gradle.tasks.ExternalNativeCleanTask
+import com.android.build.gradle.tasks.ExternalNativeBuildTask
 import groovy.json.JsonSlurper
 
 /**
@@ -11,6 +12,7 @@ import groovy.json.JsonSlurper
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
+
 // Fetch Titanium version info to be applied to generated "BuildConfig" Java class and published AAR.
 // Prefer environment variables assigned via build/package scripts under "titanium_mobile/build" folder.
 def tiBuildVersionString = System.env.TI_SDK_BUILD_VERSION
@@ -41,8 +43,10 @@ for (nextString in tiBuildVersionString.split('\\.')) {
 }
 
 android {
-	compileSdkVersion 33
+	ndkVersion project.ext.tiNdkVersion
+	namespace 'org.appcelerator.titanium'
 	defaultConfig {
+		compileSdk 33
 		minSdkVersion 21
 		targetSdkVersion 34
 		versionName tiBuildVersionString
@@ -58,8 +62,8 @@ android {
 				// Also have it produce a JSON file of all bindings to be used by module build system.
 				arguments = [
 					'kroll.outputJsonFilePath': "${projectDir}/../../dist/android/titanium.bindings.json".toString(),
-					'kroll.outputCppDirPath': "${projectDir}/../runtime/v8/generated".toString(),
-					'kroll.jsModuleName': 'titanium'
+					'kroll.outputCppDirPath'  : "${projectDir}/../runtime/v8/generated".toString(),
+					'kroll.jsModuleName'      : 'titanium'
 				]
 			}
 		}
@@ -72,6 +76,9 @@ android {
 			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 		}
 	}
+	buildFeatures {
+		buildConfig true
+	}
 	externalNativeBuild {
 		cmake {
 			version '3.22.1'
@@ -86,41 +93,36 @@ android {
 				"${projectDir}/../modules/ui/assets"
 			]
 			java.srcDirs = [
-				'src/java',
-				"${projectDir}/../modules/accelerometer/src/java",
-				"${projectDir}/../modules/analytics/src/java",
-				"${projectDir}/../modules/android/src/java",
-				"${projectDir}/../modules/app/src/java",
-				"${projectDir}/../modules/calendar/src/java",
-				"${projectDir}/../modules/contacts/src/java",
-				"${projectDir}/../modules/database/src/java",
-				"${projectDir}/../modules/filesystem/src/java",
-				"${projectDir}/../modules/geolocation/src/java",
-				"${projectDir}/../modules/gesture/src/java",
-				"${projectDir}/../modules/locale/src/java",
-				"${projectDir}/../modules/media/src/java",
-				"${projectDir}/../modules/network/src/java",
-				"${projectDir}/../modules/platform/src/java",
-				"${projectDir}/../modules/ui/src/java",
-				"${projectDir}/../modules/utils/src/java",
-				"${projectDir}/../modules/xml/src/java",
-				"${projectDir}/../runtime/common/src/java",
-				"${projectDir}/../runtime/v8/src/java"
-			]
-			jni.srcDirs = [
-				"${projectDir}/../runtime/v8/src/native",
-				"${projectDir}/../runtime/v8/src/native/modules",
-				"${projectDir}/../runtime/v8/generated"
+					'src/java',
+					"${projectDir}/../modules/accelerometer/src/java",
+					"${projectDir}/../modules/analytics/src/java",
+					"${projectDir}/../modules/android/src/java",
+					"${projectDir}/../modules/app/src/java",
+					"${projectDir}/../modules/calendar/src/java",
+					"${projectDir}/../modules/contacts/src/java",
+					"${projectDir}/../modules/database/src/java",
+					"${projectDir}/../modules/filesystem/src/java",
+					"${projectDir}/../modules/geolocation/src/java",
+					"${projectDir}/../modules/gesture/src/java",
+					"${projectDir}/../modules/locale/src/java",
+					"${projectDir}/../modules/media/src/java",
+					"${projectDir}/../modules/network/src/java",
+					"${projectDir}/../modules/platform/src/java",
+					"${projectDir}/../modules/ui/src/java",
+					"${projectDir}/../modules/utils/src/java",
+					"${projectDir}/../modules/xml/src/java",
+					"${projectDir}/../runtime/common/src/java",
+					"${projectDir}/../runtime/v8/src/java"
 			]
 			res.srcDirs = [
-				'res',
-				"${projectDir}/../modules/ui/res"
+					'res',
+					"${projectDir}/../modules/ui/res"
 			]
 		}
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 }
 
@@ -151,6 +153,7 @@ tasks.register('updateV8Library') {
 		}
 	}
 }
+
 preBuild.dependsOn updateV8Library
 tasks.withType(ExternalNativeCleanTask).configureEach {
 	dependsOn updateV8Library
@@ -164,35 +167,17 @@ tasks.withType(Checkstyle).configureEach {
 	classpath = files()
 	source android.sourceSets.main.java.srcDirs
 }
+
 // Execute Checkstyle on all files
 tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
+
 // Execute Checkstyle on all modified files
 tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
-// Used to strip the src dir prefixes from the changed java files
-def getChangedFiles() {
-	if (!project.hasProperty('changedFiles')) {
-		return new ArrayList<>()
-	}
-	def allFiles = project.changedFiles.split(',')
-
-	// Remove the prefix
-	List<String> files = new ArrayList<>()
-	for (file in allFiles) {
-		def index = file.indexOf('src/java/')
-		if (index != -1) {
-			files.add(file.substring(index + 9))
-		}
-	}
-
-	// Return the list of touched files
-	files
-}
-
 // Performs a transpile/polyfill/rollup of our "titanium_mobile/common/Resources" directory tree's JS files,
 // takes a V8 snapshot of rolled-up files, and then generates a C++ header file of that snapshot to be compiled-in.
 // Note: This supports incremental builds. Only executes when JS files change or snapshot output file is missing.
@@ -201,7 +186,7 @@ tasks.register('snapshotTiCommonFiles') {
 	inputs.file "${projectDir}/../../build/lib/builder.js"
 	inputs.file "${projectDir}/../../build/lib/android/index.js"
 	outputs.file "${projectDir}/../runtime/v8/generated/V8Snapshots.h"
-	doLast {
+	doFirst {
 		exec {
 			executable = 'node'
 			workingDir = projectDir
@@ -210,15 +195,6 @@ tasks.register('snapshotTiCommonFiles') {
 	}
 }
 
-// Set up project to compile Java side before compiling the C/C++ side.
-// We must do this because our "kroll-apt" Java annotation processor generates C++ source files.
-project.afterEvaluate {
-	externalNativeBuildDebug.dependsOn compileDebugJavaWithJavac
-	externalNativeBuildRelease.dependsOn compileReleaseJavaWithJavac
-	buildCMakeDebug.dependsOn compileDebugJavaWithJavac
-	buildCMakeRelWithDebInfo.dependsOn compileReleaseJavaWithJavac
-}
-
 // Runs our "prebuild.js" script before the C/C++ compile, but after Java compile. (Mid-build script?)
 // Generates C/C++ files providing our Android-only JS files via byte arrays.
 tasks.withType(JavaCompile).configureEach {
@@ -233,6 +209,61 @@ tasks.withType(JavaCompile).configureEach {
 	}
 }
 
+// Set up project to compile Java side before compiling the C/C++ side.
+// We must do this because our "kroll-apt" Java annotation processor generates C++ source files.
+project.afterEvaluate {
+	tasks.configureEach {
+		if (it.name == 'compileReleaseJavaWithJavac') {
+			externalNativeBuildRelease.mustRunAfter it
+		} else if (it.name == 'compileDebugJavaWithJavac') {
+			externalNativeBuildDebug.mustRunAfter it
+		} else if (it.name == 'buildCMakeRelWithDebInfo[armeabi-v7a]' || it.name == 'buildCMakeRelWithDebInfo[arm64-v8a]' || it.name == 'buildCMakeRelWithDebInfo[x86]' || it.name == 'buildCMakeRelWithDebInfo[x86_64]') {
+			it.mustRunAfter('compileReleaseJavaWithJavac')
+		} else if (it.name == 'buildCMakeDebug[armeabi-v7a]' || it.name == 'buildCMakeDebug[arm64-v8a]' || it.name == 'buildCMakeDebug[x86]' || it.name == 'buildCMakeDebug[x86_64]') {
+			it.mustRunAfter('compileDebugJavaWithJavac')
+		} else if (it.name == 'generateReleaseAssets') {
+			it.dependsOn generateReleaseRFile
+		}
+	}
+}
+
+tasks.withType(ExternalNativeBuildTask).configureEach {
+	it.mustRunAfter snapshotTiCommonFiles
+}
+
+tasks.withType(ExternalNativeCleanTask).configureEach {
+	dependsOn updateV8Library
+}
+
+// Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
+// Will trigger a build failure if any violations have been detected.
+// Customize all the Checkstyle tasks
+tasks.withType(Checkstyle).configureEach {
+	// Specify all files that should be checked
+	classpath = files()
+	source android.sourceSets.main.java.srcDirs
+}
+
+// Used to strip the src dir prefixes from the changed java files
+def getChangedFiles() {
+	if (!project.hasProperty('changedFiles')) {
+		return new ArrayList<>()
+	}
+	def allFiles = project.changedFiles.split(',')
+
+	// Remove the prefix
+	List<String> files = new ArrayList<>()
+	for (file in allFiles) {
+		def index = file.indexOf('src/java/')
+		if (index != -1) {
+			files.add(file.substring(index + 9))
+		}
+	}
+
+	// Return the list of touched files
+	files
+}
+
 clean.doLast {
 	// Delete generated C/C++ files.
 	project.delete file("${projectDir}/../runtime/v8/generated")
@@ -251,7 +282,7 @@ dependencies {
 	implementation 'androidx.cardview:cardview:1.0.0'
 	implementation "androidx.core:core:${project.ext.tiAndroidXCoreLibVersion}"
 	implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
-	implementation 'androidx.exifinterface:exifinterface:1.3.6'
+	implementation 'androidx.exifinterface:exifinterface:1.3.7'
 	implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
 	implementation 'androidx.media:media:1.6.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -261,7 +292,7 @@ dependencies {
 	implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
 	implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
 	implementation 'androidx.viewpager:viewpager:1.0.0'
-	implementation 'androidx.annotation:annotation:1.5.0'
+	implementation 'androidx.annotation:annotation:1.7.1'
 
 	// Google's "Material Components" themed UI library.
 	implementation "com.google.android.material:material:${project.ext.tiMaterialLibVersion}"
@@ -269,7 +300,7 @@ dependencies {
 	// The Google Play Services libraries are only used by Titanium's geolocation feature.
 	// We link to them dynamically at runtime. So, they can be safely excluded when in the app project.
 	implementation "com.google.android.gms:play-services-base:${project.ext.tiPlayServicesBaseLibVersion}"
-	implementation 'com.google.android.gms:play-services-location:21.0.1'
+	implementation 'com.google.android.gms:play-services-location:21.2.0'
 
 	// XML library providing XPath support to our Ti.XML APIs.
 	implementation 'jaxen:jaxen:1.2.0'
@@ -329,6 +360,7 @@ publishing {
 		}
 	}
 }
+
 publish.doLast {
 	// After above publishing step, extract C/C++ "*.so" libraries from AAR to "./build/outputs/jniLibs" directory.
 	def jniLibsOutputDir = "${buildDir}/outputs/jniLibs"
diff --git a/android/untar.gradle b/android/untar.gradle
index 145bb23b4eb..20822112eb4 100644
--- a/android/untar.gradle
+++ b/android/untar.gradle
@@ -1,36 +1,36 @@
-/**
- * Titanium SDK
- * Copyright TiDev, Inc. 04/07/2022-Present
- * Licensed under the terms of the Apache Public License.
- * Please see the LICENSE included with this distribution for details.
- */
-
-// Extracts a "*.tar" file using the same parameters as the ant <untar/> task.
-// Used by our prebuild step to extract our "libv8-*.tar.bz2" file.
-tasks.register('untar') {
-	// Throw an error if required gradle property has not been set.
-	if (!project.hasProperty('src')) {
-		throw new InvalidUserDataException('You must set a "src" property.')
-	}
-
-	// Assign a default value to any unassigned properties.
-	if (!project.hasProperty('compression')) {
-		project.ext.compression = 'none'
-	}
-	if (!project.hasProperty('overwrite')) {
-		project.ext.overwrite = 'true'
-	}
-	if (!project.hasProperty('dest')) {
-		def sourceFile = new File(src)
-		project.ext.dest = sourceFile.getParentFile().getPath()
-	}
-
-	// Use "ant" to extract the given tarball.
-	ant.untar(
-			compression: project.properties.compression,
-			overwrite: project.properties.overwrite,
-			src: project.properties.src,
-			dest: project.properties.dest)
-}
-
-defaultTasks 'untar'
\ No newline at end of file
+/**
+ * Titanium SDK
+ * Copyright TiDev, Inc. 04/07/2022-Present
+ * Licensed under the terms of the Apache Public License.
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+// Extracts a "*.tar" file using the same parameters as the ant <untar/> task.
+// Used by our prebuild step to extract our "libv8-*.tar.bz2" file.
+tasks.register('untar') {
+	// Throw an error if required gradle property has not been set.
+	if (!project.hasProperty('src')) {
+		throw new InvalidUserDataException('You must set a "src" property.')
+	}
+
+	// Assign a default value to any unassigned properties.
+	if (!project.hasProperty('compression')) {
+		project.ext.compression = 'none'
+	}
+	if (!project.hasProperty('overwrite')) {
+		project.ext.overwrite = 'true'
+	}
+	if (!project.hasProperty('dest')) {
+		def sourceFile = new File(src)
+		project.ext.dest = sourceFile.getParentFile().getPath()
+	}
+
+	// Use "ant" to extract the given tarball.
+	ant.untar(
+			compression: project.properties.compression,
+			overwrite: project.properties.overwrite,
+			src: project.properties.src,
+			dest: project.properties.dest)
+}
+
+defaultTasks 'untar'

From c5e553b8d87eeac77abab2181887b2ac5d03d7f6 Mon Sep 17 00:00:00 2001
From: Ewan Harris <ewanharris93@gmail.com>
Date: Tue, 17 Sep 2024 22:35:20 +0100
Subject: [PATCH 37/55] ci: use newer artifact actions (#13991)

* ci: use newer artifact actions

* ci: remove unused backport action
---
 .github/actions/build-android/action.yml | 10 ++++----
 .github/actions/build-ios/action.yml     |  8 +++----
 .github/actions/package/action.yml       | 24 +++++++++----------
 .github/workflows/backport.yml           | 19 ---------------
 .github/workflows/build.yml              | 18 +++++++-------
 .github/workflows/docs.yml               |  8 +++----
 .github/workflows/regen-builds.yml       |  2 +-
 .github/workflows/regen-docs.yml         |  6 ++---
 .github/workflows/release.yml            | 30 ++++++++++++------------
 .github/workflows/sponsors.yaml          |  4 ++--
 maintainer-docs/ci-setup.md              |  6 ++---
 11 files changed, 58 insertions(+), 77 deletions(-)
 delete mode 100644 .github/workflows/backport.yml

diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml
index ac6d0389498..1915ee28320 100644
--- a/.github/actions/build-android/action.yml
+++ b/.github/actions/build-android/action.yml
@@ -20,13 +20,13 @@ runs:
       shell: bash
 
     - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
         cache: 'npm'
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: ${{ inputs.java-version }}
@@ -36,7 +36,7 @@ runs:
       shell: bash
 
     - name: Cache Gradle packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -58,7 +58,7 @@ runs:
           ${{ runner.os }}-ccache-
 
     - name: Cache V8
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: dist/android/libv8
         key: libv8-${{ hashFiles('dist/android/libv8/**') }}
@@ -84,7 +84,7 @@ runs:
         dist/tmp/common
       shell: bash
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: android-build
         retention-days: 1
diff --git a/.github/actions/build-ios/action.yml b/.github/actions/build-ios/action.yml
index dfd37277f9b..facb2c2c713 100644
--- a/.github/actions/build-ios/action.yml
+++ b/.github/actions/build-ios/action.yml
@@ -9,10 +9,10 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
+        node-version: ${{ inputs.node-version }}
         cache: 'npm'
 
     - name: Install dependencies
@@ -34,7 +34,7 @@ runs:
         iphone/TitaniumKit/build/TitaniumKit.xcframework
       shell: bash
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ios-build
         retention-days: 1
diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml
index 71b593d5ac3..2b94b40f004 100644
--- a/.github/actions/package/action.yml
+++ b/.github/actions/package/action.yml
@@ -15,14 +15,14 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
         cache: 'npm'
 
-    - name: Use JDK 11
-      uses: actions/setup-java@v3
+    - name: Use JDK
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: ${{ inputs.java-version }}
@@ -32,7 +32,7 @@ runs:
       shell: bash
 
     - name: Cache Gradle packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -41,7 +41,7 @@ runs:
         restore-keys: |
           ${{ runner.os }}-gradle-
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: android-build
 
@@ -49,7 +49,7 @@ runs:
       run: tar -xzvf android-build.tar.gz
       shell: bash
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ios-build
 
@@ -58,7 +58,7 @@ runs:
       shell: bash
 
     - name: Cache Native Modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.SDK_BUILD_CACHE_DIR }}
         key: native-modules-${{ github.sha }}
@@ -70,21 +70,21 @@ runs:
       shell: bash
 
     - name: Archive OSX artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mobilesdk-${{ inputs.vtag }}-osx
         path: |
           dist/mobilesdk-*-osx.zip
 
     - name: Archive win32 artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mobilesdk-${{ inputs.vtag }}-win32
         path: |
           dist/mobilesdk-*-win32.zip
 
     - name: Archive Linux artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mobilesdk-${{ inputs.vtag }}-linux
         path: |
@@ -98,7 +98,7 @@ runs:
         rm -f ~/.gradle/caches/modules-2/gc.properties
       shell: bash
 
-    - uses: geekyeggo/delete-artifact@v2
+    - uses: geekyeggo/delete-artifact@v5
       with:
         name: |
           android-build
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
deleted file mode 100644
index 37acf53d70a..00000000000
--- a/.github/workflows/backport.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Backport
-on:
-  pull_request_target:
-    types:
-      - closed
-      - labeled
-
-jobs:
-  backport:
-    runs-on: ubuntu-20.04
-    name: Backport
-    steps:
-      - name: Backport
-        uses: ewanharris/backport@v1.0.28-25
-        with:
-          bot_username: build
-          bot_token: ${{ secrets.BOT_TOKEN }}
-          bot_token_key: ${{ secrets.BOT_TOKEN_KEY }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ee41f0c410..9fc7635a35b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,13 +15,13 @@ jobs:
       USE_CCACHE: 1
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Android build
         uses: ./.github/actions/build-android
         with:
-          node-version: '18.x'
+          node-version: '20.x'
           java-version: '17'
 
   ios:
@@ -33,27 +33,27 @@ jobs:
       DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: iOS build
         uses: ./.github/actions/build-ios
         with:
-          node-version: '18.x'
+          node-version: '20.x'
 
   js:
     runs-on: ubuntu-latest
     name: JavaScript
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: '18.x'
+        node-version: '20.x'
         cache: 'npm'
 
     - name: Install dependencies
@@ -71,7 +71,7 @@ jobs:
     needs: [android, ios, js]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Create version tag
@@ -83,6 +83,6 @@ jobs:
     - name: Package
       uses: ./.github/actions/package
       with:
-        node-version: '16.x'
+        node-version: '20.x'
         java-version: '17'
         vtag: ${{ env.vtag }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index f8f60bad8bb..e8c5cde4165 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,13 +13,13 @@ jobs:
     name: Docs
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             fetch-depth: 0
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '20.x'
           cache: 'npm'
       - run: npm ci
         name: Install dependencies
diff --git a/.github/workflows/regen-builds.yml b/.github/workflows/regen-builds.yml
index c4bc936c500..27956f717b2 100644
--- a/.github/workflows/regen-builds.yml
+++ b/.github/workflows/regen-builds.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - name: Repository Dispatch
       if: github.event.workflow_run.conclusion == 'success'
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v3
       with:
         event-type: regen-builds
         repository: tidev/downloads-www
diff --git a/.github/workflows/regen-docs.yml b/.github/workflows/regen-docs.yml
index 23ce1a85cc1..a3be88243e4 100644
--- a/.github/workflows/regen-docs.yml
+++ b/.github/workflows/regen-docs.yml
@@ -14,12 +14,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16'
         registry-url: 'https://registry.npmjs.org'
@@ -32,7 +32,7 @@ jobs:
       name: Lint
 
     - name: Repository Dispatch
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v3
       with:
         event-type: regen-api-docs
         token: ${{ secrets.REGEN_DOCS_GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 120c547b08c..762ae53fd4d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       vtag: ${{ steps.vtag.outputs.vtag }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.inputs.branch }}
@@ -43,7 +43,7 @@ jobs:
           echo "vtag=${VTAG}" >> $GITHUB_ENV
           echo "vtag=${VTAG}" >> $GITHUB_OUTPUT
       - name: Validate version
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           vtag: ${{ env.vtag }}
         with:
@@ -70,14 +70,14 @@ jobs:
       USE_CCACHE: 1
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.inputs.branch }}
       - name: Android build
         uses: ./.github/actions/build-android
         with:
-          node-version: '18.x'
+          node-version: '20.x'
           java-version: '17'
 
   ios:
@@ -90,14 +90,14 @@ jobs:
       DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.inputs.branch }}
       - name: iOS build
         uses: ./.github/actions/build-ios
         with:
-          node-version: '18.x'
+          node-version: '20.x'
 
   package:
     runs-on: macos-12
@@ -109,14 +109,14 @@ jobs:
     needs: [validate, android, ios]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: ${{ github.event.inputs.branch }}
     - name: Package
       uses: ./.github/actions/package
       with:
-        node-version: '18.x'
+        node-version: '20.x'
         java-version: '17'
         vtag: ${{ env.vtag }}
 
@@ -129,21 +129,21 @@ jobs:
       vtag: ${{ needs.validate.outputs.vtag }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: ${{ github.event.inputs.branch }}
     - run: echo ${{ env.vtag }}
     - name: Download Linux artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: mobilesdk-${{ env.vtag }}-linux
     - name: Download MacOS artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: mobilesdk-${{ env.vtag }}-osx
     - name: Download Windows artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: mobilesdk-${{ env.vtag }}-win32
     - name: Create and push tag
@@ -155,14 +155,14 @@ jobs:
         git push origin "${TAG_VERSION}"
         echo "clean-tag=${TAG_VERSION}" >> $GITHUB_ENV
     - name: Upload SDK zips (GA)
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: ${{ github.event.inputs.release-type == 'GA' }}
       with:
         files: mobilesdk-${{ env.vtag }}-*
         tag_name: ${{ env.clean-tag }}
         name: ${{ env.vtag }}
     - name: Upload SDK zips (non-GA)
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: ${{ github.event.inputs.release-type != 'GA' }}
       with:
         files: mobilesdk-${{ env.vtag }}-*
@@ -178,7 +178,7 @@ jobs:
         git commit -m "chore(release): bump version"
         git push
     - name: Regen Builds
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v3
       with:
         event-type: regen-builds
         repository: tidev/downloads-www
diff --git a/.github/workflows/sponsors.yaml b/.github/workflows/sponsors.yaml
index 7e42d6a459c..f3bd3bcfdc6 100644
--- a/.github/workflows/sponsors.yaml
+++ b/.github/workflows/sponsors.yaml
@@ -10,7 +10,7 @@ jobs:
     name: Update Sponsors
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Update Sponsors in README.md
@@ -20,4 +20,4 @@ jobs:
           token: ${{ secrets.SPONSORS_README_TOKEN }}
           file: 'README.md'
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/maintainer-docs/ci-setup.md b/maintainer-docs/ci-setup.md
index 301c661927c..046b736f9e9 100644
--- a/maintainer-docs/ci-setup.md
+++ b/maintainer-docs/ci-setup.md
@@ -73,7 +73,7 @@ For example:
       - name: Android build
         uses: ./.github/actions/build-android
         with:
-          node-version: '16.x'
+          node-version: '20.x'
           java-version: '11'
 ```
 
@@ -89,7 +89,7 @@ For example:
       - name: iOS build
         uses: ./.github/actions/build-ios
         with:
-          node-version: '16.x'
+          node-version: '20.x'
 ```
 
 ### Package
@@ -104,7 +104,7 @@ For example:
     - name: Package
       uses: ./.github/actions/package
       with:
-        node-version: '16.x'
+        node-version: '20.x'
         java-version: '11'
         vtag: ${{ env.vtag }}
 ```

From b33a15ebeac7f73baa69b410966501f7f98ef83e Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:06:17 +0000
Subject: [PATCH 38/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91ae530b24d..dc434200d76 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;7c5bd52413a071a9d5f6c9f8c0dab6c299e62f15&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;a901e60d8e246a540994dc02fe6f9a3d326a64c3&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/romeomanzur"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;476535?v&#x3D;4" width="60px" alt="Romeo Manzur" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><!-- sponsors -->
 
 ## Features
 

From 5ad1ac9200f7fc0f2a46e9d70fbc7340b2c095af Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:42:46 +0200
Subject: [PATCH 39/55] fix(android): fix ListView layout with header and
 footer only (#14117)

* fix(android): fix ListView layout with header and footer only

* remove log

* Update android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java

Co-authored-by: Chris Barber <chris@cb1inc.com>

* rename variable

---------

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 .../titanium/ui/widget/listview/ListViewHolder.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
index 0a400cd4705..137b0661f9a 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
@@ -412,7 +412,13 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 						ConstraintSet constraintSet = new ConstraintSet();
 						constraintSet.clone((ConstraintLayout) this.container);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_content, ConstraintSet.BOTTOM,
+
+						int constraintStartId = R.id.titanium_ui_listview_holder_header;
+						if (this.content.getChildCount() > 0) {
+							constraintStartId = R.id.titanium_ui_listview_holder_content;
+						}
+
+						constraintSet.connect(constraintStartId, ConstraintSet.BOTTOM,
 							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
 						constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.BOTTOM,
 							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);

From e1212e9fccd79f5c302a8380157288df356081da Mon Sep 17 00:00:00 2001
From: Abdullah Al-Faqeir <abdullah.alfaqeir@gmail.com>
Date: Thu, 19 Sep 2024 22:24:13 +0300
Subject: [PATCH 40/55] feat(android): be able to add plugins to build.gradle
 (#14019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(android): added classpathes to manifest
feat(android): plugins classpathes to manifest
feat(android): custom root.build.gradle for modules

* Update root.build.gradle

Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>

* feat(android): added default root.build.gradle file

* Update _buildModule.js

check if this.manifest.plugins is there before splitting

* fix: fix typos

* fix: fix some more typos

* fix: guard non-existing classpaths

* fix(android): fix generating build.gradle files

* fix(android): added examples in the manifest file on how to use android classpaths and plugins

---------

Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>
Co-authored-by: Hans Knöchel <h.knoechel@lambus.com>
---
 android/cli/commands/_build.js                        | 10 ++++++----
 android/cli/commands/_buildModule.js                  | 11 +++++++----
 android/templates/build/root.build.gradle             | 10 ++++++++++
 .../module/default/template/android/manifest.ejs      |  9 +++++++++
 .../module/default/template/android/root.build.gradle |  4 ++++
 android/templates/module/generated/build.gradle       |  3 +++
 build/lib/test/test.js                                |  2 +-
 .../TitaniumKit/TitaniumKit/Sources/API/KrollModule.h |  2 +-
 8 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 android/templates/module/default/template/android/root.build.gradle

diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
index 96411a1dd72..234b92aecb9 100644
--- a/android/cli/commands/_build.js
+++ b/android/cli/commands/_build.js
@@ -2174,10 +2174,12 @@ AndroidBuilder.prototype.generateRootProjectFiles = async function generateRootP
 	// Create a "local.properties" file providing a path to the Android SDK directory.
 	await gradlew.writeLocalPropertiesFile(this.androidInfo.sdk.path);
 
-	// Copy our root "build.gradle" template script to the root build directory.
-	await fs.copyFile(
-		path.join(this.templatesDir, 'root.build.gradle'),
-		path.join(this.buildDir, 'build.gradle'));
+	// Generate root "build.gradle" template script to the root build directory.
+	let buildGradleContent = await fs.readFile(path.join(this.templatesDir, 'root.build.gradle'));
+	buildGradleContent = ejs.render(buildGradleContent.toString(), {
+		classpaths: [],
+	});
+	await fs.writeFile(path.join(this.buildDir, 'build.gradle'), buildGradleContent);
 
 	// Copy our Titanium template's gradle constants file.
 	// This provides the Google library versions we use and defines our custom "AndroidManifest.xml" placeholders.
diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
index 3405f072cc1..144c65b7c4a 100644
--- a/android/cli/commands/_buildModule.js
+++ b/android/cli/commands/_buildModule.js
@@ -512,11 +512,13 @@ AndroidModuleBuilder.prototype.generateRootProjectFiles = async function generat
 	// Create a "local.properties" file providing a path to the Android SDK directory.
 	await gradlew.writeLocalPropertiesFile(this.androidInfo.sdk.path);
 
-	// Copy our root "build.gradle" template script to the root build directory.
+	// Generate root "build.gradle" template script to the root build directory.
 	const templatesDir = path.join(this.platformPath, 'templates', 'build');
-	await fs.copyFile(
-		path.join(templatesDir, 'root.build.gradle'),
-		path.join(this.buildDir, 'build.gradle'));
+	let buildGradleContent = await fs.readFile(path.join(templatesDir, 'root.build.gradle'));
+	buildGradleContent = ejs.render(buildGradleContent.toString(), {
+		classpaths: (this.manifest.classpaths?.split(',') ?? []).filter(classpath => classpath !== ''),
+	});
+	await fs.writeFile(path.join(this.buildDir, 'build.gradle'), buildGradleContent);
 
 	// Copy our Titanium template's gradle constants file.
 	// This provides the Google library versions we use and defines our custom "AndroidManifest.xml" placeholders.
@@ -562,6 +564,7 @@ AndroidModuleBuilder.prototype.generateModuleProject = async function generateMo
 	let buildGradleContent = await fs.readFile(path.join(this.moduleTemplateDir, 'build.gradle'));
 	buildGradleContent = ejs.render(buildGradleContent.toString(), {
 		compileSdkVersion: this.compileSdkVersion,
+		plugins: (this.manifest.plugins?.split(',') ?? []).filter(plugin => plugin !== ''),
 		krollAptJarPath: path.join(this.platformPath, 'kroll-apt.jar'),
 		minSdkVersion: this.minSupportedApiLevel,
 		moduleAuthor: this.manifest.author,
diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle
index d400cc80468..9ed2fe1d5c5 100644
--- a/android/templates/build/root.build.gradle
+++ b/android/templates/build/root.build.gradle
@@ -9,9 +9,19 @@ buildscript {
 		classpath 'com.android.tools.build:gradle:8.3.1'
 		classpath 'com.google.gms:google-services:4.4.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+		<% for (let i = 0; i < classpaths.length; i++) {%>
+		classpath '<%= classpaths[i] %>'
+		<% } %>
 	}
 }
 
+// Load the module developer's optional "root.build.gradle" file from "<module>/android" directory.
+// This gradle file is expected to provide the module's "dependencies".
+def moduleRootBuildGradlePath = "${projectDir}/../root.build.gradle"
+if (file(moduleRootBuildGradlePath).exists()) {
+	apply from: moduleRootBuildGradlePath
+}
+
 allprojects {
 	repositories {
 		google()
diff --git a/android/templates/module/default/template/android/manifest.ejs b/android/templates/module/default/template/android/manifest.ejs
index 0afbaac181a..b198ad393bc 100644
--- a/android/templates/module/default/template/android/manifest.ejs
+++ b/android/templates/module/default/template/android/manifest.ejs
@@ -15,4 +15,13 @@ name: <%- moduleName %>
 moduleid: <%- moduleId %>
 guid: <%- guid %>
 platform: <%- platform %>
+#
+# Classpaths and plugins are used for android packages that requires them
+# to use them you have to add your classpaths and plugins comma separated
+# Ex:
+# classpaths: classpath1,classpath2
+# plugins: plugin1,plugin2
+#
+classpaths:
+plugins:
 minsdk: <%- tisdkVersion %>
diff --git a/android/templates/module/default/template/android/root.build.gradle b/android/templates/module/default/template/android/root.build.gradle
new file mode 100644
index 00000000000..fa2361da412
--- /dev/null
+++ b/android/templates/module/default/template/android/root.build.gradle
@@ -0,0 +1,4 @@
+
+dependencies {
+	// Add the module's library root project dependencies here.
+}
diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
index 9a54bd32738..648bedebf4a 100644
--- a/android/templates/module/generated/build.gradle
+++ b/android/templates/module/generated/build.gradle
@@ -3,6 +3,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+<% for(var i=0; i<plugins.length; i++) {%>
+apply plugin: '<%= plugins[i] %>'
+<% } %>
 
 repositories {
 	maven {
diff --git a/build/lib/test/test.js b/build/lib/test/test.js
index beb51094541..81392c1f4ef 100644
--- a/build/lib/test/test.js
+++ b/build/lib/test/test.js
@@ -315,7 +315,7 @@ async function addTiAppProperties() {
 		} else if (line.indexOf('<use-app-thinning>') >= 0) {
 			content.pop();
 			content.push('\t\t<use-app-thinning>false</use-app-thinning>');
-		// Grab contents of modules/modules.xml to inject as moduel listing for tiapp.xml
+		// Grab contents of modules/modules.xml to inject as module listing for tiapp.xml
 		// This allows PR to override
 		} else if (line.indexOf('<modules>') >= 0) {
 			// remove open tag
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollModule.h b/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollModule.h
index 2dbfa4541c4..7ab4a7198c2 100644
--- a/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollModule.h
+++ b/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollModule.h
@@ -23,7 +23,7 @@
 /**
  * @param moduleID is assumed to be the module name (classname with the "Module" suffix stripped off) - i.e. "UI", "App", "Media"
  * We will generate the full class name from the moduleID: "UI" => "UIModule", "com.appcelerator.urlSession" => "ComAppceleratorUrlSessionModule"
- * @return TiModule* or ObjcProxy* based on whether the module is an older style proxy moduel or a new Obj-C JSC API style (currently only 1st party in-SDK code)
+ * @return TiModule* or ObjcProxy* based on whether the module is an older style proxy module or a new Obj-C JSC API style (currently only 1st party in-SDK code)
  */
 + (id<Module>)loadCoreModule:(NSString *)moduleID inContext:(JSContext *)jsContext;
 

From d887d6bf1534ffcfe65503dd7c6d733307fe13c5 Mon Sep 17 00:00:00 2001
From: Prashant Saini <prashant10103497@gmail.com>
Date: Mon, 23 Sep 2024 01:12:05 +0530
Subject: [PATCH 41/55] ListView has empty cells while scrolling up/down
 (#14119)

* fix(android): use Barrier to set constraints

Using Barrier, potentially avoiding an issue of improper layout cycles (refer video in PR).

* fix(android): list-item shifts to left on having accessoryType field
---
 .../layout/titanium_ui_listview_holder.xml    | 23 +++++++++------
 .../ui/widget/listview/ListViewHolder.java    | 28 -------------------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/android/modules/ui/res/layout/titanium_ui_listview_holder.xml b/android/modules/ui/res/layout/titanium_ui_listview_holder.xml
index de8cfbe1581..68888ce5ac0 100644
--- a/android/modules/ui/res/layout/titanium_ui_listview_holder.xml
+++ b/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" />
 
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
index 137b0661f9a..4b83ba48705 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
@@ -34,8 +34,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.lang.ref.WeakReference;
@@ -365,16 +363,6 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 						this.header.addView(headerView, view.getLayoutParams());
 						this.header.setVisibility(View.VISIBLE);
-
-						ConstraintSet constraintSet = new ConstraintSet();
-						constraintSet.clone((ConstraintLayout) this.container);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_content, ConstraintSet.TOP,
-							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.TOP,
-							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.TOP,
-							R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
-						constraintSet.applyTo((ConstraintLayout) this.container);
 					}
 				}
 			}
@@ -409,22 +397,6 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 						this.footer.addView(footerView, view.getLayoutParams());
 						this.footer.setVisibility(View.VISIBLE);
-
-						ConstraintSet constraintSet = new ConstraintSet();
-						constraintSet.clone((ConstraintLayout) this.container);
-
-						int constraintStartId = R.id.titanium_ui_listview_holder_header;
-						if (this.content.getChildCount() > 0) {
-							constraintStartId = R.id.titanium_ui_listview_holder_content;
-						}
-
-						constraintSet.connect(constraintStartId, ConstraintSet.BOTTOM,
-							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.BOTTOM,
-							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
-						constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.BOTTOM,
-							R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
-						constraintSet.applyTo((ConstraintLayout) this.container);
 					}
 				}
 			}

From 4a543ab506da9c67f725568abafcc5b311d6884f Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:28:06 +0200
Subject: [PATCH 42/55] fix: allow ignoreLog to be a single string (#14116)

---
 android/cli/hooks/run.js | 6 +++++-
 iphone/cli/hooks/run.js  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/android/cli/hooks/run.js b/android/cli/hooks/run.js
index b8b2e07ef06..7d73130d830 100644
--- a/android/cli/hooks/run.js
+++ b/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;
 						}
 
diff --git a/iphone/cli/hooks/run.js b/iphone/cli/hooks/run.js
index ec41e90b7c6..1c06ac6605d 100644
--- a/iphone/cli/hooks/run.js
+++ b/iphone/cli/hooks/run.js
@@ -75,7 +75,11 @@ exports.init = function (logger, config, cli) {
 				}
 
 				// ignore logs from cli ignoreLog
-				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;
 				}
 

From 032c5b10bd63bc7c7e089dedd144950fe63649bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Tue, 24 Sep 2024 18:22:02 +0200
Subject: [PATCH 43/55] fix(build): update ioslib to 1.7.38 to fix incremental
 builds in Xcode 16

---
 package-lock.json | 15 +++++++--------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97000a2d7b1..250900030d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "ejs": "3.1.9",
         "fields": "0.1.24",
         "fs-extra": "11.2.0",
-        "ioslib": "1.7.37",
+        "ioslib": "1.7.38",
         "liveview": "1.5.6",
         "lodash.merge": "4.6.2",
         "markdown": "0.5.0",
@@ -8822,10 +8822,9 @@
       }
     },
     "node_modules/ioslib": {
-      "version": "1.7.37",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.37.tgz",
-      "integrity": "sha512-D4SrH3QocN2GBlzSBcv9V1WKpmcOVUk3F6rjHafWXtrAFs7ZrsPtyR0nA4t1ubqjOYwkTZLgMliEUrs5bpfqXQ==",
-      "license": "Apache-2.0",
+      "version": "1.7.38",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.38.tgz",
+      "integrity": "sha512-b73D5Erc4QanbEWCM2hCTfi4B6rPmyxUeNZ3ztAIRD7ukF/9BpvTTmDpoNtUjY40lhmd9nDAwxkZRTSh03BX4g==",
       "dependencies": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
@@ -22726,9 +22725,9 @@
       }
     },
     "ioslib": {
-      "version": "1.7.37",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.37.tgz",
-      "integrity": "sha512-D4SrH3QocN2GBlzSBcv9V1WKpmcOVUk3F6rjHafWXtrAFs7ZrsPtyR0nA4t1ubqjOYwkTZLgMliEUrs5bpfqXQ==",
+      "version": "1.7.38",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.38.tgz",
+      "integrity": "sha512-b73D5Erc4QanbEWCM2hCTfi4B6rPmyxUeNZ3ztAIRD7ukF/9BpvTTmDpoNtUjY40lhmd9nDAwxkZRTSh03BX4g==",
       "requires": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
diff --git a/package.json b/package.json
index 57779acbd5f..37a3a135870 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "ejs": "3.1.9",
     "fields": "0.1.24",
     "fs-extra": "11.2.0",
-    "ioslib": "1.7.37",
+    "ioslib": "1.7.38",
     "liveview": "1.5.6",
     "lodash.merge": "4.6.2",
     "markdown": "0.5.0",

From 86661857d13138a2d1ac73392bb8eb364f7266a0 Mon Sep 17 00:00:00 2001
From: hansemannn <hansemannn@users.noreply.github.com>
Date: Fri, 27 Sep 2024 00:06:56 +0000
Subject: [PATCH 44/55] Apply automatic changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc434200d76..c260d52ea4d 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
 
 Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
 
-<!-- sponsors --><a href="https://github.com/Topener"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1898949?u&#x3D;2a4679d6ddcec38e0e8855796b6df883b05ca295&amp;v&#x3D;4" width="60px" alt="Rene Pot" /></a><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;a901e60d8e246a540994dc02fe6f9a3d326a64c3&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/romeomanzur"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;476535?v&#x3D;4" width="60px" alt="Romeo Manzur" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5816606?u&#x3D;129b37486ffa01feb669bf7ad8adc3c81a305f0b&amp;v&#x3D;4" width="60px" alt="Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;901045?u&#x3D;a901e60d8e246a540994dc02fe6f9a3d326a64c3&amp;v&#x3D;4" width="60px" alt="Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8171849?u&#x3D;990e64ef4c1909a0b0e8924c4e6c5b3f730b260b&amp;v&#x3D;4" width="60px" alt="dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6359232?u&#x3D;7a635b5d99fde2573103a7d94464ac3166fadad8&amp;v&#x3D;4" width="60px" alt="Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2934870?u&#x3D;0258c5d071fe0d398155ab92b5bb45c5d44fb9ef&amp;v&#x3D;4" width="60px" alt="Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;104650443?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;2573811?u&#x3D;90b858430c052de19099b336344bfd6f44eb9e8a&amp;v&#x3D;4" width="60px" alt="Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;81745?v&#x3D;4" width="60px" alt="Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;94473234?u&#x3D;c0cfd7677bb6864e3814261f035307c834d074c1&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8946160?u&#x3D;90bd7d922f63690651f0a077ec9e862c0778e872&amp;v&#x3D;4" width="60px" alt="Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;77621597?v&#x3D;4" width="60px" alt="Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5295258?u&#x3D;741e21b15806caa959e3a5fe6a580303794e047b&amp;v&#x3D;4" width="60px" alt="Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;874832?u&#x3D;51f1e316e60d21f9d8dce3ccf69056a6209b1a71&amp;v&#x3D;4" width="60px" alt="Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1700582?u&#x3D;3ff22598878dc903595a6b6b541de33ad45bd918&amp;v&#x3D;4" width="60px" alt="Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;7572148?u&#x3D;ff1828727f6afc13559f79dcb7bf505629e17e1f&amp;v&#x3D;4" width="60px" alt="Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;11294684?v&#x3D;4" width="60px" alt="Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71382335?u&#x3D;d488db216612dbff622368a3ab7016bb083badee&amp;v&#x3D;4" width="60px" alt="Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;306669?v&#x3D;4" width="60px" alt="Korelogic Limited" /></a><a href="https://github.com/romeomanzur"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;476535?v&#x3D;4" width="60px" alt="Romeo Manzur" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8219203?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1489502?u&#x3D;81e9e9df9a35acf9b602126480cc5e70ead1f7a7&amp;v&#x3D;4" width="60px" alt="John Gould" /></a><!-- sponsors -->
 
 ## Features
 

From fb696a145b9d41655737ed6afac7872b744be053 Mon Sep 17 00:00:00 2001
From: Prashant Saini <prashant10103497@gmail.com>
Date: Fri, 27 Sep 2024 19:42:00 +0530
Subject: [PATCH 45/55] Android: marker event was only triggered for first and
 last visible section items (#14124)

* fix(android): fire marker event for all visible items in range of first to last visible item

* chore: remove package.json files
---
 .../titanium/ui/widget/listview/ListViewProxy.java   | 11 +++++++++--
 .../titanium/ui/widget/listview/TiListView.java      | 12 ++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java
index 79b5769f8f8..f3b88eaf0cf 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java
@@ -631,8 +631,15 @@ public void handleMarkers()
 			return;
 		}
 
-		final ListItemProxy[] items =
-			new ListItemProxy[] { listView.getFirstVisibleItem(), listView.getLastVisibleItem()};
+		final ArrayList<ListItemProxy> items = new ArrayList<>();
+		final LinearLayoutManager lm = listView.getLayoutManager();
+		final int firstVisibleItemPos = lm.findFirstVisibleItemPosition();
+		final int lastVisibleItemPos = lm.findLastVisibleItemPosition();
+
+		// ideally markers should be triggered for all visible items between first and last visible ones
+		for (int i = firstVisibleItemPos; i <= lastVisibleItemPos; i++) {
+			items.add(listView.getVisibleItemAt(i));
+		}
 
 		for (final ListItemProxy item : items) {
 			if (item != null) {
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
index e4cee03582b..2efb68fd889 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -571,6 +571,18 @@ public ListItemProxy getFirstVisibleItem()
 		return null;
 	}
 
+	public ListItemProxy getVisibleItemAt(int index)
+	{
+		final View itemView = getLayoutManager().findViewByPosition(index);
+
+		if (itemView == null) {
+			return null;
+		}
+
+		// Obtain list item proxy
+		return ((ListViewHolder) recyclerView.getChildViewHolder(itemView)).getProxy();
+	}
+
 	/**
 	 * Obtain last visible list item proxy.
 	 *

From 6ed55d85f6ce3df9c750ee9dd857487dd9e974ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Sat, 28 Sep 2024 23:35:00 +0200
Subject: [PATCH 46/55] chore(ios): update compatibility for iOS 18+ and Xcode
 16+

---
 iphone/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/iphone/package.json b/iphone/package.json
index 3b69c0d0dad..a9697c57543 100644
--- a/iphone/package.json
+++ b/iphone/package.json
@@ -1,9 +1,9 @@
 {
 	"name": "titanium-mobile-ios",
 	"title": "iOS",
-	"description": "Titanium SDK iOS",
+	"description": "Titanium iOS SDK",
 	"keywords": [
-		"appcelerator",
+		"tidev",
 		"titanium",
 		"mobile",
 		"ios",
@@ -15,8 +15,8 @@
 	"minIosVersion": "13.0",
 	"minWatchosVersion": "6.0",
 	"vendorDependencies": {
-		"xcode": ">=12.0 <=14.x",
-		"ios sdk": ">=13.0 <=16.x"
+		"xcode": ">=12.0 <=16.x",
+		"ios sdk": ">=13.0 <=18.x"
 	},
 	"engines": {
 		"node": ">=16.0.0"

From a305e40a83aa3407965da40fd0d2db5a960a1ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Mon, 30 Sep 2024 10:00:49 +0200
Subject: [PATCH 47/55] chore: update ioslib to 1.7.39 to support Xcode 16
 provisioning profile handling

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 250900030d4..3d7b346a791 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "ejs": "3.1.9",
         "fields": "0.1.24",
         "fs-extra": "11.2.0",
-        "ioslib": "1.7.38",
+        "ioslib": "1.7.39",
         "liveview": "1.5.6",
         "lodash.merge": "4.6.2",
         "markdown": "0.5.0",
@@ -8822,9 +8822,9 @@
       }
     },
     "node_modules/ioslib": {
-      "version": "1.7.38",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.38.tgz",
-      "integrity": "sha512-b73D5Erc4QanbEWCM2hCTfi4B6rPmyxUeNZ3ztAIRD7ukF/9BpvTTmDpoNtUjY40lhmd9nDAwxkZRTSh03BX4g==",
+      "version": "1.7.39",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.39.tgz",
+      "integrity": "sha512-pe97cEv+6iABzP5lCLC1JELH77acunEvSxKl4YG+xLL4PqpRnNOaqKfp6omjpFJMLAHBo1CuOIUL5tk2gkYjLA==",
       "dependencies": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
@@ -22725,9 +22725,9 @@
       }
     },
     "ioslib": {
-      "version": "1.7.38",
-      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.38.tgz",
-      "integrity": "sha512-b73D5Erc4QanbEWCM2hCTfi4B6rPmyxUeNZ3ztAIRD7ukF/9BpvTTmDpoNtUjY40lhmd9nDAwxkZRTSh03BX4g==",
+      "version": "1.7.39",
+      "resolved": "https://registry.npmjs.org/ioslib/-/ioslib-1.7.39.tgz",
+      "integrity": "sha512-pe97cEv+6iABzP5lCLC1JELH77acunEvSxKl4YG+xLL4PqpRnNOaqKfp6omjpFJMLAHBo1CuOIUL5tk2gkYjLA==",
       "requires": {
         "always-tail": "0.2.0",
         "async": "^3.2.4",
diff --git a/package.json b/package.json
index 37a3a135870..e9575c117c4 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "ejs": "3.1.9",
     "fields": "0.1.24",
     "fs-extra": "11.2.0",
-    "ioslib": "1.7.38",
+    "ioslib": "1.7.39",
     "liveview": "1.5.6",
     "lodash.merge": "4.6.2",
     "markdown": "0.5.0",

From 630ca6d9a498603c2d645a7ff5020760a0d0ac39 Mon Sep 17 00:00:00 2001
From: Chris Barber <chris@cb1inc.com>
Date: Tue, 1 Oct 2024 00:35:06 -0500
Subject: [PATCH 48/55] fix(android): fix toString() call when adb devices
 fails (#14128)

---
 android/cli/hooks/run.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/cli/hooks/run.js b/android/cli/hooks/run.js
index 7d73130d830..091ed7f9458 100644
--- a/android/cli/hooks/run.js
+++ b/android/cli/hooks/run.js
@@ -87,7 +87,7 @@ exports.init = function (logger, config, cli) {
 				const adb = new ADB(config);
 				adb.devices(function (err, devices) {
 					if (err) {
-						err.toString.split('\n').forEach(logger.error);
+						err.toString().split('\n').forEach(logger.error);
 						logger.log();
 						process.exit(1);
 					}

From eb284db25b4eec9fb941989a387a20d501c5e822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= <h.knoechel@lambus.com>
Date: Wed, 2 Oct 2024 12:59:02 +0200
Subject: [PATCH 49/55] chore: add 12.5.1 changelog

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 584645fff44..c5759037ef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+## [12.5.1](https://github.com/tidev/titanium_mobile/compare/12_5_0_GA...12.5.1) (2024-10-02)
+
+## About this release
+
+Titanium SDK 12.5.1 is a patch release of the SDK, addressing high-priority issues from previous releases.
+
+As of this GA release, the previous Titanium SDK patch release (12.5.0) is no longer supported.
+
+## Community Credits
+
+* Hans Knöchel
+  * update ioslib to 1.7.38 to fix incremental builds in Xcode 16 ([a72b174](https://github.com/tidev/titanium_mobile/commit/a72b174030844f48b3bc173a13cb55ad639d31b9))
+  * update ioslib to 1.7.39 to support Xcode 16 provisioning profile handling ([a762523](https://github.com/tidev/titanium_mobile/commit/a762523f887c458f4312db8d664dbe33abb45d65))
+  * update compatibility for iOS 18+ and Xcode 16+ ([a55e6a8](https://github.com/tidev/titanium_mobile/commit/a55e6a8929a654dc8fbba53f810930f75b9c9891))
+
+* Prashant Saini
+  * marker event was only triggered for first and last visible section items ([edc6163](https://github.com/tidev/titanium_mobile/commit/edc6163ed1a6e267e3022d6f8aa1e0ff09999013))
+  * ListView has empty cells while scrolling up/down (#14119) ([d4abe90](https://github.com/tidev/titanium_mobile/commit/d4abe90817a7b971c9b3ac77149635277c4923c2))
+
+* Michael Gangolf
+  * allow ignoreLog to be a single string ([15b0eb6](https://github.com/tidev/titanium_mobile/commit/15b0eb64f8fec642b51895ccca7f7922704f1f33))
+  * fix ListView layout with header and footer only ([3012280](https://github.com/tidev/titanium_mobile/commit/3012280a418bc354bbfb7c1762ca0a241e696131))
+
+## Bug Fixes
+
+### Multiple platforms
+
+* allow ignoreLog to be a single string ([15b0eb6](https://github.com/tidev/titanium_mobile/commit/15b0eb64f8fec642b51895ccca7f7922704f1f33))
+* update ioslib to 1.7.38 to fix incremental builds in Xcode 16 ([a72b174](https://github.com/tidev/titanium_mobile/commit/a72b174030844f48b3bc173a13cb55ad639d31b9))
+
+### Android platform
+
+* fix ListView layout with header and footer only ([3012280](https://github.com/tidev/titanium_mobile/commit/3012280a418bc354bbfb7c1762ca0a241e696131))
+* fix toString() call when adb devices fails ([a6870b9](https://github.com/tidev/titanium_mobile/commit/a6870b9eca47f3e78f96f6c3c11f42dc7f42ffa4))
+
+## 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.5.0](https://github.com/tidev/titanium_mobile/compare/12_4_X...12.5.0) (2024-09-16)
 
 ## About this release

From b8d1a8fe6a8a7b6c4d2209f2873f4a3eb0c52981 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:53:54 +0200
Subject: [PATCH 50/55] fix(android): build module with example app (#14133)

* fix(android): build module with example app

* Update android/cli/commands/_buildModule.js

Co-authored-by: Chris Barber <chris@cb1inc.com>

---------

Co-authored-by: Chris Barber <chris@cb1inc.com>
---
 android/cli/commands/_buildModule.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
index 144c65b7c4a..46258b9af1c 100644
--- a/android/cli/commands/_buildModule.js
+++ b/android/cli/commands/_buildModule.js
@@ -58,7 +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;
+	this.tiSdkVersion = this.cli.sdk.name;
 
 	// Determine if the "manifest" file's "apiversion" needs updating.
 	let isApiVersionUpdateRequired = false;

From 81d5d1e79b13f6677041256e7416f72662c2f2dc Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Sat, 5 Oct 2024 16:23:05 +0200
Subject: [PATCH 51/55] feat(ios): add direction to ListView scrolling (#14130)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(ios): add direction to ListView scrolling

* Update iphone/Classes/TiUIListView.m

Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>

* fix: fix “direction” event attribute default

* fix: fix incorrect type

* chore: align “unknown” value with Android, update docs

---------

Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>
Co-authored-by: Hans Knöchel <h.knoechel@lambus.com>
---
 .../ui/widget/listview/TiListView.java         |  2 ++
 apidoc/Titanium/UI/ListView.yml                |  2 +-
 apidoc/Titanium/UI/TableView.yml               |  2 +-
 iphone/Classes/TiUIListView.m                  | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
index 2efb68fd889..a169a10a0cc 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -153,6 +153,8 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy)
 						payload.put(TiC.PROPERTY_DIRECTION, "up");
 					} else if (dy < 0) {
 						payload.put(TiC.PROPERTY_DIRECTION, "down");
+					} else {
+						payload.put(TiC.PROPERTY_DIRECTION, "unknown");
 					}
 					payload.put(TiC.EVENT_PROPERTY_VELOCITY, 0);
 					if (continuousUpdate) {
diff --git a/apidoc/Titanium/UI/ListView.yml b/apidoc/Titanium/UI/ListView.yml
index 5cbb58e0f68..b6ac0a46f03 100644
--- a/apidoc/Titanium/UI/ListView.yml
+++ b/apidoc/Titanium/UI/ListView.yml
@@ -648,7 +648,7 @@ events:
         ipad: 5.4.0
     properties:
       - name: direction
-        summary: Direction of the scroll either 'up', or 'down'.
+        summary: Direction of the scroll either 'up', 'down' or 'unknown'.
         type: String
 
       - name: velocity
diff --git a/apidoc/Titanium/UI/TableView.yml b/apidoc/Titanium/UI/TableView.yml
index 07837bbb172..6b53a579a52 100644
--- a/apidoc/Titanium/UI/TableView.yml
+++ b/apidoc/Titanium/UI/TableView.yml
@@ -453,7 +453,7 @@ events:
     since: { android: "2.1.0", iphone: "2.1.0", ipad: "2.1.0" }
     properties:
       - name: direction
-        summary: Direction of the swipe, either `left` or `right`.
+        summary: Direction of the swipe, either `left`, `right` or `unknown`.
         type: String
 
       - name: index
diff --git a/iphone/Classes/TiUIListView.m b/iphone/Classes/TiUIListView.m
index ae821bb0393..6a570920fc3 100644
--- a/iphone/Classes/TiUIListView.m
+++ b/iphone/Classes/TiUIListView.m
@@ -24,6 +24,7 @@ @interface TiUIListView ()
 @property (nonatomic, readonly) TiUIListViewProxy *listViewProxy;
 @property (nonatomic, copy, readwrite) NSString *searchString;
 @property (nonatomic, copy, readwrite) NSString *searchedString;
+@property (nonatomic, assign) CGFloat lastContentOffset;
 @end
 
 static TiViewProxy *FindViewProxyWithBindIdContainingPoint(UIView *view, CGPoint point);
@@ -79,8 +80,8 @@ @implementation TiUIListView {
   BOOL isSearched;
   UIView *dimmingView;
   BOOL isSearchBarInNavigation;
-  int lastVisibleItem;
-  int lastVisibleSection;
+  NSInteger lastVisibleItem;
+  NSInteger lastVisibleSection;
   BOOL forceUpdates;
 }
 
@@ -2011,6 +2012,15 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
         TiUIListSectionProxy *section;
         CGFloat topSpacing = scrollView.contentOffset.y + scrollView.adjustedContentInset.top;
 
+        NSString *direction = @"unknown";
+
+        if (self.lastContentOffset > scrollView.contentOffset.y) {
+          direction = @"down";
+        } else if (self.lastContentOffset < scrollView.contentOffset.y) {
+          direction = @"up";
+        }
+        self.lastContentOffset = scrollView.contentOffset.y;
+
         if ([indexPaths count] > 0) {
           NSIndexPath *indexPath = [self pathForSearchPath:[indexPaths objectAtIndex:0]];
           NSUInteger visibleItemCount = [indexPaths count];
@@ -2022,6 +2032,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
           [eventArgs setValue:section forKey:@"firstVisibleSection"];
           [eventArgs setValue:[section itemAtIndex:[indexPath row]] forKey:@"firstVisibleItem"];
           [eventArgs setValue:NUMINTEGER(topSpacing) forKey:@"top"];
+          [eventArgs setValue:direction forKey:@"direction"];
 
           if (lastVisibleItem != [indexPath row] || lastVisibleSection != [indexPath section] || forceUpdates) {
             // only log if the item changes or forced
@@ -2038,6 +2049,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
           [eventArgs setValue:section forKey:@"firstVisibleSection"];
           [eventArgs setValue:NUMINTEGER(-1) forKey:@"firstVisibleItem"];
           [eventArgs setValue:NUMINTEGER(topSpacing) forKey:@"top"];
+          [eventArgs setValue:direction forKey:@"direction"];
         }
       });
     }
@@ -2110,7 +2122,7 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
 {
   if ([[self proxy] _hasListeners:@"scrolling"]) {
-    NSString *direction = nil;
+    NSString *direction = @"unknown";
 
     if (velocity.y > 0) {
       direction = @"up";

From 5dd0259b7a2310f92f45f78e52913437d93b4677 Mon Sep 17 00:00:00 2001
From: Abdullah Al-Faqeir <abdullah.alfaqeir@gmail.com>
Date: Thu, 17 Oct 2024 11:36:10 +0300
Subject: [PATCH 52/55] fix(android): fixing not finding themes when building
 sdk app.js (#14136)

---
 android/gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/gradle.properties b/android/gradle.properties
index 04ede8b4816..073e209f36e 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -12,3 +12,4 @@ org.gradle.jvmargs=-Xmx1536m
 # Note: Jetifier is not needed for test app since it doesn't use Google's deprecated support libraries.
 android.useAndroidX=true
 android.enableJetifier=false
+android.nonTransitiveRClass=false

From 6f0d755e05a01d5abbc66d5610af5f6fdfdceaf8 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Thu, 17 Oct 2024 10:38:04 +0200
Subject: [PATCH 53/55] feat(android): enable gradle config caching (#14135)

---
 android/cli/commands/_build.js       | 2 +-
 android/cli/commands/_buildModule.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
index 234b92aecb9..522adb32ceb 100644
--- a/android/cli/commands/_build.js
+++ b/android/cli/commands/_build.js
@@ -2154,9 +2154,9 @@ AndroidBuilder.prototype.generateRootProjectFiles = async function generateRootP
 	const gradleProperties = await gradlew.fetchDefaultGradleProperties();
 	gradleProperties.push({ key: 'android.useAndroidX', value: 'true' });
 	gradleProperties.push({ key: 'android.enableJetifier', value: 'true' });
-	gradleProperties.push({ key: 'android.suppressUnsupportedCompileSdk', value: '33' });
 	gradleProperties.push({ key: 'android.nonTransitiveRClass', value: 'false' });
 	gradleProperties.push({ key: 'org.gradle.jvmargs', value: `-Xmx${this.javacMaxMemory}` });
+	gradleProperties.push({ key: 'org.gradle.configuration-cache', value: 'true' });
 	await gradlew.writeGradlePropertiesFile(gradleProperties);
 
 	// Copy optional "gradle.properties" file contents from Titanium project to the above generated file.
diff --git a/android/cli/commands/_buildModule.js b/android/cli/commands/_buildModule.js
index 46258b9af1c..84614b78f57 100644
--- a/android/cli/commands/_buildModule.js
+++ b/android/cli/commands/_buildModule.js
@@ -496,7 +496,6 @@ AndroidModuleBuilder.prototype.generateRootProjectFiles = async function generat
 	// Create a "gradle.properties" file. Will add network proxy settings if needed.
 	const gradleProperties = await gradlew.fetchDefaultGradleProperties();
 	gradleProperties.push({ key: 'android.useAndroidX', value: 'true' });
-	gradleProperties.push({ key: 'android.suppressUnsupportedCompileSdk', value: '33' });
 	gradleProperties.push({
 		key: 'org.gradle.jvmargs',
 		value: `-Xmx${this.javacMaxMemory} -Dkotlin.daemon.jvm.options="-Xmx${this.javacMaxMemory}"`

From 62e9d4abfdaf893b854465b8d0766fa662ca6f35 Mon Sep 17 00:00:00 2001
From: Douglas Alves <douglas_ufop@yahoo.com.br>
Date: Thu, 17 Oct 2024 06:46:51 -0300
Subject: [PATCH 54/55] fix: handle x/y position for touch in dragstart/dragend
 events on iOS (#14134)

* fix: handle x/y position for touch in dragstart/dragend events on iOS

* fix: handle x/y position for touch in dragstart/dragend events on iOS

* refactor: rename 'drag_dict' to 'dict' for better consistency

---------

Co-authored-by: Michael Gangolf <m1ga@users.noreply.github.com>
---
 iphone/Classes/TiUIScrollViewProxy.m | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/iphone/Classes/TiUIScrollViewProxy.m b/iphone/Classes/TiUIScrollViewProxy.m
index 33f75a7fa79..ae16566b8e1 100644
--- a/iphone/Classes/TiUIScrollViewProxy.m
+++ b/iphone/Classes/TiUIScrollViewProxy.m
@@ -430,23 +430,36 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)vi
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 {
+  CGPoint offset = [scrollView contentOffset];
+  NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
+                                         NUMFLOAT(offset.x), @"x",
+                                     NUMFLOAT(offset.y), @"y",
+                                     NUMBOOL([scrollView isDecelerating]), @"decelerating",
+                                     [TiUtils sizeToDictionary:scrollView.contentSize], @"contentSize",
+                                     nil];
   if ([self _hasListeners:@"dragStart"]) { // TODO: Deprecate old event
-    [self fireEvent:@"dragStart" withObject:nil];
+    [self fireEvent:@"dragStart" withObject:dict];
   }
   if ([self _hasListeners:@"dragstart"]) {
-    [self fireEvent:@"dragstart" withObject:nil];
+    [self fireEvent:@"dragstart" withObject:dict];
   }
 }
 
 // listerner which tells when dragging ended in the scroll view.
-
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
 {
+  CGPoint offset = [scrollView contentOffset];
+  NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
+                                         NUMFLOAT(offset.x), @"x",
+                                     NUMFLOAT(offset.y), @"y",
+                                     [NSNumber numberWithBool:decelerate], @"decelerate", nil,
+                                     [TiUtils sizeToDictionary:scrollView.contentSize], @"contentSize",
+                                     nil];
   if ([self _hasListeners:@"dragEnd"]) { // TODO: Deprecate old event
-    [self fireEvent:@"dragEnd" withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:decelerate], @"decelerate", nil]];
+    [self fireEvent:@"dragEnd" withObject:dict];
   }
   if ([self _hasListeners:@"dragend"]) {
-    [self fireEvent:@"dragend" withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:decelerate], @"decelerate", nil]];
+    [self fireEvent:@"dragend" withObject:dict];
   }
 }
 

From 70073c425c72d7e3a62ed2bb749c896b0cff832b Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:04:33 +0200
Subject: [PATCH 55/55] feat(android): add x/y to ScrollView drag events
 (#14102)

* feat(android): add x/y to ScrollView drag events

* docs

* docs
---
 .../titanium/ui/widget/TiUIScrollView.java      | 17 +++++++++++++++++
 apidoc/Titanium/UI/ScrollView.yml               | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
index 4dded6d0761..7dc6474ab45 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
@@ -53,6 +53,8 @@ public class TiUIScrollView extends TiUIView
 	private static int verticalAttrId = -1;
 	private static int horizontalAttrId = -1;
 	private int type;
+	private TiDimension xDimension;
+	private TiDimension yDimension;
 
 	public class TiScrollViewLayout extends TiCompositeLayout
 	{
@@ -405,6 +407,9 @@ public TiScrollViewLayout getLayout()
 		@Override
 		public boolean onTouchEvent(MotionEvent event)
 		{
+			xDimension = new TiDimension((double) event.getX(), TiDimension.TYPE_LEFT);
+			yDimension = new TiDimension((double) event.getY(), TiDimension.TYPE_TOP);
+
 			if (event.getAction() == MotionEvent.ACTION_MOVE && !mScrollingEnabled) {
 				return false;
 			}
@@ -416,6 +421,9 @@ public boolean onTouchEvent(MotionEvent event)
 				isTouching = false;
 				KrollDict data = new KrollDict();
 				data.put("decelerate", true);
+
+				data.put(TiC.EVENT_PROPERTY_X, xDimension.getAsDefault(scrollView));
+				data.put(TiC.EVENT_PROPERTY_Y, yDimension.getAsDefault(scrollView));
 				getProxy().fireEvent(TiC.EVENT_DRAGEND, data);
 			}
 			//There's a known Android bug (version 3.1 and above) that will throw an exception when we use 3+ fingers to touch the scrollview.
@@ -475,6 +483,8 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt)
 			if (!isScrolling && isTouching) {
 				isScrolling = true;
 				KrollDict data = new KrollDict();
+				data.put(TiC.EVENT_PROPERTY_X, xDimension.getAsDefault(scrollView));
+				data.put(TiC.EVENT_PROPERTY_Y, yDimension.getAsDefault(scrollView));
 				getProxy().fireEvent(TiC.EVENT_DRAGSTART, data);
 			}
 
@@ -553,6 +563,9 @@ public TiScrollViewLayout getLayout()
 		@Override
 		public boolean onTouchEvent(MotionEvent event)
 		{
+			xDimension = new TiDimension((double) event.getX(), TiDimension.TYPE_LEFT);
+			yDimension = new TiDimension((double) event.getY(), TiDimension.TYPE_TOP);
+
 			if (event.getAction() == MotionEvent.ACTION_MOVE && !mScrollingEnabled) {
 				return false;
 			}
@@ -564,6 +577,8 @@ public boolean onTouchEvent(MotionEvent event)
 				isTouching = false;
 				KrollDict data = new KrollDict();
 				data.put("decelerate", true);
+				data.put(TiC.EVENT_PROPERTY_X, xDimension.getAsDefault(scrollView));
+				data.put(TiC.EVENT_PROPERTY_Y, yDimension.getAsDefault(scrollView));
 				getProxy().fireEvent(TiC.EVENT_DRAGEND, data);
 			}
 			//There's a known Android bug (version 3.1 and above) that will throw an exception when we use 3+ fingers to touch the scrollview.
@@ -603,6 +618,8 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt)
 
 			if (!isScrolling && isTouching) {
 				isScrolling = true;
+				data.put(TiC.EVENT_PROPERTY_X, xDimension.getAsDefault(scrollView));
+				data.put(TiC.EVENT_PROPERTY_Y, yDimension.getAsDefault(scrollView));
 				getProxy().fireEvent(TiC.EVENT_DRAGSTART, data);
 			}
 
diff --git a/apidoc/Titanium/UI/ScrollView.yml b/apidoc/Titanium/UI/ScrollView.yml
index 9121ebabc8d..ab0d72c79b9 100644
--- a/apidoc/Titanium/UI/ScrollView.yml
+++ b/apidoc/Titanium/UI/ScrollView.yml
@@ -198,6 +198,14 @@ events:
         A dragging gesture is when a touch remains in contact with the display to physically drag
         the view, as opposed to it being the result of scrolling momentum.
     platforms: [android, iphone, ipad, macos]
+    properties:
+      - name: x
+        summary: X coordinate from the scrollable touch position.
+        type: Number
+
+      - name: y
+        summary: Y coordinate from the scrollable touch position.
+        type: Number
     since: { iphone: "3.0.0", ipad: "3.0.0", android: "6.2.0" }
 
   - name: dragend
@@ -213,6 +221,13 @@ events:
             been released by the touch. If `false`, scrolling will stop immediately.
             Is always `true` on Android.
         type: Boolean
+      - name: x
+        summary: X coordinate from the scrollable touch position.
+        type: Number
+
+      - name: y
+        summary: Y coordinate from the scrollable touch position.
+        type: Number
     since: { iphone: "3.0.0", ipad: "3.0.0", android: "6.2.0" }
 
 properties: