Merge pull request #206 from lsj8706/feat/#202-1차QA-UI반영

[Feat] #202 - 1차 QA UI반영
sopt-makers · Apr 24, 2023 · c0f67a7 · c0f67a7
2 parents ac27a3c + 995c72f
commit c0f67a7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift b/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift
@@ -39,7 +39,7 @@ public class MainVC: UIViewController, MainViewControllable {
     public var factory: factoryType!
     private var cancelBag = CancelBag()
 
-    private var requestUserInfo = CurrentValueSubject<Void, Never>(())
+    private var requestUserInfo = PassthroughSubject<Void, Never>()
 
     // MARK: - UI Components
 
@@ -66,6 +66,11 @@ public class MainVC: UIViewController, MainViewControllable {
         self.setDelegate()
         self.registerCells()
     }
+
+    public override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.requestUserInfo.send(())
+    }
 }
 
 // MARK: - UI & Layout
@@ -74,10 +79,6 @@ extension MainVC {
     private func setUI() {
         self.navigationController?.isNavigationBarHidden = true
         view.backgroundColor = DSKitAsset.Colors.black100.color
-
-        if viewModel.userType == .visitor {
-            self.naviBar.setRightButtonImage(image: DSKitAsset.Assets.btnLogout.image)
-        }
     }
 
     private func setLayout() {
@@ -127,6 +128,11 @@ extension MainVC {
                     self?.presentPlaygroundRegisterationAlertVC()
                 }
             }.store(in: self.cancelBag)
+
+        output.isLoading
+            .sink { [weak self] isLoading in
+                isLoading ? self?.showLoading() : self?.stopLoading()
+            }.store(in: self.cancelBag)
     }
 
     private func bindViews() {

diff --git a/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/ViewModel/MainViewModel.swift b/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/ViewModel/MainViewModel.swift
@@ -28,7 +28,7 @@ public class MainViewModel: ViewModelType {
     // MARK: - Inputs
 
     public struct Input {
-        let requestUserInfo: CurrentValueSubject<Void, Never>
+        let requestUserInfo: PassthroughSubject<Void, Never>
     }
 
     // MARK: - Outputs
@@ -37,6 +37,7 @@ public class MainViewModel: ViewModelType {
         var getUserMainInfoDidComplete = PassthroughSubject<Void, Never>()
         var isServiceAvailable = PassthroughSubject<Bool, Never>()
         var needPlaygroundProfileRegistration = PassthroughSubject<Bool, Never>()
+        var isLoading = PassthroughSubject<Bool, Never>()
     }
 
     // MARK: - init
@@ -57,6 +58,7 @@ extension MainViewModel {
 
         input.requestUserInfo
             .sink { [weak self] _ in
+                output.isLoading.send(true)
                 guard let self = self else { return }
                 if self.userType != .visitor {
                     self.useCase.getUserMainInfo()
@@ -70,6 +72,7 @@ extension MainViewModel {
     private func bindOutput(output: Output, cancelBag: CancelBag) {
         useCase.userMainInfo.asDriver()
             .sink { [weak self] userMainInfo in
+                output.isLoading.send(false)
                 guard let self = self else { return }
                 self.userMainInfo = userMainInfo
                 self.userType = userMainInfo?.userType ?? .unregisteredInactive
@@ -82,6 +85,7 @@ extension MainViewModel {
 
         useCase.serviceState.asDriver()
             .sink { serviceState in
+                output.isLoading.send(false)
                 output.isServiceAvailable.send(serviceState.isAvailable)
             }.store(in: self.cancelBag)
     }

diff --git a/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SentenceEditVC.swift b/SOPT-iOS/Projects/Features/SettingFeature/Sources/SettingScene/VC/SentenceEditVC.swift
@@ -43,7 +43,6 @@ public class SentenceEditVC: UIViewController, SentenceEditViewControllable {
         tv.setTypoStyle(DSKitFontFamily.Suit.medium.font(size: 16))
         tv.layer.cornerRadius = 9.adjustedH
         tv.layer.borderWidth = 1.adjustedH
-        tv.layer.borderColor = DSKitAsset.Colors.purple100.color.cgColor
         tv.isEditable = true
         tv.textContainerInset = UIEdgeInsets(top: 13, left: 16, bottom: 13, right: 16)
         tv.delegate = self
@@ -155,8 +154,17 @@ extension SentenceEditVC {
 
 extension SentenceEditVC: UITextViewDelegate {
     public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        guard text != "\n" else { return false }
         guard let str = textView.text else { return true }
         let newLength = str.count + text.count - range.length
         return newLength <= 42
     }
+
+    public func textViewDidBeginEditing(_ textView: UITextView) {
+        textView.layer.borderColor = DSKitAsset.Colors.purple100.color.cgColor
+    }
+
+    public func textViewDidEndEditing(_ textView: UITextView) {
+        textView.layer.borderColor = nil
+    }
 }
diff --git a/SOPT-iOS/Projects/Features/SplashFeature/Sources/SplashScene/VC/NoticePopUpVC.swift b/SOPT-iOS/Projects/Features/SplashFeature/Sources/SplashScene/VC/NoticePopUpVC.swift
@@ -59,6 +59,7 @@ public class NoticePopUpVC: UIViewController, NoticePopUpViewControllable {
                                                  attributes: [.font: UIFont.SoptampFont.caption3,
                                                               .foregroundColor: DSKitAsset.Colors.white.color]),
                               for: .normal)
+        $0.titleLabel?.adjustsFontSizeToFitWidth = true
     }
 
     private let updateButton = UIButton(type: .custom).then {

diff --git a/SOPT-iOS/Projects/Features/StampFeature/Sources/StampGuideScene/VC/StampGuideVC.swift b/SOPT-iOS/Projects/Features/StampFeature/Sources/StampGuideScene/VC/StampGuideVC.swift
@@ -44,6 +44,7 @@ public class StampGuideVC: UIViewController, StampGuideViewControllable {
         collectionView.isScrollEnabled = true
         collectionView.isPagingEnabled = true
         collectionView.showsHorizontalScrollIndicator = false
+        collectionView.backgroundColor = .clear
         return collectionView
     }()
 

diff --git a/SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STNavigationBar.swift b/SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STNavigationBar.swift
@@ -220,6 +220,7 @@ extension STNavigationBar {
             titleButton.setImage(DSKitAsset.Assets.icDownArrow.image, for: .normal)
             titleButton.setTitleColor(.black, for: .normal)
             titleButton.semanticContentAttribute = .forceRightToLeft
+            titleButton.titleLabel?.adjustsFontSizeToFitWidth = true
         case .titleWithLeftButton:
             rightButton.isHidden = true
             leftButton.setImage(UIImage(asset: DSKitAsset.Assets.icArrow), for: .normal)