mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-15 19:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Editor toolbar icons

Browse source
This commit is contained in:
Thomas Ricouard 2024-01-07 09:47:55 +01:00
parent d952601528
commit 27ce7fe916
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Packages/StatusKit/Sources/StatusKit/Editor/EditorView.swift
View file

@ -53,7 +53,6 @@ extension StatusEditor {
Divider() Divider()
} }
.opacity(editorFocusState == assignedFocusState ? 1 : 0.6)
} }
#if !os(visionOS) #if !os(visionOS)
.background(theme.primaryBackgroundColor) .background(theme.primaryBackgroundColor)
@ -158,31 +157,33 @@ extension StatusEditor {
private var characterCountAndLangView: some View { private var characterCountAndLangView: some View {
let value = (currentInstance.instance?.configuration?.statuses.maxCharacters ?? 500) + viewModel.statusTextCharacterLength let value = (currentInstance.instance?.configuration?.statuses.maxCharacters ?? 500) + viewModel.statusTextCharacterLength
HStack(alignment: .center) { HStack(alignment: .center) {
LangButton(viewModel: viewModel) if editorFocusState == assignedFocusState {
.padding(.leading, .layoutPadding) LangButton(viewModel: viewModel)
.padding(.leading, .layoutPadding)
Button {
withAnimation { Button {
viewModel.showPoll.toggle() withAnimation {
viewModel.resetPollDefaults() viewModel.showPoll.toggle()
viewModel.resetPollDefaults()
}
} label: {
Image(systemName: viewModel.showPoll ? "chart.bar.fill" : "chart.bar")
} }
} label: { .buttonStyle(.bordered)
Image(systemName: viewModel.showPoll ? "chart.bar.fill" : "chart.bar") .accessibilityLabel("accessibility.editor.button.poll")
} .disabled(viewModel.shouldDisablePollButton)
.buttonStyle(.bordered)
.accessibilityLabel("accessibility.editor.button.poll")
.disabled(viewModel.shouldDisablePollButton)
Button { Button {
withAnimation { withAnimation {
viewModel.spoilerOn.toggle() viewModel.spoilerOn.toggle()
}
isSpoilerTextFocused = viewModel.id
} label: {
Image(systemName: viewModel.spoilerOn ? "exclamationmark.triangle.fill" : "exclamationmark.triangle")
} }
isSpoilerTextFocused = viewModel.id .buttonStyle(.bordered)
} label: { .accessibilityLabel("accessibility.editor.button.spoiler")
Image(systemName: viewModel.spoilerOn ? "exclamationmark.triangle.fill" : "exclamationmark.triangle")
} }
.buttonStyle(.bordered)
.accessibilityLabel("accessibility.editor.button.spoiler")
Spacer() Spacer()

7
Packages/StatusKit/Sources/StatusKit/Editor/ToolbarItems.swift
View file

@ -31,7 +31,7 @@ extension StatusEditor {
Button { Button {
isDraftsSheetDisplayed = true isDraftsSheetDisplayed = true
} label: { } label: {
Text("status.editor.drafts.navigation-title") Image(systemName: "pencil.and.list.clipboard")
} }
.accessibilityLabel("accessibility.editor.button.drafts") .accessibilityLabel("accessibility.editor.button.drafts")
.popover(isPresented: $isDraftsSheetDisplayed) { .popover(isPresented: $isDraftsSheetDisplayed) {
@ -57,7 +57,8 @@ extension StatusEditor {
} }
} }
} label: { } label: {
Text("status.action.post").bold() Image(systemName: "paperplane.fill")
.bold()
} }
.buttonStyle(.borderedProminent) .buttonStyle(.borderedProminent)
.disabled(!mainSEVM.canPost || mainSEVM.isPosting) .disabled(!mainSEVM.canPost || mainSEVM.isPosting)
@ -77,7 +78,7 @@ extension StatusEditor {
object: nil) object: nil)
} }
} label: { } label: {
Text("action.cancel") Image(systemName: "xmark")
} }
.keyboardShortcut(.cancelAction) .keyboardShortcut(.cancelAction)
.confirmationDialog( .confirmationDialog(