add top and bottom swiping

omarthamri · Nov 30, 2023 · 76e79aa · 76e79aa
1 parent cec4949
commit 76e79aa
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 12 deletions.
diff --git a/... Files/Pods-MyTinderSwipingAnimation_Tests/Pods-MyTinderSwipingAnimation_Tests-Info.plist b/... Files/Pods-MyTinderSwipingAnimation_Tests/Pods-MyTinderSwipingAnimation_Tests-Info.plist
diff --git a/Example/Tests/Info.plist b/Example/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6</string>
+	<string>1.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/MyTinderSwipingAnimation.podspec b/MyTinderSwipingAnimation.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'MyTinderSwipingAnimation'
-  s.version          = '1.6'
+  s.version          = '1.7'
   s.summary          = 'TinderSwipingAnimation is a library written using SwiftUI to simplify the implementation of the tinder swipe animation.'
 
 # This description is used to generate tags and improve search results.

diff --git a/Sources/TinderSwipingAnimation/Components/CustomButton.swift b/Sources/TinderSwipingAnimation/Components/CustomButton.swift
@@ -21,9 +21,9 @@ struct CustomButton: View {
                    case .goLeft:
                        viewModel.goLeft = true
                    case .goTop:
-                       break
+                       viewModel.goTop = true
                    case .goBottom:
-                       break
+                       viewModel.goBottom = true
                    }
         }) {
             button.image

diff --git a/Sources/TinderSwipingAnimation/Models/Direction.swift b/Sources/TinderSwipingAnimation/Models/Direction.swift
@@ -11,10 +11,14 @@ public enum Direction {
 
     case right
     case left
+    case top
+    case bottom
     public var description: String {
         switch self {
         case .right: return "right"
         case .left: return "left"
+        case .top: return "top"
+        case .bottom: return "bottom"
         }
     }
 }
diff --git a/Sources/TinderSwipingAnimation/ViewModels/TinderViewModel.swift b/Sources/TinderSwipingAnimation/ViewModels/TinderViewModel.swift
@@ -17,4 +17,6 @@ class TinderViewModel: ObservableObject {
     @Published var cards: [CardModel] = []
     @Published var goRight: Bool = false
     @Published var goLeft: Bool = false
+    @Published var goTop: Bool = false
+    @Published var goBottom: Bool = false
 }
diff --git a/Sources/TinderSwipingAnimation/Views/CardView.swift b/Sources/TinderSwipingAnimation/Views/CardView.swift
@@ -9,8 +9,9 @@ import SwiftUI
 import Combine
 
 struct CardView: View {
-    @State var x: [CGFloat] = [0,0,0,0,0,0,0]
-    @State var degree: [Double] = [0,0,0,0,0,0,0]
+    @State var x: [CGFloat] = [0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+    @State var y: [CGFloat] = [0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+    @State var degree: [Double] = [0,0,0,0,0,0,0,0,0,0,0,0,0,0]
     @State var offset: CGFloat = 0.0
     var cards: [CardModel]
     var buttons: [ButtonModel]
@@ -26,18 +27,24 @@ struct CardView: View {
             viewModel.$goRight.sink { _ in
                     }
                     .store(in: &subscriptions)
-                    viewModel.$goLeft.sink { _ in
+            viewModel.$goLeft.sink { _ in
+                    }
+                    .store(in: &subscriptions)
+            viewModel.$goTop.sink { _ in
+                    }
+                    .store(in: &subscriptions)
+            viewModel.$goBottom.sink { _ in
                     }
                     .store(in: &subscriptions)
         }
     var body: some View {
         ZStack {
             ForEach(0..<cards.count,id: \.self) { i in
                 Card(card: cards[i], buttons: buttons, viewModel: viewModel, orientation: orientation)
-                    .offset(x: self.x[i])
+                    .offset(x: self.x[i],y: y[i])
                     .rotationEffect(.init(degrees: degree[i]))
-                    .onChange(of: viewModel.goRight || viewModel.goLeft) {
-                                            if viewModel.goRight && abs(degree[i]) != 12 {
+                    .onChange(of: viewModel.goRight || viewModel.goLeft || viewModel.goBottom || viewModel.goTop) {
+                                            if viewModel.goRight && abs(degree[i]) != 12 && abs(degree[i]) != 1 {
                                                 withAnimation(.default) {
                                                     viewModel.goRight = false
                                                     self.x[i] = 500
@@ -47,7 +54,7 @@ struct CardView: View {
                                                     viewModel.cards[i].thumbsUpOpacity = 0
                                                     viewModel.cards[i].thumbsDownOpacity = 0
                                                 }
-                                            } else if viewModel.goLeft && abs(degree[i]) != 12 {
+                                            } else if viewModel.goLeft && abs(degree[i]) != 12 && abs(degree[i]) != 1  {
                                                 withAnimation(.default) {
                                                     viewModel.goLeft = false
                                                     self.x[i] = -500
@@ -57,6 +64,26 @@ struct CardView: View {
                                                     viewModel.cards[i].thumbsUpOpacity = 0
                                                     viewModel.cards[i].thumbsDownOpacity = 0
                                                 }
+                                            } else if viewModel.goTop && abs(degree[i]) != 1 && abs(degree[i]) != 12{
+                                                withAnimation(.default) {
+                                                    viewModel.goTop = false
+                                                    self.y[i] = 750
+                                                    self.offset = 750
+                                                    self.degree[i] = 1
+                                                    viewModel.cardSwiped = (cards[i],Direction.top)
+                                                    viewModel.cards[i].thumbsUpOpacity = 0
+                                                    viewModel.cards[i].thumbsDownOpacity = 0
+                                                }
+                                            } else if viewModel.goBottom && abs(degree[i]) != 1 && abs(degree[i]) != 12 {
+                                                withAnimation(.default) {
+                                                    viewModel.goBottom = false
+                                                    self.y[i] = -750
+                                                    self.offset = -750
+                                                    self.degree[i] = -1
+                                                    viewModel.cardSwiped = (cards[i],Direction.bottom)
+                                                    viewModel.cards[i].thumbsUpOpacity = 0
+                                                    viewModel.cards[i].thumbsDownOpacity = 0
+                                                }
                                             }
                                         }
                     .gesture(DragGesture()