From 874d2588f8ea9b6c55cb58c39d2e9cfb6577e17d Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 3 Mar 2025 19:46:04 -0500 Subject: [PATCH] Compose tweaks --- .../ComposeUI/Views/Autocomplete/AutocompleteEmojiView.swift | 3 +++ .../ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift | 2 -- .../ComposeUI/Sources/ComposeUI/Views/DraftContentEditor.swift | 2 ++ .../ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift | 3 +-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/Autocomplete/AutocompleteEmojiView.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/Autocomplete/AutocompleteEmojiView.swift index 99133af5..42b77a36 100644 --- a/Packages/ComposeUI/Sources/ComposeUI/Views/Autocomplete/AutocompleteEmojiView.swift +++ b/Packages/ComposeUI/Sources/ComposeUI/Views/Autocomplete/AutocompleteEmojiView.swift @@ -162,6 +162,7 @@ private struct AutocompleteEmojiButton: View { } .accessibilityLabel(emoji.shortcode) .frame(height: 30) + .hoverEffect() .padding(.vertical, 7) } } @@ -182,5 +183,7 @@ private struct ToggleExpandedButton: View { } .accessibilityLabel(expanded ? "Collapse" : "Expand") .frame(width: 20, height: 20) + .hoverEffect() + .contentShape(Rectangle()) } } diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift index 986fdf7d..26600e2f 100644 --- a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift +++ b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift @@ -241,8 +241,6 @@ private struct FormatButtons: View { let input, input.toolbarElements.contains(.formattingButtons), contentType != .plain { - - Spacer() ForEach(StatusFormat.allCases) { format in FormatButton(format: format, input: input) } diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/DraftContentEditor.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/DraftContentEditor.swift index d2761bd1..d03f74bc 100644 --- a/Packages/ComposeUI/Sources/ComposeUI/Views/DraftContentEditor.swift +++ b/Packages/ComposeUI/Sources/ComposeUI/Views/DraftContentEditor.swift @@ -25,6 +25,7 @@ struct DraftContentEditor: View { CharactersRemaining(draft: draft) .padding(.trailing, 6) } + .padding([.horizontal, .bottom], 4) } .composePlatterBackground() } @@ -117,6 +118,7 @@ private struct TogglePollButton: View { } .buttonStyle(LanguageButtonStyle()) .disabled(disabled) + .hoverEffect(.lift) .animation(.linear(duration: 0.2), value: disabled) .animation(.linear(duration: 0.2), value: draft.pollEnabled) } diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift index 01f252e2..7e971e16 100644 --- a/Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift +++ b/Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift @@ -69,8 +69,7 @@ struct LanguagePicker: View { Text((languageCode.wrappedValue.identifier(.alpha2) ?? languageCode.wrappedValue.identifier).uppercased()) } .accessibilityLabel("Post Language") - .padding(5) - .hoverEffect() + .hoverEffect(.lift) .sheet(isPresented: $isShowingSheet) { NavigationStack { LanguagePickerList(languageCode: languageCode, hasChangedSelection: $hasChangedSelection, isPresented: $isShowingSheet)