diff --git a/iphone/Maps/Debug Icon.icon/Assets/Part 1.svg b/iphone/Maps/Debug Icon.icon/Assets/Part 1.svg new file mode 100644 index 000000000..bf1d2f761 --- /dev/null +++ b/iphone/Maps/Debug Icon.icon/Assets/Part 1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iphone/Maps/Debug Icon.icon/Assets/Part 2.svg b/iphone/Maps/Debug Icon.icon/Assets/Part 2.svg new file mode 100644 index 000000000..b1dd4b30b --- /dev/null +++ b/iphone/Maps/Debug Icon.icon/Assets/Part 2.svg @@ -0,0 +1,11 @@ + + + Shape + + \ No newline at end of file diff --git a/iphone/Maps/Debug Icon.icon/icon.json b/iphone/Maps/Debug Icon.icon/icon.json new file mode 100644 index 000000000..c77ae7df3 --- /dev/null +++ b/iphone/Maps/Debug Icon.icon/icon.json @@ -0,0 +1,139 @@ +{ + "fill" : { + "solid" : "srgb:0.97255,0.70588,0.18039,1.00000" + }, + "groups" : [ + { + "blur-material" : null, + "layers" : [ + { + "blend-mode" : "normal", + "fill" : { + "solid" : "srgb:0.99608,0.99216,0.96471,1.00000" + }, + "glass" : true, + "hidden" : false, + "image-name" : "Part 1.svg", + "name" : "Part 1", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -100.2890625, + 0.984375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "blend-mode" : "normal", + "blur-material" : null, + "hidden" : false, + "layers" : [ + { + "blend-mode" : "normal", + "fill" : { + "linear-gradient" : [ + "display-p3:0.99608,0.99216,0.96471,0.00000", + "srgb:0.99608,0.99216,0.96471,1.00000" + ] + }, + "glass" : true, + "hidden" : false, + "image-name" : "Part 1.svg", + "name" : "Part 1", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -100.2890625, + 0.984375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.4 + } + }, + { + "layers" : [ + { + "fill" : { + "solid" : "srgb:0.98431,0.87843,0.65098,1.00000" + }, + "hidden" : false, + "image-name" : "Part 2.svg", + "name" : "Part 2", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 119.9296875, + -6.0859375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "blur-material" : null, + "layers" : [ + { + "fill" : { + "linear-gradient" : [ + "display-p3:0.98431,0.87843,0.65098,0.00000", + "srgb:0.98431,0.87843,0.65098,1.00000" + ] + }, + "hidden" : false, + "image-name" : "Part 2.svg", + "name" : "Part 2", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 119.9296875, + -6.0859375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.3 + } + } + ], + "supported-platforms" : { + "squares" : "shared" + } +} \ No newline at end of file diff --git a/iphone/Maps/Icon.icon/Assets/Part 1.svg b/iphone/Maps/Icon.icon/Assets/Part 1.svg new file mode 100644 index 000000000..bf1d2f761 --- /dev/null +++ b/iphone/Maps/Icon.icon/Assets/Part 1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iphone/Maps/Icon.icon/Assets/Part 2.svg b/iphone/Maps/Icon.icon/Assets/Part 2.svg new file mode 100644 index 000000000..ae28685ef --- /dev/null +++ b/iphone/Maps/Icon.icon/Assets/Part 2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iphone/Maps/Icon.icon/icon.json b/iphone/Maps/Icon.icon/icon.json new file mode 100644 index 000000000..b14fa142e --- /dev/null +++ b/iphone/Maps/Icon.icon/icon.json @@ -0,0 +1,139 @@ +{ + "fill" : { + "solid" : "srgb:0.34510,0.50588,0.34118,1.00000" + }, + "groups" : [ + { + "blur-material" : null, + "layers" : [ + { + "blend-mode" : "normal", + "fill" : { + "solid" : "srgb:0.99608,0.99216,0.96471,1.00000" + }, + "glass" : true, + "hidden" : false, + "image-name" : "Part 1.svg", + "name" : "Part 1", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -100.2890625, + 0.984375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "blend-mode" : "normal", + "blur-material" : null, + "hidden" : false, + "layers" : [ + { + "blend-mode" : "normal", + "fill" : { + "linear-gradient" : [ + "display-p3:0.99608,0.99216,0.96471,0.00000", + "srgb:0.99608,0.99216,0.96471,1.00000" + ] + }, + "glass" : true, + "hidden" : false, + "image-name" : "Part 1.svg", + "name" : "Part 1", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -100.2890625, + 0.984375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.3 + } + }, + { + "layers" : [ + { + "fill" : { + "solid" : "srgb:0.80000,0.87451,0.79216,1.00000" + }, + "hidden" : false, + "image-name" : "Part 2.svg", + "name" : "Part 2", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 119.9296875, + -6.0859375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "blur-material" : null, + "layers" : [ + { + "fill" : { + "linear-gradient" : [ + "display-p3:0.80000,0.87451,0.79216,0.00000", + "srgb:0.80000,0.87451,0.79216,1.00000" + ] + }, + "hidden" : false, + "image-name" : "Part 2.svg", + "name" : "Part 2", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 119.9296875, + -6.0859375 + ] + } + } + ], + "lighting" : "combined", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.3 + } + } + ], + "supported-platforms" : { + "squares" : "shared" + } +} \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 0fbc548b7..fe3399f6c 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 165953942CB44B5600CFED7C /* symbols in Resources */ = {isa = PBXBuildFile; fileRef = 165953932CB44B3B00CFED7C /* symbols */; }; 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; }; + 27176A862E65B0150015F25F /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A852E65B0150015F25F /* Icon.icon */; }; + 27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A892E65B01B0015F25F /* Debug Icon.icon */; }; 272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */; }; 272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */; }; 272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */; }; @@ -759,6 +761,8 @@ 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = "UIColor+PartnerColor.m"; sourceTree = ""; tabWidth = 2; }; 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = ""; tabWidth = 2; }; 270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = ""; }; + 27176A852E65B0150015F25F /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = ""; }; + 27176A892E65B01B0015F25F /* Debug Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "Debug Icon.icon"; sourceTree = ""; }; 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExistingProfileView.swift; sourceTree = ""; }; 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoExistingProfileView.swift; sourceTree = ""; }; 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = ""; }; @@ -2013,6 +2017,8 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 27176A852E65B0150015F25F /* Icon.icon */, + 27176A892E65B01B0015F25F /* Debug Icon.icon */, F6C3A1B121AC22810060EEC8 /* Alert 5.m4a */, 4A300ED31C6DCFD400140018 /* countries-strings */, 5605022E1B6211E100169CAD /* sound-strings */, @@ -4174,6 +4180,7 @@ 471A7BC22481D44B00A0D4C1 /* BookmarkTitleCell.xib in Resources */, FA637ED329A500BE00D8921A /* drules_proto_outdoors_light.txt in Resources */, F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */, + 27176A862E65B0150015F25F /* Icon.icon in Resources */, F6E2FE701E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */, 4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */, 47CA68D22500435E00671019 /* BookmarksListViewController.xib in Resources */, @@ -4287,6 +4294,7 @@ 6741A95D1BF340DE002C974C /* types.txt in Resources */, 340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */, 6741A9521BF340DE002C974C /* World.mwm in Resources */, + 27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */, 6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5085,6 +5093,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; + ASSETCATALOG_OTHER_FLAGS = "--enable-icon-stack-fallback-generation=disabled"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -5117,6 +5127,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; + ASSETCATALOG_OTHER_FLAGS = "--enable-icon-stack-fallback-generation=disabled"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic;