Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<group>"; };
FA3AC9C61067B0FBDE869711 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -206,6 +207,7 @@
children = (
6F190E03DDAFD11C50FF6510 /* App */,
514423F7A59AD057AC7310CA /* Resource */,
FA3AC9C61067B0FBDE869711 /* App.xcconfig */,
);
path = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion Application/DevLogApp/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
)
),
Expand Down
2 changes: 2 additions & 0 deletions Application/DevLogApp/Sources/App.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "../../Shared/Version.xcconfig"
#include? "Resource/Config.xcconfig"
Original file line number Diff line number Diff line change
Expand Up @@ -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)
.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)
}
}
}
}
}
.contentShape(.capsule)
Comment thread
opficdev marked this conversation as resolved.
Outdated
}
}