diff --git a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate index 2f82717..102dbcb 100644 Binary files a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate and b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AcaMate/1. View/12. Main/125. Etc/DevInfoView.swift b/AcaMate/1. View/12. Main/125. Etc/DevInfoView.swift new file mode 100644 index 0000000..197fc8b --- /dev/null +++ b/AcaMate/1. View/12. Main/125. Etc/DevInfoView.swift @@ -0,0 +1,63 @@ +// +// DevInfoView.swift +// AcaMate +// +// Created by TAnine on 2/13/25. +// + +import SwiftUI + +struct DevInfoView: View { + var body: some View { + VStack(alignment: .leading, spacing: 24) { + Text(""" + 아래 정보는 해당 프로그램에 관한 정보로서 + 학원에 대한 문의는 더보기 > 고객센터 > 1:1 문의 이용해주시기 바랍니다. + """) + .font(.nps(size: 8)) + .foregroundStyle(Color(.Text.detail)) + .lineLimit(2) + .multilineTextAlignment(.center) + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) + // .padding([.leading,.trailing],24) + + Image(.Logo.appIcon).resizable() + .frame(width: 40, height: 40,alignment: .leading) + .background( + RoundedRectangle(cornerRadius: 8) + .frame(width: 40, height: 40,alignment: .leading) + .foregroundStyle(Color(.Normal.light)) + ) + VStack(alignment: .leading, spacing: 12){ + Text("AcaMate") + .font(.nps(font: .bold, size: 16)) + .foregroundStyle(Color(.Text.detail)) + + VStack(spacing: 4) { + Text("문의: sean.kk@daum.net") + .font(.nps(size: 12)) + .foregroundStyle(Color(.Text.detail)) + + Text("문의: sean.kk@daum.net") + .font(.nps(size: 12)) + .foregroundStyle(Color(.Text.detail)) + } + + } + + Text("Copyright © Team.Stein. All Rights Reserved") + .font(.nps(size: 14)) + .foregroundStyle(Color(.Text.detail)) + + // .padding([.leading,.trailing],24) + } + .padding(24) + // .padding([.top,.bottom],24) + .background { + Color(.Disable.normal) + } + .frame(maxWidth: .infinity, maxHeight: .infinity) + + + } +} diff --git a/AcaMate/1. View/12. Main/125. Etc/EtcView.swift b/AcaMate/1. View/12. Main/125. Etc/EtcView.swift index 5df13a1..26ab919 100644 --- a/AcaMate/1. View/12. Main/125. Etc/EtcView.swift +++ b/AcaMate/1. View/12. Main/125. Etc/EtcView.swift @@ -26,8 +26,9 @@ struct EtcView: View { TsCsView() AppInfoView() } - .frame(maxWidth: .infinity, alignment: .leading) +// .frame(maxWidth: .infinity, alignment: .leading) .padding(24) + DevInfoView() } } diff --git a/AcaMate/1. View/12. Main/125. Etc/UserInfoView.swift b/AcaMate/1. View/12. Main/125. Etc/UserInfoView.swift index 5a7ab82..1f56990 100644 --- a/AcaMate/1. View/12. Main/125. Etc/UserInfoView.swift +++ b/AcaMate/1. View/12. Main/125. Etc/UserInfoView.swift @@ -36,7 +36,7 @@ struct UserInfoView: View { .foregroundStyle(Color(.Text.detail)) Spacer(minLength: 1) Text("\(userData.userID)") - .font(.nps(font: .bold, size: 16)) + .font(.nps(size: 16)) .foregroundStyle(Color(.Text.detail)) } HStack(spacing: 0) { @@ -45,7 +45,7 @@ struct UserInfoView: View { .foregroundStyle(Color(.Text.detail)) Spacer(minLength: 1) Text("\(userData.email)") - .font(.nps(font: .bold, size: 16)) + .font(.nps(size: 16)) .lineLimit(1) .minimumScaleFactor(0.5) .truncationMode(.tail) @@ -62,6 +62,11 @@ struct UserInfoView: View { .onAppear { btnVM.setImage(for: notifyBtnID, newImage: Image(.Icon.notificationSET)) btnVM.setSize(for: notifyBtnID, newWidth: 24, newHeight: 24) + btnVM.setAction(for: notifyBtnID) { + // MARK: TO-DO + // 알림 설정 페이지로 이동 + printLog("알림 설정 페이지") + } } } } diff --git a/AcaMate/6. Resources/Assets.xcassets/Color Folder/Point/Darker.colorset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Color Folder/Point/Darker.colorset/Contents.json index f3bfe31..5b0fb16 100644 --- a/AcaMate/6. Resources/Assets.xcassets/Color Folder/Point/Darker.colorset/Contents.json +++ b/AcaMate/6. Resources/Assets.xcassets/Color Folder/Point/Darker.colorset/Contents.json @@ -16,5 +16,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "localizable" : true } } diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/Contents.json new file mode 100644 index 0000000..a4cc2a3 --- /dev/null +++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "LOGO.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/LOGO.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/LOGO.png new file mode 100644 index 0000000..38f90a2 Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/Logo/LOGO.imageset/LOGO.png differ