-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Dev' of https://github.com/Swift-Coding-Club/TossSecuri…
- Loading branch information
Showing
27 changed files
with
617 additions
and
317 deletions.
There are no files selected for viewing
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
StockApp/StockApp.xcodeproj/xcshareddata/xcschemes/StockApp.xcscheme
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
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
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
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
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
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
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
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
File renamed without changes
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
File renamed without changes.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>com.apple.developer.applesignin</key> | ||
| <array> | ||
| <string>Default</string> | ||
| </array> | ||
| </dict> | ||
| </plist> |
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
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
104 changes: 104 additions & 0 deletions
104
StockApp/StockApp/View/Components/POPUP/withDrawPOPUPView.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // | ||
| // withDrawPOPUPView.swift | ||
| // StockApp | ||
| // | ||
| // Created by 서원지 on 2023/02/07. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct withDrawPOPUPView: View { | ||
| var title: String | ||
| var message: String | ||
| var cancelTitle: String = "취소" | ||
| var confiremTitle: String = "확인" | ||
|
|
||
| @State var closedAlert: Bool = false | ||
| var confirmAction: () -> Void = {} | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .center) { | ||
| customAlertTitle() | ||
|
|
||
| Spacer() | ||
| .frame(height: 22) | ||
|
|
||
| alertConfirmButton() | ||
| } | ||
| .padding(EdgeInsets(top: 40, leading: 30, bottom: 31, trailing: 30)) | ||
| .frame(width: ContentsWidth, height: 200) | ||
| .background(Color.colorAssets.navy2) | ||
| .cornerRadius(30.0) | ||
| .shadow(color: Color.fontColor.accentColor, radius: 6, x: 0, y: .zero) | ||
| .animation(.easeOut) | ||
| .edgesIgnoringSafeArea(.all) | ||
| } | ||
| //MARK: - 알림창 타이틀 및 메세지 | ||
| @ViewBuilder | ||
| private func customAlertTitle() -> some View { | ||
| Text(title) | ||
| .kerning(-0.36) | ||
| .spoqaHan(family: .Bold, size: 18) | ||
| .foregroundColor(.white) | ||
| .frame(width: ContentsWidth - 60) | ||
|
|
||
| Spacer() | ||
| .frame(height: 13) | ||
|
|
||
| Text(message) | ||
| .kerning(-0.3) | ||
| .spoqaHan(family: .Bold, size: 18) | ||
| .foregroundColor(Color.colorAssets.white2) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
| .multilineTextAlignment(.center) | ||
| .frame(width: ContentsWidth-60) | ||
| } | ||
|
|
||
| //MARK: - 알림 버튼 취소 확인 버튼 | ||
| @ViewBuilder | ||
| private func alertConfirmButton() -> some View { | ||
| HStack { | ||
| Button { | ||
| self.closedAlert = false | ||
| } label: { | ||
| Text(cancelTitle) | ||
| .kerning(-0.34) | ||
| .spoqaHan(family: .Bold, size: 18) | ||
| .foregroundColor(Color.colorAssets.white2) | ||
| .frame(width: 140, height: 40) | ||
| .overlay( | ||
| RoundedRectangle(cornerRadius: 30) | ||
| .stroke(Color.white, lineWidth: 1) | ||
| .frame(width: 140, height: 40) | ||
| ) | ||
| } | ||
| .frame(width: 140, height: 40) | ||
| // .background(Color.colorAssets.white) | ||
| .cornerRadius(30.0) | ||
| .shadow(color: Color.colorAssets.white.opacity(0.4), radius: 6, x: 0, y: 3) | ||
|
|
||
| Spacer() | ||
| .frame(width: 30) | ||
|
|
||
| Button { | ||
| confirmAction() | ||
| } label: { | ||
| Text(confiremTitle) | ||
| .kerning(-0.34) | ||
| .spoqaHan(family: .Bold, size: 18) | ||
| .foregroundColor(Color.colorAssets.subColor) | ||
| .frame(width: 140, height: 40) | ||
| } | ||
| .frame(width: 140, height: 40) | ||
| .background(Color.colorAssets.white) | ||
| .cornerRadius(30.0) | ||
| .shadow(color: Color.colorAssets.white.opacity(0.4), radius: 6, x: 0, y: 3) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct withDrawPOPUPView_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| withDrawPOPUPView(title: "회원탈퇴", message: "회원탈퇴") {} | ||
| } | ||
| } |
Oops, something went wrong.