mirror of
https://github.com/cranci1/Sora.git
synced 2026-05-09 19:40:41 +00:00
removed silly git text
This commit is contained in:
parent
bbeef08013
commit
661dcad69c
1 changed files with 0 additions and 13 deletions
|
|
@ -42,15 +42,12 @@ struct EpisodeCell: View {
|
||||||
@State private var downloadAnimationScale: CGFloat = 1.0
|
@State private var downloadAnimationScale: CGFloat = 1.0
|
||||||
@State private var activeDownloadTask: AVAssetDownloadTask?
|
@State private var activeDownloadTask: AVAssetDownloadTask?
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
@State private var swipeOffset: CGFloat = 0
|
@State private var swipeOffset: CGFloat = 0
|
||||||
@State private var isShowingActions: Bool = false
|
@State private var isShowingActions: Bool = false
|
||||||
@State private var actionButtonWidth: CGFloat = 60
|
@State private var actionButtonWidth: CGFloat = 60
|
||||||
@State private var dragState: DragState = .inactive
|
@State private var dragState: DragState = .inactive
|
||||||
@State private var dragStart: CGPoint?
|
@State private var dragStart: CGPoint?
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> f53cc505fc93609c8cfee2e1306c57094bd93de5
|
|
||||||
@State private var retryAttempts: Int = 0
|
@State private var retryAttempts: Int = 0
|
||||||
private var malIDFromParent: Int? { malID }
|
private var malIDFromParent: Int? { malID }
|
||||||
private let maxRetryAttempts: Int = 3
|
private let maxRetryAttempts: Int = 3
|
||||||
|
|
@ -218,8 +215,6 @@ private extension EpisodeCell {
|
||||||
|
|
||||||
actionButtonsBackground
|
actionButtonsBackground
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.padding(.horizontal, 8)
|
.padding(.horizontal, 8)
|
||||||
.padding(.vertical, 8)
|
.padding(.vertical, 8)
|
||||||
|
|
@ -256,7 +251,6 @@ private extension EpisodeCell {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onTapGesture { handleTap() }
|
.onTapGesture { handleTap() }
|
||||||
>>>>>>> f53cc505fc93609c8cfee2e1306c57094bd93de5
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var cellBackground: some View {
|
var cellBackground: some View {
|
||||||
|
|
@ -410,7 +404,6 @@ private extension EpisodeCell {
|
||||||
}
|
}
|
||||||
|
|
||||||
private extension EpisodeCell {
|
private extension EpisodeCell {
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
enum DragState {
|
enum DragState {
|
||||||
case inactive
|
case inactive
|
||||||
|
|
@ -506,8 +499,6 @@ private extension EpisodeCell {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> f53cc505fc93609c8cfee2e1306c57094bd93de5
|
|
||||||
func handleTap() {
|
func handleTap() {
|
||||||
if isShowingActions {
|
if isShowingActions {
|
||||||
withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) {
|
withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) {
|
||||||
|
|
@ -522,7 +513,6 @@ private extension EpisodeCell {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
func calculateMaxSwipeDistance() -> CGFloat {
|
func calculateMaxSwipeDistance() -> CGFloat {
|
||||||
var buttonCount = 1
|
var buttonCount = 1
|
||||||
|
|
||||||
|
|
@ -551,12 +541,9 @@ private extension EpisodeCell {
|
||||||
action()
|
action()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
=======
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private extension EpisodeCell {
|
private extension EpisodeCell {
|
||||||
>>>>>>> f53cc505fc93609c8cfee2e1306c57094bd93de5
|
|
||||||
func markAsWatched() {
|
func markAsWatched() {
|
||||||
let defaults = UserDefaults.standard
|
let defaults = UserDefaults.standard
|
||||||
let totalTime = 1000.0
|
let totalTime = 1000.0
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue