🔗 :: (#231) 불러오는 중 문구 추가

Projects/Core/Sources/Steps/EasterEggStep.swift

@@ -0,0 +1,5 @@
+import RxFlow
+
+public enum EasterEggStep: Step {
+ case easterEggIsRequired
+}

Projects/Core/Sources/Steps/HomeStep.swift

@@ -4,6 +4,7 @@ public enum HomeStep: Step {
  case homeIsRequired
  case alarmIsRequired
  case companyIsRequired
+ case easterEggIsRequired
  case rejectReasonIsRequired(
  recruitmentID: Int,
  applicationID: Int,

Projects/Flow/Sources/Home/EasterEggFlow.swift

@@ -0,0 +1,35 @@
+import UIKit
+import SwiftUI
+import Presentation
+import Swinject
+import RxFlow
+import Core
+
+
+public final class EasterEggFlow: Flow {
+ public let container: Container
+ private let rootViewController: RxFlowViewController
+ public var root: Presentable {
+ return rootViewController
+ }
+
+ public init(container: Container) {
+ self.container = container
+ self.rootViewController = container.resolve(EasterEggViewController.self)!
+ }
+
+ public func navigate(to step: Step) -> FlowContributors {
+ guard let step = step as? EasterEggStep else { return .none }
+
+ switch step {
+ case .easterEggIsRequired:
+ return navigateToEasterEgg()
+ }
+ }
+}
+
+private extension EasterEggFlow {
+ func navigateToEasterEgg() -> FlowContributors {
+ return .one(flowContributor: .contribute(withNext: rootViewController))
+ }
+}

Projects/Flow/Sources/Home/HomeFlow.swift

@@ -28,6 +28,9 @@ public final class HomeFlow: Flow {
  case .companyIsRequired:
  return navigateToCompany()
 
+ case .easterEggIsRequired:
+ return navigateToEasterEgg()
+
  case let .rejectReasonIsRequired(recruitmentID, applicationID, companyName, companyImageUrl):
  return navigateToRejectReason(recruitmentID, applicationID, companyName, companyImageUrl)
 
@@ -67,6 +70,21 @@ private extension HomeFlow {
  ))
  }
 
+ func navigateToEasterEgg() -> FlowContributors {
+ let easterEggFlow = EasterEggFlow(container: container)
+
+ Flows.use(easterEggFlow, when: .created) { root in
+ self.rootViewController.present(
+ root, animated: true
+ )
+ }
+
+ return .one(flowContributor: .contribute(
+ withNextPresentable: easterEggFlow,
+ withNextStepper: OneStepper(withSingleStep: EasterEggStep.easterEggIsRequired)
+ ))
+ }
+
  func navigateToCompany() -> FlowContributors {
  let companyFlow = CompanyFlow(container: container)
  Flows.use(companyFlow, when: .created) { root in

Projects/Presentation/Resources/Images/OnboardingImages.xcassets/Jobis logo.imageset/Contents.json → Projects/Modules/DesignSystem/Resources/Images/Images.xcassets/Easter Egg/Close.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "Jobis logo.png",
+ "filename" : "close.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

Projects/Presentation/Resources/Images/OnboardingImages.xcassets/Contents.json → Projects/Modules/DesignSystem/Resources/Images/Images.xcassets/Easter Egg/Contents.json

@@ -2,5 +2,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "provides-namespace" : true
  }
 }

Projects/Presentation/Resources/Images/OnboardingImages.xcassets/Team return logo.imageset/Contents.json → Projects/Modules/DesignSystem/Resources/Images/Images.xcassets/Easter Egg/Open.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "Team return logo.png",
+ "filename" : "open.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

Projects/Modules/DesignSystem/Sources/View/StudentInfoView.swift

@@ -14,10 +14,10 @@ public final class StudentInfoView: UIView {
  $0.alignment = .leading
  }
  private let userInfoLabel = UILabel().then {
- $0.setJobisText("0000 가가가", font: .subHeadLine, color: .GrayScale.gray90)
+ $0.setJobisText("불러오는 중...", font: .subHeadLine, color: .GrayScale.gray90)
  }
  private let departmentLabel = UILabel().then {
- $0.setJobisText("가가가가가가가가", font: .description, color: .GrayScale.gray70)
+ $0.setJobisText("", font: .description, color: .GrayScale.gray70)
  }
 
  public init() {

Projects/Presentation/Sources/DI/PresentationAssembly.swift

@@ -251,5 +251,9 @@ public final class PresentationAssembly: Assembly {
  fetchRejectionReasonUseCase: resolver.resolve(FetchRejectionReasonUseCase.self)!
  )
  }
+
+ container.register(EasterEggViewController.self) { resolver in
+ EasterEggViewController()
+ }
  }
 }

