[trello.com/c/sI4VXuJa] update snackbar

autoDismiss 4sec -> 3 sec

Author: vovameister

PopupKit/Sources/PopupKit/Implementation/Services/AutoDismissManager.swift

@@ -49,4 +49,4 @@ private extension AutoDismissManager {
     }
 }
 
-private let autoDismissTimeInterval: TimeInterval = 4
+private let autoDismissTimeInterval: TimeInterval = 3

PopupKit/Sources/PopupKit/Implementation/Views/NotificationPresenterView.swift

@@ -13,95 +13,103 @@ struct NotificationPresenterView: View {
         case vertical
         case horizontal
     }
-    
-    @State private var verticalDragTranslation: CGFloat = .zero
-    @State private var horizontalDragTranslation: CGFloat = .zero
-    @State private var minTranslationYForDismiss: CGFloat = .infinity
-    @State private var minTranslationXForDismiss: CGFloat = .infinity
     @State private var isTextLimited: Bool = true
     @State private var dismissEdge: Edge = .top
-    @State private var dragDirection: DragDirection? 
+    @State private var dragDirection: DragDirection?
+    @State private var dynamicHeight: CGFloat = 0
+    @State private var notificationHeight: CGFloat = 0
+    @State private var offset: CGSize = .zero
 
     let model: NotificationModel
     let safeAreaInsets: EdgeInsets
     let dismissAction: () -> Void
 
     var body: some View {
-        NotificationView(
-            isTextLimited: $isTextLimited,
-            model: model
-        )
-        .padding([.leading, .trailing], 10)
-        .padding([.top, .bottom], 10)
+        VStack {
+            NotificationView(
+                isTextLimited: $isTextLimited,
+                model: model
+            )
+            .padding(10)
+            .padding([.top, .bottom], 10)
+            .background(
+                GeometryReader { geometry in
+                    Color.clear
+                        .onAppear {
+                            notificationHeight = geometry.size.height
+                            print("onappier")
+                        }
+                        .onChange(of: geometry.size.height) { newValue in
+                            notificationHeight = newValue
+                        }
+                }
+            )
+        }
+        .frame(minHeight: notificationHeight + dynamicHeight)
         .overlay(
             RoundedRectangle(cornerRadius: 10)
                 .stroke(Color.init(uiColor:.adamant.chatInputBarBorderColor), lineWidth: 1)
         )
         .background(GeometryReader(content: processGeometry))
-        .expanded(axes: .horizontal)
-        .offset(y: verticalDragTranslation < .zero ? verticalDragTranslation : .zero)
-        .offset(x: horizontalDragTranslation < .zero ? horizontalDragTranslation : .zero)
-        .gesture(dragGesture)
         .onTapGesture(perform: onTap)
+        .gesture(dragGesture)
         .cornerRadius(10)
         .padding(.horizontal, 15)
         .padding(.top, safeAreaInsets.top)
+        .offset(offset)
+        .animation(.interactiveSpring(), value: offset)
         .transition(.move(edge: dismissEdge))
     }
 }
-
+private extension NotificationPresenterView {
+    func processGeometry(_ geometry: GeometryProxy) -> some View {
+        return Color.init(uiColor: .adamant.swipeBlockColor)
+            .cornerRadius(10)
+    }
+    func onTap() {
+        model.tapHandler?.value()
+        dismissAction()
+        dismissEdge = .top
+    }
+}
 private extension NotificationPresenterView {
     var dragGesture: some Gesture {
         DragGesture()
-            .onChanged {
-                if dragDirection == nil {
-                    dragDirection = abs($0.translation.height) > abs($0.translation.width) ? .vertical : .horizontal
+            .onChanged { value in
+                if dragDirection == nil || (abs(value.translation.width) <= 5 && abs(value.translation.height) <= 5) {
+                    detectDragDirection(value: value)
                 }
-                switch dragDirection {
-                case .vertical:
-                    verticalDragTranslation = $0.translation.height
-                case .horizontal:
-                    horizontalDragTranslation = $0.translation.width
-                case .none:
-                    break
+                if dragDirection == .vertical && isTextLimited {
+                    dynamicHeight = max(0, min(value.translation.height, 30))
+                }
+                if dragDirection == .vertical, value.translation.height < 0 {
+                    offset = CGSize(width: 0, height: value.translation.height)
+                } else if dragDirection == .horizontal, value.translation.width < 0 {
+                    offset = CGSize(width: value.translation.width, height: 0)
                 }
             }
-            .onEnded {
-                if $0.velocity.height < -100 || -$0.translation.height > minTranslationYForDismiss {
-                        dismissEdge = .top
-                    Task { dismissAction() }
-                } else if $0.velocity.width < -100 || $0.translation.width > minTranslationXForDismiss {
-                        dismissEdge = .leading
-                    Task { dismissAction() }
-                } else if $0.velocity.height > -100 || -$0.translation.height < minTranslationYForDismiss {
-                    withAnimation {
-                        horizontalDragTranslation = .zero
+            .onEnded { value in
+                if dragDirection == .vertical {
+                    if value.translation.height > 25 {
+                        model.cancelAutoDismiss?.value()
                         isTextLimited = false
+                    } else if value.translation.height < -30 {
+                        Task { dismissAction() }
                     }
-                    model.cancelAutoDismiss?.value()
-                } else {
-                    withAnimation {
-                        verticalDragTranslation = .zero
-                        horizontalDragTranslation = .zero
+                } else if dragDirection == .horizontal {
+                    if value.translation.width < -100 {
+                        dismissEdge = .leading
+                        Task { dismissAction() }
                     }
                 }
                 dragDirection = nil
+                dynamicHeight = 0
+                offset = .zero
             }
     }
 
-    func processGeometry(_ geometry: GeometryProxy) -> some View {
-        DispatchQueue.main.async {
-            minTranslationYForDismiss = geometry.size.height / 2
-            minTranslationXForDismiss = geometry.size.width / 2
-        }
-
-        return Color.init(uiColor: .adamant.swipeBlockColor)
-            .cornerRadius(10)
-    }
-    
-    func onTap() {
-        model.tapHandler?.value()
-        dismissAction()
-        dismissEdge = .top
+    func detectDragDirection(value: DragGesture.Value) {
+        let horizontalDistance = abs(value.translation.width), verticalDistance = abs(value.translation.height)
+        dragDirection = verticalDistance > horizontalDistance ? .vertical : .horizontal
     }
 }

PopupKit/Sources/PopupKit/Implementation/Views/NotificationView.swift

@@ -1,6 +1,6 @@
 //
 //  NotificationView.swift
-//  
+//
 //
 //  Created by Andrey Golubenko on 06.12.2022.
 //
@@ -21,7 +21,6 @@ struct NotificationView: View {
                 textStack
                 Spacer(minLength: .zero)
             }
-            
             Image(systemName: isTextLimited ? pullDownIcon : pullUpIcon)
                 .font(.title)
                 .foregroundColor(.gray)
@@ -50,7 +49,6 @@ private extension NotificationView {
                 Text(description)
                     .font(.system(size: 13))
                     .lineLimit(isTextLimited ? 3 : nil)
-               
             }
         }
     }