[🎨] 로고 및 이미지 변경
모던 디자인 로고로 변경 및 웹 로고와 같은 아이콘으로 변경
|
@ -22,7 +22,7 @@ struct IntroView: View {
|
||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
Spacer()
|
Spacer()
|
||||||
.frame(height: 100)
|
.frame(height: 100)
|
||||||
Image(.Logo.appIcon)
|
Image(.Logo.crystalIcon)
|
||||||
.resizable()
|
.resizable()
|
||||||
.frame(width: 200, height: 200)
|
.frame(width: 200, height: 200)
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
|
@ -21,7 +21,7 @@ struct LoginView: View {
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
Spacer().frame(height: 100)
|
Spacer().frame(height: 100)
|
||||||
Image(.Logo.appIcon)
|
Image(.Logo.crystalIcon)
|
||||||
.resizable()
|
.resizable()
|
||||||
.frame(width: 200, height: 200)
|
.frame(width: 200, height: 200)
|
||||||
// .padding(.top, 80)
|
// .padding(.top, 80)
|
||||||
|
|
|
@ -10,9 +10,9 @@ class ChatViewModel: ObservableObject {
|
||||||
private let appVM: AppViewModel
|
private let appVM: AppViewModel
|
||||||
|
|
||||||
@Published var messages: [ChatMesage] = []
|
@Published var messages: [ChatMesage] = []
|
||||||
|
|
||||||
init(_ appVM: AppViewModel) {
|
init(_ appVM: AppViewModel) {
|
||||||
self.appVM = appVM
|
self.appVM = appVM
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,8 +13,8 @@ class LoginViewModel: ObservableObject {
|
||||||
|
|
||||||
private var cancellables = Set<AnyCancellable>()
|
private var cancellables = Set<AnyCancellable>()
|
||||||
|
|
||||||
// @Published var toggleLoading: Bool = false
|
// @Published var toggleLoading: Bool = false
|
||||||
// @Published var pathName: PathName = .NONE
|
// @Published var pathName: PathName = .NONE
|
||||||
|
|
||||||
@UserDefault(key: "token", defaultValue: "accToken") var accToken
|
@UserDefault(key: "token", defaultValue: "accToken") var accToken
|
||||||
@UserDefault(key: "refresh", defaultValue: "refreshToken") var refresh
|
@UserDefault(key: "refresh", defaultValue: "refreshToken") var refresh
|
||||||
|
@ -34,7 +34,8 @@ class LoginViewModel: ObservableObject {
|
||||||
let acctype: String = type == .Apple ? "ST00": (type == .Kakao ? "ST01" : "ST02")
|
let acctype: String = type == .Apple ? "ST00": (type == .Kakao ? "ST01" : "ST02")
|
||||||
LoginController().login(type, devId)
|
LoginController().login(type, devId)
|
||||||
.flatMap{ snsId in
|
.flatMap{ snsId in
|
||||||
self.appVM.apiManager.loadAPIData(APIRequest(path: "/api/v1/in/user/login",
|
self.appVM.apiManager.loadAPIData(
|
||||||
|
APIRequest(path: "/api/v1/in/user/login",
|
||||||
headers: [API_HEADER : self.headerValue],
|
headers: [API_HEADER : self.headerValue],
|
||||||
parameters: [
|
parameters: [
|
||||||
"acctype": acctype,
|
"acctype": acctype,
|
||||||
|
|
|
@ -40,4 +40,5 @@ class TopViewModel: ObservableObject {
|
||||||
}
|
}
|
||||||
btnVM.setAction(for: rightBtnID, newAction: action)
|
btnVM.setAction(for: rightBtnID, newAction: action)
|
||||||
}
|
}
|
||||||
|
// 여기에 프린트 문만 찍어줘
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
</label>
|
</label>
|
||||||
</subviews>
|
</subviews>
|
||||||
</stackView>
|
</stackView>
|
||||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo/App_Icon" translatesAutoresizingMaskIntoConstraints="NO" id="yVp-20-rR1">
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Crystal_Icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="yVp-20-rR1">
|
||||||
<rect key="frame" x="96.666666666666686" y="159" width="200" height="200"/>
|
<rect key="frame" x="96.666666666666686" y="159" width="200" height="200"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstAttribute="height" constant="200" id="USS-fT-KDG"/>
|
<constraint firstAttribute="height" constant="200" id="USS-fT-KDG"/>
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
</scene>
|
</scene>
|
||||||
</scenes>
|
</scenes>
|
||||||
<resources>
|
<resources>
|
||||||
<image name="Logo/App_Icon" width="1024" height="1024"/>
|
<image name="Crystal_Icon.png" width="1024" height="1024"/>
|
||||||
<image name="Logo/Team_Icon" width="144" height="144"/>
|
<image name="Logo/Team_Icon" width="144" height="144"/>
|
||||||
<namedColor name="Normal/Normal">
|
<namedColor name="Normal/Normal">
|
||||||
<color red="0.92199999094009399" green="0.875" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
<color red="0.92199999094009399" green="0.875" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
|
|
Before Width: | Height: | Size: 811 KiB After Width: | Height: | Size: 830 KiB |
Before Width: | Height: | Size: 811 KiB After Width: | Height: | Size: 830 KiB |
Before Width: | Height: | Size: 811 KiB After Width: | Height: | Size: 830 KiB |
BIN
AcaMate/Resources/Assets.xcassets/Color Folder.zip
Normal file
12
AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/Contents.json
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "LogoImage.png",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
BIN
AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/LogoImage.png
vendored
Normal file
After Width: | Height: | Size: 1.3 MiB |
Before Width: | Height: | Size: 811 KiB After Width: | Height: | Size: 830 KiB |
BIN
AcaMate/Resources/Images/Logo/Crystal_Icon.png
Normal file
After Width: | Height: | Size: 1.3 MiB |
Before Width: | Height: | Size: 811 KiB After Width: | Height: | Size: 830 KiB |
BIN
AcaMate/Resources/Images/Logo/OldLogo.png
Normal file
After Width: | Height: | Size: 811 KiB |