diff --git a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift index 338db5fd..159c4bf7 100644 --- a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift +++ b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift @@ -210,6 +210,10 @@ extension MainViewController { let cell = collectionView.dequeueReusableCell(withReuseIdentifier: MainCollectionViewCell.identifier, for: indexPath) as! MainCollectionViewCell cell.setUpCell(list) + if list.userId == self.viewModel?.currentUserId { + self.collectionView.selectItem(at: IndexPath(item: indexPath.item, section: 0), animated: false, scrollPosition: .init()) + } + return cell }) diff --git a/Weekand/Weekand/Presentation/MainScene/Main/ViewModel/MainViewModel.swift b/Weekand/Weekand/Presentation/MainScene/Main/ViewModel/MainViewModel.swift index 218a388d..08695cc7 100644 --- a/Weekand/Weekand/Presentation/MainScene/Main/ViewModel/MainViewModel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Main/ViewModel/MainViewModel.swift @@ -123,7 +123,7 @@ extension MainViewModel { // Navigation Items input.didFoldBarButton.subscribe(onNext: { _ in - PublishRelay.just(Void()).bind(to: self.foldCollection).disposed(by: self.disposeBag) + self.foldCollection.accept(()) }).disposed(by: disposeBag) input.didAlarmBarButton.subscribe(onNext: { [weak self] _ in @@ -150,17 +150,15 @@ extension MainViewModel { }).disposed(by: disposeBag) input.didTapTodayButton.subscribe(onNext: { _ in - BehaviorRelay.just(Date()).bind(to: self.calendarDate).disposed(by: self.disposeBag) + self.calendarDate.accept(Date()) }).disposed(by: disposeBag) input.didTapNextWeekButton.subscribe(onNext: { _ in - PublishRelay.just(true).bind(to: self.scrollWeek).disposed(by: self.disposeBag) - + self.scrollWeek.accept(true) }).disposed(by: disposeBag) input.didTapPrevWeekButton.subscribe(onNext: { _ in - PublishRelay.just(false).bind(to: self.scrollWeek).disposed(by: self.disposeBag) - + self.scrollWeek.accept(false) }).disposed(by: disposeBag) input.didTapFloatingButton.subscribe(onNext: { _ in