merge :: SchoolConfirmationQuestions UI #95
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
baekteun
requested changes
Oct 27, 2022
| VStack(spacing: 72) { | ||
| DMSFloatingTextField( | ||
| "답변", | ||
| text: $viewModel.id, |
|
|
||
| HStack(spacing: 16) { | ||
| Text("이미 계정이 있으신가요?") | ||
| .dmsFont(.text(.extraSmall), color: .GrayScale.gray5) |
| @Published var id = "" | ||
| @Published var answer = "" | ||
| @Published var isDisabled = true | ||
| @Published var isNavigateCheckConfirmationQuestion = false |
There was a problem hiding this comment.
isNavigateCheckConfirmationQuestion는 CheckConfirmationQuestion에 navigate하겠냐는 의미이니.. 조금.. 안맞는거같습니다
Comment on lines
11
to
13
| var isSignupButtonEnabled: Bool { | ||
| !id.isEmpty | ||
| } |
Comment on lines
37
to
38
| text: $viewModel.id, | ||
| isError: viewModel.isErrorOcuured |
| Text("우리 학교 학생 수는?") | ||
| .dmsFont(.text(.large), color: .GrayScale.gray7) | ||
| .padding(.top, 50) | ||
| }.padding(.horizontal, 24) |
There was a problem hiding this comment.
Suggested change
| }.padding(.horizontal, 24) | |
| } | |
| .padding(.horizontal, 24) |
으로 해주세요
| VStack(alignment: .leading, spacing: 8) { | ||
| Text("DMS") | ||
| .dmsFont(.title(.extraLarge), color: .PrimaryVariant.primary) | ||
| .padding(.top, 28) |
There was a problem hiding this comment.
이 padding은 HStack에 붙이는게 더 좋을거같아요
Comment on lines
6
to
7
| case id | ||
| case password |
baekteun
reviewed
Oct 27, 2022
| text: $viewModel.id, | ||
| isError: viewModel.isErrorOcuured | ||
| ) | ||
| .textContentType(.username) |
There was a problem hiding this comment.
textContentType을 지정해버리면 키체인에 저장되어버려요..
…ub.com/team-aliens/DMS-iOS into feat/89_SchoolConfirmationQuestions-UI
baekteun
approved these changes
Oct 27, 2022
Comment on lines
1
to
29
| import SwiftUI | ||
|
|
||
| import Combine | ||
|
|
||
| struct PasscodeView: View { | ||
| @Binding var text: String | ||
| @FocusState var focused: Bool | ||
|
|
||
| var body: some View { | ||
| VStack { | ||
| ZStack { | ||
| TextField("", text: $text) | ||
| .focused($focused) | ||
| .keyboardType(.numberPad) | ||
| .accentColor(.clear) | ||
| .foregroundColor(.clear) | ||
| .onReceive(Just(text), perform: { _ in | ||
| if 8 < text.count { | ||
| text = String(text.prefix(8)) | ||
| } | ||
| }) | ||
|
|
||
| HStack(spacing: 20) { | ||
| ForEach(1...8, id: \.self) { num in | ||
| Circle() | ||
| .frame(width: 20, height: 20) | ||
| .foregroundColor(text.count >= num ? Color.GrayScale.gray6 : Color.GrayScale.gray4) | ||
| } | ||
| } |
There was a problem hiding this comment.
이 친구 DesignSystem 모듈안으로 갔으니가 지워줘야할거같아요
Comment on lines
36
to
40
| PasscodeView(text: $viewModel.schoolCode) | ||
|
|
||
| DMSPassCodeView(codeCount: 8, text: $viewModel.schoolCode) | ||
|
|
||
| .padding(.horizontal, 64) |
kimdaehee0824
approved these changes
Oct 27, 2022
…at/89_SchoolConfirmationQuestions-UI
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
개요
SchoolConfirmationQuestions UI
작업사항
SchoolConfirmationQuestions UI