Tusker/API/ReblogService.swift

@@ -17,6 +17,7 @@ class ReblogService {
     private let status: StatusMO
     
     var hapticFeedback = true
+    var visibility: Visibility? = nil
     var requireConfirmation = Preferences.shared.confirmBeforeReblog
     
     init(status: StatusMO, mastodonController: MastodonController, presenter: any TuskerNavigationDelegate) {
@@ -30,30 +31,26 @@ class ReblogService {
            requireConfirmation {
             presentConfirmationAlert()
         } else {
-            await doToggleReblog(visibility: nil)
+            await doToggleReblog()
         }
     }
     
     private func presentConfirmationAlert() {
         let image: UIImage?
-        let reblogVisibilityActions: [CustomAlertController.MenuAction]
+        let reblogVisibilityActions: [CustomAlertController.MenuAction]?
-        let maximumVisibility = status.visibility
         if mastodonController.instanceFeatures.reblogVisibility {
-            image = UIImage(systemName: maximumVisibility.unfilledImageName)
+            image = UIImage(systemName: Visibility.public.unfilledImageName)
-            reblogVisibilityActions = [Visibility.unlisted, .private].compactMap { visibility in
+            reblogVisibilityActions = [Visibility.unlisted, .private].map { visibility in
-                guard visibility < maximumVisibility else {
+                CustomAlertController.MenuAction(title: "Reblog as \(visibility.displayName)", subtitle: visibility.subtitle, image: UIImage(systemName: visibility.unfilledImageName)) {
-                    return nil
-                }
-                return CustomAlertController.MenuAction(title: "Reblog as \(visibility.displayName)", subtitle: visibility.subtitle, image: UIImage(systemName: visibility.unfilledImageName)) {
                     // deliberately retain a strong reference to self
                     Task {
-                        await self.doToggleReblog(visibility: visibility)
+                        await self.doToggleReblog()
                     }
                 }
             }
         } else {
             image = nil
-            reblogVisibilityActions = []
+            reblogVisibilityActions = nil
         }
         
         let preview = ConfirmReblogStatusPreviewView(status: status)
@@ -62,11 +59,11 @@ class ReblogService {
             CustomAlertController.Action(title: "Reblog", image: image, style: .default, handler: {
                 // deliberately retain a strong reference to self
                 Task {
-                    await self.doToggleReblog(visibility: nil)
+                    await self.doToggleReblog()
                 }
             })
         ])
-        if !reblogVisibilityActions.isEmpty {
+        if let reblogVisibilityActions {
             var menuAction = CustomAlertController.Action(title: nil, image: UIImage(systemName: "chevron.down"), style: .menu(reblogVisibilityActions), handler: nil)
             menuAction.isSecondaryMenu = true
             config.actions.append(menuAction)
@@ -75,7 +72,7 @@ class ReblogService {
         presenter.present(alert, animated: true)
     }
     
-    private func doToggleReblog(visibility: Visibility?) async {
+    private func doToggleReblog() async {
         let oldValue = status.reblogged
         status.reblogged.toggle()
         mastodonController.persistentContainer.statusSubject.send(status.id)

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -518,7 +518,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
             if let centerStatusID,
                let index = statusIDs.firstIndex(of: centerStatusID) {
                 self.scrollToItem(item: items[index])
-                stateRestorationLogger.info("TimelineViewController: restored statuses with center ID \(centerStatusID)")
+                stateRestorationLogger.fault("TimelineViewController: restored statuses with center ID \(centerStatusID)")
             } else {
                 stateRestorationLogger.fault("TimelineViewController: restored statuses, but couldn't find center ID")
             }

Tusker/Views/CachedImageView.swift

@@ -46,13 +46,6 @@ class CachedImageView: UIImageView {
         }
     }
     
-    func showOnlyBlurHash(_ blurhash: String, for url: URL) {
-        if url != self.url {
-            self.url = url
-            updateBlurhash(blurhash, for: url)
-        }
-    }
-    
     @objc private func preferencesChanged() {
         if isGrayscale != Preferences.shared.grayscaleImages {
             updateImage()

Tusker/Views/Profile Header/ProfileHeaderButton.swift

@@ -19,7 +19,6 @@ class ProfileHeaderButton: UIButton {
         var backgroundConfig = UIBackgroundConfiguration.clear()
         backgroundConfig.visualEffect = UIBlurEffect(style: .systemThickMaterial)
         config.background = backgroundConfig
-        config.imagePadding = 4
         self.configuration = config
     }
     

Tusker/Views/ScrollingSegmentedControl.swift

@@ -75,13 +75,6 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        if traitCollection.preferredContentSizeCategory != previousTraitCollection?.preferredContentSizeCategory {
-            invalidateIntrinsicContentSize()
-        }
-    }
-    
     private func createOptionViews() {
         optionsStack.arrangedSubviews.forEach { $0.removeFromSuperview() }
         

Tusker/Views/Status/StatusCardView.swift

@@ -30,7 +30,7 @@ class StatusCardView: UIView {
     private var titleLabel: UILabel!
     private var descriptionLabel: UILabel!
     private var domainLabel: UILabel!
-    private var imageView: StatusCardImageView!
+    private var imageView: CachedImageView!
     private var placeholderImageView: UIImageView!
     private var leadingSpacer: UIView!
     private var trailingSpacer: UIView!
@@ -80,7 +80,7 @@ class StatusCardView: UIView {
         vStack.alignment = .leading
         vStack.spacing = 0
         
-        imageView = StatusCardImageView(cache: .attachments)
+        imageView = CachedImageView(cache: .attachments)
         imageView.contentMode = .scaleAspectFill
         imageView.clipsToBounds = true
         
@@ -167,18 +167,7 @@ class StatusCardView: UIView {
         }
         
         if let image = card.image {
-            if status.sensitive {
+            imageView.update(for: URL(image), blurhash: card.blurhash)
-                if let blurhash = card.blurhash {
-                    imageView.blurImage = false
-                    imageView.showOnlyBlurHash(blurhash, for: URL(image)!)
-                } else {
-                    // if we don't have a blurhash, load the image and show it behind a blur
-                    imageView.blurImage = true
-                    imageView.update(for: URL(image), blurhash: nil)
-                }
-            } else {
-                imageView.update(for: URL(image), blurhash: card.blurhash)
-            }
             imageView.isHidden = false
             leadingSpacer.isHidden = true
         } else {
@@ -268,25 +257,3 @@ extension StatusCardView: UIContextMenuInteractionDelegate {
         }
     }
 }
-
-private class StatusCardImageView: CachedImageView {
-    @Lazy private var blurView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
-    var blurImage = false {
-        didSet {
-            if blurImage {
-                if !_blurView.isInitialized {
-                    blurView.translatesAutoresizingMaskIntoConstraints = false
-                    addSubview(blurView)
-                    NSLayoutConstraint.activate([
-                        blurView.leadingAnchor.constraint(equalTo: leadingAnchor),
-                        blurView.trailingAnchor.constraint(equalTo: trailingAnchor),
-                        blurView.topAnchor.constraint(equalTo: topAnchor),
-                        blurView.bottomAnchor.constraint(equalTo: bottomAnchor),
-                    ])
-                }
-            } else {
-                _blurView.valueIfInitialized?.removeFromSuperview()
-            }
-        }
-    }
-}