seonkyu.kim/AcaMate_iOS
1
0
Fork 0
forked from AcaMate/AcaMate_iOS
Code Pull Requests Activity

[✨] 개발 계정 우회용 작업 UI 추가중

Browse Source
This commit is contained in:
김선규 2025-04-11 17:48:50 +09:00
parent c2f540abd8
commit 77ee3083b3
8 changed files with 26 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

110
AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -3,114 +3,4 @@
uuid = "800DD51A-C089-4DC4-AE55-7F5ABD5C0AE7"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "EF02BBC2-AF83-4307-9043-6A5F28034993"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "AcaMate/3. ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
landmarkName = "loginAction(type:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D0EC0AF1-892F-452E-B364-908485B238C8"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "AcaMate/3. ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "76"
endingLineNumber = "76"
landmarkName = "loginAction(type:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "EE4B8BD1-834C-4489-857D-C4892550A974"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "AcaMate/3. ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "59"
endingLineNumber = "59"
landmarkName = "loginAction(type:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "541FB419-BE81-4999-93CD-C37FEB9BDDA4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "AcaMate/3. ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58"
landmarkName = "loginAction(type:)"
landmarkType = "7">
<Locations>
<Location
uuid = "541FB419-BE81-4999-93CD-C37FEB9BDDA4 - fec6a76745ade7a4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "AcaMate.LoginViewModel.loginAction(type: AcaMate.SNSLoginType) -&gt; ()"
moduleName = "AcaMate.debug.dylib"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Library/TAnine/KimSeonKyu/ACA/APP/AcaMate_iOS/AcaMate/3.%20ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58">
</Location>
<Location
uuid = "541FB419-BE81-4999-93CD-C37FEB9BDDA4 - 8a2a7067165bc08f"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #2 (Combine.Subscribers.Completion&lt;Swift.Error&gt;) -&gt; () in AcaMate.LoginViewModel.loginAction(type: AcaMate.SNSLoginType) -&gt; ()"
moduleName = "AcaMate.debug.dylib"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Library/TAnine/KimSeonKyu/ACA/APP/AcaMate_iOS/AcaMate/3.%20ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58">
</Location>
<Location
uuid = "541FB419-BE81-4999-93CD-C37FEB9BDDA4 - 67e85eea66ec8076"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #3 ((snsId: Swift.String, response: AcaMate.APIResponse&lt;AcaMate.User_Token&gt;)) -&gt; () in AcaMate.LoginViewModel.loginAction(type: AcaMate.SNSLoginType) -&gt; ()"
moduleName = "AcaMate.debug.dylib"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Library/TAnine/KimSeonKyu/ACA/APP/AcaMate_iOS/AcaMate/3.%20ViewModel/LoginViewModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

2
AcaMate/1. View/11. Intro & Login/LoginView.swift
View File

@ -59,7 +59,7 @@ struct LoginView: View {
.background {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(Color(.Normal.light))
}.clipped()
}
Button {
// loginVM.toggleLoading = true
loginVM.loginAction(type: .Dev)

6
AcaMate/1. View/11. Intro & Login/SelectAcademyView.swift
View File

@ -27,6 +27,11 @@ struct SelectAcademyView: View {
.frame(width: 200, height: 200)
VStack(spacing: 4) {
Button {
vm.moveChatting()
} label: {
Text("채팅 진입")
}
HStack(spacing: 0){
Text("학원 코드")
.font(.nps(font: .bold, size: 16))
@ -45,6 +50,7 @@ struct SelectAcademyView: View {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(Color(.Normal.light))
}
.clipped()
}
.padding(EdgeInsets(top: 12, leading: 24, bottom: 40, trailing: 24))

10
AcaMate/1. View/12. Main/123. Chatting/ChattingView.swift
View File

@ -10,12 +10,19 @@ import SwiftUI
struct ChattingView: View {
@StateObject private var topVM = TopViewModel()
@StateObject private var btnVM = ButtonViewModel()
@StateObject private var vm: ChatViewModel
@State private var scrollOffset: CGPoint = .zero
@State private var leftBtnID = UUID()
@State private var rightBtnID = UUID()
init(_ appVM: AppViewModel, _ myType: Binding<UserType>) {
_vm = StateObject(wrappedValue: ChatViewModel(appVM))
_myType = myType
}
let classList = [
SummaryChat(id: "00", chatName: "Class 101", teacherName: "홍길동",
lastMessage: "여기에는 채팅이 나올 예정입니다. 2줄 정도로 나올 예정이며 끝자리는 잘려서 나올 것 입니다. 이정도의 채팅으로는 택도 없어서 조금 더 길게 길게 작성을 해봅니다.",
@ -125,10 +132,11 @@ struct ChattingView: View {
topVM.setLeftBtn(text: "\(myType.rawValue)", font: .nps(font: .bold, size: 24),
size: CGPoint(x: 40, y: 40), action: leftAct)
}
topVM.setRightBtn(size: CGPoint(x: 40, y: 40), action: rightAct)
topVM.setRightBtn(Image(.Icon.plus), size: CGPoint(x: 40, y: 40), action: rightAct)
btnVM.setImage(for: leftBtnID, newImage: Image(.Icon.left))
btnVM.setImage(for: rightBtnID, newImage: Image(.Icon.right))
btnVM.setSize(for: leftBtnID, newWidth: 24, newHeight: 24)
btnVM.setSize(for: rightBtnID, newWidth: 24, newHeight: 24)
}

2
AcaMate/1. View/12. Main/MainView.swift
View File

@ -25,7 +25,7 @@ struct MainView: View {
case .Management:
ManagementView()
case .Chatting:
ChattingView(myType: $myType)
ChattingView(appVM, $myType)
case .Calendar:
CalendarView()
case .Etc:

4
AcaMate/3. ViewModel/ChatViewModel.swift
View File

@ -6,10 +6,6 @@
//
import SwiftUI
final class ChatVM: ObservableObject {
@Published var vm: ChatViewModel?
}
class ChatViewModel: ObservableObject {
private let appVM: AppViewModel

10
AcaMate/3. ViewModel/SelectAcademyViewModel.swift
View File

@ -20,6 +20,11 @@ class SelectAcademyViewModel: ObservableObject {
@Published var academyList: [AcademyName] = []
@Published var selectNum: Int = -1
func moveChatting() {
appVM.naviState.set(act: .RESET, path: .Main)
}
func loadAcademy() {
@UserDefault(key: "token", defaultValue: "accToken") var token
@UserDefault(key: "refresh", defaultValue: "refreshToken") var refresh
@ -50,5 +55,8 @@ class SelectAcademyViewModel: ObservableObject {
selectNum = -1
} else {
selectNum = index
}}
}
}
}