From b9c262c84e3e23e59785971b235c5b3dbf0d74e8 Mon Sep 17 00:00:00 2001 From: CMK Date: Mon, 31 May 2021 17:07:32 +0800 Subject: [PATCH] chore: suppression project warning --- Mastodon/Coordinator/SceneCoordinator.swift | 4 ---- Mastodon/Diffiable/Section/StatusSection.swift | 3 ++- .../HashtagTimelineViewModel+LoadMiddleState.swift | 2 +- .../Profile/Header/ProfileHeaderViewController.swift | 8 -------- .../PublicTimeline/PublicTimelineViewModel+Diffable.swift | 5 ----- .../Share/View/Container/MosaicImageViewContainer.swift | 6 +++--- .../Scene/Thread/ThreadViewModel+LoadThreadState.swift | 2 +- ...oMediaPreviewViewControllerAnimatedTransitioning.swift | 2 +- Mastodon/Service/EmojiService/Trie.swift | 2 +- 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/Mastodon/Coordinator/SceneCoordinator.swift b/Mastodon/Coordinator/SceneCoordinator.swift index 3768f7d3d..f9da785ad 100644 --- a/Mastodon/Coordinator/SceneCoordinator.swift +++ b/Mastodon/Coordinator/SceneCoordinator.swift @@ -261,10 +261,6 @@ private extension SceneCoordinator { let _viewController = FavoriteViewController() _viewController.viewModel = viewModel viewController = _viewController - case .settings(let viewModel): - let _viewController = SettingsViewController() - _viewController.viewModel = viewModel - viewController = _viewController case .suggestionAccount(let viewModel): let _viewController = SuggestionAccountViewController() _viewController.viewModel = viewModel diff --git a/Mastodon/Diffiable/Section/StatusSection.swift b/Mastodon/Diffiable/Section/StatusSection.swift index d139e061f..ed24db929 100644 --- a/Mastodon/Diffiable/Section/StatusSection.swift +++ b/Mastodon/Diffiable/Section/StatusSection.swift @@ -274,7 +274,8 @@ extension StatusSection { } else { meta.blurhashImagePublisher() .receive(on: DispatchQueue.main) - .sink { [weak cell] image in + .sink { [weak blurhashImageCache] image in + guard let blurhashImageCache = blurhashImageCache else { return } blurhashOverlayImageView.image = image image?.pngData().flatMap { blurhashImageCache.setObject($0 as NSData, forKey: blurhashImageDataKey) diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+LoadMiddleState.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+LoadMiddleState.swift index dcd3f81ac..f458b86a5 100644 --- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+LoadMiddleState.swift +++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+LoadMiddleState.swift @@ -58,7 +58,7 @@ extension HashtagTimelineViewModel.LoadMiddleState { stateMachine.enter(Fail.self) return } - let statusIDs = (viewModel.fetchedResultsController.fetchedResultsController.fetchedObjects ?? []).compactMap { status in + _ = (viewModel.fetchedResultsController.fetchedResultsController.fetchedObjects ?? []).compactMap { status in status.id } diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift index fbc8be624..199903792 100644 --- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift +++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift @@ -212,14 +212,6 @@ extension ProfileHeaderViewController { } .store(in: &disposeBag) - viewModel.isEditing - .receive(on: RunLoop.main) - .sink { [weak self] isEditing in - guard let self = self else { return } - // self.profileHeaderView.fieldCollectionView. - } - .store(in: &disposeBag) - profileHeaderView.editAvatarButton.menu = createAvatarContextMenu() profileHeaderView.editAvatarButton.showsMenuAsPrimaryAction = true } diff --git a/Mastodon/Scene/PublicTimeline/PublicTimelineViewModel+Diffable.swift b/Mastodon/Scene/PublicTimeline/PublicTimelineViewModel+Diffable.swift index 27336dc58..3270302bb 100644 --- a/Mastodon/Scene/PublicTimeline/PublicTimelineViewModel+Diffable.swift +++ b/Mastodon/Scene/PublicTimeline/PublicTimelineViewModel+Diffable.swift @@ -59,11 +59,6 @@ extension PublicTimelineViewModel: NSFetchedResultsControllerDelegate { var items = [Item]() for (_, status) in indexStatusTuples { - let targetStatus = status.reblog ?? status - let isStatusTextSensitive: Bool = { - guard let spoilerText = targetStatus.spoilerText, !spoilerText.isEmpty else { return false } - return true - }() let attribute = oldSnapshotAttributeDict[status.objectID] ?? Item.StatusAttribute() items.append(Item.status(objectID: status.objectID, attribute: attribute)) if statusIDsWhichHasGap.contains(status.id) { diff --git a/Mastodon/Scene/Share/View/Container/MosaicImageViewContainer.swift b/Mastodon/Scene/Share/View/Container/MosaicImageViewContainer.swift index 0dccd5930..081e99af4 100644 --- a/Mastodon/Scene/Share/View/Container/MosaicImageViewContainer.swift +++ b/Mastodon/Scene/Share/View/Container/MosaicImageViewContainer.swift @@ -395,7 +395,7 @@ struct MosaicImageView_Previews: PreviewProvider { let images = self.images.prefix(2) let mosaics = view.setupImageViews(count: images.count, maxHeight: 162) for (i, mosiac) in mosaics.enumerated() { - let (imageView, blurhashOverlayImageView) = mosiac + let (imageView, _) = mosiac imageView.image = images[i] } return view @@ -407,7 +407,7 @@ struct MosaicImageView_Previews: PreviewProvider { let images = self.images.prefix(3) let mosaics = view.setupImageViews(count: images.count, maxHeight: 162) for (i, mosiac) in mosaics.enumerated() { - let (imageView, blurhashOverlayImageView) = mosiac + let (imageView, _) = mosiac imageView.image = images[i] } return view @@ -419,7 +419,7 @@ struct MosaicImageView_Previews: PreviewProvider { let images = self.images.prefix(4) let mosaics = view.setupImageViews(count: images.count, maxHeight: 162) for (i, mosiac) in mosaics.enumerated() { - let (imageView, blurhashOverlayImageView) = mosiac + let (imageView, _) = mosiac imageView.image = images[i] } return view diff --git a/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift b/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift index 5327edc5c..827242644 100644 --- a/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift +++ b/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift @@ -111,7 +111,7 @@ extension ThreadViewModel.LoadThreadState { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let _ = viewModel, let stateMachine = stateMachine else { return } DispatchQueue.main.asyncAfter(deadline: .now() + 3) { stateMachine.enter(Loading.self) } diff --git a/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift b/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift index 3c7b5b8ce..50a518dc7 100644 --- a/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift +++ b/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift @@ -245,7 +245,7 @@ extension MediaHostToMediaPreviewViewControllerAnimatedTransitioning { private func popInteractiveTransition(using transitionContext: UIViewControllerContextTransitioning) { guard let fromVC = transitionContext.viewController(forKey: .from) as? MediaPreviewViewController, - let fromView = transitionContext.view(forKey: .from), + let _ = transitionContext.view(forKey: .from), let mediaPreviewImageViewController = fromVC.pagingViewConttroller.currentViewController as? MediaPreviewImageViewController, let index = fromVC.pagingViewConttroller.currentIndex else { fatalError() diff --git a/Mastodon/Service/EmojiService/Trie.swift b/Mastodon/Service/EmojiService/Trie.swift index 0eb490ae6..3bf9eeaf0 100644 --- a/Mastodon/Service/EmojiService/Trie.swift +++ b/Mastodon/Service/EmojiService/Trie.swift @@ -104,7 +104,7 @@ extension Trie { var values: NSSet { let valueSet = NSMutableSet(set: self.valueSet) - for (key, value) in children { + for (_, value) in children { valueSet.addObjects(from: Array(value.values)) }