diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj index 3f73a574..b7ffb095 100644 --- a/IceCubesApp.xcodeproj/project.pbxproj +++ b/IceCubesApp.xcodeproj/project.pbxproj @@ -1189,7 +1189,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIconAlternate0 AppIconAlternate6 AppIconAlternate7 AppIconAlternate8 AppIconAlternate10 AppIconAlternate11 AppIconAlternate12 AppIconAlternate13 AppIconAlternate14 AppIconAlternate15 AppIconAlternate16 AppIconAlternate17 AppIconAlternate19 AppIconAlternate18 AppIconAlternate20 AppIconAlternate21 AppIconAlternate22 AppIconAlternate23 AppIconAlternate24 AppIconAlternate25 AppIconAlternate26 AppIconAlternate27 AppIconAlternate28 AppIconAlternate29 AppIconAlternate30 AppIconAlternate31 AppIconAlternate32 AppIconAlternate33 AppIconAlternate34 AppIconAlternate35 AppIconAlternate36 AppIconAlternate37 AppIconAlternate38 AppIconAlternate39 AppIconAlternate40 AppIconAlternate42 AppIconAlternate2 AppIconAlternate41 AppIconAlternate45 AppIconAlternate44 AppIconAlternate1 AppIconAlternate4 AppIconAlternate3 AppIconAlternate5 AppIconAlternate9 AppIconAlternate43"; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIconAlternate0 AppIconAlternate6 AppIconAlternate7 AppIconAlternate8 AppIconAlternate10 AppIconAlternate11 AppIconAlternate12 AppIconAlternate13 AppIconAlternate14 AppIconAlternate15 AppIconAlternate16 AppIconAlternate17 AppIconAlternate19 AppIconAlternate18 AppIconAlternate20 AppIconAlternate21 AppIconAlternate22 AppIconAlternate23 AppIconAlternate24 AppIconAlternate25 AppIconAlternate26 AppIconAlternate27 AppIconAlternate28 AppIconAlternate29 AppIconAlternate30 AppIconAlternate31 AppIconAlternate32 AppIconAlternate33 AppIconAlternate34 AppIconAlternate35 AppIconAlternate36 AppIconAlternate37 AppIconAlternate38 AppIconAlternate39 AppIconAlternate40 AppIconAlternate42 AppIconAlternate2 AppIconAlternate41 AppIconAlternate45 AppIconAlternate44 AppIconAlternate1 AppIconAlternate4 AppIconAlternate3 AppIconAlternate5 AppIconAlternate46 AppIconAlternate9 AppIconAlternate43"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; @@ -1243,7 +1243,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIconAlternate0 AppIconAlternate6 AppIconAlternate7 AppIconAlternate8 AppIconAlternate10 AppIconAlternate11 AppIconAlternate12 AppIconAlternate13 AppIconAlternate14 AppIconAlternate15 AppIconAlternate16 AppIconAlternate17 AppIconAlternate19 AppIconAlternate18 AppIconAlternate20 AppIconAlternate21 AppIconAlternate22 AppIconAlternate23 AppIconAlternate24 AppIconAlternate25 AppIconAlternate26 AppIconAlternate27 AppIconAlternate28 AppIconAlternate29 AppIconAlternate30 AppIconAlternate31 AppIconAlternate32 AppIconAlternate33 AppIconAlternate34 AppIconAlternate35 AppIconAlternate36 AppIconAlternate37 AppIconAlternate38 AppIconAlternate39 AppIconAlternate40 AppIconAlternate42 AppIconAlternate2 AppIconAlternate41 AppIconAlternate45 AppIconAlternate44 AppIconAlternate1 AppIconAlternate4 AppIconAlternate3 AppIconAlternate5 AppIconAlternate9 AppIconAlternate43"; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIconAlternate0 AppIconAlternate6 AppIconAlternate7 AppIconAlternate8 AppIconAlternate10 AppIconAlternate11 AppIconAlternate12 AppIconAlternate13 AppIconAlternate14 AppIconAlternate15 AppIconAlternate16 AppIconAlternate17 AppIconAlternate19 AppIconAlternate18 AppIconAlternate20 AppIconAlternate21 AppIconAlternate22 AppIconAlternate23 AppIconAlternate24 AppIconAlternate25 AppIconAlternate26 AppIconAlternate27 AppIconAlternate28 AppIconAlternate29 AppIconAlternate30 AppIconAlternate31 AppIconAlternate32 AppIconAlternate33 AppIconAlternate34 AppIconAlternate35 AppIconAlternate36 AppIconAlternate37 AppIconAlternate38 AppIconAlternate39 AppIconAlternate40 AppIconAlternate42 AppIconAlternate2 AppIconAlternate41 AppIconAlternate45 AppIconAlternate44 AppIconAlternate1 AppIconAlternate4 AppIconAlternate3 AppIconAlternate5 AppIconAlternate46 AppIconAlternate9 AppIconAlternate43"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; diff --git a/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift b/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift index b4dd9ba3..65b32f76 100644 --- a/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift +++ b/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift @@ -26,6 +26,7 @@ struct IconSelectorView: View { case alt38 case alt39, alt40, alt41, alt42, alt43 case alt44, alt45 + case alt46 var appIconName: String { return "AppIconAlternate\(rawValue)" @@ -39,10 +40,11 @@ struct IconSelectorView: View { static let items = [ IconSelector(title: "settings.app.icon.official".localized, icons: [ - .primary, .alt1, .alt2, .alt3, .alt4, + .primary, .alt46, .alt1, .alt2, .alt3, .alt4, .alt5, .alt6, .alt7, .alt8, .alt9, .alt10, .alt11, .alt12, .alt13, .alt14, .alt15, .alt16, .alt17, .alt18, .alt19, .alt20, .alt21]), + IconSelector(title: "\("settings.app.icon.designed-by".localized) Louie Mantia, Jr.", icons: []), IconSelector(title: "\("settings.app.icon.designed-by".localized) Albert Kinng", icons: [.alt22, .alt23, .alt24, .alt25, .alt26]), IconSelector(title: "\("settings.app.icon.designed-by".localized) Dan van Moll", icons: [.alt27, .alt28, .alt29]), IconSelector(title: "\("settings.app.icon.designed-by".localized) Chanhwi Joo (GitHub @te6-in)", icons: [.alt30, .alt31, .alt32, .alt33, .alt34, .alt35, .alt36]), diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/1024.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 00000000..cc1f2c88 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/AppIcon.png deleted file mode 100644 index f90e5c7e..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/AppIcon.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json index 204c99a8..42bb74dc 100755 --- a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,67 +1,67 @@ { "images" : [ { - "filename" : "AppIcon.png", + "filename" : "1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" }, { - "filename" : "Icon-16.png", + "filename" : "macos16.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { - "filename" : "Icon-32.png", + "filename" : "macos32 1.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { - "filename" : "Icon-32 1.png", + "filename" : "macos32.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { - "filename" : "Icon-64.png", + "filename" : "macos64.png", "idiom" : "mac", "scale" : "2x", "size" : "32x32" }, { - "filename" : "Icon-128.png", + "filename" : "macos128.png", "idiom" : "mac", "scale" : "1x", "size" : "128x128" }, { - "filename" : "Icon-256 1.png", + "filename" : "mac256 1.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" }, { - "filename" : "Icon-256.png", + "filename" : "mac256.png", "idiom" : "mac", "scale" : "1x", "size" : "256x256" }, { - "filename" : "Icon-512 1.png", + "filename" : "macOS512 1.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { - "filename" : "Icon-512.png", + "filename" : "macOS512.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { - "filename" : "Icon-1024.png", + "filename" : "macOS1024.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-1024.png deleted file mode 100644 index 6e328936..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-1024.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-128.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-128.png deleted file mode 100644 index 0f070207..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-128.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-16.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-16.png deleted file mode 100644 index aa765ae7..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-16.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256 1.png deleted file mode 100644 index 9fb2fac4..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256 1.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256.png deleted file mode 100644 index 9fb2fac4..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-256.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32 1.png deleted file mode 100644 index e24e7919..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32 1.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32.png deleted file mode 100644 index e24e7919..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-32.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512 1.png deleted file mode 100644 index 4d88cf2e..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512 1.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512.png deleted file mode 100644 index 4d88cf2e..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-512.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-64.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-64.png deleted file mode 100644 index d19be8a7..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Icon-64.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256 1.png new file mode 100644 index 00000000..45966064 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256 1.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256.png new file mode 100644 index 00000000..45966064 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/mac256.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS1024.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS1024.png new file mode 100644 index 00000000..25168062 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS1024.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512 1.png new file mode 100644 index 00000000..a2685e2a Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512 1.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512.png new file mode 100644 index 00000000..a2685e2a Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macOS512.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos128.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos128.png new file mode 100644 index 00000000..00c57e80 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos128.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos16.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos16.png new file mode 100644 index 00000000..2de17d07 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos16.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32 1.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32 1.png new file mode 100644 index 00000000..e99be08c Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32 1.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32.png new file mode 100644 index 00000000..e99be08c Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos32.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos64.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos64.png new file mode 100644 index 00000000..6d10fe70 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/macos64.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Back.png b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Back.png deleted file mode 100644 index 99e7e041..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Back.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Background.png b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Background.png new file mode 100644 index 00000000..1a9ff250 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Background.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json index 5979065a..53f39da0 100644 --- a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json +++ b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Back.png", + "filename" : "Background.png", "idiom" : "vision", "scale" : "2x" } diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json index e3b0a77a..0d74a85b 100644 --- a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json +++ b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Front.png", + "filename" : "Layer 1.png", "idiom" : "vision", "scale" : "2x" } diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Front.png b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Front.png deleted file mode 100644 index 0554a29c..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Front.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Layer 1.png b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Layer 1.png new file mode 100644 index 00000000..e8d18db9 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Layer 1.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Contents.json b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Contents.json index 8c9879e8..04056a54 100644 --- a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Contents.json +++ b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "Middle.png", "idiom" : "vision", "scale" : "2x" } diff --git a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Middle.png b/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Middle.png deleted file mode 100644 index 1f2f3586..00000000 Binary files a/IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Middle.png and /dev/null differ diff --git a/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/1024.png b/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/1024.png new file mode 100755 index 00000000..cc1f2c88 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/1024.png differ diff --git a/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/Contents.json new file mode 100644 index 00000000..cff1680b --- /dev/null +++ b/IceCubesApp/Assets.xcassets/AppIconAlternate46.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Images/AppIcon.png b/Images/AppIcon.png index f90e5c7e..25168062 100644 Binary files a/Images/AppIcon.png and b/Images/AppIcon.png differ