diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj index d2470c8a..2b433331 100644 --- a/IceCubesApp.xcodeproj/project.pbxproj +++ b/IceCubesApp.xcodeproj/project.pbxproj @@ -19,8 +19,8 @@ 9FAE4AD129379AD600772766 /* AppAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAE4AD029379AD600772766 /* AppAccount.swift */; }; 9FAE4AD32937A0C600772766 /* AppAccountsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAE4AD22937A0C600772766 /* AppAccountsManager.swift */; }; 9FBFE63D292A715500C250E9 /* IceCubesApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBFE63C292A715500C250E9 /* IceCubesApp.swift */; }; - 9FBFE641292A715600C250E9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9FBFE640292A715600C250E9 /* Assets.xcassets */; }; 9FBFE64E292A72BD00C250E9 /* Network in Frameworks */ = {isa = PBXBuildFile; productRef = 9FBFE64D292A72BD00C250E9 /* Network */; }; + 9FD34823293D06E800DB0EE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9FD34822293D06E800DB0EE9 /* Assets.xcassets */; }; 9FE151A6293C90F900E9683D /* IconSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FE151A5293C90F900E9683D /* IconSelectorView.swift */; }; /* End PBXBuildFile section */ @@ -39,8 +39,8 @@ 9FAE4AD22937A0C600772766 /* AppAccountsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAccountsManager.swift; sourceTree = ""; }; 9FBFE639292A715500C250E9 /* IceCubesApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IceCubesApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9FBFE63C292A715500C250E9 /* IceCubesApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IceCubesApp.swift; sourceTree = ""; }; - 9FBFE640292A715600C250E9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9FBFE642292A715600C250E9 /* IceCubesApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = IceCubesApp.entitlements; sourceTree = ""; }; + 9FD34822293D06E800DB0EE9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9FE151A5293C90F900E9683D /* IconSelectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconSelectorView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -76,7 +76,6 @@ isa = PBXGroup; children = ( 9F24EEB729360C330042359D /* Preview Assets.xcassets */, - 9FBFE640292A715600C250E9 /* Assets.xcassets */, ); path = Resources; sourceTree = ""; @@ -124,6 +123,7 @@ 9FBFE63B292A715500C250E9 /* IceCubesApp */ = { isa = PBXGroup; children = ( + 9FD34822293D06E800DB0EE9 /* Assets.xcassets */, 9FAE4AC8293774FF00772766 /* Info.plist */, 9F398AB429360A5800A889F2 /* App */, 9FBFE642292A715600C250E9 /* IceCubesApp.entitlements */, @@ -217,8 +217,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9FD34823293D06E800DB0EE9 /* Assets.xcassets in Resources */, 9F24EEB829360C330042359D /* Preview Assets.xcassets in Resources */, - 9FBFE641292A715600C250E9 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -380,7 +380,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.IceCubesApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -420,7 +420,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.IceCubesApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; diff --git a/IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesApp.xcscheme b/IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesApp.xcscheme new file mode 100644 index 00000000..82cdf8b1 --- /dev/null +++ b/IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesApp.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift b/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift index 2cfc2b76..e8267594 100644 --- a/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift +++ b/IceCubesApp/App/Tabs/Settings/IconSelectorView.swift @@ -6,7 +6,7 @@ struct IconSelectorView: View { self.rawValue } - case primary = "AppIcon" + case primary = "AppIconInApp" case alternate1 = "AppIconAlternate1" case alternate2 = "AppIconAlternate2" case alternate3 = "AppIconAlternate3" diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift index 1539060a..3ed51d7f 100644 --- a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift +++ b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift @@ -80,7 +80,7 @@ struct SettingsTabs: View { Label { Text("Icon selector") } icon: { - Image(uiImage: .init(named: UIApplication.shared.alternateIconName ?? "AppIcon")!) + Image(uiImage: .init(named: UIApplication.shared.alternateIconName ?? "AppIconInApp")!) .resizable() .frame(width: 25, height: 25) .cornerRadius(4) diff --git a/IceCubesApp/Resources/Assets.xcassets/AccentColor.colorset/Contents.json b/IceCubesApp/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AccentColor.colorset/Contents.json rename to IceCubesApp/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIcon.appiconset/icon.png b/IceCubesApp/Assets.xcassets/AppIcon.appiconset/icon.png similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIcon.appiconset/icon.png rename to IceCubesApp/Assets.xcassets/AppIcon.appiconset/icon.png diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate1.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconAlternate1.appiconset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate1.appiconset/Contents.json rename to IceCubesApp/Assets.xcassets/AppIconAlternate1.appiconset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate1.appiconset/icon.png b/IceCubesApp/Assets.xcassets/AppIconAlternate1.appiconset/icon.png similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate1.appiconset/icon.png rename to IceCubesApp/Assets.xcassets/AppIconAlternate1.appiconset/icon.png diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate2.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconAlternate2.appiconset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate2.appiconset/Contents.json rename to IceCubesApp/Assets.xcassets/AppIconAlternate2.appiconset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate2.appiconset/icon.png b/IceCubesApp/Assets.xcassets/AppIconAlternate2.appiconset/icon.png similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate2.appiconset/icon.png rename to IceCubesApp/Assets.xcassets/AppIconAlternate2.appiconset/icon.png diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate3.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconAlternate3.appiconset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate3.appiconset/Contents.json rename to IceCubesApp/Assets.xcassets/AppIconAlternate3.appiconset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate3.appiconset/icon.png b/IceCubesApp/Assets.xcassets/AppIconAlternate3.appiconset/icon.png similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate3.appiconset/icon.png rename to IceCubesApp/Assets.xcassets/AppIconAlternate3.appiconset/icon.png diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate4.appiconset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconAlternate4.appiconset/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate4.appiconset/Contents.json rename to IceCubesApp/Assets.xcassets/AppIconAlternate4.appiconset/Contents.json diff --git a/IceCubesApp/Resources/Assets.xcassets/AppIconAlternate4.appiconset/icon.png b/IceCubesApp/Assets.xcassets/AppIconAlternate4.appiconset/icon.png similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/AppIconAlternate4.appiconset/icon.png rename to IceCubesApp/Assets.xcassets/AppIconAlternate4.appiconset/icon.png diff --git a/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/Contents.json b/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/Contents.json new file mode 100644 index 00000000..2945b36b --- /dev/null +++ b/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/icon.png b/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/icon.png new file mode 100644 index 00000000..0fecb831 Binary files /dev/null and b/IceCubesApp/Assets.xcassets/AppIconInApp.imageset/icon.png differ diff --git a/IceCubesApp/Resources/Assets.xcassets/Contents.json b/IceCubesApp/Assets.xcassets/Contents.json similarity index 100% rename from IceCubesApp/Resources/Assets.xcassets/Contents.json rename to IceCubesApp/Assets.xcassets/Contents.json