diff options
| author | NicoleYarroch <nicole@livio.io> | 2020-09-04 16:15:39 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2020-09-04 16:15:39 -0400 |
| commit | 9bedb8e3985d342196ecf380f29282ac1d47ef05 (patch) | |
| tree | 48e23a0582b7197ba872f060c55698114f9c669f /Example Apps | |
| parent | 2665099bf420c9dd3c32b782ce2037c7d5ff5532 (diff) | |
| parent | e4e153f5be8c75211b50468a9dd6e1ca2df38bf9 (diff) | |
| download | sdl_ios-9bedb8e3985d342196ecf380f29282ac1d47ef05.tar.gz | |
Merge branch 'develop' into feature/0312_update_min_required_iOS_version_to_10
Signed-off-by: NicoleYarroch <nicole@livio.io>
# Conflicts:
# SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenManagerSpec.m
Diffstat (limited to 'Example Apps')
| -rw-r--r-- | Example Apps/Example ObjC/ConnectionTransitionContext.m | 2 | ||||
| -rw-r--r-- | Example Apps/Shared/Images.xcassets/AppIcon.appiconset/Contents.json | 55 | ||||
| -rw-r--r-- | Example Apps/Shared/Images.xcassets/AppIcon.appiconset/iTunesArtwork.png | bin | 0 -> 317272 bytes |
3 files changed, 30 insertions, 27 deletions
diff --git a/Example Apps/Example ObjC/ConnectionTransitionContext.m b/Example Apps/Example ObjC/ConnectionTransitionContext.m index e46e19a10..7275952c3 100644 --- a/Example Apps/Example ObjC/ConnectionTransitionContext.m +++ b/Example Apps/Example ObjC/ConnectionTransitionContext.m @@ -105,6 +105,8 @@ - (void)updateInteractiveTransition:(CGFloat)percentComplete {} - (void)finishInteractiveTransition {} - (void)cancelInteractiveTransition {} +- (void)pauseInteractiveTransition {} + @end diff --git a/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/Contents.json b/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/Contents.json index 997a0f138..5e692a4d1 100644 --- a/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/Contents.json @@ -2,58 +2,59 @@ "images" : [ { "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-Small@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-Small@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-Small-40@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-60@2x-1.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "Icon-60@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "Icon-60@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" }, { + "filename" : "iTunesArtwork.png", "idiom" : "ios-marketing", - "size" : "1024x1024", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -}
\ No newline at end of file +} diff --git a/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/iTunesArtwork.png b/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/iTunesArtwork.png Binary files differnew file mode 100644 index 000000000..0d8007ea2 --- /dev/null +++ b/Example Apps/Shared/Images.xcassets/AppIcon.appiconset/iTunesArtwork.png |
