🔀 :: (#499) 마이페이지 수정

Application/Resources/Assets.xcassets/Image/Icon/Camera.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "material-symbols_photo-camera-outline.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Application/Sources/ResoucesCode/Image.swift

@@ -12,6 +12,7 @@ extension Image {
     static let onboardingXquare = Image("Onboarding-Xquare")
 
     // Icon
+    static let camera = Image("Camera")
     static let application = Image("Application")
     static let bell = Image("Bell")
     static let bellWithBadge = Image("Bell.badge")

Application/Sources/Router/XQUARE/XquareRouterFactory.swift

@@ -148,6 +148,7 @@ class XquareRouterFactory: RouterFactory {
             fetchReleaseNoteUseCase: reportServiceDependency.fetchReleaseNoteUseCase
         )
         self.releaseNoteView = ReleaseNoteView(viewModel: releaseNoteViewModel)
+
     }
     // swiftlint:enable function_body_length
 

Application/Sources/Scene/Entire/EntireView.swift

@@ -28,8 +28,8 @@ struct EntireView: View, XNavigationAndTabContent {
                     ServiceSectionButtonView(
                         headerText: "앱",
                         services: [
-                            (text: "로그아웃", action: { viewModel.showLogoutAlert = true })
-//                            (text: "업데이트 사항", action: { xquareRouter.navigateTo(.releaseNote) })
+                            (text: "로그아웃", action: { viewModel.showLogoutAlert = true }),
+                            (text: "업데이트 사항", action: { xquareRouter.navigateTo(.releaseNote) })
                         ])
                     Spacer()
                 }

Application/Sources/Scene/MyPage/Information/MyInformationView.swift

@@ -22,6 +22,7 @@ struct MyInformationView: View {
             .padding(.leading, 16)
             .frame(height: 44)
             .background(Color.GrayScale.gray50)
+            .cornerRadius(8)
             .overlay { RoundedRectangle(cornerRadius: 8).stroke(Color.GrayScale.gray300) }
         }
         .padding(.bottom, 20)

Application/Sources/Scene/MyPage/MyPageView.swift

@@ -12,23 +12,17 @@ struct MyPageView: View {
             alignment: .center,
             spacing: 0
         ) {
-            Spacer()
-                .frame(height: 34)
-            ProfileImageView(
+            Spacer().frame(height: 20)
+            MyProfileView(
                 imageUrl: viewModel.profileImagrUrl,
-                uiimage: $viewModel.profileImage
+                uiimage: $viewModel.profileImage,
+                name: viewModel.name,
+                gradeClassNum: viewModel.gradeClassNum,
+                xPhotosIsPresented: $viewModel.xPhotosIsPresented
             )
-            Button {
-                viewModel.xPhotosIsPresented = true
-            } label: {
-                Text("변경하기")
-                    .sdText(type: .body4, textColor: .GrayScale.gray900)
-            }
-            .padding(.bottom, 6)
-            MyInformationView(title: "이름", content: viewModel.name)
-            MyInformationView(title: "생년월일", content: viewModel.birthDay)
-            MyInformationView(title: "학년 반 번호", content: viewModel.gradeClassNum)
             MyInformationView(title: "아이디", content: viewModel.id)
+            MyInformationView(title: "생년월일", content: viewModel.birthDay)
+            Spacer()
             Button(action: {
                 viewModel.showLogoutAlert = true
             }, label: {
@@ -39,12 +33,8 @@ struct MyPageView: View {
                     .background(Color.System.red50)
                     .cornerRadius(8)
             })
-            Spacer()
+            .padding(.bottom, 40)
         }
-        .sdPhotoPicker(
-            isPresented: $viewModel.xPhotosIsPresented,
-            selection: $viewModel.profileImage
-        )
         .sdAlert(isPresented: $viewModel.showLogoutAlert) {
             SDAlert(
                 title: "정말 회원탈퇴 하시겠습니까?",
@@ -55,6 +45,10 @@ struct MyPageView: View {
                 })
             )
         }
+        .sdPhotoPicker(
+            isPresented: $viewModel.xPhotosIsPresented,
+            selection: $viewModel.profileImage
+        )
         .onChange(of: viewModel.profileImage, perform: { _ in
             viewModel.uploadImage()
         })

Application/Sources/Scene/MyPage/MyProfile/MyProfileView.swift

@@ -0,0 +1,36 @@
+import SwiftUI
+
+import SemicolonDesign
+
+struct MyProfileView: View {
+    var imageUrl: URL?
+    @Binding var uiimage: UIImage
+    var name: String
+    var gradeClassNum: String
+    @Binding var xPhotosIsPresented: Bool
+    var body: some View {
+        HStack(alignment: .center, spacing: 16) {
+            ZStack(alignment: .bottomTrailing) {
+                ProfileImageView(
+                    imageUrl: imageUrl,
+                    uiimage: $uiimage
+                )
+                Image.camera
+                    .resizable()
+                    .scaledToFill()
+                    .frame(width: 20, height: 20)
+            }.onTapGesture {
+                xPhotosIsPresented = true
+            }
+            VStack(alignment: .leading, spacing: 0) {
+                Text(name)
+                    .sdText(type: .body1, textColor: .GrayScale.gray900)
+                Text(gradeClassNum)
+                    .sdText(type: .body2, textColor: .GrayScale.gray900)
+            }
+            Spacer()
+        }
+        .padding(.bottom, 20)
+        .padding(.leading, 4)
+    }
+}

Application/Sources/Scene/MyPage/ProfileImage/ProfileImageView.swift → Application/Sources/Scene/MyPage/MyProfile/ProfileImage/ProfileImageView.swift

@@ -10,19 +10,18 @@ struct ProfileImageView: View {
                 image
                     .resizable()
                     .scaledToFill()
+                    .frame(width: 60, height: 60)
             } placeholder: {
                 Image("DefaultImage")
             }
             .frame(width: 60, height: 60)
             .cornerRadius(30)
-            .padding(.bottom, 6)
         } else {
             Image(uiImage: uiimage)
                 .resizable()
                 .scaledToFill()
                 .frame(width: 60, height: 60)
                 .cornerRadius(30)
-                .padding(.bottom, 6)
         }
     }
 }