[♻️] 기존의 다른 로컬 작업과 병합

This commit is contained in:
김선규 2025-02-05 00:37:06 +09:00
parent 1bb3558015
commit af390e4aac
55 changed files with 778 additions and 158 deletions

View File

@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
A73892212D526A9D00659A62 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = A73892202D526A9D00659A62 /* FirebaseAnalytics */; };
A73892232D526A9D00659A62 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = A73892222D526A9D00659A62 /* FirebaseAppCheck */; };
A73892252D526A9D00659A62 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = A73892242D526A9D00659A62 /* FirebaseCrashlytics */; };
A771FFF22CFB70D100367DA6 /* KakaoSDK in Frameworks */ = {isa = PBXBuildFile; productRef = A771FFF12CFB70D100367DA6 /* KakaoSDK */; };
A78774722CF586AF002FE2EE /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = A78774712CF586AF002FE2EE /* Alamofire */; };
A7A518CF2CF555E200822D0D /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A7A518CE2CF555E200822D0D /* README.md */; };
@ -45,8 +48,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A73892232D526A9D00659A62 /* FirebaseAppCheck in Frameworks */,
A78774722CF586AF002FE2EE /* Alamofire in Frameworks */,
A73892252D526A9D00659A62 /* FirebaseCrashlytics in Frameworks */,
A771FFF22CFB70D100367DA6 /* KakaoSDK in Frameworks */,
A73892212D526A9D00659A62 /* FirebaseAnalytics in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -93,6 +99,9 @@
packageProductDependencies = (
A78774712CF586AF002FE2EE /* Alamofire */,
A771FFF12CFB70D100367DA6 /* KakaoSDK */,
A73892202D526A9D00659A62 /* FirebaseAnalytics */,
A73892222D526A9D00659A62 /* FirebaseAppCheck */,
A73892242D526A9D00659A62 /* FirebaseCrashlytics */,
);
productName = AcaMate;
productReference = A7A518BB2CF5558B00822D0D /* AcaMate.app */;
@ -125,6 +134,7 @@
packageReferences = (
A78774702CF586AF002FE2EE /* XCRemoteSwiftPackageReference "Alamofire" */,
A771FFF02CFB70D100367DA6 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */,
A738921F2D526A9D00659A62 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = A7A518BC2CF5558B00822D0D /* Products */;
@ -378,6 +388,14 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
A738921F2D526A9D00659A62 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 11.8.0;
};
};
A771FFF02CFB70D100367DA6 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kakao/kakao-ios-sdk";
@ -397,6 +415,21 @@
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
A73892202D526A9D00659A62 /* FirebaseAnalytics */ = {
isa = XCSwiftPackageProductDependency;
package = A738921F2D526A9D00659A62 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAnalytics;
};
A73892222D526A9D00659A62 /* FirebaseAppCheck */ = {
isa = XCSwiftPackageProductDependency;
package = A738921F2D526A9D00659A62 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAppCheck;
};
A73892242D526A9D00659A62 /* FirebaseCrashlytics */ = {
isa = XCSwiftPackageProductDependency;
package = A738921F2D526A9D00659A62 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCrashlytics;
};
A771FFF12CFB70D100367DA6 /* KakaoSDK */ = {
isa = XCSwiftPackageProductDependency;
package = A771FFF02CFB70D100367DA6 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;

View File

@ -1,6 +1,15 @@
{
"originHash" : "48d44fe9560aaa48bc97ae34cdb596f62fa2d739be3dafd4261b95db8f8c86ab",
"originHash" : "3b609245b8d633048f6670834279f82d0601cc0879a2d8c9c86fa0dd25734ea3",
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27",
"version" : "1.2024011602.0"
}
},
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
@ -10,6 +19,78 @@
"version" : "5.10.2"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "61b85103a1aeed8218f17c794687781505fbbef5",
"version" : "11.2.0"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "075679d6b25b28f4cb167f1d7769b58fb556fb30",
"version" : "11.8.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "be0881ff728eca210ccb628092af400c086abda3",
"version" : "11.7.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
"version" : "10.1.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb",
"version" : "8.0.2"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "f56d8fc3162de9a498377c7b6cea43431f4f5083",
"version" : "1.65.1"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "3cdb78efb79b4a5383c3911488d8025bfc545b5e",
"version" : "4.3.0"
}
},
{
"identity" : "interop-ios-for-google-sdks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
"state" : {
"revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
"version" : "100.0.0"
}
},
{
"identity" : "kakao-ios-sdk",
"kind" : "remoteSourceControl",
@ -18,6 +99,42 @@
"branch" : "master",
"revision" : "ab4309c1950550add307046ad1e08024c7514603"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "ebc7251dd5b37f627c93698e4374084d98409633",
"version" : "1.28.2"
}
}
],
"version" : 3