Projects/Presentation/Sources/EasterEgg/EasterEggView.swift

@@ -0,0 +1,60 @@
+import SwiftUI
+import DesignSystem
+
+struct EasterEggView: View {
+ @State private var count = 0
+ @State private var angle = 0
+ @State private var index = 0
+ private var colors: [Color] = [
+ .yellow,
+ .red,
+ .blue,
+ .green,
+ .purple,
+ .orange,
+ .mint,
+ .white
+ ]
+ var body: some View {
+ VStack {
+ Button("", action: addAction)
+ .buttonStyle(CatButtonStyle())
+ .rotationEffect(.degrees(Double(angle)))
+
+ Text("\(count)")
+ .padding(.top, 50)
+ }
+ .frame(maxWidth: .infinity, maxHeight: .infinity)
+ .padding()
+ .background(colors[index])
+ }
+
+ private func addAction() {
+ count += 1
+ angle = (angle + 45) % 360
+ index = Int.random(in: 0..<colors.count)
+ HapticManager.instance.impact(style: .heavy)
+ }
+}
+
+private struct CatButtonStyle: ButtonStyle {
+ func makeBody(configuration: Configuration) -> some View {
+ configuration.isPressed ? DesignSystemAsset.Images.EasterEgg.open.swiftUIImage:
+ DesignSystemAsset.Images.EasterEgg.close.swiftUIImage
+ }
+}
+
+final private class HapticManager {
+ static let instance = HapticManager()
+
+ func notification(type: UINotificationFeedbackGenerator.FeedbackType) {
+
+ let generator = UINotificationFeedbackGenerator()
+ generator.notificationOccurred(type)
+ }
+
+ func impact(style: UIImpactFeedbackGenerator.FeedbackStyle) {
+ let generator = UIImpactFeedbackGenerator(style: style)
+ generator.impactOccurred()
+ }
+}

Projects/Presentation/Sources/EasterEgg/EasterEggViewController.swift

