From 98108d013e94ec01b85629e15037b153005572cf Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 30 Sep 2026 11:47:40 -0400
Subject: [PATCH] use m3e iconbuttons

---
 lib/helpers/extensions/build_event_options.dart | 3 ++-
 lib/helpers/extensions/scheme_to_theme.dart     | 1 +
 lib/widgets/composer/composer.dart              | 4 +++-
 lib/widgets/sidebar.dart                        | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/helpers/extensions/build_event_options.dart b/lib/helpers/extensions/build_event_options.dart
index 441e3c4..3793b0a 100644
--- a/lib/helpers/extensions/build_event_options.dart
+++ b/lib/helpers/extensions/build_event_options.dart
@@ -95,6 +95,7 @@ extension BuildEventOptions on Event {
           child: IconTheme(
             data: theme.iconTheme,
             child: Row(
+              mainAxisAlignment: .center,
               children: [
                 for (final emoji in {
                   ...ref
@@ -104,7 +105,7 @@ extension BuildEventOptions on Event {
                   "🤣",
                   "😭",
                   "🤔",
-                }.take(4))
+                }.take(3))
                   IconButton(
                     icon: Text(emoji),
                     onPressed: () async {
diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart
index 6f0d112..ac50a09 100644
--- a/lib/helpers/extensions/scheme_to_theme.dart
+++ b/lib/helpers/extensions/scheme_to_theme.dart
@@ -28,6 +28,7 @@ extension SchemeToTheme on ColorScheme {
           borderRadius: .circular(8),
         ),
       ),
+      iconButtonTheme: .new(variant: StyleVariant.material3Expressive),
       textTheme: textTheme,
       inputDecorationTheme: const InputDecorationTheme(
         border: OutlineInputBorder(),
diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart
index 4c9ea4e..8664e4d 100644
--- a/lib/widgets/composer/composer.dart
+++ b/lib/widgets/composer/composer.dart
@@ -117,7 +117,6 @@ class const Composer(
                   color: theme.colorScheme.surfaceContainerHighest,
                   padding: .symmetric(horizontal: 8),
                   child: Row(
-                    spacing: 8,
                     mainAxisAlignment: .center,
                     children:
                         ref.watch(
@@ -127,6 +126,7 @@ class const Composer(
                         )
                         ? [
                             IconButton(
+                              style: .new(iconButtonWidth: .narrow),
                               onPressed: () => showModalBottomSheet(
                                 isScrollControlled: true,
                                 context: context,
@@ -141,6 +141,7 @@ class const Composer(
                               icon: Icon(Icons.emoji_emotions),
                             ),
                             PopupMenuButton(
+                              style: .new(iconButtonWidth: .narrow),
                               tooltip: "Add media",
                               enabled: attachment == null,
                               itemBuilder: (context) => [
@@ -199,6 +200,7 @@ class const Composer(
                               ],
                               icon: Icon(Icons.add),
                             ),
+                            SizedBox(width: 8),
                             Expanded(
                               child: FlutterTagger(
                                 triggerStrategy: .eager,
diff --git a/lib/widgets/sidebar.dart b/lib/widgets/sidebar.dart
index c6fede9..bc0c421 100644
--- a/lib/widgets/sidebar.dart
+++ b/lib/widgets/sidebar.dart
@@ -158,7 +158,6 @@ class const Sidebar({super.key}) extends HookConsumerWidget {
                     trailing: Padding(
                       padding: .symmetric(vertical: 16),
                       child: Column(
-                        spacing: 8,
                         children: [
                           PopupMenuButton(
                             itemBuilder: (_) => [