diff --git a/MacNearFuture/Views/ContentView.swift b/MacNearFuture/Views/ContentView.swift index b8f8c93..9209f30 100644 --- a/MacNearFuture/Views/ContentView.swift +++ b/MacNearFuture/Views/ContentView.swift @@ -17,6 +17,8 @@ struct ContentView: View { .imageScale(.large) .foregroundStyle(.tint) Text("Hello, world!") + Text(getVersion()) + .foregroundStyle(Color("uiColors/bloo")) } .padding() } diff --git a/NearFuture.xcodeproj/project.pbxproj b/NearFuture.xcodeproj/project.pbxproj index 36fd439..b739678 100644 --- a/NearFuture.xcodeproj/project.pbxproj +++ b/NearFuture.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920C28D2D24011A00E4F9B1 /* Assets.xcassets */; }; A90D49402DDE111400781124 /* NearFutureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2872D24011400E4F9B1 /* NearFutureApp.swift */; }; A90D49422DDE114100781124 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Event.swift */; }; + A90D49442DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; }; + A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; }; + A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; }; A914FA4B2DD26C6800856265 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4A2DD26C0F00856265 /* HomeView.swift */; }; A914FA4D2DD2768900856265 /* WhatsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4C2DD2768900856265 /* WhatsNewView.swift */; }; A914FA4F2DD276D200856265 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4E2DD276D200856265 /* AboutView.swift */; }; @@ -70,6 +73,7 @@ A90D49262DDE0FA400781124 /* MacNearFuture.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacNearFuture.app; sourceTree = BUILT_PRODUCTS_DIR; }; A90D49332DDE0FAF00781124 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; A90D49342DDE0FAF00781124 /* MacNearFuture.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacNearFuture.entitlements; sourceTree = ""; }; + A90D49432DDE1C1100781124 /* Tints.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Tints.xcassets; sourceTree = ""; }; A90FDE222DC0D4310012790C /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; A914FA4A2DD26C0F00856265 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; A914FA4C2DD2768900856265 /* WhatsNewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WhatsNewView.swift; path = NearFuture/Views/Settings/WhatsNewView.swift; sourceTree = SOURCE_ROOT; }; @@ -165,9 +169,9 @@ A920C27B2D24011300E4F9B1 = { isa = PBXGroup; children = ( - A90D49412DDE112700781124 /* Shared */, A90D491F2DDE08E400781124 /* README.md */, A90FDE222DC0D4310012790C /* Config.xcconfig */, + A90D49412DDE112700781124 /* Shared */, A920C2862D24011400E4F9B1 /* NearFuture */, A90D49362DDE0FAF00781124 /* MacNearFuture */, A949F8002DCAA0340064DCA0 /* Resources */, @@ -208,6 +212,7 @@ children = ( A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */, A920C28D2D24011A00E4F9B1 /* Assets.xcassets */, + A90D49432DDE1C1100781124 /* Tints.xcassets */, A949F82E2DCAAA640064DCA0 /* NearFutureIcon.pxd */, A949F82F2DCAAA640064DCA0 /* NearFutureIconDark.pxd */, A949F8302DCAAA640064DCA0 /* NearFutureIconTint.pxd */, @@ -406,6 +411,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */, A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */, A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */, ); @@ -415,6 +421,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A90D49442DDE1C7600781124 /* Tints.xcassets in Resources */, A920C2922D24011A00E4F9B1 /* Preview Assets.xcassets in Resources */, A949F8322DCAAA8A0064DCA0 /* NearFutureIcon.png in Resources */, A920C28E2D24011A00E4F9B1 /* Assets.xcassets in Resources */, @@ -425,6 +432,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */, A979F6102D270AF90094C0B3 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -493,12 +501,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "bloo blue green pink purple red yellow"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = MacNearFuture/MacNearFuture.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)"; DEVELOPMENT_TEAM = 8JGND254B7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -509,7 +518,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.5; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "$(VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = com.neon443.NearFuture; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; @@ -523,12 +532,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "bloo blue green pink purple red yellow"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = MacNearFuture/MacNearFuture.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)"; DEVELOPMENT_TEAM = 8JGND254B7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -539,7 +549,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.5; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "$(VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = com.neon443.NearFuture; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; diff --git a/Resources/Tints.xcassets/Contents.json b/Resources/Tints.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Resources/Tints.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Resources/Assets.xcassets/one.colorset/Contents.json b/Resources/Tints.xcassets/one.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/one.colorset/Contents.json rename to Resources/Tints.xcassets/one.colorset/Contents.json diff --git a/Resources/Assets.xcassets/two.colorset/Contents.json b/Resources/Tints.xcassets/two.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/two.colorset/Contents.json rename to Resources/Tints.xcassets/two.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/Contents.json b/Resources/Tints.xcassets/uiColors/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/Contents.json rename to Resources/Tints.xcassets/uiColors/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/bloo.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/bloo.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/blue.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/blue.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/green.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/green.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/green.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/green.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/orange.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/orange.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/pink.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/pink.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/purple.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/purple.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/red.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/red.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/red.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/red.colorset/Contents.json diff --git a/Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json b/Resources/Tints.xcassets/uiColors/yellow.colorset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json rename to Resources/Tints.xcassets/uiColors/yellow.colorset/Contents.json