From 795b4da51f14fb3d4aaeaec31e10a917755fb349 Mon Sep 17 00:00:00 2001 From: Evgeny Fayvuzhinsky Date: Fri, 19 Aug 2022 23:50:00 +0300 Subject: [PATCH] [ios] Add dark mode to LaunchScreen.storyboard, remove LaunchImage Apple HIG suggest empty launch screen or with UI (no splash screens). Following discussion #3215, UI elements are no good on LaunchScreen. Just adding support of a system dark mode as a follow up to #7292. Also removed LaunchImage assets (they were for iOS 7 and lower). Closes: #3049 Signed-off-by: Evgeny Fayvuzhinsky --- .../LaunchImage.launchimage/1024x768-1.png | Bin 190 -> 0 bytes .../LaunchImage.launchimage/1024x768.png | Bin 190 -> 0 bytes .../LaunchImage.launchimage/1242x2208.png | Bin 431 -> 0 bytes .../LaunchImage.launchimage/1536x2048-1.png | Bin 477 -> 0 bytes .../LaunchImage.launchimage/1536x2048.png | Bin 477 -> 0 bytes .../LaunchImage.launchimage/2048x1536-1.png | Bin 477 -> 0 bytes .../LaunchImage.launchimage/2048x1536.png | Bin 477 -> 0 bytes .../LaunchImage.launchimage/2208x1242.png | Bin 428 -> 0 bytes .../LaunchImage.launchimage/320x480.png | Bin 113 -> 0 bytes .../LaunchImage.launchimage/640x1136-1.png | Bin 184 -> 0 bytes .../LaunchImage.launchimage/640x1136.png | Bin 184 -> 0 bytes .../LaunchImage.launchimage/640x960-1.png | Bin 170 -> 0 bytes .../LaunchImage.launchimage/640x960.png | Bin 170 -> 0 bytes .../LaunchImage.launchimage/750x1334.png | Bin 217 -> 0 bytes .../LaunchImage.launchimage/768x1024-1.png | Bin 190 -> 0 bytes .../LaunchImage.launchimage/768x1024.png | Bin 190 -> 0 bytes .../LaunchImage.launchimage/Contents.json | 134 ------------------ .../LaunchScreen/Contents.json | 6 + .../backgroundColor.colorset/Contents.json | 38 +++++ iphone/Maps/Maps.xcodeproj/project.pbxproj | 2 - .../UI/Storyboard/LaunchScreen.storyboard | 23 +-- 21 files changed, 58 insertions(+), 145 deletions(-) delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png delete mode 100644 iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json create mode 100644 iphone/Maps/Images.xcassets/LaunchScreen/Contents.json create mode 100644 iphone/Maps/Images.xcassets/LaunchScreen/backgroundColor.colorset/Contents.json 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 88e840ab3fd64b6cec2aa6fab46a5c9eb1f343d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j85o&?R6|L-ABY#=6XN>r{X?#|fA<2pWu7jM uAr*{o4>kfh42Ku|4wg^33S!a_H0)t+=4W8+P2#-;vc=QY&t;ucLK6UZb{aeY 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 88e840ab3fd64b6cec2aa6fab46a5c9eb1f343d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j85o&?R6|L-ABY#=6XN>r{X?#|fA<2pWu7jM uAr*{o4>kfh42Ku|4wg^33S!a_H0)t+=4W8+P2#-;vc=QY&t;ucLK6UZb{aeY 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 5427a83a54b19eed089a99e1bb8ef74a20465e25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmeAS@N?(olHy`uVBq!ia0y~yV7bM>z_Eal87Oi&<}Q%Kz#QNc;`;9WL$0@f_cAar zrhB?LhEy=VJ;=xiRLyMgH@KVeei%^QD4<>l9H`>;%4T5v#l!O!WT>aBpUXO@geCwx Cr5oM= 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 053d120dfd8f50d60ddefd6b7be6b5f2d338e268..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 477 zcmeAS@N?(olHy`uVBq!ia0y~yU;{Ea7#Nv>)Ghg}QXs_~;1lBd?)^iqw}1CCFfdN_ zba4!+V0?R!k&%Icg+bxJKXY0LkU0tlE(AVsaYQjNZrFXY7UTv`S3j3^P6)Ghg}QXs_~;1lBd?)^iqw}1CCFfdN_ zba4!+V0?R!k&%Icg+bxJKXY0LkU0tlE(AVsaYQjNZrFXY7UTv`S3j3^P6)QvDJJs`y#;1lBd?)^iqw}1CCFfdN_ zba4!+h)QvDJJs`y#;1lBd?)^iqw}1CCFfdN_ zba4!+hB?WRWd0253gnnxyS-kI0~o~0u3wk#|mN>_Cb+z$e7@-TQ}JZ~yKEay30& v978JN-X1Vy1o93k{9eB8h+hN?kc|c&_&i`>ocgqSCrI4W)z4*}Q$iB}>^2-- 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 bb126fd6626a033ef5234285500e2a3deb4bb98e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sU@2f^28uX1mOBF}<^Z1%*LUw9a=rb#7sxH} yba4!+V0?R!k&%IcgK5FP_3zv?4g7&Jv;jKl^$d*5dX`=S8Sm-p=d#Wzp$PyEm>O09 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 bb126fd6626a033ef5234285500e2a3deb4bb98e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sU@2f^28uX1mOBF}<^Z1%*LUw9a=rb#7sxH} yba4!+V0?R!k&%IcgK5FP_3zv?4g7&Jv;jKl^$d*5dX`=S8Sm-p=d#Wzp$PyEm>O09 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 8e11bdfa40f2d5e3a0acf2a2e1436c1d28b0786e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sU_QXe3>2BK6SV_KF$egBxW0S;kn8Q=y+Ce~ xr;B4q1>@U;hKxYoA%)+|w;k0>-~_U%1^D#OGcbzha-9Pi=;`X`vd$@?2>_!28hHQ! 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 8e11bdfa40f2d5e3a0acf2a2e1436c1d28b0786e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sU_QXe3>2BK6SV_KF$egBxW0S;kn8Q=y+Ce~ xr;B4q1>@U;hKxYoA%)+|w;k0>-~_U%1^D#OGcbzha-9Pi=;`X`vd$@?2>_!28hHQ! 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 523af45654bf7a98edc020f9d39e65ce900601fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0y~yV0y>Ez-q?G3>5hwxzH6zF$egBxW0S;kn8Q=y+H0n wPZ!6K3dXkw4H<#FLkho_Z#$fq0AddiD0nZ)z}UOaq6K8Xr>mdKI;Vst0MMr!-2eap 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 c43dd4adf1406a5d7be588df1f2a29b1bf232ad1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yUTc6jl!2-ynC1_x7;b&mX$*M^L+2ZNy=d#Wzp$P!)3>sPh 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 c43dd4adf1406a5d7be588df1f2a29b1bf232ad1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yUTc6jl!2-ynC1_x7;b&mX$*M^L+2ZNy=d#Wzp$P!)3>sPh diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 26e3cae6c3..0000000000 --- a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "images" : [ - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "1242x2208.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "2208x1242.png", - "minimum-system-version" : "8.0", - "orientation" : "landscape", - "scale" : "3x" - }, - { - "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" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/LaunchScreen/Contents.json b/iphone/Maps/Images.xcassets/LaunchScreen/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/iphone/Maps/Images.xcassets/LaunchScreen/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/LaunchScreen/backgroundColor.colorset/Contents.json b/iphone/Maps/Images.xcassets/LaunchScreen/backgroundColor.colorset/Contents.json new file mode 100644 index 0000000000..9c2319eb89 --- /dev/null +++ b/iphone/Maps/Images.xcassets/LaunchScreen/backgroundColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xD2", + "green" : "0xE1", + "red" : "0xE3" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 0f4c62981e..3f504e4cd4 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4874,7 +4874,6 @@ baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = app.organicmaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; @@ -4915,7 +4914,6 @@ baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = app.organicmaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; diff --git a/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard b/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard index fa3015c8e4..4888de1ba0 100644 --- a/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard +++ b/iphone/Maps/UI/Storyboard/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - - - - + + + - + + @@ -13,17 +13,22 @@ - + - + - + - + + + + + +