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.

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

Add a on_continue_user_activity delegate method #773

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: objective-c
osx_image: xcode7.2
before_install:
- (ruby --version)
- sudo chown -R travis ~/Library/RubyMotion
Expand Down
9 changes: 8 additions & 1 deletion app/screens/test_delegate.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
class TestDelegate < ProMotion::Delegate
status_bar false

attr_accessor :called_on_load, :called_will_load, :called_on_activate, :called_will_deactivate, :called_on_enter_background, :called_will_enter_foreground, :called_on_unload, :called_on_tab_selected
attr_accessor :called_on_load, :called_will_load, :called_on_activate, :called_will_deactivate, :called_on_enter_background, :called_will_enter_foreground, :called_on_unload, :called_on_tab_selected, :called_on_continue_user_activity, :user_activity, :restoration_handler

def on_load(app, options)
self.called_on_load = true
end
Expand Down Expand Up @@ -33,4 +34,10 @@ def on_unload
def on_tab_selected(vc)
self.called_on_tab_selected = true
end

def on_continue_user_activity(params = {})
self.called_on_continue_user_activity = true
self.user_activity = params[:user_activity]
self.restoration_handler = params[:restoration_handler]
end
end
11 changes: 11 additions & 0 deletions docs/Reference/ProMotion Delegate.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,17 @@ def on_open_url(args = {})
end
```

#### on_continue_user_activity(args = {})

Fires when the application is opened with a `NSUserActivity` (utilizing [application:continueUserActivity:restorationHandler:](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIApplicationDelegate_Protocol/index.html#//apple_ref/occ/intfm/UIApplicationDelegate/application:continueUserActivity:restorationHandler:)).

```ruby
def on_continue_user_activity(asrgs = {})
args[:user_activity] #=> the object that describes the activity (NSUserActivity)
args[:restoration_handler] #=> a block, that yields an array of restorable objects, ie. objects that respond to a `restoreActivityState` method.
end
```

---

### Class Methods
Expand Down
4 changes: 4 additions & 0 deletions lib/ProMotion/delegate/delegate_module.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ def application(application, openURL: url, sourceApplication:source_app, annotat
try :on_open_url, { url: url, source_app: source_app, annotation: annotation }
end

def application(application, continueUserActivity:user_activity, restorationHandler:restoration_handler)
try :on_continue_user_activity, { user_activity: user_activity, restoration_handler: restoration_handler }
end

def ui_window
(defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
end
Expand Down
18 changes: 18 additions & 0 deletions spec/unit/delegate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,24 @@

@subject.application(UIApplication.sharedApplication, openURL: url, sourceApplication:sourceApplication, annotation: annotation)
end

describe "#on_continue_user_activity" do
before do
@subject.application(UIApplication.sharedApplication, continueUserActivity: {}, restorationHandler: [])
end

it "should call on_continue_user_activity when launching with a user activity" do
@subject.called_on_continue_user_activity.should == true
end

it "should pass the user activity" do
@subject.user_activity.should == {}
end

it "should pass the restoration_handler" do
@subject.restoration_handler.should == []
end
end
end

# iOS 7 ONLY tests
Expand Down