@@ -0,0 +1,25 @@
+import UIKit
+import SwiftUI
+import RxFlow
+import RxCocoa
+import RxSwift
+import DesignSystem
+
+public final class EasterEggViewController: RxFlowViewController {
+ public init() {
+ super.init(nibName: nil, bundle: nil)
+ contentViewController = UIHostingController(rootView: EasterEggView())
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ public override func viewDidLoad() {
+ super.viewDidLoad()
+ }
+
+ public override func viewWillAppear(_ animated: Bool) {
+ self.hideTabbar()
+ }
+}

Projects/Presentation/Sources/EasterEgg/RxFlowViewController.swift

@@ -0,0 +1,27 @@
+import UIKit
+import RxFlow
+import RxCocoa
+
+public class RxFlowViewController: UIViewController, RxFlow.Stepper {
+ public let steps = PublishRelay<Step>()
+ var contentViewController = UIViewController()
+
+ private var didSetupConstraints = false
+
+ open override func viewDidLoad() {
+ super.viewDidLoad()
+
+ addChild(contentViewController)
+ view.addSubview(contentViewController.view)
+ setupConstraints()
+
+ }
+
+ fileprivate func setupConstraints() {
+ contentViewController.view.translatesAutoresizingMaskIntoConstraints = false
+ contentViewController.view.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
+ contentViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
+ contentViewController.view.leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true
+ contentViewController.view.rightAnchor.constraint(equalTo: view.rightAnchor).isActive = true
+ }
+}

Projects/Presentation/Sources/Home/Alarm/AlarmViewController.swift

@@ -48,9 +48,9 @@ public final class AlarmViewController: BaseViewController<AlarmViewModel> {
  }
 
  public override func configureViewController() {
- self.viewWillDisappearPublisher.asObservable()
- .subscribe(onNext: { [weak self] in
- self?.showTabbar()
+ self.viewWillAppearPublisher.asObservable()
+ .subscribe(onNext: {
+ self.hideTabbar()
  })
  .disposed(by: disposeBag)
  }

Projects/Presentation/Sources/Home/HomeViewController.swift

@@ -45,7 +45,7 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
  }
  private var findCompanysCard = CareerNavigationCard()
  private var findWinterRecruitmentsCard = CareerNavigationCard()
-
+ private var navigateToEasterEggDidTap = PublishRelay<Void>()
  public override func addView() {
  self.view.addSubview(scrollView)
  self.scrollView.addSubview(contentView)
@@ -108,12 +108,20 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
  public override func bind() {
  let input = HomeViewModel.Input(
  viewAppear: viewWillAppearPublisher,
+ viewDisappear: viewWillDisappearPublisher,
  navigateToAlarmButtonDidTap: navigateToAlarmButton.rx.tap.asSignal(),
+ navigateToEasterEggDidTap: navigateToEasterEggDidTap,
  navigateToCompanyButtonDidTap: findCompanysCard.rx.tap.asSignal(),
  rejectButtonDidTap: rejectButtonDidTap,
  reApplyButtonDidTap: reApplyButtonDidTap
  )
 
+ titleImageView.rx.tapGesture().when(.recognized).asObservable()
+ .bind { [weak self] _ in
+ self?.navigateToEasterEggDidTap.accept(())
+ }
+ .disposed(by: disposeBag)
+
  let output = viewModel.transform(input)
 
  output.studentInfo
@@ -172,12 +180,6 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
  public override func configureViewController() {
  checkWinterSeason()
 
- navigateToAlarmButton.rx.tap.asObservable()
- .subscribe(onNext: { [weak self] _ in
- self?.hideTabbar()
- })
- .disposed(by: disposeBag)
-
  isWinterSeason.asObservable()
  .bind { [weak self] in
  self?.findCompanysCard.setCard(style: $0 ? .small(type: .findCompanys) : .large)

Projects/Presentation/Sources/Home/HomeViewModel.swift

@@ -12,6 +12,8 @@ public final class HomeViewModel: BaseViewModel, Stepper {
  private let fetchApplicationUseCase: FetchApplicationUseCase
  private let fetchBannerListUseCase: FetchBannerListUseCase
 
+ private var touchedPopcatCount = 0
+
  init(
  fetchStudentInfoUseCase: FetchStudentInfoUseCase,
  fetchApplicationUseCase: FetchApplicationUseCase,
@@ -24,7 +26,9 @@ public final class HomeViewModel: BaseViewModel, Stepper {
 
  public struct Input {
  let viewAppear: PublishRelay<Void>
+ let viewDisappear: PublishRelay<Void>
  let navigateToAlarmButtonDidTap: Signal<Void>
+ let navigateToEasterEggDidTap: PublishRelay<Void>
  let navigateToCompanyButtonDidTap: Signal<Void>
  let rejectButtonDidTap: PublishRelay<ApplicationEntity>
  let reApplyButtonDidTap: PublishRelay<ApplicationEntity>
@@ -51,13 +55,33 @@ public final class HomeViewModel: BaseViewModel, Stepper {
  .bind(to: studentInfo)
  .disposed(by: disposeBag)
 
+ input.viewAppear.asObservable()
+ .bind { _ in
+ self.touchedPopcatCount = 0
+ }
+ .disposed(by: disposeBag)
+
  input.navigateToAlarmButtonDidTap.asObservable()
  .map { _ in
  HomeStep.alarmIsRequired
  }
  .bind(to: steps)
  .disposed(by: disposeBag)
 
+ input.navigateToEasterEggDidTap.asObservable()
+ .do { _ in
+ self.touchedPopcatCount += 1
+ }
+ .filter { _ in
+ self.touchedPopcatCount >= 5
+ }
+ .map { _ in
+ self.touchedPopcatCount = 0
+ return HomeStep.easterEggIsRequired
+ }
+ .bind(to: steps)
+ .disposed(by: disposeBag)
+
  input.navigateToCompanyButtonDidTap.asObservable()
  .map { _ in HomeStep.companyIsRequired }
  .bind(to: steps)

Scripts/.swiftlint.yml

@@ -1,3 +1,4 @@
 disabled_rules:
  - function_body_length
  - function_parameter_count
+ - cyclomatic_complexity