View File

@ -12,10 +12,11 @@ import UserNotifications
import KakaoSDKCommon
import KakaoSDKAuth
import FirebaseCore
class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDelegate {
class AppDelegate: NSObject, UIApplicationDelegate {
@ -28,6 +29,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
}
//MARK: - Set Notification
let center = UNUserNotificationCenter.current()
let authOptions: UNAuthorizationOptions = [.alert, .badge, .sound]
center.requestAuthorization(options: authOptions) { granted, error in
@ -47,6 +49,9 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
//MARK: -
_ = NetworkMonitor.shared
//MARK: - FIREBASE
FirebaseApp.configure()
printLog("End Set AppDelegate")
return true
}
@ -60,6 +65,12 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
}
}
extension AppDelegate: UNUserNotificationCenterDelegate {
//
func registerForRemoteNotifications() {
UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
print("Permission granted: \(granted)")
@ -86,7 +97,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
printLog("APNs 등록 실패: \(error)")
}
// ( )
//
func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions {
let userInfo = notification.request.content.userInfo
@ -107,7 +118,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
}
}
// Notification
// Noti ( )
func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
let userInfo = response.notification.request.content.userInfo
if let apsData = userInfo["aps"] as? [AnyHashable: Any] {
@ -117,9 +128,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
if let param = alert["parameter"] {
printLog(param as? String)
}
// viewModel.setBadge()
}
}
}
}

View File

@ -6,7 +6,10 @@
//
import SwiftUI
// MARK: - ACAMATE
#if DEV
// APPSTORE_URL : https://apps.apple.com/us/app/%EC%95%84%EC%B9%B4%EB%8D%B0%EB%AF%B8%EB%A9%94%EC%9D%B4%ED%8A%B8/id6739448113
#if DEV && LOCAL
public let API_URL: String = "http://localhost:5144"
#elseif DEV
public let API_URL: String = "https://devacamate.ipstein.myds.me"
#else
public let API_URL: String = "https://acamate.ipstein.myds.me"
@ -16,7 +19,6 @@ public let API_URL: String = "https://acamate.ipstein.myds.me"
// MARK: - TYPEALIAS
typealias VOID_TO_VOID = () -> ()
// MARK: - VARIABLE
public var APPSTORE_URL = "https://itunes.apple.com/app/"
public var KEYBOARD_UP_HEIGHT: CGFloat = 46.0
@ -123,6 +125,19 @@ public func jsonToDict(_ input: String) -> [String: Any] {
return [:]
}
/// JSON Swift .
public func jsonToSwift<T: Decodable>(_ input: String) -> T? {
if let data = input.data(using: .utf8) {
do {
let jsonObject = try JSONDecoder().decode(T.self, from: data)
return jsonObject
} catch let error {
printLog("JSON ERROR: \(error))")
}
}
return nil
}
func versionChange(ver: String) -> [Int] {
return ver.components(separatedBy: ["."]).map {Int($0) ?? 0}
}

View File

