From 4fe40f9ed65f6d7063fe46e92c27a794ef96c0e4 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 25 Jul 2020 19:44:50 -0500 Subject: [PATCH] Add replay so that iOS filters work --- Multiplatform/Shared/Timeline/TimelineModel.swift | 1 + Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Multiplatform/Shared/Timeline/TimelineModel.swift b/Multiplatform/Shared/Timeline/TimelineModel.swift index 4f410e14e..a28aabd55 100644 --- a/Multiplatform/Shared/Timeline/TimelineModel.swift +++ b/Multiplatform/Shared/Timeline/TimelineModel.swift @@ -181,6 +181,7 @@ private extension TimelineModel { readFilterAndFeedsPublisher = toggledReadFilterPublisher .merge(with: feedsReadFilterPublisher) + .share(replay: 1) .eraseToAnyPublisher() } diff --git a/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift b/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift index a4ede9729..1d8445220 100644 --- a/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift +++ b/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift @@ -30,6 +30,9 @@ struct TimelineToolbarModifier: ViewModifier { AppAssets.filterInactiveImage.font(.title3) } } + .onReceive(timelineModel.readFilterAndFeedsPublisher!) { (_, filtered) in + isReadFiltered = filtered + } .hidden(isReadFiltered == nil) .help(isReadFiltered ?? false ? "Show Read Articles" : "Filter Read Articles") } @@ -49,9 +52,6 @@ struct TimelineToolbarModifier: ViewModifier { } #endif } - .onReceive(timelineModel.readFilterAndFeedsPublisher!) { (_, filtered) in - isReadFiltered = filtered - } } }