prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move itemToSnooze var into HomeViewModel

Browse source
This commit is contained in:
Satindar Dhillon 2022-04-08 09:21:42 -07:00
parent 4c21bb4c69
commit b8ac528b2a
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift
View file

@ -10,7 +10,6 @@ import Views
struct HomeFeedContainerView: View {
@EnvironmentObject var dataService: DataService
@AppStorage(UserDefaultKey.homeFeedlayoutPreference.rawValue) var prefersListLayout = UIDevice.isIPhone
@State private var itemToSnooze: FeedItem?
@State private var selectedLinkItem: FeedItem?
@ObservedObject var viewModel: HomeFeedViewModel
@ -20,7 +19,6 @@ import Views
HomeFeedView(
prefersListLayout: $prefersListLayout,
selectedLinkItem: $selectedLinkItem,
itemToSnooze: $itemToSnooze,
viewModel: viewModel
)
.refreshable {
@ -54,7 +52,6 @@ import Views
HomeFeedView(
prefersListLayout: $prefersListLayout,
selectedLinkItem: $selectedLinkItem,
itemToSnooze: $itemToSnooze,
viewModel: viewModel
)
.sheet(item: $viewModel.itemUnderLabelEdit) { item in
@ -90,7 +87,7 @@ import Views
}
}
.formSheet(isPresented: $viewModel.snoozePresented) {
SnoozeView(snoozePresented: $viewModel.snoozePresented, itemToSnooze: $itemToSnooze) {
SnoozeView(snoozePresented: $viewModel.snoozePresented, itemToSnooze: $viewModel.itemToSnooze) {
viewModel.snoozeUntil(
dataService: dataService,
linkId: $0.feedItemId,
@ -115,7 +112,6 @@ import Views
@Binding var prefersListLayout: Bool
@Binding var selectedLinkItem: FeedItem?
@Binding var itemToSnooze: FeedItem?
@ObservedObject var viewModel: HomeFeedViewModel
@ -124,13 +120,11 @@ import Views
HomeFeedListView(
prefersListLayout: $prefersListLayout,
selectedLinkItem: $selectedLinkItem,
itemToSnooze: $itemToSnooze,
viewModel: viewModel
)
} else {
HomeFeedGridView(
selectedLinkItem: $selectedLinkItem,
itemToSnooze: $itemToSnooze,
viewModel: viewModel
)
.toolbar {
@ -173,7 +167,6 @@ import Views
@EnvironmentObject var dataService: DataService
@Binding var prefersListLayout: Bool
@Binding var selectedLinkItem: FeedItem?
@Binding var itemToSnooze: FeedItem?
@State private var itemToRemove: FeedItem?
@State private var confirmationShown = false
@ -209,7 +202,7 @@ import Views
)
if FeatureFlag.enableSnooze {
Button {
itemToSnooze = item
viewModel.itemToSnooze = item
viewModel.snoozePresented = true
} label: {
Label { Text("Snooze") } icon: { Image.moon }
@ -262,7 +255,7 @@ import Views
.swipeActions(edge: .leading, allowsFullSwipe: true) {
if FeatureFlag.enableSnooze {
Button {
itemToSnooze = item
viewModel.itemToSnooze = item
viewModel.snoozePresented = true
} label: {
Label { Text("Snooze") } icon: { Image.moon }
@ -301,7 +294,6 @@ import Views
struct HomeFeedGridView: View {
@EnvironmentObject var dataService: DataService
@Binding var selectedLinkItem: FeedItem?
@Binding var itemToSnooze: FeedItem?
@State private var itemToRemove: FeedItem?
@State private var confirmationShown = false

3
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift
View file

@ -12,7 +12,6 @@ import Views
@State private var selectedLinkItem: FeedItem?
@State private var itemToRemove: FeedItem?
@State private var confirmationShown = false
@State private var itemToSnooze: FeedItem?
@ObservedObject var viewModel: HomeFeedViewModel
@ -52,7 +51,7 @@ import Views
)
if FeatureFlag.enableSnooze {
Button {
itemToSnooze = item
viewModel.itemToSnooze = item
viewModel.snoozePresented = true
} label: {
Label { Text("Snooze") } icon: { Image.moon }

1
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift
View file

@ -17,6 +17,7 @@ final class HomeFeedViewModel: ObservableObject {
@Published var itemUnderLabelEdit: FeedItem?
@Published var searchQuery = ""
@Published var snoozePresented = false
@Published var itemToSnooze: FeedItem?
var cursor: String?
var sendProgressUpdates = false