Add bookmarks filter to persistence so that filter reapplies on state restoration

Author: dfsm

App/Data Sources/ThreadListDataSource.swift

@@ -17,6 +17,34 @@ enum BookmarkFilter {
     case textSearch(String)
 }
 
+extension BookmarkFilter {
+    /// Returns nil for `.textSearch` so transient queries are not persisted.
+    var persistenceKey: String? {
+        switch self {
+        case .all: return "all"
+        case .unreadOnly: return "unread"
+        case .readOnly: return "read"
+        case .starCategory(let c): return "star_\(c.rawValue)"
+        case .textSearch: return nil
+        }
+    }
+
+    init(persistenceKey: String) {
+        switch persistenceKey {
+        case "unread": self = .unreadOnly
+        case "read": self = .readOnly
+        case let s where s.hasPrefix("star_"):
+            if let raw = Int16(s.dropFirst("star_".count)),
+               let cat = StarCategory(rawValue: raw) {
+                self = .starCategory(cat)
+            } else {
+                self = .all
+            }
+        default: self = .all
+        }
+    }
+}
+
 private let Log = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ThreadListDataSource")
 
 final class ThreadListDataSource: NSObject {

App/View Controllers/Threads/BookmarksTableViewController.swift

@@ -13,6 +13,10 @@ import UIKit
 
 private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "BookmarksTableViewController")
 
+private enum UserDefaultsKey {
+    static let bookmarksFilter = "BookmarksListFilter"
+}
+
 private class FilterMenuViewController: UIViewController {
     // MARK: - Constants
     private enum Layout {
@@ -586,7 +590,12 @@ final class BookmarksTableViewController: TableViewController {
     @FoilDefaultStorage(Settings.showThreadTags) private var showThreadTags
     @FoilDefaultStorage(Settings.bookmarksSortedUnread) private var sortUnreadToTop
 
-    private var currentFilter: BookmarkFilter = .all
+    private var currentFilter: BookmarkFilter = {
+        if let saved = UserDefaults.standard.string(forKey: UserDefaultsKey.bookmarksFilter) {
+            return BookmarkFilter(persistenceKey: saved)
+        }
+        return .all
+    }()
     private var filterButton: UIBarButtonItem!
     private var filterButtonView: UIButton?
     private var searchButton: UIBarButtonItem!
@@ -823,9 +832,12 @@ final class BookmarksTableViewController: TableViewController {
 
     private func applyFilter(_ filter: BookmarkFilter) {
         currentFilter = filter
+        if let key = filter.persistenceKey {
+            UserDefaults.standard.set(key, forKey: UserDefaultsKey.bookmarksFilter)
+        }
         dataSource = makeDataSource()
         tableView.reloadData()
-        
+
         updateButtonColors()
     }