diff --git a/assets/iconfont/icon_builder.dart b/assets/iconfont/icon_builder.dart index 8986d87..4bd785e 100644 --- a/assets/iconfont/icon_builder.dart +++ b/assets/iconfont/icon_builder.dart @@ -3,26 +3,26 @@ import 'dart:io'; import 'package:path/path.dart' as path; main() async{ - var fontName ='TolyIcon'; - var fileName ='toly_icon'; - var resDir="assets/iconfont";//资源文件夹 - var outFile='lib/app/res/$fileName.dart';//输出文件地址 + String fontName ='TolyIcon'; + String fileName ='toly_icon'; + String resDir="assets/iconfont";//资源文件夹 + String outFile='lib/app/res/$fileName.dart';//输出文件地址 - var result = """import 'package:flutter/widgets.dart'; + String result = """import 'package:flutter/widgets.dart'; //Power By 张风捷特烈--- Generated file. Do not edit. class $fontName { $fontName._(); """; - var fileCss = File(path.join(Directory.current.path,"$resDir/iconfont.css")); + File fileCss = File(path.join(Directory.current.path,"$resDir/iconfont.css")); if (! await fileCss.exists()) return; - var read = await fileCss.readAsString(); - var split = read.split(".icon-"); + String read = await fileCss.readAsString(); + List split = read.split(".icon-"); split.forEach((str) { if (str.contains("before")) { - var split = str.split(":"); + List split = str.split(":"); result += "static const IconData " + split[0].replaceAll("-", "_") + " = const IconData(" + @@ -33,13 +33,13 @@ class $fontName { result+="}"; fileCss.delete();//删除css文件 - var fileOut = File(path.join(Directory.current.path,"$outFile")); + File fileOut = File(path.join(Directory.current.path,"$outFile")); if(! await fileOut.exists()){ await fileOut.create(recursive: true); } fileOut.writeAsString(result);//将代码写入dart文件 - var config=""" + String config=""" fonts: - family: $fontName fonts: diff --git a/lib/app/api/issues_api.dart b/lib/app/api/issues_api.dart index dd413c7..4127ab8 100644 --- a/lib/app/api/issues_api.dart +++ b/lib/app/api/issues_api.dart @@ -12,24 +12,24 @@ import 'package:flutter_unit/model/github/repository.dart'; const kBaseUrl = 'http://119.45.173.197:8080/api/v1'; class IssuesApi { - static var dio = Dio(BaseOptions(baseUrl: kBaseUrl)); + static Dio dio = Dio(BaseOptions(baseUrl: kBaseUrl)); static Future getRepoFlutterUnit() async { - var rep = await dio.get('/repository/name/FlutterUnit'); - var repoStr = rep.data['data']['repositoryData']; + Response rep = await dio.get('/repository/name/FlutterUnit'); + dynamic repoStr = rep.data['data']['repositoryData']; return Repository.fromJson(json.decode(repoStr)); } static Future> getIssues( {int page = 1, int pageSize = 100}) async { - var res = (await dio.get('/point', + List res = (await dio.get('/point', queryParameters: {"page": page, "pageSize": pageSize})) .data['data'] as List; return res.map((e) => Issue.fromJson(json.decode(e['pointData']))).toList(); } static Future> getIssuesComment(int pointId) async { - var res = (await dio.get('/pointComment/$pointId')).data['data'] as List; + List res = (await dio.get('/pointComment/$pointId')).data['data'] as List; return res .map((e) => IssueComment.fromJson(json.decode(e['pointCommentData']))) .toList(); diff --git a/lib/app/res/cons.dart b/lib/app/res/cons.dart index 93a13b8..a291d3a 100644 --- a/lib/app/res/cons.dart +++ b/lib/app/res/cons.dart @@ -42,7 +42,7 @@ class Cons { 'Neucha' ]; - static var codeThemeSupport = { + static Map codeThemeSupport = { HighlighterStyle.fromColors(HighlighterStyle.gitHub):"GitHub - Power By 张风捷特烈", HighlighterStyle.fromColors(HighlighterStyle.darkColor):"捷特黑 - Power By 张风捷特烈", HighlighterStyle.fromColors(HighlighterStyle.lightColor):"捷特白 - Power By 张风捷特烈", diff --git a/lib/app/res/style/shape/coupon_shape_border.dart b/lib/app/res/style/shape/coupon_shape_border.dart index d58f1de..4b6831f 100644 --- a/lib/app/res/style/shape/coupon_shape_border.dart +++ b/lib/app/res/style/shape/coupon_shape_border.dart @@ -35,12 +35,12 @@ class CouponShapeBorder extends ShapeBorder { @override Path getOuterPath(Rect rect, {TextDirection textDirection}) { - var w = rect.width; - var h = rect.height; + double w = rect.width; + double h = rect.height; - var d = h / (1 + 2 * holeCount); + double d = h / (1 + 2 * holeCount); - var path = Path(); + Path path = Path(); path.addRect(rect); _formHoldLeft(path, d); @@ -84,20 +84,20 @@ class CouponShapeBorder extends ShapeBorder { _formHoldLeft(Path path, double d) { for (int i = 0; i < holeCount; i++) { - var left = -d / 2; - var top = 0.0 + d + 2 * d * (i); - var right = left + d; - var bottom = top + d; + double left = -d / 2; + double top = 0.0 + d + 2 * d * (i); + double right = left + d; + double bottom = top + d; path.addArc(Rect.fromLTRB(left, top, right, bottom), -pi / 2, pi); } } _formHoldRight(Path path, double w, double d) { for (int i = 0; i < holeCount; i++) { - var left = -d / 2 + w; - var top = 0.0 + d + 2 * d * (i); - var right = left + d; - var bottom = top + d; + double left = -d / 2 + w; + double top = 0.0 + d + 2 * d * (i); + double right = left + d; + double bottom = top + d; path.addArc(Rect.fromLTRB(left, top, right, bottom), pi / 2, pi); } } @@ -105,12 +105,12 @@ class CouponShapeBorder extends ShapeBorder { @override void paint(Canvas canvas, Rect rect, {TextDirection textDirection}) { if(!hasLine) return; - var paint = Paint() + Paint paint = Paint() ..color = color ..strokeWidth = 1.5 ..style = PaintingStyle.stroke ..strokeJoin = StrokeJoin.round; - var d = rect.height / (1 + 2 * holeCount); + double d = rect.height / (1 + 2 * holeCount); if (dash) { _drawDashLine(canvas, Offset(lineRate * rect.width, d / 2), rect.height / 16, rect.height - 13, paint); @@ -122,9 +122,9 @@ class CouponShapeBorder extends ShapeBorder { _drawDashLine( Canvas canvas, Offset start, double count, double length, Paint paint) { - var step = length / count / 2; + double step = length / count / 2; for (int i = 0; i < count; i++) { - var offset = start + Offset(0, 2 * step * i); + Offset offset = start + Offset(0, 2 * step * i); canvas.drawLine(offset, offset + Offset(0, step), paint); } } diff --git a/lib/app/res/style/shape/techno_shape.dart b/lib/app/res/style/shape/techno_shape.dart index 656f5bb..3a85279 100644 --- a/lib/app/res/style/shape/techno_shape.dart +++ b/lib/app/res/style/shape/techno_shape.dart @@ -38,7 +38,7 @@ class TechnoShapeBorder extends ShapeBorder { @override Path getInnerPath(Rect rect, {TextDirection textDirection}) { - var path = Path(); + Path path = Path(); path.addRRect(RRect.fromRectAndRadius(rect, Radius.circular(5))); return path; } diff --git a/lib/app/utils/color_utils.dart b/lib/app/utils/color_utils.dart index 8040587..3e245dd 100644 --- a/lib/app/utils/color_utils.dart +++ b/lib/app/utils/color_utils.dart @@ -4,23 +4,7 @@ import 'package:flutter/material.dart'; import 'random_provider.dart'; -//Color randomColor(){/// 用来返回一个随机色 -//var random=Random(); -//var a = random.nextInt(256);//透明度值 -//var r = random.nextInt(256);//红值 -//var g = random.nextInt(256);//绿值 -//var b = random.nextInt(256);//蓝值 -//return Color.fromARGB(a, r, g, b);//生成argb模式的颜色 -//} -//Color randomColor(int limitA){ -// var random=Random(); -// var a = limitA+random.nextInt(256-limitA);//透明度值 -// var r = random.nextInt(256);//红值 -// var g = random.nextInt(256);//绿值 -// var b = random.nextInt(256);//蓝值 -// return Color.fromARGB(a, r, g, b);//生成argb模式的颜色 -//} class ColorUtils { static Color randomColor({ @@ -29,11 +13,11 @@ class ColorUtils { int limitG = 0, int limitB = 0, }) { - var random = RandomProvider.random; - var a = limitA + random.nextInt(256 - limitA); //透明度值 - var r = limitR + random.nextInt(256 - limitR); //红值 - var g = limitG + random.nextInt(256 - limitG); //绿值 - var b = limitB + random.nextInt(256 - limitB); //蓝值 + Random random = RandomProvider.random; + int a = limitA + random.nextInt(256 - limitA); //透明度值 + int r = limitR + random.nextInt(256 - limitR); //红值 + int g = limitG + random.nextInt(256 - limitG); //绿值 + int b = limitB + random.nextInt(256 - limitB); //蓝值 return Color.fromARGB(a, r, g, b); //生成argb模式的颜色 } @@ -46,7 +30,7 @@ class ColorUtils { /// static Color parse(String code) { Color result =Colors.red; - var value = 0 ; + int value = 0 ; if (code.contains("#")) { try { value = int.parse(code.substring(1), radix: 16); diff --git a/lib/app/utils/random_provider.dart b/lib/app/utils/random_provider.dart index 11239d8..b34218b 100644 --- a/lib/app/utils/random_provider.dart +++ b/lib/app/utils/random_provider.dart @@ -3,5 +3,5 @@ import 'dart:math'; class RandomProvider{ RandomProvider._();//私有化构造 static final _random= Random(); - static get random =>_random; + static Random get random =>_random; } \ No newline at end of file diff --git a/lib/blocs/category/category_bloc.dart b/lib/blocs/category/category_bloc.dart index 1e2b23c..6c1f0d6 100644 --- a/lib/blocs/category/category_bloc.dart +++ b/lib/blocs/category/category_bloc.dart @@ -39,7 +39,7 @@ class CategoryBloc extends Bloc { } if (event is EventAddCategory) { - var categoryPo = CategoryPo( + CategoryPo categoryPo = CategoryPo( name: event.name, color: event.color ?? ColorUtils.colorString(UnitColor.collectColorSupport[0]), @@ -58,7 +58,7 @@ class CategoryBloc extends Bloc { } if (event is EventUpdateCategory) { - var categoryPo = CategoryPo( + CategoryPo categoryPo = CategoryPo( id: event.id, name: event.name, priority: event.priority ?? 0, diff --git a/lib/blocs/global/global_bloc.dart b/lib/blocs/global/global_bloc.dart index 3468ec9..c0aeed1 100644 --- a/lib/blocs/global/global_bloc.dart +++ b/lib/blocs/global/global_bloc.dart @@ -29,14 +29,14 @@ class GlobalBloc extends Bloc { } if (event is EventSwitchFontFamily) { - var familyIndex = Cons.fontFamilySupport.indexOf(event.family); + int familyIndex = Cons.fontFamilySupport.indexOf(event.family); await sp ..setInt(SP.fontFamily, familyIndex); //固化数据 yield state.copyWith(fontFamily: event.family); } if (event is EventSwitchThemeColor) { - var themeIndex = + int themeIndex = Cons.themeColorSupport.keys.toList().indexOf(event.color); await sp ..setInt(SP.themeColorIndex, themeIndex); //固化数据 diff --git a/lib/components/permanent/circle_image.dart b/lib/components/permanent/circle_image.dart index 724bd11..08c628f 100644 --- a/lib/components/permanent/circle_image.dart +++ b/lib/components/permanent/circle_image.dart @@ -16,7 +16,7 @@ class CircleImage extends StatelessWidget { final double borderSize; @override Widget build(BuildContext context) { - var headIcon = Container( + Widget headIcon = Container( width: size, height: size, decoration: BoxDecoration( diff --git a/lib/components/permanent/circle_text.dart b/lib/components/permanent/circle_text.dart index 8918a9e..f453082 100644 --- a/lib/components/permanent/circle_text.dart +++ b/lib/components/permanent/circle_text.dart @@ -20,7 +20,7 @@ class CircleText extends StatelessWidget { final Color backgroundColor; //边框颜色 @override Widget build(BuildContext context) { - var headIcon = Container( + Widget headIcon = Container( width: size, height: size, decoration: BoxDecoration( diff --git a/lib/components/permanent/edit_panel.dart b/lib/components/permanent/edit_panel.dart index 7a554d8..7143bf0 100644 --- a/lib/components/permanent/edit_panel.dart +++ b/lib/components/permanent/edit_panel.dart @@ -32,7 +32,7 @@ class EditPanel extends StatefulWidget { } class _EditPanelState extends State { - var _radius; //边角半径 + Radius _radius; //边角半径 TextEditingController _controller; @@ -51,7 +51,7 @@ class _EditPanelState extends State { @override Widget build(BuildContext context) { - var panel = TextField( + Widget panel = TextField( controller: _controller, //输入控制器 keyboardType: TextInputType.text, diff --git a/lib/components/permanent/feedback_widget.dart b/lib/components/permanent/feedback_widget.dart index 36a148e..9ec52c2 100644 --- a/lib/components/permanent/feedback_widget.dart +++ b/lib/components/permanent/feedback_widget.dart @@ -33,7 +33,7 @@ class FeedbackWidget extends StatefulWidget { class _FeedBackState extends State with SingleTickerProviderStateMixin { AnimationController _controller; - var rate = 1.0; + double rate = 1.0; @override void initState() { diff --git a/lib/components/permanent/input_button.dart b/lib/components/permanent/input_button.dart index 81f6b51..d82b261 100644 --- a/lib/components/permanent/input_button.dart +++ b/lib/components/permanent/input_button.dart @@ -42,9 +42,9 @@ class InputButton extends StatefulWidget { } class _InputButtonState extends State { - var _height; - var _fontSize; - var _radius; + double _height; + double _fontSize; + Radius _radius; TextEditingController _controller; @@ -65,7 +65,7 @@ class _InputButtonState extends State { @override Widget build(BuildContext context) { - var textField = TextField( + Widget textField = TextField( controller: _controller, maxLines: 1, style: TextStyle( @@ -94,7 +94,7 @@ class _InputButtonState extends State { }, onTap: widget.onTap, ); - var btn = RaisedButton( + Widget btn = RaisedButton( elevation: 0, child: Icon(widget.config.iconData,color: Theme.of(context).primaryColor,), @@ -110,7 +110,7 @@ class _InputButtonState extends State { } }, ); - var inputBtn = Row( + Widget inputBtn = Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( diff --git a/lib/components/permanent/markdown/markdown_widget.dart b/lib/components/permanent/markdown/markdown_widget.dart index 0b1fee7..636beca 100644 --- a/lib/components/permanent/markdown/markdown_widget.dart +++ b/lib/components/permanent/markdown/markdown_widget.dart @@ -15,7 +15,7 @@ class MarkdownWidget extends StatelessWidget { MarkdownWidget({this.markdownData = "", this.style = kWhite}); - _getCommonSheet(BuildContext context, Color codeBackground) { + MarkdownStyleSheet _getCommonSheet(BuildContext context, Color codeBackground) { MarkdownStyleSheet markdownStyleSheet = MarkdownStyleSheet.fromTheme(Theme.of(context)); return markdownStyleSheet.copyWith( codeblockDecoration: new BoxDecoration( @@ -47,7 +47,7 @@ class MarkdownWidget extends StatelessWidget { ); } - _getStyleSheetWhite(BuildContext context) { + MarkdownStyleSheet _getStyleSheetWhite(BuildContext context) { return _getCommonSheet(context, Color.fromRGBO(40, 44, 52, 1.00)).copyWith( p: UnitTextStyle.smallText, h1: UnitTextStyle.largeLargeText, @@ -90,7 +90,7 @@ class MarkdownWidget extends StatelessWidget { } _getStyle(BuildContext context) { - var styleSheet = _getStyleSheetWhite(context); + MarkdownStyleSheet styleSheet = _getStyleSheetWhite(context); switch (style) { case kDarkLight: styleSheet = _getStyleSheetDark(context); diff --git a/lib/components/project/color_chooser.dart b/lib/components/project/color_chooser.dart index 8061fc3..f3c1a3a 100644 --- a/lib/components/project/color_chooser.dart +++ b/lib/components/project/color_chooser.dart @@ -35,8 +35,8 @@ class _ColorChooserState extends State { @override Widget build(BuildContext context) { - var li = []; - for (var i = 0; i < widget.colors.length; i++) { + List li = []; + for (int i = 0; i < widget.colors.length; i++) { li.add(FeedbackWidget( a: 0.8, onPressed: () { @@ -93,8 +93,8 @@ class _IconChooserState extends State { @override Widget build(BuildContext context) { - var li = []; - for (var i = 0; i < widget.icons.length; i++) { + List li = []; + for (int i = 0; i < widget.icons.length; i++) { li.add(GestureDetector( onTap: () { _checkLi[_perPosition] = false; @@ -113,8 +113,8 @@ class _IconChooserState extends State { } buildIcon({bool checked, IconData icon}) { - var defaultColor = Colors.black26; - var activeColor = Colors.blue; + Color defaultColor = Colors.black26; + Color activeColor = Colors.blue; return Icon( icon, color: checked ? activeColor : defaultColor, diff --git a/lib/components/project/widget_node_panel.dart b/lib/components/project/widget_node_panel.dart index 62b2bc0..166cfff 100644 --- a/lib/components/project/widget_node_panel.dart +++ b/lib/components/project/widget_node_panel.dart @@ -36,7 +36,7 @@ class WidgetNodePanel extends StatefulWidget { } class _WidgetNodePanelState extends State { - var _crossFadeState = CrossFadeState.showFirst; + CrossFadeState _crossFadeState = CrossFadeState.showFirst; bool get isFirst => _crossFadeState == CrossFadeState.showFirst; diff --git a/lib/repositories/impl/catagory_db_repository.dart b/lib/repositories/impl/catagory_db_repository.dart index 14114f5..211b48e 100644 --- a/lib/repositories/impl/catagory_db_repository.dart +++ b/lib/repositories/impl/catagory_db_repository.dart @@ -21,7 +21,7 @@ class CategoryDbRepository implements CategoryRepository { @override Future addCategory(CategoryPo categoryPo) async { - var success = await _categoryDao.insert(categoryPo); + int success = await _categoryDao.insert(categoryPo); return success != -1; } @@ -37,15 +37,15 @@ class CategoryDbRepository implements CategoryRepository { @override Future> loadCategories() async { - var data = await _categoryDao.queryAll(); - var collects = data.map((e) => CategoryPo.fromJson(e)).toList(); + List> data = await _categoryDao.queryAll(); + List collects = data.map((e) => CategoryPo.fromJson(e)).toList(); return collects.map(CategoryModel.fromPo).toList(); } @override Future> loadCategoryWidgets({int categoryId = 0}) async { - var rawData = await _categoryDao.loadCollectWidgets(categoryId); - var widgets = rawData.map((e) => WidgetPo.fromJson(e)).toList(); + List> rawData = await _categoryDao.loadCollectWidgets(categoryId); + List widgets = rawData.map((e) => WidgetPo.fromJson(e)).toList(); return widgets.map(WidgetModel.fromPo).toList(); } @@ -61,7 +61,7 @@ class CategoryDbRepository implements CategoryRepository { @override Future updateCategory(CategoryPo categoryPo) async{ - var success = await _categoryDao.update(categoryPo); + int success = await _categoryDao.update(categoryPo); return success != -1; } diff --git a/lib/repositories/impl/widget_db_repository.dart b/lib/repositories/impl/widget_db_repository.dart index 2ea218b..3e7abb1 100644 --- a/lib/repositories/impl/widget_db_repository.dart +++ b/lib/repositories/impl/widget_db_repository.dart @@ -26,37 +26,37 @@ class WidgetDbRepository implements WidgetRepository { @override Future> loadWidgets(WidgetFamily family) async { - var data = await _widgetDao.queryByFamily(family); - var widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); + List> data = await _widgetDao.queryByFamily(family); + List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); return widgets.map(WidgetModel.fromPo).toList(); } @override Future> loadCollectWidgets() async { - var data = await _widgetDao.queryCollect(); - var widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); - var list = widgets.map(WidgetModel.fromPo).toList(); + List> data = await _widgetDao.queryCollect(); + List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); + List list = widgets.map(WidgetModel.fromPo).toList(); return list; } @override Future> searchWidgets(SearchArgs args) async { - var data = await _widgetDao.search(args); - var widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); + List> data = await _widgetDao.search(args); + List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); return widgets.map(WidgetModel.fromPo).toList(); } @override Future> loadNode(WidgetModel widgetModel) async { - var data = await _nodeDao.queryById(widgetModel.id); - var nodes = data.map((e) => NodeModel.fromJson(e)).toList(); + List> data = await _nodeDao.queryById(widgetModel.id); + List nodes = data.map((e) => NodeModel.fromJson(e)).toList(); return nodes; } @override Future> loadWidget(List id) async { - var data = await _widgetDao.queryByIds(id); - var widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); + List> data = await _widgetDao.queryByIds(id); + List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); if (widgets.length > 0) return widgets.map(WidgetModel.fromPo).toList(); return null; } diff --git a/lib/storage/app_storage.dart b/lib/storage/app_storage.dart index 972aaaf..983b4c8 100644 --- a/lib/storage/app_storage.dart +++ b/lib/storage/app_storage.dart @@ -29,13 +29,13 @@ class AppStorage { // 初始化 App 固化的配置数据 Future initApp() async { - var prefs = await sp; + SharedPreferences prefs = await sp; _database = await initDb(); - var showBg = prefs.getBool(SP.showBackground) ?? true; - var themeIndex = prefs.getInt(SP.themeColorIndex) ?? 4; - var fontIndex = prefs.getInt(SP.fontFamily) ?? 1; - var codeIndex = prefs.getInt(SP.codeStyleIndex) ?? 0; - var itemStyleIndex = prefs.getInt(SP.itemStyleIndex) ?? 0; + bool showBg = prefs.getBool(SP.showBackground) ?? true; + int themeIndex = prefs.getInt(SP.themeColorIndex) ?? 4; + int fontIndex = prefs.getInt(SP.fontFamily) ?? 1; + int codeIndex = prefs.getInt(SP.codeStyleIndex) ?? 0; + int itemStyleIndex = prefs.getInt(SP.itemStyleIndex) ?? 0; return GlobalState( showBackGround: showBg, @@ -47,9 +47,9 @@ class AppStorage { // 初始化数据库 Future initDb() async { - var databasesPath = await getDatabasesPath(); - var dbPath = path.join(databasesPath, "flutter.db"); - var exists = await databaseExists(dbPath); + String databasesPath = await getDatabasesPath(); + String dbPath = path.join(databasesPath, "flutter.db"); + bool exists = await databaseExists(dbPath); const isPro = bool.fromEnvironment('dart.vm.product'); //是否release模式 if (!isPro) { diff --git a/lib/storage/dao/category_dao.dart b/lib/storage/dao/category_dao.dart index f2d2bf7..c9d2be2 100644 --- a/lib/storage/dao/category_dao.dart +++ b/lib/storage/dao/category_dao.dart @@ -83,7 +83,7 @@ class CategoryDao { String sql = //插入数据 "SELECT COUNT(name) as count FROM category " "WHERE name = ?"; - var rawData = await db.rawQuery(sql, [name]); + List> rawData = await db.rawQuery(sql, [name]); if (rawData.length > 0) { return rawData[0]['count'] > 0; } @@ -92,7 +92,7 @@ class CategoryDao { Future>> queryAll() async { final db = await _db; - var data = await db.rawQuery( + List> data = await db.rawQuery( "SELECT c.id,c.name,c.info,c.color,c.image,c.created,c.updated,c.priority,COUNT(cw.categoryId) as `count`" "FROM category AS c " "LEFT JOIN category_widget AS cw " @@ -104,7 +104,7 @@ class CategoryDao { Future> categoryWidgetIds(int id) async { final db = await _db; - var data = await db.rawQuery( + List> data = await db.rawQuery( "SELECT categoryId FROM `category_widget`" "WHERE widgetId = ?", [id]); @@ -143,7 +143,7 @@ class CategoryDao { String sql = //插入数据 "SELECT COUNT(id) as count FROM category_widget " "WHERE categoryId = ? AND widgetId = ?"; - var rawData = await db.rawQuery(sql, [categoryId, widgetId]); + List> rawData = await db.rawQuery(sql, [categoryId, widgetId]); if (rawData.length > 0) { return rawData[0]['count'] > 0; } diff --git a/lib/storage/dao/widget_dao.dart b/lib/storage/dao/widget_dao.dart index 22ec501..054b160 100644 --- a/lib/storage/dao/widget_dao.dart +++ b/lib/storage/dao/widget_dao.dart @@ -51,7 +51,7 @@ class WidgetDao { } final db = await storage.db; - var sql = "SELECT * " + String sql = "SELECT * " "FROM widget WHERE id in (${'?,' * (ids.length - 1)}?) "; return await db.rawQuery(sql, [...ids]); @@ -67,8 +67,8 @@ class WidgetDao { Future>> toggleCollect(int id) async { final db = await storage.db; - var data = await db.rawQuery('SELECT collected FROM widget WHERE id = ?', [id]); - var collected = data.toList()[0]['collected']==1; + List> data = await db.rawQuery('SELECT collected FROM widget WHERE id = ?', [id]); + bool collected = data.toList()[0]['collected']==1; return await db.rawQuery( "UPDATE widget SET collected = ? " "WHERE id = ?", @@ -83,7 +83,7 @@ class WidgetDao { Future collected(int id) async { final db = await storage.db; - var data = await db.rawQuery("SELECT collected " + List> data = await db.rawQuery("SELECT collected " "FROM widget WHERE id = ?"); if(data.length>0){ diff --git a/lib/views/app/navigation/unit_bottom_bar.dart b/lib/views/app/navigation/unit_bottom_bar.dart index c131704..0b396f9 100644 --- a/lib/views/app/navigation/unit_bottom_bar.dart +++ b/lib/views/app/navigation/unit_bottom_bar.dart @@ -44,9 +44,8 @@ class _UnitBottomBarState extends State { final paddingTL = const EdgeInsets.only(top: 2, left: 2); Widget _buildChild(BuildContext context, int i, Color color) { - var active = i == _position; - bool left = i == 0; - + final bool active = i == _position; + final bool left = i == 0; return GestureDetector( onTap: () => _tapTab(i), @@ -88,5 +87,4 @@ class _UnitBottomBarState extends State { Scaffold.of(context).openEndDrawer(); } } - } diff --git a/lib/views/app/splash/unit_splash.dart b/lib/views/app/splash/unit_splash.dart index 5568e60..e57da87 100644 --- a/lib/views/app/splash/unit_splash.dart +++ b/lib/views/app/splash/unit_splash.dart @@ -60,8 +60,8 @@ class _UnitSplashState extends State with TickerProviderStateMixin { @override Widget build(BuildContext context) { - var winH = MediaQuery.of(context).size.height; - var winW = MediaQuery.of(context).size.width; + final double winH = MediaQuery.of(context).size.height; + final double winW = MediaQuery.of(context).size.width; return Scaffold( body: Stack( diff --git a/lib/views/dialogs/dialog_about.dart b/lib/views/dialogs/dialog_about.dart index 98b14ab..0607286 100644 --- a/lib/views/dialogs/dialog_about.dart +++ b/lib/views/dialogs/dialog_about.dart @@ -9,7 +9,7 @@ class DialogAbout extends StatelessWidget { } @override Widget build(BuildContext context) { - var title = Row( + Widget title = Row( //标题 children: [ Image.asset( @@ -27,7 +27,7 @@ class DialogAbout extends StatelessWidget { ) ], ); - var content = Column( + Widget content = Column( //内容 mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/views/items/category_list_item.dart b/lib/views/items/category_list_item.dart index 7cf4150..5b5ea78 100644 --- a/lib/views/items/category_list_item.dart +++ b/lib/views/items/category_list_item.dart @@ -35,7 +35,7 @@ class CategoryListItem extends StatelessWidget { } _buildChild(BuildContext context) { - var themeColor = Theme.of(context).primaryColor; + final Color themeColor = Theme.of(context).primaryColor; return Column( children: [ _buildTitle(themeColor), diff --git a/lib/views/items/coupon_widget_list_item.dart b/lib/views/items/coupon_widget_list_item.dart index 6eb07aa..e533926 100644 --- a/lib/views/items/coupon_widget_list_item.dart +++ b/lib/views/items/coupon_widget_list_item.dart @@ -95,7 +95,7 @@ class CouponWidgetListItem extends StatelessWidget { top: 0, right: 40, child: BlocBuilder(builder: (_, s) { - var show = s.widgets.contains(data); + bool show = s.widgets.contains(data); return Opacity( opacity: show ? 1.0 : 0.0, child: SizedOverflowBox( diff --git a/lib/views/items/techno_widget_list_item.dart b/lib/views/items/techno_widget_list_item.dart index f183eb9..6c4dba6 100644 --- a/lib/views/items/techno_widget_list_item.dart +++ b/lib/views/items/techno_widget_list_item.dart @@ -72,7 +72,7 @@ class TechnoWidgetListItem extends StatelessWidget { top: 0, right: 40, child: BlocBuilder(builder: (_, s) { - var show = s.widgets.contains(data); + bool show = s.widgets.contains(data); return Opacity( opacity: show ? 1.0 : 0.0, child: SizedOverflowBox( diff --git a/lib/views/pages/category/collect_page.dart b/lib/views/pages/category/collect_page.dart index 91aafb3..d457cab 100644 --- a/lib/views/pages/category/collect_page.dart +++ b/lib/views/pages/category/collect_page.dart @@ -25,7 +25,7 @@ class _CollectPageState extends State @override Widget build(BuildContext context) { super.build(context); - var _topContext = context; + BuildContext _topContext = context; return Scaffold( backgroundColor: BlocProvider.of(context).state.homeColor.withAlpha(11), diff --git a/lib/views/pages/detail/category_end_drawer.dart b/lib/views/pages/detail/category_end_drawer.dart index b3dd3f0..222a9bf 100644 --- a/lib/views/pages/detail/category_end_drawer.dart +++ b/lib/views/pages/detail/category_end_drawer.dart @@ -140,7 +140,7 @@ class _CategoryInfoState extends State { CategoryRepository get repository => BlocProvider.of(context).repository; List get categories { - var state = BlocProvider.of(context).state; + CategoryState state = BlocProvider.of(context).state; if (state is CategoryLoadedState) { _categories = state.categories; } diff --git a/lib/views/pages/detail/widget_detail_page.dart b/lib/views/pages/detail/widget_detail_page.dart index e074ee3..8e2526c 100644 --- a/lib/views/pages/detail/widget_detail_page.dart +++ b/lib/views/pages/detail/widget_detail_page.dart @@ -74,7 +74,7 @@ class _WidgetDetailPageState extends State { return BlocListener( listener: (ctx, st) { bool collected = st.widgets.contains(model); - var msg = collected ? "收藏【${model.name}】组件成功!" : "已取消【${model.name}】组件收藏!"; + String msg = collected ? "收藏【${model.name}】组件成功!" : "已取消【${model.name}】组件收藏!"; _showToast(ctx, msg, collected); }, child: FeedbackWidget( @@ -109,7 +109,7 @@ class _WidgetDetailPageState extends State { final List colors = Cons.tabColors; Widget _buildNodes(List nodes, String name) { - var globalState = BlocProvider.of(context).state; + GlobalState globalState = BlocProvider.of(context).state; return Column( children: nodes .asMap() diff --git a/lib/views/pages/gallery/art/circle_packing.dart b/lib/views/pages/gallery/art/circle_packing.dart index 0e27197..ca31826 100644 --- a/lib/views/pages/gallery/art/circle_packing.dart +++ b/lib/views/pages/gallery/art/circle_packing.dart @@ -42,7 +42,7 @@ class CirclePackingPainter extends CustomPainter { Circle circle; bool circleSafeToDraw = false; - for (var i = 0; i < createCircleAttemps; i++) { + for (int i = 0; i < createCircleAttemps; i++) { circle = Circle() ..radius = minRaidus ..center = Point( @@ -63,7 +63,7 @@ class CirclePackingPainter extends CustomPainter { return; } - for (var i = minRaidus; i < maxRaidus; i++) { + for (double i = minRaidus; i < maxRaidus; i++) { circle.radius = i; if (_doesHaveACollision(circle, size)) { circle.radius--; @@ -88,7 +88,7 @@ class CirclePackingPainter extends CustomPainter { } bool _doesHaveACollision(Circle circle, Size size) { - for (var i = 0; i < circles.length; i++) { + for (int i = 0; i < circles.length; i++) { Circle otherCircle = circles[i]; double r2 = circle.radius + otherCircle.radius; @@ -112,7 +112,7 @@ class CirclePackingPainter extends CustomPainter { @override void paint(Canvas canvas, Size size) { - for (var i = 0; i < totalCircles; i++) { + for (int i = 0; i < totalCircles; i++) { _createCircles(canvas, size); _drawCircles(canvas); } diff --git a/lib/views/pages/gallery/art/cubic_disarray.dart b/lib/views/pages/gallery/art/cubic_disarray.dart index 42d153b..915abdd 100644 --- a/lib/views/pages/gallery/art/cubic_disarray.dart +++ b/lib/views/pages/gallery/art/cubic_disarray.dart @@ -45,8 +45,8 @@ class CubicDisarrayPainter extends CustomPainter { double offset = 20.0; double canvasSize = size.width - offset; - for (var i = squareSize; i <= canvasSize - squareSize; i += squareSize) { - for (var j = squareSize; j <= canvasSize; j += squareSize) { + for (double i = squareSize; i <= canvasSize - squareSize; i += squareSize) { + for (double j = squareSize; j <= canvasSize; j += squareSize) { double plusOrMinus = Random().nextBool() ? -1 : 1; double rotateAmt = j / canvasSize * @@ -57,7 +57,7 @@ class CubicDisarrayPainter extends CustomPainter { rotateMultiplier; plusOrMinus = Random().nextBool() ? -1 : 1; - var translateAmt = j / + double translateAmt = j / canvasSize * plusOrMinus * Random().nextDouble() * diff --git a/lib/views/pages/gallery/art/draw_picture.dart b/lib/views/pages/gallery/art/draw_picture.dart index f202dc7..e9595d9 100644 --- a/lib/views/pages/gallery/art/draw_picture.dart +++ b/lib/views/pages/gallery/art/draw_picture.dart @@ -75,7 +75,7 @@ class PaperPainter extends CustomPainter { void _drawLine(Size size, Canvas canvas) { _paint..color = Color(0xFFF0F0F0); - var step = 10.0; + double step = 10.0; for (int i = 1; i <= size.height / step; i++) { canvas.drawLine(Offset(step * i, 0), Offset(0, step * i), _paint); canvas.drawLine( diff --git a/lib/views/pages/gallery/art/hypnotic_squares.dart b/lib/views/pages/gallery/art/hypnotic_squares.dart index 05fc37f..5db9a5f 100644 --- a/lib/views/pages/gallery/art/hypnotic_squares.dart +++ b/lib/views/pages/gallery/art/hypnotic_squares.dart @@ -77,8 +77,8 @@ class HypnoticSquaresPainter extends CustomPainter { double tileStep = (canvasSize - offset * 2) / 6; double startSize = tileStep; - for (var x = offset; x < canvasSize - offset; x += tileStep) { - for (var y = offset; y < canvasSize - offset; y += tileStep) { + for (double x = offset; x < canvasSize - offset; x += tileStep) { + for (double y = offset; y < canvasSize - offset; y += tileStep) { startSteps = 2.0 + random.nextInt(10); double xDirection = directions[random.nextInt(directions.length)]; double yDirection = directions[random.nextInt(directions.length)]; diff --git a/lib/views/pages/gallery/art/joy_division.dart b/lib/views/pages/gallery/art/joy_division.dart index 67ee5b9..7d7f8e8 100644 --- a/lib/views/pages/gallery/art/joy_division.dart +++ b/lib/views/pages/gallery/art/joy_division.dart @@ -51,11 +51,11 @@ class JoyDivisionPainter extends CustomPainter { // ..strokeCap=StrokeCap.round ..isAntiAlias = true; - for (var i = 5; i < lines.length; i++) { + for (int i = 5; i < lines.length; i++) { Point p1 = lines[i][0]; Path path = Path()..moveTo(p1.x, p1.y); - for (var j = 0; j < lines[i].length - 2; j++) { + for (int j = 0; j < lines[i].length - 2; j++) { double xc = (lines[i][j].x + lines[i][j + 1].x) / 2; double yc = (lines[i][j].y + lines[i][j + 1].y) / 2; diff --git a/lib/views/pages/gallery/art/random_portrait.dart b/lib/views/pages/gallery/art/random_portrait.dart index cf37fc2..edada03 100644 --- a/lib/views/pages/gallery/art/random_portrait.dart +++ b/lib/views/pages/gallery/art/random_portrait.dart @@ -37,61 +37,64 @@ class _RandomPortraitState extends State { onTap: () { setState(() {}); }, - child: CustomPaint(painter: PaperPainter(positions))); + child: CustomPaint( + painter: PortraitPainter(positions, blockCount: blockCount))); } - void _initPosition() async { + void _initPosition() { positions.clear(); int randomCount = 2 + random.nextInt(blockCount * blockCount ~/ 2 - 2); - var flag = blockCount ~/ 2 + 1; + final int axis = blockCount ~/ 2; for (int i = 0; i < randomCount; i++) { - int randomX = random.nextInt(flag); + int randomX = random.nextInt(axis + 1); int randomY = random.nextInt(blockCount); - var position = Position(randomX, randomY); + final Position position = Position(randomX, randomY); positions.add(position); } for (int i = 0; i < positions.length; i++) { if (positions[i].x < blockCount ~/ 2) { - positions - .add(Position(2 * flag - (positions[i].x + 1) - 1, positions[i].y)); + positions.add(Position(2 * axis - positions[i].x, positions[i].y)); } } } } -class PaperPainter extends CustomPainter { +class PortraitPainter extends CustomPainter { Paint _paint; - final double strokeWidth = 0.5; - final Color color = Colors.blue; - final int blockCount = 9; - + final int blockCount; + final Color color; final List positions; - PaperPainter(this.positions) : _paint = Paint()..color = Colors.blue; + final pd = 20.0; + + PortraitPainter(this.positions, + {this.blockCount = 9, this.color = Colors.blue}) + : _paint = Paint()..color = color; @override void paint(Canvas canvas, Size size) { canvas.clipRect( Rect.fromPoints(Offset.zero, Offset(size.width, size.height))); - var pd = 20.0; + final double perW = (size.width - pd * 2) / (blockCount); + final double perH = (size.height - pd * 2) / (blockCount); - var dW = (size.width-pd*2) / (blockCount); - var dH = (size.height-pd*2) / (blockCount); canvas.translate(pd, pd); positions.forEach((element) { - _drawBlock(dW.floor(), dH.floor(), canvas, element); + _drawBlock(perW, perH, canvas, element); }); } - void _drawBlock(int dW, int dH, Canvas canvas, Position position) { + void _drawBlock(double dW, double dH, Canvas canvas, Position position) { canvas.drawRect( - Rect.fromLTWH(position.x * dW*1.0, position.y * dH*1.0, dW*1.0, dH*1.0), _paint); + Rect.fromLTWH(position.x * dW.floor() * 1.0, + position.y * dH.floor() * 1.0, dW.floor() * 1.0, dH.floor() * 1.0), + _paint); } @override - bool shouldRepaint(PaperPainter oldDelegate) => true; + bool shouldRepaint(PortraitPainter oldDelegate) => true; } diff --git a/lib/views/pages/gallery/art/triangular_mesh.dart b/lib/views/pages/gallery/art/triangular_mesh.dart index 6e2ced0..c06931b 100644 --- a/lib/views/pages/gallery/art/triangular_mesh.dart +++ b/lib/views/pages/gallery/art/triangular_mesh.dart @@ -82,7 +82,7 @@ class TriangularMeshPainter extends CustomPainter { for (int y = 0; y < lines.length - 1; y++) { odd = !odd; dotLine = []; - for (var i = 0; i < lines[y].length; i++) { + for (int i = 0; i < lines[y].length; i++) { dotLine.add(odd ? lines[y][i] : lines[y + 1][i]); dotLine.add(odd ? lines[y + 1][i] : lines[y][i]); } diff --git a/lib/views/pages/gallery/art/un_deux_trois.dart b/lib/views/pages/gallery/art/un_deux_trois.dart index c3c668d..9695e6a 100644 --- a/lib/views/pages/gallery/art/un_deux_trois.dart +++ b/lib/views/pages/gallery/art/un_deux_trois.dart @@ -42,7 +42,7 @@ class UnDeuxTroisPainter extends CustomPainter { ..strokeWidth = 4 ..strokeCap = StrokeCap.round; - for (var i = 0; i < positions.length; i++) { + for (int i = 0; i < positions.length; i++) { Offset p1 = Offset(positions[i] * width, 0); Offset p2 = Offset(positions[i] * width, height); canvas.drawLine(p1, p2, paint); @@ -57,8 +57,8 @@ class UnDeuxTroisPainter extends CustomPainter { double step = 30; double aThirdOfHeight = size.height / 3; - for (var y = step; y < height - step; y += step) { - for (var x = step; x < width - step; x += step) { + for (double y = step; y < height - step; y += step) { + for (double x = step; x < width - step; x += step) { if (y < aThirdOfHeight) { _draw(x, y, step, step, [0.5], canvas); } else if (y < aThirdOfHeight * 2) { diff --git a/lib/views/pages/gallery/picture_frame.dart b/lib/views/pages/gallery/picture_frame.dart index bc14a0b..398a797 100644 --- a/lib/views/pages/gallery/picture_frame.dart +++ b/lib/views/pages/gallery/picture_frame.dart @@ -11,7 +11,7 @@ class PictureFrame extends StatelessWidget { @override Widget build(BuildContext context) { - var size = MediaQuery.of(context).size.shortestSide; + double size = MediaQuery.of(context).size.shortestSide; return Container( width: size, height: size, @@ -46,7 +46,7 @@ class FramePainter extends CustomPainter { ..style = PaintingStyle.stroke ..strokeWidth = 10; canvas.drawPath(path, myPaint); - var shadowPath = Path()..addRect(Rect.fromPoints(Offset.zero, Offset(size.width,size.height))); + Path shadowPath = Path()..addRect(Rect.fromPoints(Offset.zero, Offset(size.width,size.height))); // canvas.drawShadow(shadowPath, Colors.grey, 1, false); canvas.save(); diff --git a/lib/views/pages/home/home_page.dart b/lib/views/pages/home/home_page.dart index 298a765..11d8675 100644 --- a/lib/views/pages/home/home_page.dart +++ b/lib/views/pages/home/home_page.dart @@ -32,7 +32,7 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin{ @override Widget build(BuildContext context) { super.build(context); - var color = context.bloc().state.homeColor; + Color color = context.bloc().state.homeColor; return Scaffold( appBar: TolyAppBar( selectIndex: Cons.tabColors.indexOf(color.value), @@ -57,7 +57,7 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin{ Widget _buildContent(BuildContext context, HomeState state) { if (state is WidgetsLoaded) { - var items = state.widgets; + List items = state.widgets; if (items.isEmpty) return EmptyPage(); return ListView.builder( controller: _ctrl, diff --git a/lib/views/pages/home/toly_app_bar.dart b/lib/views/pages/home/toly_app_bar.dart index fc45a6c..c9d589f 100644 --- a/lib/views/pages/home/toly_app_bar.dart +++ b/lib/views/pages/home/toly_app_bar.dart @@ -125,7 +125,7 @@ class TolyAppBarDelegate extends FlowDelegate { double obx = 0; for (int i = 0; i < context.childCount / 2; i++) { - var cSize = context.getChildSize(i); + Size cSize = context.getChildSize(i); if (i == selectIndex) { context.paintChild(i, transform: Matrix4.translationValues(ox, 20.0 * factor - 20, 0.0)); diff --git a/lib/views/pages/issues_point/issues_point_page.dart b/lib/views/pages/issues_point/issues_point_page.dart index bf3d8ce..9bae704 100644 --- a/lib/views/pages/issues_point/issues_point_page.dart +++ b/lib/views/pages/issues_point/issues_point_page.dart @@ -6,6 +6,7 @@ import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:flutter_unit/app/api/issues_api.dart'; import 'package:flutter_unit/app/router.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/model/github/issue.dart'; import 'package:flutter_unit/model/github/repository.dart'; import 'issue_item.dart'; @@ -64,7 +65,7 @@ class _IssuesPointContentState extends State { } if (state is PointLoaded) { - var issues = state.issues; + List issues = state.issues; return SliverList( delegate: SliverChildBuilderDelegate( (ctx, int index) => GestureDetector( @@ -134,7 +135,7 @@ class _IssuesPointContentState extends State { } void _loadRepo() async { - var result = await IssuesApi.getRepoFlutterUnit(); + final Repository result = await IssuesApi.getRepoFlutterUnit(); setState(() { if (result != null) { _repository = result; diff --git a/lib/views/pages/search/app_search_bar.dart b/lib/views/pages/search/app_search_bar.dart index 34ab5cb..7be8d2d 100644 --- a/lib/views/pages/search/app_search_bar.dart +++ b/lib/views/pages/search/app_search_bar.dart @@ -12,7 +12,7 @@ class AppSearchBar extends StatefulWidget { } class _AppSearchBarState extends State { - var _controller=TextEditingController();//文本控制器 + TextEditingController _controller=TextEditingController();//文本控制器 @override Widget build(BuildContext context) => Container( diff --git a/lib/views/pages/search/serach_page.dart b/lib/views/pages/search/serach_page.dart index 7e34e60..3538e57 100644 --- a/lib/views/pages/search/serach_page.dart +++ b/lib/views/pages/search/serach_page.dart @@ -113,7 +113,7 @@ class _SearchPageState extends State { ); _doSelectStart(List select) { - var temp = select.map((e)=>e+1).toList(); + List temp = select.map((e)=>e+1).toList(); if (temp.length < 5) { temp.addAll(List.generate(5 - temp.length, (e) => -1)); } diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart index 10961cb..4b87a26 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart @@ -74,15 +74,15 @@ class CornerCustomMultiChildLayout extends MultiChildLayoutDelegate{ positionChild(CornerType.topLeft, Offset.zero.translate(padding.left, padding.top)); } if (hasChild(CornerType.topRight)) { - var childSize = layoutChild(CornerType.topRight, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.topRight, BoxConstraints.loose(size)); positionChild(CornerType.topRight, Offset(size.width-childSize.width,0).translate(-padding.right, padding.top)); } if (hasChild(CornerType.bottomLeft)) { - var childSize = layoutChild(CornerType.bottomLeft, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.bottomLeft, BoxConstraints.loose(size)); positionChild(CornerType.bottomLeft, Offset(0,size.height-childSize.height).translate(padding.left, -padding.bottom)); } if (hasChild(CornerType.bottomRight)) { - var childSize = layoutChild(CornerType.bottomRight, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.bottomRight, BoxConstraints.loose(size)); positionChild(CornerType.bottomRight, Offset(size.width-childSize.width,size.height-childSize.height).translate(-padding.right, -padding.bottom)); } } diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/Flex/zz_node_play.dart b/lib/views/widgets/MultiChildRenderObjectWidget/Flex/zz_node_play.dart index 3f6e49a..d77560b 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/Flex/zz_node_play.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/Flex/zz_node_play.dart @@ -10,30 +10,30 @@ class PlayFlex extends StatefulWidget { } class _PlayFlexState extends State { - final redBox = Container( + final Widget redBox = Container( color: Colors.red, height: 50, width: 50, ); - final blueBox = Container( + final Widget blueBox = Container( color: Colors.blue, width: 60, height: 60, ); - final yellowBox = Container( + final Widget yellowBox = Container( color: Colors.yellow, height: 10, width: 10, ); - final greenBox = Container( + final Widget greenBox = Container( color: Colors.green, height: 30, width: 20, ); - var _direction = Axis.horizontal; - var _mainAxisAlignment = MainAxisAlignment.start; - var _crossAxisAlignment = CrossAxisAlignment.center; - var _verticalDirection = VerticalDirection.up; + Axis _direction = Axis.horizontal; + MainAxisAlignment _mainAxisAlignment = MainAxisAlignment.start; + CrossAxisAlignment _crossAxisAlignment = CrossAxisAlignment.center; + VerticalDirection _verticalDirection = VerticalDirection.up; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node1_base.dart index 3b41103..9541aaa 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node1_base.dart @@ -40,14 +40,14 @@ class _CircleFlowDelegate extends FlowDelegate { void paintChildren(FlowPaintingContext context) { double radius = context.size.shortestSide / 2; print(context.getChildSize(0)); - var count = context.childCount; - var perRad = 2 * pi / count; + int count = context.childCount; + double perRad = 2 * pi / count; for (int i = 0; i < count; i++) { - var cSizeX = context.getChildSize(i).width / 2; - var cSizeY = context.getChildSize(i).height / 2; + double cSizeX = context.getChildSize(i).width / 2; + double cSizeY = context.getChildSize(i).height / 2; - var offsetX = (radius - cSizeX) * cos(i * perRad) + radius; - var offsetY = (radius - cSizeY) * sin(i * perRad) + radius; + double offsetX = (radius - cSizeX) * cos(i * perRad) + radius; + double offsetY = (radius - cSizeY) * sin(i * perRad) + radius; context.paintChild(i, transform: Matrix4.translationValues( offsetX - cSizeX, offsetY - cSizeY, 0.0)); diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node2_anim.dart b/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node2_anim.dart index 46bd526..10e51f1 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node2_anim.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/Flow/node2_anim.dart @@ -90,14 +90,14 @@ class _BurstFlowDelegate extends FlowDelegate { @override //绘制孩子的方法 void paintChildren(FlowPaintingContext context) { double radius = context.size.shortestSide / 2; - var count = context.childCount - 1; - var perRad = 2 * pi / count; + int count = context.childCount - 1; + double perRad = 2 * pi / count; for (int i = 0; i < count; i++) { print(i); - var cSizeX = context.getChildSize(i).width / 2; - var cSizeY = context.getChildSize(i).height / 2; - var offsetX = rad * (radius - cSizeX) * cos(i * perRad) + radius; - var offsetY = rad * (radius - cSizeY) * sin(i * perRad) + radius; + double cSizeX = context.getChildSize(i).width / 2; + double cSizeY = context.getChildSize(i).height / 2; + double offsetX = rad * (radius - cSizeX) * cos(i * perRad) + radius; + double offsetY = rad * (radius - cSizeY) * sin(i * perRad) + radius; context.paintChild(i, transform: Matrix4.translationValues( offsetX - cSizeX, offsetY - cSizeY, 0.0)); diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/IndexedStack/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/IndexedStack/node1_base.dart index 28a0600..0ce7155 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/IndexedStack/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/IndexedStack/node1_base.dart @@ -19,7 +19,7 @@ class CustomIndexedStack extends StatefulWidget { } class _CustomIndexedStackState extends State { - var _index = 1; + int _index = 1; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node1_base.dart index ce16eaf..132faff 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node1_base.dart @@ -16,25 +16,25 @@ import 'package:flutter/material.dart'; class CustomStack extends StatelessWidget { @override Widget build(BuildContext context) { - var yellowBox = Container( + Widget yellowBox = Container( color: Colors.yellow, height: 100, width: 100, ); - var redBox = Container( + Widget redBox = Container( color: Colors.red, height: 90, width: 90, ); - var greenBox = Container( + Widget greenBox = Container( color: Colors.green, height: 80, width: 80, ); - var cyanBox = Container( + Widget cyanBox = Container( color: Colors.cyanAccent, height: 70, width: 70, diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node2_positioned.dart b/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node2_positioned.dart index b1d6feb..485908e 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node2_positioned.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/Stack/node2_positioned.dart @@ -12,25 +12,25 @@ import 'package:flutter/material.dart'; class PositionedStack extends StatelessWidget { @override Widget build(BuildContext context) { - var yellowBox = Container( + Widget yellowBox = Container( color: Colors.yellow, height: 100, width: 100, ); - var redBox = Container( + Widget redBox = Container( color: Colors.red, height: 90, width: 90, ); - var greenBox = Container( + Widget greenBox = Container( color: Colors.green, height: 80, width: 80, ); - var cyanBox = Container( + Widget cyanBox = Container( color: Colors.cyanAccent, height: 70, width: 70, diff --git a/lib/views/widgets/Other/Table/node1_base.dart b/lib/views/widgets/Other/Table/node1_base.dart index dab4708..3aaa2e1 100644 --- a/lib/views/widgets/Other/Table/node1_base.dart +++ b/lib/views/widgets/Other/Table/node1_base.dart @@ -17,16 +17,16 @@ import 'package:flutter/material.dart'; class CustomTable extends StatelessWidget { @override Widget build(BuildContext context) { - var title = _ItemBean("单位称", "量纲", "单位", "单位名称", "单位符号"); - var m = _ItemBean("长度", "L", "1m", "米", "m"); - var kg = _ItemBean("质量", "M", "1Kg", "千克", "Kg"); - var s = _ItemBean("时间", "T", "1s", "秒", "s"); - var a = _ItemBean("安培", "Ι", "1A", "安培", "A"); - var k = _ItemBean("热力学温度", "θ", "1K", "开尔文", "K"); - var mol = _ItemBean("物质的量", "N", "1mol", "摩尔", "mol"); - var cd = _ItemBean("发光强度", "J", "1cd", "坎德拉", "cd"); + _ItemBean title = _ItemBean("单位称", "量纲", "单位", "单位名称", "单位符号"); + _ItemBean m = _ItemBean("长度", "L", "1m", "米", "m"); + _ItemBean kg = _ItemBean("质量", "M", "1Kg", "千克", "Kg"); + _ItemBean s = _ItemBean("时间", "T", "1s", "秒", "s"); + _ItemBean a = _ItemBean("安培", "Ι", "1A", "安培", "A"); + _ItemBean k = _ItemBean("热力学温度", "θ", "1K", "开尔文", "K"); + _ItemBean mol = _ItemBean("物质的量", "N", "1mol", "摩尔", "mol"); + _ItemBean cd = _ItemBean("发光强度", "J", "1cd", "坎德拉", "cd"); - var data = <_ItemBean>[title, m, kg, s, a, k, mol, cd]; + List<_ItemBean> data = <_ItemBean>[title, m, kg, s, a, k, mol, cd]; return SingleChildScrollView( scrollDirection: Axis.horizontal, diff --git a/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart b/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart index b4215aa..cf52d4c 100644 --- a/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart @@ -74,15 +74,15 @@ class CornerCustomMultiChildLayout extends MultiChildLayoutDelegate{ positionChild(CornerType.topLeft, Offset.zero.translate(padding.left, padding.top)); } if (hasChild(CornerType.topRight)) { - var childSize = layoutChild(CornerType.topRight, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.topRight, BoxConstraints.loose(size)); positionChild(CornerType.topRight, Offset(size.width-childSize.width,0).translate(-padding.right, padding.top)); } if (hasChild(CornerType.bottomLeft)) { - var childSize = layoutChild(CornerType.bottomLeft, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.bottomLeft, BoxConstraints.loose(size)); positionChild(CornerType.bottomLeft, Offset(0,size.height-childSize.height).translate(padding.left, -padding.bottom)); } if (hasChild(CornerType.bottomRight)) { - var childSize = layoutChild(CornerType.bottomRight, BoxConstraints.loose(size)); + Size childSize = layoutChild(CornerType.bottomRight, BoxConstraints.loose(size)); positionChild(CornerType.bottomRight, Offset(size.width-childSize.width,size.height-childSize.height).translate(-padding.right, -padding.bottom)); } } diff --git a/lib/views/widgets/ProxyWidget/MediaQuery/node1_base.dart b/lib/views/widgets/ProxyWidget/MediaQuery/node1_base.dart index 818b2e1..7d10d25 100644 --- a/lib/views/widgets/ProxyWidget/MediaQuery/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/MediaQuery/node1_base.dart @@ -15,8 +15,8 @@ import 'package:flutter/material.dart'; class CustomMediaQuery extends StatelessWidget { @override Widget build(BuildContext context) { - var queryData = MediaQuery.of(context); - var data = { + MediaQueryData queryData = MediaQuery.of(context); + Map data = { "size": queryData.size, "devicePixelRatio": queryData.devicePixelRatio.toStringAsFixed(1), "textScaleFactor": queryData.textScaleFactor.toStringAsFixed(1), diff --git a/lib/views/widgets/ProxyWidget/Positioned/node1_base.dart b/lib/views/widgets/ProxyWidget/Positioned/node1_base.dart index 0e249eb..994e89b 100644 --- a/lib/views/widgets/ProxyWidget/Positioned/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/Positioned/node1_base.dart @@ -18,25 +18,25 @@ import 'package:flutter/material.dart'; class CustomPositioned extends StatelessWidget { @override Widget build(BuildContext context) { - var yellowBox = Container( + Widget yellowBox = Container( color: Colors.yellow, height: 100, width: 100, ); - var redBox = Container( + Widget redBox = Container( color: Colors.red, height: 90, width: 90, ); - var greenBox = Container( + Widget greenBox = Container( color: Colors.green, height: 80, width: 80, ); - var cyanBox = Container( + Widget cyanBox = Container( color: Colors.cyanAccent, height: 70, width: 70, diff --git a/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart b/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart index 217daa9..b1a25a6 100644 --- a/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart @@ -21,7 +21,7 @@ class SliderThemeDemo extends StatefulWidget { } class _SliderThemeDemoState extends State { - var _bliss = 0.5; + double _bliss = 0.5; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart b/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart index 885db01..f82166e 100644 --- a/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart +++ b/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart @@ -21,7 +21,7 @@ class DIYSliderTheme extends StatefulWidget { } class _DIYSliderThemeState extends State { - var _bliss = 0.5; + double _bliss = 0.5; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/ProxyWidget/ToggleButtonsTheme/node1_base.dart b/lib/views/widgets/ProxyWidget/ToggleButtonsTheme/node1_base.dart index 3d0d16f..1459d35 100644 --- a/lib/views/widgets/ProxyWidget/ToggleButtonsTheme/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/ToggleButtonsTheme/node1_base.dart @@ -35,7 +35,7 @@ class _ToggleButtonsSimple extends StatefulWidget { } class _ToggleButtonsSimpleState extends State<_ToggleButtonsSimple> { - var _isSelected = [true, false, false]; + List _isSelected = [true, false, false]; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/Align/node2_other.dart b/lib/views/widgets/SingleChildRenderObjectWidget/Align/node2_other.dart index d16e6e2..8f5bace 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/Align/node2_other.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/Align/node2_other.dart @@ -44,11 +44,11 @@ class SinLayout extends StatefulWidget { } class _SinLayoutState extends State { - var _x = 0.0; //Alignment坐标系上的x坐标 + double _x = 0.0; //Alignment坐标系上的x坐标 @override Widget build(BuildContext context) { - var item = Container( + Widget item = Container( width: 300, height: 120, color: Colors.black.withAlpha(10), @@ -60,7 +60,7 @@ class _SinLayoutState extends State { ), ); - var slider = Slider( + Widget slider = Slider( max: 180, min: -180, divisions: 360, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/AspectRatio/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/AspectRatio/node1_base.dart index 137128c..0a5762e 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/AspectRatio/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/AspectRatio/node1_base.dart @@ -16,11 +16,11 @@ class CustomAspectRatio extends StatefulWidget { } class _CustomAspectRatioState extends State { - var _ratio = 0.75; + double _ratio = 0.75; @override Widget build(BuildContext context) { - var child = Container( + Widget child = Container( alignment: Alignment.center, color: Colors.cyanAccent, width: 50, @@ -28,7 +28,7 @@ class _CustomAspectRatioState extends State { child: Text("Static"), ); - var box = AspectRatio( + Widget box = AspectRatio( aspectRatio: _ratio, child: Container( color: Colors.orange, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/Baseline/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/Baseline/node1_base.dart index a720790..04f1cb1 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/Baseline/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/Baseline/node1_base.dart @@ -23,13 +23,13 @@ class _CustomBaselineState extends State { @override Widget build(BuildContext context) { - var childBox = Text( + Widget childBox = Text( '你好,Flutter', style: TextStyle(fontSize: 20,fontFamily: "Menlo"), ); - var baseline = Baseline( + Widget baseline = Baseline( child: childBox, baseline: _baseline, baselineType: TextBaseline.alphabetic diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/ConstrainedBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/ConstrainedBox/node1_base.dart index 65171c1..f2a742e 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/ConstrainedBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/ConstrainedBox/node1_base.dart @@ -20,11 +20,11 @@ class CustomConstrainedBox extends StatefulWidget { } class _CustomConstrainedBoxState extends State { - var _text = ''; + String _text = ''; @override Widget build(BuildContext context) { - var child = Container( + Widget child = Container( alignment: Alignment.center, color: Colors.cyanAccent, width: 40, @@ -32,7 +32,7 @@ class _CustomConstrainedBoxState extends State { child: Text("Static"), ); - var box = ConstrainedBox( + Widget box = ConstrainedBox( constraints: BoxConstraints( minHeight: 50, minWidth: 20, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node1_clock.dart b/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node1_clock.dart index c86f46c..c771c8d 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node1_clock.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node1_clock.dart @@ -27,7 +27,7 @@ class ClockPage extends StatelessWidget { class ClockPainter extends CustomPainter { Paint _paint; - var _radius = 3.0; //小球半径 + double _radius = 3.0; //小球半径 Path _path = Path(); //画笔对象 ClockPainter () { _paint = Paint()..color= Color(0xff45d0fd)..isAntiAlias=true; diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/CustomSingleChildLayout/node2_offset.dart b/lib/views/widgets/SingleChildRenderObjectWidget/CustomSingleChildLayout/node2_offset.dart index 4b5444c..b786113 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/CustomSingleChildLayout/node2_offset.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/CustomSingleChildLayout/node2_offset.dart @@ -98,10 +98,10 @@ class _OffSetDelegate extends SingleChildLayoutDelegate { @override Offset getPositionForChild(Size size, Size childSize) { - var w = size.width; - var h = size.height; - var wc = childSize.width; - var hc = childSize.height; + double w = size.width; + double h = size.height; + double wc = childSize.width; + double hc = childSize.height; switch (direction) { case Direction.topLeft: diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/FractionalTranslation/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/FractionalTranslation/node1_base.dart index 9a24054..a685b78 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/FractionalTranslation/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/FractionalTranslation/node1_base.dart @@ -19,8 +19,8 @@ class FractionalTranslationDemo extends StatefulWidget { } class _FractionalTranslationDemoState extends State { - var dx = 0.0; - var dy = 0.0; + double dx = 0.0; + double dy = 0.0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/FractionallySizedBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/FractionallySizedBox/node1_base.dart index 362200b..c7d88e0 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/FractionallySizedBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/FractionallySizedBox/node1_base.dart @@ -21,12 +21,12 @@ class CustomFractionallySizedBox extends StatefulWidget { class _CustomFractionallySizedBoxState extends State { - var _hf = 0.5; - var _wf = 0.4; + double _hf = 0.5; + double _wf = 0.4; @override Widget build(BuildContext context) { - var box = FractionallySizedBox( + Widget box = FractionallySizedBox( widthFactor: _wf, heightFactor: _hf, alignment: Alignment.center, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicHeight/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicHeight/node1_base.dart index c9eaeec..5b60f3b 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicHeight/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicHeight/node1_base.dart @@ -18,7 +18,7 @@ class IntrinsicHeightDemo extends StatefulWidget { } class _IntrinsicHeightDemoState extends State { - var _height =120.0; + double _height =120.0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicWidth/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicWidth/node1_base.dart index e3c20aa..691ed37 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicWidth/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/IntrinsicWidth/node1_base.dart @@ -19,7 +19,7 @@ class IntrinsicWidthDemo extends StatefulWidget { } class _IntrinsicWidthDemoState extends State { - var _height =120.0; + double _height =120.0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/LimiteBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/LimiteBox/node1_base.dart index d1bec3c..d019cfd 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/LimiteBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/LimiteBox/node1_base.dart @@ -18,11 +18,11 @@ class CustomLimitedBox extends StatefulWidget { } class _CustomLimitedBoxState extends State { - var _text = ''; + String _text = ''; @override Widget build(BuildContext context) { - var child = Container( + Widget child = Container( alignment: Alignment.center, color: Colors.cyanAccent, width: 50, @@ -30,7 +30,7 @@ class _CustomLimitedBoxState extends State { child: Text("Static"), ); - var box = LimitedBox( + Widget box = LimitedBox( maxHeight: 60, maxWidth: 100, child: Container(color: Colors.orange, child: Text(_text)), diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/OffStage/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/OffStage/node1_base.dart index 7719ad4..d4ab9dc 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/OffStage/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/OffStage/node1_base.dart @@ -21,7 +21,7 @@ class _CustomOffstageState extends State { @override Widget build(BuildContext context) { - var radBox = Container( + Widget radBox = Container( height: 50, width: 60, color: Colors.red, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/Opacity/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/Opacity/node1_base.dart index aacb7ee..0a3d4a3 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/Opacity/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/Opacity/node1_base.dart @@ -17,7 +17,7 @@ class CustomOpacity extends StatefulWidget { } class _CustomOpacityState extends State { - var _opacity = 0.2; + double _opacity = 0.2; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/OverflowBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/OverflowBox/node1_base.dart index 569b043..b81c464 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/OverflowBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/OverflowBox/node1_base.dart @@ -21,11 +21,11 @@ class CustomOverflowBox extends StatefulWidget { } class _CustomOverflowBoxState extends State { - var _text = ''; + String _text = ''; @override Widget build(BuildContext context) { - var box = OverflowBox( + Widget box = OverflowBox( alignment: Alignment.center, minHeight: 50, minWidth: 50, diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node2_save.dart b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node2_save.dart index 7d700f2..6f2f48f 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node2_save.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node2_save.dart @@ -46,10 +46,10 @@ class RepaintBoundarySave extends StatelessWidget { side: BorderSide(width: 2.0, color: Color(0xFFFFDFDFDF)), ), onPressed: () async { - var bits = await _widget2Image(_globalKey); - var dir = await getApplicationSupportDirectory(); - var file = File(dir.path + "/save_img.png"); - var f = await file.writeAsBytes(bits); + Uint8List bits = await _widget2Image(_globalKey); + Directory dir = await getApplicationSupportDirectory(); + File file = File(dir.path + "/save_img.png"); + File f = await file.writeAsBytes(bits); Scaffold.of(context).showSnackBar(SnackBar( backgroundColor: Theme.of(context).primaryColor, content: Text('保存成功后! 路径为:${f.path}'), @@ -61,7 +61,7 @@ class RepaintBoundarySave extends StatelessWidget { //获得 ui.image ui.Image img = await boundary.toImage(); //获取图片字节 - var byteData = await img.toByteData(format: ui.ImageByteFormat.png); + ByteData byteData = await img.toByteData(format: ui.ImageByteFormat.png); Uint8List bits = byteData.buffer.asUint8List(); return bits; } diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/SizedBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/SizedBox/node1_base.dart index c070de0..8635914 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/SizedBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/SizedBox/node1_base.dart @@ -15,7 +15,7 @@ import 'package:flutter/material.dart'; class CustomSizedBox extends StatelessWidget { @override Widget build(BuildContext context) { - var child = Container( + Widget child = Container( alignment: Alignment.center, color: Colors.cyanAccent, width: 50, @@ -23,7 +23,7 @@ class CustomSizedBox extends StatelessWidget { child: Text("Static"), ); - var box = SizedBox( + Widget box = SizedBox( width: 80, height: 40, child: Container( diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/SizedOverflowBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/SizedOverflowBox/node1_base.dart index a604a53..0267f6c 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/SizedOverflowBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/SizedOverflowBox/node1_base.dart @@ -24,7 +24,7 @@ class _CustomSizedOverflowBoxState extends State { @override Widget build(BuildContext context) { - var box = SizedOverflowBox( + Widget box = SizedOverflowBox( alignment: Alignment.bottomRight, size: Size(_x, _y), child: Container(width: 30, height: 50, color: Colors.orange), diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/Transform/zz_node_op.dart b/lib/views/widgets/SingleChildRenderObjectWidget/Transform/zz_node_op.dart index 9e69fce..4730f15 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/Transform/zz_node_op.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/Transform/zz_node_op.dart @@ -10,8 +10,8 @@ class CustomTransform extends StatefulWidget { } class _CustomTransformState extends State { - var angle = 0.0; - var m = [ + double angle = 0.0; + List m = [ 1.0, 0.0, 0.0, @@ -32,7 +32,7 @@ class _CustomTransformState extends State { @override Widget build(BuildContext context) { - var transform = Transform( + Transform transform = Transform( transform: Matrix4(m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], m[9], m[10], m[11], m[12], m[13], m[14], m[15]), child: Container( diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/UnConstrainedBox/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/UnConstrainedBox/node1_base.dart index 36b143f..e02789a 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/UnConstrainedBox/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/UnConstrainedBox/node1_base.dart @@ -18,7 +18,7 @@ class CustomUnConstrainedBox extends StatefulWidget { } class _CustomUnConstrainedBoxState extends State { - var _value = false; + bool _value = false; @override Widget build(BuildContext context) { @@ -29,7 +29,7 @@ class _CustomUnConstrainedBoxState extends State { } Widget _buildUnconstrainedBox() { - var child = Container( + Widget child = Container( color: Colors.cyanAccent, width: 60, height: 60, diff --git a/lib/views/widgets/Sliver/SliverFillViewport/node1_base.dart b/lib/views/widgets/Sliver/SliverFillViewport/node1_base.dart index 01d5237..852c592 100644 --- a/lib/views/widgets/Sliver/SliverFillViewport/node1_base.dart +++ b/lib/views/widgets/Sliver/SliverFillViewport/node1_base.dart @@ -17,7 +17,7 @@ class SliverFillViewportDemo extends StatefulWidget { } class _SliverFillViewportDemoState extends State { - final data = [ + final List data = [ Colors.orange[50], Colors.orange[100], Colors.orange[200], @@ -29,7 +29,7 @@ class _SliverFillViewportDemoState extends State { Colors.orange[800], Colors.orange[900], ]; - var _viewportFraction = 0.5; + double _viewportFraction = 0.5; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node1_base.dart b/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node1_base.dart index cc72e64..229a384 100644 --- a/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node1_base.dart @@ -22,7 +22,7 @@ class CustomAnimatedCrossFade extends StatefulWidget { } class _CustomAnimatedCrossFadeState extends State { - var _crossFadeState = CrossFadeState.showFirst; + CrossFadeState _crossFadeState = CrossFadeState.showFirst; bool get isFirst => _crossFadeState == CrossFadeState.showFirst; diff --git a/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node2_curve.dart b/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node2_curve.dart index e4ac90f..e54cac0 100644 --- a/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node2_curve.dart +++ b/lib/views/widgets/StatefulWidget/AnimatedCrossFade/node2_curve.dart @@ -19,7 +19,7 @@ class CurveAnimatedCrossFade extends StatefulWidget { } class _CurveAnimatedCrossFadeState extends State { - var _crossFadeState = CrossFadeState.showFirst; + CrossFadeState _crossFadeState = CrossFadeState.showFirst; bool get isFirst=> _crossFadeState == CrossFadeState.showFirst; diff --git a/lib/views/widgets/StatefulWidget/AnimatedPositioned/node1_base.dart b/lib/views/widgets/StatefulWidget/AnimatedPositioned/node1_base.dart index b10146c..8a5cff2 100644 --- a/lib/views/widgets/StatefulWidget/AnimatedPositioned/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/AnimatedPositioned/node1_base.dart @@ -24,10 +24,10 @@ class CustomAnimatedPositioned extends StatefulWidget { } class _CustomAnimatedPositionedState extends State { - final startTop = 0.0; - final endTop = 30.0; + final double startTop = 0.0; + final double endTop = 30.0; - var _top = 0.0; + double _top = 0.0; @override void initState() { diff --git a/lib/views/widgets/StatefulWidget/AnimatedPositionedDirectional/node1_base.dart b/lib/views/widgets/StatefulWidget/AnimatedPositionedDirectional/node1_base.dart index 2622b28..f001e38 100644 --- a/lib/views/widgets/StatefulWidget/AnimatedPositionedDirectional/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/AnimatedPositionedDirectional/node1_base.dart @@ -25,10 +25,10 @@ class CustomAnimatedPositionedDirectional extends StatefulWidget { class _CustomAnimatedPositionedDirectionalState extends State { - final startTop = 0.0; - final endTop = 30.0; + final double startTop = 0.0; + final double endTop = 30.0; - var _top = 0.0; + double _top = 0.0; @override void initState() { diff --git a/lib/views/widgets/StatefulWidget/BottomAppBar/node1_base.dart b/lib/views/widgets/StatefulWidget/BottomAppBar/node1_base.dart index 1cfcb9f..f575598 100755 --- a/lib/views/widgets/StatefulWidget/BottomAppBar/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/BottomAppBar/node1_base.dart @@ -21,15 +21,15 @@ class CustomBottomAppBar extends StatefulWidget { } class _CustomBottomAppBarState extends State { - var _position = 0; - var _location = FloatingActionButtonLocation.centerDocked; - final iconsMap = { + int _position = 0; + FloatingActionButtonLocation _location = FloatingActionButtonLocation.centerDocked; + final Map iconsMap = { "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, }; - var activeColor = Colors.blue.withAlpha(240); + Color activeColor = Colors.blue.withAlpha(240); @override Widget build(BuildContext context) { @@ -91,7 +91,7 @@ class _CustomBottomAppBarState extends State { bool get isCenter => _location == FloatingActionButtonLocation.centerDocked; Widget _buildChild(int i) { - var active = i == _position; + final bool active = i == _position; return Padding( padding: const EdgeInsets.all(8.0), child: GestureDetector( diff --git a/lib/views/widgets/StatefulWidget/BottomNavigationBar/node1_base.dart b/lib/views/widgets/StatefulWidget/BottomNavigationBar/node1_base.dart index aa9822e..4958138 100755 --- a/lib/views/widgets/StatefulWidget/BottomNavigationBar/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/BottomNavigationBar/node1_base.dart @@ -27,15 +27,15 @@ class CustomBottomNavigationBar extends StatefulWidget { } class _CustomBottomNavigationBarState extends State { - var _position = 0; + int _position = 0; BottomNavigationBarType _type = BottomNavigationBarType.shifting; - final iconsMap = { + final Map iconsMap = { //底栏图标 "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, "我的": Icons.account_circle, }; - final _colors = [ + final List _colors = [ Colors.red, Colors.yellow, Colors.blue, diff --git a/lib/views/widgets/StatefulWidget/BottomNavigationBar/node2_page.dart b/lib/views/widgets/StatefulWidget/BottomNavigationBar/node2_page.dart index 72c3f37..e5816dd 100755 --- a/lib/views/widgets/StatefulWidget/BottomNavigationBar/node2_page.dart +++ b/lib/views/widgets/StatefulWidget/BottomNavigationBar/node2_page.dart @@ -17,14 +17,14 @@ class BottomNavigationBarWithPageView extends StatefulWidget { class _BottomNavigationBarWithPageViewState extends State { - var _position = 0; - final iconsMap = { + int _position = 0; + final Map iconsMap = { //底栏图标 "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, "我的": Icons.account_circle, }; - final _colors = [ + final List _colors = [ Colors.red, Colors.yellow, Colors.blue, diff --git a/lib/views/widgets/StatefulWidget/CircularProgressIndicator/node1_base.dart b/lib/views/widgets/StatefulWidget/CircularProgressIndicator/node1_base.dart index 03b4b49..72eaad8 100644 --- a/lib/views/widgets/StatefulWidget/CircularProgressIndicator/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CircularProgressIndicator/node1_base.dart @@ -21,7 +21,7 @@ class CustomCircularProgressIndicator extends StatefulWidget { class _CustomCircularProgressIndicatorState extends State { - var data = [0.2,0.4,0.6,0.8,null]; + List data = [0.2,0.4,0.6,0.8,null]; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/CupertinoButton/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoButton/node1_base.dart index ade5190..1c518e6 100755 --- a/lib/views/widgets/StatefulWidget/CupertinoButton/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoButton/node1_base.dart @@ -19,7 +19,7 @@ import 'package:flutter/material.dart'; class CustomCupertinoButton extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { CupertinoColors.activeBlue:4.0, Colors.blue:6.0, CupertinoColors.activeOrange:8.0, diff --git a/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node1_base.dart index 59ef2c9..aef3c97 100644 --- a/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node1_base.dart @@ -23,7 +23,7 @@ class CupertinoSegmentedControlDemo extends StatefulWidget { class _CupertinoSegmentedControlDemoState extends State { - var _value = 1; + int _value = 1; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node2_color.dart b/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node2_color.dart index cf71d0a..d09151d 100644 --- a/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node2_color.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoSegmentedControl/node2_color.dart @@ -23,7 +23,7 @@ class CupertinoSegmentedControlColor extends StatefulWidget { class _CupertinoSegmentedControlColorState extends State { - var _value = 1; + int _value = 1; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/CupertinoSlidingSegmentedControl/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoSlidingSegmentedControl/node1_base.dart index 24a542b..97746a5 100644 --- a/lib/views/widgets/StatefulWidget/CupertinoSlidingSegmentedControl/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoSlidingSegmentedControl/node1_base.dart @@ -24,7 +24,7 @@ class CupertinoSlidingSegmentedControlDemo extends StatefulWidget { class _CupertinoSlidingSegmentedControlDemoState extends State { - var _value = 1; + int _value = 1; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/CupertinoTabBar/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoTabBar/node1_base.dart index 69fe867..d3f30f8 100755 --- a/lib/views/widgets/StatefulWidget/CupertinoTabBar/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoTabBar/node1_base.dart @@ -23,8 +23,8 @@ class CustomCupertinoTabBar extends StatefulWidget { } class _CustomCupertinoTabBarState extends State { - var _position = 0; - final iconsMap = { + int _position = 0; + final Map iconsMap = { //底栏图标 "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, diff --git a/lib/views/widgets/StatefulWidget/CupertinoTabScaffold/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoTabScaffold/node1_base.dart index 1ff6ba2..0ec285e 100644 --- a/lib/views/widgets/StatefulWidget/CupertinoTabScaffold/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoTabScaffold/node1_base.dart @@ -23,8 +23,8 @@ class CustomCupertinoTabScaffold extends StatefulWidget { class _CustomCupertinoTabScaffoldState extends State { - var _position = 0; - final iconsMap = { + int _position = 0; + final Map iconsMap = { //底栏图标 "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, diff --git a/lib/views/widgets/StatefulWidget/CupertinoTextField/node1_base.dart b/lib/views/widgets/StatefulWidget/CupertinoTextField/node1_base.dart index c84de5f..5ed57db 100644 --- a/lib/views/widgets/StatefulWidget/CupertinoTextField/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/CupertinoTextField/node1_base.dart @@ -23,8 +23,8 @@ class CupertinoTextFieldDemo extends StatefulWidget { } class _CupertinoTextFieldDemoState extends State { - var _value = ''; - var _color =Colors.black; + String _value = ''; + Color _color =Colors.black; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/Dismissible/node1_base.dart b/lib/views/widgets/StatefulWidget/Dismissible/node1_base.dart index dda065e..7d03e90 100644 --- a/lib/views/widgets/StatefulWidget/Dismissible/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Dismissible/node1_base.dart @@ -23,7 +23,7 @@ class CustomDismissible extends StatefulWidget { } class _CustomDismissibleState extends State { - var data = [ + List data = [ Colors.purple[50], Colors.purple[100], Colors.purple[200], diff --git a/lib/views/widgets/StatefulWidget/Dismissible/node2_direction.dart b/lib/views/widgets/StatefulWidget/Dismissible/node2_direction.dart index 87f2d93..cf8fbb5 100644 --- a/lib/views/widgets/StatefulWidget/Dismissible/node2_direction.dart +++ b/lib/views/widgets/StatefulWidget/Dismissible/node2_direction.dart @@ -20,7 +20,7 @@ class DirectionDismissible extends StatefulWidget { } class _CustomDirectionDismissibleState extends State { - var data = [ + List data = [ Colors.purple[50], Colors.purple[100], Colors.purple[200], diff --git a/lib/views/widgets/StatefulWidget/DragTarget/node1_base.dart b/lib/views/widgets/StatefulWidget/DragTarget/node1_base.dart index 715f36c..0e92ac3 100644 --- a/lib/views/widgets/StatefulWidget/DragTarget/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/DragTarget/node1_base.dart @@ -41,7 +41,7 @@ class _CustomDragTargetState extends State { } List _buildColors() { - var colors = [ + List colors = [ Colors.red, Colors.yellow, Colors.blue, diff --git a/lib/views/widgets/StatefulWidget/Draggable/node1_base.dart b/lib/views/widgets/StatefulWidget/Draggable/node1_base.dart index 0742f79..7e679e2 100644 --- a/lib/views/widgets/StatefulWidget/Draggable/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Draggable/node1_base.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class CustomDraggable extends StatelessWidget { @override Widget build(BuildContext context) { - var axis = [null, Axis.vertical, Axis.horizontal]; + List axis = [null, Axis.vertical, Axis.horizontal]; return Wrap( spacing: 30, children: axis diff --git a/lib/views/widgets/StatefulWidget/Draggable/node2_data.dart b/lib/views/widgets/StatefulWidget/Draggable/node2_data.dart index c9400cd..256d07a 100644 --- a/lib/views/widgets/StatefulWidget/Draggable/node2_data.dart +++ b/lib/views/widgets/StatefulWidget/Draggable/node2_data.dart @@ -44,7 +44,7 @@ class _DraggablePageState extends State { } List _buildColors() { - var colors = [ + List colors = [ Colors.red, Colors.yellow, Colors.blue, diff --git a/lib/views/widgets/StatefulWidget/ExpandIcon/node1_base.dart b/lib/views/widgets/StatefulWidget/ExpandIcon/node1_base.dart index a3fcb5b..125e3e6 100644 --- a/lib/views/widgets/StatefulWidget/ExpandIcon/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/ExpandIcon/node1_base.dart @@ -20,7 +20,7 @@ class CustomExpandIcon extends StatefulWidget { } class _CustomExpandIconState extends State { - var _closed = true; + bool _closed = true; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/ExpansionPanelList/node1_base.dart b/lib/views/widgets/StatefulWidget/ExpansionPanelList/node1_base.dart index 4ca2194..9ab2967 100644 --- a/lib/views/widgets/StatefulWidget/ExpansionPanelList/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/ExpansionPanelList/node1_base.dart @@ -20,7 +20,7 @@ class CustomExpansionPanelList extends StatefulWidget { } class _CustomExpansionPanelListState extends State { - var data = [ + List data = [ Colors.red[50], Colors.red[100], Colors.red[200], diff --git a/lib/views/widgets/StatefulWidget/Hero/node1_base.dart b/lib/views/widgets/StatefulWidget/Hero/node1_base.dart index 8c1aeba..f5570ed 100644 --- a/lib/views/widgets/StatefulWidget/Hero/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Hero/node1_base.dart @@ -15,7 +15,7 @@ import 'package:flutter/material.dart'; class CustomHero extends StatelessWidget { @override Widget build(BuildContext context) { - var hero = Hero( + Widget hero = Hero( //----定义一个Hero,并添加tag标签,此中组件共享 tag: 'user-head', child: ClipRRect( @@ -29,7 +29,7 @@ class CustomHero extends StatelessWidget { ), ); - var container = Container( + Widget container = Container( alignment: Alignment(-0.8, -0.8), child: hero, width: 250, @@ -57,7 +57,7 @@ class CustomHero extends StatelessWidget { class TargetPage extends StatelessWidget { @override Widget build(BuildContext context) { - var hero = Hero( + Widget hero = Hero( //----定义一个Hero,为其添加标签，两个标签相同，则可以共享 tag: 'user-head', child: Padding( @@ -71,7 +71,7 @@ class TargetPage extends StatelessWidget { ), ); - var touch = InkWell( + Widget touch = InkWell( onTap: () { Navigator.of(context).pop(); }, diff --git a/lib/views/widgets/StatefulWidget/Image/node2_fit.dart b/lib/views/widgets/StatefulWidget/Image/node2_fit.dart index 17573d8..b8d358c 100644 --- a/lib/views/widgets/StatefulWidget/Image/node2_fit.dart +++ b/lib/views/widgets/StatefulWidget/Image/node2_fit.dart @@ -21,7 +21,7 @@ class _FitImageState extends State { @override Widget build(BuildContext context) { - var imageLi = BoxFit.values + List imageLi = BoxFit.values .toList() .map((mode) => Column(children: [ Container( diff --git a/lib/views/widgets/StatefulWidget/Image/node3_alignment.dart b/lib/views/widgets/StatefulWidget/Image/node3_alignment.dart index fc2750a..50c4542 100644 --- a/lib/views/widgets/StatefulWidget/Image/node3_alignment.dart +++ b/lib/views/widgets/StatefulWidget/Image/node3_alignment.dart @@ -15,7 +15,7 @@ import 'package:flutter/material.dart'; class AlignmentImage extends StatelessWidget { @override Widget build(BuildContext context) { - var alignment = [ + List alignment = [ Alignment.center, Alignment.centerLeft, Alignment.centerRight, @@ -26,7 +26,7 @@ class AlignmentImage extends StatelessWidget { Alignment.bottomLeft, Alignment.bottomRight ]; //测试数组 - var imgLi = alignment + List imgLi = alignment .map((alignment) => //生成子Widget列表 Column(children: [ Container( @@ -41,7 +41,6 @@ class AlignmentImage extends StatelessWidget { Text(alignment.toString()) ])) .toList(); - var imageAlignment = Wrap(children: imgLi); - return imageAlignment; + return Wrap(children: imgLi); } } \ No newline at end of file diff --git a/lib/views/widgets/StatefulWidget/InkResponse/node1_base.dart b/lib/views/widgets/StatefulWidget/InkResponse/node1_base.dart index 3294192..52d5ce6 100644 --- a/lib/views/widgets/StatefulWidget/InkResponse/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/InkResponse/node1_base.dart @@ -22,7 +22,7 @@ class CustomInkResponse extends StatefulWidget { } class _CustomInkResponseState extends State { - var _info = 'Push'; + String _info = 'Push'; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/InkResponse/node2_color.dart b/lib/views/widgets/StatefulWidget/InkResponse/node2_color.dart index 236e4fa..9c5258a 100644 --- a/lib/views/widgets/StatefulWidget/InkResponse/node2_color.dart +++ b/lib/views/widgets/StatefulWidget/InkResponse/node2_color.dart @@ -22,7 +22,7 @@ class ColorInkResponse extends StatefulWidget { } class _ColorInkResponseState extends State { - var _info = 'Push'; + String _info = 'Push'; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/InkWell/node1_base.dart b/lib/views/widgets/StatefulWidget/InkWell/node1_base.dart index de2b03d..7751751 100644 --- a/lib/views/widgets/StatefulWidget/InkWell/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/InkWell/node1_base.dart @@ -22,7 +22,7 @@ class CustomInkWell extends StatefulWidget { } class _CustomInkWellState extends State { - var _info = 'Push'; + String _info = 'Push'; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/InkWell/node2_color.dart b/lib/views/widgets/StatefulWidget/InkWell/node2_color.dart index 442a992..dffe0f2 100644 --- a/lib/views/widgets/StatefulWidget/InkWell/node2_color.dart +++ b/lib/views/widgets/StatefulWidget/InkWell/node2_color.dart @@ -22,7 +22,7 @@ class ColorInkWell extends StatefulWidget { } class _ColorInkWellState extends State { - var _info = 'Push'; + String _info = 'Push'; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/InteractiveViewer/node3_controller.dart b/lib/views/widgets/StatefulWidget/InteractiveViewer/node3_controller.dart index c43d194..4666e22 100644 --- a/lib/views/widgets/StatefulWidget/InteractiveViewer/node3_controller.dart +++ b/lib/views/widgets/StatefulWidget/InteractiveViewer/node3_controller.dart @@ -119,7 +119,7 @@ class _InteractiveViewerDemo3State extends State onPressed: _animateResetInitialize); } - var _x = 0.0; + double _x = 0.0; Widget _buildButton2() { return MaterialButton( @@ -132,7 +132,7 @@ class _InteractiveViewerDemo3State extends State side: BorderSide(width: 2.0, color: Color(0xFFFFDFDFDF)), ), onPressed: () { - var temp = _transformationController.value.clone(); + Matrix4 temp = _transformationController.value.clone(); temp.translate(_x - 4); _transformationController.value = temp; }); @@ -149,7 +149,7 @@ class _InteractiveViewerDemo3State extends State side: BorderSide(width: 2.0, color: Color(0xFFFFDFDFDF)), ), onPressed: () { - var temp = _transformationController.value.clone(); + Matrix4 temp = _transformationController.value.clone(); temp.translate(_x + 4); _transformationController.value = temp; }); diff --git a/lib/views/widgets/StatefulWidget/LinearProgressIndicator/node1_base.dart b/lib/views/widgets/StatefulWidget/LinearProgressIndicator/node1_base.dart index 42cf95b..675d301 100644 --- a/lib/views/widgets/StatefulWidget/LinearProgressIndicator/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/LinearProgressIndicator/node1_base.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + /// create by 张风捷特烈 on 2020/4/30 /// contact me by email 1981462002@qq.com /// 说明: @@ -20,7 +21,7 @@ class CustomLinearProgressIndicator extends StatefulWidget { class _CustomLinearProgressIndicatorState extends State { - var data = [0.2, 0.4, 0.6, 0.8, null]; + List data = [0.2, 0.4, 0.6, 0.8, null]; @override Widget build(BuildContext context) { @@ -28,14 +29,14 @@ class _CustomLinearProgressIndicatorState spacing: 10, children: data .map((e) => Container( - width: 50, - height: 3, - child:LinearProgressIndicator( - value: e, - backgroundColor: Colors.grey.withAlpha(33), - valueColor: AlwaysStoppedAnimation(Colors.orange), - ), - )) + width: 50, + height: 3, + child: LinearProgressIndicator( + value: e, + backgroundColor: Colors.grey.withAlpha(33), + valueColor: AlwaysStoppedAnimation(Colors.orange), + ), + )) .toList(), ); } diff --git a/lib/views/widgets/StatefulWidget/ListWheelScrollView/node1_base.dart b/lib/views/widgets/StatefulWidget/ListWheelScrollView/node1_base.dart index 3e4e274..1e8ffcb 100644 --- a/lib/views/widgets/StatefulWidget/ListWheelScrollView/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/ListWheelScrollView/node1_base.dart @@ -19,7 +19,7 @@ class CustomListWheelScrollView extends StatefulWidget { } class _CustomListWheelScrollViewState extends State { - var data = [ + List data = [ Colors.orange[50], Colors.orange[100], Colors.orange[200], diff --git a/lib/views/widgets/StatefulWidget/LongPressDraggable/node1_base.dart b/lib/views/widgets/StatefulWidget/LongPressDraggable/node1_base.dart index 1d2166d..c397084 100644 --- a/lib/views/widgets/StatefulWidget/LongPressDraggable/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/LongPressDraggable/node1_base.dart @@ -43,7 +43,7 @@ class _CustomLongPressDraggableState extends State { } List _buildColors() { - var colors = [ + List colors = [ Colors.red, Colors.yellow, Colors.blue, diff --git a/lib/views/widgets/StatefulWidget/MaterialApp/node1_base.dart b/lib/views/widgets/StatefulWidget/MaterialApp/node1_base.dart index 796db6a..9d533b8 100644 --- a/lib/views/widgets/StatefulWidget/MaterialApp/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/MaterialApp/node1_base.dart @@ -25,9 +25,9 @@ class MaterialAppDemo extends StatefulWidget { } class _WidgetsAppDemoState extends State { - var _debugShowCheckedModeBanner = false; - var _showPerformanceOverlay = false; - var _debugShowMaterialGrid = false; + bool _debugShowCheckedModeBanner = false; + bool _showPerformanceOverlay = false; + bool _debugShowMaterialGrid = false; @override Widget build(BuildContext context) { @@ -105,7 +105,7 @@ class HomePage extends StatefulWidget { } class _HomePageState extends State { - var _count = 0; + int _count = 0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/Overlay/node1_base.dart b/lib/views/widgets/StatefulWidget/Overlay/node1_base.dart index 4589626..dcc2e32 100644 --- a/lib/views/widgets/StatefulWidget/Overlay/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Overlay/node1_base.dart @@ -53,7 +53,7 @@ bool show = false; Offset offset = Offset(200, 200); final double radius = 60; -var entry = OverlayEntry( +OverlayEntry entry = OverlayEntry( builder: (context) => Stack( children: [ Positioned( diff --git a/lib/views/widgets/StatefulWidget/Radio/node1_base.dart b/lib/views/widgets/StatefulWidget/Radio/node1_base.dart index f365991..2553e54 100644 --- a/lib/views/widgets/StatefulWidget/Radio/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Radio/node1_base.dart @@ -19,7 +19,7 @@ class CustomRadio extends StatefulWidget { } class _CustomRadioState extends State { - var data = [1, 2, 3, 4, 5]; + List data = [1, 2, 3, 4, 5]; double _value = 1; @override diff --git a/lib/views/widgets/StatefulWidget/ReorderableListView/node1_base.dart b/lib/views/widgets/StatefulWidget/ReorderableListView/node1_base.dart index 09c2bfa..9f0a78f 100644 --- a/lib/views/widgets/StatefulWidget/ReorderableListView/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/ReorderableListView/node1_base.dart @@ -19,7 +19,7 @@ class CustomReorderableListView extends StatefulWidget { } class _CustomReorderableListViewState extends State { - var data = [ + List data = [ Colors.yellow[50], Colors.yellow[100], Colors.yellow[200], diff --git a/lib/views/widgets/StatefulWidget/ReorderableListView/node2_direction.dart b/lib/views/widgets/StatefulWidget/ReorderableListView/node2_direction.dart index a073612..ec36b2b 100644 --- a/lib/views/widgets/StatefulWidget/ReorderableListView/node2_direction.dart +++ b/lib/views/widgets/StatefulWidget/ReorderableListView/node2_direction.dart @@ -18,7 +18,7 @@ class DirectionReorderableListView extends StatefulWidget { } class _DirectionReorderableListViewState extends State { - var data = [ + List data = [ Colors.yellow[50], Colors.yellow[100], Colors.yellow[200], diff --git a/lib/views/widgets/StatefulWidget/Scaffold/node1_base.dart b/lib/views/widgets/StatefulWidget/Scaffold/node1_base.dart index d18c178..a740a0d 100755 --- a/lib/views/widgets/StatefulWidget/Scaffold/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/Scaffold/node1_base.dart @@ -26,16 +26,16 @@ class CustomScaffold extends StatefulWidget { // AppBar 默认的实例,有状态 class _CustomScaffoldState extends State with SingleTickerProviderStateMixin { - final tabs = ['风画庭', '雨韵舍', '雷鸣殿', '电疾堂', '霜寒阁', '雪月楼']; - var _position = 0; - final iconsMap = { + final List tabs = ['风画庭', '雨韵舍', '雷鸣殿', '电疾堂', '霜寒阁', '雪月楼']; + int _position = 0; + final Map iconsMap = { "图鉴": Icons.home, "动态": Icons.toys, "喜欢": Icons.favorite, "手册": Icons.class_, "我的": Icons.account_circle, }; - final _colors = [ + final List _colors = [ Colors.blue, Colors.red, Colors.yellow, diff --git a/lib/views/widgets/StatefulWidget/SelectableText/node2_align.dart b/lib/views/widgets/StatefulWidget/SelectableText/node2_align.dart index 41667e8..2ff2c9f 100644 --- a/lib/views/widgets/StatefulWidget/SelectableText/node2_align.dart +++ b/lib/views/widgets/StatefulWidget/SelectableText/node2_align.dart @@ -21,7 +21,7 @@ class _AlignSelectableTextState extends State { "The [SelectableText] widget displays a string of text with a single style." "The string might break across multiple lines or might all be displayed on" "the same line depending on the layout constraints."; - var _textAlign = TextAlign.left; + TextAlign _textAlign = TextAlign.left; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/TableRowInkWell/node1_base.dart b/lib/views/widgets/StatefulWidget/TableRowInkWell/node1_base.dart index a5c8285..1171d95 100644 --- a/lib/views/widgets/StatefulWidget/TableRowInkWell/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/TableRowInkWell/node1_base.dart @@ -18,16 +18,16 @@ import 'package:flutter/material.dart'; class CustomTableRowInkWell extends StatelessWidget { @override Widget build(BuildContext context) { - var title = _ItemBean("单位称", "量纲", "单位", "单位名称", "单位符号"); - var m = _ItemBean("长度", "L", "1m", "米", "m"); - var kg = _ItemBean("质量", "M", "1Kg", "千克", "Kg"); - var s = _ItemBean("时间", "T", "1s", "秒", "s"); - var a = _ItemBean("安培", "Ι", "1A", "安培", "A"); - var k = _ItemBean("热力学温度", "θ", "1K", "开尔文", "K"); - var mol = _ItemBean("物质的量", "N", "1mol", "摩尔", "mol"); - var cd = _ItemBean("发光强度", "J", "1cd", "坎德拉", "cd"); + _ItemBean title = _ItemBean("单位称", "量纲", "单位", "单位名称", "单位符号"); + _ItemBean m = _ItemBean("长度", "L", "1m", "米", "m"); + _ItemBean kg = _ItemBean("质量", "M", "1Kg", "千克", "Kg"); + _ItemBean s = _ItemBean("时间", "T", "1s", "秒", "s"); + _ItemBean a = _ItemBean("安培", "Ι", "1A", "安培", "A"); + _ItemBean k = _ItemBean("热力学温度", "θ", "1K", "开尔文", "K"); + _ItemBean mol = _ItemBean("物质的量", "N", "1mol", "摩尔", "mol"); + _ItemBean cd = _ItemBean("发光强度", "J", "1cd", "坎德拉", "cd"); - var data = <_ItemBean>[title, m, kg, s, a, k, mol, cd]; + List<_ItemBean> data = [title, m, kg, s, a, k, mol, cd]; return SingleChildScrollView( scrollDirection: Axis.horizontal, diff --git a/lib/views/widgets/StatefulWidget/WidgetInspector/node1_base.dart b/lib/views/widgets/StatefulWidget/WidgetInspector/node1_base.dart index 100a495..0e49c0a 100644 --- a/lib/views/widgets/StatefulWidget/WidgetInspector/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/WidgetInspector/node1_base.dart @@ -35,7 +35,7 @@ class HomePage extends StatefulWidget { } class _HomePageState extends State { - var _count = 0; + int _count = 0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatefulWidget/WidgetsApp/node1_base.dart b/lib/views/widgets/StatefulWidget/WidgetsApp/node1_base.dart index 3dee921..a82ff9b 100644 --- a/lib/views/widgets/StatefulWidget/WidgetsApp/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/WidgetsApp/node1_base.dart @@ -18,9 +18,9 @@ class WidgetsAppDemo extends StatefulWidget { } class _WidgetsAppDemoState extends State { - var _debugShowCheckedModeBanner = false; - var _debugShowWidgetInspector = false; - var _showPerformanceOverlay = false; + bool _debugShowCheckedModeBanner = false; + bool _debugShowWidgetInspector = false; + bool _showPerformanceOverlay = false; @override Widget build(BuildContext context) { @@ -103,7 +103,7 @@ class HomePage extends StatefulWidget { } class _HomePageState extends State { - var _count = 0; + int _count = 0; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/BackButton/node1_base.dart b/lib/views/widgets/StatelessWidget/BackButton/node1_base.dart index 5339c7c..69a834e 100755 --- a/lib/views/widgets/StatelessWidget/BackButton/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/BackButton/node1_base.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class CustomBackButton extends StatelessWidget { @override Widget build(BuildContext context) { - var data = [Colors.red,Colors.yellow,Colors.blue,Colors.green]; + List data = [Colors.red,Colors.yellow,Colors.blue,Colors.green]; return Wrap( spacing: 10, children: data.map((e)=>BackButton( diff --git a/lib/views/widgets/StatelessWidget/Banner/node1_base.dart b/lib/views/widgets/StatelessWidget/Banner/node1_base.dart index 5fff743..c56980c 100644 --- a/lib/views/widgets/StatelessWidget/Banner/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Banner/node1_base.dart @@ -17,7 +17,7 @@ import 'package:flutter/material.dart'; class CustomBanner extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { BannerLocation.topStart: Colors.red, BannerLocation.topEnd: Colors.blue, BannerLocation.bottomStart: Colors.green, diff --git a/lib/views/widgets/StatelessWidget/CheckboxListTile/node1_base.dart b/lib/views/widgets/StatelessWidget/CheckboxListTile/node1_base.dart index b644f1c..eb5f43e 100644 --- a/lib/views/widgets/StatelessWidget/CheckboxListTile/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/CheckboxListTile/node1_base.dart @@ -22,7 +22,7 @@ class CustomCheckBoxListTile extends StatefulWidget { } class _CustomCheckBoxListTileState extends State { - var _selected = false; + bool _selected = false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/CheckboxListTile/node2_select.dart b/lib/views/widgets/StatelessWidget/CheckboxListTile/node2_select.dart index dcc38d8..217a225 100644 --- a/lib/views/widgets/StatelessWidget/CheckboxListTile/node2_select.dart +++ b/lib/views/widgets/StatelessWidget/CheckboxListTile/node2_select.dart @@ -17,7 +17,7 @@ class SelectCheckBoxListTile extends StatefulWidget { } class _SelectCheckBoxListTileState extends State { - var _selected = false; + bool _selected = false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/CheckboxListTile/node3_dense.dart b/lib/views/widgets/StatelessWidget/CheckboxListTile/node3_dense.dart index 81c9888..d249e15 100644 --- a/lib/views/widgets/StatelessWidget/CheckboxListTile/node3_dense.dart +++ b/lib/views/widgets/StatelessWidget/CheckboxListTile/node3_dense.dart @@ -17,7 +17,7 @@ class DenseCheckBoxListTile extends StatefulWidget { } class _DenseCheckBoxListTileState extends State { - var _selected = false; + bool _selected = false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/Container/node4_decoration.dart b/lib/views/widgets/StatelessWidget/Container/node4_decoration.dart index febe711..16af53a 100644 --- a/lib/views/widgets/StatelessWidget/Container/node4_decoration.dart +++ b/lib/views/widgets/StatelessWidget/Container/node4_decoration.dart @@ -26,7 +26,7 @@ class ContainerDecoration extends StatelessWidget { @override Widget build(BuildContext context) { - var stops = [0.0, 1 / 6, 2 / 6, 3 / 6, 4 / 6, 5 / 6, 1.0]; + List stops = [0.0, 1 / 6, 2 / 6, 3 / 6, 4 / 6, 5 / 6, 1.0]; return Container(//容器 alignment: Alignment.center, width: 200, diff --git a/lib/views/widgets/StatelessWidget/CupertinoTheme/node1_base.dart b/lib/views/widgets/StatelessWidget/CupertinoTheme/node1_base.dart index b63b08b..d99a4b6 100644 --- a/lib/views/widgets/StatelessWidget/CupertinoTheme/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/CupertinoTheme/node1_base.dart @@ -15,8 +15,8 @@ import 'package:flutter/material.dart'; class TextCupertinoTheme extends StatelessWidget { @override Widget build(BuildContext context) { - var queryData = CupertinoTheme.of(context).textTheme; - var styles = { + CupertinoTextThemeData queryData = CupertinoTheme.of(context).textTheme; + Map styles = { "tabLabelTextStyle: ": queryData.tabLabelTextStyle, "actionTextStyle: ": queryData.actionTextStyle, "navActionTextStyle: ": queryData.navActionTextStyle, diff --git a/lib/views/widgets/StatelessWidget/DataTable/node2_operation.dart b/lib/views/widgets/StatelessWidget/DataTable/node2_operation.dart index 29022dd..dad0361 100644 --- a/lib/views/widgets/StatelessWidget/DataTable/node2_operation.dart +++ b/lib/views/widgets/StatelessWidget/DataTable/node2_operation.dart @@ -36,7 +36,7 @@ class SortDataTable extends StatefulWidget { } class _SortDataTableState extends State { - var data = [ + List<_BeanOp> data = [ _BeanOp(101, 'DataTable', 'StatelessWidget', false), _BeanOp(44, 'RangeSlider', 'StatefulWidget', false), _BeanOp(2, 'Text', 'StatelessWidget', false), @@ -44,7 +44,7 @@ class _SortDataTableState extends State { ]; bool _sortAscending = false; - var selectData = <_BeanOp>[]; + List<_BeanOp> selectData = []; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/Divider/node1_base.dart b/lib/views/widgets/StatelessWidget/Divider/node1_base.dart index 377096f..f915339 100644 --- a/lib/views/widgets/StatelessWidget/Divider/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Divider/node1_base.dart @@ -16,11 +16,11 @@ import 'package:flutter/material.dart'; class CustomDivider extends StatelessWidget { @override Widget build(BuildContext context) { - var dataColor = [ + List dataColor = [ Colors.red, Colors.yellow, Colors.blue, Colors.green]; - var dataThickness = [1.0, 2.0, 4.0, 6.0]; - var data = Map.fromIterables(dataColor, dataThickness); + List dataThickness = [1.0, 2.0, 4.0, 6.0]; + Map data = Map.fromIterables(dataColor, dataThickness); return Column( children: dataColor .map((e) => Divider( diff --git a/lib/views/widgets/StatelessWidget/Divider/node2_height.dart b/lib/views/widgets/StatelessWidget/Divider/node2_height.dart index 820a669..44f68c2 100644 --- a/lib/views/widgets/StatelessWidget/Divider/node2_height.dart +++ b/lib/views/widgets/StatelessWidget/Divider/node2_height.dart @@ -18,11 +18,11 @@ import 'package:flutter/material.dart'; class HeightDivider extends StatelessWidget { @override Widget build(BuildContext context) { - var dataColor = [ + List dataColor = [ Colors.red, Colors.yellow, Colors.blue, Colors.green]; - var dataThickness = [10.0, 20.0, 30.0, 40.0]; - var data = Map.fromIterables(dataColor, dataThickness); + List dataThickness = [10.0, 20.0, 30.0, 40.0]; + Map data = Map.fromIterables(dataColor, dataThickness); return Column( children: dataColor .map((e) => Divider( diff --git a/lib/views/widgets/StatelessWidget/FadeInImage/node1_base.dart b/lib/views/widgets/StatelessWidget/FadeInImage/node1_base.dart index 7ff1738..d15d61c 100644 --- a/lib/views/widgets/StatelessWidget/FadeInImage/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/FadeInImage/node1_base.dart @@ -23,8 +23,8 @@ import 'package:flutter/material.dart'; class CustomFadeInImage extends StatelessWidget { @override Widget build(BuildContext context) { - var placeholder = "assets/images/icon_head.webp"; - var img = + String placeholder = "assets/images/icon_head.webp"; + String img = "https://user-gold-cdn.xitu.io/2017/8/24/" "d324efef8cbee6468a018aad7ab2ba6b?imageView2/" "1/w/180/h/180/q/85/format/webp/interlace/1"; diff --git a/lib/views/widgets/StatelessWidget/FloatingActionButton/node1_base.dart b/lib/views/widgets/StatelessWidget/FloatingActionButton/node1_base.dart index fa2fe13..91a0143 100644 --- a/lib/views/widgets/StatelessWidget/FloatingActionButton/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/FloatingActionButton/node1_base.dart @@ -17,7 +17,7 @@ import 'package:flutter/material.dart'; class CustomFAB extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { Colors.red: Icons.add, Colors.blue: Icons.bluetooth, Colors.green: Icons.android, diff --git a/lib/views/widgets/StatelessWidget/FloatingActionButton/node2_mini.dart b/lib/views/widgets/StatelessWidget/FloatingActionButton/node2_mini.dart index 2c47d8a..69749b6 100644 --- a/lib/views/widgets/StatelessWidget/FloatingActionButton/node2_mini.dart +++ b/lib/views/widgets/StatelessWidget/FloatingActionButton/node2_mini.dart @@ -17,7 +17,7 @@ import 'package:flutter/material.dart'; class MiniFAB extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { Colors.red: Icons.add, Colors.blue: Icons.bluetooth, Colors.green: Icons.android, diff --git a/lib/views/widgets/StatelessWidget/FloatingActionButton/node3_shape.dart b/lib/views/widgets/StatelessWidget/FloatingActionButton/node3_shape.dart index 9b5551c..60ca750 100644 --- a/lib/views/widgets/StatelessWidget/FloatingActionButton/node3_shape.dart +++ b/lib/views/widgets/StatelessWidget/FloatingActionButton/node3_shape.dart @@ -18,7 +18,7 @@ import '../../../../app/utils/pather.dart'; class ShapeFAB extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { Colors.red: Icons.add, Colors.blue: Icons.bluetooth, Colors.green: Icons.android, diff --git a/lib/views/widgets/StatelessWidget/FlutterLogo/node1_base.dart b/lib/views/widgets/StatelessWidget/FlutterLogo/node1_base.dart index fe426b7..0f16673 100644 --- a/lib/views/widgets/StatelessWidget/FlutterLogo/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/FlutterLogo/node1_base.dart @@ -16,7 +16,7 @@ class CustomFlutterLogo extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { Colors.blue:50.0, Colors.red:60.0, Colors.green:70.0, diff --git a/lib/views/widgets/StatelessWidget/FlutterLogo/node2_style.dart b/lib/views/widgets/StatelessWidget/FlutterLogo/node2_style.dart index 559a501..6df693e 100644 --- a/lib/views/widgets/StatelessWidget/FlutterLogo/node2_style.dart +++ b/lib/views/widgets/StatelessWidget/FlutterLogo/node2_style.dart @@ -14,7 +14,7 @@ import 'package:flutter/material.dart'; class FlutterLogoWithText extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { FlutterLogoStyle.horizontal:Colors.blue, FlutterLogoStyle.markOnly:Colors.red, FlutterLogoStyle.stacked:Colors.green, diff --git a/lib/views/widgets/StatelessWidget/GestureDetector/node1_base.dart b/lib/views/widgets/StatelessWidget/GestureDetector/node1_base.dart index 040abfd..48a2b38 100644 --- a/lib/views/widgets/StatelessWidget/GestureDetector/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/GestureDetector/node1_base.dart @@ -25,7 +25,7 @@ class CustomGestureDetector extends StatefulWidget { } class _CustomGestureDetectorState extends State { - var _info = ''; + String _info = ''; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/GestureDetector/node2_tap.dart b/lib/views/widgets/StatelessWidget/GestureDetector/node2_tap.dart index 2d36002..6012d61 100644 --- a/lib/views/widgets/StatelessWidget/GestureDetector/node2_tap.dart +++ b/lib/views/widgets/StatelessWidget/GestureDetector/node2_tap.dart @@ -19,7 +19,7 @@ class TapGestureDetector extends StatefulWidget { } class _TapGestureDetectorState extends State { - var _info = ''; + String _info = ''; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/GestureDetector/node3_pan.dart b/lib/views/widgets/StatelessWidget/GestureDetector/node3_pan.dart index d4989fa..4796500 100644 --- a/lib/views/widgets/StatelessWidget/GestureDetector/node3_pan.dart +++ b/lib/views/widgets/StatelessWidget/GestureDetector/node3_pan.dart @@ -21,7 +21,7 @@ class PanGestureDetector extends StatefulWidget { } class _PanGestureDetectorState extends State { - var _info = ''; + String _info = ''; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/ImageIcon/node1_base.dart b/lib/views/widgets/StatelessWidget/ImageIcon/node1_base.dart index a13615c..012f1fd 100644 --- a/lib/views/widgets/StatelessWidget/ImageIcon/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/ImageIcon/node1_base.dart @@ -15,7 +15,7 @@ import 'package:flutter/material.dart'; class CustomImageIcon extends StatelessWidget { @override Widget build(BuildContext context) { - var data = { + Map data = { Colors.blue: 50.0, Colors.red: 60.0, Colors.green: 70.0, diff --git a/lib/views/widgets/StatelessWidget/Listener/node1_base.dart b/lib/views/widgets/StatelessWidget/Listener/node1_base.dart index f515e9f..996b6bd 100644 --- a/lib/views/widgets/StatelessWidget/Listener/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Listener/node1_base.dart @@ -22,7 +22,7 @@ class CustomListener extends StatefulWidget { } class _CustomListenerState extends State { - var _info = ''; + String _info = ''; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/NotificationListener/node2_update.dart b/lib/views/widgets/StatelessWidget/NotificationListener/node2_update.dart index 40e0fa8..e19246b 100644 --- a/lib/views/widgets/StatelessWidget/NotificationListener/node2_update.dart +++ b/lib/views/widgets/StatelessWidget/NotificationListener/node2_update.dart @@ -21,7 +21,7 @@ class _NotificationListenerUpdateState extends State { final data = List.generate(30, (i) => '第${i + 1}条'); - var _info = ''; + String _info = ''; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/PositionedDirectional/node1_base.dart b/lib/views/widgets/StatelessWidget/PositionedDirectional/node1_base.dart index 2dc195f..98a9763 100644 --- a/lib/views/widgets/StatelessWidget/PositionedDirectional/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/PositionedDirectional/node1_base.dart @@ -18,25 +18,25 @@ import 'package:flutter/material.dart'; class CustomPositionedDirectional extends StatelessWidget { @override Widget build(BuildContext context) { - var yellowBox = Container( + Widget yellowBox = Container( color: Colors.yellow, height: 100, width: 100, ); - var redBox = Container( + Widget redBox = Container( color: Colors.red, height: 90, width: 90, ); - var greenBox = Container( + Widget greenBox = Container( color: Colors.green, height: 80, width: 80, ); - var cyanBox = Container( + Widget cyanBox = Container( color: Colors.cyanAccent, height: 70, width: 70, diff --git a/lib/views/widgets/StatelessWidget/RadioListTile/node1_base.dart b/lib/views/widgets/StatelessWidget/RadioListTile/node1_base.dart index 7687994..d1ef804 100644 --- a/lib/views/widgets/StatelessWidget/RadioListTile/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/RadioListTile/node1_base.dart @@ -45,7 +45,7 @@ class _CustomRadioListTileState extends State { ItemType.dart: ItemBean("Dart", "世界上最优雅的语言", "assets/images/dart.webp"), }; - var _type = ItemType.java; + ItemType _type = ItemType.java; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/RadioListTile/node2_dense.dart b/lib/views/widgets/StatelessWidget/RadioListTile/node2_dense.dart index df7b743..407d375 100644 --- a/lib/views/widgets/StatelessWidget/RadioListTile/node2_dense.dart +++ b/lib/views/widgets/StatelessWidget/RadioListTile/node2_dense.dart @@ -40,7 +40,7 @@ class _DenseRadioListTileState extends State { ItemType.dart: ItemBean("Dart", "世界上最优雅的语言", "assets/images/dart.webp"), }; - var _type = ItemType.java; + ItemType _type = ItemType.java; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/SwitchListTile/node1_base.dart b/lib/views/widgets/StatelessWidget/SwitchListTile/node1_base.dart index 2a53db2..ca9551b 100644 --- a/lib/views/widgets/StatelessWidget/SwitchListTile/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/SwitchListTile/node1_base.dart @@ -22,7 +22,7 @@ class CustomSwitchListTile extends StatefulWidget { } class _CustomSwitchListTileState extends State { - var _value=false; + bool _value=false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/SwitchListTile/node2_select.dart b/lib/views/widgets/StatelessWidget/SwitchListTile/node2_select.dart index 2b3a1cf..1917fb4 100644 --- a/lib/views/widgets/StatelessWidget/SwitchListTile/node2_select.dart +++ b/lib/views/widgets/StatelessWidget/SwitchListTile/node2_select.dart @@ -18,7 +18,7 @@ class SelectSwitchListTile extends StatefulWidget { } class _SelectSwitchListTileState extends State { - var _value=false; + bool _value=false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/SwitchListTile/node3_dense.dart b/lib/views/widgets/StatelessWidget/SwitchListTile/node3_dense.dart index 29d84b5..68489e3 100644 --- a/lib/views/widgets/StatelessWidget/SwitchListTile/node3_dense.dart +++ b/lib/views/widgets/StatelessWidget/SwitchListTile/node3_dense.dart @@ -16,7 +16,7 @@ class DenseSwitchListTile extends StatefulWidget { } class _DenseSwitchListTileState extends State { - var _value=false; + bool _value=false; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/Text/node1_base.dart b/lib/views/widgets/StatelessWidget/Text/node1_base.dart index e43363f..f87f24b 100644 --- a/lib/views/widgets/StatelessWidget/Text/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Text/node1_base.dart @@ -20,7 +20,7 @@ import 'package:flutter/material.dart'; class CustomText extends StatelessWidget { @override Widget build(BuildContext context) { - var style = TextStyle( + TextStyle style = TextStyle( color: Colors.blue, fontSize: 20, fontWeight: FontWeight.bold, diff --git a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart index 9162886..8355895 100644 --- a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart @@ -13,8 +13,8 @@ import 'package:flutter/material.dart'; class TextThemeDemo extends StatelessWidget { @override Widget build(BuildContext context) { - var queryData = Theme.of(context).textTheme; - var styles = { + TextTheme queryData = Theme.of(context).textTheme; + Map styles = { "headline: ": queryData.headline, "title: ": queryData.title, "subhead: ": queryData.subhead, diff --git a/lib/views/widgets/StatelessWidget/ToggleButtons/node1_single.dart b/lib/views/widgets/StatelessWidget/ToggleButtons/node1_single.dart index 9c265ee..a4c1a28 100644 --- a/lib/views/widgets/StatelessWidget/ToggleButtons/node1_single.dart +++ b/lib/views/widgets/StatelessWidget/ToggleButtons/node1_single.dart @@ -20,7 +20,7 @@ class CustomToggleButtons extends StatefulWidget { } class _CustomToggleButtonsState extends State { - var _isSelected = [true, false, false]; + List _isSelected = [true, false, false]; @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/StatelessWidget/ToggleButtons/node2_color.dart b/lib/views/widgets/StatelessWidget/ToggleButtons/node2_color.dart index be46eeb..86e16fa 100644 --- a/lib/views/widgets/StatelessWidget/ToggleButtons/node2_color.dart +++ b/lib/views/widgets/StatelessWidget/ToggleButtons/node2_color.dart @@ -22,7 +22,7 @@ class ColorToggleButtons extends StatefulWidget { } class _ColorToggleButtonsState extends State { - var _isSelected = [true, false, false]; + List _isSelected = [true, false, false]; @override Widget build(BuildContext context) { return ToggleButtons( diff --git a/lib/views/widgets/StatelessWidget/ToggleButtons/node3_multi.dart b/lib/views/widgets/StatelessWidget/ToggleButtons/node3_multi.dart index cea4cb8..ffce6bb 100644 --- a/lib/views/widgets/StatelessWidget/ToggleButtons/node3_multi.dart +++ b/lib/views/widgets/StatelessWidget/ToggleButtons/node3_multi.dart @@ -17,7 +17,7 @@ class ProToggleButtons extends StatefulWidget { } class _ProToggleButtonsState extends State { - var _isSelected = [false, false, false]; + List _isSelected = [false, false, false]; @override Widget build(BuildContext context) { return ToggleButtons( diff --git a/lib/views/widgets/StatelessWidget/VerticalDivider/node1_base.dart b/lib/views/widgets/StatelessWidget/VerticalDivider/node1_base.dart index 28e0f16..9824b3e 100644 --- a/lib/views/widgets/StatelessWidget/VerticalDivider/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/VerticalDivider/node1_base.dart @@ -13,11 +13,11 @@ import 'package:flutter/material.dart'; class CustomVerticalDivider extends StatelessWidget { @override Widget build(BuildContext context) { - var dataColor = [ + List dataColor = [ Colors.red, Colors.yellow, Colors.blue, Colors.green]; - var dataThickness = [1.0, 2.0, 4.0, 6.0]; - var data = Map.fromIterables(dataColor, dataThickness); + List dataThickness = [1.0, 2.0, 4.0, 6.0]; + Map data = Map.fromIterables(dataColor, dataThickness); return Container( height: 150, child: Row( diff --git a/lib/views/widgets/StatelessWidget/VerticalDivider/node2_height.dart b/lib/views/widgets/StatelessWidget/VerticalDivider/node2_height.dart index 87c6843..e4371b9 100644 --- a/lib/views/widgets/StatelessWidget/VerticalDivider/node2_height.dart +++ b/lib/views/widgets/StatelessWidget/VerticalDivider/node2_height.dart @@ -17,11 +17,13 @@ import 'package:flutter/material.dart'; class HeightVerticalDivider extends StatelessWidget { @override Widget build(BuildContext context) { - var dataColor = [ + List dataColor = [ Colors.red, Colors.yellow, Colors.blue, Colors.green]; - var dataThickness = [10.0, 20.0, 30.0, 40.0]; - var data = Map.fromIterables(dataColor, dataThickness); + List dataThickness = [10.0, 20.0, 30.0, 40.0]; + + Map data = Map.fromIterables(dataColor, dataThickness); + return Container( height: 150, child: Row( diff --git a/lib/views/widgets/StatelessWidget/Visibility/node1_base.dart b/lib/views/widgets/StatelessWidget/Visibility/node1_base.dart index 232981b..b7a9240 100644 --- a/lib/views/widgets/StatelessWidget/Visibility/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Visibility/node1_base.dart @@ -24,7 +24,7 @@ class CustomVisibility extends StatelessWidget { } _buildVisibility(bool visible) { - var box = Container( + Widget box = Container( height: 30, width: 30, color: Colors.blue, diff --git a/lib/views/widgets/StatelessWidget/Visibility/node2_replacement.dart b/lib/views/widgets/StatelessWidget/Visibility/node2_replacement.dart index 4c083cf..877da94 100644 --- a/lib/views/widgets/StatelessWidget/Visibility/node2_replacement.dart +++ b/lib/views/widgets/StatelessWidget/Visibility/node2_replacement.dart @@ -23,7 +23,7 @@ class ReplacementVisibility extends StatelessWidget { } _buildVisibility(bool visible) { - var box = Container( + Widget box = Container( height: 30, width: 30, color: Colors.blue,