From 0cc08a0aae72b78cb3879e4cff33f73004333df8 Mon Sep 17 00:00:00 2001
From: ntryshkina <ntryshkina@shakuro.com>
Date: Fri, 15 Mar 2024 17:41:32 +0300
Subject: [PATCH 1/2] II-29-[pull to resresh list]

---
 .../PullToRefreshListView.swift               | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift b/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
index 2e4d3e8..6e1c6ec 100644
--- a/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
+++ b/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
@@ -16,13 +16,15 @@ public enum PullToRefreshListViewConstant { // TODO: implement
     public static let offset: CGFloat = 0
 }
 
-public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: View, ContentViewType: View>: View {
+public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: View, ContentViewType: View, Style: ListStyle>: View {
 
     private let options: PullToRefreshListViewOptions
     private let refreshViewHeight: CGFloat
     private let showsIndicators: Bool
     private let isPullToRefreshEnabled: Bool
     private let isRefreshing: Binding<Bool>
+    private let listStyle: Style
+    private let listTopPadding: CGFloat
     private let onRefresh: () -> Void
     private let pullingViewBuilder: (_ progress: CGFloat) -> PullingViewType
     private let refreshingViewBuilder: (_ isTriggered: Bool) -> RefreshingViewType
@@ -31,6 +33,7 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
     @StateObject private var scrollViewState: ScrollViewState = ScrollViewState()
 
     @State private var safeAreaTopInset: CGFloat = 0
+    @State private var offsetValue: CGFloat = 0
 
     // MARK: - Initialization
 
@@ -39,6 +42,8 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                 showsIndicators: Bool = true,
                 isPullToRefreshEnabled: Bool = true,
                 isRefreshing: Binding<Bool>,
+                listStyle: Style = .automatic,
+                listTopPadding: CGFloat = 0,
                 onRefresh: @escaping () -> Void,
                 @ViewBuilder pullingViewBuilder: @escaping (_ progress: CGFloat) -> PullingViewType,
                 @ViewBuilder refreshingViewBuilder: @escaping (_ isTriggered: Bool) -> RefreshingViewType,
@@ -48,6 +53,8 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
         self.showsIndicators = showsIndicators
         self.isPullToRefreshEnabled = isPullToRefreshEnabled
         self.isRefreshing = isRefreshing
+        self.listStyle = listStyle
+        self.listTopPadding = listTopPadding
         self.onRefresh = onRefresh
         self.pullingViewBuilder = pullingViewBuilder
         self.refreshingViewBuilder = refreshingViewBuilder
@@ -80,7 +87,7 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                     // view to show pull to refresh animations
                     // List inset is calculated as safeAreaTopInset + this view height
                     Color.clear
-                        .frame(height: refreshViewHeight * scrollViewState.progress)
+                        .frame(height: offsetValue)
                     List(content: {
                         // view for offset calculation
                         Color.clear
@@ -88,9 +95,11 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                             .frame(height: 0)
                             .listRowInsets(EdgeInsets())
                             .offset(coordinateSpace: PullToRefreshListViewConstant.coordinateSpace, offset: { (offset) in
-                                let offsetConclusive = offset - safeAreaTopInset
+                                let offsetConclusive = offset - safeAreaTopInset - listTopPadding
+                                let offsetOld = scrollViewState.contentOffset
                                 scrollViewState.contentOffset = offsetConclusive
                                 updateProgressIfNeeded()
+                                updateOffsetValueIfNeeded(oldContentOffset: offsetOld)
                                 stopIfNeeded()
                                 resetReadyToTriggerIfNeeded()
                                 startIfNeeded()
@@ -100,7 +109,9 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                     })
                     .environment(\.defaultMinListRowHeight, 0)
                     .coordinateSpace(name: PullToRefreshListViewConstant.coordinateSpace)
-                    .listStyle(PlainListStyle())
+                    .listStyle(listStyle)
+                    .scrollContentBackground(.hidden)
+                    .contentMargins(.vertical, listTopPadding)
                 })
                 .animation(scrollViewState.isDragging ? nil : defaultAnimation, value: scrollViewState.progress)
             })
