Skip to content

Commit 9649103

Browse files
authored
Merge branch 'master' into androidLibraryUpdates
2 parents e3ed1ff + cee3b7a commit 9649103

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1183
-480
lines changed

.github/actions/build-ios/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ runs:
2727
run: npm run lint:ios
2828
shell: bash
2929

30-
- name: Build
31-
run: npm run build:ios
30+
- name: Build (clean)
31+
run: npm run cleanbuild:ios
3232
shell: bash
3333

3434
- name: Package build output

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
CCACHE_DIR: ${{ github.workspace }}/.ccache
3232
USE_CCACHE: 1
33-
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
33+
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
3434
steps:
3535
- name: Checkout repository
3636
uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
6767
name: Package
6868
env:
6969
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
70-
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
70+
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
7171
needs: [android, ios, js]
7272
steps:
7373
- name: Checkout repository

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
env:
8888
CCACHE_DIR: ${{ github.workspace }}/.ccache
8989
USE_CCACHE: 1
90-
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
90+
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
9191
steps:
9292
- name: Checkout repository
9393
uses: actions/checkout@v4
@@ -104,7 +104,7 @@ jobs:
104104
name: Package
105105
env:
106106
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
107-
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
107+
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
108108
vtag: ${{ needs.validate.outputs.vtag }}
109109
needs: [validate, android, ios]
110110
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ today and benefit from 1:1 sessions with the core team, exclusive modules, merch
5252

5353
Learn more about sponsoring TiDev, the organization behind the Titanium SDK, [here](https://github.com/sponsors/tidev) 🚀.
5454

55-
<!-- 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/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: " /></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/korelogic"><img src="https:&#x2F;&#x2F;github.com&#x2F;korelogic.png" width="60px" alt="User avatar: Korelogic Limited" /></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/mediabug51"><img src="https:&#x2F;&#x2F;github.com&#x2F;mediabug51.png" width="60px" alt="User avatar: " /></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><a href="https://github.com/lambus-platform"><img src="https:&#x2F;&#x2F;github.com&#x2F;lambus-platform.png" width="60px" alt="User avatar: Lambus" /></a><a href="https://github.com/emptybox"><img src="https:&#x2F;&#x2F;github.com&#x2F;emptybox.png" width="60px" alt="User avatar: Vaughn Dabney" /></a><a href="https://github.com/Whatslively"><img src="https:&#x2F;&#x2F;github.com&#x2F;Whatslively.png" width="60px" alt="User avatar: Whatslively" /></a><a href="https://github.com/JeremyFlight"><img src="https:&#x2F;&#x2F;github.com&#x2F;JeremyFlight.png" width="60px" alt="User avatar: Jeremy Flight" /></a><a href="https://github.com/Alpine-Software"><img src="https:&#x2F;&#x2F;github.com&#x2F;Alpine-Software.png" width="60px" alt="User avatar: Alpine Software" /></a><a href="https://github.com/elusu"><img src="https:&#x2F;&#x2F;github.com&#x2F;elusu.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/wittawoot"><img src="https:&#x2F;&#x2F;github.com&#x2F;wittawoot.png" width="60px" alt="User avatar: Wittawoot Thongbor" /></a><a href="https://github.com/PayMon-app"><img src="https:&#x2F;&#x2F;github.com&#x2F;PayMon-app.png" width="60px" alt="User avatar: PayMon" /></a><a href="https://github.com/oshevans"><img src="https:&#x2F;&#x2F;github.com&#x2F;oshevans.png" width="60px" alt="User avatar: Osian Evans" /></a><a href="https://github.com/UniqueSchools"><img src="https:&#x2F;&#x2F;github.com&#x2F;UniqueSchools.png" width="60px" alt="User avatar: " /></a><!-- sponsors -->
55+
<!-- 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/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: " /></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/korelogic"><img src="https:&#x2F;&#x2F;github.com&#x2F;korelogic.png" width="60px" alt="User avatar: Korelogic Limited" /></a><a href="https://github.com/drunnells"><img src="https:&#x2F;&#x2F;github.com&#x2F;drunnells.png" width="60px" alt="User avatar: Dustin Runnells" /></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/mediabug51"><img src="https:&#x2F;&#x2F;github.com&#x2F;mediabug51.png" width="60px" alt="User avatar: " /></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><a href="https://github.com/lambus-platform"><img src="https:&#x2F;&#x2F;github.com&#x2F;lambus-platform.png" width="60px" alt="User avatar: Lambus" /></a><a href="https://github.com/emptybox"><img src="https:&#x2F;&#x2F;github.com&#x2F;emptybox.png" width="60px" alt="User avatar: Vaughn Dabney" /></a><a href="https://github.com/Whatslively"><img src="https:&#x2F;&#x2F;github.com&#x2F;Whatslively.png" width="60px" alt="User avatar: Whatslively" /></a><a href="https://github.com/JeremyFlight"><img src="https:&#x2F;&#x2F;github.com&#x2F;JeremyFlight.png" width="60px" alt="User avatar: Jeremy Flight" /></a><a href="https://github.com/Alpine-Software"><img src="https:&#x2F;&#x2F;github.com&#x2F;Alpine-Software.png" width="60px" alt="User avatar: Alpine Software" /></a><a href="https://github.com/elusu"><img src="https:&#x2F;&#x2F;github.com&#x2F;elusu.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/wittawoot"><img src="https:&#x2F;&#x2F;github.com&#x2F;wittawoot.png" width="60px" alt="User avatar: Wittawoot Thongbor" /></a><a href="https://github.com/PayMon-app"><img src="https:&#x2F;&#x2F;github.com&#x2F;PayMon-app.png" width="60px" alt="User avatar: PayMon" /></a><a href="https://github.com/oshevans"><img src="https:&#x2F;&#x2F;github.com&#x2F;oshevans.png" width="60px" alt="User avatar: Osian Evans" /></a><a href="https://github.com/UniqueSchools"><img src="https:&#x2F;&#x2F;github.com&#x2F;UniqueSchools.png" width="60px" alt="User avatar: " /></a><!-- sponsors -->
5656

5757
## Features
5858

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
22
android:layout_width="match_parent"
3-
android:layout_height="match_parent"
4-
android:fitsSystemWindows="true">
3+
android:layout_height="match_parent">
54

65
<LinearLayout
76
android:id="@+id/drawer_layout_container"
@@ -14,7 +13,6 @@
1413
android:layout_width="match_parent"
1514
android:layout_height="wrap_content"
1615
android:background="?attr/colorPrimary"
17-
android:fitsSystemWindows="true"
1816
android:minHeight="?attr/actionBarSize"
1917
android:visibility="gone" />
2018

android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,13 @@ public void processProperties(KrollDict d)
203203
if (d.containsKey(TiC.PROPERTY_BACKGROUND_COLOR)) {
204204
// Why transparent?
205205
tv.setBackgroundColor(Color.TRANSPARENT);
206-
textInputLayout.setBoxBackgroundColor(TiConvert.toColor(d.get(TiC.PROPERTY_BACKGROUND_COLOR),
207-
TiApplication.getAppCurrentActivity()));
206+
if ("transparent".equals(d.get(TiC.PROPERTY_BACKGROUND_COLOR))
207+
|| d.get(TiC.PROPERTY_BACKGROUND_COLOR) == null) {
208+
textInputLayout.setBoxBackgroundMode(TextInputLayout.BOX_BACKGROUND_NONE);
209+
} else {
210+
textInputLayout.setBoxBackgroundColor(TiConvert.toColor(d.get(TiC.PROPERTY_BACKGROUND_COLOR),
211+
TiApplication.getAppCurrentActivity()));
212+
}
208213
}
209214

210215
if (d.containsKey(TiC.PROPERTY_COLOR)) {
@@ -404,7 +409,12 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
404409
this.inputFilterHandler.setMaxLength(TiConvert.toInt(newValue, -1));
405410
} else if (key.equals(TiC.PROPERTY_BACKGROUND_COLOR)) {
406411
tv.setBackgroundColor(Color.TRANSPARENT);
407-
textInputLayout.setBoxBackgroundColor(TiConvert.toColor(newValue, TiApplication.getAppCurrentActivity()));
412+
if ("transparent".equals(newValue) || newValue == null) {
413+
textInputLayout.setBoxBackgroundMode(TextInputLayout.BOX_BACKGROUND_NONE);
414+
} else {
415+
textInputLayout.setBoxBackgroundColor(
416+
TiConvert.toColor(newValue, TiApplication.getAppCurrentActivity()));
417+
}
408418
super.propertyChanged(key, oldValue, newValue, proxy);
409419
} else if (key.equals(TiC.PROPERTY_COLOR)) {
410420
// TODO: reset to default value when property is null

android/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
"android ndk": ">=r21 <=r22b",
2727
"java": ">=17.x"
2828
},
29-
"engines": {
30-
"node": ">=18.0.0"
31-
},
3229
"repository": {
3330
"type": "git",
3431
"url": "git://github.com/tidev/titanium_mobile.git"

apidoc/Titanium/UI/Button.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,6 @@ description: |
5656
5757
#### iOS Platform Notes
5858
59-
iOS buttons have two special properties, `style` and `systemButton`.
60-
61-
The `style` property specifies the type of button decoration, and can be set to one
62-
of the values described in <Titanium.UI.iOS.SystemButtonStyle>.
63-
64-
To use a custom button style, such as a background gradient, you may need to explicitly set
65-
the button's `style` property to `PLAIN`, to prevent the button style from overriding any background color or gradient.
66-
67-
Also note:
68-
6959
* When assigning a custom image to the `backgroundImage` property, the image must be
7060
partially or wholly transparent for the background color or background gradient to be visible.
7161
* Similarly, for an assigned background gradient to show through, the `backgroundColor` may need to be
@@ -114,7 +104,7 @@ description: |
114104
iOS supplies a built-in effect for pressed buttons. For most iOS buttons, the effect
115105
dims the entire button (except for the text) while the button is being pressed.
116106
117-
For toolbar buttons that use the [PLAIN](Titanium.UI.iOS.SystemButtonStyle.PLAIN) style
107+
For toolbar buttons that use the [PLAIN](Titanium.UI.BUTTON_STYLE_OPTION_NEUTRAL) style
118108
or use system icons such as [CAMERA](Titanium.UI.iOS.SystemButton.CAMERA), a glow effect is
119109
used. The glow effect shows as a white circular glow or highlight at the center of the button
120110
when the button is pressed.
@@ -231,6 +221,20 @@ properties:
231221
since: "3.2.0"
232222
platforms: [iphone, ipad, macos]
233223

224+
- name: configuration
225+
summary: Button configuration for modern button styling.
226+
description: |
227+
A <Titanium.UI.iOS.ButtonConfiguration> object that defines the appearance and behavior
228+
of the button. This provides a modern way to configure buttons with support for titles,
229+
subtitles, images, and various styling options.
230+
231+
When using a button configuration, it takes precedence over individual styling properties
232+
like `title`, `color`, and `backgroundColor`.
233+
type: Titanium.UI.iOS.ButtonConfiguration
234+
since: "13.0.0"
235+
platforms: [iphone, ipad, macos]
236+
osver: {ios: {min: "15.0"}}
237+
234238
- name: enabled
235239
summary: Set to `true` to enable the button, `false` to disable the button.
236240
type: Boolean
@@ -294,9 +298,6 @@ properties:
294298
summary: The border and fill style the button will use.
295299
description: |
296300
On Android, this is a creation-only property and cannot be changed dynamically.
297-
298-
For Titanium versions older than 10.0.0, this is an iOS only property and must be assigned
299-
a constant from <Titanium.UI.iOS.SystemButtonStyle> which is now deprecated.
300301
type: Number
301302
constants: Titanium.UI.BUTTON_STYLE_*
302303
platforms: [android, iphone, ipad, macos]

apidoc/Titanium/UI/DashboardView.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ examples:
161161
162162
var button = Ti.UI.createButton({
163163
title: 'Edit',
164-
style: Ti.UI.iOS.SystemButtonStyle.DONE,
164+
style: Ti.UI.BUTTON_STYLE_OPTION_POSITIVE,
165165
});
166166
167167
var toolbar = Ti.UI.iOS.createToolbar({
@@ -223,13 +223,13 @@ examples:
223223
224224
dashboard.addEventListener('edit', function(e) {
225225
button.title = 'Done';
226-
button.style = Ti.UI.iOS.SystemButtonStyle.DONE;
226+
button.style = Ti.UI.BUTTON_STYLE_OPTION_POSITIVE;
227227
isEditable = true;
228228
});
229229
230230
dashboard.addEventListener('commit', function(e) {
231231
button.title = 'Edit';
232-
button.style = Ti.UI.iOS.SystemButtonStyle.PLAIN;
232+
button.style = Ti.UI.BUTTON_STYLE_OPTION_NEUTRAL;
233233
isEditable = false;
234234
});
235235
@@ -290,13 +290,13 @@ examples:
290290
291291
function handleEdit(e) {
292292
$.button.title = 'Done';
293-
$.button.style = Ti.UI.iOS.SystemButtonStyle.DONE;
293+
$.button.style = Ti.UI.BUTTON_STYLE_OPTION_POSITIVE;
294294
isEditable = true;
295295
}
296296
297297
function handleCommit(e) {
298298
$.button.title = 'Edit';
299-
$.button.style = Ti.UI.iOS.SystemButtonStyle.PLAIN;
299+
$.button.style = Ti.UI.BUTTON_STYLE_OPTION_NEUTRAL;
300300
isEditable = false;
301301
}
302302

apidoc/Titanium/UI/OptionDialog.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,7 @@ properties:
382382
optional: true
383383

384384
- name: view
385-
summary: View to which to attach the dialog.
385+
summary: |
386+
View to which to attach the dialog. Prior to iOS 26, this was only
387+
used on iPad.
386388
type: Titanium.UI.View
387-
388-
- name: rect
389-
summary: Positions the arrow of the option dialog relative to the attached view's dimensions.
390-
description: |
391-
Setting the x, y coordinates to (0, 0) places the dialog in the top-left corner of the
392-
view object. Set both the `width` and `height` properties to 1.
393-
type: Dimension
394-
optional: true

0 commit comments

Comments
 (0)