Compare commits

..

No commits in common. "2b50609e5c475eec1b165d626fe79ed324300589" and "eccb1043db5080d630bade37e2ba68c3ba8b3d71" have entirely different histories.

2 changed files with 9 additions and 5 deletions

View File

@ -59,21 +59,19 @@ struct ComposePollView: View {
} }
HStack { HStack {
// use .animation(nil) on pickers so frame doesn't have a size change animation when the text changes // use .animation(nil) on the binding and .frame(maxWidth: .infinity) on labels so frame doesn't have a size change animation when the text changes
Picker(selection: $poll.multiple, label: Text(poll.multiple ? "Allow multiple choices" : "Single choice")) { Picker(selection: $poll.multiple.animation(nil), label: Text(poll.multiple ? "Allow multiple choices" : "Single choice").frame(maxWidth: .infinity)) {
Text("Allow multiple choices").tag(true) Text("Allow multiple choices").tag(true)
Text("Single choice").tag(false) Text("Single choice").tag(false)
} }
.animation(nil)
.pickerStyle(MenuPickerStyle()) .pickerStyle(MenuPickerStyle())
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
Picker(selection: $duration, label: Text(verbatim: ComposePollView.formatter.string(from: duration.timeInterval)!)) { Picker(selection: $duration.animation(nil), label: Text(verbatim: ComposePollView.formatter.string(from: duration.timeInterval)!).frame(maxWidth: .infinity)) {
ForEach(Duration.allCases, id: \.self) { (duration) in ForEach(Duration.allCases, id: \.self) { (duration) in
Text(ComposePollView.formatter.string(from: duration.timeInterval)!).tag(duration) Text(ComposePollView.formatter.string(from: duration.timeInterval)!).tag(duration)
} }
} }
.animation(nil)
.pickerStyle(MenuPickerStyle()) .pickerStyle(MenuPickerStyle())
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
} }

View File

@ -65,6 +65,7 @@ struct ComposeView: View {
autocompleteSuggestions autocompleteSuggestions
} }
.onAppear(perform: self.didAppear)
.navigationBarTitle("Compose") .navigationBarTitle("Compose")
.actionSheet(isPresented: $uiState.isShowingSaveDraftSheet, content: self.saveAndCloseSheet) .actionSheet(isPresented: $uiState.isShowingSaveDraftSheet, content: self.saveAndCloseSheet)
.alert(isPresented: $isShowingPostErrorAlert) { .alert(isPresented: $isShowingPostErrorAlert) {
@ -153,6 +154,11 @@ struct ComposeView: View {
.disabled(!postButtonEnabled) .disabled(!postButtonEnabled)
} }
private func didAppear() {
let proxy = UIScrollView.appearance(whenContainedInInstancesOf: [ComposeHostingController.self])
proxy.keyboardDismissMode = .interactive
}
private func cancel() { private func cancel() {
if Preferences.shared.automaticallySaveDrafts { if Preferences.shared.automaticallySaveDrafts {
// draft is already stored in drafts manager, drafts manager is saved by ComposeHostingController.viewWillDisappear // draft is already stored in drafts manager, drafts manager is saved by ComposeHostingController.viewWillDisappear