feat: use off icons

poppingmoon · Jan 27, 2025 · 0d5fa1b · 0d5fa1b
1 parent b4dad03
commit 0d5fa1b
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 107 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/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/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

diff --git a/lib/view/widget/user_sheet.dart b/lib/view/widget/user_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_off_icons/material_off_icons.dart';
 import 'package:misskey_dart/misskey_dart.dart' hide Clip;
 
 import '../../extension/user_extension.dart';
@@ -342,7 +343,7 @@ class UserSheet extends ConsumerWidget {
                   )
                 else
                   ListTile(
-                    leading: const Icon(Icons.repeat_on_rounded),
+                    leading: const Icon(OffIcons.repeat_rounded),
                     title: Text(t.misskey.renoteMute),
                     onTap: () => futureWithDialog(
                       context,

diff --git a/pubspec.lock b/pubspec.lock
@@ -1238,6 +1238,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.1"
+  material_off_icons:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: d2ba3655f1104ed628cf9ecd88f603d71b92d90a
+      resolved-ref: d2ba3655f1104ed628cf9ecd88f603d71b92d90a
+      url: "https://github.com/poppingmoon/material_off_icons"
+    source: git
+    version: "0.1.0"
   material_symbols_icons:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -75,6 +75,10 @@ dependencies:
   json_annotation: ^4.9.0
   just_audio: ^0.9.43
   kana_kit: ^2.1.1
+  material_off_icons:
+    git:
+      url: https://github.com/poppingmoon/material_off_icons
+      ref: d2ba3655f1104ed628cf9ecd88f603d71b92d90a
   material_symbols_icons: ^4.2801.1
   mfm_parser:
     git:
@@ -152,17 +156,17 @@ flutter:
   uses-material-design: true
   assets:
     - assets/
-    - assets/fonts/BIZ_UDGothic/
-    - assets/fonts/BIZ_UDMincho/
-    - assets/fonts/Mplus1/
-    - assets/fonts/Mplus2/
-    - assets/fonts/Noto_Sans_JP/
-    - assets/fonts/Noto_Sans_KR/
-    - assets/fonts/Noto_Sans_SC/
-    - assets/fonts/Noto_Sans_TC/
-    - assets/fonts/Noto_Serif_JP/
-    - assets/fonts/Nunito/
-    - assets/fonts/Pretendard/
+    - assets/fonts/BIZ_UDGothic/OFL.txt
+    - assets/fonts/BIZ_UDMincho/OFL.txt
+    - assets/fonts/Mplus1/OFL.txt
+    - assets/fonts/Mplus2/OFL.txt
+    - assets/fonts/Noto_Sans_JP/OFL.txt
+    - assets/fonts/Noto_Sans_KR/OFL.txt
+    - assets/fonts/Noto_Sans_SC/OFL.txt
+    - assets/fonts/Noto_Sans_TC/OFL.txt
+    - assets/fonts/Noto_Serif_JP/OFL.txt
+    - assets/fonts/Nunito/OFL.txt
+    - assets/fonts/Pretendard/LICENSE.txt
     - assets/misskey/COPYING
     - assets/misskey/LICENSE
     - assets/misskey/packages/frontend/assets/