From 7b0c3c9e40fa6a28dac9ffc70f12fccf82c1ab01 Mon Sep 17 00:00:00 2001 From: lmy <2534290808@qq.com> Date: Wed, 25 Sep 2019 11:08:23 +0800 Subject: [PATCH] File movement and adding assertions --- lib/flutter_icons.dart | 32 ++++++++++----------- lib/{ => src}/ant_design.dart | 15 ++++++---- lib/{ => src}/entypo.dart | 12 +++++--- lib/{ => src}/evil_icons.dart | 11 +++++-- lib/{ => src}/feather.dart | 13 ++++++--- lib/{ => src}/flutter_icon_data.dart | 0 lib/{ => src}/font_awesome.dart | 13 ++++++--- lib/{ => src}/font_awesome_5.dart | 6 +++- lib/{ => src}/foundation.dart | 13 ++++++--- lib/{ => src}/icon_toggle.dart | 0 lib/{ => src}/ionicons.dart | 12 ++++---- lib/{ => src}/material_community_icons.dart | 16 +++++++---- lib/{ => src}/material_icons.dart | 16 +++++++---- lib/{ => src}/octicons.dart | 13 ++++++--- lib/{ => src}/simple_line_icons.dart | 13 ++++++--- lib/{ => src}/weather_icons.dart | 4 +++ lib/{ => src}/zocial.dart | 14 ++++++--- 17 files changed, 134 insertions(+), 69 deletions(-) rename lib/{ => src}/ant_design.dart (96%) rename lib/{ => src}/entypo.dart (97%) rename lib/{ => src}/evil_icons.dart (88%) rename lib/{ => src}/feather.dart (95%) rename lib/{ => src}/flutter_icon_data.dart (100%) rename lib/{ => src}/font_awesome.dart (98%) rename lib/{ => src}/font_awesome_5.dart (99%) rename lib/{ => src}/foundation.dart (96%) rename lib/{ => src}/icon_toggle.dart (100%) rename lib/{ => src}/ionicons.dart (98%) rename lib/{ => src}/material_community_icons.dart (99%) rename lib/{ => src}/material_icons.dart (98%) rename lib/{ => src}/octicons.dart (94%) rename lib/{ => src}/simple_line_icons.dart (93%) rename lib/{ => src}/weather_icons.dart (99%) rename lib/{ => src}/zocial.dart (89%) diff --git a/lib/flutter_icons.dart b/lib/flutter_icons.dart index 8b22455..4a562c9 100644 --- a/lib/flutter_icons.dart +++ b/lib/flutter_icons.dart @@ -1,18 +1,18 @@ library flutter_icons; -export 'ionicons.dart'; -export 'ant_design.dart'; -export 'font_awesome.dart'; -export 'material_icons.dart'; -export 'entypo.dart'; -export 'evil_icons.dart'; -export 'feather.dart'; -export 'material_community_icons.dart'; -export 'octicons.dart'; -export 'simple_line_icons.dart'; -export 'zocial.dart'; -export 'foundation.dart'; -export 'font_awesome_5.dart'; -export 'flutter_icon_data.dart' show IconWeight; -export 'icon_toggle.dart'; -export 'weather_icons.dart'; +export 'src/ionicons.dart'; +export 'src/ant_design.dart'; +export 'src/font_awesome.dart'; +export 'src/material_icons.dart'; +export 'src/entypo.dart'; +export 'src/evil_icons.dart'; +export 'src/feather.dart'; +export 'src/material_community_icons.dart'; +export 'src/octicons.dart'; +export 'src/simple_line_icons.dart'; +export 'src/zocial.dart'; +export 'src/foundation.dart'; +export 'src/font_awesome_5.dart'; +export 'src/flutter_icon_data.dart' show IconWeight; +export 'src/icon_toggle.dart'; +export 'src/weather_icons.dart'; diff --git a/lib/ant_design.dart b/lib/src/ant_design.dart similarity index 96% rename from lib/ant_design.dart rename to lib/src/ant_design.dart index e34228a..028d36d 100644 --- a/lib/ant_design.dart +++ b/lib/src/ant_design.dart @@ -1,17 +1,20 @@ import 'flutter_icon_data.dart'; + class AntDesign { - static getIconData(iconName){ + static getIconData(iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the AntDesign", + ); return FlutterIconData.antDesign(_antDesign[iconName]); } - static hasIconData(iconName)=>_antDesign.containsKey(iconName); + static hasIconData(iconName) => _antDesign.containsKey(iconName); static const glyphMaps = _antDesign; } - - -const Map _antDesign ={ +const Map _antDesign = { "stepforward": 58880, "stepbackward": 58881, "forward": 58882, @@ -310,4 +313,4 @@ const Map _antDesign ={ "yuque": 59148, "slack": 59141, "slack-square": 59142 -}; \ No newline at end of file +}; diff --git a/lib/entypo.dart b/lib/src/entypo.dart similarity index 97% rename from lib/entypo.dart rename to lib/src/entypo.dart index 9bf5e3d..4c48afc 100644 --- a/lib/entypo.dart +++ b/lib/src/entypo.dart @@ -1,16 +1,20 @@ import 'flutter_icon_data.dart'; class Entypo { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Entypo", + ); return FlutterIconData.entypo(_entypo[iconName]); } - static hasIconData(iconName)=>_entypo.containsKey(iconName); + static hasIconData(iconName) => _entypo.containsKey(iconName); static const glyphMaps = _entypo; } -const Map _entypo ={ +const Map _entypo = { "500px": 61696, "500px-with-circle": 61697, "add-to-list": 61698, @@ -422,4 +426,4 @@ const Map _entypo ={ "youko-with-circle": 62104, "youtube": 62105, "youtube-with-circle": 62106 -}; \ No newline at end of file +}; diff --git a/lib/evil_icons.dart b/lib/src/evil_icons.dart similarity index 88% rename from lib/evil_icons.dart rename to lib/src/evil_icons.dart index dbc38ad..7c451dc 100644 --- a/lib/evil_icons.dart +++ b/lib/src/evil_icons.dart @@ -1,14 +1,19 @@ import 'flutter_icon_data.dart'; class EvilIcons { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the EvilIcons", + ); return FlutterIconData.evilIcons(_evilIcons[iconName]); } - static hasIconData(iconName)=>_evilIcons.containsKey(iconName); + static hasIconData(iconName) => _evilIcons.containsKey(iconName); static const glyphMaps = _evilIcons; } + const Map _evilIcons = { "archive": 61696, "arrow-down": 61697, @@ -80,4 +85,4 @@ const Map _evilIcons = { "undo": 61763, "unlock": 61764, "user": 61765 -}; \ No newline at end of file +}; diff --git a/lib/feather.dart b/lib/src/feather.dart similarity index 95% rename from lib/feather.dart rename to lib/src/feather.dart index 5a46ca1..c35b5f0 100644 --- a/lib/feather.dart +++ b/lib/src/feather.dart @@ -1,15 +1,20 @@ import 'flutter_icon_data.dart'; class Feather { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Feather", + ); return FlutterIconData.feather(_feather[iconName]); } - static hasIconData(iconName)=>_feather.containsKey(iconName); + static hasIconData(iconName) => _feather.containsKey(iconName); static const glyphMaps = _feather; } -const Map _feather ={ + +const Map _feather = { "activity": 59648, "airplay": 59649, "alert-circle": 59650, @@ -276,4 +281,4 @@ const Map _feather ={ "zap-off": 59911, "zoom-in": 59912, "zoom-out": 59913 -}; \ No newline at end of file +}; diff --git a/lib/flutter_icon_data.dart b/lib/src/flutter_icon_data.dart similarity index 100% rename from lib/flutter_icon_data.dart rename to lib/src/flutter_icon_data.dart diff --git a/lib/font_awesome.dart b/lib/src/font_awesome.dart similarity index 98% rename from lib/font_awesome.dart rename to lib/src/font_awesome.dart index 6e2af71..4779741 100644 --- a/lib/font_awesome.dart +++ b/lib/src/font_awesome.dart @@ -1,15 +1,20 @@ import 'flutter_icon_data.dart'; class FontAwesome { - static getIconData(iconName){ + static getIconData(iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the FontAwesome", + ); return FlutterIconData.fontAwesome(_fontAwesome[iconName]); } - static hasIconData(iconName)=>_fontAwesome.containsKey(iconName); + static hasIconData(iconName) => _fontAwesome.containsKey(iconName); static const glyphMaps = _fontAwesome; } -const Map _fontAwesome = { + +const Map _fontAwesome = { "glass": 61440, "music": 61441, "search": 61442, @@ -796,4 +801,4 @@ const Map _fontAwesome = { "superpowers": 62173, "wpexplorer": 62174, "meetup": 62176 -}; \ No newline at end of file +}; diff --git a/lib/font_awesome_5.dart b/lib/src/font_awesome_5.dart similarity index 99% rename from lib/font_awesome_5.dart rename to lib/src/font_awesome_5.dart index 6656ed7..1e9d38e 100644 --- a/lib/font_awesome_5.dart +++ b/lib/src/font_awesome_5.dart @@ -1,7 +1,11 @@ import 'flutter_icon_data.dart'; class FontAwesome5 { - static getIconData(iconName, {IconWeight weight}) { + static getIconData(iconName, {IconWeight weight = IconWeight.Regular}) { + assert( + hasIconData(iconName, weight: weight), + "The icon $iconName does not exist in the FontAwesome5($weight)", + ); return FlutterIconData.fontAwesome5(_fontAwesome5[iconName], weight: weight); } diff --git a/lib/foundation.dart b/lib/src/foundation.dart similarity index 96% rename from lib/foundation.dart rename to lib/src/foundation.dart index 159e80b..fd2c4a6 100644 --- a/lib/foundation.dart +++ b/lib/src/foundation.dart @@ -1,15 +1,20 @@ import 'flutter_icon_data.dart'; class Foundation { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Foundation", + ); return FlutterIconData.foundation(_foundation[iconName]); } - static hasIconData(iconName)=>_foundation.containsKey(iconName); + static hasIconData(iconName) => _foundation.containsKey(iconName); static const glyphMaps = _foundation; } -const Map _foundation = { + +const Map _foundation = { "address-book": 61696, "alert": 61697, "align-center": 61698, @@ -293,4 +298,4 @@ const Map _foundation = { "yen": 61976, "zoom-in": 61977, "zoom-out": 61978 -}; \ No newline at end of file +}; diff --git a/lib/icon_toggle.dart b/lib/src/icon_toggle.dart similarity index 100% rename from lib/icon_toggle.dart rename to lib/src/icon_toggle.dart diff --git a/lib/ionicons.dart b/lib/src/ionicons.dart similarity index 98% rename from lib/ionicons.dart rename to lib/src/ionicons.dart index 39bec4c..5621593 100644 --- a/lib/ionicons.dart +++ b/lib/src/ionicons.dart @@ -1,17 +1,19 @@ import 'flutter_icon_data.dart'; -import 'package:flutter/material.dart'; -class Ionicons{ +class Ionicons { static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Ionicons", + ); return FlutterIconData.ionicons(_ionicons[iconName]); } - static hasIconData(iconName)=>_ionicons.containsKey(iconName); + static hasIconData(iconName) => _ionicons.containsKey(iconName); static const glyphMaps = _ionicons; } - const Map _ionicons = const { "ios-add": 61698, "ios-add-circle": 61697, @@ -709,4 +711,4 @@ const Map _ionicons = const { "md-wifi": 62376, "md-wine": 62377, "md-woman": 62378 -}; \ No newline at end of file +}; diff --git a/lib/material_community_icons.dart b/lib/src/material_community_icons.dart similarity index 99% rename from lib/material_community_icons.dart rename to lib/src/material_community_icons.dart index dff253f..2249612 100644 --- a/lib/material_community_icons.dart +++ b/lib/src/material_community_icons.dart @@ -1,15 +1,21 @@ import 'flutter_icon_data.dart'; class MaterialCommunityIcons { - static getIconData(String iconName){ - return FlutterIconData.materialCommunityIcons(_materialCommunityIcons[iconName]); + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the MaterialCommunityIcons", + ); + return FlutterIconData.materialCommunityIcons( + _materialCommunityIcons[iconName]); } - static hasIconData(iconName)=>_materialCommunityIcons.containsKey(iconName); + static hasIconData(iconName) => _materialCommunityIcons.containsKey(iconName); static const glyphMaps = _materialCommunityIcons; } -const Map _materialCommunityIcons = { + +const Map _materialCommunityIcons = { "ab-testing": 983068, "access-point": 61442, "access-point-network": 61443, @@ -4107,4 +4113,4 @@ const Map _materialCommunityIcons = { "zodiac-taurus": 64134, "zodiac-virgo": 64135, "blank": 63116 -}; \ No newline at end of file +}; diff --git a/lib/material_icons.dart b/lib/src/material_icons.dart similarity index 98% rename from lib/material_icons.dart rename to lib/src/material_icons.dart index 6608169..dd3a781 100644 --- a/lib/material_icons.dart +++ b/lib/src/material_icons.dart @@ -1,14 +1,20 @@ import 'flutter_icon_data.dart'; + class MaterialIcons { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the MaterialIcons", + ); return FlutterIconData.materialIcons(_materialIcons[iconName]); } - static hasIconData(iconName)=>_materialIcons.containsKey(iconName); - static const glyphMaps = _materialIcons; + static hasIconData(iconName) => _materialIcons.containsKey(iconName); + static const glyphMaps = _materialIcons; } -const Map _materialIcons = { + +const Map _materialIcons = { "3d-rotation": 59469, "ac-unit": 60219, "access-alarm": 57744, @@ -941,4 +947,4 @@ const Map _materialIcons = { "zoom-in": 59647, "zoom-out": 59648, "zoom-out-map": 58731 -}; \ No newline at end of file +}; diff --git a/lib/octicons.dart b/lib/src/octicons.dart similarity index 94% rename from lib/octicons.dart rename to lib/src/octicons.dart index 3189e8d..9cdf98d 100644 --- a/lib/octicons.dart +++ b/lib/src/octicons.dart @@ -1,15 +1,20 @@ import 'flutter_icon_data.dart'; class Octicons { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Octicons", + ); return FlutterIconData.octicons(_octicons[iconName]); } - static hasIconData(iconName)=>_octicons.containsKey(iconName); + static hasIconData(iconName) => _octicons.containsKey(iconName); static const glyphMaps = _octicons; } -const Map _octicons ={ + +const Map _octicons = { "alert": 61696, "archive": 61697, "arrow-down": 61698, @@ -187,4 +192,4 @@ const Map _octicons ={ "watch": 61870, "x": 61871, "zap": 61872 -}; \ No newline at end of file +}; diff --git a/lib/simple_line_icons.dart b/lib/src/simple_line_icons.dart similarity index 93% rename from lib/simple_line_icons.dart rename to lib/src/simple_line_icons.dart index 4a33d71..706c294 100644 --- a/lib/simple_line_icons.dart +++ b/lib/src/simple_line_icons.dart @@ -1,15 +1,20 @@ import 'flutter_icon_data.dart'; class SimpleLineIcons { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the SimpleLineIcons", + ); return FlutterIconData.simpleLineIcons(_simpleLineIcons[iconName]); } - static hasIconData(iconName)=>_simpleLineIcons.containsKey(iconName); + static hasIconData(iconName) => _simpleLineIcons.containsKey(iconName); static const glyphMaps = _simpleLineIcons; } -const Map _simpleLineIcons = { + +const Map _simpleLineIcons = { "user": 57349, "people": 57345, "user-female": 57344, @@ -199,4 +204,4 @@ const Map _simpleLineIcons = { "social-dropbox": 57356, "social-vkontakte": 58904, "social-steam": 58912 -}; \ No newline at end of file +}; diff --git a/lib/weather_icons.dart b/lib/src/weather_icons.dart similarity index 99% rename from lib/weather_icons.dart rename to lib/src/weather_icons.dart index 3ec386b..383aec8 100644 --- a/lib/weather_icons.dart +++ b/lib/src/weather_icons.dart @@ -2,6 +2,10 @@ import 'flutter_icon_data.dart'; class WeatherIcons { static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the WeatherIcons", + ); return FlutterIconData.weatherIcons(_weatherIcons[iconName]); } diff --git a/lib/zocial.dart b/lib/src/zocial.dart similarity index 89% rename from lib/zocial.dart rename to lib/src/zocial.dart index 8b23fc1..fa92a4e 100644 --- a/lib/zocial.dart +++ b/lib/src/zocial.dart @@ -1,14 +1,20 @@ import 'flutter_icon_data.dart'; + class Zocial { - static getIconData(String iconName){ + static getIconData(String iconName) { + assert( + hasIconData(iconName), + "The icon $iconName does not exist in the Zocial", + ); return FlutterIconData.zocial(_zocial[iconName]); } - static hasIconData(iconName)=>_zocial.containsKey(iconName); + static hasIconData(iconName) => _zocial.containsKey(iconName); static const glyphMaps = _zocial; } -const Map _zocial = { + +const Map _zocial = { "acrobat": 61696, "amazon": 61697, "android": 61698, @@ -109,4 +115,4 @@ const Map _zocial = { "ycombinator": 61793, "yelp": 61794, "youtube": 61795 -}; \ No newline at end of file +};