@@ -125,6 +136,9 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                 scrollViewState.isRefreshing = false
                 stopIfNeeded()
                 resetReadyToTriggerIfNeeded()
+                withAnimation {
+                    offsetValue = 0
+                }
             }
         })
         .onChange(of: scrollViewState.isDragging, perform: { (_) in
@@ -162,6 +176,19 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
         }
     }
 
+    private func updateOffsetValueIfNeeded(oldContentOffset: CGFloat) {
+        // when user touched up in triggered state and List is moving up,
+        // we wait for the moment when top offset of List becomes equal to refreshViewHeight
+        // then set offsetValue to refreshViewHeight to make space above the List
+        if !scrollViewState.isDragging,
+           scrollViewState.isTriggered,
+           scrollViewState.contentOffset <= refreshViewHeight,
+           oldContentOffset > scrollViewState.contentOffset,
+           offsetValue == 0 {
+            offsetValue = refreshViewHeight
+        }
+    }
+
     private func resetReadyToTriggerIfNeeded() {
         if scrollViewState.contentOffset <= 1 &&
             !scrollViewState.isReadyToTrigger &&

From 150d8d19ee42edd29917d2cde647daaa360af15a Mon Sep 17 00:00:00 2001
From: ntryshkina <ntryshkina@shakuro.com>
Date: Fri, 15 Mar 2024 21:59:43 +0300
Subject: [PATCH 2/2] II-29-[List modifiers compatibility with ios 15]

---
 .../PullToRefreshListView.swift               |  4 +--
 .../View+ListBackport.swift                   | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 Sources/PullToRefreshSwiftUI/View+ListBackport.swift

diff --git a/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift b/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
index 6e1c6ec..c894c21 100644
--- a/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
+++ b/Sources/PullToRefreshSwiftUI/PullToRefreshListView.swift
@@ -110,8 +110,8 @@ public struct PullToRefreshListView<PullingViewType: View, RefreshingViewType: V
                     .environment(\.defaultMinListRowHeight, 0)
                     .coordinateSpace(name: PullToRefreshListViewConstant.coordinateSpace)
                     .listStyle(listStyle)
-                    .scrollContentBackground(.hidden)
-                    .contentMargins(.vertical, listTopPadding)
+                    .listBackport.scrollContentBackground(.hidden)
+                    .listBackport.contentMargins(.vertical, listTopPadding)
                 })
                 .animation(scrollViewState.isDragging ? nil : defaultAnimation, value: scrollViewState.progress)
             })
diff --git a/Sources/PullToRefreshSwiftUI/View+ListBackport.swift b/Sources/PullToRefreshSwiftUI/View+ListBackport.swift
new file mode 100644
index 0000000..e6e7a70
--- /dev/null
+++ b/Sources/PullToRefreshSwiftUI/View+ListBackport.swift
@@ -0,0 +1,36 @@
+import Foundation
+import SwiftUI
+
+struct ListBackport<Content> {
+
+   let content: Content
+
+    init(_ content: Content) {
+        self.content = content
+    }
+
+}
+
+extension View {
+    var listBackport: ListBackport<Self> { ListBackport(self) }
+}
+
+extension ListBackport where Content: View {
+
+    @ViewBuilder func scrollContentBackground(_ visibility: Visibility) -> some View {
+        if #available(iOS 16, *) {
+            content.scrollContentBackground(visibility)
+        } else {
+            content
+        }
+    }
+
+    @ViewBuilder func contentMargins(_ edges: Edge.Set = .all, _ length: CGFloat?) -> some View {
+        if #available(iOS 17, *) {
+            content.contentMargins(edges, length)
+        } else {
+            content
+        }
+    }
+
+}