Skip to content

Commit

Permalink
Merge pull request #9239 from hansemannn/TIMOB-25005
Browse files Browse the repository at this point in the history
[TIMOB-25005] Remove Ti.UI.iPhone namespace
  • Loading branch information
eric34 committed Nov 14, 2017
2 parents 2d80ff0 + 73b78db commit 776fa27
Show file tree
Hide file tree
Showing 68 changed files with 443 additions and 1,655 deletions.
1 change: 1 addition & 0 deletions apidoc/Titanium/Calendar/Calendar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ properties:
platforms: [android, iphone, ipad]
deprecated:
since: "5.2.0"
removed: "7.0.0"
notes: Use <Titanium.Calendar.STATUS_CANCELED> instead.

- name: STATUS_CANCELED
Expand Down
1 change: 1 addition & 0 deletions apidoc/Titanium/Media/Media.yml
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,7 @@ properties:
osver: {ios: {min: "7.0"}}
deprecated:
since: "5.2.0"
removed: "7.0.0"
notes: Use <Titanium.Media.CAMERA_AUTHORIZATION_UNKNOWN> instead.
- name: CAMERA_AUTHORIZATION_UNKNOWN
summary: Constant specifying that app is not yet authorized to use camera. This is available on iOS7 and later.
Expand Down
2 changes: 1 addition & 1 deletion apidoc/Titanium/UI/ListView.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ properties:
- name: resultsSeparatorStyle
summary: The separator style of the search results (iOS-only).
type: Number
constants: Titanium.UI.iPhone.ListViewSeparatorStyle.*
constants: Titanium.UI.TABLE_VIEW_SEPARATOR_STYLE_*
since: 6.1.0
platforms: [iphone, ipad]
availability: creation
Expand Down
5 changes: 1 addition & 4 deletions apidoc/Titanium/UI/View.yml
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ methods:
other controls, added to its `items` array. Views added using the `add` method are
displayed on top of the controls in the `items` array.
* The `Tab`, `TabGroup`, `NavigationGroup`, `NavigationWindow` and `SplitWindow` objects are
* The `Tab`, `TabGroup`, `NavigationWindow` and `SplitWindow` objects are
special containers that manage windows. These are discussed in the
"Top-Level Containers" section.
Expand All @@ -703,9 +703,6 @@ methods:
These managed windows may be referred to as *children* of the
container, but they are not added using the `add` method.
Note that although a `NavigationGroup` manages windows, it is not itself a
top-level container. It must be added to a `Window` in order to be displayed.
`Tab` is another kind of special container: it is not itself a top-level container,
but can only be used within a `TabGroup`. You cannot `add` a `Tab` to an arbitrary
container.
Expand Down
31 changes: 15 additions & 16 deletions apidoc/Titanium/UI/Window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -823,11 +823,10 @@ properties:
status bar style on the application.
If this value is undefined, the value is set to UIStatusBarStyle defined in tiapp.xml.
If that is not defined it defaults to <Titanium.UI.iPhone.StatusBar.DEFAULT>.
If that is not defined it defaults to <Titanium.UI.iOS.StatusBar.DEFAULT>.
type: [Number]
constants: [ Titanium.UI.iPhone.StatusBar.DEFAULT, Titanium.UI.iPhone.StatusBar.GRAY,
Titanium.UI.iPhone.StatusBar.GREY, Titanium.UI.iPhone.StatusBar.LIGHT_CONTENT,
Titanium.UI.iPhone.StatusBar.OPAQUE_BLACK, Titanium.UI.iPhone.StatusBar.TRANSLUCENT_BLACK ]
constants: [ Titanium.UI.iOS.StatusBar.DEFAULT, Titanium.UI.iOS.StatusBar.GRAY,
Titanium.UI.iOS.StatusBar.GREY, Titanium.UI.iOS.StatusBar.LIGHT_CONTENT]
since: "3.1.3"
platforms: [iphone,ipad]

