feat: use material symbols (#531)

* feat: use material symbols * feat: use off icons
poppingmoon · Jan 27, 2025 · a522a8c · a522a8c
1 parent 7a2c84c
commit a522a8c
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 137 deletions.
diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart
diff --git a/lib/view/page/settings/mute_block_page.dart b/lib/view/page/settings/mute_block_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 
 import '../../../constant/shortcuts.dart';
 import '../../../i18n/strings.g.dart';
@@ -32,7 +33,7 @@ class MuteBlockPage extends StatelessWidget {
           _MutedEmojisEditor(account: account),
           _InstanceMuteEditor(account: account),
           ListTile(
-            leading: const Icon(Icons.repeat_rounded),
+            leading: const Icon(OffIcons.repeat_rounded),
             title: Text('${t.misskey.mutedUsers} (${t.misskey.renote})'),
             trailing: const Icon(Icons.navigate_next),
             onTap: () => context

diff --git a/lib/view/widget/emoji_sheet.dart b/lib/view/widget/emoji_sheet.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
 import '../../i18n/strings.g.dart';
@@ -139,7 +140,7 @@ class EmojiSheet extends ConsumerWidget {
         if (!account.isGuest && host == null) ...[
           if (!isPinnedForReaction)
             ListTile(
-              leading: const Icon(Icons.push_pin),
+              leading: const Icon(Symbols.keep, fill: 1.0),
               title: Text('${t.aria.pinToEmojiPicker} (${t.misskey.reaction})'),
               onTap: () {
                 ref
@@ -153,7 +154,7 @@ class EmojiSheet extends ConsumerWidget {
             ),
           if (!isPinned)
             ListTile(
-              leading: const Icon(Icons.push_pin_outlined),
+              leading: const Icon(Symbols.keep_off, fill: 1.0),
               title: Text('${t.aria.pinToEmojiPicker} (${t.misskey.general})'),
               onTap: () {
                 ref

diff --git a/lib/view/widget/note_detailed_widget.dart b/lib/view/widget/note_detailed_widget.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 import 'package:misskey_dart/misskey_dart.dart' hide Clip;
 
 import '../../extension/note_extension.dart';
@@ -309,7 +310,7 @@ class NoteDetailedWidget extends HookConsumerWidget {
                                     Tooltip(
                                       message: t.misskey.visibility_
                                           .disableFederation,
-                                      child: const Icon(Icons.rocket_outlined),
+                                      child: const Icon(OffIcons.rocket),
                                     ),
                                 ],
                               ),

diff --git a/lib/view/widget/note_header.dart b/lib/view/widget/note_header.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
 import '../../extension/text_style_extension.dart';
@@ -135,7 +136,7 @@ class NoteHeader extends HookConsumerWidget {
               if (note.localOnly)
                 Tooltip(
                   message: t.misskey.visibility_.disableFederation,
-                  child: const Icon(Icons.rocket_outlined),
+                  child: const Icon(OffIcons.rocket),
                 ),
               if (note.channel != null)
                 Tooltip(

diff --git a/lib/view/widget/note_sheet.dart b/lib/view/widget/note_sheet.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:misskey_dart/misskey_dart.dart' hide Clip;
 import 'package:share_plus/share_plus.dart';
 
@@ -371,31 +372,28 @@ class NoteSheet extends ConsumerWidget {
           if (!account.isGuest) ...[
             if (appearNote.user.host == null &&
                 appearNote.user.username == account.username)
-              ListTile(
-                leading: const Icon(Icons.push_pin),
-                title: Text(
-                  i?.pinnedNoteIds?.contains(appearNote.id) ?? false
-                      ? t.misskey.unpin
-                      : t.misskey.pin,
+              if (i?.pinnedNoteIds?.contains(appearNote.id) ?? false)
+                ListTile(
+                  leading: const Icon(Symbols.keep_off, fill: 1.0),
+                  title: Text(t.misskey.unpin),
+                  onTap: () => futureWithDialog(
+                    context,
+                    ref
+                        .read(iNotifierProvider(account).notifier)
+                        .unpin(appearNote.id),
+                  ),
+                )
+              else
+                ListTile(
+                  leading: const Icon(Symbols.keep, fill: 1.0),
+                  title: Text(t.misskey.pin),
+                  onTap: () => futureWithDialog(
+                    context,
+                    ref
+                        .read(iNotifierProvider(account).notifier)
+                        .pin(appearNote.id),
+                  ),
                 ),
-                onTap: () async {
-                  if (i?.pinnedNoteIds?.contains(appearNote.id) ?? false) {
-                    await futureWithDialog(
-                      context,
-                      ref
-                          .read(iNotifierProvider(account).notifier)
-                          .unpin(appearNote.id),
-                    );
-                  } else {
-                    await futureWithDialog(
-                      context,
-                      ref
-                          .read(iNotifierProvider(account).notifier)
-                          .pin(appearNote.id),
-                    );
-                  }
-                },
-              ),
             ListTile(
               leading: const Icon(Icons.attach_file),
               title: Text(t.misskey.clip),

diff --git a/lib/view/widget/post_form.dart b/lib/view/widget/post_form.dart
@@ -9,6 +9,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 // import 'package:flutter_inset_shadow/flutter_inset_shadow.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 import 'package:mfm_parser/mfm_parser.dart';
 import 'package:misskey_dart/misskey_dart.dart' hide Clip;
 
@@ -533,7 +534,7 @@ class PostForm extends HookConsumerWidget {
                             .withValues(alpha: 0.5)
                         : null,
                     icon: request.localOnly ?? false
-                        ? const Icon(Icons.rocket_outlined)
+                        ? const Icon(OffIcons.rocket_outlined)
                         : const Icon(Icons.rocket),
                   ),
                   PopupMenuButton<void>(

diff --git a/lib/view/widget/renote_header.dart b/lib/view/widget/renote_header.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
 import '../../extension/text_style_extension.dart';
@@ -109,7 +110,7 @@ class RenoteHeader extends HookConsumerWidget {
                     if (note.localOnly)
                       Tooltip(
                         message: t.misskey.visibility_.disableFederation,
-                        child: const Icon(Icons.rocket_outlined),
+                        child: const Icon(OffIcons.rocket),
                       ),
                     if (note.channel != null)
                       Tooltip(

diff --git a/lib/view/widget/renote_sheet.dart b/lib/view/widget/renote_sheet.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:material_off_icons/material_off_icons.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
 import '../../i18n/strings.g.dart';
@@ -169,8 +170,7 @@ class RenoteSheet extends HookConsumerWidget {
               ),
             ),
           SwitchListTile(
-            secondary:
-                Icon(localOnly.value ? Icons.rocket_outlined : Icons.rocket),
+            secondary: Icon(localOnly.value ? OffIcons.rocket : Icons.rocket),
             title: Text(t.misskey.localOnly),
             value: localOnly.value,
             onChanged: !note.localOnly