-
Notifications
You must be signed in to change notification settings - Fork 0
업데이트 이후 피드백 반영 #283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
업데이트 이후 피드백 반영 #283
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -339,7 +339,7 @@ extension BookmarkListViewController: UICollectionViewDelegate, UICollectionView | |
|
|
||
| onBookmarkTapped: { [weak self] in | ||
| guard let self else { return } | ||
| guard state.isLogin else { | ||
| guard self.reactor?.currentState.isLogin == true else { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changing |
||
| self.reactor?.action.onNext(.showLogin) | ||
| return | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,9 +22,9 @@ class DictionaryDetailBaseViewController: BaseViewController { | |
| /// 각 탭에 해당하는 콘텐츠 뷰들을 담는 배열 | ||
| public var contentViews: [UIView] = [] { | ||
| didSet { | ||
| if let index = currentTabIndex { | ||
| mainView.setTabView(index: index, contentViews: contentViews) | ||
| } | ||
| let index = currentTabIndex ?? 0 | ||
| guard index < contentViews.count else { return } | ||
| mainView.setTabView(index: index, contentViews: contentViews) | ||
|
Comment on lines
+25
to
+27
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| } | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -372,7 +372,7 @@ extension DictionaryListViewController: UICollectionViewDelegate, UICollectionVi | |
| isMap: item.type == .map, | ||
| onBookmarkTapped: { [weak self] in | ||
| guard let self else { return } | ||
| guard state.isLogin else { | ||
| guard self.reactor?.currentState.isLogin == true else { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar to |
||
| self.reactor?.action.onNext(.showLogin) | ||
| return | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -242,11 +242,19 @@ extension DictionarySearchViewController: UICollectionViewDelegate, UICollection | |
| ) -> UICollectionReusableView { | ||
| switch indexPath.section { | ||
| case 0: | ||
| let view = collectionView.dequeueReusableSupplementaryView( | ||
| guard let view = collectionView.dequeueReusableSupplementaryView( | ||
| ofKind: kind, | ||
| withReuseIdentifier: RecentSearchHeaderView.identifier, | ||
| for: indexPath | ||
| ) as! RecentSearchHeaderView | ||
| ) as? RecentSearchHeaderView else { return UICollectionViewCell() } | ||
pinocchio22 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| guard let reactor = reactor else { return UICollectionViewCell() } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| view.deleteButton.rx.tap | ||
| .map { Reactor.Action.deleteAllButtonTapped } | ||
| .bind(to: reactor.action) | ||
| .disposed(by: disposeBag) | ||
|
|
||
| return view | ||
|
|
||
| case 2: | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.