mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-02 13:29:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CancelToolbarItem

Browse source
This commit is contained in:
Thomas Ricouard 2024-01-23 08:13:45 +01:00
parent ba071eb4c8
commit 016e4d5d57
11 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
IceCubesApp/App/Report/ReportView.swift
View file

@ -65,13 +65,7 @@ public struct ReportView: View {
}
}
ToolbarItem(placement: .navigationBarLeading) {
Button {
dismiss()
} label: {
Text("action.cancel")
}
}
CancelToolbarItem()
}
}
}

4
IceCubesApp/App/Tabs/Settings/AddAccountsView.swift
View file

@ -88,9 +88,7 @@ struct AddAccountView: View {
#endif
.toolbar {
if !appAccountsManager.availableAccounts.isEmpty {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", action: { dismiss() })
}
CancelToolbarItem()
}
}
.onAppear {

4
IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift
View file

@ -62,9 +62,7 @@ struct EditTagGroupView: View {
.scrollDismissesKeyboard(.interactively)
#endif
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", action: { dismiss() })
}
CancelToolbarItem()
ToolbarItem(placement: .navigationBarTrailing) {
Button("action.save", action: { save() })
.disabled(!tagGroup.isValid)

4
IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift
View file

@ -57,9 +57,7 @@ struct AddRemoteTimelineView: View {
.scrollDismissesKeyboard(.immediately)
#endif
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", action: { dismiss() })
}
CancelToolbarItem()
}
.onChange(of: instanceName) { _, newValue in
instanceNamePublisher.send(newValue)

1
IceCubesApp/Resources/Localization/Localizable.xcstrings
View file

@ -17415,6 +17415,7 @@
},
"action.cancel" : {
"comment" : "MARK: Common strings",
"extractionState" : "stale",
"localizations" : {
"be" : {
"stringUnit" : {

6
Packages/Account/Sources/Account/Edit/EditAccountView.swift
View file

@ -220,11 +220,7 @@ public struct EditAccountView: View {
@ToolbarContentBuilder
private var toolbarContent: some ToolbarContent {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel") {
dismiss()
}
}
CancelToolbarItem()
ToolbarItem(placement: .navigationBarTrailing) {
Button {

14
Packages/DesignSystem/Sources/DesignSystem/ToolbarItem/CancelToolbarItem.swift Normal file
View file

@ -0,0 +1,14 @@
import SwiftUI
public struct CancelToolbarItem: ToolbarContent {
@Environment(\.dismiss) private var dismiss
public init() { }
public var body: some ToolbarContent {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", role: .cancel, action: { dismiss() })
.keyboardShortcut(.cancelAction)
}
}
}

3
Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
View file

@ -126,6 +126,9 @@ struct AvatarImage: View {
RoundedRectangle(cornerRadius: config.cornerRadius)
.stroke(.primary.opacity(0.25), lineWidth: 1)
)
} else {
RoundedRectangle(cornerRadius: config.cornerRadius)
.stroke(.primary.opacity(0.25), lineWidth: 1)
}
}
}

4
Packages/StatusKit/Sources/StatusKit/Editor/Components/CustomEmojisView.swift
View file

@ -52,9 +52,7 @@ extension StatusEditor {
}
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", action: { dismiss() })
}
CancelToolbarItem()
}
.scrollContentBackground(.hidden)
.navigationTitle("status.editor.emojis.navigation-title")

6
Packages/StatusKit/Sources/StatusKit/Editor/Components/MediaEditView.swift
View file

@ -98,11 +98,7 @@ extension StatusEditor {
}
}
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel") {
dismiss()
}
}
CancelToolbarItem()
}
.preferredColorScheme(theme.selectedScheme == .dark ? .dark : .light)
}

4
Packages/StatusKit/Sources/StatusKit/Editor/Drafts/DraftsListView.swift
View file

@ -40,9 +40,7 @@ extension StatusEditor {
}
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("action.cancel", action: { dismiss() })
}
CancelToolbarItem()
}
.scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor)