From c5ca97eec7adb8aa683ed1d5f397d1ff24c3a815 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Mon, 11 Apr 2022 20:01:10 +0300 Subject: [PATCH] Add app icon --- GradeMapper.xcodeproj/project.pbxproj | 14 +- .../xcschemes/xcschememanagement.plist | 5 + .../AppIcon.appiconset/Contents.json | 144 +++++++++++------- 3 files changed, 99 insertions(+), 64 deletions(-) diff --git a/GradeMapper.xcodeproj/project.pbxproj b/GradeMapper.xcodeproj/project.pbxproj index f3a794c..95b222c 100644 --- a/GradeMapper.xcodeproj/project.pbxproj +++ b/GradeMapper.xcodeproj/project.pbxproj @@ -263,11 +263,12 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "GradeMapper (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = F5PQ7AR4DP; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; @@ -282,11 +283,11 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; PRODUCT_NAME = GradeMapper; SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = YES; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,6"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -297,11 +298,12 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "GradeMapper (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = F5PQ7AR4DP; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; @@ -316,11 +318,11 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ivabus.GradeMapper; PRODUCT_NAME = GradeMapper; SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = YES; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,6"; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcschemes/xcschememanagement.plist b/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcschemes/xcschememanagement.plist index 34c86f3..e09a7fb 100644 --- a/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/GradeMapper.xcodeproj/xcuserdata/ivabus.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + GradeMapper (iOS).xcscheme_^#shared#^_ + + orderHint + 0 + GradeMapper (macOS).xcscheme_^#shared#^_ orderHint diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json index c136eaf..053d62a 100644 --- a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,148 +1,176 @@ { "images" : [ { + "scale" : "1x", + "filename" : "icon_1024.png", + "size" : "1024x1024", + "idiom" : "ios-marketing" + }, + { + "filename" : "icon_40.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "idiom" : "iphone", + "size" : "20x20", + "filename" : "icon_60.png", "scale" : "3x", - "size" : "20x20" + "idiom" : "iphone" }, { + "size" : "29x29", "idiom" : "iphone", + "filename" : "icon_58.png", + "scale" : "2x" + }, + { + "filename" : "icon_87.png", + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "filename" : "icon_80.png", + "size" : "40x40", "scale" : "2x", - "size" : "29x29" + "idiom" : "iphone" }, { "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "size" : "40x40", + "filename" : "icon_120.png", + "scale" : "3x" }, { - "idiom" : "iphone", + "filename" : "icon_120.png", + "size" : "60x60", "scale" : "2x", - "size" : "40x40" + "idiom" : "iphone" }, { - "idiom" : "iphone", + "size" : "60x60", + "filename" : "icon_180.png", "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "idiom" : "iphone" }, { "idiom" : "ipad", "scale" : "1x", - "size" : "20x20" + "size" : "20x20", + "filename" : "icon_20.png" }, { - "idiom" : "ipad", "scale" : "2x", - "size" : "20x20" + "idiom" : "ipad", + "size" : "20x20", + "filename" : "icon_40.png" }, { - "idiom" : "ipad", + "filename" : "icon_29.png", + "size" : "29x29", "scale" : "1x", - "size" : "29x29" + "idiom" : "ipad" }, { - "idiom" : "ipad", "scale" : "2x", - "size" : "29x29" + "filename" : "icon_58.png", + "size" : "29x29", + "idiom" : "ipad" }, { "idiom" : "ipad", + "filename" : "icon_40.png", "scale" : "1x", "size" : "40x40" }, { - "idiom" : "ipad", "scale" : "2x", - "size" : "40x40" + "size" : "40x40", + "filename" : "icon_80.png", + "idiom" : "ipad" }, { "idiom" : "ipad", + "filename" : "icon_76.png", "scale" : "1x", "size" : "76x76" }, { + "filename" : "icon_152.png", + "size" : "76x76", "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "scale" : "2x" }, { + "filename" : "icon_167.png", "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" + "size" : "83.5x83.5", + "scale" : "2x" }, { + "filename" : "icon_16.png", "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" + "size" : "16x16", + "scale" : "1x" }, { - "idiom" : "mac", + "filename" : "icon_32.png", "scale" : "2x", - "size" : "16x16" + "size" : "16x16", + "idiom" : "mac" }, { + "filename" : "icon_32.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { + "size" : "32x32", "idiom" : "mac", "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" + "filename" : "icon_64.png" + }, + { + "size" : "128x128", + "filename" : "icon_128.png", + "idiom" : "mac", + "scale" : "1x" + }, + { + "filename" : "icon_256.png", + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" }, { "idiom" : "mac", + "filename" : "icon_256.png", "scale" : "1x", "size" : "256x256" }, { - "idiom" : "mac", "scale" : "2x", - "size" : "256x256" + "idiom" : "mac", + "size" : "256x256", + "filename" : "icon_512.png" }, { - "idiom" : "mac", + "filename" : "icon_512.png", "scale" : "1x", + "idiom" : "mac", "size" : "512x512" }, { + "filename" : "icon_1024.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file