Expand Down Expand Up @@ -935,11 +934,11 @@ properties:
<NavigationWindow>
<Window>
<WindowToolbar>
<Button id="send" title="Send" style="Ti.UI.iPhone.SystemButtonStyle.DONE" />
<Button id="send" title="Send" style="Ti.UI.iOS.SystemButtonStyle.DONE" />
<FlexSpace/>
<Button id="camera" systemButton="Ti.UI.iPhone.SystemButton.CAMERA" />
<Button id="camera" systemButton="Ti.UI.iOS.SystemButton.CAMERA" />
<FlexSpace/>
<Button id="cancel" systemButton="Ti.UI.iPhone.SystemButton.CANCEL" />
<Button id="cancel" systemButton="Ti.UI.iOS.SystemButton.CANCEL" />
</WindowToolbar>
</Window>
</NavigationWindow>
Expand Down Expand Up @@ -1355,7 +1354,7 @@ description: |
By default, modal windows appear from the bottom of the screen and slide up. To change the default
transition, set the `modalTransitionStyle` property to a
`Titanium.UI.iPhone.MODAL_TRANSITION_STYLE_*` constant in the dictionary passed to the Window
`Titanium.UI.iOS.MODAL_TRANSITION_STYLE_*` constant in the dictionary passed to the Window
object's `open()` method.
Modal windows should not support orientation modes that the window they are opened over do not
Expand Down Expand Up @@ -1446,7 +1445,7 @@ description: |
#### iOS Transition Animations
iOS contains built-in transition animations when switching between non-modal windows. In the Window's
`open` method, set the `transition` property to a `Titanium.UI.iPhone.AnimationStyle` constant to use an animation.
`open` method, set the `transition` property to a `Titanium.UI.iOS.AnimationStyle` constant to use an animation.
For example, to flip right-to-left between two windows:
`app/views/index.xml`:
Expand All @@ -1461,7 +1460,7 @@ description: |
function animateOpen() {
Alloy.createController('win2').getView().open({
transition: Ti.UI.iPhone.AnimationStyle.FLIP_FROM_LEFT
transition: Ti.UI.iOS.AnimationStyle.FLIP_FROM_LEFT
});
}
$.index.open();
Expand Down Expand Up @@ -1773,16 +1772,16 @@ properties:
- name: modalStyle
summary: Presentation style of this modal window.
platforms: [iphone, ipad]
constants: Titanium.UI.iPhone.MODAL_PRESENTATION_*
constants: Titanium.UI.iOS.MODAL_PRESENTATION_*
type: Number
default: <Titanium.UI.iPhone.MODAL_PRESENTATION_FULLSCREEN>
default: <Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN>

- name: modalTransitionStyle
summary: Transition style of this modal window.
platforms: [iphone, ipad]
type: Number
constants: Titanium.UI.iPhone.MODAL_TRANSITION_STYLE_*
default: <Titanium.UI.iPhone.MODAL_TRANSITION_STYLE_COVER_VERTICAL>
constants: Titanium.UI.iOS.MODAL_TRANSITION_STYLE_*
default: <Titanium.UI.iOS.MODAL_TRANSITION_STYLE_COVER_VERTICAL>

- name: navBarHidden
summary: For modal windows, hides the nav bar (`true`) or shows the nav bar (`false`).
Expand Down Expand Up @@ -1813,8 +1812,8 @@ properties:
summary: Transition style of this non-modal window.
platforms: [iphone, ipad]
type: Number
constants: Titanium.UI.iPhone.AnimationStyle.*
default: <Titanium.UI.iPhone.AnimationStyle.NONE>
constants: Titanium.UI.iOS.AnimationStyle.*
default: <Titanium.UI.iOS.AnimationStyle.NONE>

- name: width
summary: Window's width, in platform-specific units.
Expand Down
68 changes: 68 additions & 0 deletions apidoc/Titanium/UI/iOS/SystemIcon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
---
name: Titanium.UI.iOS.SystemIcon
summary: A set of constants for the system icon styles that can be used on a tab group tab.
extends: Titanium.Proxy
platforms: [iphone, ipad]
since: "5.4.0"
createable: false

properties:
- name: BOOKMARKS
summary: Bookmark style icon
type: Number
permission: read-only

- name: CONTACTS
summary: Contacts style icon
type: Number
permission: read-only

- name: DOWNLOADS
summary: Downloads style icon
type: Number
permission: read-only

- name: FAVORITES
summary: Favorites style icon
type: Number
permission: read-only

- name: FEATURED
summary: Featured style icon
type: Number
permission: read-only

- name: HISTORY
summary: History style icon
type: Number
permission: read-only

- name: MORE
summary: More style icon
type: Number
permission: read-only

- name: MOST_RECENT
summary: Most recent style icon
type: Number
permission: read-only

- name: MOST_VIEWED
summary: Most viewed style icon
type: Number
permission: read-only

- name: RECENTS
summary: Recents style icon
type: Number
permission: read-only

- name: SEARCH
summary: Search style icon
type: Number
permission: read-only

- name: TOP_RATED
summary: Top rated style icon
type: Number
permission: read-only
138 changes: 138 additions & 0 deletions apidoc/Titanium/UI/iOS/iOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,144 @@ properties:
type: Number
permission: read-only

- name: MODAL_PRESENTATION_CURRENT_CONTEXT
summary: View presented with the same style as its parent window.
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window presentation style constants
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
since: "5.4.0"

