diff --git a/.gitignore b/.gitignore index 3a6b50c..8f1aa9c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,8 @@ example/.dart_tool/package_config_subset example/.dart_tool/package_graph.json example/.dart_tool/version example/.idea/* + +# macOS metadata files +._* + +.DS_Store diff --git a/example/lib/icons.dart b/example/lib/icons.dart index 7225f1d..dbf602f 100644 --- a/example/lib/icons.dart +++ b/example/lib/icons.dart @@ -4,7 +4,31 @@ import 'package:yx_icon_fonts_example/example_icon.dart'; // 此文件由脚本自动生成! final icons = [ + // 编辑相关图标 + ExampleIcon(YXIconFonts.icon30Edit, 'icon 30 edit'), + ExampleIcon(YXIconFonts.icon44Edit, 'icon 44 edit'), + ExampleIcon(YXIconFonts.icon36EditLine, 'icon 36 edit line'), + ExampleIcon(YXIconFonts.icon24Edit, 'icon 24 edit'), + + // 复制相关图标 + ExampleIcon(YXIconFonts.icon24Copy2, 'icon 24 copy2'), + ExampleIcon(YXIconFonts.icon24Copy, 'icon 24 copy'), + + // 删除相关图标 + ExampleIcon(YXIconFonts.icon30Delete, 'icon 30 delete'), + ExampleIcon(YXIconFonts.icon44Delete, 'icon 44 delete'), + ExampleIcon(YXIconFonts.icon36Delete, 'icon 36 delete'), + ExampleIcon(YXIconFonts.icon24Delete, 'icon 24 delete'), + + // 添加相关图标 + ExampleIcon(YXIconFonts.icon36Add, 'icon 36 add'), + ExampleIcon(YXIconFonts.icon24Add, 'icon 24 add'), + ExampleIcon(YXIconFonts.icon44Add, 'icon 44 add'), + ExampleIcon(YXIconFonts.icon32Add, 'icon 32 add'), + // 其他图标 + ExampleIcon(YXIconFonts.icon32Location, 'icon 32 location'), + ExampleIcon(YXIconFonts.icon24Mypoints, 'icon 24 mypoints'), ExampleIcon(YXIconFonts.icon44Search, 'icon 44 search'), ExampleIcon(YXIconFonts.icon36ClearPeople, 'icon 36 clear people'), ExampleIcon(YXIconFonts.icon32Publish, 'icon 32 publish'), @@ -22,6 +46,8 @@ final icons = [ ExampleIcon(YXIconFonts.icon24Plus, 'icon 24 plus'), // 个人中心相关图标 + ExampleIcon(YXIconFonts.icon44MeAbout, 'icon 44 me about'), + ExampleIcon(YXIconFonts.icon44MePointsmall, 'icon 44 me pointsmall'), ExampleIcon(YXIconFonts.icon44MeLogOut, 'icon 44 me log out'), ExampleIcon(YXIconFonts.icon44MeSwitch, 'icon 44 me switch'), ExampleIcon(YXIconFonts.icon44MePassword, 'icon 44 me password'), @@ -36,16 +62,6 @@ final icons = [ ExampleIcon(YXIconFonts.icon44WechatShareWhite, 'icon 44 wechat share white'), ExampleIcon(YXIconFonts.icon44Share, 'icon 44 share'), - // 编辑相关图标 - ExampleIcon(YXIconFonts.icon44Edit, 'icon 44 edit'), - ExampleIcon(YXIconFonts.icon36EditLine, 'icon 36 edit line'), - ExampleIcon(YXIconFonts.icon24Edit, 'icon 24 edit'), - - // 删除相关图标 - ExampleIcon(YXIconFonts.icon44Delete, 'icon 44 delete'), - ExampleIcon(YXIconFonts.icon36Delete, 'icon 36 delete'), - ExampleIcon(YXIconFonts.icon24Delete, 'icon 24 delete'), - // 消息相关图标 ExampleIcon(YXIconFonts.iconMsgContacts, 'icon msg contacts'), ExampleIcon(YXIconFonts.iconMsgVideo, 'icon msg video'), @@ -85,17 +101,9 @@ final icons = [ ExampleIcon(YXIconFonts.icon44More2, 'icon 44 more2'), ExampleIcon(YXIconFonts.icon44More, 'icon 44 more'), - // 复制相关图标 - ExampleIcon(YXIconFonts.icon24Copy, 'icon 24 copy'), - // 日历相关图标 ExampleIcon(YXIconFonts.icon44Calendar, 'icon 44 calendar'), - // 添加相关图标 - ExampleIcon(YXIconFonts.icon24Add, 'icon 24 add'), - ExampleIcon(YXIconFonts.icon44Add, 'icon 44 add'), - ExampleIcon(YXIconFonts.icon32Add, 'icon 32 add'), - // 键盘相关图标 ExampleIcon(YXIconFonts.icon44Keyboard, 'icon 44 keyboard'), diff --git a/fonts/iconfont.ttf b/fonts/iconfont.ttf index 5da9adf..24c1dee 100644 Binary files a/fonts/iconfont.ttf and b/fonts/iconfont.ttf differ diff --git a/generate/icons.dart b/generate/icons.dart index 7285344..a401c9e 100644 --- a/generate/icons.dart +++ b/generate/icons.dart @@ -8,6 +8,8 @@ class FontIcons { FontIcons._(); // 其他图标 + static const IconData icon32Location = YXIconFonts.icon32Location; + static const IconData icon24Mypoints = YXIconFonts.icon24Mypoints; static const IconData icon44Search = YXIconFonts.icon44Search; static const IconData icon36ClearPeople = YXIconFonts.icon36ClearPeople; static const IconData icon32Publish = YXIconFonts.icon32Publish; @@ -23,16 +25,20 @@ class FontIcons { static const IconData icon36OnlySee = YXIconFonts.icon36OnlySee; // 编辑相关图标 + static const IconData icon30Edit = YXIconFonts.icon30Edit; static const IconData icon44Edit = YXIconFonts.icon44Edit; static const IconData icon36EditLine = YXIconFonts.icon36EditLine; static const IconData icon24Edit = YXIconFonts.icon24Edit; // 删除相关图标 + static const IconData icon30Delete = YXIconFonts.icon30Delete; static const IconData icon44Delete = YXIconFonts.icon44Delete; static const IconData icon36Delete = YXIconFonts.icon36Delete; static const IconData icon24Delete = YXIconFonts.icon24Delete; // 个人中心相关图标 + static const IconData icon44MeAbout = YXIconFonts.icon44MeAbout; + static const IconData icon44MePointsmall = YXIconFonts.icon44MePointsmall; static const IconData icon44MeLogOut = YXIconFonts.icon44MeLogOut; static const IconData icon44MeSwitch = YXIconFonts.icon44MeSwitch; static const IconData icon44MePassword = YXIconFonts.icon44MePassword; @@ -86,17 +92,18 @@ class FontIcons { static const IconData icon44More = YXIconFonts.icon44More; // 复制相关图标 + static const IconData icon24Copy2 = YXIconFonts.icon24Copy2; static const IconData icon24Copy = YXIconFonts.icon24Copy; // 日历相关图标 static const IconData icon44Calendar = YXIconFonts.icon44Calendar; // 分享相关图标 - static const IconData icon44WechatShareWhite = - YXIconFonts.icon44WechatShareWhite; + static const IconData icon44WechatShareWhite = YXIconFonts.icon44WechatShareWhite; static const IconData icon44Share = YXIconFonts.icon44Share; // 添加相关图标 + static const IconData icon36Add = YXIconFonts.icon36Add; static const IconData icon24Add = YXIconFonts.icon24Add; static const IconData icon24Plus = YXIconFonts.icon24Plus; static const IconData icon44Add = YXIconFonts.icon44Add; @@ -104,4 +111,5 @@ class FontIcons { // 键盘相关图标 static const IconData icon44Keyboard = YXIconFonts.icon44Keyboard; + } diff --git a/iconfont.json b/iconfont.json index ee25490..2662405 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,10 +1,66 @@ { "id": "4944890", - "name": "学习官OA系统", + "name": "劝学APP-学习官OA系统", "font_family": "iconfont", "css_prefix_text": "", - "description": "学习官OA系统图标", + "description": "劝学APP-学习官OA系统图标", "glyphs": [ + { + "icon_id": "46077069", + "name": "icon_30_edit", + "font_class": "icon_30_edit", + "unicode": "e65b", + "unicode_decimal": 58971 + }, + { + "icon_id": "46077068", + "name": "icon_24_copy2", + "font_class": "icon_24_copy2", + "unicode": "e65c", + "unicode_decimal": 58972 + }, + { + "icon_id": "46077067", + "name": "icon_30_delete", + "font_class": "icon_30_delete", + "unicode": "e65d", + "unicode_decimal": 58973 + }, + { + "icon_id": "46077053", + "name": "icon_36_add", + "font_class": "icon_36_add", + "unicode": "e65a", + "unicode_decimal": 58970 + }, + { + "icon_id": "46076927", + "name": "icon_32_location", + "font_class": "icon_32_location", + "unicode": "e659", + "unicode_decimal": 58969 + }, + { + "icon_id": "46076827", + "name": "icon_24_mypoints", + "font_class": "icon_24_mypoints", + "unicode": "e657", + "unicode_decimal": 58967 + }, + { + "icon_id": "45986664", + "name": "icon_44_me_about", + "font_class": "icon_44_me_about", + "unicode": "e656", + "unicode_decimal": 58966 + }, + { + "icon_id": "45986657", + "name": "icon_44_me_pointsmall", + "font_class": "icon_44_me_pointsmall", + "unicode": "e658", + "unicode_decimal": 58968 + }, { "icon_id": "45876267", "name": "icon_44_search", diff --git a/lib/src/yx_icon_fonts_data.dart b/lib/src/yx_icon_fonts_data.dart index 363963b..feab3c9 100644 --- a/lib/src/yx_icon_fonts_data.dart +++ b/lib/src/yx_icon_fonts_data.dart @@ -9,6 +9,46 @@ class YXIconFonts { // 私有构造函数,防止实例化 YXIconFonts._(); + /// icon_30_edit 图标 + /// + /// Unicode: e65b + static const IconData icon30Edit = YXIconData(0xe65b); + + /// icon_24_copy2 图标 + /// + /// Unicode: e65c + static const IconData icon24Copy2 = YXIconData(0xe65c); + + /// icon_30_delete 图标 + /// + /// Unicode: e65d + static const IconData icon30Delete = YXIconData(0xe65d); + + /// icon_36_add 图标 + /// + /// Unicode: e65a + static const IconData icon36Add = YXIconData(0xe65a); + + /// icon_32_location 图标 + /// + /// Unicode: e659 + static const IconData icon32Location = YXIconData(0xe659); + + /// icon_24_mypoints 图标 + /// + /// Unicode: e657 + static const IconData icon24Mypoints = YXIconData(0xe657); + + /// icon_44_me_about 图标 + /// + /// Unicode: e656 + static const IconData icon44MeAbout = YXIconData(0xe656); + + /// icon_44_me_pointsmall 图标 + /// + /// Unicode: e658 + static const IconData icon44MePointsmall = YXIconData(0xe658); + /// icon_44_search 图标 /// /// Unicode: e655