From a8648b8508868bc4ff37958ea452cb7c98891c1b Mon Sep 17 00:00:00 2001 From: saint Date: Sun, 9 Jun 2024 10:25:08 -0400 Subject: [PATCH] swiping seems to work fine, need to fix dragoffset now --- gloss/ContentView.swift | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gloss/ContentView.swift b/gloss/ContentView.swift index d3cd3b7..b427335 100644 --- a/gloss/ContentView.swift +++ b/gloss/ContentView.swift @@ -410,36 +410,29 @@ struct ContentView: View { if startSwipeDir == .left { maxOffsetLeft = .zero maxOffsetRight = .zero - } else { + } else if startSwipeDir == .right { maxOffsetLeft = CGFloat(200) - maxOffsetRight = .zero + maxOffsetRight = CGFloat(10) } } if newOffset + pulledOut.width < -maxOffsetLeft { if startSwipeState == .right && startSwipeDir == .left { - print("meow here") newOffset = -maxOffsetLeft + rubberBandEffect(newOffset + maxOffsetLeft) - pulledOut.width } else { - - print("meow here") newOffset = -maxOffsetLeft + rubberBandEffect(newOffset + maxOffsetLeft) } } else if newOffset + pulledOut.width > maxOffsetRight { - newOffset = maxOffsetRight + rubberBandEffect(newOffset - maxOffsetRight) + if startSwipeState == .left, startSwipeDir == .right { + newOffset = maxOffsetRight + rubberBandEffect(newOffset - maxOffsetRight) - pulledOut.width + } else { + newOffset = maxOffsetRight + rubberBandEffect(newOffset - maxOffsetRight) + } } - // if newOffset.height < -maxOffset { - // newOffset.height = -maxOffset + rubberBandEffect(newOffset.height + maxOffset) - // } else if newOffset.height > maxOffset { - // newOffset.height = maxOffset + rubberBandEffect(newOffset.height - maxOffset) - // } - self.mainSwipe.width = newOffset - - // dragOffset is what is used to make the text be readable // with the right pane being visible