Skip to content

Commit

Permalink
Merge branch 'master' into androidCachedImages
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga authored Jan 5, 2025
2 parents 5ee3e99 + f91b91a commit 16c9e76
Show file tree
Hide file tree
Showing 11 changed files with 160 additions and 53 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/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/libemax"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;14237762?u&#x3D;210b40bc55fe2f6882100c67e342adde475c0354&amp;v&#x3D;4" width="60px" alt="Libemax" /></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/victorpl"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;8822713?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/PatrickMounteney"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;6619497?v&#x3D;4" width="60px" alt="Patrick Mounteney" /></a><!-- sponsors -->
<!-- sponsors --><a href="https://github.com/phobeous"><img src="https:&#x2F;&#x2F;github.com&#x2F;phobeous.png" width="60px" alt="User avatar: Rodrigo Farfán" /></a><a href="https://github.com/de1mat"><img src="https:&#x2F;&#x2F;github.com&#x2F;de1mat.png" width="60px" alt="User avatar: Matt Delmarter" /></a><a href="https://github.com/dlewis23"><img src="https:&#x2F;&#x2F;github.com&#x2F;dlewis23.png" width="60px" alt="User avatar: dlewis23" /></a><a href="https://github.com/dethier1958"><img src="https:&#x2F;&#x2F;github.com&#x2F;dethier1958.png" width="60px" alt="User avatar: Daniel Ethier" /></a><a href="https://github.com/zenjoe"><img src="https:&#x2F;&#x2F;github.com&#x2F;zenjoe.png" width="60px" alt="User avatar: Joe Kniesek" /></a><a href="https://github.com/desarrollogotit"><img src="https:&#x2F;&#x2F;github.com&#x2F;desarrollogotit.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/Astrovic"><img src="https:&#x2F;&#x2F;github.com&#x2F;Astrovic.png" width="60px" alt="User avatar: Vittorio Sorbera" /></a><a href="https://github.com/Arood"><img src="https:&#x2F;&#x2F;github.com&#x2F;Arood.png" width="60px" alt="User avatar: Marcus Olovsson" /></a><a href="https://github.com/Rearmachine"><img src="https:&#x2F;&#x2F;github.com&#x2F;Rearmachine.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/alexlarocca"><img src="https:&#x2F;&#x2F;github.com&#x2F;alexlarocca.png" width="60px" alt="User avatar: Alessandro La Rocca" /></a><a href="https://github.com/reshopper"><img src="https:&#x2F;&#x2F;github.com&#x2F;reshopper.png" width="60px" alt="User avatar: Reshopper" /></a><a href="https://github.com/safadig"><img src="https:&#x2F;&#x2F;github.com&#x2F;safadig.png" width="60px" alt="User avatar: Gus" /></a><a href="https://github.com/designbymind"><img src="https:&#x2F;&#x2F;github.com&#x2F;designbymind.png" width="60px" alt="User avatar: Jason David Miller" /></a><a href="https://github.com/greatschism"><img src="https:&#x2F;&#x2F;github.com&#x2F;greatschism.png" width="60px" alt="User avatar: Michael Zaladonis" /></a><a href="https://github.com/enzoq"><img src="https:&#x2F;&#x2F;github.com&#x2F;enzoq.png" width="60px" alt="User avatar: Vincenzo Quacquarelli" /></a><a href="https://github.com/mighty-office"><img src="https:&#x2F;&#x2F;github.com&#x2F;mighty-office.png" width="60px" alt="User avatar: Mighty GmbH" /></a><a href="https://github.com/Fruugul"><img src="https:&#x2F;&#x2F;github.com&#x2F;Fruugul.png" width="60px" alt="User avatar: Fruugul" /></a><a href="https://github.com/korelogic"><img src="https:&#x2F;&#x2F;github.com&#x2F;korelogic.png" width="60px" alt="User avatar: Korelogic Limited" /></a><a href="https://github.com/libemax"><img src="https:&#x2F;&#x2F;github.com&#x2F;libemax.png" width="60px" alt="User avatar: Libemax" /></a><a href="https://github.com/eddyinet"><img src="https:&#x2F;&#x2F;github.com&#x2F;eddyinet.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/gouldjw"><img src="https:&#x2F;&#x2F;github.com&#x2F;gouldjw.png" width="60px" alt="User avatar: John Gould" /></a><a href="https://github.com/victorpl"><img src="https:&#x2F;&#x2F;github.com&#x2F;victorpl.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/PatrickMounteney"><img src="https:&#x2F;&#x2F;github.com&#x2F;PatrickMounteney.png" width="60px" alt="User avatar: Patrick Mounteney" /></a><!-- sponsors -->

## Features

Expand Down
3 changes: 2 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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.
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion android/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions android/templates/build/ti.constants.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
Expand Down
6 changes: 3 additions & 3 deletions android/titanium/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
ndkVersion project.ext.tiNdkVersion
namespace 'org.appcelerator.titanium'
defaultConfig {
compileSdk 33
compileSdk 34
minSdkVersion 21
targetSdkVersion 34
versionName tiBuildVersionString
Expand Down Expand Up @@ -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'
Expand Down
17 changes: 17 additions & 0 deletions apidoc/Titanium/UI/RefreshControl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
4 changes: 0 additions & 4 deletions iphone/iphone/Titanium.plist
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
<string>Can we use your microphone?</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Can we save to your photo library?</string>
<key>UIAppFonts</key>
<array>
<string>comic_zine_ot.otf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiresFullScreen</key>
Expand Down
Loading

0 comments on commit 16c9e76

Please sign in to comment.