Skip to content

fix/finish-recording-dialog-action-not-triggered #1065

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.

Sign up for GitHub

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
xameYeoh merged 2 commits into from
Jul 17, 2025
Merged

fix/finish-recording-dialog-action-not-triggered #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ece194
fix(graph > finish session action not triggered sometimes): update us…
xameYeoh Jul 11, 2025
449d0cb
fix(graph > finish session action not triggered sometimes): show emai…
xameYeoh Jul 11, 2025
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
20 changes: 13 additions & 7 deletions AirCasting/SessionViews/SessionHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ struct SessionHeaderView: View {
@Environment(\.colorScheme) var colorScheme
@ObservedObject var session: SessionEntity
@State private var showingNoConnectionAlert = false
@State private var alert: AlertInfo?
@InjectedObject private var featureFlagsViewModel: FeatureFlagsViewModel
@State var showDeleteModal = false
@State var showAddNoteModal = false
@State var showShareModal = false
@State var showEditView = false
@State var detectEmailSent = false
@State var showThresholdAlertModal = false
@State private var isShowingFinishSessionAlert = false
@State private var isShowingEmailSentAlert = false

var body: some View {
if #available(iOS 15, *) {
Expand All @@ -50,7 +51,7 @@ struct SessionHeaderView: View {
}
})).onDisappear(perform: {
if detectEmailSent {
alert = InAppAlerts.shareFileRequestSent()
isShowingEmailSentAlert = true
}
})
}
Expand Down Expand Up @@ -81,7 +82,7 @@ struct SessionHeaderView: View {
ShareSessionView(viewModel: DefaultShareSessionViewModel(session: session, apiClient: ShareSessionApi(), exitRoute: { result in
showShareModal.toggle()
if result == .fileShared {
alert = InAppAlerts.shareFileRequestSent()
isShowingEmailSentAlert = true
}
}))
}
Expand Down Expand Up @@ -132,7 +133,14 @@ private extension SessionHeaderView {
}
nameLabelAndExpandButton
}
.alert(item: $alert, content: { $0.makeAlert() })
.alert(
InAppAlerts.finishSessionAlert(
sessionName: session.name,
action: { self.finishSessionAlertAction() }
),
$isShowingFinishSessionAlert
)
.alert(InAppAlerts.shareFileRequestSent(), $isShowingEmailSentAlert)
.foregroundColor(.aircastingGray)
}

Expand Down Expand Up @@ -193,9 +201,7 @@ private extension SessionHeaderView {

var actionsMenuStopButton: some View {
Button {
alert = InAppAlerts.finishSessionAlert(sessionName: session.name, action: {
self.finishSessionAlertAction()
})
isShowingFinishSessionAlert = true
} label: {
Label(Strings.SessionHeaderView.stopRecordingButton, systemImage: "stop.circle")
}
Expand Down
16 changes: 16 additions & 0 deletions AirCasting/Utils/InAppAlerts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,3 +474,19 @@ extension AlertInfo {
}
}
}

extension View {
nonisolated func alert(_ alertInfo: AlertInfo, _ isPresented: Binding<Bool>) -> some View {
Copy link
Collaborator

@mpanuszewska mpanuszewska Jul 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fancy 💅

self.alert(alertInfo.title, isPresented: isPresented) {
ForEach(Array(alertInfo.buttons.enumerated()), id: \.offset) { index, type in
switch type {
case .cancel(let title): Button(title, role: .cancel, action: { isPresented.wrappedValue = false })
case .default(let title, nil): Button(title, action: { isPresented.wrappedValue = false })
case .default(let title, let action): Button(title, action: action!)
}
}
} message: {
Text(alertInfo.message)
}
}
}
Loading