Merge pull request #97 from DSM-PICK/hotfix/2.0.0

FIX :: 2.0.0
DSM-PICK · Sep 27, 2024 · 55cd45b · 55cd45b
2 parents 595257c + 3ce898b
commit 55cd45b
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/Projects/App/Support/Info.plist b/Projects/App/Support/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
@@ -53,9 +53,6 @@
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>fetch</string>
-		<string>location</string>
-		<string>processing</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

diff --git a/Projects/Modules/DesignSystem/Resources/Lotties/darkLottie.json b/Projects/Modules/DesignSystem/Resources/Lotties/darkLottie.json
diff --git a/Projects/Modules/DesignSystem/Resources/Lotties/pickLottie.json b/Projects/Modules/DesignSystem/Resources/Lotties/pickLottie.json
diff --git a/Projects/Modules/DesignSystem/Resources/Lotties/whiteLottie.json b/Projects/Modules/DesignSystem/Resources/Lotties/whiteLottie.json
diff --git a/Projects/Modules/DesignSystem/Sources/Component/Lottie/PiCKLottieView.swift b/Projects/Modules/DesignSystem/Sources/Component/Lottie/PiCKLottieView.swift
@@ -5,16 +5,26 @@ import SnapKit
 
 import Lottie
 
+import Core
+
 public class PiCKLottieView: UIView {
     private var lottieAnimationView: LottieAnimationView?
+    private let rawValue = UserDefaultStorage.shared.get(forKey: .displayMode) as? Int
+
+    private var animation: LottieAnimation? {
+        switch rawValue {
+        case 2:
+            return AnimationAsset.darkLottie.animation
+
+        default:
+            return AnimationAsset.whiteLottie.animation
+        }
+    }
 
     public init() {
         super.init(frame: .zero)
 
-        let animation: LottieAnimation? = AnimationAsset.pickLottie.animation
-
         self.lottieAnimationView = .init(animation: animation)
-
         self.configureView()
     }
     required init?(coder: NSCoder) {
@@ -31,8 +41,8 @@ public class PiCKLottieView: UIView {
     }
 
     public func play() {
+        self.lottieAnimationView?.animationSpeed = 3.5
         self.lottieAnimationView?.play()
-        self.lottieAnimationView?.animationSpeed = 1.5
     }
 
 }
diff --git a/Projects/Modules/DesignSystem/Sources/Component/Navigation/PiCKMainNavigationBar.swift b/Projects/Modules/DesignSystem/Sources/Component/Navigation/PiCKMainNavigationBar.swift
@@ -19,13 +19,6 @@ public class PiCKMainNavigationBar: BaseView {
          return alertButton.buttonTap
      }
 
-//    private var displayType: UIUserInterfaceStyle {
-//        let data = userDefaultStorage.get(forKey: .displayMode) as? Int
-//        print("displayType: \(data)")
-//
-//        return data == 2 ? .light : .dark
-//    }
-
     private let pickLogoImageView = UIImageView(image: .PiCKLogo).then {
         $0.contentMode = .scaleAspectFit
     }
@@ -68,8 +61,6 @@ public class PiCKMainNavigationBar: BaseView {
 
                 let value = self.userDefaultStorage.get(forKey: .displayMode) as? Int
 
-//                print("setValueWhenDisplayButtonDidTap: \(self?.displayType.rawValue)")
-
                 UIView.transition(
                     with: self.presentViewController.tabBarController!.view,
                     duration: 0.7,

diff --git a/Projects/Presentation/Sources/Scene/OnBoarding/OnBoardingViewController.swift b/Projects/Presentation/Sources/Scene/OnBoarding/OnBoardingViewController.swift
@@ -21,6 +21,7 @@ public class OnboardingViewController: BaseViewController<OnboardingViewModel> {
 
     public override func attribute() {
         super.attribute()
+
         [
             logoImageView,
             onboardingButton

diff --git a/Projects/Presentation/Sources/Scene/OnBoarding/OnboardingViewModel.swift b/Projects/Presentation/Sources/Scene/OnBoarding/OnboardingViewModel.swift
@@ -36,8 +36,8 @@ public class OnboardingViewModel: BaseViewModel, Stepper {
         let showComponet: Signal<Void>
     }
 
-    let animate = PublishRelay<Void>()
-    let showComponet = PublishRelay<Void>()
+    private let animate = PublishRelay<Void>()
+    private let showComponent = PublishRelay<Void>()
 
     public func transform(input: Input) -> Output {
         input.viewWillAppear
@@ -68,8 +68,8 @@ public class OnboardingViewModel: BaseViewModel, Stepper {
 
         input.componentAppear.asObservable()
             .throttle(.seconds(2), scheduler: MainScheduler.asyncInstance)
-            .map { _ in self.showComponet.accept(()) }
-            .bind(to: showComponet)
+            .map { _ in self.showComponent.accept(()) }
+            .bind(to: showComponent)
             .disposed(by: disposeBag)
 
         input.clickOnboardingButton
@@ -79,7 +79,7 @@ public class OnboardingViewModel: BaseViewModel, Stepper {
 
         return Output(
             animate: animate.asSignal(),
-            showComponet: showComponet.asSignal()
+            showComponet: showComponent.asSignal()
         )
     }
 

diff --git a/Projects/Presentation/Sources/Scene/SchoolMeal/Cell/SchoolMealCollectionViewCell.swift b/Projects/Presentation/Sources/Scene/SchoolMeal/Cell/SchoolMealCollectionViewCell.swift
@@ -9,22 +9,21 @@ import DesignSystem
 public class SchoolMealCollectionViewCell: BaseCollectionViewCell<Any> {
     static let identifier = "SchoolMealTableViewCell"
 
-    private let mealTimeLabel = PiCKLabel(
+    private var mealTimeLabel = PiCKLabel(
         textColor: .main700,
         font: .subTitle1
     )
-    private let kcalLabel = PiCKLabel(
+    private var kcalLabel = PiCKLabel(
         textColor: .modeWhite,
         font: .caption2,
         alignment: .center,
         backgroundColor: .main500,
         cornerRadius: 12
     )
-    private let menuLabel = PiCKLabel(
+    private var menuLabel = PiCKLabel(
         textColor: .modeBlack,
         font: .label1,
-        numberOfLines: 0,
-        alignment: .left
+        numberOfLines: 0
     )
     private lazy var infoStackView = UIStackView(arrangedSubviews: [
         mealTimeLabel,
@@ -75,7 +74,7 @@ public class SchoolMealCollectionViewCell: BaseCollectionViewCell<Any> {
         }
         menuLabel.snp.makeConstraints {
             $0.top.bottom.equalToSuperview().inset(10)
-            $0.leading.equalToSuperview().inset(190)
+            $0.leading.equalToSuperview().inset(180)
             $0.trailing.equalToSuperview().inset(10)
         }
     }

diff --git a/Projects/Presentation/Sources/Scene/SchoolMeal/SchoolMealViewController.swift b/Projects/Presentation/Sources/Scene/SchoolMeal/SchoolMealViewController.swift
@@ -82,6 +82,7 @@ public class SchoolMealViewController: BaseViewController<SchoolMealViewModel> {
                 self?.present(alert, animated: true)
             }.disposed(by: disposeBag)
     }
+
     public override func addView() {
         [
             navigationBar,