Merge pull request #87 from Umpah-swim-wave/feature/85-bug-cardview-h…

…eight [BUG] 반 뷰 QA 해결
Umpah-swim-wave · Feb 18, 2022 · be8a183 · be8a183
2 parents c484080 + c9b70dd
commit be8a183
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 21 deletions.
diff --git a/...Umpah-iOS.xcodeproj/xcshareddata/xcschemes/Umpah-iOS WatchKit App (Complication).xcscheme b/...Umpah-iOS.xcodeproj/xcshareddata/xcschemes/Umpah-iOS WatchKit App (Complication).xcscheme
@@ -55,16 +55,18 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Uhpuh WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EDD43FE326483C9600C866F3"
             BuildableName = "Umpah-iOS WatchKit App.app"
             BlueprintName = "Umpah-iOS WatchKit App"
             ReferencedContainer = "container:Umpah-iOS.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,16 +75,27 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Uhpuh WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EDD43FE326483C9600C866F3"
             BuildableName = "Umpah-iOS WatchKit App.app"
             BlueprintName = "Umpah-iOS WatchKit App"
             ReferencedContainer = "container:Umpah-iOS.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EDD43FE326483C9600C866F3"
+            BuildableName = "Umpah-iOS WatchKit App.app"
+            BlueprintName = "Umpah-iOS WatchKit App"
+            ReferencedContainer = "container:Umpah-iOS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Umpah-iOS/Umpah-iOS.xcodeproj/xcshareddata/xcschemes/Umpah-iOS WatchKit App.xcscheme b/Umpah-iOS/Umpah-iOS.xcodeproj/xcshareddata/xcschemes/Umpah-iOS WatchKit App.xcscheme
@@ -54,33 +54,46 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Uhpuh WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EDD43FE326483C9600C866F3"
             BuildableName = "Umpah-iOS WatchKit App.app"
             BlueprintName = "Umpah-iOS WatchKit App"
             ReferencedContainer = "container:Umpah-iOS.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Uhpuh WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EDD43FE326483C9600C866F3"
             BuildableName = "Umpah-iOS WatchKit App.app"
             BlueprintName = "Umpah-iOS WatchKit App"
             ReferencedContainer = "container:Umpah-iOS.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EDD43FE326483C9600C866F3"
+            BuildableName = "Umpah-iOS WatchKit App.app"
+            BlueprintName = "Umpah-iOS WatchKit App"
+            ReferencedContainer = "container:Umpah-iOS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/CardView.swift b/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/CardView.swift
@@ -85,6 +85,9 @@ final class CardView: BaseView, Alertable {
 
         switch cardViewState {
         case .normal:
+            expandedView.routineFilterView.levelText = "레벨"
+            expandedView.routineFilterView.exceptionStrokeText = "제외할 영법"
+
             normalView.fadeIn()
             expandedView.fadeOut()
             startAnimation()

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/ExpandedStateView.swift b/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/ExpandedStateView.swift
@@ -130,13 +130,15 @@ final class ExpandedStateView: ExpandedStateTableView {
         let storyboard = UIStoryboard(name: "ModifyElement", bundle: nil)
         guard let nextVC = storyboard.instantiateViewController(withIdentifier: ModifyElementVC.identifier) as? ModifyElementVC else {return}
 
+        nextVC.sendFilterData = { [weak self] in
+            self?.rootVC?.setupCardViewState(to: .expanded)
+        }
+
         nextVC.elementType = elementType
-        nextVC.modalPresentationStyle = .fullScreen
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1 , execute: {
-            nextVC.backgroundImage = self.rootVC?.view.asImage()
-            nextVC.modalTransitionStyle = .crossDissolve
-            self.rootVC?.present(nextVC, animated: true, completion: nil)
-        })
+        nextVC.backgroundImage = self.rootVC?.view.asImage()
+        nextVC.modalPresentationStyle = .overCurrentContext
+        nextVC.modalTransitionStyle = .crossDissolve
+        self.rootVC?.present(nextVC, animated: true, completion: nil)
     }
 
     private func setupModifyButton() {

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/RoutineFilterView.swift b/Umpah-iOS/Umpah-iOS/Screen/Main/Component/Sheet/RoutineFilterView.swift
@@ -23,6 +23,17 @@ final class RoutineFilterView: BaseView {
     var levelText = "레벨"
     var exceptionStrokeText = "제외할 영법"
 
+    // MARK: - init
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setAttributeRoutineButton(button: distanceOrderButton, title: "거리순")
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
     override func render() {
         addSubviews([levelButton,
                      exceptionButton,
@@ -56,7 +67,6 @@ final class RoutineFilterView: BaseView {
     func setupRoutineHeader() {
         setAttributeRoutineButton(button: levelButton, title: levelText)
         setAttributeRoutineButton(button: exceptionButton, title: exceptionStrokeText)
-        setAttributeRoutineButton(button: distanceOrderButton, title: "거리순")
     }
 
     private func setAttributeRoutineButton(button: UIButton, title: String) {

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Main/Controller/MainCardVC.swift b/Umpah-iOS/Umpah-iOS/Screen/Main/Controller/MainCardVC.swift
@@ -54,9 +54,9 @@ class MainCardVC: BaseViewController {
         case .expanded:
             switch currentMainViewState {
             case .week:
-                topConstraint = screenHeight * 0.24
+                topConstraint = screenHeight * 0.20
             case .month:
-                topConstraint = screenHeight * 0.38
+                topConstraint = screenHeight * 0.35
             default:
                 topConstraint = Size.defaultTopConstant
             }

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Main/Controller/MainVC.swift b/Umpah-iOS/Umpah-iOS/Screen/Main/Controller/MainVC.swift
@@ -111,6 +111,8 @@ final class MainVC: MainTableVC {
     private func changeStateWhenTappedHeaderTab(){
         headerView.pressedTabIsRecord = { [weak self] isRecord in
             guard let self = self else { return }
+            self.setupCardViewState(to: .normal)
+
             if !isRecord && self.currentMainViewState != .routine {
                 self.cacheMainViewState = self.currentMainViewState
                 self.currentMainViewState = .routine

diff --git a/Umpah-iOS/Umpah-iOS/Screen/Routine/Controller/ModifyElementVC.swift b/Umpah-iOS/Umpah-iOS/Screen/Routine/Controller/ModifyElementVC.swift
@@ -34,6 +34,8 @@ class ModifyElementVC: UIViewController{
 
     private var contentViewHeight = 0
 
+    var sendFilterData: (() -> Void)?
+
     private var dimmerView = UIView().then{
         $0.backgroundColor = .black
         $0.alpha = 0.6
@@ -103,9 +105,11 @@ class ModifyElementVC: UIViewController{
         case .level:
             let presentingVC = presentingViewController as? MainVC
             presentingVC?.cardView.expandedView.routineFilterView.levelText = selectedContent ?? "레벨"
+            sendFilterData?()
         case .exceptStorke:
             let presentingVC = presentingViewController as? MainVC
             presentingVC?.cardView.expandedView.routineFilterView.exceptionStrokeText = selectedContent ?? "제외할 영법"
+            sendFilterData?()
         case .none:
             elementList = []
         }