diff --git a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift index 0920c50..7145a0e 100644 --- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift +++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift @@ -62,30 +62,5 @@ struct AsyncStoreImage: View { } } -struct SafeAreaTopPreferenceKey: PreferenceKey { - static let defaultValue: CGFloat = 0 - static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) { - let next = nextValue() - if next > 0 { - value = next - } - } -} -struct SafeAreaTopReader: View { - @Binding var safeAreaTop: CGFloat - - var body: some View { - GeometryReader { geometry in - Color.clear - .preference(key: SafeAreaTopPreferenceKey.self, value: geometry.safeAreaInsets.top) - } - .frame(height: 0) - .onPreferenceChange(SafeAreaTopPreferenceKey.self) { value in - if value > 0 && safeAreaTop != value { - safeAreaTop = value - } - } - } -} diff --git a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift index 4fc42f4..f9e5e81 100644 --- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift +++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift @@ -35,7 +35,13 @@ struct StoreDetailView: View { @State var categoryHeaderOffsets: [String: CGFloat] = [:] @State var isProgrammaticCategoryScroll = false @State var scrollOffset: CGFloat = 0 - @State var safeAreaTop: CGFloat = 0 + var safeAreaTop: CGFloat { + #if canImport(UIKit) + return UIDevice.appSafeAreaTop + #else + return 0.0 + #endif + } @State var isFavoriteRequestInFlight = false let cardTopInset: CGFloat = 180 @@ -49,8 +55,6 @@ struct StoreDetailView: View { let stickyProgress = categoryTabsStickyProgress(safeTop: safeAreaTop) ZStack(alignment: .top) { - SafeAreaTopReader(safeAreaTop: $safeAreaTop) - AppColors.backgroundLight.ignoresSafeArea() ScrollView(showsIndicators: false) {