Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-9343] Ti API: Animation curves are not platform-specific #2405

Merged
merged 2 commits into from
Jun 18, 2012
Merged

[TIMOB-9343] Ti API: Animation curves are not platform-specific #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28657cf
[TIMOB-9343] Deprecate curve constants in Ti.UI.IOS proxy
vishalduggal Jun 15, 2012
9fd852c
[TIMOB-9343] Update docs
vishalduggal Jun 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions apidoc/Titanium/UI/Animation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ description: |

In iOS, you can also specify an animation curve or *easing function* to control the pace of the
animation. To use an easing function, set the animation's `curve` property to one of the
`ANIMATION_CURVE` constants defined in <Titanium.UI.iOS>. For example,
[ANIMATION_CURVE_EASE_IN](Titanium.UI.iOS.ANIMATION_CURVE_EASE_IN) specifies an animation that
`ANIMATION_CURVE` constants defined in <Titanium.UI>. For example,
[ANIMATION_CURVE_EASE_IN](Titanium.UI.ANIMATION_CURVE_EASE_IN) specifies an animation that
starts slowly and then speeds up.

Finally, iOS also supports *transitions* between windows or views. You can create a transition
Expand Down
8 changes: 0 additions & 8 deletions apidoc/Titanium/UI/UI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,32 +174,24 @@ properties:
- name: ANIMATION_CURVE_EASE_IN
summary: Use the animation curve constants in <Titanium.UI.iOS> instead.
type: Number
deprecated:
since: "1.8.0"
permission: read-only
platforms: [iphone, ipad, mobileweb]

- name: ANIMATION_CURVE_EASE_IN_OUT
summary: Use the animation curve constants in <Titanium.UI.iOS> instead.
type: Number
deprecated:
since: "1.8.0"
permission: read-only
platforms: [iphone, ipad, mobileweb]

- name: ANIMATION_CURVE_EASE_OUT
summary: Use the animation curve constants in <Titanium.UI.iOS> instead.
type: Number
deprecated:
since: "1.8.0"
permission: read-only
platforms: [iphone, ipad, mobileweb]

- name: ANIMATION_CURVE_LINEAR
summary: Use the animation curve constants in <Titanium.UI.iOS> instead.
type: Number
deprecated:
since: "1.8.0"
permission: read-only
platforms: [iphone, ipad, mobileweb]

Expand Down
8 changes: 8 additions & 0 deletions apidoc/Titanium/UI/iOS/iOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,35 @@ properties:
Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
slowly and speeds up.
type: Number
deprecated:
since: "2.1.0"
permission: read-only

- name: ANIMATION_CURVE_EASE_IN_OUT
summary: |
Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
slowly, and speeds up, then slows down at the end of the animation.
type: Number
deprecated:
since: "2.1.0"
permission: read-only

- name: ANIMATION_CURVE_EASE_OUT
summary: |
Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
quickly, then slows down at the end of the animation.
type: Number
deprecated:
since: "2.1.0"
permission: read-only

- name: ANIMATION_CURVE_LINEAR
summary: |
Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that proceeds
at a constant rate.
type: Number
deprecated:
since: "2.1.0"
permission: read-only

- name: AUTODETECT_ADDRESS
Expand Down
8 changes: 4 additions & 4 deletions iphone/Classes/TiUIiOSProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ -(id)createTabbedBar:(id)args
}
#endif
#ifdef USE_TI_UIIOS
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_IN_OUT,UIViewAnimationCurveEaseInOut);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_IN,UIViewAnimationCurveEaseIn);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_OUT,UIViewAnimationCurveEaseOut);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_LINEAR,UIViewAnimationCurveLinear);
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_IN_OUT, UIViewAnimationCurveEaseInOut, @"UI.iOS.ANIMATION_CURVE_EASE_IN_OUT", @"2.1.0", @"Ti.UI.ANIMATION_CURVE_EASE_IN_OUT");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_IN, UIViewAnimationCurveEaseIn, @"UI.iOS.ANIMATION_CURVE_EASE_IN", @"2.1.0", @"Ti.UI.ANIMATION_CURVE_EASE_IN");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_OUT,UIViewAnimationCurveEaseOut, @"UI.iOS.ANIMATION_CURVE_EASE_OUT", @"2.1.0", @"Ti.UI.ANIMATION_CURVE_EASE_OUT");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_LINEAR,UIViewAnimationCurveLinear, @"UI.iOS.ANIMATION_CURVE_LINEAR", @"2.1.0", @"Ti.UI.ANIMATION_CURVE_LINEAR");

MAKE_SYSTEM_PROP(BLEND_MODE_NORMAL,kCGBlendModeNormal);
MAKE_SYSTEM_PROP(BLEND_MODE_MULTIPLY,kCGBlendModeMultiply);
Expand Down
8 changes: 4 additions & 4 deletions iphone/Classes/UIModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ -(void)dealloc

#pragma mark Public Constants

MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_IN_OUT, UIViewAnimationCurveEaseInOut, @"UI.ANIMATION_CURVE_EASE_IN_OUT", @"1.8.0", @"Ti.UI.iOS.ANIMATION_CURVE_EASE_IN_OUT");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_IN, UIViewAnimationCurveEaseIn, @"UI.ANIMATION_CURVE_EASE_IN", @"1.8.0", @"Ti.UI.iOS.ANIMATION_CURVE_EASE_IN");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_EASE_OUT,UIViewAnimationCurveEaseOut, @"UI.ANIMATION_CURVE_EASE_OUT", @"1.8.0", @"Ti.UI.iOS.ANIMATION_CURVE_EASE_OUT");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ANIMATION_CURVE_LINEAR,UIViewAnimationCurveLinear, @"UI.ANIMATION_CURVE_LINEAR", @"1.8.0", @"Ti.UI.iOS.ANIMATION_CURVE_LINEAR");
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_IN_OUT,UIViewAnimationCurveEaseInOut);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_IN,UIViewAnimationCurveEaseIn);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_EASE_OUT,UIViewAnimationCurveEaseOut);
MAKE_SYSTEM_PROP(ANIMATION_CURVE_LINEAR,UIViewAnimationCurveLinear);

MAKE_SYSTEM_PROP(TEXT_VERTICAL_ALIGNMENT_TOP,UIControlContentVerticalAlignmentTop);
MAKE_SYSTEM_PROP(TEXT_VERTICAL_ALIGNMENT_CENTER,UIControlContentVerticalAlignmentCenter);
Expand Down