Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with enabled button shapes in compose screen

This commit is contained in:
Marcin Czachursk 2023-04-15 08:22:56 +02:00
parent 2fcd7bcd3c
commit 68f39b15e8
2 changed files with 104 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
Vernissage/Views/ComposeView.swift
View File

@ -388,60 +388,63 @@ struct ComposeView: View {
private func keyboardToolbar() -> some View {
VStack(spacing: 0) {
Divider()
HStack(alignment: .center, spacing: 22) {
HStack {
ScrollView(.horizontal) {
HStack(alignment: .center, spacing: 20) {
Button {
hideKeyboard()
self.focusedField = .unknown
self.photosPickerVisible = true
} label: {
Image(systemName: self.photosAreAttached ? "photo.fill.on.rectangle.fill" : "photo.on.rectangle")
}
Button {
hideKeyboard()
self.focusedField = .unknown
self.photosPickerVisible = true
} label: {
Image(systemName: self.photosAreAttached ? "photo.fill.on.rectangle.fill" : "photo.on.rectangle")
}
Button {
withAnimation(.easeInOut) {
self.isSensitive.toggle()
Button {
withAnimation(.easeInOut) {
self.isSensitive.toggle()
if self.isSensitive {
self.focusedField = .spoilerText
} else {
self.focusedField = .content
}
}
} label: {
Image(systemName: self.isSensitive ? "exclamationmark.square.fill" : "exclamationmark.square")
}
if self.isSensitive {
self.focusedField = .spoilerText
} else {
self.focusedField = .content
Button {
withAnimation(.easeInOut) {
self.commentsDisabled.toggle()
}
} label: {
Image(systemName: self.commentsDisabled ? "person.2.slash" : "person.2.fill")
}
Button {
if self.place != nil {
withAnimation(.easeInOut) {
self.place = nil
}
} else {
self.showSheet = .placeSelector
}
} label: {
Image(systemName: self.place == nil ? "mappin.square" : "mappin.square.fill")
}
Button {
self.textModel.insertAtCursorPosition(content: "#")
} label: {
Image(systemName: "number")
}
Button {
self.textModel.insertAtCursorPosition(content: "@")
} label: {
Image(systemName: "at")
}
}
} label: {
Image(systemName: self.isSensitive ? "exclamationmark.square.fill" : "exclamationmark.square")
}
Button {
withAnimation(.easeInOut) {
self.commentsDisabled.toggle()
}
} label: {
Image(systemName: self.commentsDisabled ? "person.2.slash" : "person.2.fill")
}
Button {
if self.place != nil {
withAnimation(.easeInOut) {
self.place = nil
}
} else {
self.showSheet = .placeSelector
}
} label: {
Image(systemName: self.place == nil ? "mappin.square" : "mappin.square.fill")
}
Button {
self.textModel.insertAtCursorPosition(content: "#")
} label: {
Image(systemName: "number")
}
Button {
self.textModel.insertAtCursorPosition(content: "@")
} label: {
Image(systemName: "at")
}
Spacer()

101
VernissageShare/ComposeView.swift
View File

@ -361,60 +361,63 @@ struct ComposeView: View {
private func keyboardToolbar() -> some View {
VStack(spacing: 0) {
Divider()
HStack(alignment: .center, spacing: 22) {
HStack {
ScrollView(.horizontal) {
HStack(alignment: .center, spacing: 20) {
Button {
hideKeyboard()
self.focusedField = .unknown
self.photosPickerVisible = true
} label: {
Image(systemName: self.photosAreAttached ? "photo.fill.on.rectangle.fill" : "photo.on.rectangle")
}
Button {
hideKeyboard()
self.focusedField = .unknown
self.photosPickerVisible = true
} label: {
Image(systemName: self.photosAreAttached ? "photo.fill.on.rectangle.fill" : "photo.on.rectangle")
}
Button {
withAnimation(.easeInOut) {
self.isSensitive.toggle()
Button {
withAnimation(.easeInOut) {
self.isSensitive.toggle()
if self.isSensitive {
self.focusedField = .spoilerText
} else {
self.focusedField = .content
}
}
} label: {
Image(systemName: self.isSensitive ? "exclamationmark.square.fill" : "exclamationmark.square")
}
if self.isSensitive {
self.focusedField = .spoilerText
} else {
self.focusedField = .content
Button {
withAnimation(.easeInOut) {
self.commentsDisabled.toggle()
}
} label: {
Image(systemName: self.commentsDisabled ? "person.2.slash" : "person.2.fill")
}
Button {
if self.place != nil {
withAnimation(.easeInOut) {
self.place = nil
}
} else {
self.showSheet = .placeSelector
}
} label: {
Image(systemName: self.place == nil ? "mappin.square" : "mappin.square.fill")
}
Button {
self.textModel.insertAtCursorPosition(content: "#")
} label: {
Image(systemName: "number")
}
Button {
self.textModel.insertAtCursorPosition(content: "@")
} label: {
Image(systemName: "at")
}
}
} label: {
Image(systemName: self.isSensitive ? "exclamationmark.square.fill" : "exclamationmark.square")
}
Button {
withAnimation(.easeInOut) {
self.commentsDisabled.toggle()
}
} label: {
Image(systemName: self.commentsDisabled ? "person.2.slash" : "person.2.fill")
}
Button {
if self.place != nil {
withAnimation(.easeInOut) {
self.place = nil
}
} else {
self.showSheet = .placeSelector
}
} label: {
Image(systemName: self.place == nil ? "mappin.square" : "mappin.square.fill")
}
Button {
self.textModel.insertAtCursorPosition(content: "#")
} label: {
Image(systemName: "number")
}
Button {
self.textModel.insertAtCursorPosition(content: "@")
} label: {
Image(systemName: "at")
}
Spacer()