From 06248ecf7eb424e3584b9733f5c0703ba8e3a0d9 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Sun, 15 Dec 2024 14:56:57 +0100 Subject: [PATCH 1/5] feat(android): refreshControl offset property (#13970) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(android): refreshControl offset property * feat(android): refreshControl offset property * docs * Update RefreshControl.yml --------- Co-authored-by: Hans Knöchel --- .../titanium/ui/RefreshControlProxy.java | 23 +++++++++++++++---- apidoc/Titanium/UI/RefreshControl.yml | 17 ++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) 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 f4a8fd62783..c5f5a82f61d 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 @@ -13,7 +13,9 @@ import org.appcelerator.kroll.annotations.Kroll; import org.appcelerator.kroll.common.Log; import org.appcelerator.titanium.TiC; +import org.appcelerator.titanium.TiDimension; import org.appcelerator.titanium.util.TiColorHelper; +import org.appcelerator.titanium.util.TiConvert; import java.util.HashSet; @@ -30,7 +32,8 @@ public class RefreshControlProxy extends KrollProxy * The default Android log tag name to be used by this class. */ private static final String TAG = "RefreshControlProxy"; - + private static int offsetStart = -1; + private static int offsetEnd = -1; /** * Android's default progress indicator color used by the SwipeRefreshLayout class. * This is defined in Google's "MaterialProgressDrawable.java", which is an internal class. @@ -134,9 +137,18 @@ public void handleCreationDict(KrollDict properties) super.handleCreationDict(properties); // Fetch "tintColor" property, if provided. - value = properties.get(TiC.PROPERTY_TINT_COLOR); - if (value != null) { - onTintColorChanged(value); + if (properties.containsKeyAndNotNull(TiC.PROPERTY_TINT_COLOR)) { + value = properties.get(TiC.PROPERTY_TINT_COLOR); + if (value != null) { + onTintColorChanged(value); + } + } + if (properties.containsKeyAndNotNull("offset")) { + KrollDict offset = properties.getKrollDict("offset"); + offsetStart = new TiDimension(TiConvert.toInt(offset.get("start"), 0), TiDimension.TYPE_TOP) + .getAsPixels(this.swipeRefreshLayout); + offsetEnd = new TiDimension(TiConvert.toInt(offset.get("end"), 80), TiDimension.TYPE_BOTTOM) + .getAsPixels(this.swipeRefreshLayout); } } @@ -275,6 +287,9 @@ public void assignTo(TiSwipeRefreshLayout view) // Set up the given view for pull-down refresh support. view.setColorSchemeColors(this.tintColor); + if (offsetStart != -1 && offsetEnd != -1) { + view.setProgressViewOffset(false, offsetStart, offsetEnd); + } view.setSwipeRefreshEnabled(true); view.setOnRefreshListener(new TiSwipeRefreshLayout.OnRefreshListener() { diff --git a/apidoc/Titanium/UI/RefreshControl.yml b/apidoc/Titanium/UI/RefreshControl.yml index 1abd9a4c6c8..d3c78eb2b35 100644 --- a/apidoc/Titanium/UI/RefreshControl.yml +++ b/apidoc/Titanium/UI/RefreshControl.yml @@ -55,6 +55,13 @@ properties: platforms: [android, iphone, ipad, macos] since: { android: "6.2.0", iphone: "3.2.0", ipad: "3.2.0" } + - name: offset + summary: Offset of the refresh control view. + type: RefreshControlOffset + platforms: [android] + since: { android: "12.7.0" } + availability: creation + - name: backgroundColor summary: The background color for the refresh control, as a color name or hex triplet. description: | @@ -146,3 +153,13 @@ examples: $.index.open(); ``` +--- +name: RefreshControlOffset +summary: Offset of the refresh control view. +properties: + - name: start + summary: The offset from the top of this view at which the progress spinner should appear. + type: Number + - name: end + summary: The offset from the top of this view at which the progress spinner should come to rest after a successful swipe gesture. + type: Number From 6352c2790f51e70016a073af7560402ad29be5cb Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Sun, 15 Dec 2024 14:57:47 +0100 Subject: [PATCH 2/5] chore(android): library updates (#14155) * chore(android): library updates * spaces/tabs --- android/app/build.gradle | 3 ++- android/package.json | 2 +- android/templates/build/ti.constants.gradle | 8 ++++---- android/titanium/build.gradle | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2577c868951..d89cdc7bbfd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -9,7 +9,7 @@ apply plugin: 'com.android.application' // Set up Android app project. android { - compileSdkVersion 34 + compileSdkVersion 34 ndkVersion project.ext.tiNdkVersion defaultConfig { applicationId 'com.titanium.test' @@ -86,6 +86,7 @@ dependencies { // exclude group: 'com.google.android.gms' } + implementation "androidx.activity:activity:1.8.0" implementation "androidx.appcompat:appcompat:${project.ext.tiAndroidXAppCompatLibVersion}" implementation "com.google.android.material:material:${project.ext.tiMaterialLibVersion}" } diff --git a/android/package.json b/android/package.json index cb890f2d580..72d1b882847 100644 --- a/android/package.json +++ b/android/package.json @@ -17,7 +17,7 @@ "integrity": "sha512-A0tV+fYtkpKfIF5roRTCFPtdULMFygmfWlEuuHOBjC3q4rz/mKnAsJTYBlqayC/4oYEWehj867Oh1o6vy26XHQ==" }, "minSDKVersion": "21", - "compileSDKVersion": "33", + "compileSDKVersion": "34", "vendorDependencies": { "android sdk": ">=23.x <=34.x", "android build tools": ">=30.0.2 <=34.x", diff --git a/android/templates/build/ti.constants.gradle b/android/templates/build/ti.constants.gradle index 6988acc5601..27cf7beb9c3 100644 --- a/android/templates/build/ti.constants.gradle +++ b/android/templates/build/ti.constants.gradle @@ -7,11 +7,11 @@ project.ext { tiNdkVersion = '26.2.11394342' - tiAndroidXAppCompatLibVersion = '1.4.1' + tiAndroidXAppCompatLibVersion = '1.7.0' tiAndroidXCoreLibVersion = '1.9.0' - tiAndroidXFragmentLibVersion = '1.5.7' - tiMaterialLibVersion = '1.6.1' - tiPlayServicesBaseLibVersion = '18.2.0' + tiAndroidXFragmentLibVersion = '1.7.1' + tiMaterialLibVersion = '1.12.0' + tiPlayServicesBaseLibVersion = '18.3.0' tiManifestPlaceholders = [ tiActivityConfigChanges: 'density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode' ] diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle index c3078c48701..a5909b6a936 100644 --- a/android/titanium/build.gradle +++ b/android/titanium/build.gradle @@ -46,7 +46,7 @@ android { ndkVersion project.ext.tiNdkVersion namespace 'org.appcelerator.titanium' defaultConfig { - compileSdk 33 + compileSdk 34 minSdkVersion 21 targetSdkVersion 34 versionName tiBuildVersionString @@ -284,11 +284,11 @@ dependencies { implementation 'androidx.drawerlayout:drawerlayout:1.2.0' implementation 'androidx.exifinterface:exifinterface:1.3.7' implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}" - implementation 'androidx.media:media:1.6.0' + implementation 'androidx.media:media:1.7.0' 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' + implementation 'androidx.transition:transition:1.5.1' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' From 5f12318b916921303cb683fd1db948df6a998090 Mon Sep 17 00:00:00 2001 From: hansemannn Date: Tue, 17 Dec 2024 00:07:23 +0000 Subject: [PATCH 3/5] Apply automatic changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba6d453b005..068b1d6f24a 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) 🚀. -Rodrigo FarfánMatt Delmarterdlewis23Daniel EthierJoe KniesekVittorio SorberaMarcus OlovssonAlessandro La RoccaReshopperGusJason David MillerMichael ZaladonisVincenzo QuacquarelliMighty GmbHFruugulKorelogic LimitedLibemaxJohn GouldPatrick Mounteney +User avatar: Rodrigo FarfánUser avatar: Matt DelmarterUser avatar: dlewis23User avatar: Daniel EthierUser avatar: Joe KniesekUser avatar: User avatar: Vittorio SorberaUser avatar: Marcus OlovssonUser avatar: User avatar: Alessandro La RoccaUser avatar: ReshopperUser avatar: GusUser avatar: Jason David MillerUser avatar: Michael ZaladonisUser avatar: Vincenzo QuacquarelliUser avatar: Mighty GmbHUser avatar: FruugulUser avatar: Korelogic LimitedUser avatar: LibemaxUser avatar: User avatar: John GouldUser avatar: User avatar: Patrick Mounteney ## Features From e00517ec04c844ad30911a51f0f8ad595defb83c Mon Sep 17 00:00:00 2001 From: hansemannn Date: Wed, 18 Dec 2024 00:07:16 +0000 Subject: [PATCH 4/5] Apply automatic changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 068b1d6f24a..c8b3f977cbc 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) 🚀. -User avatar: Rodrigo FarfánUser avatar: Matt DelmarterUser avatar: dlewis23User avatar: Daniel EthierUser avatar: Joe KniesekUser avatar: User avatar: Vittorio SorberaUser avatar: Marcus OlovssonUser avatar: User avatar: Alessandro La RoccaUser avatar: ReshopperUser avatar: GusUser avatar: Jason David MillerUser avatar: Michael ZaladonisUser avatar: Vincenzo QuacquarelliUser avatar: Mighty GmbHUser avatar: FruugulUser avatar: Korelogic LimitedUser avatar: LibemaxUser avatar: User avatar: John GouldUser avatar: User avatar: Patrick Mounteney +User avatar: Rodrigo FarfánUser avatar: Matt DelmarterUser avatar: dlewis23User avatar: Daniel EthierUser avatar: Joe KniesekUser avatar: User avatar: Vittorio SorberaUser avatar: Marcus OlovssonUser avatar: User avatar: Alessandro La RoccaUser avatar: ReshopperUser avatar: GusUser avatar: Jason David MillerUser avatar: Michael ZaladonisUser avatar: Vincenzo QuacquarelliUser avatar: Mighty GmbHUser avatar: FruugulUser avatar: Korelogic LimitedUser avatar: LibemaxUser avatar: User avatar: John GouldUser avatar: User avatar: Patrick Mounteney ## Features From 48871cedecf571cfa38d86e8b23bca295aa3fd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= Date: Thu, 19 Dec 2024 15:16:47 +0100 Subject: [PATCH 5/5] chore: add 12.6.1.GA changelog --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e06e5894240..4e51dd3dc38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,32 @@ +## [12.6.1](https://github.com/tidev/titanium_mobile/compare/12_6_0_GA...12.6.1) (2024-12-19) + +## About this release + +Titanium SDK 12.6.1 is a patch release of the SDK, addressing a regression related to click events on iOS from 12.6.0. + +## Community Credits + +* Michael Gangolf + * ios workflow update ([94d9cac](https://github.com/tidev/titanium_mobile/commit/94d9cace7c98d8b670e20bd0f56ac0fe839b86da)) + +* Hans Knöchel + * Revert "fix(android): ios click speed (#14115)" (#14153) ([53227e4](https://github.com/tidev/titanium_mobile/commit/53227e41b2855dcc5008b43fecd0c4720d22c073)) + * bump version ([82d9471](https://github.com/tidev/titanium_mobile/commit/82d9471170bb6f19526d94d87353e9d8b689e081)) + +## SDK Module Versions + +| Module | Android version | iOS Version | +| ----------- | --------------- | ----------- | +| facebook | 13.0.0 | 15.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.9 | 7.0.9 | + # [12.6.0](https://github.com/tidev/titanium_mobile/compare/12_5_X...12.6.0) (2024-12-12) ## About this release