diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/100.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/100.png deleted file mode 100644 index fe1e61be5e..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/100.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png index d32f5cb3c5..736069b30c 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png index 186e44006f..5ebfeae16b 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png index b703bccc5a..bb13d70d10 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/144.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/144.png deleted file mode 100644 index 0f848a8d52..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/144.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/152.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/152.png deleted file mode 100644 index be9360e158..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/152.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/167.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/167.png deleted file mode 100644 index a09436d571..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/167.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png index 91eab76448..9ebe8478a3 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/20.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/20.png deleted file mode 100644 index c7828389fd..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/20.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png index ad75246a1b..43b70ec1c7 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png index 1bcd6ed242..4cb2619b1d 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/50.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/50.png deleted file mode 100644 index 848b0a8d40..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/50.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png index 39fd8c7053..c9396a6714 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png index 5a0cb45f14..585ec5cfb5 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png index 04c34d1fdd..1a96490d85 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/72.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/72.png deleted file mode 100644 index c3183a824c..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/72.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/76.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/76.png deleted file mode 100644 index 9fa41ac0a2..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/76.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png index ab2bd7f8f1..8f34ea1e51 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png index f01bfa42f7..130aa1da84 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json index 65b74d7ef1..73d3b7f6d1 100644 --- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1 @@ -{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]} \ No newline at end of file +{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png deleted file mode 100644 index 09777dda6c..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json index cff1680b35..efb128b76a 100644 --- a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json +++ b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "1024.png", + "filename" : "logo 1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/logo 1024.png b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/logo 1024.png new file mode 100644 index 0000000000..1ec46af3e5 Binary files /dev/null and b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/logo 1024.png differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png deleted file mode 100644 index 88e840ab3f..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png deleted file mode 100644 index 88e840ab3f..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png deleted file mode 100644 index 5427a83a54..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png deleted file mode 100644 index 053d120dfd..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png deleted file mode 100644 index 053d120dfd..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png deleted file mode 100644 index ce818a7482..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png deleted file mode 100644 index ce818a7482..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png deleted file mode 100644 index 1ddf301d09..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png deleted file mode 100644 index dab3af9e16..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png deleted file mode 100644 index bb126fd662..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png deleted file mode 100644 index bb126fd662..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png deleted file mode 100644 index 8e11bdfa40..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png deleted file mode 100644 index 8e11bdfa40..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png deleted file mode 100644 index 523af45654..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png deleted file mode 100644 index c43dd4adf1..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png deleted file mode 100644 index c43dd4adf1..0000000000 Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json index 26e3cae6c3..d7167a5dd8 100644 --- a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,134 +1,59 @@ { "images" : [ + { + "extent" : "full-screen", + "filename" : "New Project.png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "filename" : "New Project (1).png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "filename" : "New Project (2).png", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2436h" + }, { "extent" : "full-screen", "idiom" : "iphone", - "subtype" : "736h", - "filename" : "1242x2208.png", "minimum-system-version" : "8.0", "orientation" : "portrait", - "scale" : "3x" + "scale" : "3x", + "subtype" : "736h" }, { "extent" : "full-screen", "idiom" : "iphone", - "subtype" : "736h", - "filename" : "2208x1242.png", "minimum-system-version" : "8.0", "orientation" : "landscape", - "scale" : "3x" + "scale" : "3x", + "subtype" : "736h" }, { "extent" : "full-screen", "idiom" : "iphone", - "subtype" : "667h", - "filename" : "750x1334.png", "minimum-system-version" : "8.0", "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "filename" : "640x960-1.png", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "640x1136.png", - "minimum-system-version" : "7.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "filename" : "768x1024-1.png", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "filename" : "1024x768.png", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "filename" : "1536x2048-1.png", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "filename" : "2048x1536.png", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "filename" : "320x480.png", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "filename" : "640x960.png", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "filename" : "640x1136-1.png", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "filename" : "768x1024.png", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "filename" : "1024x768-1.png", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "filename" : "1536x2048.png", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "filename" : "2048x1536-1.png", - "scale" : "2x" + "scale" : "2x", + "subtype" : "667h" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (1).png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (1).png new file mode 100644 index 0000000000..5304c50cc5 Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (1).png differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (2).png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (2).png new file mode 100644 index 0000000000..d71bf99c8a Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project (2).png differ diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project.png new file mode 100644 index 0000000000..2fc718ef6d Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/New Project.png differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json index 97804fb11e..4e12055ad8 100644 --- a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "logo.png", "idiom" : "universal", - "filename" : "imgLogo.png", "scale" : "1x" }, { + "filename" : "logo 1.png", "idiom" : "universal", - "filename" : "imgLogo@2x.png", "scale" : "2x" }, { + "filename" : "logo 2.png", "idiom" : "universal", - "filename" : "imgLogo@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png deleted file mode 100644 index fcbd5a435c..0000000000 Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png deleted file mode 100644 index 58cc04111c..0000000000 Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png deleted file mode 100644 index 72d26cddd8..0000000000 Binary files a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/imgLogo@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 1.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 1.png new file mode 100644 index 0000000000..6c30ed64c3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 1.png differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 2.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 2.png new file mode 100644 index 0000000000..6c30ed64c3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo 2.png differ diff --git a/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo.png b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo.png new file mode 100644 index 0000000000..6c30ed64c3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/logo.png differ diff --git a/iphone/Maps/Images.xcassets/SplashScreen.imageset/Contents.json b/iphone/Maps/Images.xcassets/SplashScreen.imageset/Contents.json new file mode 100644 index 0000000000..bdefa4af19 --- /dev/null +++ b/iphone/Maps/Images.xcassets/SplashScreen.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "SplashScreen.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/SplashScreen.imageset/SplashScreen.png b/iphone/Maps/Images.xcassets/SplashScreen.imageset/SplashScreen.png new file mode 100644 index 0000000000..c06c4cf5e8 Binary files /dev/null and b/iphone/Maps/Images.xcassets/SplashScreen.imageset/SplashScreen.png differ diff --git a/iphone/Maps/Images.xcassets/logo.imageset/Contents.json b/iphone/Maps/Images.xcassets/logo.imageset/Contents.json index ad42a58df2..7c58c478f6 100644 --- a/iphone/Maps/Images.xcassets/logo.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/logo.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "logo.svg", + "filename" : "logo.png", "idiom" : "universal" } ], diff --git a/iphone/Maps/Images.xcassets/logo.imageset/logo.png b/iphone/Maps/Images.xcassets/logo.imageset/logo.png new file mode 100644 index 0000000000..6c30ed64c3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/logo.imageset/logo.png differ diff --git a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg b/iphone/Maps/Images.xcassets/logo.imageset/logo.svg deleted file mode 100644 index 14f52eba26..0000000000 --- a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 312f197414..07530623e5 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1447,7 +1447,7 @@ 52EF1B612C8989F1003046A4 /* PlaceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceViewController.swift; sourceTree = ""; }; 52EF1B652C8989F9003046A4 /* PlaceViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceViewModel.swift; sourceTree = ""; }; 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = ""; }; - 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Organic Maps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6741AA5D1BF340DE002C974C /* Tourism (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Tourism (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoSansThai-Regular.ttf"; path = "../../data/00_NotoSansThai-Regular.ttf"; sourceTree = ""; }; 6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoNaskhArabic-Regular.ttf"; path = "../../data/00_NotoNaskhArabic-Regular.ttf"; sourceTree = ""; }; 6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = ""; }; @@ -2106,7 +2106,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, + 6741AA5D1BF340DE002C974C /* Tourism (Debug).app */, ED097E762BB80C320006ED01 /* OMapsTests.xctest */, ); name = Products; @@ -4703,7 +4703,7 @@ CED0E0102C8ACBE1008C61CA /* CountryPickerView */, ); productName = Maps; - productReference = 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */; + productReference = 6741AA5D1BF340DE002C974C /* Tourism (Debug).app */; productType = "com.apple.product-type.application"; }; ED097E752BB80C320006ED01 /* OMapsTests */ = { @@ -5920,7 +5920,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; - PRODUCT_NAME = "Organic Maps (Debug)"; + PRODUCT_NAME = "Tourism (Debug)"; SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -5961,7 +5961,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; - PRODUCT_NAME = "Organic Maps"; + PRODUCT_NAME = "Tourism Map Tajikistan"; SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; diff --git a/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard b/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard index fa3015c8e4..e90755f18b 100644 --- a/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard +++ b/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard @@ -1,11 +1,10 @@ - - - - + + - + + @@ -17,8 +16,14 @@ - + + + + + + + @@ -26,4 +31,10 @@ + + + + + +