mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
replace isCompact with prefersListLayout
This commit is contained in:
parent
da8678a207
commit
05a7eca567
2 changed files with 7 additions and 9 deletions
|
|
@ -8,8 +8,8 @@ import Views
|
|||
|
||||
#if os(iOS)
|
||||
struct HomeFeedContainerView: View {
|
||||
let isCompact: Bool
|
||||
@EnvironmentObject var dataService: DataService
|
||||
@State private var prefersListLayout = UIDevice.isIPhone
|
||||
@State private var searchQuery = ""
|
||||
@State private var snoozePresented = false
|
||||
@State private var itemToSnooze: FeedItem?
|
||||
|
|
@ -20,7 +20,7 @@ import Views
|
|||
Group {
|
||||
if #available(iOS 15.0, *) {
|
||||
HomeFeedView(
|
||||
isCompact: isCompact,
|
||||
prefersListLayout: $prefersListLayout,
|
||||
searchQuery: $searchQuery,
|
||||
selectedLinkItem: $selectedLinkItem,
|
||||
snoozePresented: $snoozePresented,
|
||||
|
|
@ -51,7 +51,7 @@ import Views
|
|||
}
|
||||
} else {
|
||||
HomeFeedView(
|
||||
isCompact: isCompact,
|
||||
prefersListLayout: $prefersListLayout,
|
||||
searchQuery: $searchQuery,
|
||||
selectedLinkItem: $selectedLinkItem,
|
||||
snoozePresented: $snoozePresented,
|
||||
|
|
@ -102,7 +102,7 @@ import Views
|
|||
struct HomeFeedView: View {
|
||||
@EnvironmentObject var dataService: DataService
|
||||
|
||||
let isCompact: Bool
|
||||
@Binding var prefersListLayout: Bool
|
||||
@Binding var searchQuery: String
|
||||
@Binding var selectedLinkItem: FeedItem?
|
||||
@Binding var snoozePresented: Bool
|
||||
|
|
@ -111,7 +111,7 @@ import Views
|
|||
@ObservedObject var viewModel: HomeFeedViewModel
|
||||
|
||||
var body: some View {
|
||||
if isCompact {
|
||||
if prefersListLayout {
|
||||
HomeFeedListView(
|
||||
searchQuery: $searchQuery,
|
||||
selectedLinkItem: $selectedLinkItem,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ struct HomeView: View {
|
|||
#if os(iOS)
|
||||
if UIDevice.isIPhone {
|
||||
NavigationView {
|
||||
HomeFeedContainerView(isCompact: true, viewModel: viewModel)
|
||||
HomeFeedContainerView(viewModel: viewModel)
|
||||
.toolbar {
|
||||
ToolbarItem {
|
||||
NavigationLink(
|
||||
|
|
@ -24,9 +24,7 @@ struct HomeView: View {
|
|||
}
|
||||
.accentColor(.appGrayTextContrast)
|
||||
} else {
|
||||
GeometryReader { _ in
|
||||
HomeFeedContainerView(isCompact: UIDevice.isIPhone, viewModel: viewModel)
|
||||
}
|
||||
HomeFeedContainerView(viewModel: viewModel)
|
||||
}
|
||||
#elseif os(macOS)
|
||||
HomeFeedView(viewModel: viewModel)
|
||||
|
|
|
|||
Loading…
Reference in a new issue