diff --git a/assets/fonts/custom_icon.ttf b/assets/fonts/custom_icon.ttf index f7e4a4eac..8d6b5d03b 100644 Binary files a/assets/fonts/custom_icon.ttf and b/assets/fonts/custom_icon.ttf differ diff --git a/lib/common/widgets/custom_icon.dart b/lib/common/widgets/custom_icon.dart index 00117db15..79740c27e 100644 --- a/lib/common/widgets/custom_icon.dart +++ b/lib/common/widgets/custom_icon.dart @@ -7,24 +7,24 @@ abstract final class CustomIcons { static const _kFontFam = 'custom_icon'; static const IconData ai_circle = IconData(0xe800, fontFamily: _kFontFam); - static const IconData coin = IconData(0xe801, fontFamily: _kFontFam); - static const IconData dm_off = IconData(0xe802, fontFamily: _kFontFam); - static const IconData dm_on = IconData(0xe803, fontFamily: _kFontFam); - static const IconData dm_settings = IconData(0xe804, fontFamily: _kFontFam); - static const IconData dyn = IconData(0xe805, fontFamily: _kFontFam); - static const IconData fav = IconData(0xe806, fontFamily: _kFontFam); - static const IconData flip_rotate_90 = IconData(0xe807, fontFamily: _kFontFam); + static const IconData dm_off = IconData(0xe801, fontFamily: _kFontFam); + static const IconData dm_on = IconData(0xe802, fontFamily: _kFontFam); + static const IconData dm_settings = IconData(0xe803, fontFamily: _kFontFam); + static const IconData download = IconData(0xe804, fontFamily: _kFontFam); + static const IconData flip_rotate_90 = IconData(0xe805, fontFamily: _kFontFam); + static const IconData folderDownloadOutline = IconData(0xe806, fontFamily: _kFontFam); + static const IconData history = IconData(0xe807, fontFamily: _kFontFam); static const IconData identifier_circle = IconData(0xe808, fontFamily: _kFontFam); static const IconData live_reserve = IconData(0xe809, fontFamily: _kFontFam); - static const IconData open_in_full_rotate_45 = IconData(0xe80a, fontFamily: _kFontFam); - static const IconData player_dm_tip_back = IconData(0xe80b, fontFamily: _kFontFam); - static const IconData player_dm_tip_copy = IconData(0xe80c, fontFamily: _kFontFam); - static const IconData player_dm_tip_like = IconData(0xe80d, fontFamily: _kFontFam); - static const IconData player_dm_tip_like_solid = IconData(0xe80e, fontFamily: _kFontFam); - static const IconData player_dm_tip_recall = IconData(0xe80f, fontFamily: _kFontFam); - static const IconData repeat_rounded_rotate_90 = IconData(0xe810, fontFamily: _kFontFam); - static const IconData share = IconData(0xe811, fontFamily: _kFontFam); - static const IconData share_line = IconData(0xe812, fontFamily: _kFontFam); + static const IconData motion_photos_on = IconData(0xe80a, fontFamily: _kFontFam); + static const IconData motion_photos_on_outlined = IconData(0xe80b, fontFamily: _kFontFam); + static const IconData open_in_full_rotate_45 = IconData(0xe80c, fontFamily: _kFontFam); + static const IconData player_dm_tip_back = IconData(0xe80d, fontFamily: _kFontFam); + static const IconData player_dm_tip_copy = IconData(0xe80e, fontFamily: _kFontFam); + static const IconData player_dm_tip_like = IconData(0xe80f, fontFamily: _kFontFam); + static const IconData player_dm_tip_like_solid = IconData(0xe810, fontFamily: _kFontFam); + static const IconData player_dm_tip_recall = IconData(0xe811, fontFamily: _kFontFam); + static const IconData repeat_rounded_rotate_90 = IconData(0xe812, fontFamily: _kFontFam); static const IconData share_node = IconData(0xe813, fontFamily: _kFontFam); static const IconData shield_play_arrow = IconData(0xe814, fontFamily: _kFontFam); static const IconData shield_published = IconData(0xe815, fontFamily: _kFontFam); @@ -33,14 +33,9 @@ abstract final class CustomIcons { static const IconData splitscreen_rotate_90 = IconData(0xe818, fontFamily: _kFontFam); static const IconData star_favorite_line = IconData(0xe819, fontFamily: _kFontFam); static const IconData star_favorite_solid = IconData(0xe81a, fontFamily: _kFontFam); - static const IconData thumbs_down = IconData(0xe81b, fontFamily: _kFontFam); - static const IconData thumbs_down_outline = IconData(0xe81c, fontFamily: _kFontFam); - static const IconData thumbs_up = IconData(0xe81d, fontFamily: _kFontFam); - static const IconData thumbs_up_fill = IconData(0xe81e, fontFamily: _kFontFam); - static const IconData thumbs_up_line = IconData(0xe81f, fontFamily: _kFontFam); - static const IconData thumbs_up_outline = IconData(0xe820, fontFamily: _kFontFam); - static const IconData topic_tag = IconData(0xe821, fontFamily: _kFontFam); - static const IconData touch_app_rotate_270 = IconData(0xe822, fontFamily: _kFontFam); - static const IconData view_headline_rotate_90 = IconData(0xe823, fontFamily: _kFontFam); - static const IconData watch_later = IconData(0xe824, fontFamily: _kFontFam); -} + static const IconData subscriptions_outlined = IconData(0xe81b, fontFamily: _kFontFam); + static const IconData topic_tag = IconData(0xe81c, fontFamily: _kFontFam); + static const IconData touch_app_rotate_270 = IconData(0xe81d, fontFamily: _kFontFam); + static const IconData view_headline_rotate_90 = IconData(0xe81e, fontFamily: _kFontFam); + static const IconData watch_later_outlined = IconData(0xe81f, fontFamily: _kFontFam); +} \ No newline at end of file diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart index 75db67df5..d69c8cde5 100644 --- a/lib/models/common/nav_bar_config.dart +++ b/lib/models/common/nav_bar_config.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/common/widgets/custom_icon.dart'; import 'package:PiliPlus/models/common/enum_with_label.dart'; import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/home/view.dart'; @@ -7,20 +8,20 @@ import 'package:flutter/material.dart'; enum NavigationBarType implements EnumWithLabel { home( '首页', - Icon(Icons.home_outlined, size: 24), - Icon(Icons.home, size: 24), + Icon(Icons.home_outlined), + Icon(Icons.home), HomePage(), ), dynamics( '动态', - Icon(Icons.motion_photos_on_outlined, size: 21), - Icon(Icons.motion_photos_on, size: 21), + Icon(CustomIcons.motion_photos_on_outlined), + Icon(CustomIcons.motion_photos_on), DynamicsPage(), ), mine( '我的', - Icon(Icons.person_outline, size: 24), - Icon(Icons.person, size: 24), + Icon(Icons.person_outline), + Icon(Icons.person), MinePage(), ), ; diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart index 3b6d0a8a4..6f98e20f5 100644 --- a/lib/pages/mine/controller.dart +++ b/lib/pages/mine/controller.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/common/widgets/custom_icon.dart'; import 'package:PiliPlus/http/fav.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; @@ -40,45 +41,40 @@ class MineController extends CommonDataController static RxBool anonymity = (Accounts.account.isNotEmpty && !Accounts.heartbeat.isLogin).obs; - late final list = - <({IconData icon, double size, String title, VoidCallback onTap})>[ - ( - size: 23, - icon: MdiIcons.folderDownloadOutline, - title: '离线缓存', - onTap: () => Get.toNamed('/download'), - ), - ( - size: 23, - icon: Icons.history, - title: '观看记录', - onTap: () { - if (isLogin) { - Get.toNamed('/history'); - } - }, - ), - ( - size: 20, - icon: Icons.subscriptions_outlined, - title: '我的订阅', - onTap: () { - if (isLogin) { - Get.toNamed('/subscription'); - } - }, - ), - ( - size: 21, - icon: Icons.watch_later_outlined, - title: '稍后再看', - onTap: () { - if (isLogin) { - Get.toNamed('/later'); - } - }, - ), - ]; + late final list = <({IconData icon, String title, VoidCallback onTap})>[ + ( + icon: CustomIcons.folderDownloadOutline, + title: '离线缓存', + onTap: () => Get.toNamed('/download'), + ), + ( + icon: CustomIcons.history, + title: '观看记录', + onTap: () { + if (isLogin) { + Get.toNamed('/history'); + } + }, + ), + ( + icon: CustomIcons.subscriptions_outlined, + title: '我的订阅', + onTap: () { + if (isLogin) { + Get.toNamed('/subscription'); + } + }, + ), + ( + icon: CustomIcons.watch_later_outlined, + title: '稍后再看', + onTap: () { + if (isLogin) { + Get.toNamed('/later'); + } + }, + ), + ]; @override void onInit() { diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index 8f5c92b94..72d7a19aa 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -119,7 +119,7 @@ class _MediaPageState extends CommonPageState mainAxisSize: .min, mainAxisAlignment: .center, children: [ - Icon(size: e.size, e.icon, color: primary), + Icon(e.icon, color: primary), Text( e.title, style: const TextStyle(fontSize: 13),