Skip to content
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

Jump to bottom

style: Unique toolbar for compose message view #1548

Merged
merged 1 commit into from
Sep 20, 2024
Merged

style: Unique toolbar for compose message view #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Mail/Views/New Message/ComposeMessageProgressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct ComposeMessageProgressView: View {
var body: some View {
ProgressView()
.progressViewStyle(.circular)
.composeMessageToolbar {
.baseComposeMessageToolbar {
dismiss()
dismissModal()
}
Expand Down
6 changes: 3 additions & 3 deletions Mail/Views/New Message/ComposeMessageToolbarModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import MailResources
import SwiftUI

extension View {
func composeMessageToolbar(dismissHandler: @escaping () -> Void) -> some View {
modifier(ComposeMessageToolbarModifier(dismissHandler: dismissHandler))
func baseComposeMessageToolbar(dismissHandler: @escaping () -> Void) -> some View {
modifier(BaseComposeMessageToolbarModifier(dismissHandler: dismissHandler))
}
}

struct ComposeMessageToolbarModifier: ViewModifier {
struct BaseComposeMessageToolbarModifier: ViewModifier {
@LazyInjectService private var platformDetector: PlatformDetectable

let dismissHandler: () -> Void
Expand Down
2 changes: 1 addition & 1 deletion Mail/Views/New Message/ComposeMessageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ struct ComposeMessageView: View {
focusedField = .editor
}
}
.composeMessageToolbar(dismissHandler: didTouchDismiss)
.baseComposeMessageToolbar(dismissHandler: didTouchDismiss)
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button(action: didTouchSend) {
Expand Down
Loading