saint
/
gloss-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swipe with drag offset works now

fix_swipe
saint 2024-06-09 10:32:59 -04:00
parent a8648b8508
commit c04469ef19
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gloss/ContentView.swift
View File

@ -372,6 +372,8 @@ struct ContentView: View {
.onChanged { value in .onChanged { value in
// Calculate the offset // Calculate the offset
let margin = CGFloat(30)
var newOffset = value.translation.width var newOffset = value.translation.width
if startSwipeState == nil { if startSwipeState == nil {
if pulledOut.width == 0 { if pulledOut.width == 0 {
@ -438,25 +440,28 @@ struct ContentView: View {
// if mainSwipe.width < -margin && pulledOut.width <= 0 { // if mainSwipe.width < -margin && pulledOut.width <= 0 {
// if mainSwipe.width < -margin && pulledOut.width <= 0 { if mainSwipe.width < -margin && pulledOut.width <= 0 {
// dragOffset = margin + mainSwipe.width + pulledOut.width dragOffset = margin + mainSwipe.width + pulledOut.width
// } }
// if mainSwipe.width > 0 && pulledOut.width < 0 { if mainSwipe.width > 0 && pulledOut.width < 0 {
// dragOffset = margin + mainSwipe.width + pulledOut.width dragOffset = margin + mainSwipe.width + pulledOut.width
// } }
} }
.onEnded { _ in .onEnded { _ in
var finalSwipe = CGFloat(0) var finalSwipe = CGFloat(0)
let swipeLeftFinal = CGFloat(-200) let swipeLeftFinal = CGFloat(-200)
let swipeRightFinal = CGFloat(110) let swipeRightFinal = CGFloat(110)
// let margin = CGFloat(30)
let margin = CGFloat(30)
var setDragOffset = CGFloat(0)
if startSwipeState == .center { if startSwipeState == .center {
if startSwipeDir == .right { if startSwipeDir == .right {
finalSwipe = swipeRightFinal finalSwipe = swipeRightFinal
} else { } else {
finalSwipe = swipeLeftFinal finalSwipe = swipeLeftFinal
setDragOffset = margin + swipeLeftFinal
} }
} else if startSwipeState == .right { } else if startSwipeState == .right {
finalSwipe = .zero finalSwipe = .zero
@ -470,6 +475,7 @@ struct ContentView: View {
if startSwipeDir == .left { if startSwipeDir == .left {
finalSwipe = swipeLeftFinal finalSwipe = swipeLeftFinal
setDragOffset = margin + swipeLeftFinal
} else { } else {
finalSwipe = .zero finalSwipe = .zero
} }
@ -478,9 +484,6 @@ struct ContentView: View {
startSwipeState = nil startSwipeState = nil
startSwipeDir = nil startSwipeDir = nil
// var setDragOffset = CGFloat(0)
// if mainSwipe.width < 0 && pulledOut.width > 0 { // if mainSwipe.width < 0 && pulledOut.width > 0 {
// setPulledOutWith = CGFloat(0) // setPulledOutWith = CGFloat(0)
// } else if mainSwipe.width > 0 && pulledOut.width < 0 { // } else if mainSwipe.width > 0 && pulledOut.width < 0 {
@ -496,7 +499,7 @@ struct ContentView: View {
withAnimation(.spring(response: 0.2)) { withAnimation(.spring(response: 0.2)) {
pulledOut.width = finalSwipe pulledOut.width = finalSwipe
// dragOffset = setDragOffset dragOffset = setDragOffset
mainSwipe = .zero mainSwipe = .zero
} }
} }