From e6d1a0840b42ed545410b1b55d945df4f1eaae74 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Mon, 9 May 2022 11:48:03 -0700 Subject: [PATCH] set loading bar on zstack over labels bar --- .../App/Views/Home/HomeFeedViewIOS.swift | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 043ff1e9d..a86dcce2f 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -136,26 +136,28 @@ private let enableGrid = UIDevice.isIPad || FeatureFlag.enableGridCardsOnPhone var body: some View { VStack(spacing: 0) { - ScrollView(.horizontal, showsIndicators: false) { - HStack { - TextChipButton.makeAddLabelButton { - showLabelsSheet = true + ZStack(alignment: .bottom) { + ScrollView(.horizontal, showsIndicators: false) { + HStack { + TextChipButton.makeAddLabelButton { + showLabelsSheet = true + } + ForEach(viewModel.selectedLabels, id: \.self) { label in + TextChipButton.makeRemovableLabelButton(feedItemLabel: label) { + viewModel.selectedLabels.removeAll { $0.id == label.id } + } + } + Spacer() } - ForEach(viewModel.selectedLabels, id: \.self) { label in - TextChipButton.makeRemovableLabelButton(feedItemLabel: label) { - viewModel.selectedLabels.removeAll { $0.id == label.id } + .padding(.horizontal) + .sheet(isPresented: $showLabelsSheet) { + ApplyLabelsView(mode: .list(viewModel.selectedLabels)) { + viewModel.selectedLabels = $0 } } - Spacer() - } - .padding(.horizontal) - .sheet(isPresented: $showLabelsSheet) { - ApplyLabelsView(mode: .list(viewModel.selectedLabels)) { - viewModel.selectedLabels = $0 - } } + ShimmeringLoader() } - ShimmeringLoader() if prefersListLayout || !enableGrid { HomeFeedListView(prefersListLayout: $prefersListLayout, viewModel: viewModel) } else {