Skip to content

Feature convenient transition with duration #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Example/SDWebImageSwiftUIDemo/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ struct ContentView: View {
WebImage(url: URL(string:url), isAnimating: self.$animated)
.resizable()
.indicator(.activity)
.animation(.easeInOut(duration: 0.5))
.transition(.fade)
.transition(.fade(duration: 0.5))
.scaledToFit()
.frame(width: CGFloat(100), height: CGFloat(100), alignment: .center)
#endif
Expand All @@ -187,8 +186,7 @@ struct ContentView: View {
}
*/
.indicator(.activity)
.animation(.easeInOut(duration: 0.5))
.transition(.fade)
.transition(.fade(duration: 0.5))
.scaledToFit()
.frame(width: CGFloat(100), height: CGFloat(100), alignment: .center)
}
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ var body: some View {
Rectangle().foregroundColor(.gray)
}
.indicator(.activity) // Activity Indicator
.animation(.easeInOut(duration: 0.5)) // Animation Duration
.transition(.fade) // Fade Transition
.transition(.fade(duration: 0.5)) // Fade Transition with duration
.scaledToFit()
.frame(width: 300, height: 300, alignment: .center)
}
Expand Down
45 changes: 45 additions & 0 deletions SDWebImageSwiftUI/Classes/Transition/Transition.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,76 @@ extension AnyTransition {
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Fade-in transition with duration
/// - Parameter duration: transition duration, use ease-in-out
/// - Returns: A transition with duration
public static func fade(duration: Double) -> AnyTransition {
let insertion = AnyTransition.opacity.animation(.easeInOut(duration: duration))
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from left transition
public static var flipFromLeft: AnyTransition {
let insertion = AnyTransition.move(edge: .leading)
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from left transition with duration
/// - Parameter duration: transition duration, use ease-in-out
/// - Returns: A transition with duration
public static func flipFromLeft(duration: Double) -> AnyTransition {
let insertion = AnyTransition.move(edge: .leading).animation(.easeInOut(duration: duration))
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from right transition
public static var flipFromRight: AnyTransition {
let insertion = AnyTransition.move(edge: .trailing)
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from right transition with duration
/// - Parameter duration: transition duration, use ease-in-out
/// - Returns: A transition with duration
public static func flipFromRight(duration: Double) -> AnyTransition {
let insertion = AnyTransition.move(edge: .trailing).animation(.easeInOut(duration: duration))
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from top transition
public static var flipFromTop: AnyTransition {
let insertion = AnyTransition.move(edge: .top)
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from top transition with duration
/// - Parameter duration: transition duration, use ease-in-out
/// - Returns: A transition with duration
public static func flipFromTop(duration: Double) -> AnyTransition {
let insertion = AnyTransition.move(edge: .top).animation(.easeInOut(duration: duration))
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from bottom transition
public static var flipFromBottom: AnyTransition {
let insertion = AnyTransition.move(edge: .bottom)
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}

/// Flip from bottom transition with duration
/// - Parameter duration: transition duration, use ease-in-out
/// - Returns: A transition with duration
public static func flipFromBottom(duration: Double) -> AnyTransition {
let insertion = AnyTransition.move(edge: .bottom).animation(.easeInOut(duration: duration))
let removal = AnyTransition.identity
return AnyTransition.asymmetric(insertion: insertion, removal: removal)
}
}