Skip to content

Commit beadf3e

Browse files
authored
[#522] 로그아웃 시 미등록 FCM 토큰 삭제 실패로 로그아웃이 중단되는 문제를 해결한다 (#523)
* fix: APNs 환경 설정 추가 * fix: 로그인 버튼에서 텍스트 부분만 탭이 되던 현상 해결 * fix: 앱 설정 파일 참조 추가 * refactor: contentShape(:) 위치 이동
1 parent 5acab83 commit beadf3e

4 files changed

Lines changed: 31 additions & 19 deletions

File tree

Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
DCC05042BEB7C047BE4DB7E9 /* DevLogWidgetCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogWidgetCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
139139
ECA33E1403AF8BDB84D46C01 /* DevLogPresentation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogPresentation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
140140
F078E79DE65AE8D92F556B27 /* DeletePushNotificationIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletePushNotificationIntegrationTests.swift; sourceTree = "<group>"; };
141+
FA3AC9C61067B0FBDE869711 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = "<group>"; };
141142
/* End PBXFileReference section */
142143

143144
/* Begin PBXFrameworksBuildPhase section */
@@ -206,6 +207,7 @@
206207
children = (
207208
6F190E03DDAFD11C50FF6510 /* App */,
208209
514423F7A59AD057AC7310CA /* Resource */,
210+
FA3AC9C61067B0FBDE869711 /* App.xcconfig */,
209211
);
210212
path = Sources;
211213
sourceTree = "<group>";
@@ -509,8 +511,9 @@
509511
/* Begin XCBuildConfiguration section */
510512
31AC08F8A6DA3854B3A6B6AC /* Release */ = {
511513
isa = XCBuildConfiguration;
512-
baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */;
514+
baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */;
513515
buildSettings = {
516+
APS_ENVIRONMENT = production;
514517
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
515518
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
516519
CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements;
@@ -617,8 +620,9 @@
617620
};
618621
8D758741AE117AED0462B9E4 /* Debug */ = {
619622
isa = XCBuildConfiguration;
620-
baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */;
623+
baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */;
621624
buildSettings = {
625+
APS_ENVIRONMENT = development;
622626
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
623627
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
624628
CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements;

Application/DevLogApp/Project.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,17 @@ let project = Project(
3636
DevLogPackages.swiftLintPlugin,
3737
],
3838
settings: .devlog(
39-
versionXcconfigPath: "../Shared/Version.xcconfig",
39+
versionXcconfigPath: "Sources/App.xcconfig",
4040
base: [
4141
"ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon",
4242
"CODE_SIGN_STYLE": "Automatic",
4343
"PRODUCT_MODULE_NAME": "DevLogApp",
44+
],
45+
debug: [
46+
"APS_ENVIRONMENT": "development",
47+
],
48+
release: [
49+
"APS_ENVIRONMENT": "production",
4450
]
4551
)
4652
),
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "../../Shared/Version.xcconfig"
2+
#include? "Resource/Config.xcconfig"

Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ struct LoginButton: View {
2525
}
2626

2727
var body: some View {
28-
Button(action: {
28+
Button {
2929
action()
30-
}) {
30+
} label: {
3131
Text(text)
3232
.foregroundStyle(Color.primary)
3333
.font(.system(.body))
34-
}
35-
.frame(width: 300, height: height + 16)
36-
.contentShape(.capsule)
37-
.overlay {
38-
ZStack(alignment: .leading) {
39-
Capsule()
40-
.stroke(Color.gray, lineWidth: 1)
41-
if let logo = logo {
42-
logo
43-
.resizable()
44-
.scaledToFit()
45-
.frame(width: height, height: height)
46-
.padding(.leading)
34+
.contentShape(.capsule)
35+
.frame(width: 300, height: height + 16)
36+
.overlay {
37+
ZStack(alignment: .leading) {
38+
Capsule()
39+
.stroke(Color.gray, lineWidth: 1)
40+
if let logo = logo {
41+
logo
42+
.resizable()
43+
.scaledToFit()
44+
.frame(width: height, height: height)
45+
.padding(.leading)
46+
}
47+
}
4748
}
48-
}
4949
}
5050
}
5151
}

0 commit comments

Comments
 (0)