@ -11,6 +11,8 @@ import Combine
///
struct NavigationView: View {
@EnvironmentObject var appVM: AppViewModel
@State private var naviState : NaviState = .init(act: .NONE, path: .Intro)
@State private var history: [PathName] = [.Intro]
@ -45,9 +47,13 @@ struct NavigationView: View {
printLog("\(old.path) => \(new.path)")
showHistory()
}
.onTapGesture {
endTextEditing()
}
.fullDrawView(.Normal.normal)
.setAlert()
.setNetwork()
.loadingView(isLoading: $appVM.isLoading)
}
///

View File

@ -0,0 +1,117 @@
//
// AccountLoginView.swift
// AcaMate
//
// Created by Sean Kim on 12/14/24.
//
import SwiftUI
struct AccountLoginView: View {
@ObservedObject var viewModel: LoginViewModel
@Binding var userId: String
@Binding var password: String
@Binding var isSecure: Bool
@Binding var isSave: Bool
var body: some View {
VStack(spacing: 0) {
ZStack(alignment: .leading) {
if userId.isEmpty {
Text("아이디를 입력하세요.")
.font(.nps(font: .regular, size: 16))
.foregroundStyle(Color(.Text.border))
.padding(EdgeInsets(top: 12, leading: 24, bottom: 12, trailing: 24))
}
CustomTextField(placeholder: "", text: $userId)
.frame(maxWidth: .infinity,maxHeight: 24)
.padding(EdgeInsets(top: 12, leading: 24, bottom: 12, trailing: 24))
}
.background {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(.white)
}
.padding(EdgeInsets(top: 0, leading: 12, bottom: 8, trailing: 12))
ZStack(alignment: .leading) {
if password.isEmpty {
Text("비밀번호를 입력하세요.")
.font(.nps(font: .regular, size: 16))
.foregroundStyle(Color(.Text.border))
.padding(EdgeInsets(top: 12, leading: 24, bottom: 12, trailing: 24))
}
CustomTextField(placeholder: "", text: $password, isSecure: $isSecure)
.frame(maxWidth: .infinity,maxHeight: 24)
.padding(EdgeInsets(top: 12, leading: 24, bottom: 12, trailing: 24))
HStack {
Spacer()
Button {
isSecure.toggle()
} label: {
if password.isEmpty {
Rectangle()
.frame(width: 16, height: 2)
.foregroundStyle(Color(.Text.border))
.padding(.trailing,24)
}
else {
if isSecure {
Image(systemName: "eye")
.frame(width: 16, height: 16)
.foregroundStyle(Color(.Text.detail))
.padding(.trailing,24)
}
else {
Image(systemName: "eye.slash")
.frame(width: 16, height: 16)
.foregroundStyle(Color(.Text.detail))
.padding(.trailing,24)
}
}
}
}
}
.background {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(.white)
}
.padding(EdgeInsets(top: 0, leading: 12, bottom: 8, trailing: 12))
Button {
isSave.toggle()
} label: {
HStack(alignment: .center, spacing: 4) {
Spacer(minLength: 1)
if isSave {
Image(systemName: "checkmark.square")
.foregroundStyle(Color(.Second.normal))
.frame(width: 24, height: 24)
} else {
Image(systemName: "square")
.foregroundStyle(Color(.Second.normal))
.frame(width: 24, height: 24)
}
Text("로그인 정보 저장")
.font(.nps(font: .regular, size: 16))
.foregroundStyle(Color(.Text.detail))
}
}
.padding(EdgeInsets(top: 0, leading: 0, bottom: 24, trailing: 12))
Button {
viewModel.loginAction.send(true)
} label: {
Text("로그인")
.font(.nps(font: .bold, size: 24))
.foregroundStyle(Color(.Text.white))
.padding(EdgeInsets(top: 8, leading: 48, bottom: 8, trailing: 48))
.background{
RoundedRectangle(cornerRadius: 12)
.foregroundStyle(Color(.Second.normal))
}
}
}
}
}

View File