- name: MODAL_PRESENTATION_FORMSHEET
summary: |
Window width and height are smaller than those of the screen and the view is centered on
the screen.
description: |
If the system is in a landscape orientation and the keyboard is visible, the position of the
view is adjusted upward so that the view remains visible. All uncovered areas are dimmed
and do not respond to touch to prevent the user from interacting with them.
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window presentation style constants
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_PRESENTATION_FULLSCREEN
summary: Window covers the screen.
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window presentation style constants
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_PRESENTATION_PAGESHEET
summary: |
Window height is the height of the screen and width is equal to screen width in a portrait
orientation.
description: |
Any uncovered areas are dimmed and do not respond to touch, to prevent the user from
interacting with them. In portrait orientations, this option is essentially the same as
<Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN>.
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window presentation style constants
[MODAL_PRESENTATION_CURRENT_CONTEXT](Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT),
[MODAL_PRESENTATION_FORMSHEET](Titanium.UI.iOS.MODAL_PRESENTATION_FORMSHEET),
[MODAL_PRESENTATION_FULLSCREEN](Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN),
and [MODAL_PRESENTATION_PAGESHEET](Titanium.UI.iOS.MODAL_PRESENTATION_PAGESHEET).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_TRANSITION_STYLE_COVER_VERTICAL
summary: |
When the window is presented, its view slides up from the bottom of the screen. On dismissal,
the view slides back down (default.)
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window transition style constants
[MODAL_TRANSITION_STYLE_COVER_VERTICAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_COVER_VERTICAL),
[MODAL_TRANSITION_STYLE_CROSS_DISSOLVE](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_CROSS_DISSOLVE),
[MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL),
and [MODAL_TRANSITION_STYLE_PARTIAL_CURL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_PARTIAL_CURL).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_TRANSITION_STYLE_CROSS_DISSOLVE
summary: |
When the window is presented, the current view fades out while the new view fades in at the
same time. On dismissal, a similar type of cross-fade is used to return to the original view.
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window transition style constants
[MODAL_TRANSITION_STYLE_COVER_VERTICAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_COVER_VERTICAL),
[MODAL_TRANSITION_STYLE_CROSS_DISSOLVE](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_CROSS_DISSOLVE),
[MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL),
and [MODAL_TRANSITION_STYLE_PARTIAL_CURL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_PARTIAL_CURL).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL
summary: |
When the window is presented, the current view initiates a horizontal 3D flip from
right-to-left, resulting in the revealing of the new view as if it were on the back of the
previous view. On dismissal, the flip occurs from left-to-right, returning to the original
view.
description: |
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window transition style constants
[MODAL_TRANSITION_STYLE_COVER_VERTICAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_COVER_VERTICAL),
[MODAL_TRANSITION_STYLE_CROSS_DISSOLVE](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_CROSS_DISSOLVE),
[MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL),
and [MODAL_TRANSITION_STYLE_PARTIAL_CURL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_PARTIAL_CURL).
type: Number
permission: read-only
since: "5.4.0"

- name: MODAL_TRANSITION_STYLE_PARTIAL_CURL
summary: |
When the window is presented, one corner of the current view curls up to reveal the modal
view underneath. On dismissal, the curled up page unfurls itself back on top of the modal
view.
description: |
A modal view presented using this transition is itself prevented from presenting any
additional modal views. This transition style is supported only if the window is presenting
a <Titanium.UI.iOS.MODAL_PRESENTATION_FULLSCREEN> modal presentation style.
Used with the <Titanium.UI.Window.open> and <Titanium.UI.Window.close> methods.
One of the group of modal window transition style constants
[MODAL_TRANSITION_STYLE_COVER_VERTICAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_COVER_VERTICAL),
[MODAL_TRANSITION_STYLE_CROSS_DISSOLVE](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_CROSS_DISSOLVE),
[MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL),
and [MODAL_TRANSITION_STYLE_PARTIAL_CURL](Titanium.UI.iOS.MODAL_TRANSITION_STYLE_PARTIAL_CURL).
type: Number
permission: read-only
since: "5.4.0"

- name: PUSH_MODE_CONTINUOUS
summary: |
Use with <Titanium.UI.iOS.PushBehavior.pushMode> to specifiy a continuous force.
Expand Down
5 changes: 4 additions & 1 deletion apidoc/Titanium/UI/iPhone/ActivityIndicatorStyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Titanium.UI.iPhone.ActivityIndicatorStyle
summary: A set of constants for the styles available for <Titanium.UI.ActivityIndicator> objects.
deprecated:
since: 5.1.0
removed: "7.0.0"
notes: Use the <Titanium.UI.ActivityIndicatorStyle> constants instead (without the iPhone namespace).
extends: Titanium.Proxy
since: "0.9"
Expand All @@ -25,6 +26,7 @@ properties:
permission: read-only
deprecated:
since: "5.1.0"
removed: "7.0.0"
notes: Use <Titanium.UI.ActivityIndicatorStyle.BIG> instead.
- name: DARK
summary: Small gray spinning indicator.
Expand All @@ -39,6 +41,7 @@ properties:
permission: read-only
deprecated:
since: "5.1.0"
removed: "7.0.0"
notes: Use <Titanium.UI.ActivityIndicatorStyle.DARK> instead.
- name: PLAIN
summary: Small white spinning indicator (default.)
Expand All @@ -53,5 +56,5 @@ properties:
permission: read-only
deprecated:
since: "5.1.0"
removed: "7.0.0"
notes: Use <Titanium.UI.ActivityIndicatorStyle.PLAIN> instead.

0 comments on commit 776fa27

Please sign in to comment.