diff --git a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj index 4c25467e..a1c923ba 100644 --- a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj +++ b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj @@ -138,6 +138,7 @@ DCC05042BEB7C047BE4DB7E9 /* DevLogWidgetCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogWidgetCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ECA33E1403AF8BDB84D46C01 /* DevLogPresentation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogPresentation.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F078E79DE65AE8D92F556B27 /* DeletePushNotificationIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletePushNotificationIntegrationTests.swift; sourceTree = ""; }; + FA3AC9C61067B0FBDE869711 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -206,6 +207,7 @@ children = ( 6F190E03DDAFD11C50FF6510 /* App */, 514423F7A59AD057AC7310CA /* Resource */, + FA3AC9C61067B0FBDE869711 /* App.xcconfig */, ); path = Sources; sourceTree = ""; @@ -509,8 +511,9 @@ /* Begin XCBuildConfiguration section */ 31AC08F8A6DA3854B3A6B6AC /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; + baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */; buildSettings = { + APS_ENVIRONMENT = production; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements; @@ -617,8 +620,9 @@ }; 8D758741AE117AED0462B9E4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; + baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */; buildSettings = { + APS_ENVIRONMENT = development; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements; diff --git a/Application/DevLogApp/Project.swift b/Application/DevLogApp/Project.swift index 2e636192..35f4ee59 100644 --- a/Application/DevLogApp/Project.swift +++ b/Application/DevLogApp/Project.swift @@ -36,11 +36,17 @@ let project = Project( DevLogPackages.swiftLintPlugin, ], settings: .devlog( - versionXcconfigPath: "../Shared/Version.xcconfig", + versionXcconfigPath: "Sources/App.xcconfig", base: [ "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon", "CODE_SIGN_STYLE": "Automatic", "PRODUCT_MODULE_NAME": "DevLogApp", + ], + debug: [ + "APS_ENVIRONMENT": "development", + ], + release: [ + "APS_ENVIRONMENT": "production", ] ) ), diff --git a/Application/DevLogApp/Sources/App.xcconfig b/Application/DevLogApp/Sources/App.xcconfig new file mode 100644 index 00000000..e0e8aa65 --- /dev/null +++ b/Application/DevLogApp/Sources/App.xcconfig @@ -0,0 +1,2 @@ +#include "../../Shared/Version.xcconfig" +#include? "Resource/Config.xcconfig" diff --git a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift index 7c9c6fe0..d5e6a153 100644 --- a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift +++ b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift @@ -25,27 +25,27 @@ struct LoginButton: View { } var body: some View { - Button(action: { + Button { action() - }) { + } label: { Text(text) .foregroundStyle(Color.primary) .font(.system(.body)) - } - .frame(width: 300, height: height + 16) - .contentShape(.capsule) - .overlay { - ZStack(alignment: .leading) { - Capsule() - .stroke(Color.gray, lineWidth: 1) - if let logo = logo { - logo - .resizable() - .scaledToFit() - .frame(width: height, height: height) - .padding(.leading) + .contentShape(.capsule) + .frame(width: 300, height: height + 16) + .overlay { + ZStack(alignment: .leading) { + Capsule() + .stroke(Color.gray, lineWidth: 1) + if let logo = logo { + logo + .resizable() + .scaledToFit() + .frame(width: height, height: height) + .padding(.leading) + } + } } - } } } }