Skip to content

Commit 5520f17

Browse files
applebuddyios-min
authored andcommitted
[Fix] #336 아이패드 > 일부 레이아웃이 SafeArea 없는 기기를 고려하지 않아서 생기는 문제 수정 (#337)
* [Fix] #336 아이패드 > 일부 레이아웃이 SafeArea를 고려하지 않아서 생기는 문제 수정 #336 * [Fix] #336 아이패드 > 로그인 화면 좌상단 X버튼이 잘려보이는 문제 수정
1 parent a3c40cc commit 5520f17

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

Projects/Coffice/Sources/App/Login/LoginView.swift

+42-42
Original file line numberDiff line numberDiff line change
@@ -35,55 +35,55 @@ struct LoginView: View {
3535

3636
Spacer()
3737

38-
Button {
39-
viewStore.send(.kakaoLoginButtonTapped)
40-
} label: {
41-
HStack {
42-
CofficeAsset.Asset.kakaoLogo18px.swiftUIImage
43-
.frame(width: 18, height: 18)
44-
Text("카카오톡으로 로그인")
45-
.tint(.black)
46-
.applyCofficeFont(font: .subtitleSemiBold)
47-
}
48-
.frame(maxWidth: .infinity)
38+
Spacer()
39+
40+
Button {
41+
viewStore.send(.kakaoLoginButtonTapped)
42+
} label: {
43+
HStack {
44+
CofficeAsset.Asset.kakaoLogo18px.swiftUIImage
45+
.frame(width: 18, height: 18)
46+
Text("카카오톡으로 로그인")
47+
.tint(.black)
48+
.applyCofficeFont(font: .subtitleSemiBold)
4949
}
50-
.frame(height: 52)
51-
.background(CofficeAsset.Colors.kakao.swiftUIColor)
52-
.cornerRadius(25)
53-
.padding(.bottom, 16)
50+
.frame(maxWidth: .infinity)
51+
}
52+
.frame(height: 52)
53+
.background(CofficeAsset.Colors.kakao.swiftUIColor)
54+
.cornerRadius(25)
55+
.padding(.bottom, 16)
5456

55-
SignInWithAppleButton { request in
56-
request.requestedScopes = []
57-
} onCompletion: { result in
58-
switch result {
59-
case .success(let authResults):
60-
guard let appleIDCredential = authResults.credential as? ASAuthorizationAppleIDCredential,
61-
let identityToken = appleIDCredential.identityToken,
62-
let token = String(data: identityToken, encoding: .utf8) else {
63-
return
64-
}
65-
viewStore.send(.appleLoginButtonTapped(token: token))
66-
case .failure(let error):
67-
debugPrint(error)
57+
SignInWithAppleButton { request in
58+
request.requestedScopes = []
59+
} onCompletion: { result in
60+
switch result {
61+
case .success(let authResults):
62+
guard let appleIDCredential = authResults.credential as? ASAuthorizationAppleIDCredential,
63+
let identityToken = appleIDCredential.identityToken,
64+
let token = String(data: identityToken, encoding: .utf8) else {
65+
return
6866
}
67+
viewStore.send(.appleLoginButtonTapped(token: token))
68+
case .failure(let error):
69+
debugPrint(error)
6970
}
70-
.cornerRadius(25)
71-
.frame(height: 50)
72-
.padding(.bottom, 24)
71+
}
72+
.cornerRadius(25)
73+
.frame(height: 50)
74+
.padding(.bottom, 24)
7375

74-
HStack(spacing: 4) {
75-
Text("회원가입 없이")
76-
Button {
77-
viewStore.send(.lookAroundButtonTapped)
78-
} label: {
79-
Text("둘러보기")
80-
.foregroundColor(CofficeAsset.Colors.secondary1.swiftUIColor)
81-
}
76+
HStack(spacing: 4) {
77+
Text("회원가입 없이")
78+
Button {
79+
viewStore.send(.lookAroundButtonTapped)
80+
} label: {
81+
Text("둘러보기")
82+
.foregroundColor(CofficeAsset.Colors.secondary1.swiftUIColor)
8283
}
83-
.applyCofficeFont(font: .body1Medium)
84-
.hiddenWithOpacity(isHidden: viewStore.isOnboarding.isFalse)
8584
}
86-
.padding(EdgeInsets(top: 163, leading: 36, bottom: 129, trailing: 36))
85+
.applyCofficeFont(font: .body1Medium)
86+
.hiddenWithOpacity(isHidden: viewStore.isOnboarding.isFalse)
8787
}
8888
.navigationBarHidden(true)
8989
.padding(EdgeInsets(top: 163, leading: 36, bottom: 129, trailing: 36))

0 commit comments

Comments
 (0)