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

Implement SDL-0184 CancelInteraction RPC #1346

Merged
merged 115 commits into from Sep 13, 2019
Merged

Implement SDL-0184 CancelInteraction RPC #1346

merged 115 commits into from Sep 13, 2019

Conversation

NicoleYarroch
Copy link
Contributor

@NicoleYarroch NicoleYarroch commented Jul 12, 2019 •
edited

Fixes #1055, #1338

This PR is ready for review.

Risk

This PR makes minor API changes.

Testing Plan

  • Tests added for the CancelInteraction response and request classes
  • Test cases added to the screen manager specs
  • Smoke tested against sdl_core v.6.0

Summary

  • Added CancelInteraction request and response classes to the library
  • Added cancelID parameter to Alert, PerformInteraction, Slider, and ScrollableMessage RPCs
  • Added cancel method to choice set manager
  • Added dismissKeyboard: method to screen manager
  • Deprecated the current presentKeyboard: method and created a new one that returns a value that can be passed to dismissKeyboard: to specify which keyboard to dismiss

Changelog

Enhancements
  • Added new RPC CancelInteraction to the library
  • Screen manager now supports canceling/dismissing a choice set and dismissing a presented keyboard.

Tasks Remaining:

  • Test against sdl_core v.6.0
  • Set the finalized functionID for CancelInteraction
  • Add convenience init for CancelInteraction request
  • Update Swift example app
  • Update Obj-C example app
  • Deprecate the current presentKeyboard: method
  • Update the dismissKeyboard:method

CLA

@NicoleYarroch NicoleYarroch added enhancement proposal Accepted SDL Evolution Proposal labels Jul 12, 2019
@NicoleYarroch NicoleYarroch added this to the 6.4.0 milestone Jul 12, 2019
@NicoleYarroch NicoleYarroch self-assigned this Jul 12, 2019
@NicoleYarroch NicoleYarroch added this to In progress in v6.4 via automation Jul 12, 2019
@joeljfischer joeljfischer changed the title WIP: New RPC CancelInteraction WIP: Implement SDL-0184 CancelInteraction RPC Jul 15, 2019
@NicoleYarroch
Added test cases for Alerts
01a617e
@NicoleYarroch
new parameter and inits added to PerformInteraction
c1b6778 
* deprecated old inits
@NicoleYarroch
Added missing test cases to perform interaction spec
f15507a
@NicoleYarroch
Added cancelID to scrollable message
b97979c 
* Added test cases to scrollable message spec
@NicoleYarroch
Cleaned up slider request documentation
851e69e
@NicoleYarroch
Added tests to slider spec
a5fdb18
@NicoleYarroch
Updated deprecated methods in example apps
773d53a
@NicoleYarroch
Removed comments
13a7028
@NicoleYarroch
Fixed spelling in documentation
4a3a779
@NicoleYarroch
Basic framework - adding cancelIds to manager PICS
b0e4a0f
@NicoleYarroch
refactored the PICS manager cancelID handling
7c2c987
@NicoleYarroch
Added documentation
1ee6d5f
@NicoleYarroch
Refactored comments
a505019
@NicoleYarroch
Added support for canceling a keyboard
3bb3988
@NicoleYarroch
cancelID added to PeformInteraction sent by manager
b080694
@NicoleYarroch
Removed dealloc
eb9a8b2
@NicoleYarroch
Merge branch 'develop' into feature/issue_1055_cancel_interaction_RPC
615b480 
# Conflicts:
#	SmartDeviceLink/SDLPresentKeyboardOperation.m
@NicoleYarroch
Fixed documentation
16ea47e
@NicoleYarroch
Fixed incorrect call to finish operation
35e944e
joeljfischer
joeljfischer suggested changes Aug 13, 2019
View reviewed changes
SmartDeviceLink/SDLChoiceSetManager.h Outdated Show resolved Hide resolved
SmartDeviceLink/SDLChoiceSetManager.h Outdated Show resolved Hide resolved
SmartDeviceLink/SDLChoiceSetManager.h Show resolved Hide resolved
SmartDeviceLink/SDLChoiceSetManager.m Outdated Show resolved Hide resolved
SmartDeviceLink/SDLChoiceSetManager.m Show resolved Hide resolved
SmartDeviceLink/SDLPresentKeyboardOperation.h Outdated Show resolved Hide resolved
SmartDeviceLink/SDLScreenManager.h Show resolved Hide resolved
v6.4 automation moved this from Review in progress to Reviewer approved Aug 14, 2019
NicoleYarroch and others added 4 commits August 15, 2019 13:59
v6.4 automation moved this from Reviewer approved to Review in progress Sep 13, 2019
@NicoleYarroch
Choice set and screen manager methods now match
01274e3 
Choice set manager method `presentKeyboardWithInitialText:delegate` now matches the coresponding screen screen manager method
v6.4 automation moved this from Review in progress to Reviewer approved Sep 13, 2019
@joeljfischer joeljfischer merged commit 897d491 into develop Sep 13, 2019
v6.4 automation moved this from Reviewer approved to Done Sep 13, 2019
@joeljfischer joeljfischer deleted the feature/issue_1055_cancel_interaction_RPC branch September 13, 2019 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joeljfischer joeljfischer joeljfischer approved these changes

Assignees

@NicoleYarroch NicoleYarroch

Labels
proposal Accepted SDL Evolution Proposal
Projects
No open projects
v6.4
  
Done
Milestone
6.4.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@NicoleYarroch @joeljfischer