From 05a7eca567fd2dd24aef2413101d26a1d91be339 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Thu, 10 Mar 2022 20:33:57 -0800 Subject: [PATCH] replace isCompact with prefersListLayout --- .../Sources/App/Views/Home/HomeFeedViewIOS.swift | 10 +++++----- .../OmnivoreKit/Sources/App/Views/Home/HomeView.swift | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 04a07ba01..6e4734ccf 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -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, diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeView.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeView.swift index 2be7ba9a5..5c016d814 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeView.swift @@ -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)