Merge success animation + auto-return to landing page; bump to 3.0
Build iOS App / Build .ipa and publish source (push) Successful in 23s
Build iOS App / Build .ipa and publish source (push) Successful in 23s
On a successful merge, show a brief full-screen green checkmark animation
('Merged'), then automatically pop the PR detail view back to the landing
page. MergeSheet now calls an onSuccess callback; PRDetailView shows the
overlay and dismisses after ~1.2s. Bump to 3.0.
This commit is contained in:
1 parent
5e9ee9e5cf
commit
2301b8a861
3 files changed
+47
-6
No files matched your search
@@ -2,12 +2,14 @@ import SwiftUI
|
||||
|
||||
struct PRDetailView: View {
|
||||
@StateObject private var vm: PRDetailViewModel
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@State private var selectedTab: DetailTab = .overview
|
||||
@State private var showCommentSheet = false
|
||||
@State private var showMergeSheet = false
|
||||
@State private var showCloseConfirm = false
|
||||
@State private var showRerunConfirm: ActionRun?
|
||||
@State private var requestChangesMode = false
|
||||
@State private var showMergeSuccess = false
|
||||
|
||||
enum DetailTab: String, CaseIterable, Identifiable {
|
||||
case overview = "Overview"
|
||||
@@ -56,6 +58,7 @@ struct PRDetailView: View {
|
||||
Button("OK", role: .cancel) {}
|
||||
} message: { Text(vm.errorMessage ?? "") }
|
||||
.overlay { if vm.busyMessage != nil { busyOverlay } }
|
||||
.overlay { if showMergeSuccess { mergeSuccessOverlay } }
|
||||
.confirmationDialog("Close this PR?", isPresented: $showCloseConfirm, titleVisibility: .visible) {
|
||||
Button("Close", role: .destructive) { Task { await vm.setState("closed") } }
|
||||
Button("Cancel", role: .cancel) {}
|
||||
@@ -65,7 +68,19 @@ struct PRDetailView: View {
|
||||
mode: requestChangesMode ? .requestChanges : .comment)
|
||||
.onDisappear { requestChangesMode = false }
|
||||
}
|
||||
.sheet(isPresented: $showMergeSheet) { MergeSheet(vm: vm) }
|
||||
.sheet(isPresented: $showMergeSheet) {
|
||||
MergeSheet(vm: vm) {
|
||||
// Merge succeeded: show the success animation, then pop back
|
||||
// to the landing page.
|
||||
withAnimation(.spring(response: 0.4, dampingFraction: 0.6)) {
|
||||
showMergeSuccess = true
|
||||
}
|
||||
Task {
|
||||
try? await Task.sleep(nanoseconds: 1_200_000_000)
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
.confirmationDialog("Re-run workflow?",
|
||||
isPresented: .init(
|
||||
get: { showRerunConfirm != nil },
|
||||
@@ -219,4 +234,24 @@ struct PRDetailView: View {
|
||||
}
|
||||
.ignoresSafeArea()
|
||||
}
|
||||
|
||||
/// Full-screen success animation shown briefly after a merge, then the
|
||||
/// view pops back to the landing page.
|
||||
private var mergeSuccessOverlay: some View {
|
||||
ZStack {
|
||||
Color.black.opacity(0.4)
|
||||
.ignoresSafeArea()
|
||||
VStack(spacing: 12) {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.font(.system(size: 72))
|
||||
.foregroundColor(.green)
|
||||
.scaleEffect(showMergeSuccess ? 1 : 0.3)
|
||||
.opacity(showMergeSuccess ? 1 : 0)
|
||||
Text("Merged")
|
||||
.font(.title2.weight(.semibold))
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
}
|
||||
.transition(.opacity)
|
||||
}
|
||||
}
|
||||
@@ -65,6 +65,9 @@ struct MergeSheet: View {
|
||||
@ObservedObject var vm: PRDetailViewModel
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@State private var method = "merge"
|
||||
/// Called when the merge succeeds, so the parent can show the success
|
||||
/// animation and pop back to the landing page.
|
||||
var onSuccess: () -> Void = {}
|
||||
|
||||
private let methods = [("merge", "Create merge commit"),
|
||||
("rebase", "Rebase and merge"),
|
||||
@@ -129,7 +132,10 @@ struct MergeSheet: View {
|
||||
private func performMerge() {
|
||||
Task {
|
||||
let success = await vm.merge(method: method)
|
||||
if success { dismiss() }
|
||||
if success {
|
||||
dismiss()
|
||||
onSuccess()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user