diff --git a/iphone/Maps/Core/Theme/Colors.swift b/iphone/Maps/Core/Theme/Colors.swift index ba7a8c98c..c20480f07 100644 --- a/iphone/Maps/Core/Theme/Colors.swift +++ b/iphone/Maps/Core/Theme/Colors.swift @@ -16,9 +16,9 @@ class DayColors: IColors { // Orange color (use for status 15 min in place page) var orange = UIColor(255, 120, 5, alpha100) // Blue color (use for links and phone numbers) - var linkBlue = UIColor(30, 150, 240, alpha100) - var linkBlueHighlighted = UIColor(30, 150, 240, alpha30) - var linkBlueDark = UIColor(25, 135, 215, alpha100) + var linkBlue = UIColor.accent + var linkBlueHighlighted = UIColor.accent + var linkBlueDark = UIColor.accent var buttonRed = UIColor(244, 67, 67, alpha100) var buttonRedHighlighted = UIColor(183, 28, 28, alpha100) var blackPrimaryText = UIColor(0, 0, 0, alpha87) @@ -78,9 +78,9 @@ class NightColors: IColors { // Orange color (use for status 15 min in place page) var orange = UIColor(250, 190, 10, alpha100) // Blue color (use for links and phone numbers) - var linkBlue = UIColor(80, 195, 240, alpha100) - var linkBlueHighlighted = UIColor(60, 155, 190, alpha30) - var linkBlueDark = UIColor(75, 185, 230, alpha100) + var linkBlue = UIColor.accent + var linkBlueHighlighted = UIColor.accent + var linkBlueDark = UIColor.accent var buttonRed = UIColor(244, 67, 67, alpha100) var buttonRedHighlighted = UIColor(183, 28, 28, alpha100) var blackPrimaryText = UIColor(255, 255, 255, alpha90) diff --git a/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json index d50fd6b76..42a455eb5 100644 --- a/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json +++ b/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json @@ -11,6 +11,24 @@ } }, "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.482", + "green" : "0.737", + "red" : "0.486" + } + }, + "idiom" : "universal" } ], "info" : { diff --git a/iphone/Maps/Images.xcassets/CircularProgress/Downloader/ic_download_all.imageset/Contents.json b/iphone/Maps/Images.xcassets/CircularProgress/Downloader/ic_download_all.imageset/Contents.json index 9987bb3ec..52f1eb3eb 100644 --- a/iphone/Maps/Images.xcassets/CircularProgress/Downloader/ic_download_all.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/CircularProgress/Downloader/ic_download_all.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Download All.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Download All@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Download All@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json index 5d815b947..fd1fb7b32 100644 --- a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "btn_float_more_dark.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "btn_float_more_dark@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "btn_float_more_dark@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png index 2515f6e19..654a38427 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png and b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png differ diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png index d27ca5ca3..a42585d50 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png and b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png index 1f6030fcb..d8113e529 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png and b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json index 713a08b50..09279c129 100644 --- a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "btn_float_more_light.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "btn_float_more_light@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "btn_float_more_light@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png index e466e220a..9d27f4387 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png and b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png differ diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png index bd9bf6111..3ec867e7d 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png and b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png index f4be507ae..fb68e57fc 100644 Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png and b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json index 33a690bf7..3de423e89 100644 --- a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "ic_add_dark.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "ic_add_dark@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "ic_add_dark@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png index 38eb56ae3..fd19f1632 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png index b0827cce3..eab5abf0a 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png index 1e2ff25e9..10092b055 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json index 949a245d0..f9e6c3c11 100644 --- a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "ic_add_highlighted_dark.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "ic_add_highlighted_dark@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "ic_add_highlighted_dark@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png index b4e3847bb..09fc5874f 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png index 002c5b7fa..e7fe842cb 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png index 3115b356a..0453e3a0e 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json index 9ec65ce70..78fc4dce8 100644 --- a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "ic_add_highlighted_light.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "ic_add_highlighted_light@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "ic_add_highlighted_light@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png index e2fddde71..0db242a70 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png index efe079ac4..25f65abb6 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png index 7b8b467dd..e50eb98c9 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json index 7261560f2..51d4538ae 100644 --- a/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "ic_add_light.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "ic_add_light@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "ic_add_light@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png index f539cc667..903dad675 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png and b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png index c70fd5bae..903d11fb3 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png and b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png index c4eaa918a..360216190 100644 Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png and b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png differ diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index 7ccc64915..128d26de9 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -1061,11 +1061,15 @@ + + + +