[Design] #170 - Design 수정사항 반영 #172

shimseohyun · 2024-08-13T18:11:23Z

🔥 Pull requests

👷 작업한 내용

loading view 작업
hankki list 디자인 잘못된 부분 수정
모달 디자인 (아주 약간 변경)

🚨 참고 사항

로딩뷰가 추가되었습니다.
네트워크 통신 시작~응답 받기까지 진행됩니다.

MoyaPlugin.swift

func willSend(_ request: RequestType, target: TargetType) {

        guard let httpRequest = request.request else {
            print("--> ❌🍚❌유효하지 않은 요청❌🍚❌")
            return
        }
        // 로딩뷰를 보여주는 부분
        DispatchQueue.main.async {
            UIApplication.showLoadingView()
        }
        
(생략)

func didReceive(_ result: Result<Response, MoyaError>, target: TargetType) {
        // 로딩뷰를 닫는 부분
        DispatchQueue.main.async {
            UIApplication.dismissLoadingView()
        }

BaseViewController.swift
로딩뷰 관련 함수와, UIComponents가 추가되었습니다.
Base View Controller에 기본적인 로딩뷰가 내제되어있고 on off 되는 방식으로 진행됩니다.

private extension BaseViewController {
    func setupLoadingView() {
        loadingView.do {
            $0.isHidden = true
        }
        
        spinner.do {
            $0.animation = LottieAnimation.named("loading")
            $0.contentMode = .scaleAspectFill
            $0.loopMode = .loop
            $0.stop()
        }
        
        view.addSubview(loadingView)
        loadingView.addSubview(spinner)
        
        loadingView.snp.makeConstraints {
            $0.edges.equalTo(view.safeAreaLayoutGuide)
        }
        
        spinner.snp.makeConstraints {
            $0.size.equalTo(68)
            $0.center.equalToSuperview()
        }
    }
}

extension BaseViewController {
    func showLoadingView() {
        loadingView.do {
            $0.isHidden = false
        }
        
        spinner.do {
            $0.play()
        }
    }
    
    func dismissLoadingView() {
        loadingView.do {
            $0.isHidden = true
        }
        
        spinner.do {
            $0.stop()
        }
    }
}

✅ Check List

Merge 대상 브랜치가 올바른가?
최종 코드가 에러 없이 잘 동작하는가?
전체 변경사항이 500줄을 넘지 않는가?

📟 관련 이슈

Resolved: [Design] Design 수정사항 반영 #170

mcrkgus

Lottie 소녀 고마워요
수고했소

mcrkgus · 2024-08-13T18:34:47Z

Hankkijogbo/Hankkijogbo/Global/Components/HankkiAlerts/AlertViewController.swift

+            if UIScreen.getDeviceWidth() > 331 {
+                $0.width.equalTo(331)
+            } else {
+                $0.horizontalEdges.equalToSuperview().inset(22)
+            }


p3
분기처리 LGTM

mcrkgus · 2024-08-13T18:35:05Z

Hankkijogbo/Hankkijogbo/Global/Components/HankkiAlerts/AlertViewController.swift

            $0.center.equalToSuperview()
        }

+
+        // TODO: - 버튼 패딩 값으로 바꾸기


p3
친절하오

mcrkgus · 2024-08-13T18:35:53Z

Hankkijogbo/Hankkijogbo/Global/Components/HankkiButtons/MainButton.swift

+    var style: MainButton.Style {
+        switch self {
+        case .secondary:
+            MainButton.Style(ableBackgroundColor: .white, disableBackgroundColor: .white, textColor: .hankkiRed)
+        default:
+            MainButton.Style(ableBackgroundColor: .hankkiRed, disableBackgroundColor: .hankkiSemiRed, textColor: .white)
+        }
+    }


p3
오.. 여기서 바로 해도 좋군요... HomeView filtering Button도 이렇게 해봐야겠소

mcrkgus · 2024-08-13T18:40:25Z

Hankkijogbo/Hankkijogbo/Network/User/DTO/Response/GetMeResponseDTO.swift

@@ -8,6 +8,7 @@
 import Foundation

 struct GetMeResponseData: Codable {
+    // TODO: - 서현) Server 업데이트 되면 Image 부분 지우기 디코딩 에러난다!!!!!


EunsuSeo01

고생했어요~!!

EunsuSeo01 · 2024-08-13T18:45:06Z

Hankkijogbo/Hankkijogbo/Global/Components/HankkiButtons/MainButton.swift

+    var style: MainButton.Style {
+        switch self {
+        case .secondary:
+            MainButton.Style(ableBackgroundColor: .white, disableBackgroundColor: .white, textColor: .hankkiRed)
+        default:
+            MainButton.Style(ableBackgroundColor: .hankkiRed, disableBackgroundColor: .hankkiSemiRed, textColor: .white)
+        }
+    }


EunsuSeo01 · 2024-08-13T18:45:27Z

Hankkijogbo/Hankkijogbo/Global/Extensions/UIApplication+.swift

+    static func showLoadingView() {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let delegate = windowScene.delegate as? SceneDelegate,
+                          let rootViewController = delegate.window?.rootViewController as? UINavigationController,
+                          let currentViewController = rootViewController.topViewController as? BaseViewController {
+                           currentViewController.showLoadingView()
+        }
+    }
+
+    static func dismissLoadingView() {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let delegate = windowScene.delegate as? SceneDelegate,
+                          let rootViewController = delegate.window?.rootViewController as? UINavigationController,
+                          let currentViewController = rootViewController.topViewController as? BaseViewController {
+                           currentViewController.dismissLoadingView()
+        }
+    }


아주 좋소

EunsuSeo01 · 2024-08-13T18:45:51Z

Hankkijogbo/Hankkijogbo/Network/Base/MoyaPlugin.swift

            print("--> ❌🍚❌유효하지 않은 요청❌🍚❌")
            return
        }
+        DispatchQueue.main.async {
+            UIApplication.showLoadingView()
+        }

        let url = httpRequest.description


천재 발생

EunsuSeo01 · 2024-08-13T18:46:34Z

Hankkijogbo/Hankkijogbo/Present/Base/BaseViewController.swift

+private extension BaseViewController {
+    func setupLoadingView() {


EunsuSeo01 · 2024-08-13T18:46:50Z

...kijogbo/Present/HankkiDetail/View/Cell/HankkiReportOption/HankkiReportOptionFooterView.swift

@@ -11,7 +11,7 @@ final class HankkiReportOptionFooterView: BaseCollectionReusableView {

    // MARK: - UI Components

-    let hankkiReportButton: MainButton = MainButton(titleText: StringLiterals.Common.report)
+    let hankkiReportButton: MainButton = MainButton(titleText: StringLiterals.Common.report, isDisable: true)


shimseohyun added 6 commits August 13, 2024 17:41

[Design] #170 - add Loading View

fa3ca20

[Design] #170 - modal 디자인 변경 반영

03e8624

[Design] #170 - profile default 이미지 변경

1a7033f

[Fix] #170 - Hankki List 하트 버튼 크기 수정, 마지막 라인 없애기

3e56dbb

[Chore] #170 - loading view 수정사항 반영

7dc9b7e

[Chore] #170 - HankkiList default image 변경

90a5e35

shimseohyun added 🍚 Feat 새로운 기능 구현 🎨 Design UI 디자인을 구현하거나 변경 🤹🏻‍♀️ 서현 서현 공주 작업 labels Aug 13, 2024

shimseohyun self-assigned this Aug 13, 2024

shimseohyun requested review from EunsuSeo01 and mcrkgus and removed request for EunsuSeo01 August 13, 2024 18:11

[Design] #170 - Create My Zip 디자인 수정

3cb7639

mcrkgus approved these changes Aug 13, 2024

View reviewed changes

EunsuSeo01 approved these changes Aug 13, 2024

View reviewed changes

shimseohyun merged commit a9a048e into develop Aug 13, 2024

shimseohyun deleted the design/#170 branch August 13, 2024 19:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Design] #170 - Design 수정사항 반영 #172

[Design] #170 - Design 수정사항 반영 #172

shimseohyun commented Aug 13, 2024 •

edited

Loading

mcrkgus left a comment

mcrkgus Aug 13, 2024

mcrkgus Aug 13, 2024

mcrkgus Aug 13, 2024

EunsuSeo01 Aug 13, 2024

mcrkgus Aug 13, 2024

EunsuSeo01 left a comment

EunsuSeo01 Aug 13, 2024

EunsuSeo01 Aug 13, 2024

EunsuSeo01 Aug 13, 2024

EunsuSeo01 Aug 13, 2024

EunsuSeo01 Aug 13, 2024

		private extension BaseViewController {
		func setupLoadingView() {

[Design] #170 - Design 수정사항 반영 #172

[Design] #170 - Design 수정사항 반영 #172

Conversation

shimseohyun commented Aug 13, 2024 • edited Loading

🔥 Pull requests

👷 작업한 내용

🚨 참고 사항

✅ Check List

📟 관련 이슈

mcrkgus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EunsuSeo01 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shimseohyun commented Aug 13, 2024 •

edited

Loading