@ -9,7 +9,8 @@ import SwiftUI
import Combine
struct IntroView: View {
@EnvironmentObject var alertController: AlertController
@EnvironmentObject var appVM: AppViewModel
@State var cancellables: Set<AnyCancellable> = []
@Binding var naviState : NaviState
@ -17,15 +18,12 @@ struct IntroView: View {
VStack(spacing: 0) {
Spacer()
.frame(height: 100)
Image("Team_Icon")
Image(.Icon.appIcon)
.resizable()
.frame(width: 200, height: 200)
.background(.white)
.border(.black)
.padding()
Spacer()
HStack(spacing: 4) {
Image("Team_Icon")
Image(.Icon.teamIcon)
.resizable()
.frame(width: 24, height: 24)
Text("STEIN")
@ -52,32 +50,34 @@ struct IntroView: View {
} receiveValue: { version in
let compareForce = compareVersion(version.force_ver, currentVersion())
let compareChoice = compareVersion(version.final_ver, currentVersion())
if compareForce == .bigger {
alertController.alertData = SetAlertData().setForceUpdate(
action: alertController.alertAction
appVM.alertData = SetAlertData().setForceUpdate(
action: appVM.alertAction
)
alertController.showAlert.toggle()
appVM.showAlert.toggle()
} else if compareChoice == .bigger && version.choice_update_yn {
alertController.alertData = SetAlertData().setSelectUpdate(
action: alertController.alertAction
appVM.alertData = SetAlertData().setSelectUpdate(
action: appVM.alertAction
)
alertController.showAlert.toggle()
appVM.showAlert.toggle()
} else {
naviState.set(act: .RESET, path: .Login)
}
}
.store(in: &cancellables)
}
}
private func subscribeAlertAction() {
alertController.alertAction
appVM.alertAction
.compactMap { $0 }
.sink { action in
if action == "updateNow" {
exit(1)
// MARK: TO-DO
// ( )
//MARK: - TODO ( )
} else {
naviState.set(act: .RESET, path: .Login)
}

View File

@ -6,23 +6,48 @@
//
import SwiftUI
import Combine
struct LoginView: View {
@EnvironmentObject var alertController: AlertController
@EnvironmentObject var appVM: AppViewModel
@StateObject private var loginVM = LoginViewModel()
@State var cancellables: Set<AnyCancellable> = []
@Binding var naviState : NaviState
@State var selectIdLogin: Bool = false
@State var userId: String = ""
@State var password: String = ""
@State var isSecure: Bool = true
@State var isSave: Bool = false
var body: some View {
VStack(spacing: 0) {
Image("Team_Icon")
Image(.Icon.appIcon)
.resizable()
.frame(maxWidth: 200, maxHeight: 200)
.frame(width: 200, height: 200)
.background(.white)
.border(.black)
.padding(.bottom, 84)
.padding(.top, 80)
///
VStack(spacing: 16) {
Button {
// MARK: - TODO,
appVM.isLoading.toggle()
loginAction(type: .Kakao)
} label: {
makeButton(image: Image(.Icon.kakaoIcon),color: Color(.Other.yellow), "카카오 계정으로 시작하기")
}
Button {
// MARK: - TODO,
naviState.set(act: .MOVE, path: .Main)
} label: {
makeButton(image: Image(.Icon.appleIcon), color: Color(.Text.black), "애플 계정으로 시작하기")
}
}
/*
VStack(spacing: 16) {
Button {
// MARK: TO-DO
//
@ -70,22 +95,87 @@ struct LoginView: View {
.frame(maxWidth: .infinity)
/// APPLE
}
*/
.padding([.leading,.trailing], 28)
///
//
// Button {
// alertController.alertData = SetAlertData().setTest()
// alertController.showAlert.toggle()
// // naviState.set(act: .MOVE,path: .Intro)
//
// } label: {
// Text("111111111")
// }
}
.onAppear {
subscribeLoginAction()
}
.frame(maxWidth: .infinity,maxHeight: .infinity)
.fullDrawView(.Normal.normal)
}
func makeButton(image: Image, color: Color? = nil, _ body: String) -> some View {
return HStack {
image
.resizable()
.frame(width: 32, height: 32)
Spacer(minLength: 12)
Text("\(body)")
.font(.nps(font: .regular, size: 16))
.foregroundStyle(color == Color(.Text.black) ? Color(.Text.white) : Color(.Text.black))
Spacer(minLength: 12)
}
.padding(12)
.background {
if let color = color {
RoundedRectangle(cornerRadius: 12)
.foregroundStyle(color)
}
}
}
private func subscribeLoginAction() {
loginVM.loginAction
.sink { isTapped in
if isTapped {
if userId.isEmpty || password.isEmpty {
appVM.alertData = SetAlertData().setErrorLogin()
appVM.showAlert.toggle()
}
else {
}
printLog("로그인")
}
}
.store(in: &cancellables)
}
private func loginAction(type: SNSLoginType) {
LoginController().login(type)
.flatMap{ snsId in
loadAPIData(url: "\(API_URL)",
path: "/api/v1/in/user/login",
parameters: [
"sns_id": "\(snsId.snsId)",
"acctype": "\(type == .Apple ? "ST00": "ST01")"
],
decodingType: APIResponse<User_Academy>.self)
}
.sink { completion in
switch completion {
case .failure(let error):
printLog("\(error)")
appVM.isLoading.toggle()
case .finished:
appVM.isLoading.toggle()
}
} receiveValue: { response in
guard let ua = response as? APIResponse<User_Academy> else {return}
if let bids = ua.data.toStringDict()["bid"] {
printLog(bids)
if let bidArray: [String] = jsonToSwift(bids) {
printLog(bidArray[0])
} else {
printLog("JSON 변환 실패")
}
}
}
.store(in: &cancellables)
}
}
//#Preview {

View File

@ -25,5 +25,11 @@ class VersionData: Codable {
}
// ----------------
class User_Academy: Codable {
let uid: String
let bid: [String]
}

View File

@ -82,5 +82,16 @@ struct SetAlertData {
])
}
///
func setErrorLogin() -> AlertData {
return AlertData(title: "로그인",
body: """
ID .
.
""",
button: [
ButtonType(name: "확인", role: .cancel, function: nil)
])
}
}

View File

@ -0,0 +1,19 @@
//
// AlertController.swift
// AcaMate
//
// Created by Sean Kim on 12/13/24.
//
import SwiftUI
import Combine
class AlertViewModel2: ObservableObject {
@Published var showAlert: Bool = false
var alertData: AlertData = .init(body: "")
let alertAction = CurrentValueSubject<String?, Never>(nil)
}

View File

@ -0,0 +1,19 @@
//
// AppViewModel.swift
// AcaMate
//
// Created by Sean Kim on 12/16/24.
//
import SwiftUI
import Combine
class AppViewModel: ObservableObject {
@Published var isLoading: Bool = false
@Published var showAlert: Bool = false
var alertData: AlertData = .init(body: "")
let alertAction = CurrentValueSubject<String?, Never>(nil)
}

View File

@ -0,0 +1,13 @@
//
// LoginViewModel.swift
// AcaMate
//
// Created by Sean Kim on 12/14/24.
//
import SwiftUI
import Combine
class LoginViewModel: ObservableObject {
let loginAction = CurrentValueSubject<Bool, Never>(false)
}

View File

@ -12,28 +12,31 @@ import KakaoSDKAuth
import KakaoSDKUser
import Alamofire
import Foundation
class SNSLogin {
class LoginController {
private var cancellables = Set<AnyCancellable>()
func login(type: SNSLoginType){
func login(_ type: SNSLoginType) -> AnyPublisher<SNSID,Error> {
switch type {
case .Kakao:
self.checkKakaoToken()
.sink { completion in
return self.checkKakaoToken()
.handleEvents(receiveCompletion: { completion in
switch completion {
case .failure(let error):
case .failure(let error) :
printLog("KAKAO LOGIN ERROR: \(error)")
case .finished: break
}
} receiveValue: { snsId in
printLog("로그인 완료 \(snsId)")
}
.store(in: &cancellables)
})
.eraseToAnyPublisher()
//
case .Apple: break
case .Apple:
return Fail(error: NSError(domain: "Apple login not implemented", code: 1, userInfo: nil))
.eraseToAnyPublisher()
}
}
func logout(type: SNSLoginType) {
@ -54,7 +57,7 @@ class SNSLogin {
//MARK: - KAKAO LOGIN
extension SNSLogin {
extension LoginController {
///
private func checkKakaoToken() -> Future<SNSID, Error> {
return Future { promise in

View File

@ -0,0 +1,65 @@
//
// UIView.swift
// AcaMate
//
// Created by Sean Kim on 12/14/24.
//
import SwiftUI
import UIKit
struct CustomTextField: UIViewRepresentable {
var placeholder: String
@Binding var text: String
var isSecure: Binding<Bool> = .constant(false)
var textColor = UIColor(Color(.Text.detail))
var font = UIFont(name: "NPS-font-Regular", size: 16)
// [] UIView
func makeUIView(context: Context) -> UITextField {
let txf = UITextField()
txf.placeholder = placeholder
txf.isSecureTextEntry = isSecure.wrappedValue
txf.textColor = textColor
txf.font = font
txf.translatesAutoresizingMaskIntoConstraints = false
let height = (font?.lineHeight ?? 10) + 8
txf.frame.size.height = height
txf.autocorrectionType = .no
txf.autocapitalizationType = .none
txf.smartInsertDeleteType = .no
txf.textContentType = .oneTimeCode
txf.delegate = context.coordinator
return txf
}
// [] UIView
func updateUIView(_ uiView: UITextField, context: Context) {
uiView.text = text
uiView.isSecureTextEntry = isSecure.wrappedValue
}
func makeCoordinator() -> Coordinator {
Coordinator(self)
}
class Coordinator: NSObject, UITextFieldDelegate {
var parent: CustomTextField
init(_ parent: CustomTextField) {
self.parent = parent
}
func textFieldDidChangeSelection(_ textField: UITextField) {
parent.text = textField.text ?? ""
}
}
}

View File

@ -8,28 +8,29 @@
import SwiftUI
import Combine
struct NetworkModifier: ViewModifier {
@ObservedObject private var networkMonitor = NetworkMonitor.shared
@EnvironmentObject var alertController: AlertController
@EnvironmentObject var appVM: AppViewModel
func body(content: Content) -> some View {
content
.onChange(of: networkMonitor.isConnected) { _ , new in
if !new {
alertController.alertData = SetAlertData().setErrorNetwork()
alertController.showAlert.toggle()
appVM.alertData = SetAlertData().setErrorNetwork()
appVM.showAlert.toggle()
}
}
}
}
struct AlertModifier: ViewModifier {
@EnvironmentObject var controller: AlertController
@EnvironmentObject var appVM: AppViewModel
func body(content: Content) -> some View {
content
.alert(controller.alertData.title,
isPresented: $controller.showAlert,
presenting: $controller.alertData) { data in
.alert(appVM.alertData.title,
isPresented: $appVM.showAlert,
presenting: $appVM.alertData) { data in
let btnCount = data.button.count
ForEach(0 ..< btnCount, id: \.self) { index in
let btn = data.wrappedValue.button[index]
@ -45,6 +46,32 @@ struct AlertModifier: ViewModifier {
}
}
struct LoadingModifier: ViewModifier {
@Binding var isLoading: Bool
func body(content: Content) -> some View {
ZStack {
content
.disabled(isLoading)
.blur(radius: isLoading ? 3:0)
if isLoading {
Color.Text.detail.opacity(0.6)
// Color.Second.normal.opacity(0.3)
.ignoresSafeArea()
ProgressView("Loading...")
// .tint(Color.Text.black)
.tint(Color.Normal.normal)
.scaleEffect(1.5)
.foregroundStyle(Color.Normal.normal)
.font(.nps(font: .bold, size: 16))
.padding()
}
}
}
}
extension View {
/// View
func fullDrawView(_ backColor: Color) -> some View {
@ -64,10 +91,8 @@ extension View {
UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
}
func setNavigaion() -> some View {
self
.navigationBarBackButtonHidden(true)
.toolbar(.hidden, for: .navigationBar)
func loadingView(isLoading: Binding<Bool>) -> some View {
self.modifier(LoadingModifier(isLoading: isLoading))
}
func innerShadow<S: Shape> (shape: S, color: Color, lineWidth: CGFloat = 6, blur: CGFloat, x: CGFloat, y: CGFloat) -> some View {

View File

@ -1,6 +1,7 @@
{
"images" : [
{
"filename" : "LOGO.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
@ -12,6 +13,7 @@
"value" : "dark"
}
],
"filename" : "LOGO 1.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
@ -23,6 +25,7 @@
"value" : "tinted"
}
],
"filename" : "LOGO 2.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 KiB

View File

@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.776",
"green" : "0.776",
"red" : "0.776"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "appIcon.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "APPLE.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -0,0 +1,9 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"provides-namespace" : true
}
}

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "KAKAO.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "MI.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "PageIcon.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "TeamIcon.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "KakaoIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

View File

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "MI.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

View File

@ -1,21 +0,0 @@
{
"images" : [
{
"filename" : "1024.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 KiB

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

View File

@ -15,7 +15,7 @@ import KakaoSDKAuth
struct AcaMateApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
var cancellables: Set<AnyCancellable> = []
var alertController = AlertController()
@StateObject var appVM = AppViewModel()
init() {
printLog("APP INIT")
@ -29,7 +29,7 @@ struct AcaMateApp: App {
_ = AuthController.handleOpenUrl(url: url)
}
}
.environmentObject(self.alertController)
.environmentObject(self.appVM)
}
}
}

View File

@ -0,0 +1,30 @@
<?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>API_KEY</key>
<string>AIzaSyBsdv91LqE7F-ZnOGZ018FjlDR8S6trIyc</string>
<key>GCM_SENDER_ID</key>
<string>477645655994</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>me.myds.ipstein.acamate.AcaMate</string>
<key>PROJECT_ID</key>
<string>acamate-350fd</string>
<key>STORAGE_BUCKET</key>
<string>acamate-350fd.firebasestorage.app</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<key>IS_GCM_ENABLED</key>
<true></true>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:477645655994:ios:dd3f8f91d85c5516481783</string>
</dict>
</plist>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
@ -17,42 +17,36 @@
</customFonts>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<scene sceneID="gUs-fK-jkQ">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<viewController id="Z5j-31-33C" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="lAw-OH-GcJ">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="PHz-gS-WUF">
<rect key="frame" x="0.0" y="832" width="393" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AcaMate" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="0.0" y="263.66666666666669" width="393" height="43"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="36"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © Team.Stein" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DB7-ZE-OmZ">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © Team.Stein" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NOC-tk-QJM">
<rect key="frame" x="110.33333333333333" y="747.66666666666663" width="172.66666666666669" height="20.333333333333371"/>
<fontDescription key="fontDescription" name="NPS-font-Regular" family="NPS font" pointSize="14"/>
<color key="textColor" name="Text/Detail"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="e1n-TP-Snx">
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="3Cc-mO-qI9">
<rect key="frame" x="159" y="711.66666666666663" width="75.333333333333314" height="24"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Team_Icon" translatesAutoresizingMaskIntoConstraints="NO" id="Jut-ME-xPR">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Icon/Team_Icon" translatesAutoresizingMaskIntoConstraints="NO" id="HZ9-M4-4km">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="ZYt-gO-7Dd"/>
<constraint firstAttribute="height" constant="24" id="n0u-p8-9ce"/>
<constraint firstAttribute="width" constant="24" id="jTz-mU-7gD"/>
<constraint firstAttribute="height" constant="24" id="lyO-og-sS0"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="STEIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D4H-4L-gwl">
<label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="STEIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4FD-cd-QOK">
<rect key="frame" x="28.000000000000004" y="0.33333333333337123" width="47.333333333333343" height="23.333333333333332"/>
<fontDescription key="fontDescription" name="NPS-font-Bold" family="NPS font" pointSize="16"/>
<color key="textColor" name="Text/Black"/>
@ -60,30 +54,37 @@
</label>
</subviews>
</stackView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Icon/App_Icon" translatesAutoresizingMaskIntoConstraints="NO" id="yVp-20-rR1">
<rect key="frame" x="96.666666666666686" y="159" width="200" height="200"/>
<constraints>
<constraint firstAttribute="height" constant="200" id="USS-fT-KDG"/>
<constraint firstAttribute="width" constant="200" id="qSG-BI-jdV"/>
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
<viewLayoutGuide key="safeArea" id="iby-bH-Sbp"/>
<color key="backgroundColor" name="Normal/Normal"/>
<constraints>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="DB7-ZE-OmZ" secondAttribute="bottom" constant="50" id="BAj-IX-P9u"/>
<constraint firstItem="DB7-ZE-OmZ" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="FfN-i1-tv7"/>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
<constraint firstItem="DB7-ZE-OmZ" firstAttribute="top" secondItem="e1n-TP-Snx" secondAttribute="bottom" constant="12" id="adk-eM-96E"/>
<constraint firstItem="e1n-TP-Snx" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="ifu-zm-USe"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
<constraint firstItem="iby-bH-Sbp" firstAttribute="centerX" secondItem="PHz-gS-WUF" secondAttribute="centerX" id="DxG-26-DB9"/>
<constraint firstItem="yVp-20-rR1" firstAttribute="top" secondItem="iby-bH-Sbp" secondAttribute="top" constant="100" id="FGu-C6-fhZ"/>
<constraint firstItem="iby-bH-Sbp" firstAttribute="bottom" secondItem="NOC-tk-QJM" secondAttribute="bottom" constant="50" id="HN4-FQ-mdh"/>
<constraint firstItem="NOC-tk-QJM" firstAttribute="centerX" secondItem="iby-bH-Sbp" secondAttribute="centerX" id="RZ7-gJ-rzh"/>
<constraint firstItem="NOC-tk-QJM" firstAttribute="top" secondItem="3Cc-mO-qI9" secondAttribute="bottom" constant="12" id="eoe-eh-4Q7"/>
<constraint firstAttribute="bottom" secondItem="PHz-gS-WUF" secondAttribute="bottom" constant="20" id="mur-RX-Zfl"/>
<constraint firstItem="yVp-20-rR1" firstAttribute="centerX" secondItem="iby-bH-Sbp" secondAttribute="centerX" id="ofT-VP-Uyl"/>
<constraint firstItem="PHz-gS-WUF" firstAttribute="leading" secondItem="iby-bH-Sbp" secondAttribute="leading" symbolic="YES" id="vUL-yT-bIb"/>
<constraint firstItem="3Cc-mO-qI9" firstAttribute="centerX" secondItem="iby-bH-Sbp" secondAttribute="centerX" id="vtR-tI-8yo"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="xXZ-Eh-2EG" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
</scene>
</scenes>
<resources>
<image name="Team_Icon" width="144" height="144"/>
<image name="Icon/App_Icon" width="1024" height="1024"/>
<image name="Icon/Team_Icon" width="144" height="144"/>
<namedColor name="Normal/Normal">
<color red="0.92199999094009399" green="0.875" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>