diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 00000000..f17eaea4 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,167 @@ +# Specify analysis options. +# +# Until there are meta linter rules, each desired lint must be explicitly enabled. +# See: https://github.com/dart-lang/linter/issues/288 +# +# For a list of lints, see: http://dart-lang.github.io/linter/lints/ +# See the configuration guide for more +# https://github.com/dart-lang/sdk/tree/master/pkg/analyzer#configuring-the-analyzer +# +# There are other similar analysis options files in the flutter repos, +# which should be kept in sync with this file: +# +# - analysis_options.yaml (this file) +# - packages/flutter/lib/analysis_options_user.yaml +# - https://github.com/flutter/plugins/blob/master/analysis_options.yaml +# - https://github.com/flutter/engine/blob/master/analysis_options.yaml +# +# This file contains the analysis options used by Flutter tools, such as IntelliJ, +# Android Studio, and the `flutter analyze` command. + +analyzer: + strong-mode: + implicit-dynamic: false + errors: + # treat missing required parameters as a warning (not a hint) + missing_required_param: warning + # treat missing returns as a warning (not a hint) + missing_return: warning + # allow having TODOs in the code + todo: ignore + exclude: + - 'bin/cache/**' + # the following two are relative to the stocks example and the flutter package respectively + # see https://github.com/dart-lang/sdk/issues/28463 + - 'lib/i18n/stock_messages_*.dart' + - 'lib/src/http/**' + +linter: + rules: + # these rules are documented on and in the same order as + # the Dart Lint rules page to make maintenance easier + # https://github.com/dart-lang/linter/blob/master/example/all.yaml + - always_declare_return_types + - always_put_control_body_on_new_line + # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219 + - always_require_non_null_named_parameters + - always_specify_types + # - avoid_annotating_with_dynamic # conflicts with always_specify_types + - avoid_as + # - avoid_bool_literals_in_conditional_expressions # not yet tested + # - avoid_catches_without_on_clauses # we do this commonly + # - avoid_catching_errors # we do this commonly + - avoid_classes_with_only_static_members + # - avoid_double_and_int_checks # only useful when targeting JS runtime + - avoid_empty_else + - avoid_field_initializers_in_const_classes + - avoid_function_literals_in_foreach_calls + # - avoid_implementing_value_types # not yet tested + - avoid_init_to_null + # - avoid_js_rounded_ints # only useful when targeting JS runtime + - avoid_null_checks_in_equality_operators + # - avoid_positional_boolean_parameters # not yet tested + # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356) + - avoid_relative_lib_imports + - avoid_renaming_method_parameters + - avoid_return_types_on_setters + # - avoid_returning_null # there are plenty of valid reasons to return null + - avoid_returning_null_for_void + # - avoid_returning_this # there are plenty of valid reasons to return this + # - avoid_setters_without_getters # not yet tested + # - avoid_single_cascade_in_expression_statements # not yet tested + - avoid_slow_async_io + - avoid_types_as_parameter_names + # - avoid_types_on_closure_parameters # conflicts with always_specify_types + - avoid_unused_constructor_parameters + - avoid_void_async + - await_only_futures + - camel_case_types + - cancel_subscriptions + # - cascade_invocations # not yet tested + # - close_sinks # not reliable enough + # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765 + # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204 + - control_flow_in_finally + # - curly_braces_in_flow_control_structures # not yet tested + - directives_ordering + - empty_catches + - empty_constructor_bodies + - empty_statements + # - file_names # not yet tested + - flutter_style_todos + - hash_and_equals + - implementation_imports + # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811 + - iterable_contains_unrelated_type + # - join_return_with_assignment # not yet tested + - library_names + - library_prefixes + # - lines_longer_than_80_chars # not yet tested + - list_remove_unrelated_type + # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181 + - no_adjacent_strings_in_list + - no_duplicate_case_values + - non_constant_identifier_names + # - null_closures # not yet tested + # - omit_local_variable_types # opposite of always_specify_types + # - one_member_abstracts # too many false positives + # - only_throw_errors # https://github.com/flutter/flutter/issues/5792 + - package_api_docs + - package_names + - package_prefixed_library_names + # - parameter_assignments # we do this commonly + - prefer_adjacent_string_concatenation + - prefer_asserts_in_initializer_lists + - prefer_collection_literals + - prefer_conditional_assignment + - prefer_const_constructors + - prefer_const_constructors_in_immutables + - prefer_const_declarations + - prefer_const_literals_to_create_immutables + # - prefer_constructors_over_static_methods # not yet tested + - prefer_contains + - prefer_equal_for_default_values + # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods + - prefer_final_fields + - prefer_final_locals + - prefer_foreach + # - prefer_function_declarations_over_variables # not yet tested + - prefer_generic_function_type_aliases + - prefer_initializing_formals + # - prefer_int_literals # not yet tested + # - prefer_interpolation_to_compose_strings # not yet tested + - prefer_is_empty + - prefer_is_not_empty + - prefer_iterable_whereType + # - prefer_mixin # https://github.com/dart-lang/language/issues/32 + - prefer_single_quotes + - prefer_typing_uninitialized_variables + - prefer_void_to_null + # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml + - recursive_getters + - slash_for_doc_comments + - sort_constructors_first + - sort_pub_dependencies + - sort_unnamed_constructors_first + - test_types_in_equals + - throw_in_finally + # - type_annotate_public_apis # subset of always_specify_types + - type_init_formals + # - unawaited_futures # too many false positives + - unnecessary_brace_in_string_interps + - unnecessary_const + - unnecessary_getters_setters + # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498 + - unnecessary_new + - unnecessary_null_aware_assignments + - unnecessary_null_in_if_null_operators + - unnecessary_parenthesis + - unnecessary_statements + - unnecessary_this + - unrelated_type_equality_checks + - use_rethrow_when_possible + # - use_setters_to_change_properties # not yet tested + # - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182 + # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review + - valid_regexps + # - void_checks # not yet tested diff --git a/lib/main.dart b/lib/main.dart index bae1c80f..a53adabe 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,6 +3,7 @@ import 'package:flutter_examples/sample_browser.dart'; import 'package:syncfusion_flutter_core/core.dart'; void main() { + // Register your license here SyncfusionLicense.registerLicense(null); return runApp(SampleBrowser()); } diff --git a/lib/model/helper.dart b/lib/model/helper.dart index 8acdd38a..8ac98830 100755 --- a/lib/model/helper.dart +++ b/lib/model/helper.dart @@ -141,73 +141,73 @@ import 'model.dart'; void onTapControlItem( BuildContext context, SampleListModel model, int position) { - var sample = model.controlList[position]; + final SampleList sample = model.controlList[position]; model.selectedIndex = position; if (sample.title == 'Cartesian Charts') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => CartesianTypes())); + builder: (BuildContext context) => const CartesianTypes())); } if (sample.title == 'Axis Types') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => AxisTypes())); + builder: (BuildContext context) => const AxisTypes())); } if (sample.title == 'Axis Features') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => AxesFeatures())); + builder: (BuildContext context) => const AxesFeatures())); } if (sample.title == 'Circular Charts') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => CircularTypes())); + builder: (BuildContext context) => const CircularTypes())); } if (sample.title == 'Radial Gauge') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => RadialGaugeExamples())); + builder: (BuildContext context) => const RadialGaugeExamples())); } if (sample.title == 'Pyramid Chart') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => PyramidFeatures())); + builder: (BuildContext context) => const PyramidFeatures())); } if (sample.title == 'Funnel Chart') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => FunnelCharts())); + builder: (BuildContext context) => const FunnelCharts())); } if (sample.title == 'Series Features') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => SeriesFeatures())); + builder: (BuildContext context) => const SeriesFeatures())); } if (sample.title == 'Legend') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => LegendFeatures())); + builder: (BuildContext context) => const LegendFeatures())); } if (sample.title == 'User Interactions') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => InteractionTypes())); + builder: (BuildContext context) => const InteractionTypes())); } if (sample.title == 'Dynamic Updates') { Navigator.push( context, MaterialPageRoute( - builder: (BuildContext context) => DynamicUpdates())); + builder: (BuildContext context) => const DynamicUpdates())); } } @@ -1006,18 +1006,277 @@ void onTapSampleItem(BuildContext context, SubItemList sample) { } String getStatus(List model) { - int newCount = 0; - int updateCount = 0; - for (int i = 0; i < model.length; - i++) { - if (model.length > 0 && model[i].status!=null) { - if(model[i].status == 'New'){ - newCount++; - }else if(model[i].status == 'Updated'){ - updateCount++; - } + int newCount = 0; + int updateCount = 0; + for (int i = 0; i < model.length; i++) { + if (model.isNotEmpty && model[i].status != null) { + if (model[i].status == 'New') { + newCount++; + } else if (model[i].status == 'Updated') { + updateCount++; } } - return (newCount == model.length) ? 'N' : (newCount!=0 || updateCount!=0) ? 'U' : ''; } -//......................End User Interactions......................................// + return (newCount == model.length) + ? 'N' + : (newCount != 0 || updateCount != 0) ? 'U' : ''; +} + +List getTabs(SampleListModel model) { + final List tabs = []; + for (int i = 0; + i < model.controlList[model.selectedIndex].subItemList.length; + i++) { + if (model.controlList[model.selectedIndex].subItemList[i].isNotEmpty) { + final String str = + getStatus(model.controlList[model.selectedIndex].subItemList[i]); + tabs.add(Tab( + child: Row( + children: [ + Text(model + .controlList[model.selectedIndex].subItemList[i][0]?.category + .toString() + + (str != '' ? ' ' : '')), + Container( + height: 20, + width: 20, + decoration: BoxDecoration( + color: str == 'N' + ? const Color.fromRGBO(101, 193, 0, 1) + : str == 'U' + ? const Color.fromRGBO(245, 166, 35, 1) + : Colors.transparent, + shape: BoxShape.circle, + ), + alignment: Alignment.center, + child: Text( + str, + style: TextStyle(fontSize: 12), + ), + ), + ], + ))); + } + } + return tabs; +} + +List getCardViewChildren(SampleListModel model) { + final List tabChildren = []; + for (int i = 0; + i < model.controlList[model.selectedIndex].subItemList.length; + i++) { + tabChildren.add(ListView.builder( + cacheExtent: model + .controlList[model.selectedIndex].subItemList[i].length + .toDouble(), + addAutomaticKeepAlives: true, + itemCount: model.controlList[model.selectedIndex].subItemList[i].length, + itemBuilder: (BuildContext context, int position) { + return Container( + color: model.slidingPanelColor, + child: Padding( + padding: const EdgeInsets.all(5.0), + child: Column( + children: [ + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Card( + elevation: 2, + color: model.cardThemeColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(3.0), + ), + child: Column( + children: [ + InkWell( + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + onTapSampleItem( + context, + model.controlList[model.selectedIndex] + .subItemList[i][position]); + }, + child: Padding( + padding: + const EdgeInsets.fromLTRB(10, 5, 10, 5), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + '${model.controlList[model.selectedIndex].subItemList[i][position].title}', + textAlign: TextAlign.left, + softWrap: true, + textScaleFactor: 1, + overflow: TextOverflow.fade, + style: TextStyle( + fontFamily: 'MontserratMedium', + fontSize: 16.0, + color: model.textColor, + letterSpacing: 0.2), + ), + Container( + child: Row( + children: [ + Container( + decoration: BoxDecoration( + color: model.controlList[model.selectedIndex].subItemList[i][position].status != null + ? (model.controlList[model.selectedIndex].subItemList[i][position].status == 'New' + ? const Color.fromRGBO( + 101, 193, 0, 1) + : const Color.fromRGBO( + 245, 166, 35, 1)) + : Colors.transparent, + shape: BoxShape.rectangle, + borderRadius: const BorderRadius.all( + Radius.circular(10.0))), + padding: const EdgeInsets.fromLTRB( + 6, 3, 6, 3), + child: Text( + model.controlList[model.selectedIndex].subItemList[i][position].status != null + ? model.controlList[model.selectedIndex].subItemList[i][position].status + : '', + style: TextStyle(color: Colors.white))), + const Padding( + padding: + EdgeInsets.only(left: 15), + ), + Container( + height: 24, + width: 24, + color: Colors.transparent, + child: Padding( + padding: + const EdgeInsets.fromLTRB( + 5, 0, 5, 5), + child: Image.asset( + 'images/fullscreen.png', + fit: BoxFit.contain, + height: 20, + width: 20, + color: model.listIconColor), + ), + ), + ], + )), + ]), + ), + ), + InkWell( + onTap: () {}, + splashColor: Colors.grey.withOpacity(0.4), + child: Padding( + padding: + const EdgeInsets.fromLTRB(5, 5, 5, 5), + child: SizedBox( + width: double.infinity, + height: 230, + child: model + .controlList[model.selectedIndex] + .subItemList[i][position] + .previewWidget, + ), + ), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + ); + })); + } + return tabChildren; +} + +///Below methods for calendar control - (to show the samples in tabview instead of tileview) +List getSecondaryTabBar(SampleListModel model) { + final List tabs = []; + for (int i = 0; + i < model.controlList[model.selectedIndex].subItemList.length; + i++) { + if (model.controlList[model.selectedIndex].subItemList[i].isNotEmpty) { + tabs.add(Container( + alignment: Alignment.center, + child: DefaultTabController( + length: + model.controlList[model.selectedIndex].subItemList[i].length, + child: Scaffold( + appBar: PreferredSize( + child: AppBar( + backgroundColor: model.backgroundColor, + bottom: TabBar( + indicator: UnderlineTabIndicator( + borderSide: BorderSide( + width: 3.0, color: const Color.fromRGBO(252, 220, 0, 1)), + ), + isScrollable: true, + tabs: getSecondaryTabs(model, i), + ), + ), + preferredSize: Size.fromHeight(48.0), + ), + body: TabBarView(children: getTabViewChildren(model, i)))), + )); + } + } + return tabs; +} + +List getSecondaryTabs(SampleListModel model, int i) { + final List tabs = []; + for (int j = 0; + j < model.controlList[model.selectedIndex].subItemList[i].length; + j++) { + final String str = + getStatus(model.controlList[model.selectedIndex].subItemList[i]); + tabs.add(Tab( + child: Row( + children: [ + Text( + model.controlList[model.selectedIndex].subItemList[i][j].title + + (str != '' ? ' ' : ''), + ), + Container( + height: 20, + width: 20, + decoration: BoxDecoration( + color: str == 'N' + ? const Color.fromRGBO(101, 193, 0, 1) + : str == 'U' + ? const Color.fromRGBO(245, 166, 35, 1) + : Colors.transparent, + shape: BoxShape.circle, + ), + alignment: Alignment.center, + child: Text( + str, + style: TextStyle(fontSize: 12), + ), + ), + ], + ))); + } + return tabs; +} + +List getTabViewChildren(SampleListModel model, int i) { + final List tabs = []; + for (int j = 0; + j < model.controlList[model.selectedIndex].subItemList[i].length; + j++) { + tabs.add(Container( + child: model + .controlList[model.selectedIndex].subItemList[i][j].previewWidget)); + } + return tabs; +} \ No newline at end of file diff --git a/lib/model/model.dart b/lib/model/model.dart index 7355ef63..efd993c7 100755 --- a/lib/model/model.dart +++ b/lib/model/model.dart @@ -150,101 +150,7 @@ class SubItemList { } class SampleListModel extends Model { - bool isTargetMobile; - List controlList; - List searchControlListItems; // To handle search - List sampleList; - List searchSampleListItems; // To handle search - - int selectedIndex = 0; - Color backgroundColor = Color.fromRGBO(0, 116, 228, 1); - Color slidingPanelColor = Color.fromRGBO(250, 250, 250, 1); - Color paletteColor; - ThemeData themeData = ThemeData.light(); - Color searchBoxColor = Colors.white; - Color listIconColor = Color.fromRGBO(0, 116, 228, 1); - Color listDescriptionTextColor = Colors.grey; - Color textColor = Color.fromRGBO(51, 51, 51, 1); - String codeViewerIcon = 'images/code.png'; - String informationIcon = 'images/info.png'; - Brightness theme = Brightness.light; - Color drawerTextIconColor = Colors.black; - Color drawerIconColor = Colors.black; - Color drawerBackgroundColor = Colors.white; - Color bottomSheetBackgroundColor = Colors.white; - final isTileView = true; - Color cardThemeColor = Colors.white; - - // For Axis Types - List numericAxisSubItemList; - List categoryAxisSubItemList; - List dateTimeAxisSubItemList; - List logarithmicAxisSubItemList; - List axisFeaturesSubItemList; - List multipleAxisSubItemList; - List labelIntersectActionSubItemList; - List edgeLabelPlacementSubItemList; - List> axisSubItemList; - List> axesFeaturesSubItemList; - - // Cartesian Types - List lineSeriesSubItemList; - List columnSeriesSubItemList; - List splineSeriesSubItemList; - List areaSeriesSubItemList; - List barSeriesSubItemList; - List bubbleSeriesSubItemList; - List scatterSeriesSubItemList; - List stepLineSeriesSubItemList; - List rangeColumnSeriesSubItemList; - List stackedSeriesSubItemList; - List legendSubItemList; - List markerSubItemList; - List dataLabelSubItemList; - List annotationSubItemList; - List sortingSubItemList; - List animationSubItemList; - List emptyPointSubItemList; - List> cartesianSubItemList; - List> accumulationSubItemList; - List> pyramidSubItemList; - List> funnelSubItemList; - List> otherFeaturesSubItemList; - List> legendFeaturesSubItemList; - List> userInteractionSubItemList; - List> dynamicUpdatesSubItemList; - - // dynamic updates - List liveUpdateSubItemList; - List liveVerticalSubItemList; - List randomUpdateDataSubItemList; - - // User Interactions Types - List tooltipSubItemList; - List zoomingPanningSubItemList; - List crossHairSubItemList; - List trackballSubItemList; - List selectionSubItemList; - - // Accumulation Types - List pieSeriesSubItemList; - List doughnutSeriesSubItemList; - List radialBarSeriesSubItemList; - - //Triangular Types - List pyramidSeriesSubItemList; - List funnelSeriesSubItemList; - - //Radial gauge examples - List> radialGaugeSubItemList; - List radialAxisSubItemList; - List radialPointersSubItemList; - List radialRangesSubItemList; - List radialAnnotationSubItemList; - List radialInteractionSubItemList; - List radialAnimationSubItemList; - List radialShowCaseSubItemList; - + SampleListModel() { controlList = []; searchControlListItems = []; @@ -539,7 +445,6 @@ class SampleListModel extends Model { legendFeaturesSubItemList = >[]; userInteractionSubItemList = >[]; dynamicUpdatesSubItemList = >[]; - // dynamic updates liveUpdateSubItemList = []; liveVerticalSubItemList = []; @@ -1362,6 +1267,102 @@ class SampleListModel extends Model { } } + bool isTargetMobile; + List controlList; + List searchControlListItems; // To handle search + List sampleList; + List searchSampleListItems; // To handle search + + int selectedIndex = 0; + Color backgroundColor = const Color.fromRGBO(0, 116, 228, 1); + Color slidingPanelColor = const Color.fromRGBO(250, 250, 250, 1); + Color paletteColor; + ThemeData themeData = ThemeData.light(); + Color searchBoxColor = Colors.white; + Color listIconColor = const Color.fromRGBO(0, 116, 228, 1); + Color listDescriptionTextColor = Colors.grey; + Color textColor = const Color.fromRGBO(51, 51, 51, 1); + String codeViewerIcon = 'images/code.png'; + String informationIcon = 'images/info.png'; + Brightness theme = Brightness.light; + Color drawerTextIconColor = Colors.black; + Color drawerIconColor = Colors.black; + Color drawerBackgroundColor = Colors.white; + Color bottomSheetBackgroundColor = Colors.white; + final bool isTileView = true; + Color cardThemeColor = Colors.white; + + // For Axis Types + List numericAxisSubItemList; + List categoryAxisSubItemList; + List dateTimeAxisSubItemList; + List logarithmicAxisSubItemList; + List axisFeaturesSubItemList; + List multipleAxisSubItemList; + List labelIntersectActionSubItemList; + List edgeLabelPlacementSubItemList; + List> axisSubItemList; + List> axesFeaturesSubItemList; + + // Cartesian Types + List lineSeriesSubItemList; + List columnSeriesSubItemList; + List splineSeriesSubItemList; + List areaSeriesSubItemList; + List barSeriesSubItemList; + List bubbleSeriesSubItemList; + List scatterSeriesSubItemList; + List stepLineSeriesSubItemList; + List rangeColumnSeriesSubItemList; + List stackedSeriesSubItemList; + List legendSubItemList; + List markerSubItemList; + List dataLabelSubItemList; + List annotationSubItemList; + List sortingSubItemList; + List animationSubItemList; + List emptyPointSubItemList; + List> cartesianSubItemList; + List> accumulationSubItemList; + List> pyramidSubItemList; + List> funnelSubItemList; + List> otherFeaturesSubItemList; + List> legendFeaturesSubItemList; + List> userInteractionSubItemList; + List> dynamicUpdatesSubItemList; + List> calendarSubItemList; + + // dynamic updates + List liveUpdateSubItemList; + List liveVerticalSubItemList; + List randomUpdateDataSubItemList; + + // User Interactions Types + List tooltipSubItemList; + List zoomingPanningSubItemList; + List crossHairSubItemList; + List trackballSubItemList; + List selectionSubItemList; + + // Accumulation Types + List pieSeriesSubItemList; + List doughnutSeriesSubItemList; + List radialBarSeriesSubItemList; + + //Triangular Types + List pyramidSeriesSubItemList; + List funnelSeriesSubItemList; + + //Radial gauge examples + List> radialGaugeSubItemList; + List radialAxisSubItemList; + List radialPointersSubItemList; + List radialRangesSubItemList; + List radialAnnotationSubItemList; + List radialInteractionSubItemList; + List radialAnimationSubItemList; + List radialShowCaseSubItemList; + void changeTheme(ThemeData _themeData) { themeData = _themeData; switch (_themeData.brightness) { @@ -1373,11 +1374,11 @@ class SampleListModel extends Model { drawerIconColor = Colors.black; drawerBackgroundColor = Colors.white; bottomSheetBackgroundColor = Colors.white; - backgroundColor = paletteColor ?? Color.fromRGBO(0, 116, 228, 1); - listIconColor = paletteColor ?? Color.fromRGBO(0, 116, 228, 1); + backgroundColor = paletteColor ?? const Color.fromRGBO(0, 116, 228, 1); + listIconColor = paletteColor ?? const Color.fromRGBO(0, 116, 228, 1); searchBoxColor = Colors.white; listDescriptionTextColor = Colors.grey; - textColor = Color.fromRGBO(51, 51, 51, 1); + textColor = const Color.fromRGBO(51, 51, 51, 1); theme = Brightness.light; cardThemeColor = Colors.white; break; @@ -1386,17 +1387,17 @@ class SampleListModel extends Model { { drawerTextIconColor = Colors.white; drawerIconColor = Colors.white; - slidingPanelColor = Color.fromRGBO(32, 33, 37, 1); + slidingPanelColor = const Color.fromRGBO(32, 33, 37, 1); drawerBackgroundColor = Colors.black; - bottomSheetBackgroundColor = Color.fromRGBO(34, 39, 51, 1); - backgroundColor = paletteColor ?? Color.fromRGBO(0, 116, 228, 1); + bottomSheetBackgroundColor = const Color.fromRGBO(34, 39, 51, 1); + backgroundColor = paletteColor ?? const Color.fromRGBO(0, 116, 228, 1); listIconColor = paletteColor ?? Colors.white; searchBoxColor = Colors.white; - listDescriptionTextColor = Color.fromRGBO(242,242,242,1); - textColor = Color.fromRGBO(242,242,242,1); + listDescriptionTextColor = const Color.fromRGBO(242,242,242,1); + textColor = const Color.fromRGBO(242,242,242,1); theme = Brightness.dark; // cardThemeColor = Colors.black.withOpacity(0.7); - cardThemeColor = Color.fromRGBO(23,27,36,1); + cardThemeColor = const Color.fromRGBO(23,27,36,1); break; } default: @@ -1406,11 +1407,11 @@ class SampleListModel extends Model { bottomSheetBackgroundColor = Colors.white; drawerIconColor = Colors.white; slidingPanelColor = Colors.white; - backgroundColor = Color.fromRGBO(0, 116, 228, 1); + backgroundColor = const Color.fromRGBO(0, 116, 228, 1); searchBoxColor = Colors.white; - listIconColor = Color.fromRGBO(0, 116, 228, 1); + listIconColor = const Color.fromRGBO(0, 116, 228, 1); listDescriptionTextColor = Colors.white; - textColor = Color.fromRGBO(51, 51, 51, 1); + textColor = const Color.fromRGBO(51, 51, 51, 1); theme = Brightness.light; cardThemeColor = Colors.white; break; diff --git a/lib/sample_browser.dart b/lib/sample_browser.dart index c7df5afa..c08b26b1 100755 --- a/lib/sample_browser.dart +++ b/lib/sample_browser.dart @@ -9,9 +9,11 @@ import 'package:flutter_examples/widgets/search_bar.dart'; import 'package:flutter_examples/widgets/widget.dart'; import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'model/model.dart'; -import 'model/helper.dart'; import 'package:flutter/material.dart'; +import 'model/helper.dart'; +import 'model/model.dart'; + + class SampleBrowser extends StatelessWidget { @override @@ -39,11 +41,11 @@ class _HomePageState extends State { SampleListModel sampleListModel; List colorPaletteWidgets; List colors; - final controller = ScrollController(); + final dynamic controller = ScrollController(); double cOpacity = 0.0; double screenHeight; ThemeData _currentThemeData; - Color _currentBackgroundColor = Color.fromRGBO(0, 116, 228, 1); + Color _currentBackgroundColor = const Color.fromRGBO(0, 116, 228, 1); Color _currentListIconColor; Color _currentPaletteColor; bool _lightThemeSelected = true; @@ -54,9 +56,9 @@ class _HomePageState extends State { _currentThemeData = ThemeData.light(); sampleListModel = SampleListModel(); lightThemeSelected = sampleListModel.backgroundColor; - darkThemeSelected = Color.fromRGBO(249, 249, 249, 1); + darkThemeSelected = const Color.fromRGBO(249, 249, 249, 1); lightThemeSelectedTextColor = Colors.white; - darkThemeSelectedTextColor = Color.fromRGBO(51, 51, 51, 1); + darkThemeSelectedTextColor = const Color.fromRGBO(51, 51, 51, 1); defaultBorderColor = []; addColors(); init(); @@ -83,14 +85,14 @@ class _HomePageState extends State { Widget build(BuildContext context) { screenHeight = MediaQuery.of(context).size.height; _orientationPadding = ((MediaQuery.of(context).size.width) / 100) * 20; - var smallestDimension = MediaQuery.of(context).size.shortestSide; + final dynamic smallestDimension = MediaQuery.of(context).size.shortestSide; final bool useMobileLayout = smallestDimension < 600; sampleListModel.isTargetMobile = useMobileLayout; - return ScopedModel( + return ScopedModel( model: sampleListModel, child: ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => MaterialApp( + builder: (BuildContext context, _, SampleListModel model) => MaterialApp( debugShowCheckedModeBanner: false, home: SafeArea( child: Scaffold( @@ -99,10 +101,10 @@ class _HomePageState extends State { appBar: PreferredSize( preferredSize: Size.fromHeight(60.0), child: Container( - decoration: BoxDecoration(boxShadow: [ + decoration: BoxDecoration(boxShadow: [ BoxShadow( color: model.backgroundColor, - offset: Offset(0, 2.0), + offset: const Offset(0, 2.0), blurRadius: 0.25, ) ]), @@ -123,7 +125,7 @@ class _HomePageState extends State { height: 40, width: 40, child: IconButton( - icon: new Icon(Icons.settings, + icon: Icon(Icons.settings, color: Colors.white), onPressed: () { _showSettingsPanel(model); @@ -137,23 +139,23 @@ class _HomePageState extends State { body: Scaffold( backgroundColor: model.slidingPanelColor, body: SafeArea( - child: new ListView.builder( + child: ListView.builder( controller: controller, - physics: ClampingScrollPhysics(), + physics: const ClampingScrollPhysics(), itemCount: 2, - itemBuilder: (context, index) { - return new Material( + itemBuilder: (BuildContext context, num index) { + return Material( color: model.backgroundColor, - child: new CustomListView( + child: CustomListView( header: Container( color: model.backgroundColor, child: Column( children: [ index != 0 - ? new Container( + ? Container( color: model.backgroundColor, height: 100.0, - padding: new EdgeInsets.symmetric( + padding: const EdgeInsets.symmetric( horizontal: 0.0), alignment: Alignment.centerLeft, child: Column( @@ -176,27 +178,27 @@ class _HomePageState extends State { child: Container( height: 20, width: double.infinity, - decoration: new BoxDecoration( + decoration: BoxDecoration( color: model .slidingPanelColor, border: Border.all( color: model .slidingPanelColor), - borderRadius: new BorderRadius + borderRadius: const BorderRadius .only( topLeft: - const Radius + Radius .circular( 12.0), topRight: - const Radius + Radius .circular( 12.0)), - boxShadow: [ + boxShadow: [ BoxShadow( color: model .slidingPanelColor, - offset: Offset( + offset: const Offset( 0, 2.0), blurRadius: 0.25, @@ -297,7 +299,8 @@ class _HomePageState extends State { } List getListViewChildrens(SampleListModel model) { - List items = []; + List items; + items = []; for (int i = 0; i < model.controlList.length; i++) { items.add(Padding( padding: const EdgeInsets.fromLTRB(0, 2, 0, 0), @@ -305,7 +308,7 @@ class _HomePageState extends State { color: model.slidingPanelColor, child: ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Material( + builder: (BuildContext context, _, SampleListModel model) => Material( color: model.slidingPanelColor, elevation: 0.0, child: InkWell( @@ -338,23 +341,23 @@ class _HomePageState extends State { decoration: BoxDecoration( shape: BoxShape.rectangle, color: model.controlList[i].status == 'New' - ? Color.fromRGBO(101, 193, 0, 1) + ? const Color.fromRGBO(101, 193, 0, 1) : model.controlList[i].status == 'Updated' - ? Color.fromRGBO( + ? const Color.fromRGBO( 245, 166, 35, 1) : model.controlList[i].status == 'Preview' - ? Color.fromRGBO( + ? const Color.fromRGBO( 238, 245, 255, 1) : Colors.transparent, - borderRadius: BorderRadius.only( + borderRadius: const BorderRadius.only( topLeft: Radius.circular(10), bottomLeft: Radius.circular(10))), - padding: EdgeInsets.fromLTRB(7, 3, 6, 3), + padding: const EdgeInsets.fromLTRB(7, 3, 6, 3), child: Text(model.controlList[i].status, style: TextStyle( color: model.controlList[i].status == 'Preview' - ? Color.fromRGBO(0, 98, 255, 1) + ? const Color.fromRGBO(0, 98, 255, 1) : Colors.white, fontSize: 12))) ]), @@ -380,12 +383,14 @@ class _HomePageState extends State { )))), ), )); - if (i != model.controlList.length - 1) items.add(Divider(height: 15.0)); + if (i != model.controlList.length - 1) { + items.add(const Divider(height: 15.0)); + } } for (int i = 0; i < model.sampleList.length; i++) { items.add(ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Material( + builder: (BuildContext context, _, SampleListModel model) => Material( elevation: 0.0, color: model.slidingPanelColor, child: InkWell( @@ -404,9 +409,9 @@ class _HomePageState extends State { textAlign: TextAlign.left, softWrap: true, maxLines: 1, - text: new TextSpan( + text: TextSpan( children: [ - new TextSpan( + TextSpan( text: '${model.sampleList[i].title} in ', style: TextStyle( fontFamily: 'MontserratMedium', @@ -414,7 +419,7 @@ class _HomePageState extends State { fontSize: 14.0, color: model.textColor, letterSpacing: 0.3)), - new TextSpan( + TextSpan( text: '${model.sampleList[0].category}', style: TextStyle( fontSize: 14.0, @@ -426,10 +431,12 @@ class _HomePageState extends State { ), ), ))))); - if (i != model.sampleList.length - 1) items.add(Divider(height: 15.0)); + if (i != model.sampleList.length - 1) { + items.add(const Divider(height: 15.0)); + } } - if (model.sampleList.length == 0 && model.controlList.length == 0) { + if (model.sampleList.isEmpty&& model.controlList.isEmpty) { items.add(Padding( padding: const EdgeInsets.fromLTRB(0, 30, 0, 0), child: Container( @@ -444,17 +451,17 @@ class _HomePageState extends State { } void _showSettingsPanel(SampleListModel model) { - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModel( + builder: (BuildContext context) => ScopedModel( model: sampleListModel, child: ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => OrientationBuilder( - builder: (context, orientation) { + builder: (BuildContext context, _, SampleListModel model) => OrientationBuilder( + builder: (BuildContext context, Orientation orientation) { return Container( height: 250, child: Column( @@ -702,14 +709,14 @@ class _HomePageState extends State { )))); } - _applySetting(SampleListModel model) { + void _applySetting(SampleListModel model) { model.backgroundColor = _currentBackgroundColor; if (_lightThemeSelected) { lightThemeSelected = model.backgroundColor; - darkThemeSelected = Color.fromRGBO(249, 249, 249, 1); + darkThemeSelected = const Color.fromRGBO(249, 249, 249, 1); } else { darkThemeSelected = model.backgroundColor; - lightThemeSelected = Color.fromRGBO(249, 249, 249, 1); + lightThemeSelected = const Color.fromRGBO(249, 249, 249, 1); } model.listIconColor = _currentListIconColor; model.paletteColor = _currentPaletteColor; @@ -719,23 +726,23 @@ class _HomePageState extends State { Navigator.pop(context); } - _toggleLightTheme(SampleListModel model) { + void _toggleLightTheme(SampleListModel model) { _lightThemeSelected = true; lightThemeSelected = model.backgroundColor; - darkThemeSelected = Color.fromRGBO(249, 249, 249, 1); + darkThemeSelected = const Color.fromRGBO(249, 249, 249, 1); _currentThemeData = ThemeData.light(); lightThemeSelectedTextColor = Colors.white; - darkThemeSelectedTextColor = Color.fromRGBO(51, 51, 51, 1); + darkThemeSelectedTextColor = const Color.fromRGBO(51, 51, 51, 1); // ignore: invalid_use_of_protected_member model.notifyListeners(); } - _toggleDarkTheme(SampleListModel model) { + void _toggleDarkTheme(SampleListModel model) { _lightThemeSelected = false; darkThemeSelected = model.backgroundColor; - lightThemeSelected = Color.fromRGBO(249, 249, 249, 1); + lightThemeSelected = const Color.fromRGBO(249, 249, 249, 1); _currentThemeData = ThemeData.dark(); - lightThemeSelectedTextColor = Color.fromRGBO(51, 51, 51, 1); + lightThemeSelectedTextColor = const Color.fromRGBO(51, 51, 51, 1); darkThemeSelectedTextColor = Colors.white; // ignore: invalid_use_of_protected_member model.notifyListeners(); @@ -743,12 +750,12 @@ class _HomePageState extends State { void addColors() { colors = []; - colors.add(Color.fromRGBO(0, 116, 228, 1)); - colors.add(Color.fromRGBO(255, 90, 25, 1)); - colors.add(Color.fromRGBO(251, 53, 105, 1)); - colors.add(Color.fromRGBO(73, 76, 162, 1)); - colors.add(Color.fromRGBO(48, 171, 123, 1)); - defaultBorderColor.add(Color.fromRGBO(87, 89, 208, 1)); + colors.add(const Color.fromRGBO(0, 116, 228, 1)); + colors.add(const Color.fromRGBO(255, 90, 25, 1)); + colors.add(const Color.fromRGBO(251, 53, 105, 1)); + colors.add(const Color.fromRGBO(73, 76, 162, 1)); + colors.add(const Color.fromRGBO(48, 171, 123, 1)); + defaultBorderColor.add(const Color.fromRGBO(87, 89, 208, 1)); defaultBorderColor.add(Colors.transparent); defaultBorderColor.add(Colors.transparent); defaultBorderColor.add(Colors.transparent); @@ -874,9 +881,9 @@ class _HomePageState extends State { 25, 0, 0, 0), child: Column( children: [ - Padding( + const Padding( padding: - const EdgeInsets.only( + EdgeInsets.only( top: 10)), Row(children: [ Image.asset( @@ -902,9 +909,9 @@ class _HomePageState extends State { .normal)), ) ]), - Padding( + const Padding( padding: - const EdgeInsets.only( + EdgeInsets.only( top: 10)), ], )))), @@ -925,9 +932,9 @@ class _HomePageState extends State { 25, 0, 0, 0), child: Column( children: [ - Padding( + const Padding( padding: - const EdgeInsets.only( + EdgeInsets.only( top: 10)), Row(children: [ Image.asset( @@ -953,9 +960,9 @@ class _HomePageState extends State { .normal)), ) ]), - Padding( + const Padding( padding: - const EdgeInsets.only( + EdgeInsets.only( top: 10)), ], )))), @@ -991,9 +998,9 @@ class _HomePageState extends State { ) ]), ), - Padding( + const Padding( padding: - const EdgeInsets.fromLTRB(0, 15, 0, 0)), + EdgeInsets.fromLTRB(0, 15, 0, 0)), Material( color: Colors.transparent, child: InkWell( @@ -1005,9 +1012,9 @@ class _HomePageState extends State { }, child: Column( children: [ - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), Row( children: [ Padding( @@ -1048,9 +1055,9 @@ class _HomePageState extends State { ), ], ), - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), ], ))), Material( @@ -1064,9 +1071,9 @@ class _HomePageState extends State { }, child: Column( children: [ - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), Row( children: [ Padding( @@ -1108,9 +1115,9 @@ class _HomePageState extends State { ), ], ), - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), ], ))), Material( @@ -1124,9 +1131,9 @@ class _HomePageState extends State { }, child: Column( children: [ - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), Row( children: [ Padding( @@ -1168,9 +1175,9 @@ class _HomePageState extends State { ), ], ), - Padding( + const Padding( padding: - const EdgeInsets.only(top: 10)), + EdgeInsets.only(top: 10)), ], ))), ], @@ -1196,7 +1203,7 @@ class _HomePageState extends State { )), Align( alignment: Alignment.bottomCenter, - child: Text('Version 1.0.0-beta', + child: Text('Version 17.3.14', style: TextStyle( color: _model.drawerTextIconColor, fontSize: 12, diff --git a/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart b/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart index 7e1ea201..74123b73 100644 --- a/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart +++ b/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart @@ -10,20 +10,17 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AxisCrossing extends StatefulWidget { - final SubItemList sample; const AxisCrossing(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; @override _AxisCrossingState createState() => _AxisCrossingState(sample); } class _AxisCrossingState extends State { + _AxisCrossingState(this.sample); final SubItemList sample; - - _AxisCrossingState(this.sample); - bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -49,7 +46,7 @@ class _AxisCrossingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -84,7 +81,7 @@ class _AxisCrossingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color:model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -92,18 +89,21 @@ class _AxisCrossingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); final List _axis = ['X', 'Y'].toList(); String _selectedAxisType = 'X'; @@ -122,7 +122,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -182,19 +182,19 @@ class _FrontPanelState extends State { }); } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -308,7 +308,7 @@ class _FrontPanelState extends State { maxValue: 8, initialValue: crossAt, - onChanged: (val) => + onChanged: (double val) => setState(() { crossAt = val; }), @@ -347,14 +347,14 @@ class _FrontPanelState extends State { letterSpacing: 0.34, fontWeight: FontWeight.normal)), - Padding( + const Padding( padding: EdgeInsets.fromLTRB(20, 0, 0, 0) ), BottomSheetCheckbox( activeColor: model.backgroundColor, switchValue: isPlaceLabelsNearAxisLine, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { isPlaceLabelsNearAxisLine = value; }); @@ -372,18 +372,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - - BackPanel(this.sample); + //ignore: prefer_const_constructors_in_immutables + BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); + final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -391,15 +392,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -408,7 +409,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart b/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart index 1c9c01c2..3eab7e2b 100755 --- a/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart +++ b/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart @@ -9,18 +9,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class EdgeLabel extends StatefulWidget { - final SubItemList sample; const EdgeLabel(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _EdgeLabelState createState() => _EdgeLabelState(sample); } class _EdgeLabelState extends State { + _EdgeLabelState(this.sample); + final SubItemList sample; - _EdgeLabelState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +48,7 @@ class _EdgeLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +82,7 @@ class _EdgeLabelState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,16 +90,19 @@ class _EdgeLabelState extends State { } class FrontPanel extends StatefulWidget { + //ignore: prefer_const_constructors_in_immutables + FrontPanel(this.subItemList); + final SubItemList subItemList; - FrontPanel(this.subItemList); @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); + final SubItemList sample; - _FrontPanelState(this.sample); bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -111,7 +116,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -178,19 +183,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -291,34 +296,38 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -327,7 +336,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -398,18 +407,18 @@ SfCartesianChart getEdgeLabelPlacementChart(bool isTileView, List> getLineSeries(bool isTileView) { final List<_ChartData> chartData = <_ChartData>[ - _ChartData(new DateTime(2005, 4, 1), 37.99, 28.22), - _ChartData(new DateTime(2006, 4, 1), 43.5, 30.45), - _ChartData(new DateTime(2007, 4, 1), 43, 30.25), - _ChartData(new DateTime(2008, 4, 1), 45.5, 31.76), - _ChartData(new DateTime(2009, 4, 1), 44.7, 30.86), - _ChartData(new DateTime(2010, 4, 1), 48, 38.1), - _ChartData(new DateTime(2011, 4, 1), 58.5, 37.75), - _ChartData(new DateTime(2012, 4, 1), 65.6, 40.91), - _ChartData(new DateTime(2013, 4, 1), 66.09, 48.63), - _ChartData(new DateTime(2014, 4, 1), 72.26, 55.48), - _ChartData(new DateTime(2015, 4, 1), 60.49, 49.71), - _ChartData(new DateTime(2016, 4, 1), 59.68, 48.33) + _ChartData( DateTime(2005, 4, 1), 37.99, 28.22), + _ChartData( DateTime(2006, 4, 1), 43.5, 30.45), + _ChartData( DateTime(2007, 4, 1), 43, 30.25), + _ChartData( DateTime(2008, 4, 1), 45.5, 31.76), + _ChartData( DateTime(2009, 4, 1), 44.7, 30.86), + _ChartData( DateTime(2010, 4, 1), 48, 38.1), + _ChartData( DateTime(2011, 4, 1), 58.5, 37.75), + _ChartData( DateTime(2012, 4, 1), 65.6, 40.91), + _ChartData( DateTime(2013, 4, 1), 66.09, 48.63), + _ChartData( DateTime(2014, 4, 1), 72.26, 55.48), + _ChartData( DateTime(2015, 4, 1), 60.49, 49.71), + _ChartData( DateTime(2016, 4, 1), 59.68, 48.33) ]; return >[ SplineSeries<_ChartData, DateTime>( diff --git a/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart b/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart index 0f2ce17c..e817ed7e 100755 --- a/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart +++ b/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart @@ -8,18 +8,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LabelAction extends StatefulWidget { - final SubItemList sample; const LabelAction(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LabelActionState createState() => _LabelActionState(sample); } class _LabelActionState extends State { - final SubItemList sample; _LabelActionState(this.sample); + + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +46,7 @@ class _LabelActionState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +96,7 @@ class _LabelActionState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,16 +104,19 @@ class _LabelActionState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -134,7 +138,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -210,15 +214,15 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -319,18 +323,21 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); + final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -338,15 +345,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -355,7 +362,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart b/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart index 66928ec0..b059a9be 100755 --- a/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart +++ b/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart @@ -6,18 +6,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class MultipleAxis extends StatefulWidget { - final SubItemList sample; const MultipleAxis(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _MultipleAxisState createState() => _MultipleAxisState(sample); } class _MultipleAxisState extends State { - final SubItemList sample; _MultipleAxisState(this.sample); + + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +45,7 @@ class _MultipleAxisState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +79,7 @@ class _MultipleAxisState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +87,26 @@ class _MultipleAxisState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -139,34 +145,38 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + + //ignore:prefer_const_constructors_in_immutables + BackPanel(this.sample); + final SubItemList sample; - BackPanel(this.sample); @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -175,7 +185,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart b/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart index 567df121..3ae8bf5b 100755 --- a/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart +++ b/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart @@ -7,18 +7,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class NumericOpposed extends StatefulWidget { - final SubItemList sample; const NumericOpposed(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _NumericOpposedState createState() => _NumericOpposedState(sample); } class _NumericOpposedState extends State { - final SubItemList sample; _NumericOpposedState(this.sample); + + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +46,7 @@ class _NumericOpposedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, toggleFrontLayer: false, @@ -78,7 +80,7 @@ class _NumericOpposedState extends State { headerClosingHeight: 350, color:model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,16 +88,20 @@ class _NumericOpposedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -104,7 +110,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -142,34 +148,37 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -178,7 +187,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart b/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart index 1f2893fa..bc8c5629 100644 --- a/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart +++ b/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart @@ -9,18 +9,20 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../../widgets/bottom_sheet.dart'; class PlotBandRecurrence extends StatefulWidget { - final SubItemList sample; const PlotBandRecurrence(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _PlotBandRecurrenceState createState() => _PlotBandRecurrenceState(sample); } class _PlotBandRecurrenceState extends State { - final SubItemList sample; _PlotBandRecurrenceState(this.sample); + + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,11 +48,12 @@ class _PlotBandRecurrenceState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, sampleListModel: model, + toggleFrontLayer: false, frontPanelOpenPercentage: 0.28, appBarAnimatedLeadingMenuIcon: AnimatedIcons.close_menu, appBarActions: [ @@ -69,25 +72,6 @@ class _PlotBandRecurrenceState extends State { ), ), ), - Padding( - padding: const EdgeInsets.fromLTRB(0, 0, 10, 0), - child: Container( - height: 40, - width: 40, - child: IconButton( - icon: Icon( - Icons.info_outline, - color: Colors.white, - ), - onPressed: () { - if (frontPanelVisible.value) - frontPanelVisible.value = false; - else - frontPanelVisible.value = true; - }, - ), - ), - ), ], appBarTitle: AnimatedSwitcher( duration: Duration(milliseconds: 1000), @@ -98,7 +82,7 @@ class _PlotBandRecurrenceState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,16 +90,20 @@ class _PlotBandRecurrenceState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + + final SubItemList sample; bool xAxis = false, yAxis = true; @override @@ -129,7 +117,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -148,19 +136,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 180, child: Padding( @@ -215,7 +203,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: xAxis, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { xAxis = value; }); @@ -238,7 +226,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: yAxis, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { yAxis = value; }); @@ -256,34 +244,37 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -292,7 +283,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -335,7 +326,7 @@ class _BackPanelState extends State { SfCartesianChart getPlotBandRecurrenceChart(bool isTileView, [bool xVisible, bool yVisible]) { return SfCartesianChart( - title: ChartTitle(text: isTileView ? '' : "World pollution report"), + title: ChartTitle(text: isTileView ? '' : 'World pollution report'), legend: Legend(isVisible: !isTileView), plotAreaBorderWidth: 0, primaryXAxis: DateTimeAxis( @@ -357,7 +348,7 @@ SfCartesianChart getPlotBandRecurrenceChart(bool isTileView, start: DateTime(1965, 1, 1), end: DateTime(2010, 1, 1), shouldRenderAboveSeries:false, - color: Color.fromRGBO(227, 228, 230, 0.4)) + color: const Color.fromRGBO(227, 228, 230, 0.4)) ]), primaryYAxis: NumericAxis( isVisible: true, @@ -374,7 +365,7 @@ SfCartesianChart getPlotBandRecurrenceChart(bool isTileView, end: 18000, repeatUntil: 18000, shouldRenderAboveSeries:false, - color: Color.fromRGBO(227, 228, 230, 0.1)) + color: const Color.fromRGBO(227, 228, 230, 0.1)) ], majorGridLines: MajorGridLines(color: Colors.grey), majorTickLines: MajorTickLines(size: 0), diff --git a/lib/samples/chart/axis_features/plot_band/plot_band.dart b/lib/samples/chart/axis_features/plot_band/plot_band.dart index 11253fb5..689e16e2 100644 --- a/lib/samples/chart/axis_features/plot_band/plot_band.dart +++ b/lib/samples/chart/axis_features/plot_band/plot_band.dart @@ -9,18 +9,20 @@ import '../../../../widgets/bottom_sheet.dart'; import '../../../../widgets/customDropDown.dart'; class PlotBandDefault extends StatefulWidget { - final SubItemList sample; const PlotBandDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _PlotBandDefaultState createState() => _PlotBandDefaultState(sample); } class _PlotBandDefaultState extends State { - final SubItemList sample; _PlotBandDefaultState(this.sample); + + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,9 +48,10 @@ class _PlotBandDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, + toggleFrontLayer: false, panelVisible: frontPanelVisible, sampleListModel: model, frontPanelOpenPercentage: 0.28, @@ -69,25 +72,7 @@ class _PlotBandDefaultState extends State { ), ), ), - Padding( - padding: const EdgeInsets.fromLTRB(0, 0, 10, 0), - child: Container( - height: 40, - width: 40, - child: IconButton( - icon: Icon( - Icons.info_outline, - color: Colors.white, - ), - onPressed: () { - if (frontPanelVisible.value) - frontPanelVisible.value = false; - else - frontPanelVisible.value = true; - }, - ), - ), - ), + ], appBarTitle: AnimatedSwitcher( duration: Duration(milliseconds: 1000), @@ -98,7 +83,7 @@ class _PlotBandDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,16 +91,20 @@ class _PlotBandDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + + final SubItemList sample; final List _plotBandType = ['vertical', 'horizontal', 'segment'].toList(); bool isHorizontal = true; @@ -139,7 +128,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -188,19 +177,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -298,34 +287,39 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + + //ignore: prefer_const_constructors_in_immutables + BackPanel(this.sample); + final SubItemList sample; - BackPanel(this.sample); @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); + _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + dynamic _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -334,7 +328,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -474,7 +468,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, text: 'High Temperature', shouldRenderAboveSeries: false, color: const Color.fromRGBO(207, 85, 7, 1), - textStyle: ChartTextStyle(color: Color.fromRGBO(255, 255, 255, 1))), + textStyle: ChartTextStyle(color:const Color.fromRGBO(255, 255, 255, 1))), PlotBand( isVisible: isTileView ? false : isVertical, start: 20, @@ -482,7 +476,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, text: 'Average Temperature', shouldRenderAboveSeries: false, color: const Color.fromRGBO(224, 155, 0, 1), - textStyle: ChartTextStyle(color: Color.fromRGBO(255, 255, 255, 1))), + textStyle: ChartTextStyle(color:const Color.fromRGBO(255, 255, 255, 1))), PlotBand( isVisible: isTileView ? false : isVertical, start: 10, diff --git a/lib/samples/chart/axis_types/category_types/default_category_axis.dart b/lib/samples/chart/axis_types/category_types/default_category_axis.dart index d76cb816..adb2b2a5 100755 --- a/lib/samples/chart/axis_types/category_types/default_category_axis.dart +++ b/lib/samples/chart/axis_types/category_types/default_category_axis.dart @@ -6,18 +6,17 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class CategoryDefault extends StatefulWidget { - final SubItemList sample; const CategoryDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; @override _CategoryDefaultState createState() => _CategoryDefaultState(sample); } class _CategoryDefaultState extends State { - final SubItemList sample; _CategoryDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +42,7 @@ class _CategoryDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +76,7 @@ class _CategoryDefaultState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +84,25 @@ class _CategoryDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -112,18 +114,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + //ignore:prefer_const_constructors_in_immutables + BackPanel(this.sample); final SubItemList sample; - BackPanel(this.sample); @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -131,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -148,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart b/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart index 20412739..486847c0 100755 --- a/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart +++ b/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart @@ -9,18 +9,21 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../../widgets/bottom_sheet.dart'; class CategoryIndexed extends StatefulWidget { - final SubItemList sample; const CategoryIndexed(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _CategoryIndexedState createState() => _CategoryIndexedState(sample); } class _CategoryIndexedState extends State { - final SubItemList sample; + _CategoryIndexedState(this.sample); + final SubItemList sample; + bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +49,7 @@ class _CategoryIndexedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -96,7 +99,7 @@ class _CategoryIndexedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -104,16 +107,20 @@ class _CategoryIndexedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; + bool enableTooltip = false; bool isIndexed = true; bool enableMarker = false; @@ -123,7 +130,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -142,19 +149,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -209,7 +216,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: isIndexed, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { isIndexed = value; }); @@ -227,34 +234,39 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -263,7 +275,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_types/category_types/label_placement.dart b/lib/samples/chart/axis_types/category_types/label_placement.dart index 5d2c71cf..d3b334df 100755 --- a/lib/samples/chart/axis_types/category_types/label_placement.dart +++ b/lib/samples/chart/axis_types/category_types/label_placement.dart @@ -9,18 +9,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class CategoryTicks extends StatefulWidget { - final SubItemList sample; const CategoryTicks(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _CategoryTicksState createState() => _CategoryTicksState(sample); } class _CategoryTicksState extends State { - final SubItemList sample; _CategoryTicksState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +46,7 @@ class _CategoryTicksState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +80,7 @@ class _CategoryTicksState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,16 +88,17 @@ class _CategoryTicksState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -113,7 +114,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -144,19 +145,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -258,34 +259,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -294,7 +295,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart b/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart index 28e2a8f5..3f5b0602 100755 --- a/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart +++ b/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DateTimeLabel extends StatefulWidget { - final SubItemList sample; const DateTimeLabel(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DateTimeLabelState createState() => _DateTimeLabelState(sample); } class _DateTimeLabelState extends State { - final SubItemList sample; _DateTimeLabelState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _DateTimeLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -78,7 +78,7 @@ class _DateTimeLabelState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,22 +86,23 @@ class _DateTimeLabelState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -139,18 +140,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { @@ -158,15 +160,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -175,7 +177,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -267,7 +269,7 @@ List> getLineSeries(bool isTileView) { dataSource: chartData, xValueMapper: (_DateTimeData data, _) => data.year, yValueMapper: (_DateTimeData data, _) => data.y, - color: Color.fromRGBO(232, 84, 84, 1)) + color: const Color.fromRGBO(232, 84, 84, 1)) ]; } diff --git a/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart b/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart index 7a708575..fe28aaa8 100755 --- a/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart +++ b/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DateTimeDefault extends StatefulWidget { - final SubItemList sample; const DateTimeDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DateTimeDefaultState createState() => _DateTimeDefaultState(sample); } class _DateTimeDefaultState extends State { - final SubItemList sample; _DateTimeDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DateTimeDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _DateTimeDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,24 @@ class _DateTimeDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -138,18 +140,20 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + //ignore: prefer_const_constructors_in_immutables + BackPanel(this.sample); final SubItemList sample; - BackPanel(this.sample); + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -157,15 +161,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -174,7 +178,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -300,7 +304,7 @@ List> getLineSeries(bool isTileView) { dataSource: chartData, xValueMapper: (_DateTimeData data, _) => data.year, yValueMapper: (_DateTimeData data, _) => data.y, - color: Color.fromRGBO(242, 117, 7, 1), + color: const Color.fromRGBO(242, 117, 7, 1), ) ]; } diff --git a/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart b/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart index 97660207..0436ad2b 100644 --- a/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart +++ b/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart @@ -6,21 +6,22 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LogarithmicAxisDefault extends StatefulWidget { - final SubItemList sample; const LogarithmicAxisDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _LogarithmicAxisDefaultState createState() => _LogarithmicAxisDefaultState(sample); } class _LogarithmicAxisDefaultState extends State { - final SubItemList sample; _LogarithmicAxisDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +47,7 @@ class _LogarithmicAxisDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -81,7 +82,7 @@ class _LogarithmicAxisDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -89,24 +90,25 @@ class _LogarithmicAxisDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); - + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -118,18 +120,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { @@ -137,15 +140,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -154,7 +157,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -214,16 +217,16 @@ SfCartesianChart getDefaultLogarithmicAxisChart(bool isTileView) { List> _getSeries(bool isTileView) { final List<_ChartData> chartData = <_ChartData>[ - _ChartData(new DateTime(1996, 1, 1), 200), - _ChartData(new DateTime(1997, 1, 1), 400), - _ChartData(new DateTime(1998, 1, 1), 600), - _ChartData(new DateTime(1999, 1, 1), 700), - _ChartData(new DateTime(2000, 1, 1), 1400), - _ChartData(new DateTime(2001, 1, 1), 2000), - _ChartData(new DateTime(2002, 1, 1), 4000), - _ChartData(new DateTime(2003, 1, 1), 6000), - _ChartData(new DateTime(2004, 1, 1), 8000), - _ChartData(new DateTime(2005, 1, 1), 11000) + _ChartData(DateTime(1996, 1, 1), 200), + _ChartData(DateTime(1997, 1, 1), 400), + _ChartData(DateTime(1998, 1, 1), 600), + _ChartData(DateTime(1999, 1, 1), 700), + _ChartData(DateTime(2000, 1, 1), 1400), + _ChartData(DateTime(2001, 1, 1), 2000), + _ChartData(DateTime(2002, 1, 1), 4000), + _ChartData(DateTime(2003, 1, 1), 6000), + _ChartData(DateTime(2004, 1, 1), 8000), + _ChartData(DateTime(2005, 1, 1), 11000) ]; return >[ LineSeries<_ChartData, DateTime>( diff --git a/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart b/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart index 38e42fb3..e4e374af 100644 --- a/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart +++ b/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart @@ -7,21 +7,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; dynamic text; class LogarithmicAxisInversed extends StatefulWidget { - final SubItemList sample; const LogarithmicAxisInversed(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; @override _LogarithmicAxisInversedState createState() => _LogarithmicAxisInversedState(sample); } class _LogarithmicAxisInversedState extends State { + _LogarithmicAxisInversedState(this.sample); final SubItemList sample; - _LogarithmicAxisInversedState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +46,7 @@ class _LogarithmicAxisInversedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -82,7 +81,7 @@ class _LogarithmicAxisInversedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -90,23 +89,25 @@ class _LogarithmicAxisInversedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -144,18 +145,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -163,15 +164,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -180,7 +181,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart b/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart index 54bbd2f3..a8ff261b 100755 --- a/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart +++ b/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class NumericDefault extends StatefulWidget { - final SubItemList sample; const NumericDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _NumericDefaultState createState() => _NumericDefaultState(sample); } class _NumericDefaultState extends State { - final SubItemList sample; _NumericDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _NumericDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _NumericDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,18 @@ class _NumericDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -103,7 +105,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -141,18 +143,20 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -160,15 +164,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -177,7 +181,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -253,14 +257,14 @@ List> getLineSeries(bool isTileView) { ColumnSeries<_ChartNumeric, num>( enableTooltip: true, dataSource: chartData, - color: Color.fromRGBO(237, 221, 76, 1), + color: const Color.fromRGBO(237, 221, 76, 1), name: 'Australia', xValueMapper: (_ChartNumeric sales, _) => sales.x, yValueMapper: (_ChartNumeric sales, _) => sales.y2), ColumnSeries<_ChartNumeric, num>( enableTooltip: true, dataSource: chartData, - color: Color.fromRGBO(2, 109, 213, 1), + color: const Color.fromRGBO(2, 109, 213, 1), xValueMapper: (_ChartNumeric sales, _) => sales.x, yValueMapper: (_ChartNumeric sales, _) => sales.y, name: 'India'), diff --git a/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart b/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart index d1ed628c..d019e399 100755 --- a/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart +++ b/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart @@ -9,18 +9,18 @@ import 'package:intl/intl.dart'; import 'package:url_launcher/url_launcher.dart'; class NumericInverse extends StatefulWidget { - final SubItemList sample; const NumericInverse(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _NumericInverseState createState() => _NumericInverseState(sample); } class _NumericInverseState extends State { - final SubItemList sample; _NumericInverseState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +46,7 @@ class _NumericInverseState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _,SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +80,7 @@ class _NumericInverseState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius:const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,16 +88,18 @@ class _NumericInverseState extends State { } class FrontPanel extends StatefulWidget { + + //ignore: prefer_const_constructors_in_immutables + FrontPanel(this.subItemList); final SubItemList subItemList; - FrontPanel(this.subItemList); @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool isYInversed = true; bool isXInversed = true; @@ -105,7 +107,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -157,19 +159,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _,SampleListModel model) => Padding( + padding:const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 150, child: Padding( @@ -220,7 +222,7 @@ class _FrontPanelState extends State { letterSpacing: 0.34, fontWeight: FontWeight.normal)), - Padding( + const Padding( padding: EdgeInsets.only(left: 5), ), Padding( @@ -231,7 +233,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: isXInversed, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { isXInversed = value; }); @@ -251,7 +253,7 @@ class _FrontPanelState extends State { letterSpacing: 0.34, fontWeight: FontWeight.normal)), - Padding( + const Padding( padding: EdgeInsets.only(left: 5), ), Padding( @@ -262,7 +264,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: isYInversed, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { isYInversed = value; }); @@ -281,34 +283,35 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + //ignore: prefer_const_constructors_in_immutables + BackPanel(this.sample); final SubItemList sample; - BackPanel(this.sample); @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -317,7 +320,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _,SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart b/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart index e3186d45..ad29c47b 100755 --- a/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart +++ b/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class NumericLabel extends StatefulWidget { - final SubItemList sample; const NumericLabel(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _NumericLabelState createState() => _NumericLabelState(sample); } class _NumericLabelState extends State { + _NumericLabelState(this.sample); final SubItemList sample; - _NumericLabelState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _NumericLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _NumericLabelState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,24 @@ class _NumericLabelState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -112,18 +114,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -131,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -148,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart b/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart index 73618e09..4be19739 100755 --- a/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart +++ b/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AreaEmpty extends StatefulWidget { - final SubItemList sample; const AreaEmpty(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _AreaEmptyState createState() => _AreaEmptyState(sample); } class _AreaEmptyState extends State { - final SubItemList sample; _AreaEmptyState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _AreaEmptyState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +95,7 @@ class _AreaEmptyState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,21 +103,22 @@ class _AreaEmptyState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -129,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -148,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -165,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart b/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart index 7120dd8d..3c9805a5 100755 --- a/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart +++ b/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AreaGradient extends StatefulWidget { - final SubItemList sample; const AreaGradient(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _AreaGradientState createState() => _AreaGradientState(sample); } class _AreaGradientState extends State { - final SubItemList sample; _AreaGradientState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _AreaGradientState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -78,7 +78,7 @@ class _AreaGradientState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,22 +86,24 @@ class _AreaGradientState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,18 +115,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -132,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart b/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart index 0389a2ad..fb51df2a 100755 --- a/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AreaDefault extends StatefulWidget { - final SubItemList sample; const AreaDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _AreaDefaultState createState() => _AreaDefaultState(sample); } class _AreaDefaultState extends State { + _AreaDefaultState(this.sample); final SubItemList sample; - _AreaDefaultState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _AreaDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -78,7 +78,7 @@ class _AreaDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,22 +86,24 @@ class _AreaDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,18 +115,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -132,15 +135,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +152,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart b/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart index 639d6838..6074a4a1 100755 --- a/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AreaVertical extends StatefulWidget { - final SubItemList sample; const AreaVertical(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _AreaVerticalState createState() => _AreaVerticalState(sample); } class _AreaVerticalState extends State { +_AreaVerticalState(this.sample); final SubItemList sample; - _AreaVerticalState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _AreaVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _AreaVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _AreaVerticalState extends State { } class FrontPanel extends StatefulWidget { + //ignore:prefer_const_constructors_in_immutables + FrontPanel(this.subItemList); final SubItemList subItemList; - FrontPanel(this.subItemList); @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -209,21 +210,21 @@ SfCartesianChart getVerticalAreaChart(bool isTileView) { List> getAreaSeries(bool isTileView) { final List<_AreaData> chartData = <_AreaData>[ - _AreaData(new DateTime(2000, 0, 1), 0.61, 0.03, 0.48, 0.23), - _AreaData(new DateTime(2001, 0, 1), 0.81, 0.05, 0.53, 0.17), - _AreaData(new DateTime(2002, 0, 1), 0.91, 0.06, 0.57, 0.17), - _AreaData(new DateTime(2003, 0, 1), 1, 0.09, 0.61, 0.20), - _AreaData(new DateTime(2004, 0, 1), 1.19, 0.14, 0.63, 0.23), - _AreaData(new DateTime(2005, 0, 1), 1.47, 0.20, 0.64, 0.36), - _AreaData(new DateTime(2006, 0, 1), 1.74, 0.29, 0.66, 0.43), - _AreaData(new DateTime(2007, 0, 1), 1.98, 0.46, 0.76, 0.52), - _AreaData(new DateTime(2008, 0, 1), 1.99, 0.64, 0.77, 0.72), - _AreaData(new DateTime(2009, 0, 1), 1.70, 0.75, 0.55, 1.29), - _AreaData(new DateTime(2010, 0, 1), 1.48, 1.06, 0.54, 1.38), - _AreaData(new DateTime(2011, 0, 1), 1.38, 1.25, 0.57, 1.82), - _AreaData(new DateTime(2012, 0, 1), 1.66, 1.55, 0.61, 2.16), - _AreaData(new DateTime(2013, 0, 1), 1.66, 1.55, 0.67, 2.51), - _AreaData(new DateTime(2014, 0, 1), 1.67, 1.65, 0.67, 2.61), + _AreaData(DateTime(2000, 0, 1), 0.61, 0.03, 0.48, 0.23), + _AreaData(DateTime(2001, 0, 1), 0.81, 0.05, 0.53, 0.17), + _AreaData(DateTime(2002, 0, 1), 0.91, 0.06, 0.57, 0.17), + _AreaData(DateTime(2003, 0, 1), 1, 0.09, 0.61, 0.20), + _AreaData(DateTime(2004, 0, 1), 1.19, 0.14, 0.63, 0.23), + _AreaData(DateTime(2005, 0, 1), 1.47, 0.20, 0.64, 0.36), + _AreaData(DateTime(2006, 0, 1), 1.74, 0.29, 0.66, 0.43), + _AreaData(DateTime(2007, 0, 1), 1.98, 0.46, 0.76, 0.52), + _AreaData(DateTime(2008, 0, 1), 1.99, 0.64, 0.77, 0.72), + _AreaData(DateTime(2009, 0, 1), 1.70, 0.75, 0.55, 1.29), + _AreaData(DateTime(2010, 0, 1), 1.48, 1.06, 0.54, 1.38), + _AreaData(DateTime(2011, 0, 1), 1.38, 1.25, 0.57, 1.82), + _AreaData(DateTime(2012, 0, 1), 1.66, 1.55, 0.61, 2.16), + _AreaData(DateTime(2013, 0, 1), 1.66, 1.55, 0.67, 2.51), + _AreaData(DateTime(2014, 0, 1), 1.67, 1.65, 0.67, 2.61), ]; return >[ AreaSeries<_AreaData, DateTime>( diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart index f24f9231..c36853db 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart @@ -8,20 +8,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BarSpacing extends StatefulWidget { - final SubItemList sample; const BarSpacing(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BarSpacingState createState() => _BarSpacingState(sample); } class _BarSpacingState extends State { + _BarSpacingState(this.sample); final SubItemList sample; - _BarSpacingState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +47,7 @@ class _BarSpacingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _BarSpacingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,18 +101,20 @@ class _BarSpacingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; double columnWidth = 0.8; double columnSpacing = 0.2; - _FrontPanelState(this.sample); TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); @@ -120,7 +122,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -140,19 +142,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -213,7 +215,7 @@ class _FrontPanelState extends State { minValue: 0, maxValue: 1, initialValue: columnWidth, - onChanged: (val) => + onChanged: (double val) => setState(() { columnWidth = val; }), @@ -265,7 +267,7 @@ class _FrontPanelState extends State { minValue: 0, maxValue: 0.9, initialValue: columnSpacing, - onChanged: (val) => + onChanged: (double val) => setState(() { columnSpacing = val; }), @@ -305,18 +307,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -324,15 +326,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -341,7 +343,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -388,7 +390,7 @@ SfCartesianChart getSpacingBarChart(bool isTileView, title: ChartTitle(text: isTileView ? '' : 'Exports & Imports of US'), legend: Legend(isVisible: isTileView ? false : true), primaryXAxis: NumericAxis( - minimum: 2005, maximum: 2011, majorGridLines: MajorGridLines(width: 0)), + minimum: 2005, maximum: 2011,interval: 1, majorGridLines: MajorGridLines(width: 0)), primaryYAxis: NumericAxis( labelFormat: '{value}%', title: AxisTitle(text: isTileView ? '' : 'Goods and services (% of GDP)'), diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart index d18a18ab..0be5c0ee 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BarRounded extends StatefulWidget { - final SubItemList sample; const BarRounded(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BarRoundedState createState() => _BarRoundedState(sample); } class _BarRoundedState extends State { - final SubItemList sample; - _BarRoundedState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _BarRoundedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _BarRoundedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,22 +87,23 @@ class _BarRoundedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -140,18 +140,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -159,15 +159,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -176,7 +176,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -244,7 +244,7 @@ List> getBarSeries(bool isTileView) { BarSeries<_ChartData, String>( enableTooltip: true, dataSource: chartData, - borderRadius: BorderRadius.all(Radius.circular(10)), + borderRadius:const BorderRadius.all(Radius.circular(10)), xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.population, ), diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart index 31cce29b..915a9562 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BarTracker extends StatefulWidget { - final SubItemList sample; const BarTracker(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BarTrackerState createState() => _BarTrackerState(sample); } class _BarTrackerState extends State { - final SubItemList sample; - _BarTrackerState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _BarTrackerState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +94,7 @@ class _BarTrackerState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +102,23 @@ class _BarTrackerState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -149,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -166,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -238,7 +238,7 @@ List> getBarSeries(bool isTileView) { BarSeries<_TrackerData, String>( dataSource: chartData, borderRadius: BorderRadius.circular(15), - trackColor: Color.fromRGBO(198, 201, 207, 1), + trackColor:const Color.fromRGBO(198, 201, 207, 1), isTrackVisible: true, dataLabelSettings: DataLabelSettings( isVisible: true, labelAlignment: ChartDataLabelAlignment.top), diff --git a/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart b/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart index 22d63781..77d8d33c 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:syncfusion_flutter_charts/charts.dart'; import 'dart:ui' as ui; +import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; import 'package:flutter_examples/widgets/flutter_backdrop.dart'; @@ -8,8 +8,8 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BarCustomization extends StatefulWidget { + const BarCustomization(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const BarCustomization(this.sample, {Key key}) : super(key: key); @override _BarCustomizationState createState() => _BarCustomizationState(sample); @@ -21,10 +21,10 @@ bool isImageloaded = false; List values; class _BarCustomizationState extends State { - final SubItemList sample; _BarCustomizationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { panelOpen = frontPanelVisible.value; @@ -48,7 +48,7 @@ class _BarCustomizationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -98,7 +98,7 @@ class _BarCustomizationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,26 +106,28 @@ class _BarCustomizationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); void initState() { super.initState(); } final SubItemList sample; - _FrontPanelState(this.sample); + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -161,31 +163,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { +_BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -194,7 +198,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -339,7 +343,7 @@ class CustomPainter extends BarSegment { if (isImageloaded && devicePixelRatio > 0) { super.onPaint(canvas); - Rect rect = Rect.fromLTRB(segmentRect.left, segmentRect.top, + final Rect rect = Rect.fromLTRB(segmentRect.left, segmentRect.top, segmentRect.right * animationFactor, segmentRect.bottom); canvas.drawRect(rect, linePaint); } diff --git a/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart b/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart index 53ef3e88..7999c417 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart @@ -7,20 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BarDefault extends StatefulWidget { - final SubItemList sample; const BarDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BarDefaultState createState() => _BarDefaultState(sample); } class _BarDefaultState extends State { - final SubItemList sample; - _BarDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +45,7 @@ class _BarDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +79,7 @@ class _BarDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,22 +87,23 @@ class _BarDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -115,18 +115,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -134,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -151,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart index bcf589f0..28663087 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BubbleGradient extends StatefulWidget { - final SubItemList sample; const BubbleGradient(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BubbleGradientState createState() => _BubbleGradientState(sample); } class _BubbleGradientState extends State { + _BubbleGradientState(this.sample); final SubItemList sample; - _BubbleGradientState(this.sample); - bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _BubbleGradientState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +94,7 @@ class _BubbleGradientState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +102,23 @@ class _BubbleGradientState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -131,18 +131,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { @@ -150,15 +151,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -167,7 +168,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -233,12 +234,12 @@ SfCartesianChart getGradientBubbleChart(bool isTileView) { List> getBubbleSeries(bool isTileView) { final List<_BubbleGradient> chartData = <_BubbleGradient>[ + _BubbleGradient('England', 3, 0, const Color.fromRGBO(233, 132, 30, 1)), _BubbleGradient('India', 3, 2, const Color.fromRGBO(0, 255, 255, 1)), + _BubbleGradient('Pakistan', 2, 1, const Color.fromRGBO(255, 200, 102, 1)), _BubbleGradient('West\nIndies', 3, 2, const Color.fromRGBO(0, 0, 0, 1)), - _BubbleGradient('Sri\nLanka', 3, 1, const Color.fromRGBO(255, 340, 102, 1)), - _BubbleGradient('Pakistan', 2, 1, const Color.fromRGBO(255, 200, 102, 1)), - _BubbleGradient('England', 3, 0, const Color.fromRGBO(233, 132, 30, 1)), - _BubbleGradient('New\nZealand', 1, 0, const Color.fromRGBO(200, 0, 102, 1)), + _BubbleGradient('Sri\nLanka', 3, 1, const Color.fromRGBO(255, 340, 102, 1)), + _BubbleGradient('New\nZealand', 1, 0, const Color.fromRGBO(200, 0, 102, 1)) ]; final List color = []; color.add(Colors.blue[50]); diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart index b2359d3d..83460987 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart @@ -6,20 +6,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BubbleMultiSeries extends StatefulWidget { + const BubbleMultiSeries(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const BubbleMultiSeries(this.sample, {Key key}) : super(key: key); @override _BubbleMultiSeriesState createState() => _BubbleMultiSeriesState(sample); } class _BubbleMultiSeriesState extends State { - final SubItemList sample; _BubbleMultiSeriesState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _BubbleMultiSeriesState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _BubbleMultiSeriesState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,22 +87,24 @@ class _BubbleMultiSeriesState extends State { } class FrontPanel extends StatefulWidget { + + //ignore:prefer_const_constructors_in_immutables + FrontPanel(this.subItemList); final SubItemList subItemList; - FrontPanel(this.subItemList); @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +116,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + //ignore:prefer_const_constructors_in_immutables + BackPanel(this.sample); final SubItemList sample; - BackPanel(this.sample); - @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +135,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +152,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart index f877a965..b494b304 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart @@ -7,20 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BubblePointColor extends StatefulWidget { + const BubblePointColor(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const BubblePointColor(this.sample, {Key key}) : super(key: key); @override _BubblePointColorState createState() => _BubblePointColorState(sample); } class _BubblePointColorState extends State { + _BubblePointColorState(this.sample); final SubItemList sample; - _BubblePointColorState(this.sample); - bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +45,7 @@ class _BubblePointColorState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +79,7 @@ class _BubblePointColorState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,22 +87,25 @@ class _BubblePointColorState extends State { } class FrontPanel extends StatefulWidget { + + //ignore:prefer_const_constructors_in_immutables + FrontPanel(this.subItemList); final SubItemList subItemList; - FrontPanel(this.subItemList); @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -115,18 +117,20 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { @@ -134,15 +138,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -151,7 +155,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart b/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart index 3fe78c48..6c94c6b9 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class BubbleDefault extends StatefulWidget { - final SubItemList sample; const BubbleDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _BubbleDefaultState createState() => _BubbleDefaultState(sample); } class _BubbleDefaultState extends State { - final SubItemList sample; - _BubbleDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _BubbleDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +78,7 @@ class _BubbleDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,22 +86,24 @@ class _BubbleDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +115,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart b/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart index 1e010b2c..a35aae6f 100755 --- a/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart +++ b/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart @@ -7,19 +7,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnBack extends StatefulWidget { + + const ColumnBack(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const ColumnBack(this.sample, {Key key}) : super(key: key); @override _ColumnBackState createState() => _ColumnBackState(sample); } class _ColumnBackState extends State { - final SubItemList sample; _ColumnBackState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +46,7 @@ class _ColumnBackState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +96,7 @@ class _ColumnBackState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,23 +104,26 @@ class _ColumnBackState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + + _FrontPanelState(this.sample); final SubItemList sample; bool enableLegend = true; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -131,18 +135,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -150,15 +155,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -167,7 +172,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart b/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart index fde09467..3a3ee7ad 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart @@ -8,20 +8,20 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnSpacing extends StatefulWidget { + const ColumnSpacing(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const ColumnSpacing(this.sample, {Key key}) : super(key: key); @override _ColumnSpacingState createState() => _ColumnSpacingState(sample); } class _ColumnSpacingState extends State { - final SubItemList sample; _ColumnSpacingState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +47,7 @@ class _ColumnSpacingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -97,7 +97,7 @@ class _ColumnSpacingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color:model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -105,27 +105,29 @@ class _ColumnSpacingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; bool enableLegend = true; double columnWidth = 0.8; double columnSpacing = 0.2; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -145,19 +147,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -218,7 +220,7 @@ class _FrontPanelState extends State { minValue: 0, maxValue: 0.9, initialValue: columnWidth, - onChanged: (val) => + onChanged: (dynamic val) => setState(() { columnWidth = val; }), @@ -270,7 +272,7 @@ class _FrontPanelState extends State { minValue: 0, maxValue: 1, initialValue: columnSpacing, - onChanged: (val) => + onChanged: (dynamic val) => setState(() { columnSpacing = val; }), @@ -310,18 +312,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -329,15 +332,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -346,7 +349,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -420,7 +423,7 @@ List> getDefaultColumn(bool isTileView, width: isTileView ? 0.8 : columnWidth, spacing: isTileView ? 0.2 : columnSpacing, dataSource: chartData, - color: Color.fromRGBO(252, 216, 20, 1), + color: const Color.fromRGBO(252, 216, 20, 1), xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y, name: 'Gold'), @@ -429,7 +432,7 @@ List> getDefaultColumn(bool isTileView, dataSource: chartData, width: isTileView ? 0.8 : columnWidth, spacing: isTileView ? 0.2 : columnSpacing, - color: Color.fromRGBO(169, 169, 169, 1), + color: const Color.fromRGBO(169, 169, 169, 1), xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y2, name: 'Silver'), @@ -438,7 +441,7 @@ List> getDefaultColumn(bool isTileView, dataSource: chartData, width: isTileView ? 0.8 : columnWidth, spacing: isTileView ? 0.2 : columnSpacing, - color: Color.fromRGBO(205, 127, 50, 1), + color: const Color.fromRGBO(205, 127, 50, 1), xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y3, name: 'Bronze') diff --git a/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart b/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart index f3d72172..991d0468 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnRounded extends StatefulWidget { + const ColumnRounded(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const ColumnRounded(this.sample, {Key key}) : super(key: key); @override _ColumnRoundedState createState() => _ColumnRoundedState(sample); } class _ColumnRoundedState extends State { - final SubItemList sample; - _ColumnRoundedState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ColumnRoundedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _ColumnRoundedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,22 +87,24 @@ class _ColumnRoundedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -139,18 +140,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -158,15 +160,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -175,7 +177,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart b/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart index 9a7e1bc8..d7cc7d12 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnTracker extends StatefulWidget { - final SubItemList sample; const ColumnTracker(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ColumnTrackerState createState() => _ColumnTrackerState(sample); } class _ColumnTrackerState extends State { - final SubItemList sample; - _ColumnTrackerState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ColumnTrackerState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +94,7 @@ class _ColumnTrackerState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +102,23 @@ class _ColumnTrackerState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -149,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -166,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -240,7 +240,7 @@ List> getTracker(bool isTileView) { enableTooltip: true, dataSource: chartData, isTrackVisible: true, - trackColor: Color.fromRGBO(198, 201, 207, 1), + trackColor:const Color.fromRGBO(198, 201, 207, 1), borderRadius: BorderRadius.circular(15), xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y, diff --git a/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart b/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart index fec9534f..fe6ec5d4 100755 --- a/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnVertical extends StatefulWidget { - final SubItemList sample; const ColumnVertical(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ColumnVerticalState createState() => _ColumnVerticalState(sample); } class _ColumnVerticalState extends State { - final SubItemList sample; - _ColumnVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ColumnVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -96,7 +95,7 @@ class _ColumnVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -104,22 +103,23 @@ class _ColumnVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -155,18 +155,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -174,15 +174,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -191,7 +191,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -358,7 +358,7 @@ class CustomPainter extends ColumnSegment { final Path path = Path(); final dynamic factor = segmentRect.height * (1 - animationFactor); path.moveTo(x - width / 2, y + factor + height); - path.lineTo(x, ((segmentRect.top + factor + height)) - height); + path.lineTo(x, (segmentRect.top + factor + height) - height); path.lineTo(x + width / 2, y + factor + height); path.lineTo(x + width / 2, segmentRect.bottom + factor); path.lineTo(x - width / 2, segmentRect.bottom + factor); diff --git a/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart b/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart index b7e11f15..708434f7 100755 --- a/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ColumnDefault extends StatefulWidget { - final SubItemList sample; const ColumnDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ColumnDefaultState createState() => _ColumnDefaultState(sample); } class _ColumnDefaultState extends State { - final SubItemList sample; - _ColumnDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ColumnDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _ColumnDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _ColumnDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -117,18 +117,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -136,15 +136,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -153,7 +153,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart b/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart index 40f56a46..76a04cd6 100755 --- a/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart @@ -10,8 +10,8 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class CustomizedLine extends StatefulWidget { - final SubItemList sample; const CustomizedLine(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LineDefaultState createState() => _LineDefaultState(sample); @@ -21,10 +21,10 @@ List xValues; List yValues; class _LineDefaultState extends State { - final SubItemList sample; _LineDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -50,7 +50,7 @@ class _LineDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, toggleFrontLayer: false, @@ -84,7 +84,7 @@ class _LineDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -92,16 +92,17 @@ class _LineDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); bool enableTooltip = true; bool enableMarker = true; bool enableDatalabel = false; @@ -110,7 +111,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -123,18 +124,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -142,15 +143,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -159,7 +160,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -312,7 +313,7 @@ class CustomPainter extends LineSegment { @override Paint getStrokePaint() { final Paint customerStrokePaint = Paint(); - customerStrokePaint.color = Color.fromRGBO(53, 92, 125, 1); + customerStrokePaint.color = const Color.fromRGBO(53, 92, 125, 1); customerStrokePaint.strokeWidth = 2; customerStrokePaint.style = PaintingStyle.stroke; return customerStrokePaint; @@ -332,7 +333,7 @@ class CustomPainter extends LineSegment { canvas.drawPath(path, getStrokePaint()); if (currentSegmentIndex == series.segments.length - 1) { - final double labelPadding = 10; + const double labelPadding = 10; final Paint topLinePaint = Paint() ..color = Colors.green ..style = PaintingStyle.stroke diff --git a/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart b/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart index 0355ef0d..02cfde07 100755 --- a/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LineDefault extends StatefulWidget { - final SubItemList sample; const LineDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LineDefaultState createState() => _LineDefaultState(sample); } class _LineDefaultState extends State { - final SubItemList sample; _LineDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _LineDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -93,7 +93,7 @@ class _LineDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,16 +101,18 @@ class _LineDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = true; bool enableMarker = true; bool enableDatalabel = false; @@ -119,7 +121,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor:model.cardThemeColor, body: Padding( @@ -132,18 +134,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -151,15 +153,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -168,7 +170,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart b/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart index f8baa035..ea57e864 100755 --- a/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LineDashed extends StatefulWidget { - final SubItemList sample; const LineDashed(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LineDashedState createState() => _LineDashedState(sample); } class _LineDashedState extends State { + _LineDashedState(this.sample); final SubItemList sample; - _LineDashedState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _LineDashedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _LineDashedState extends State { color: model.cardThemeColor, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,22 +101,23 @@ class _LineDashedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -128,18 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -147,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -164,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -242,7 +243,7 @@ List> getLineSeries(bool isTileView) { LineSeries<_ChartData, num>( animationDuration: 2500, enableTooltip: true, - dashArray: [15, 3, 3, 3], + dashArray:[15, 3, 3, 3], dataSource: chartData, xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y, @@ -253,7 +254,7 @@ List> getLineSeries(bool isTileView) { animationDuration: 2500, enableTooltip: true, dataSource: chartData, - dashArray: [15, 3, 3, 3], + dashArray: [15, 3, 3, 3], width: 2, name: 'Saudi Arabia', xValueMapper: (_ChartData sales, _) => sales.x, @@ -264,7 +265,7 @@ List> getLineSeries(bool isTileView) { enableTooltip: true, dataSource: chartData, width: 2, - dashArray: [15, 3, 3, 3], + dashArray: [15, 3, 3, 3], name: 'Spain', xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y3, @@ -274,7 +275,7 @@ List> getLineSeries(bool isTileView) { enableTooltip: true, dataSource: chartData, width: 2, - dashArray: [15, 3, 3, 3], + dashArray: [15, 3, 3, 3], name: 'Portugal', xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y4, diff --git a/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart b/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart index 4e04ec1f..5e65157d 100755 --- a/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart +++ b/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LineMultiColor extends StatefulWidget { - final SubItemList sample; const LineMultiColor(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LineMultiColorState createState() => _LineMultiColorState(sample); } class _LineMultiColorState extends State { + _LineMultiColorState(this.sample); final SubItemList sample; - _LineMultiColorState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _LineMultiColorState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +95,7 @@ class _LineMultiColorState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,16 +103,17 @@ class _LineMultiColorState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); bool enableTooltip = false; bool enableMarker = false; @@ -120,7 +121,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -132,18 +133,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -151,15 +152,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -168,7 +169,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -235,27 +236,27 @@ SfCartesianChart getMultiColorLineChart(bool isTileView) { List> getLineSeries(bool isTileView) { final List<_ChartData> chartData = <_ChartData>[ - _ChartData(DateTime(1925), 415, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1926), 408, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1927), 415, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1928), 350, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1929), 375, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1930), 500, Color.fromRGBO(248, 184, 131, 1)), - _ChartData(DateTime(1931), 390, Color.fromRGBO(229, 101, 144, 1)), - _ChartData(DateTime(1932), 450, Color.fromRGBO(229, 101, 144, 1)), - _ChartData(DateTime(1933), 440, Color.fromRGBO(229, 101, 144, 1)), - _ChartData(DateTime(1934), 350, Color.fromRGBO(229, 101, 144, 1)), - _ChartData(DateTime(1935), 400, Color.fromRGBO(229, 101, 144, 1)), - _ChartData(DateTime(1936), 365, Color.fromRGBO(53, 124, 210, 1)), - _ChartData(DateTime(1937), 490, Color.fromRGBO(53, 124, 210, 1)), - _ChartData(DateTime(1938), 400, Color.fromRGBO(53, 124, 210, 1)), - _ChartData(DateTime(1939), 520, Color.fromRGBO(53, 124, 210, 1)), - _ChartData(DateTime(1940), 510, Color.fromRGBO(53, 124, 210, 1)), - _ChartData(DateTime(1941), 395, Color.fromRGBO(0, 189, 174, 1)), - _ChartData(DateTime(1942), 380, Color.fromRGBO(0, 189, 174, 1)), - _ChartData(DateTime(1943), 404, Color.fromRGBO(0, 189, 174, 1)), - _ChartData(DateTime(1944), 400, Color.fromRGBO(0, 189, 174, 1)), - _ChartData(DateTime(1945), 500, Color.fromRGBO(0, 189, 174, 1)) + _ChartData(DateTime(1925), 415, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1926), 408, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1927), 415, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1928), 350, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1929), 375, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1930), 500, const Color.fromRGBO(248, 184, 131, 1)), + _ChartData(DateTime(1931), 390, const Color.fromRGBO(229, 101, 144, 1)), + _ChartData(DateTime(1932), 450, const Color.fromRGBO(229, 101, 144, 1)), + _ChartData(DateTime(1933), 440, const Color.fromRGBO(229, 101, 144, 1)), + _ChartData(DateTime(1934), 350, const Color.fromRGBO(229, 101, 144, 1)), + _ChartData(DateTime(1935), 400, const Color.fromRGBO(229, 101, 144, 1)), + _ChartData(DateTime(1936), 365, const Color.fromRGBO(53, 124, 210, 1)), + _ChartData(DateTime(1937), 490, const Color.fromRGBO(53, 124, 210, 1)), + _ChartData(DateTime(1938), 400, const Color.fromRGBO(53, 124, 210, 1)), + _ChartData(DateTime(1939), 520, const Color.fromRGBO(53, 124, 210, 1)), + _ChartData(DateTime(1940), 510, const Color.fromRGBO(53, 124, 210, 1)), + _ChartData(DateTime(1941), 395, const Color.fromRGBO(0, 189, 174, 1)), + _ChartData(DateTime(1942), 380, const Color.fromRGBO(0, 189, 174, 1)), + _ChartData(DateTime(1943), 404, const Color.fromRGBO(0, 189, 174, 1)), + _ChartData(DateTime(1944), 400, const Color.fromRGBO(0, 189, 174, 1)), + _ChartData(DateTime(1945), 500, const Color.fromRGBO(0, 189, 174, 1)) ]; return >[ LineSeries<_ChartData, DateTime>( diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart index a2b15fe5..4dcc990d 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeColumnDefault extends StatefulWidget { - final SubItemList sample; const RangeColumnDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RangeColumnDefaultState createState() => _RangeColumnDefaultState(sample); } class _RangeColumnDefaultState extends State { - final SubItemList sample; - _RangeColumnDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _RangeColumnDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _RangeColumnDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _RangeColumnDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -144,18 +144,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -163,15 +164,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -180,7 +181,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart index ee557b53..033d2807 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart @@ -6,8 +6,8 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeColumnWithTrack extends StatefulWidget { + const RangeColumnWithTrack(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const RangeColumnWithTrack(this.sample, {Key key}) : super(key: key); @override _RangeColumnWithTrackState createState() => @@ -15,12 +15,11 @@ class RangeColumnWithTrack extends StatefulWidget { } class _RangeColumnWithTrackState extends State { - final SubItemList sample; - _RangeColumnWithTrackState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +45,7 @@ class _RangeColumnWithTrackState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -81,7 +80,7 @@ class _RangeColumnWithTrackState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -89,24 +88,25 @@ class _RangeColumnWithTrackState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -118,18 +118,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -137,15 +137,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -154,7 +154,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -227,7 +227,7 @@ List> getRangeColumnSeries( enableTooltip: true, dataSource: chartData, isTrackVisible: true, - trackColor: Color.fromRGBO(198, 201, 207, 1), + trackColor: const Color.fromRGBO(198, 201, 207, 1), borderRadius: BorderRadius.circular(15), trackBorderColor: Colors.grey[100], xValueMapper: (_ChartData sales, _) => sales.x, diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart index 0a448a7a..5ad2a3d0 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeBarChart extends StatefulWidget { - final SubItemList sample; const RangeBarChart(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RangeBarChartState createState() => _RangeBarChartState(sample); } class _RangeBarChartState extends State { - final SubItemList sample; - _RangeBarChartState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _RangeBarChartState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _RangeBarChartState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _RangeBarChartState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { +_FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -143,18 +143,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -162,15 +162,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -179,7 +179,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart b/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart index 4093c986..d1a810a4 100755 --- a/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart +++ b/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ScatterDefault extends StatefulWidget { - final SubItemList sample; const ScatterDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ScatterDefaultState createState() => _ScatterDefaultState(sample); } class _ScatterDefaultState extends State { - final SubItemList sample; - _ScatterDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ScatterDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +78,7 @@ class _ScatterDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,22 +86,23 @@ class _ScatterDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; +//ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -140,34 +140,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -176,7 +176,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -236,17 +236,17 @@ SfCartesianChart getDefaultScatterChart(bool isTileView) { List> getScatterSeries(bool isTileView) { final List<_ScatterData> chartData = <_ScatterData>[ - _ScatterData(new DateTime(2006, 1, 1), 0.01, -0.03, 0.10), - _ScatterData(new DateTime(2007, 1, 1), 0.03, -0.02, 0.08), - _ScatterData(new DateTime(2008, 1, 1), -0.06, -0.13, -0.03), - _ScatterData(new DateTime(2009, 1, 1), -0.03, -0.04, 0.04), - _ScatterData(new DateTime(2010, 1, 1), 0.09, 0.07, 0.19), - _ScatterData(new DateTime(2011, 1, 1), 0, 0.04, 0), - _ScatterData(new DateTime(2012, 1, 1), 0.01, -0.01, -0.09), - _ScatterData(new DateTime(2013, 1, 1), 0.05, 0.05, 0.10), - _ScatterData(new DateTime(2014, 1, 1), 0, 0.08, 0.05), - _ScatterData(new DateTime(2015, 1, 1), 0.1, 0.01, -0.04), - _ScatterData(new DateTime(2016, 1, 1), 0.08, 0, 0.02), + _ScatterData( DateTime(2006, 1, 1), 0.01, -0.03, 0.10), + _ScatterData( DateTime(2007, 1, 1), 0.03, -0.02, 0.08), + _ScatterData( DateTime(2008, 1, 1), -0.06, -0.13, -0.03), + _ScatterData( DateTime(2009, 1, 1), -0.03, -0.04, 0.04), + _ScatterData( DateTime(2010, 1, 1), 0.09, 0.07, 0.19), + _ScatterData( DateTime(2011, 1, 1), 0, 0.04, 0), + _ScatterData( DateTime(2012, 1, 1), 0.01, -0.01, -0.09), + _ScatterData( DateTime(2013, 1, 1), 0.05, 0.05, 0.10), + _ScatterData( DateTime(2014, 1, 1), 0, 0.08, 0.05), + _ScatterData( DateTime(2015, 1, 1), 0.1, 0.01, -0.04), + _ScatterData( DateTime(2016, 1, 1), 0.08, 0, 0.02), ]; return >[ ScatterSeries<_ScatterData, DateTime>( @@ -268,7 +268,7 @@ List> getScatterSeries(bool isTileView) { ScatterSeries<_ScatterData, DateTime>( enableTooltip: true, dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_ScatterData sales, _) => sales.year, yValueMapper: (_ScatterData sales, _) => sales.y2, name: 'India', diff --git a/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart b/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart index 9b2abab6..67790285 100755 --- a/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart +++ b/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ScatterShapes extends StatefulWidget { - final SubItemList sample; const ScatterShapes(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ScatterShapesState createState() => _ScatterShapesState(sample); } class _ScatterShapesState extends State { - final SubItemList sample; - _ScatterShapesState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _ScatterShapesState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +94,7 @@ class _ScatterShapesState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +102,23 @@ class _ScatterShapesState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; +//ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -149,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -166,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart index ea1163ac..c16ad4bf 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart @@ -1,28 +1,26 @@ +import 'dart:math'; import 'dart:ui'; import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; import 'package:flutter_examples/widgets/flutter_backdrop.dart'; import 'package:scoped_model/scoped_model.dart'; -import 'dart:math'; - import 'package:url_launcher/url_launcher.dart'; class SplineCustomization extends StatefulWidget { - final SubItemList sample; const SplineCustomization(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _SplineVerticalState createState() => _SplineVerticalState(sample); } class _SplineVerticalState extends State { - final SubItemList sample; - _SplineVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -48,7 +46,7 @@ class _SplineVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, toggleFrontLayer: false, @@ -84,7 +82,7 @@ class _SplineVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -92,24 +90,25 @@ class _SplineVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; +//ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; bool enableLegend = true; double animaionDuration = 1500; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -121,18 +120,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -140,15 +139,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -157,7 +156,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -272,15 +271,16 @@ class CustomSplineSeries extends SplineSeries { @override ChartSegment createSegment() { - return CustomPainter(randomNumber.nextInt(4)); + return SplineCustomPainter(randomNumber.nextInt(4)); } } List yValues; List xValues; -class CustomPainter extends SplineSegment { - CustomPainter(int value) { +class SplineCustomPainter extends SplineSegment { + SplineCustomPainter(int value) { + //ignore: prefer_initializing_formals index = value; yValues = []; xValues = []; @@ -305,8 +305,8 @@ class CustomPainter extends SplineSegment { Paint getStrokePaint() { final Paint customerStrokePaint = Paint(); customerStrokePaint.color = currentSegmentIndex < 4 - ? Color.fromRGBO(0, 168, 181, 1) - : Color.fromRGBO(246, 114, 128, 1); + ? const Color.fromRGBO(0, 168, 181, 1) + :const Color.fromRGBO(246, 114, 128, 1); customerStrokePaint.strokeWidth = 2; customerStrokePaint.style = PaintingStyle.stroke; return customerStrokePaint; @@ -338,7 +338,7 @@ class CustomPainter extends SplineSegment { if (currentSegmentIndex == series.segments.length - 1) { double maximum; maximum = yValues.reduce(max); - final TextSpan span = TextSpan( + const TextSpan span = TextSpan( style: TextStyle( color: Color.fromRGBO(0, 168, 181, 1), fontSize: 12.0, @@ -349,9 +349,9 @@ class CustomPainter extends SplineSegment { TextPainter(text: span, textDirection: TextDirection.ltr); tp.layout(); tp.paint(canvas, Offset(xValues[1], maximum + tp.size.height)); - final TextSpan span1 = TextSpan( + const TextSpan span1 = TextSpan( style: TextStyle( - color: Color.fromRGBO(246, 114, 128, 1), + color: Color.fromRGBO(246, 114, 128, 1), fontSize: 12.0, fontFamily: 'Roboto'), text: 'Imaginary data', diff --git a/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart index 04d9d647..116faeff 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class SplineDefault extends StatefulWidget { - final SubItemList sample; const SplineDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _SplineDefaultState createState() => _SplineDefaultState(sample); } class _SplineDefaultState extends State { - final SubItemList sample; - _SplineDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _SplineDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _SplineDefaultState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,23 +87,23 @@ class _SplineDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; - _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -142,18 +141,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -161,15 +160,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -178,7 +177,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart b/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart index 04e868b1..6a194728 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart @@ -9,20 +9,19 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../../widgets/bottom_sheet.dart'; class SplineTypes extends StatefulWidget { - final SubItemList sample; const SplineTypes(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _SplineTypesState createState() => _SplineTypesState(sample); } class _SplineTypesState extends State { - final SubItemList sample; - _SplineTypesState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -48,7 +47,7 @@ class _SplineTypesState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -98,7 +97,7 @@ class _SplineTypesState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,16 +105,17 @@ class _SplineTypesState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -129,7 +129,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -197,19 +197,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 140, child: Padding( @@ -311,18 +311,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - +//ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -330,15 +330,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -347,7 +347,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart b/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart index 502010a5..1823328e 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class SplineDashed extends StatefulWidget { - final SubItemList sample; const SplineDashed(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _SplineDashedState createState() => _SplineDashedState(sample); } class _SplineDashedState extends State { + _SplineDashedState(this.sample); final SubItemList sample; - _SplineDashedState(this.sample); - bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _SplineDashedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -81,7 +80,7 @@ class _SplineDashedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -89,22 +88,24 @@ class _SplineDashedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -142,18 +143,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -161,15 +163,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -178,7 +180,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -255,14 +257,14 @@ List> getSplineSeries(bool isTileView) { yValueMapper: (_ChartData sales, _) => sales.y, width: 2, name: 'Brazil', - dashArray: [12, 3, 3, 3], + dashArray: [12, 3, 3, 3], markerSettings: MarkerSettings(isVisible: true)), SplineSeries<_ChartData, num>( enableTooltip: true, dataSource: chartData, width: 2, name: 'Sweden', - dashArray: [12, 3, 3, 3], + dashArray: [12, 3, 3, 3], xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y2, markerSettings: MarkerSettings(isVisible: true)), @@ -270,7 +272,7 @@ List> getSplineSeries(bool isTileView) { enableTooltip: true, dataSource: chartData, width: 2, - dashArray: [12, 3, 3, 3], + dashArray: [12, 3, 3, 3], name: 'Greece', xValueMapper: (_ChartData sales, _) => sales.x, yValueMapper: (_ChartData sales, _) => sales.y3, diff --git a/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart index 033933f2..3917b919 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class SplineVertical extends StatefulWidget { - final SubItemList sample; const SplineVertical(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _SplineVerticalState createState() => _SplineVerticalState(sample); } class _SplineVerticalState extends State { - final SubItemList sample; - _SplineVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _SplineVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +78,7 @@ class _SplineVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,24 +86,26 @@ class _SplineVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; bool enableLegend = true; double animaionDuration = 1500; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -116,34 +117,37 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); + _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -152,7 +156,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart index 9cdc3429..499b7d19 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart @@ -7,20 +7,19 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:intl/intl.dart'; class StackedAreaChart extends StatefulWidget { - final SubItemList sample; const StackedAreaChart(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StackedAreaChartState createState() => _StackedAreaChartState(sample); } class _StackedAreaChartState extends State { - final SubItemList sample; - _StackedAreaChartState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +45,7 @@ class _StackedAreaChartState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -81,7 +80,7 @@ class _StackedAreaChartState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -89,24 +88,25 @@ class _StackedAreaChartState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -118,18 +118,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -137,15 +137,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -154,7 +154,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart index ae53d657..7d5838f4 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StackedBarChart extends StatefulWidget { - final SubItemList sample; const StackedBarChart(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StackedBarChartState createState() => _StackedBarChartState(sample); } class _StackedBarChartState extends State { - final SubItemList sample; - _StackedBarChartState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _StackedBarChartState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _StackedBarChartState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _StackedBarChartState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -117,18 +117,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -136,15 +136,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -153,7 +153,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart index e7bcbb44..dcc75dde 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StackedColumnChart extends StatefulWidget { - final SubItemList sample; const StackedColumnChart(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StackedColumnChartState createState() => _StackedColumnChartState(sample); } class _StackedColumnChartState extends State { - final SubItemList sample; - _StackedColumnChartState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _StackedColumnChartState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _StackedColumnChartState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _StackedColumnChartState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -117,18 +117,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -136,15 +136,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -153,7 +153,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart index 192605ce..d1a11cb9 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StackedLineChart extends StatefulWidget { - final SubItemList sample; const StackedLineChart(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StackedLineChartState createState() => _StackedLineChartState(sample); } class _StackedLineChartState extends State { - final SubItemList sample; - _StackedLineChartState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _StackedLineChartState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -80,7 +79,7 @@ class _StackedLineChartState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,24 +87,25 @@ class _StackedLineChartState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -117,18 +117,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -136,15 +136,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -153,7 +153,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart b/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart index f7c11772..16b6e99c 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StepLineDefault extends StatefulWidget { - final SubItemList sample; const StepLineDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StepLineDefaultState createState() => _StepLineDefaultState(sample); } class _StepLineDefaultState extends State { - final SubItemList sample; - _StepLineDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _StepLineDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +78,7 @@ class _StepLineDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,22 +86,23 @@ class _StepLineDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +114,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +133,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +150,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart b/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart index 3843cc26..80047e6d 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart @@ -6,20 +6,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StepLineDashed extends StatefulWidget { - final SubItemList sample; const StepLineDashed(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StepLineDashedState createState() => _StepLineDashedState(sample); } class _StepLineDashedState extends State { - final SubItemList sample; - _StepLineDashedState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +44,7 @@ class _StepLineDashedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +94,7 @@ class _StepLineDashedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +102,23 @@ class _StepLineDashedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -149,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -166,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -244,28 +244,28 @@ List> getStepLineSeries(bool isTileView) { yValueMapper: (_StepLineData data, _) => data.y1, name: 'USA', width: 2, - dashArray: [10, 5]), + dashArray:[10, 5]), StepLineSeries<_StepLineData, num>( dataSource: chartData, xValueMapper: (_StepLineData data, _) => data.x, yValueMapper: (_StepLineData data, _) => data.y2, name: 'UK', width: 2, - dashArray: [10, 5]), + dashArray: [10, 5]), StepLineSeries<_StepLineData, num>( dataSource: chartData, xValueMapper: (_StepLineData data, _) => data.x, yValueMapper: (_StepLineData data, _) => data.y3, name: 'Korea', width: 2, - dashArray: [10, 5]), + dashArray: [10, 5]), StepLineSeries<_StepLineData, num>( dataSource: chartData, xValueMapper: (_StepLineData data, _) => data.x, yValueMapper: (_StepLineData data, _) => data.y4, name: 'Japan', width: 2, - dashArray: [10, 5]) + dashArray: [10, 5]) ]; } diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart b/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart index 16c3556c..89b6758a 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart @@ -7,20 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class StepLineVertical extends StatefulWidget { - final SubItemList sample; const StepLineVertical(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _StepLineVerticalState createState() => _StepLineVerticalState(sample); } class _StepLineVerticalState extends State { - final SubItemList sample; - _StepLineVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +45,7 @@ class _StepLineVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -96,7 +95,7 @@ class _StepLineVerticalState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -104,22 +103,23 @@ class _StepLineVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -131,18 +131,17 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -150,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -167,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart b/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart index aba0fb07..15beb1cc 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DoughnutDefault extends StatefulWidget { - final SubItemList sample; const DoughnutDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DoughnutDefaultState createState() => _DoughnutDefaultState(sample); } class _DoughnutDefaultState extends State { - final SubItemList sample; _DoughnutDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DoughnutDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _DoughnutDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _DoughnutDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -138,18 +139,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -157,15 +158,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -174,7 +175,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart index 1fe28ad2..6d607535 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DoughnutElevation extends StatefulWidget { + const DoughnutElevation(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const DoughnutElevation(this.sample, {Key key}) : super(key: key); @override _DoughnutDefaultState createState() => _DoughnutDefaultState(sample); } class _DoughnutDefaultState extends State { - final SubItemList sample; _DoughnutDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DoughnutDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _DoughnutDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,22 +101,23 @@ class _DoughnutDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -128,18 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -147,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -164,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -220,8 +221,8 @@ SfCircularChart getElevationDoughnutChart(bool isTileView) { CircularChartAnnotation( widget: Container( child: const Text('62%', - style: TextStyle( - color: Color.fromRGBO(0, 0, 0, 0.5), fontSize: 25)))) + style: TextStyle( + color: Color.fromRGBO(0, 0, 0, 0.5), fontSize: 25)))) ], title: ChartTitle( text: isTileView ? '' : 'Progress of a task', diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart index 6e291e34..990815e5 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DoughnutCustomization extends StatefulWidget { + const DoughnutCustomization(this.sample, {Key key}) : super(key: key); final SubItemList sample; - const DoughnutCustomization(this.sample, {Key key}) : super(key: key); @override _DoughnutDefaultState createState() => _DoughnutDefaultState(sample); } class _DoughnutDefaultState extends State { - final SubItemList sample; _DoughnutDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DoughnutDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _DoughnutDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _DoughnutDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -112,18 +113,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -131,15 +132,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -148,7 +149,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -193,7 +194,7 @@ SfCircularChart getDoughnutCustomizationChart(bool isTileView) { annotations: [ CircularChartAnnotation( widget: Container( - child: const Text('90%', + child: Text('90%', style: TextStyle( color: Colors.grey, fontSize: 25)))) ], diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart index 73b93feb..30be7271 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DoughnutRounded extends StatefulWidget { - final SubItemList sample; const DoughnutRounded(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DoughnutRoundedState createState() => _DoughnutRoundedState(sample); } class _DoughnutRoundedState extends State { + _DoughnutRoundedState(this.sample); final SubItemList sample; - _DoughnutRoundedState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DoughnutRoundedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -94,7 +94,7 @@ class _DoughnutRoundedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -102,16 +102,17 @@ class _DoughnutRoundedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -120,7 +121,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -132,18 +133,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -151,15 +152,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -168,7 +169,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart b/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart index 5b2d7352..fc40b5fd 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart @@ -8,18 +8,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DoughnutSemi extends StatefulWidget { - final SubItemList sample; const DoughnutSemi(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DoughnutSemiState createState() => _DoughnutSemiState(sample); } class _DoughnutSemiState extends State { - final SubItemList sample; _DoughnutSemiState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _DoughnutSemiState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _DoughnutSemiState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,23 +87,24 @@ class _DoughnutSemiState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; int startAngle = 270; int endAngle = 90; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -122,19 +123,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -196,7 +197,7 @@ class _FrontPanelState extends State { maxValue: 270, initialValue: startAngle.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { startAngle = val.toInt(); @@ -252,7 +253,7 @@ class _FrontPanelState extends State { maxValue: 270, initialValue: endAngle.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { endAngle = val.toInt(); }), @@ -290,18 +291,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -309,15 +310,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -326,7 +327,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart b/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart index 4a601edf..d0c559f0 100755 --- a/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart +++ b/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PieDefault extends StatefulWidget { - final SubItemList sample; const PieDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _PieDefaultState createState() => _PieDefaultState(sample); } class _PieDefaultState extends State { - final SubItemList sample; _PieDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _PieDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _PieDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _PieDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart index 1114fcc1..99995f56 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PieGrouping extends StatefulWidget { - final SubItemList sample; const PieGrouping(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _PieGroupingState createState() => _PieGroupingState(sample); } class _PieGroupingState extends State { - final SubItemList sample; _PieGroupingState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _PieGroupingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _PieGroupingState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,22 +101,23 @@ class _PieGroupingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -128,18 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -147,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -164,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -220,7 +221,7 @@ List> getPieSeries(bool isTileView) { _PieData('Small\nHydro', 1.3, 'Small Hydro: 4,594.15 MW (1.3%)', null), _PieData('Wind\nPower', 10, 'Wind Power: 35,815.88 MW (10.0%)', null), _PieData('Solar\nPower', 8, 'Solar Power: 28,679.21 MW (8.0%)', - Color.fromRGBO(198, 201, 207, 1)), + const Color.fromRGBO(198, 201, 207, 1)), _PieData('Biomass', 2.6, 'Biomass: 9,269.8 MW (2.6%)', null), _PieData('Nuclear', 1.9, 'Nuclear: 6,780 MW (1.9%)', null), _PieData('Gas', 7, 'Gas: 24,937.22 MW (7.0%)', null), diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart index 70e0175d..e9dc1e37 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PieSmartLabels extends StatefulWidget { - final SubItemList sample; const PieSmartLabels(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _PieSmartLabelsState createState() => _PieSmartLabelsState(sample); } class _PieSmartLabelsState extends State { - final SubItemList sample; _PieSmartLabelsState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _PieSmartLabelsState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _PieSmartLabelsState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _PieSmartLabelsState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -103,7 +104,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -115,18 +116,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -134,15 +135,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -151,7 +152,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart index 97f12d0f..54b8bbbf 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PieRadius extends StatefulWidget { - final SubItemList sample; const PieRadius(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _PieRadiusState createState() => _PieRadiusState(sample); } class _PieRadiusState extends State { + _PieRadiusState(this.sample); final SubItemList sample; - _PieRadiusState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _PieRadiusState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _PieRadiusState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,22 +101,23 @@ class _PieRadiusState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -128,18 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -147,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -164,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart b/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart index 0b1c9739..cf804d8c 100755 --- a/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart +++ b/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart @@ -8,18 +8,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PieSemi extends StatefulWidget { - final SubItemList sample; const PieSemi(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _PieSemiState createState() => _PieSemiState(sample); } class _PieSemiState extends State { - final SubItemList sample; _PieSemiState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _PieSemiState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _PieSemiState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,16 +87,17 @@ class _PieSemiState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; int startAngle = 270; int endAngle = 90; @@ -104,7 +105,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -155,19 +156,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -229,7 +230,7 @@ class _FrontPanelState extends State { maxValue: 270, initialValue: startAngle.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { startAngle = val.toInt(); @@ -285,7 +286,7 @@ class _FrontPanelState extends State { maxValue: 270, initialValue: endAngle.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { endAngle = val.toInt(); }), @@ -323,18 +324,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -342,15 +343,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -359,7 +360,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart b/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart index 99084876..dbf11625 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialBarCustomized extends StatefulWidget { - final SubItemList sample; const RadialBarCustomized(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialBarCustomizedState createState() => _RadialBarCustomizedState(sample); } class _RadialBarCustomizedState extends State { - final SubItemList sample; _RadialBarCustomizedState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _RadialBarCustomizedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -94,7 +94,7 @@ class _RadialBarCustomizedState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -102,22 +102,23 @@ class _RadialBarCustomizedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -129,18 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -148,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -165,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -206,23 +207,23 @@ class _BackPanelState extends State { } SfCircularChart getCustomizedRadialBarChart(bool isTileView) { - List<_RadialData> dataSources = [ - _RadialData('Vehicle', 62.70, '10%', Color.fromRGBO(69, 186, 161, 1.0)), - _RadialData('Education', 29.20, '10%', Color.fromRGBO(230, 135, 111, 1.0)), - _RadialData('Home', 85.20, '100%', Color.fromRGBO(145, 132, 202, 1.0)), - _RadialData('Personal', 45.70, '100%', Color.fromRGBO(235, 96, 143, 1.0)) + final List<_RadialData> dataSources = <_RadialData>[ + _RadialData('Vehicle', 62.70, '10%', const Color.fromRGBO(69, 186, 161, 1.0)), + _RadialData('Education', 29.20, '10%', const Color.fromRGBO(230, 135, 111, 1.0)), + _RadialData('Home', 85.20, '100%', const Color.fromRGBO(145, 132, 202, 1.0)), + _RadialData('Personal', 45.70, '100%', const Color.fromRGBO(235, 96, 143, 1.0)) ]; - List annotationSources = [ + final List annotationSources =[ CircularChartAnnotation( angle: 0, radius: '0%', widget: Container( - child: new Image.asset( + child: Image.asset( 'images/car_legend.png', width: 20, height: 20, - color: Color.fromRGBO(69, 186, 161, 1.0), + color: const Color.fromRGBO(69, 186, 161, 1.0), ), ), ), @@ -230,11 +231,11 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { angle: 0, radius: '0%', widget: Container( - child: new Image.asset( + child: Image.asset( 'images/book.png', width: 20, height: 20, - color: Color.fromRGBO(230, 135, 111, 1.0), + color: const Color.fromRGBO(230, 135, 111, 1.0), ), ), ), @@ -242,25 +243,25 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { angle: 0, radius: '0%', widget: Container( - child: new Image.asset('images/home.png', - width: 20, height: 20, color: Color.fromRGBO(145, 132, 202, 1.0)), + child: Image.asset('images/home.png', + width: 20, height: 20, color: const Color.fromRGBO(145, 132, 202, 1.0)), ), ), CircularChartAnnotation( angle: 0, radius: '0%', widget: Container( - child: new Image.asset( + child: Image.asset( 'images/personal_loan.png', width: 20, height: 20, - color: Color.fromRGBO(235, 96, 143, 1.0), + color: const Color.fromRGBO(235, 96, 143, 1.0), ), ), ), ]; - dynamic colors = [ + const dynamic colors =[ Color.fromRGBO(69, 186, 161, 1.0), Color.fromRGBO(230, 135, 111, 1.0), Color.fromRGBO(145, 132, 202, 1.0), @@ -285,10 +286,10 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { annotations: [ annotationSources[index], ], - series: [ + series: >[ RadialBarSeries<_RadialData, String>( animationDuration: 0, - dataSource: [dataSources[index]], + dataSource: <_RadialData>[dataSources[index]], maximumValue: 100, radius: '100%', cornerStyle: CornerStyle.bothCurve, @@ -321,7 +322,7 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { height: '90%', width:'90%', widget: Container( - child: new Image.asset( + child: Image.asset( 'images/person.png', height: 100.0, width: 100.0, @@ -334,10 +335,10 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { List> getRadialBarCustomizedSeries() { final List<_RadialData> chartData = <_RadialData>[ - _RadialData('Vehicle', 62.70, '100%', Color.fromRGBO(69, 186, 161, 1.0)), - _RadialData('Education', 29.20, '100%', Color.fromRGBO(230, 135, 111, 1.0)), - _RadialData('Home', 85.20, '100%', Color.fromRGBO(145, 132, 202, 1.0)), - _RadialData('Personal', 45.70, '100%', Color.fromRGBO(235, 96, 143, 1.0)) + _RadialData('Vehicle', 62.70, '100%', const Color.fromRGBO(69, 186, 161, 1.0)), + _RadialData('Education', 29.20, '100%', const Color.fromRGBO(230, 135, 111, 1.0)), + _RadialData('Home', 85.20, '100%', const Color.fromRGBO(145, 132, 202, 1.0)), + _RadialData('Personal', 45.70, '100%', const Color.fromRGBO(235, 96, 143, 1.0)) ]; return >[ RadialBarSeries<_RadialData, String>( diff --git a/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart b/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart index 60a53361..3e678923 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialBarDefault extends StatefulWidget { - final SubItemList sample; const RadialBarDefault(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialBarDefaultState createState() => _RadialBarDefaultState(sample); } class _RadialBarDefaultState extends State { - final SubItemList sample; _RadialBarDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialBarDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -93,7 +93,7 @@ class _RadialBarDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -101,22 +101,23 @@ class _RadialBarDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -128,18 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -147,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -164,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -216,10 +217,10 @@ SfCircularChart getDefaultRadialBarChart(bool isTileView) { List> getRadialBarDefaultSeries( bool isTileView) { final List<_RadialData> chartData = <_RadialData>[ - _RadialData('John', 10, '100%', Color.fromRGBO(248, 177, 149, 1.0)), - _RadialData('Almaida', 11, '100%', Color.fromRGBO(246, 114, 128, 1.0)), - _RadialData('Doe', 12, '100%', Color.fromRGBO(61, 205, 171, 1.0)), - _RadialData('Tom', 13, '100%', Color.fromRGBO(1, 174, 190, 1.0)), + _RadialData('John', 10, '100%', const Color.fromRGBO(248, 177, 149, 1.0)), + _RadialData('Almaida', 11, '100%', const Color.fromRGBO(246, 114, 128, 1.0)), + _RadialData('Doe', 12, '100%', const Color.fromRGBO(61, 205, 171, 1.0)), + _RadialData('Tom', 13, '100%', const Color.fromRGBO(1, 174, 190, 1.0)), ]; return >[ RadialBarSeries<_RadialData, String>( diff --git a/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart b/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart index 5af487ea..bb3a93ab 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialBarAngle extends StatefulWidget { - final SubItemList sample; const RadialBarAngle(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialBarAngleState createState() => _RadialBarAngleState(sample); } class _RadialBarAngleState extends State { + _RadialBarAngleState(this.sample); final SubItemList sample; - _RadialBarAngleState(this.sample); bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialBarAngleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialBarAngleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _RadialBarAngleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -112,18 +113,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { + _BackPanelState(this.sample); final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); - _BackPanelState(this.sample); + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -131,15 +132,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -148,7 +149,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -204,13 +205,13 @@ SfCircularChart getAngleRadialBarChart(bool isTileView) { List> getRadialBarSeries(bool isTileView) { final List<_RadialData> chartData = <_RadialData>[ _RadialData('Move 65%\n338/520 CAL', 65, 'Move ', null, - Color.fromRGBO(0, 201, 230, 1.0)), + const Color.fromRGBO(0, 201, 230, 1.0)), _RadialData('Exercise 43%\n13/30 MIN', 43, 'Exercise ', null, - Color.fromRGBO(63, 224, 0, 1.0)), + const Color.fromRGBO(63, 224, 0, 1.0)), _RadialData('Stand 58%\n7/12 HR', 58, 'Stand ', null, - Color.fromRGBO(226, 1, 26, 1.0)), + const Color.fromRGBO(226, 1, 26, 1.0)), ]; - var list = >[ + final List> list = >[ RadialBarSeries<_RadialData, String>( pointRadiusMapper: (_RadialData data, _) => data.radius, maximumValue: 100, diff --git a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart index 84fdda51..0e4c3734 100755 --- a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart +++ b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart @@ -8,9 +8,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AddDataPoints extends StatefulWidget { - final SubItemList sample; const AddDataPoints(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LiveVerticalState createState() => _LiveVerticalState(sample); } @@ -31,10 +31,10 @@ List<_ChartData> chartData = chartData = <_ChartData>[ int count = 11; class _LiveVerticalState extends State { - final SubItemList sample; _LiveVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -60,7 +60,7 @@ class _LiveVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -112,7 +112,7 @@ class _LiveVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -120,16 +120,17 @@ class _LiveVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; num getRandomInt(num min, num max) { final Random random = Random(); return min + random.nextInt(max - min); @@ -158,7 +159,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -205,34 +206,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -241,7 +242,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart index 592fa7e4..a072a249 100755 --- a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart +++ b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart @@ -8,9 +8,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AddSeries extends StatefulWidget { - final SubItemList sample; const AddSeries(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LiveVerticalState createState() => _LiveVerticalState(sample); } @@ -49,10 +49,10 @@ List> series = >[ int count = 0; class _LiveVerticalState extends State { - final SubItemList sample; _LiveVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -78,7 +78,7 @@ class _LiveVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 50, frontHeader: Container( @@ -88,7 +88,7 @@ class _LiveVerticalState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Row( - children: [], + children: const [], ), ], )), @@ -142,7 +142,7 @@ class _LiveVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -150,17 +150,18 @@ class _LiveVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + num getRandomInt(num min, num max) { final Random random = Random(); return min + random.nextInt(max - min); @@ -169,7 +170,9 @@ class _FrontPanelState extends State { void getSeries1(SampleListModel model) { //ignore: invalid_use_of_protected_member model.notifyListeners(); - if (series != null && series.isNotEmpty) series.removeLast(); + if (series != null && series.isNotEmpty){ + series.removeLast(); + } } void getSeries(SampleListModel model) { @@ -194,7 +197,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -242,34 +245,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -278,7 +281,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/dynamic_updates/live_update/live_update.dart b/lib/samples/chart/dynamic_updates/live_update/live_update.dart index 42b9add1..cea8996f 100755 --- a/lib/samples/chart/dynamic_updates/live_update/live_update.dart +++ b/lib/samples/chart/dynamic_updates/live_update/live_update.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'dart:math' as Math; +import 'dart:math' as math; import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; @@ -8,9 +8,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LiveUpdate extends StatefulWidget { - final SubItemList sample; const LiveUpdate(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LiveUpdateState createState() => _LiveUpdateState(sample); } @@ -34,12 +34,12 @@ int wave1; int wave2, count = 1; class _LiveUpdateState extends State { + _LiveUpdateState(this.sample); Timer timer; final SubItemList sample; - _LiveUpdateState(this.sample); - + bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -72,7 +72,7 @@ class _LiveUpdateState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -106,7 +106,7 @@ class _LiveUpdateState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -114,23 +114,15 @@ class _LiveUpdateState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - Timer timer; - - @override - void dispose() { - timer.cancel(); - super.dispose(); - } - - final SubItemList sample; _FrontPanelState(this.sample) { wave1 = 0; wave2 = 180; @@ -139,20 +131,30 @@ class _FrontPanelState extends State { chartData2.clear(); } updateLiveData(); - this.timer = Timer.periodic(Duration(milliseconds: 2), updateData); + timer = Timer.periodic(Duration(milliseconds: 2), updateData); + } + + Timer timer; + + @override + void dispose() { + timer.cancel(); + super.dispose(); } + final SubItemList sample; + void updateData(Timer timer) { setState(() { chartData1.removeAt(0); - chartData1.add(new _ChartData( + chartData1.add(_ChartData( wave1, - Math.sin(wave1 * (Math.pi / 180.0)), + math.sin(wave1 * (math.pi / 180.0)), )); chartData2.removeAt(0); - chartData2.add(new _ChartData( + chartData2.add(_ChartData( wave1, - Math.sin(wave2 * (Math.pi / 180.0)), + math.sin(wave2 * (math.pi / 180.0)), )); wave1++; wave2++; @@ -160,13 +162,13 @@ class _FrontPanelState extends State { } void updateLiveData() { - for (var i = 0; i < 180; i++) { - chartData1.add(new _ChartData(i, Math.sin(wave1 * (Math.pi / 180.0)))); + for (int i = 0; i < 180; i++) { + chartData1.add(_ChartData(i, math.sin(wave1 * (math.pi / 180.0)))); wave1++; } - for (var i = 0; i < 180; i++) { - chartData2.add(new _ChartData(i, Math.sin(wave2 * (Math.pi / 180.0)))); + for (int i = 0; i < 180; i++) { + chartData2.add(_ChartData(i, math.sin(wave2 * (math.pi / 180.0)))); wave2++; } @@ -177,7 +179,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -189,19 +191,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -209,15 +210,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -226,7 +227,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -267,13 +268,13 @@ class _BackPanelState extends State { } void updateLiveData() { - for (var i = 0; i < 180; i++) { - chartData1.add(new _ChartData(i, Math.sin(wave1 * (Math.pi / 180.0)))); + for (int i = 0; i < 180; i++) { + chartData1.add(_ChartData(i, math.sin(wave1 * (math.pi / 180.0)))); wave1++; } - for (var i = 0; i < 180; i++) { - chartData2.add(new _ChartData(i, Math.sin(wave2 * (Math.pi / 180.0)))); + for (int i = 0; i < 180; i++) { + chartData2.add(_ChartData(i, math.sin(wave2 * (math.pi / 180.0)))); wave2++; } diff --git a/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart b/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart index f01bcdad..330785e5 100755 --- a/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart +++ b/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart @@ -8,9 +8,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class VerticalLineLiveUpdate extends StatefulWidget { - final SubItemList sample; const VerticalLineLiveUpdate(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LiveUpdateState createState() => _LiveUpdateState(sample); } @@ -33,10 +33,10 @@ List<_ChartData> chartData = <_ChartData>[ Timer timer; class _LiveUpdateState extends State { - final SubItemList sample; _LiveUpdateState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -65,7 +65,7 @@ class _LiveUpdateState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -99,7 +99,7 @@ class _LiveUpdateState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -107,15 +107,18 @@ class _LiveUpdateState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - + _FrontPanelState(this.sample) { + count = 0; + } @override void initState() { super.initState(); @@ -135,14 +138,11 @@ class _FrontPanelState extends State { } final SubItemList sample; - _FrontPanelState(this.sample) { - count = 0; - } @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -155,16 +155,17 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -172,15 +173,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -189,7 +190,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart b/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart index 2d892672..3d2cf1ce 100644 --- a/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart +++ b/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart @@ -8,9 +8,8 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class UpdateDataSource extends StatefulWidget { - final SubItemList sample; - const UpdateDataSource(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _LiveVerticalState createState() => _LiveVerticalState(sample); @@ -26,10 +25,10 @@ List<_ChartData> chartData = chartData = <_ChartData>[ int count = 11; class _LiveVerticalState extends State { - final SubItemList sample; _LiveVerticalState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -55,7 +54,7 @@ class _LiveVerticalState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -107,7 +106,7 @@ class _LiveVerticalState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -115,16 +114,17 @@ class _LiveVerticalState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; final Random random = Random(); num getRandomInt(num min, num max) { return min + random.nextInt(max - min); @@ -156,7 +156,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -166,7 +166,7 @@ class _FrontPanelState extends State { ), floatingActionButton: FloatingActionButton( onPressed: () => setState(() { - chartData = []; + chartData = <_ChartData>[]; chartData = getChartData(model); }), child: Icon(Icons.refresh, color: Colors.white), @@ -177,34 +177,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -213,7 +213,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/funnel_charts/default_funnel_chart.dart b/lib/samples/chart/funnel_charts/default_funnel_chart.dart index c330502b..75756c8c 100644 --- a/lib/samples/chart/funnel_charts/default_funnel_chart.dart +++ b/lib/samples/chart/funnel_charts/default_funnel_chart.dart @@ -10,18 +10,18 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../widgets/checkbox.dart'; class FunnelDefault extends StatefulWidget { - final SubItemList sample; const FunnelDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _FunnelDefaultState createState() => _FunnelDefaultState(sample); } class _FunnelDefaultState extends State { - final SubItemList sample; _FunnelDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +47,7 @@ class _FunnelDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -81,7 +81,7 @@ class _FunnelDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -89,16 +89,17 @@ class _FunnelDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; double gapRatio = 0; int neckWidth = 20; int neckHeight = 20; @@ -107,7 +108,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -156,19 +157,19 @@ class _FrontPanelState extends State { }); } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -231,7 +232,7 @@ class _FrontPanelState extends State { maxValue: 0.5, initialValue: gapRatio, - onChanged: (val) => + onChanged: (dynamic val) => setState(() { gapRatio = val; }), @@ -281,7 +282,7 @@ class _FrontPanelState extends State { maxValue: 50, initialValue: neckHeight.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { neckHeight = val.toInt(); }), @@ -331,7 +332,7 @@ class _FrontPanelState extends State { maxValue: 50, initialValue: neckWidth.toDouble(), - onChanged: (val) => + onChanged: (dynamic val) => setState(() { neckWidth = val.toInt(); }), @@ -371,14 +372,14 @@ class _FrontPanelState extends State { letterSpacing: 0.34, fontWeight: FontWeight.normal)), - Padding( + const Padding( padding: EdgeInsets.fromLTRB(40, 0, 0, 0) ), BottomSheetCheckbox( activeColor: model.backgroundColor, switchValue: explode, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { explode = value; }); @@ -396,34 +397,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -432,7 +433,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/funnel_charts/funnel_with_legend.dart b/lib/samples/chart/funnel_charts/funnel_with_legend.dart index 1eb03917..0cce4e60 100644 --- a/lib/samples/chart/funnel_charts/funnel_with_legend.dart +++ b/lib/samples/chart/funnel_charts/funnel_with_legend.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class FunnelLegend extends StatefulWidget { - final SubItemList sample; const FunnelLegend(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _FunnelLegendState createState() => _FunnelLegendState(sample); } class _FunnelLegendState extends State { - final SubItemList sample; _FunnelLegendState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _FunnelLegendState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _FunnelLegendState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _FunnelLegendState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart b/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart index c83b8ba4..3d011312 100644 --- a/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart +++ b/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart @@ -8,18 +8,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class FunnelSmartLabels extends StatefulWidget { - final SubItemList sample; const FunnelSmartLabels(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _FunnelSmartLabelState createState() => _FunnelSmartLabelState(sample); } class _FunnelSmartLabelState extends State { - final SubItemList sample; _FunnelSmartLabelState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _FunnelSmartLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _FunnelSmartLabelState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,16 +87,17 @@ class _FunnelSmartLabelState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; final List _labelPositon = ['outside', 'inside'].toList(); ChartDataLabelPosition _selectedLabelPosition = ChartDataLabelPosition.outside; String _selectedPosition; @@ -116,7 +117,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -168,19 +169,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -333,34 +334,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -369,7 +369,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/home/axes_features_home.dart b/lib/samples/chart/home/axes_features_home.dart index 13690070..1953589f 100755 --- a/lib/samples/chart/home/axes_features_home.dart +++ b/lib/samples/chart/home/axes_features_home.dart @@ -21,49 +21,12 @@ class _SeriesFeaturesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = - getStatus(model.controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Colors.green - : str == 'U' ? Colors.yellow : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -85,154 +48,10 @@ class _SeriesFeaturesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/axis_types.dart b/lib/samples/chart/home/axis_types.dart index 1c0efdda..eb60efed 100755 --- a/lib/samples/chart/home/axis_types.dart +++ b/lib/samples/chart/home/axis_types.dart @@ -21,49 +21,12 @@ class _AxisTypesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -79,7 +42,7 @@ class _AxisTypesState extends State { bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -93,155 +56,10 @@ class _AxisTypesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 25, - width: 25, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - ) - ), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/cartesian_types.dart b/lib/samples/chart/home/cartesian_types.dart index 88ad35f7..9151620f 100755 --- a/lib/samples/chart/home/cartesian_types.dart +++ b/lib/samples/chart/home/cartesian_types.dart @@ -27,7 +27,7 @@ class _CartesianTypesState extends State Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -43,7 +43,7 @@ class _CartesianTypesState extends State bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -57,195 +57,13 @@ class _CartesianTypesState extends State letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } - @override bool get wantKeepAlive => false; -} - \ No newline at end of file +} \ No newline at end of file diff --git a/lib/samples/chart/home/circular_types.dart b/lib/samples/chart/home/circular_types.dart index cf1a4b38..abd3ce22 100755 --- a/lib/samples/chart/home/circular_types.dart +++ b/lib/samples/chart/home/circular_types.dart @@ -27,7 +27,7 @@ class _CircularTypesState extends State Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -43,7 +43,7 @@ class _CircularTypesState extends State bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -57,194 +57,13 @@ class _CircularTypesState extends State letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 5, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 25, - width: 25, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } - @override bool get wantKeepAlive => false; } diff --git a/lib/samples/chart/home/dynamic_updates.dart b/lib/samples/chart/home/dynamic_updates.dart index 7776d9bd..5607d148 100755 --- a/lib/samples/chart/home/dynamic_updates.dart +++ b/lib/samples/chart/home/dynamic_updates.dart @@ -21,47 +21,12 @@ class _DynamicUpdatesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -77,7 +42,7 @@ class _DynamicUpdatesState extends State { bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -91,154 +56,10 @@ class _DynamicUpdatesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/funnel_chart.dart b/lib/samples/chart/home/funnel_chart.dart index 9ee3e945..86e88178 100644 --- a/lib/samples/chart/home/funnel_chart.dart +++ b/lib/samples/chart/home/funnel_chart.dart @@ -21,26 +21,12 @@ class _SeriesFeaturesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - tabs.add(Tab( - text: model - .controlList[model.selectedIndex].subItemList[i][0]?.category)); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -62,120 +48,10 @@ class _SeriesFeaturesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: model.listIconColor), - ), - ), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/legend_home.dart b/lib/samples/chart/home/legend_home.dart index 452e5c62..5c6ccb9a 100755 --- a/lib/samples/chart/home/legend_home.dart +++ b/lib/samples/chart/home/legend_home.dart @@ -21,49 +21,12 @@ class _SeriesFeaturesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -85,154 +48,10 @@ class _SeriesFeaturesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/other_features.dart b/lib/samples/chart/home/other_features.dart index 1a7b4e9a..ef10fef7 100755 --- a/lib/samples/chart/home/other_features.dart +++ b/lib/samples/chart/home/other_features.dart @@ -21,49 +21,12 @@ class _SeriesFeaturesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -79,7 +42,7 @@ class _SeriesFeaturesState extends State { bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -93,154 +56,10 @@ class _SeriesFeaturesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/pyramid_chart.dart b/lib/samples/chart/home/pyramid_chart.dart index 13295595..ed7cbdb4 100644 --- a/lib/samples/chart/home/pyramid_chart.dart +++ b/lib/samples/chart/home/pyramid_chart.dart @@ -21,26 +21,12 @@ class _SeriesFeaturesState extends State { super.dispose(); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - tabs.add(Tab( - text: model - .controlList[model.selectedIndex].subItemList[i][0]?.category)); - } - } - return tabs; - } - @override // ignore: must_call_super Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -62,120 +48,10 @@ class _SeriesFeaturesState extends State { letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: model.listIconColor), - ), - ), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } } diff --git a/lib/samples/chart/home/radial_gauge.dart b/lib/samples/chart/home/radial_gauge.dart index 52f241bc..aa25c1b2 100644 --- a/lib/samples/chart/home/radial_gauge.dart +++ b/lib/samples/chart/home/radial_gauge.dart @@ -27,12 +27,12 @@ class _RadialGaugeExamplesState extends State Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( length: - model.controlList[model.selectedIndex].subItemList.length, + model.controlList[model.selectedIndex].subItemList.length, child: Scaffold( appBar: AppBar( leading: IconButton( @@ -43,7 +43,7 @@ class _RadialGaugeExamplesState extends State bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -57,137 +57,13 @@ class _RadialGaugeExamplesState extends State letterSpacing: 0.3)), ), body: TabBarView( - children: getTabViewChildrens(model), + children: getCardViewChildren(model), ), ), ), ))); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - if (model.controlList[model.selectedIndex].subItemList[i].length > 0) { - tabs.add(Tab( - text: model - .controlList[model.selectedIndex].subItemList[i][0]?.category)); - } - } - return tabs; - } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 5, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: model.listIconColor), - ), - ), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } - @override bool get wantKeepAlive => false; -} \ No newline at end of file +} diff --git a/lib/samples/chart/home/user_interaction.dart b/lib/samples/chart/home/user_interaction.dart index 58beaaba..63a135ce 100755 --- a/lib/samples/chart/home/user_interaction.dart +++ b/lib/samples/chart/home/user_interaction.dart @@ -27,7 +27,7 @@ class _InteractionTypesState extends State Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) => Theme( + builder: (BuildContext context, _, SampleListModel model) => Theme( data: model.themeData, child: SafeArea( child: DefaultTabController( @@ -43,7 +43,7 @@ class _InteractionTypesState extends State bottom: TabBar( indicator: UnderlineTabIndicator( borderSide: BorderSide( - width: 5.0, color: Color.fromRGBO(252, 220, 0, 1)), + width: 5.0, color: const Color.fromRGBO(252, 220, 0, 1)), ), isScrollable: true, tabs: getTabs(model), @@ -57,193 +57,14 @@ class _InteractionTypesState extends State letterSpacing: 0.3)), ), body: TabBarView( - physics: ClampingScrollPhysics(), - children: getTabViewChildrens(model), + physics: const ClampingScrollPhysics(), + children: getCardViewChildren(model), ), ), ), ))); } - List getTabs(SampleListModel model) { - List tabs = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - String str = getStatus(model - .controlList[model.selectedIndex].subItemList[i]); - tabs.add(Tab( - child: Row( - children: [ - Text(model.controlList[model.selectedIndex].subItemList[i][0] - ?.category - .toString() + - (str != '' ? ' ' : '')), - Container( - height: 20, - width: 20, - decoration: BoxDecoration( - color: str == 'N' - ? Color.fromRGBO(101,193,0,1) - : str == 'U' ? Color.fromRGBO(245,166,35,1) : Colors.transparent, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Text( - str, - style: TextStyle(fontSize: 12), - ), - ), - ], - ))); - } - return tabs; - } - - List getTabViewChildrens(SampleListModel model) { - List tabChildren = []; - for (int i = 0; - i < model.controlList[model.selectedIndex].subItemList.length; - i++) { - tabChildren.add(ListView.builder( - cacheExtent: model - .controlList[model.selectedIndex].subItemList[i].length - .toDouble(), - addAutomaticKeepAlives: true, - itemCount: - model.controlList[model.selectedIndex].subItemList[i].length, - itemBuilder: (BuildContext context, int position) { - return Container( - color: model.slidingPanelColor, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Card( - elevation: 2, - color: model.cardThemeColor, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(3.0), - ), - child: Column( - children: [ - InkWell( - splashColor: Colors.grey.withOpacity(0.4), - onTap: () { - Feedback.forLongPress(context); - onTapSampleItem( - context, - model.controlList[model.selectedIndex] - .subItemList[i][position]); - }, - child: Padding( - padding: - const EdgeInsets.fromLTRB(10, 5, 10, 5), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text( - '${model.controlList[model.selectedIndex].subItemList[i][position].title}', - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontFamily: 'MontserratMedium', - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3), - ), - Container( - child: Row( - children: [ - Container( - decoration: BoxDecoration( - color: model - .controlList[model - .selectedIndex] - .subItemList[i] - [position] - .status != - null - ? (model.controlList[model.selectedIndex].subItemList[i][position].status == - 'New' - ? Color.fromRGBO( - 101, 193, 0, 1) - : Color.fromRGBO( - 245, - 166, - 35, - 1)) - : Colors.transparent, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all( - Radius.circular(10.0))), - padding: EdgeInsets.fromLTRB(6, 3, 6, 3), - child: Text((model.controlList[model.selectedIndex].subItemList[i][position].status != null ? model.controlList[model.selectedIndex].subItemList[i][position].status : ''), style: TextStyle(color: Colors.white))), - Padding( - padding: - EdgeInsets.only(left: 15), - ), - Container( - height: 30, - width: 30, - color: Colors.transparent, - child: Padding( - padding: - const EdgeInsets.fromLTRB( - 5, 0, 5, 5), - child: Image.asset( - 'images/fullscreen.png', - fit: BoxFit.contain, - height: 20, - width: 20, - color: - model.listIconColor), - ), - ), - ], - )), - ]), - ), - ), - InkWell( - onTap: () {}, - splashColor: Colors.grey.withOpacity(0.4), - child: Padding( - padding: - const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: SizedBox( - width: double.infinity, - height: 230, - child: model - .controlList[model.selectedIndex] - .subItemList[i][position] - .previewWidget, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - ); - })); - } - return tabChildren; - } - @override bool get wantKeepAlive => false; } diff --git a/lib/samples/chart/legend/chart_with_customized_legend.dart b/lib/samples/chart/legend/chart_with_customized_legend.dart index 738ac16d..cc9f5204 100755 --- a/lib/samples/chart/legend/chart_with_customized_legend.dart +++ b/lib/samples/chart/legend/chart_with_customized_legend.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LegendCustomized extends StatefulWidget { - final SubItemList sample; const LegendCustomized(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LegendCustomizedState createState() => _LegendCustomizedState(sample); } class _LegendCustomizedState extends State { - final SubItemList sample; _LegendCustomizedState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _LegendCustomizedState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _LegendCustomizedState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _LegendCustomizedState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,34 +114,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +149,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -222,7 +222,7 @@ SfCartesianChart getLegendCustomizedChart(bool isTileView) { } dynamic getImage(int index) { - final dynamic images = [ + final dynamic images = [ Image.asset('images/truck_legend.png'), Image.asset('images/car_legend.png'), Image.asset('images/bike_legend.png'), diff --git a/lib/samples/chart/legend/chart_with_legend.dart b/lib/samples/chart/legend/chart_with_legend.dart index 4c0ea319..3bf088b7 100755 --- a/lib/samples/chart/legend/chart_with_legend.dart +++ b/lib/samples/chart/legend/chart_with_legend.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LegendDefault extends StatefulWidget { - final SubItemList sample; const LegendDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LegendDefaultState createState() => _LegendDefaultState(sample); } class _LegendDefaultState extends State { - final SubItemList sample; _LegendDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _LegendDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _LegendDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _LegendDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,34 +114,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +150,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/legend/legend_with_various_options.dart b/lib/samples/chart/legend/legend_with_various_options.dart index adf31246..3df8a7dd 100755 --- a/lib/samples/chart/legend/legend_with_various_options.dart +++ b/lib/samples/chart/legend/legend_with_various_options.dart @@ -9,18 +9,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class LegendOptions extends StatefulWidget { - final SubItemList sample; const LegendOptions(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _LegendOptionsState createState() => _LegendOptionsState(sample); } class _LegendOptionsState extends State { - final SubItemList sample; _LegendOptionsState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +46,7 @@ class _LegendOptionsState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +80,7 @@ class _LegendOptionsState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,16 +88,17 @@ class _LegendOptionsState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -116,7 +117,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -136,19 +137,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.4 : 0.5; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 20.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 220, child: Padding( @@ -300,7 +301,7 @@ class _FrontPanelState extends State { activeColor: model.backgroundColor, switchValue: toggleVisibility, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { toggleVisibility = value; }); @@ -362,34 +363,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -398,7 +398,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -467,7 +467,7 @@ class _PieData { SfCircularChart getLegendOptionsChart(bool isTileView, [LegendPosition _position, LegendItemOverflowMode _overflowMode, - toggleVisibility]) { + dynamic toggleVisibility]) { return SfCircularChart( title: ChartTitle(text: isTileView ? '' : 'Expenses by category'), legend: Legend( diff --git a/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart b/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart index d341b63b..094690a6 100644 --- a/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart +++ b/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart @@ -11,18 +11,18 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../widgets/checkbox.dart'; class PyramidDefault extends StatefulWidget { - final SubItemList sample; const PyramidDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _PyramidDefaultState createState() => _PyramidDefaultState(sample); } class _PyramidDefaultState extends State { - final SubItemList sample; _PyramidDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -48,7 +48,7 @@ class _PyramidDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -82,7 +82,7 @@ class _PyramidDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -90,20 +90,21 @@ class _PyramidDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; final List _pyramidMode = ['Linear', 'Surface'].toList(); PyramidMode _selectedPyramidMode = PyramidMode.linear; String _selectedMode; - _FrontPanelState(this.sample); double gapRatio = 0; bool explode = false; @override @@ -117,7 +118,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -177,19 +178,19 @@ class _FrontPanelState extends State { }); } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -303,7 +304,7 @@ class _FrontPanelState extends State { maxValue: 0.5, initialValue: gapRatio, - onChanged: (val) => + onChanged: (dynamic val) => setState(() { gapRatio = val; }), @@ -342,14 +343,14 @@ class _FrontPanelState extends State { letterSpacing: 0.34, fontWeight: FontWeight.normal)), - Padding( + const Padding( padding: EdgeInsets.fromLTRB(40, 0, 0, 0) ), BottomSheetCheckbox( activeColor: model.backgroundColor, switchValue: explode, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { explode = value; }); @@ -367,18 +368,20 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { + //ignore: prefer_const_constructors_in_immutables + BackPanel(this.sample); final SubItemList sample; - BackPanel(this.sample); + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -386,15 +389,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -403,7 +406,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart b/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart index 8118d439..79c5dd57 100644 --- a/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart +++ b/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PyramidLegend extends StatefulWidget { - final SubItemList sample; const PyramidLegend(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _PyramidLegendState createState() => _PyramidLegendState(sample); } class _PyramidLegendState extends State { - final SubItemList sample; _PyramidLegendState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _PyramidLegendState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _PyramidLegendState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _PyramidLegendState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -195,7 +196,7 @@ SfPyramidChart getLegendPyramidChart(bool isTileView) { text = args.dataPoints[args.pointIndex].y.toString(); if (text.contains('.')) { data = text.split('.'); - String newTe = + final String newTe = data[0].toString() + ' years ' + data[1].toString() + ' months'; args.text = newTe; } else { diff --git a/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart b/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart index d003cf47..70e5a303 100644 --- a/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart +++ b/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart @@ -9,18 +9,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class PyramidSmartLabels extends StatefulWidget { - final SubItemList sample; const PyramidSmartLabels(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _PyramidSmartLabelState createState() => _PyramidSmartLabelState(sample); } class _PyramidSmartLabelState extends State { - final SubItemList sample; _PyramidSmartLabelState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +46,7 @@ class _PyramidSmartLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -80,7 +80,7 @@ class _PyramidSmartLabelState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -88,16 +88,17 @@ class _PyramidSmartLabelState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; final List _labelPositon = ['outside', 'inside'].toList(); ChartDataLabelPosition _selectedLabelPosition = ChartDataLabelPosition.outside; String _selectedPosition; @@ -117,7 +118,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -193,19 +194,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -358,34 +359,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -394,7 +395,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -456,19 +457,19 @@ PyramidSeries<_PyramidData, String> _getPyramidSeries(bool isTileView, [ChartDataLabelPosition _labelPosition, LabelIntersectAction _labelIntersectAction]) { final List<_PyramidData> pieData = <_PyramidData>[ - _PyramidData('Mexico', 127575529, null, Color.fromRGBO(238, 238, 238, 1)), - _PyramidData('Russia ', 145872256, null, Color.fromRGBO(255, 240, 219, 1)), + _PyramidData('Mexico', 127575529, null, const Color.fromRGBO(238, 238, 238, 1)), + _PyramidData('Russia ', 145872256, null, const Color.fromRGBO(255, 240, 219, 1)), _PyramidData( - 'Bangladesh', 163046161, null, Color.fromRGBO(255, 205, 96, 1)), - _PyramidData('Nigeria ', 200963599, null, Color.fromRGBO(73, 76, 162, 1)), - _PyramidData('Brazil', 211049527, null, Color.fromRGBO(0, 168, 181, 1)), + 'Bangladesh', 163046161, null, const Color.fromRGBO(255, 205, 96, 1)), + _PyramidData('Nigeria ', 200963599, null, const Color.fromRGBO(73, 76, 162, 1)), + _PyramidData('Brazil', 211049527, null, const Color.fromRGBO(0, 168, 181, 1)), _PyramidData( - 'Pakistan ', 216565318, null, Color.fromRGBO(116, 180, 155, 1)), + 'Pakistan ', 216565318, null, const Color.fromRGBO(116, 180, 155, 1)), _PyramidData( - 'Indonesia', 270625568, null, Color.fromRGBO(248, 177, 149, 1)), - _PyramidData('US', 329064917, null, Color.fromRGBO(246, 114, 128, 1)), - _PyramidData('India', 1366417754, null, Color.fromRGBO(192, 108, 132, 1)), - _PyramidData('China', 1433783686, null, Color.fromRGBO(53, 92, 125, 1)), + 'Indonesia', 270625568, null, const Color.fromRGBO(248, 177, 149, 1)), + _PyramidData('US', 329064917, null, const Color.fromRGBO(246, 114, 128, 1)), + _PyramidData('India', 1366417754, null, const Color.fromRGBO(192, 108, 132, 1)), + _PyramidData('China', 1433783686, null, const Color.fromRGBO(53, 92, 125, 1)), ]; return PyramidSeries<_PyramidData, String>( width: '60%', diff --git a/lib/samples/chart/series_features/animation/dynamic_animation.dart b/lib/samples/chart/series_features/animation/dynamic_animation.dart index 2d2a3247..a8df2d77 100644 --- a/lib/samples/chart/series_features/animation/dynamic_animation.dart +++ b/lib/samples/chart/series_features/animation/dynamic_animation.dart @@ -10,19 +10,19 @@ import 'package:url_launcher/url_launcher.dart'; Timer timer; class CartesianDynamicAnimation extends StatefulWidget { - final SubItemList sample; const CartesianDynamicAnimation(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _CartesianDynamicAnimationState createState() => _CartesianDynamicAnimationState(sample); } class _CartesianDynamicAnimationState extends State { - final SubItemList sample; _CartesianDynamicAnimationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override @@ -50,7 +50,7 @@ class _CartesianDynamicAnimationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -85,7 +85,7 @@ class _CartesianDynamicAnimationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -93,11 +93,12 @@ class _CartesianDynamicAnimationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } List<_DynamicData> chartData = <_DynamicData>[ @@ -110,8 +111,8 @@ List<_DynamicData> chartData = <_DynamicData>[ ]; class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -141,7 +142,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -188,15 +189,15 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -335,19 +336,19 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); @@ -355,15 +356,15 @@ class _BackPanelState extends State { // _selectedseriesType = _seriesTypes.first; } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -372,7 +373,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -433,7 +434,7 @@ List> getAnimationData( return >[ LineSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), width: 2, xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, @@ -455,7 +456,7 @@ List> getAnimationData( return >[ ColumnSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, markerSettings: MarkerSettings( @@ -477,7 +478,7 @@ List> getAnimationData( return >[ SplineSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), width: 2, xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, @@ -499,7 +500,7 @@ List> getAnimationData( return >[ AreaSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, dataLabelSettings: DataLabelSettings( @@ -521,7 +522,7 @@ List> getAnimationData( StepLineSeries<_DynamicData, String>( dataSource: chartData, width: 2, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, dataLabelSettings: DataLabelSettings( @@ -543,7 +544,7 @@ List> getAnimationData( return >[ BarSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, dataLabelSettings: DataLabelSettings( @@ -568,7 +569,7 @@ List> getAnimationData( dataSource: chartData, xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), dataLabelSettings: DataLabelSettings( color: Colors.blue, alignment: ChartAlignment.center, @@ -588,7 +589,7 @@ List> getAnimationData( return >[ BubbleSeries<_DynamicData, String>( dataSource: chartData, - color: Color.fromRGBO(0, 168, 181, 1), + color: const Color.fromRGBO(0, 168, 181, 1), xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, sizeValueMapper: (_DynamicData sales, _) => sales.sales, diff --git a/lib/samples/chart/series_features/animation/series_animation.dart b/lib/samples/chart/series_features/animation/series_animation.dart index c4fb47be..8d88b0be 100755 --- a/lib/samples/chart/series_features/animation/series_animation.dart +++ b/lib/samples/chart/series_features/animation/series_animation.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AnimationDefault extends StatefulWidget { - final SubItemList sample; const AnimationDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _AnimationDefaultState createState() => _AnimationDefaultState(sample); } class _AnimationDefaultState extends State { - final SubItemList sample; _AnimationDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _AnimationDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _AnimationDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,23 @@ class _AnimationDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -112,34 +113,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -148,7 +149,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/series_features/annotation/chart_with_annotation.dart b/lib/samples/chart/series_features/annotation/chart_with_annotation.dart index e6da506c..02a75e00 100755 --- a/lib/samples/chart/series_features/annotation/chart_with_annotation.dart +++ b/lib/samples/chart/series_features/annotation/chart_with_annotation.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AnnotationWatermark extends StatefulWidget { - final SubItemList sample; const AnnotationWatermark(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _AnnotationWatermarkState createState() => _AnnotationWatermarkState(sample); } class _AnnotationWatermarkState extends State { - final SubItemList sample; _AnnotationWatermarkState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _AnnotationWatermarkState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +95,7 @@ class _AnnotationWatermarkState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,22 +103,23 @@ class _AnnotationWatermarkState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -131,34 +132,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -167,7 +168,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -235,13 +236,13 @@ SfCartesianChart getWatermarkAnnotationChart(bool isTileView) { enableSmartLabels: false, dataSource: <_ChartData>[ _ChartData('Facebook', 90, '90%', - Color.fromRGBO(0, 63, 92, 1)), + const Color.fromRGBO(0, 63, 92, 1)), _ChartData('Twitter', 60, '60%', - Color.fromRGBO(242, 117, 7, 1)), + const Color.fromRGBO(242, 117, 7, 1)), _ChartData('Instagram', 51, '51%', - Color.fromRGBO(89, 59, 84, 1)), + const Color.fromRGBO(89, 59, 84, 1)), _ChartData('Snapchat', 50, '50%', - Color.fromRGBO(217, 67, 80, 1)), + const Color.fromRGBO(217, 67, 80, 1)), ], dataLabelMapper: (_ChartData data, _) => data.text, xValueMapper: (_ChartData data, _) => data.x, @@ -264,10 +265,10 @@ SfCartesianChart getWatermarkAnnotationChart(bool isTileView) { List> getLineSeries(bool isTileView) { final dynamic chartData = <_ChartData>[ - _ChartData('Facebook', 90, '90', Color.fromRGBO(0, 63, 92, 1)), - _ChartData('Twitter', 60, '60', Color.fromRGBO(242, 117, 7, 1)), - _ChartData('Instagram', 51, '51', Color.fromRGBO(89, 59, 84, 1)), - _ChartData('Snapchat', 50, '50', Color.fromRGBO(217, 67, 80, 1)), + _ChartData('Facebook', 90, '90', const Color.fromRGBO(0, 63, 92, 1)), + _ChartData('Twitter', 60, '60', const Color.fromRGBO(242, 117, 7, 1)), + _ChartData('Instagram', 51, '51', const Color.fromRGBO(89, 59, 84, 1)), + _ChartData('Snapchat', 50, '50', const Color.fromRGBO(217, 67, 80, 1)), ]; return >[ ColumnSeries<_ChartData, String>( diff --git a/lib/samples/chart/series_features/annotation/chart_with_watermark.dart b/lib/samples/chart/series_features/annotation/chart_with_watermark.dart index 40de970d..dc41d15a 100755 --- a/lib/samples/chart/series_features/annotation/chart_with_watermark.dart +++ b/lib/samples/chart/series_features/annotation/chart_with_watermark.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class AnnotationDefault extends StatefulWidget { - final SubItemList sample; const AnnotationDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _AnnotationDefaultState createState() => _AnnotationDefaultState(sample); } class _AnnotationDefaultState extends State { - final SubItemList sample; _AnnotationDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,14 +43,14 @@ class _AnnotationDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeader: Container( color: Colors.transparent, child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, - children: [], + children: const [], )), needCloseButton: false, panelVisible: frontPanelVisible, @@ -102,7 +102,7 @@ class _AnnotationDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -110,22 +110,23 @@ class _AnnotationDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -137,34 +138,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -173,7 +174,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -236,11 +237,11 @@ SfCartesianChart getDefaultAnnotationChart(bool isTileView,[Brightness currentTh annotations: [ CartesianChartAnnotation( widget: Container( - child: Text( + child: const Text( '€ - \$ ', style: TextStyle( color:Color.fromRGBO(216, 225, 227,1), - // color: currentTheme == Brightness.light ? Color.fromRGBO(0, 0, 0, 0.15) : Color.fromRGBO(255, 255, 255, 0.3), + // color: currentTheme == Brightness.light? const Color.fromRGBO(0, 0, 0, 0.15) : Color.fromRGBO(255, 255, 255, 0.3), fontWeight: FontWeight.bold, fontSize: 80), ), @@ -311,7 +312,7 @@ List> getAnnotationLineSeries( dataSource: chartData, xValueMapper: (_DateTimeData data, _) => data.year, yValueMapper: (_DateTimeData data, _) => data.y, - color: Color.fromRGBO(242, 117, 7, 1), + color: const Color.fromRGBO(242, 117, 7, 1), ) ]; } diff --git a/lib/samples/chart/series_features/data_label/default_datalabels.dart b/lib/samples/chart/series_features/data_label/default_datalabels.dart index 058b2481..6988676b 100755 --- a/lib/samples/chart/series_features/data_label/default_datalabels.dart +++ b/lib/samples/chart/series_features/data_label/default_datalabels.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DataLabelDefault extends StatefulWidget { - final SubItemList sample; const DataLabelDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _DataLabelDefaultState createState() => _DataLabelDefaultState(sample); } class _DataLabelDefaultState extends State { - final SubItemList sample; _DataLabelDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DataLabelDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _DataLabelDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,22 +85,22 @@ class _DataLabelDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool performIntersectAction = true; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,34 +113,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +149,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -228,7 +228,7 @@ List> getLineSeries( legendIconType: LegendIconType.rectangle, enableTooltip: true, dataSource: chartData, - color: Color.fromRGBO(140, 198, 64, 1), + color: const Color.fromRGBO(140, 198, 64, 1), width: 2, xValueMapper: (_LabelData sales, _) => sales.x, yValueMapper: (_LabelData sales, _) => sales.y1, @@ -241,7 +241,7 @@ List> getLineSeries( SplineSeries<_LabelData, num>( legendIconType: LegendIconType.rectangle, enableTooltip: true, - color: Color.fromRGBO(203, 164, 199, 1), + color: const Color.fromRGBO(203, 164, 199, 1), dataSource: chartData, width: 2, xValueMapper: (_LabelData sales, _) => sales.x, diff --git a/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart b/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart index 719aad08..c9556ecc 100755 --- a/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart +++ b/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart @@ -8,20 +8,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class EmptyPoints extends StatefulWidget { - final SubItemList sample; const EmptyPoints(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _EmptyPointsState createState() => _EmptyPointsState(sample); } class _EmptyPointsState extends State { - final SubItemList sample; - _EmptyPointsState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +46,7 @@ class _EmptyPointsState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 20, needCloseButton: false, @@ -82,7 +81,7 @@ class _EmptyPointsState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -90,14 +89,16 @@ class _EmptyPointsState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; final List _emptyPointMode = ['gap', 'zero', 'average', 'drop'].toList(); @@ -112,13 +113,12 @@ class _FrontPanelState extends State { TextEditingController editingController = TextEditingController(); TextEditingController spacingEditingController = TextEditingController(); - _FrontPanelState(this.sample); - + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -163,19 +163,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -274,34 +274,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -310,7 +310,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/series_features/marker/various_marker_shapes.dart b/lib/samples/chart/series_features/marker/various_marker_shapes.dart index 41003bba..e15cd594 100755 --- a/lib/samples/chart/series_features/marker/various_marker_shapes.dart +++ b/lib/samples/chart/series_features/marker/various_marker_shapes.dart @@ -7,18 +7,18 @@ import 'package:intl/intl.dart'; import 'package:url_launcher/url_launcher.dart'; class MarkerDefault extends StatefulWidget { - final SubItemList sample; const MarkerDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _MarkerDefaultState createState() => _MarkerDefaultState(sample); } class _MarkerDefaultState extends State { - final SubItemList sample; _MarkerDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _MarkerDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -78,7 +78,7 @@ class _MarkerDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,22 +86,22 @@ class _MarkerDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -113,34 +113,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -149,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -228,7 +227,7 @@ List> getLineSeries(bool isTileView) { markerSettings: MarkerSettings( isVisible: true, shape: DataMarkerType.pentagon, - image: AssetImage('images/truck.png')), + image: const AssetImage('images/truck.png')), ), LineSeries<_ChartNumeric, DateTime>( dataSource: chartData, diff --git a/lib/samples/chart/series_features/sorting/sorting_options.dart b/lib/samples/chart/series_features/sorting/sorting_options.dart index ac1d9d4f..bd6f7778 100755 --- a/lib/samples/chart/series_features/sorting/sorting_options.dart +++ b/lib/samples/chart/series_features/sorting/sorting_options.dart @@ -8,18 +8,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class SortingDefault extends StatefulWidget { - final SubItemList sample; const SortingDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _SortingDefaultState createState() => _SortingDefaultState(sample); } class _SortingDefaultState extends State { - final SubItemList sample; _SortingDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _SortingDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -97,7 +97,7 @@ class _SortingDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -105,16 +105,17 @@ class _SortingDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -132,7 +133,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -209,15 +210,15 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -370,18 +371,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -389,15 +390,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -406,7 +407,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart b/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart index 42ee7f61..6d826be8 100755 --- a/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart +++ b/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart @@ -1,27 +1,27 @@ +import 'dart:math'; import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; import 'package:flutter_examples/widgets/customDropDown.dart'; import 'package:flutter_examples/widgets/flutter_backdrop.dart'; import 'package:scoped_model/scoped_model.dart'; -import 'dart:math'; import 'package:flutter_examples/widgets/bottom_sheet.dart'; import 'package:flutter_examples/widgets/checkbox.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultCrossHair extends StatefulWidget { - final SubItemList sample; + const DefaultCrossHair(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; @override _DefaultCrossHairState createState() => _DefaultCrossHairState(sample); } class _DefaultCrossHairState extends State { - final SubItemList sample; _DefaultCrossHairState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +47,7 @@ class _DefaultCrossHairState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -99,7 +99,7 @@ class _DefaultCrossHairState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -107,16 +107,17 @@ class _DefaultCrossHairState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool alwaysShow = true; final List _lineTypeList = ['both', 'vertical', 'horizontal'].toList(); @@ -133,7 +134,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -153,19 +154,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.4 : 0.5; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 170, child: Padding( @@ -266,7 +267,7 @@ class _FrontPanelState extends State { BottomSheetCheckbox( activeColor: model.backgroundColor, switchValue: alwaysShow, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { alwaysShow = value; }); @@ -305,18 +306,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -324,15 +325,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -341,7 +342,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -432,7 +433,7 @@ class _DateTimeData { dynamic getDatatTimeData() { final List<_DateTimeData> randomData = <_DateTimeData>[]; - Random rand = new Random(); + final Random rand = Random(); double value = 100; for (int i = 1; i < 2000; i++) { if (rand.nextDouble() > 0.5) diff --git a/lib/samples/chart/user_interactions/selection/selection_modes.dart b/lib/samples/chart/user_interactions/selection/selection_modes.dart index e62ca08f..611943d7 100755 --- a/lib/samples/chart/user_interactions/selection/selection_modes.dart +++ b/lib/samples/chart/user_interactions/selection/selection_modes.dart @@ -9,18 +9,19 @@ import 'package:flutter_examples/widgets/checkbox.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultSelection extends StatefulWidget { - final SubItemList sample; const DefaultSelection(this.sample, {Key key}) : super(key: key); + final SubItemList sample; + @override _DefaultSelectionState createState() => _DefaultSelectionState(sample); } class _DefaultSelectionState extends State { - final SubItemList sample; _DefaultSelectionState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +47,7 @@ class _DefaultSelectionState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -98,7 +99,7 @@ class _DefaultSelectionState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,16 +107,18 @@ class _DefaultSelectionState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableMultiSelect = false; final List _modeList = @@ -128,9 +131,9 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( - backgroundColor: model.cardThemeColor, + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -148,135 +151,143 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.3 : 0.4; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant< + SampleListModel>( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), - child: Container( - height: 170, - child: Padding( - padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), - child: Container( - height: MediaQuery.of(context).size.height * height, - child: Padding( - padding: const EdgeInsets.fromLTRB(15, 0, 0, 5), - child: Stack( - children: [ - Container( - height: 40, - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Text('Settings', - style: TextStyle( + builder: (BuildContext context, _, SampleListModel model) => + Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), + child: Container( + height: 170, + child: Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), + child: Container( + height: MediaQuery.of(context).size.height * height, + child: Padding( + padding: const EdgeInsets.fromLTRB(15, 0, 0, 5), + child: Stack( + children: [ + Container( + height: 40, + child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text('Settings', + style: TextStyle( + color: model.textColor, + fontSize: 18, + letterSpacing: 0.34, + fontWeight: FontWeight.w500)), + IconButton( + icon: Icon( + Icons.close, color: model.textColor, - fontSize: 18, - letterSpacing: 0.34, - fontWeight: FontWeight.w500)), - IconButton( - icon: Icon( - Icons.close, - color: model.textColor, - ), - onPressed: () { - Navigator.pop(context); - }, + ), + onPressed: () { + Navigator.pop(context); + }, + ), + ], ), - ], - ), - ), - Padding( - padding: const EdgeInsets.fromLTRB(0, 50, 0, 0), - child: ListView( - children: [ - Container( - child: Row( - children: [ - Text('Mode ', - style: TextStyle( - color: model.textColor, - fontSize: 16, - letterSpacing: 0.34, - fontWeight: - FontWeight.normal)), - Container( - padding: const EdgeInsets.fromLTRB( - 150, 0, 0, 0), - height: 50, - width: 250, - child: Align( - alignment: Alignment.bottomLeft, - child: Theme( - data: Theme.of(context).copyWith( - canvasColor: model - .bottomSheetBackgroundColor), - child: DropDown( - value: _selectedMode, - item: _modeList - .map((String value) { - return DropdownMenuItem< - String>( - value: - (value != null) + ), + Padding( + padding: + const EdgeInsets.fromLTRB(0, 50, 0, 0), + child: ListView( + children: [ + Container( + child: Row( + children: [ + Text('Mode ', + style: TextStyle( + color: model.textColor, + fontSize: 16, + letterSpacing: 0.34, + fontWeight: + FontWeight.normal)), + Container( + padding: + const EdgeInsets.fromLTRB( + 150, 0, 0, 0), + height: 50, + width: 250, + child: Align( + alignment: + Alignment.bottomLeft, + child: Theme( + data: Theme.of(context) + .copyWith( + canvasColor: model + .bottomSheetBackgroundColor), + child: DropDown( + value: _selectedMode, + item: _modeList.map( + (String value) { + return DropdownMenuItem< + String>( + value: (value != + null) ? value : 'point', - child: Text( - '$value', - style: TextStyle( - color: model - .textColor))); - }).toList(), - valueChanged: - (dynamic value) { - onModeTypeChange( - value, model); - })), - ), + child: Text( + '$value', + style: TextStyle( + color: model + .textColor))); + }).toList(), + valueChanged: + (dynamic value) { + onModeTypeChange( + value, model); + })), + ), + ), + ], ), - ], - ), - ), - Container( - child: Row( - children: [ - Text('Enable multi-selection ', - style: TextStyle( - color: model.textColor, - fontSize: 16, - letterSpacing: 0.34, - fontWeight: - FontWeight.normal)), - BottomSheetCheckbox( - activeColor: model.backgroundColor, - switchValue: enableMultiSelect, - valueChanged: (value) { - setState(() { - enableMultiSelect = value; - }); - }, + ), + Container( + child: Row( + children: [ + Text('Enable multi-selection ', + style: TextStyle( + color: model.textColor, + fontSize: 16, + letterSpacing: 0.34, + fontWeight: + FontWeight.normal)), + BottomSheetCheckbox( + activeColor: + model.backgroundColor, + switchValue: enableMultiSelect, + valueChanged: (dynamic value) { + setState(() { + enableMultiSelect = value; + }); + }, + ), + ], ), - ], - ), + ), + ], ), - ], - ), - ) - ], - ), - ), - )), - )))); + ) + ], + ), + ), + )), + )))); } void onModeTypeChange(String item, SampleListModel model) { @@ -298,18 +309,21 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); + // ignore: prefer_const_constructors_in_immutables _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { @@ -317,15 +331,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -334,7 +348,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart b/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart index 6503d6c1..975bc5d2 100755 --- a/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart +++ b/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultTooltip extends StatefulWidget { - final SubItemList sample; const DefaultTooltip(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DefaultTooltipState createState() => _DefaultTooltipState(sample); } class _DefaultTooltipState extends State { - final SubItemList sample; _DefaultTooltipState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DefaultTooltipState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +95,7 @@ class _DefaultTooltipState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -103,16 +103,17 @@ class _DefaultTooltipState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -121,9 +122,9 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( - backgroundColor: model.cardThemeColor, + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultTooltipChart(false)), @@ -161,34 +162,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -197,7 +198,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart b/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart index 39a9f2f6..86a371b6 100755 --- a/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart +++ b/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart @@ -9,18 +9,18 @@ import 'package:flutter_examples/widgets/checkbox.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultTrackball extends StatefulWidget { - final SubItemList sample; const DefaultTrackball(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _DefaultTrackballState createState() => _DefaultTrackballState(sample); } class _DefaultTrackballState extends State { - final SubItemList sample; _DefaultTrackballState(this.sample); - bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final SubItemList sample; + bool panelOpen; + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -46,7 +46,7 @@ class _DefaultTrackballState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -98,7 +98,7 @@ class _DefaultTrackballState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -106,16 +106,17 @@ class _DefaultTrackballState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool showAlways = true; final List _modeList = ['floatAllPoints', 'groupAllPoints', 'nearestPoint'].toList(); @@ -133,7 +134,7 @@ class _FrontPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -153,19 +154,19 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - double height = + final double height = (MediaQuery.of(context).size.height > MediaQuery.of(context).size.width) ? 0.4 : 0.5; - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 220, child: Padding( @@ -260,7 +261,7 @@ class _FrontPanelState extends State { style: TextStyle( color: _selectedMode != 'groupAllPoints' - ? Color.fromRGBO( + ? const Color.fromRGBO( 0, 0, 0, 0.3) : model.textColor, fontSize: 16, @@ -320,7 +321,7 @@ class _FrontPanelState extends State { BottomSheetCheckbox( activeColor: model.backgroundColor, switchValue: showAlways, - valueChanged: (value) { + valueChanged: (dynamic value) { setState(() { showAlways = value; }); @@ -378,34 +379,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -414,7 +415,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -480,19 +481,19 @@ SfCartesianChart getDefaultTrackballChart(bool isTileView, List> getLineSeries(bool isTileView) { final List<_TrackballData> chartData = <_TrackballData>[ - _TrackballData(new DateTime(2000, 2, 11), 15, 39, 60), - _TrackballData(new DateTime(2000, 9, 14), 20, 30, 55), - _TrackballData(new DateTime(2001, 2, 11), 25, 28, 48), - _TrackballData(new DateTime(2001, 9, 16), 21, 35, 57), - _TrackballData(new DateTime(2002, 2, 7), 13, 39, 62), - _TrackballData(new DateTime(2002, 9, 7), 18, 41, 64), - _TrackballData(new DateTime(2003, 2, 11), 24, 45, 57), - _TrackballData(new DateTime(2003, 9, 14), 23, 48, 53), - _TrackballData(new DateTime(2004, 2, 6), 19, 54, 63), - _TrackballData(new DateTime(2004, 9, 6), 31, 55, 50), - _TrackballData(new DateTime(2005, 2, 11), 39, 57, 66), - _TrackballData(new DateTime(2005, 9, 11), 50, 60, 65), - _TrackballData(new DateTime(2006, 2, 11), 24, 60, 79), + _TrackballData(DateTime(2000, 2, 11), 15, 39, 60), + _TrackballData(DateTime(2000, 9, 14), 20, 30, 55), + _TrackballData(DateTime(2001, 2, 11), 25, 28, 48), + _TrackballData(DateTime(2001, 9, 16), 21, 35, 57), + _TrackballData(DateTime(2002, 2, 7), 13, 39, 62), + _TrackballData(DateTime(2002, 9, 7), 18, 41, 64), + _TrackballData(DateTime(2003, 2, 11), 24, 45, 57), + _TrackballData(DateTime(2003, 9, 14), 23, 48, 53), + _TrackballData(DateTime(2004, 2, 6), 19, 54, 63), + _TrackballData(DateTime(2004, 9, 6), 31, 55, 50), + _TrackballData(DateTime(2005, 2, 11), 39, 57, 66), + _TrackballData(DateTime(2005, 9, 11), 50, 60, 65), + _TrackballData(DateTime(2006, 2, 11), 24, 60, 79), ]; return >[ LineSeries<_TrackballData, DateTime>( diff --git a/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart b/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart index b3768a8e..e668c9f5 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart @@ -8,9 +8,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultPanning extends StatefulWidget { - final SubItemList sample; const DefaultPanning(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _DefaultPanningState createState() => _DefaultPanningState(sample); } @@ -18,10 +18,10 @@ class DefaultPanning extends StatefulWidget { ZoomPanBehavior zoomingBehavior; class _DefaultPanningState extends State { - final SubItemList sample; _DefaultPanningState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -47,7 +47,7 @@ class _DefaultPanningState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -99,7 +99,7 @@ class _DefaultPanningState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -107,16 +107,17 @@ class _DefaultPanningState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + final List _zoomModeTypeList = ['x', 'y', 'xy'].toList(); String _selectedModeType = 'x'; ZoomMode _zoomModeType = ZoomMode.x; @@ -129,7 +130,7 @@ class _FrontPanelState extends State { enablePanning: true); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -149,7 +150,7 @@ class _FrontPanelState extends State { child: Icon(Icons.graphic_eq, color: Colors.white), backgroundColor: model.backgroundColor, ), - Padding( + const Padding( padding:EdgeInsets.only(left:5) , ), @@ -168,15 +169,15 @@ class _FrontPanelState extends State { } void _showSettingsPanel(SampleListModel model) { - showRoundedModalBottomSheet( + showRoundedModalBottomSheet( dismissOnTap: false, context: context, radius: 12.0, color: model.bottomSheetBackgroundColor, - builder: (context) => ScopedModelDescendant( + builder: (BuildContext context) => ScopedModelDescendant( rebuildOnChange: false, - builder: (context, _, model) => Padding( - padding: EdgeInsets.fromLTRB(0, 0, 0, 0), + builder: (BuildContext context, _, SampleListModel model) => Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 120, child: Padding( @@ -291,34 +292,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -327,7 +327,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart b/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart index 5358291b..7f9f66eb 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DefaultZooming extends StatefulWidget { - final SubItemList sample; const DefaultZooming(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _DefaultZoomingState createState() => _DefaultZoomingState(sample); } class _DefaultZoomingState extends State { - final SubItemList sample; _DefaultZoomingState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DefaultZoomingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -95,7 +95,7 @@ class _DefaultZoomingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -105,16 +105,17 @@ class _DefaultZoomingState extends State { ZoomPanBehavior zoomingBehavior; class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; bool enableTooltip = false; bool enableMarker = false; bool enableDatalabel = false; @@ -125,7 +126,7 @@ class _FrontPanelState extends State { ZoomPanBehavior(enablePanning: true, enableSelectionZooming: true); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -144,34 +145,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -180,7 +181,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -261,308 +262,308 @@ List> getZoomScatterSeries( } final List<_ChartDataModel> zoomData = <_ChartDataModel>[ - new _ChartDataModel(161, 65), - new _ChartDataModel(150, 65), - new _ChartDataModel(155, 65), - new _ChartDataModel(160, 65), - new _ChartDataModel(148, 66), - new _ChartDataModel(145, 66), - new _ChartDataModel(137, 66), - new _ChartDataModel(138, 66), - new _ChartDataModel(162, 66), - new _ChartDataModel(166, 66), - new _ChartDataModel(159, 66), - new _ChartDataModel(151, 66), - new _ChartDataModel(180, 66), - new _ChartDataModel(181, 66), - new _ChartDataModel(174, 66), - new _ChartDataModel(159, 66), - new _ChartDataModel(151, 67), - new _ChartDataModel(148, 67), - new _ChartDataModel(141, 67), - new _ChartDataModel(145, 67), - new _ChartDataModel(165, 67), - new _ChartDataModel(168, 67), - new _ChartDataModel(159, 67), - new _ChartDataModel(183, 67), - new _ChartDataModel(188, 67), - new _ChartDataModel(187, 67), - new _ChartDataModel(172, 67), - new _ChartDataModel(193, 67), - new _ChartDataModel(153, 68), - new _ChartDataModel(153, 68), - new _ChartDataModel(147, 68), - new _ChartDataModel(163, 68), - new _ChartDataModel(174, 68), - new _ChartDataModel(173, 68), - new _ChartDataModel(160, 68), - new _ChartDataModel(191, 68), - new _ChartDataModel(131, 62), - new _ChartDataModel(140, 62), - new _ChartDataModel(149, 62), - new _ChartDataModel(115, 62), - new _ChartDataModel(164, 63), - new _ChartDataModel(162, 63), - new _ChartDataModel(167, 63), - new _ChartDataModel(146, 63), - new _ChartDataModel(150, 64), - new _ChartDataModel(141, 64), - new _ChartDataModel(142, 64), - new _ChartDataModel(129, 64), - new _ChartDataModel(159, 64), - new _ChartDataModel(158, 64), - new _ChartDataModel(162, 64), - new _ChartDataModel(136, 64), - new _ChartDataModel(176, 64), - new _ChartDataModel(170, 64), - new _ChartDataModel(167, 64), - new _ChartDataModel(144, 64), - new _ChartDataModel(143, 65), - new _ChartDataModel(137, 65), - new _ChartDataModel(137, 65), - new _ChartDataModel(140, 65), - new _ChartDataModel(182, 65), - new _ChartDataModel(168, 65), - new _ChartDataModel(181, 65), - new _ChartDataModel(165, 65), - new _ChartDataModel(214, 74), - new _ChartDataModel(211, 74), - new _ChartDataModel(166, 74), - new _ChartDataModel(185, 74), - new _ChartDataModel(189, 68), - new _ChartDataModel(182, 68), - new _ChartDataModel(181, 68), - new _ChartDataModel(196, 68), - new _ChartDataModel(152, 69), - new _ChartDataModel(173, 69), - new _ChartDataModel(190, 69), - new _ChartDataModel(161, 69), - new _ChartDataModel(173, 69), - new _ChartDataModel(185, 69), - new _ChartDataModel(141, 69), - new _ChartDataModel(149, 69), - new _ChartDataModel(134, 62), - new _ChartDataModel(183, 62), - new _ChartDataModel(155, 62), - new _ChartDataModel(164, 62), - new _ChartDataModel(169, 62), - new _ChartDataModel(122, 62), - new _ChartDataModel(161, 62), - new _ChartDataModel(166, 62), - new _ChartDataModel(137, 63), - new _ChartDataModel(140, 63), - new _ChartDataModel(140, 63), - new _ChartDataModel(126, 63), - new _ChartDataModel(150, 63), - new _ChartDataModel(153, 63), - new _ChartDataModel(154, 63), - new _ChartDataModel(139, 63), - new _ChartDataModel(186, 69), - new _ChartDataModel(188, 69), - new _ChartDataModel(148, 69), - new _ChartDataModel(174, 69), - new _ChartDataModel(164, 70), - new _ChartDataModel(182, 70), - new _ChartDataModel(200, 70), - new _ChartDataModel(151, 70), - new _ChartDataModel(204, 74), - new _ChartDataModel(177, 74), - new _ChartDataModel(194, 74), - new _ChartDataModel(212, 74), - new _ChartDataModel(162, 70), - new _ChartDataModel(200, 70), - new _ChartDataModel(166, 70), - new _ChartDataModel(177, 70), - new _ChartDataModel(188, 70), - new _ChartDataModel(156, 70), - new _ChartDataModel(175, 70), - new _ChartDataModel(191, 70), - new _ChartDataModel(174, 71), - new _ChartDataModel(187, 71), - new _ChartDataModel(208, 71), - new _ChartDataModel(166, 71), - new _ChartDataModel(150, 71), - new _ChartDataModel(194, 71), - new _ChartDataModel(157, 71), - new _ChartDataModel(183, 71), - new _ChartDataModel(204, 71), - new _ChartDataModel(162, 71), - new _ChartDataModel(179, 71), - new _ChartDataModel(196, 71), - new _ChartDataModel(170, 72), - new _ChartDataModel(184, 72), - new _ChartDataModel(197, 72), - new _ChartDataModel(162, 72), - new _ChartDataModel(177, 72), - new _ChartDataModel(203, 72), - new _ChartDataModel(159, 72), - new _ChartDataModel(178, 72), - new _ChartDataModel(198, 72), - new _ChartDataModel(167, 72), - new _ChartDataModel(184, 72), - new _ChartDataModel(201, 72), - new _ChartDataModel(167, 73), - new _ChartDataModel(178, 73), - new _ChartDataModel(215, 73), - new _ChartDataModel(207, 73), - new _ChartDataModel(172, 73), - new _ChartDataModel(204, 73), - new _ChartDataModel(162, 73), - new _ChartDataModel(182, 73), - new _ChartDataModel(201, 73), - new _ChartDataModel(172, 73), - new _ChartDataModel(189, 73), - new _ChartDataModel(206, 73), - new _ChartDataModel(150, 74), - new _ChartDataModel(187, 74), - new _ChartDataModel(153, 74), - new _ChartDataModel(171, 74), + _ChartDataModel(161, 65), + _ChartDataModel(150, 65), + _ChartDataModel(155, 65), + _ChartDataModel(160, 65), + _ChartDataModel(148, 66), + _ChartDataModel(145, 66), + _ChartDataModel(137, 66), + _ChartDataModel(138, 66), + _ChartDataModel(162, 66), + _ChartDataModel(166, 66), + _ChartDataModel(159, 66), + _ChartDataModel(151, 66), + _ChartDataModel(180, 66), + _ChartDataModel(181, 66), + _ChartDataModel(174, 66), + _ChartDataModel(159, 66), + _ChartDataModel(151, 67), + _ChartDataModel(148, 67), + _ChartDataModel(141, 67), + _ChartDataModel(145, 67), + _ChartDataModel(165, 67), + _ChartDataModel(168, 67), + _ChartDataModel(159, 67), + _ChartDataModel(183, 67), + _ChartDataModel(188, 67), + _ChartDataModel(187, 67), + _ChartDataModel(172, 67), + _ChartDataModel(193, 67), + _ChartDataModel(153, 68), + _ChartDataModel(153, 68), + _ChartDataModel(147, 68), + _ChartDataModel(163, 68), + _ChartDataModel(174, 68), + _ChartDataModel(173, 68), + _ChartDataModel(160, 68), + _ChartDataModel(191, 68), + _ChartDataModel(131, 62), + _ChartDataModel(140, 62), + _ChartDataModel(149, 62), + _ChartDataModel(115, 62), + _ChartDataModel(164, 63), + _ChartDataModel(162, 63), + _ChartDataModel(167, 63), + _ChartDataModel(146, 63), + _ChartDataModel(150, 64), + _ChartDataModel(141, 64), + _ChartDataModel(142, 64), + _ChartDataModel(129, 64), + _ChartDataModel(159, 64), + _ChartDataModel(158, 64), + _ChartDataModel(162, 64), + _ChartDataModel(136, 64), + _ChartDataModel(176, 64), + _ChartDataModel(170, 64), + _ChartDataModel(167, 64), + _ChartDataModel(144, 64), + _ChartDataModel(143, 65), + _ChartDataModel(137, 65), + _ChartDataModel(137, 65), + _ChartDataModel(140, 65), + _ChartDataModel(182, 65), + _ChartDataModel(168, 65), + _ChartDataModel(181, 65), + _ChartDataModel(165, 65), + _ChartDataModel(214, 74), + _ChartDataModel(211, 74), + _ChartDataModel(166, 74), + _ChartDataModel(185, 74), + _ChartDataModel(189, 68), + _ChartDataModel(182, 68), + _ChartDataModel(181, 68), + _ChartDataModel(196, 68), + _ChartDataModel(152, 69), + _ChartDataModel(173, 69), + _ChartDataModel(190, 69), + _ChartDataModel(161, 69), + _ChartDataModel(173, 69), + _ChartDataModel(185, 69), + _ChartDataModel(141, 69), + _ChartDataModel(149, 69), + _ChartDataModel(134, 62), + _ChartDataModel(183, 62), + _ChartDataModel(155, 62), + _ChartDataModel(164, 62), + _ChartDataModel(169, 62), + _ChartDataModel(122, 62), + _ChartDataModel(161, 62), + _ChartDataModel(166, 62), + _ChartDataModel(137, 63), + _ChartDataModel(140, 63), + _ChartDataModel(140, 63), + _ChartDataModel(126, 63), + _ChartDataModel(150, 63), + _ChartDataModel(153, 63), + _ChartDataModel(154, 63), + _ChartDataModel(139, 63), + _ChartDataModel(186, 69), + _ChartDataModel(188, 69), + _ChartDataModel(148, 69), + _ChartDataModel(174, 69), + _ChartDataModel(164, 70), + _ChartDataModel(182, 70), + _ChartDataModel(200, 70), + _ChartDataModel(151, 70), + _ChartDataModel(204, 74), + _ChartDataModel(177, 74), + _ChartDataModel(194, 74), + _ChartDataModel(212, 74), + _ChartDataModel(162, 70), + _ChartDataModel(200, 70), + _ChartDataModel(166, 70), + _ChartDataModel(177, 70), + _ChartDataModel(188, 70), + _ChartDataModel(156, 70), + _ChartDataModel(175, 70), + _ChartDataModel(191, 70), + _ChartDataModel(174, 71), + _ChartDataModel(187, 71), + _ChartDataModel(208, 71), + _ChartDataModel(166, 71), + _ChartDataModel(150, 71), + _ChartDataModel(194, 71), + _ChartDataModel(157, 71), + _ChartDataModel(183, 71), + _ChartDataModel(204, 71), + _ChartDataModel(162, 71), + _ChartDataModel(179, 71), + _ChartDataModel(196, 71), + _ChartDataModel(170, 72), + _ChartDataModel(184, 72), + _ChartDataModel(197, 72), + _ChartDataModel(162, 72), + _ChartDataModel(177, 72), + _ChartDataModel(203, 72), + _ChartDataModel(159, 72), + _ChartDataModel(178, 72), + _ChartDataModel(198, 72), + _ChartDataModel(167, 72), + _ChartDataModel(184, 72), + _ChartDataModel(201, 72), + _ChartDataModel(167, 73), + _ChartDataModel(178, 73), + _ChartDataModel(215, 73), + _ChartDataModel(207, 73), + _ChartDataModel(172, 73), + _ChartDataModel(204, 73), + _ChartDataModel(162, 73), + _ChartDataModel(182, 73), + _ChartDataModel(201, 73), + _ChartDataModel(172, 73), + _ChartDataModel(189, 73), + _ChartDataModel(206, 73), + _ChartDataModel(150, 74), + _ChartDataModel(187, 74), + _ChartDataModel(153, 74), + _ChartDataModel(171, 74), ]; final List<_ChartDataModel> zoomData1 = <_ChartDataModel>[ - new _ChartDataModel(115, 57), - new _ChartDataModel(138, 57), - new _ChartDataModel(166, 57), - new _ChartDataModel(122, 57), - new _ChartDataModel(126, 57), - new _ChartDataModel(130, 57), - new _ChartDataModel(125, 57), - new _ChartDataModel(144, 57), - new _ChartDataModel(150, 57), - new _ChartDataModel(120, 57), - new _ChartDataModel(125, 57), - new _ChartDataModel(130, 57), - new _ChartDataModel(103, 58), - new _ChartDataModel(116, 58), - new _ChartDataModel(130, 58), - new _ChartDataModel(126, 58), - new _ChartDataModel(136, 58), - new _ChartDataModel(148, 58), - new _ChartDataModel(119, 58), - new _ChartDataModel(141, 58), - new _ChartDataModel(159, 58), - new _ChartDataModel(120, 58), - new _ChartDataModel(135, 58), - new _ChartDataModel(163, 58), - new _ChartDataModel(119, 59), - new _ChartDataModel(131, 59), - new _ChartDataModel(148, 59), - new _ChartDataModel(123, 59), - new _ChartDataModel(137, 59), - new _ChartDataModel(149, 59), - new _ChartDataModel(121, 59), - new _ChartDataModel(142, 59), - new _ChartDataModel(160, 59), - new _ChartDataModel(118, 59), - new _ChartDataModel(130, 59), - new _ChartDataModel(146, 59), - new _ChartDataModel(119, 60), - new _ChartDataModel(133, 60), - new _ChartDataModel(150, 60), - new _ChartDataModel(133, 60), - new _ChartDataModel(149, 60), - new _ChartDataModel(165, 60), - new _ChartDataModel(130, 60), - new _ChartDataModel(139, 60), - new _ChartDataModel(154, 60), - new _ChartDataModel(118, 60), - new _ChartDataModel(152, 60), - new _ChartDataModel(154, 60), - new _ChartDataModel(130, 61), - new _ChartDataModel(145, 61), - new _ChartDataModel(166, 61), - new _ChartDataModel(131, 61), - new _ChartDataModel(143, 61), - new _ChartDataModel(162, 61), - new _ChartDataModel(131, 61), - new _ChartDataModel(145, 61), - new _ChartDataModel(162, 61), - new _ChartDataModel(115, 61), - new _ChartDataModel(149, 61), - new _ChartDataModel(183, 61), - new _ChartDataModel(121, 62), - new _ChartDataModel(139, 62), - new _ChartDataModel(159, 62), - new _ChartDataModel(135, 62), - new _ChartDataModel(152, 62), - new _ChartDataModel(178, 62), - new _ChartDataModel(130, 62), - new _ChartDataModel(153, 62), - new _ChartDataModel(172, 62), - new _ChartDataModel(114, 62), - new _ChartDataModel(135, 62), - new _ChartDataModel(154, 62), - new _ChartDataModel(126, 63), - new _ChartDataModel(141, 63), - new _ChartDataModel(160, 63), - new _ChartDataModel(135, 63), - new _ChartDataModel(149, 63), - new _ChartDataModel(180, 63), - new _ChartDataModel(132, 63), - new _ChartDataModel(144, 63), - new _ChartDataModel(163, 63), - new _ChartDataModel(122, 63), - new _ChartDataModel(146, 63), - new _ChartDataModel(156, 63), - new _ChartDataModel(133, 64), - new _ChartDataModel(150, 64), - new _ChartDataModel(176, 64), - new _ChartDataModel(133, 64), - new _ChartDataModel(149, 64), - new _ChartDataModel(176, 64), - new _ChartDataModel(136, 64), - new _ChartDataModel(157, 64), - new _ChartDataModel(174, 64), - new _ChartDataModel(131, 64), - new _ChartDataModel(155, 64), - new _ChartDataModel(191, 64), - new _ChartDataModel(136, 65), - new _ChartDataModel(149, 65), - new _ChartDataModel(177, 65), - new _ChartDataModel(143, 65), - new _ChartDataModel(149, 65), - new _ChartDataModel(184, 65), - new _ChartDataModel(128, 65), - new _ChartDataModel(146, 65), - new _ChartDataModel(157, 65), - new _ChartDataModel(133, 65), - new _ChartDataModel(153, 65), - new _ChartDataModel(173, 65), - new _ChartDataModel(141, 66), - new _ChartDataModel(156, 66), - new _ChartDataModel(175, 66), - new _ChartDataModel(125, 66), - new _ChartDataModel(138, 66), - new _ChartDataModel(165, 66), - new _ChartDataModel(122, 66), - new _ChartDataModel(164, 66), - new _ChartDataModel(182, 66), - new _ChartDataModel(137, 66), - new _ChartDataModel(157, 66), - new _ChartDataModel(176, 66), - new _ChartDataModel(149, 67), - new _ChartDataModel(159, 67), - new _ChartDataModel(179, 67), - new _ChartDataModel(156, 67), - new _ChartDataModel(179, 67), - new _ChartDataModel(186, 67), - new _ChartDataModel(147, 67), - new _ChartDataModel(166, 67), - new _ChartDataModel(185, 67), - new _ChartDataModel(140, 67), - new _ChartDataModel(160, 67), - new _ChartDataModel(180, 67), - new _ChartDataModel(145, 68), - new _ChartDataModel(155, 68), - new _ChartDataModel(170, 68), - new _ChartDataModel(129, 68), - new _ChartDataModel(164, 68), - new _ChartDataModel(189, 68), - new _ChartDataModel(150, 68), - new _ChartDataModel(157, 68), - new _ChartDataModel(183, 68), - new _ChartDataModel(144, 68), - new _ChartDataModel(170, 68), - new _ChartDataModel(180, 68) + _ChartDataModel(115, 57), + _ChartDataModel(138, 57), + _ChartDataModel(166, 57), + _ChartDataModel(122, 57), + _ChartDataModel(126, 57), + _ChartDataModel(130, 57), + _ChartDataModel(125, 57), + _ChartDataModel(144, 57), + _ChartDataModel(150, 57), + _ChartDataModel(120, 57), + _ChartDataModel(125, 57), + _ChartDataModel(130, 57), + _ChartDataModel(103, 58), + _ChartDataModel(116, 58), + _ChartDataModel(130, 58), + _ChartDataModel(126, 58), + _ChartDataModel(136, 58), + _ChartDataModel(148, 58), + _ChartDataModel(119, 58), + _ChartDataModel(141, 58), + _ChartDataModel(159, 58), + _ChartDataModel(120, 58), + _ChartDataModel(135, 58), + _ChartDataModel(163, 58), + _ChartDataModel(119, 59), + _ChartDataModel(131, 59), + _ChartDataModel(148, 59), + _ChartDataModel(123, 59), + _ChartDataModel(137, 59), + _ChartDataModel(149, 59), + _ChartDataModel(121, 59), + _ChartDataModel(142, 59), + _ChartDataModel(160, 59), + _ChartDataModel(118, 59), + _ChartDataModel(130, 59), + _ChartDataModel(146, 59), + _ChartDataModel(119, 60), + _ChartDataModel(133, 60), + _ChartDataModel(150, 60), + _ChartDataModel(133, 60), + _ChartDataModel(149, 60), + _ChartDataModel(165, 60), + _ChartDataModel(130, 60), + _ChartDataModel(139, 60), + _ChartDataModel(154, 60), + _ChartDataModel(118, 60), + _ChartDataModel(152, 60), + _ChartDataModel(154, 60), + _ChartDataModel(130, 61), + _ChartDataModel(145, 61), + _ChartDataModel(166, 61), + _ChartDataModel(131, 61), + _ChartDataModel(143, 61), + _ChartDataModel(162, 61), + _ChartDataModel(131, 61), + _ChartDataModel(145, 61), + _ChartDataModel(162, 61), + _ChartDataModel(115, 61), + _ChartDataModel(149, 61), + _ChartDataModel(183, 61), + _ChartDataModel(121, 62), + _ChartDataModel(139, 62), + _ChartDataModel(159, 62), + _ChartDataModel(135, 62), + _ChartDataModel(152, 62), + _ChartDataModel(178, 62), + _ChartDataModel(130, 62), + _ChartDataModel(153, 62), + _ChartDataModel(172, 62), + _ChartDataModel(114, 62), + _ChartDataModel(135, 62), + _ChartDataModel(154, 62), + _ChartDataModel(126, 63), + _ChartDataModel(141, 63), + _ChartDataModel(160, 63), + _ChartDataModel(135, 63), + _ChartDataModel(149, 63), + _ChartDataModel(180, 63), + _ChartDataModel(132, 63), + _ChartDataModel(144, 63), + _ChartDataModel(163, 63), + _ChartDataModel(122, 63), + _ChartDataModel(146, 63), + _ChartDataModel(156, 63), + _ChartDataModel(133, 64), + _ChartDataModel(150, 64), + _ChartDataModel(176, 64), + _ChartDataModel(133, 64), + _ChartDataModel(149, 64), + _ChartDataModel(176, 64), + _ChartDataModel(136, 64), + _ChartDataModel(157, 64), + _ChartDataModel(174, 64), + _ChartDataModel(131, 64), + _ChartDataModel(155, 64), + _ChartDataModel(191, 64), + _ChartDataModel(136, 65), + _ChartDataModel(149, 65), + _ChartDataModel(177, 65), + _ChartDataModel(143, 65), + _ChartDataModel(149, 65), + _ChartDataModel(184, 65), + _ChartDataModel(128, 65), + _ChartDataModel(146, 65), + _ChartDataModel(157, 65), + _ChartDataModel(133, 65), + _ChartDataModel(153, 65), + _ChartDataModel(173, 65), + _ChartDataModel(141, 66), + _ChartDataModel(156, 66), + _ChartDataModel(175, 66), + _ChartDataModel(125, 66), + _ChartDataModel(138, 66), + _ChartDataModel(165, 66), + _ChartDataModel(122, 66), + _ChartDataModel(164, 66), + _ChartDataModel(182, 66), + _ChartDataModel(137, 66), + _ChartDataModel(157, 66), + _ChartDataModel(176, 66), + _ChartDataModel(149, 67), + _ChartDataModel(159, 67), + _ChartDataModel(179, 67), + _ChartDataModel(156, 67), + _ChartDataModel(179, 67), + _ChartDataModel(186, 67), + _ChartDataModel(147, 67), + _ChartDataModel(166, 67), + _ChartDataModel(185, 67), + _ChartDataModel(140, 67), + _ChartDataModel(160, 67), + _ChartDataModel(180, 67), + _ChartDataModel(145, 68), + _ChartDataModel(155, 68), + _ChartDataModel(170, 68), + _ChartDataModel(129, 68), + _ChartDataModel(164, 68), + _ChartDataModel(189, 68), + _ChartDataModel(150, 68), + _ChartDataModel(157, 68), + _ChartDataModel(183, 68), + _ChartDataModel(144, 68), + _ChartDataModel(170, 68), + _ChartDataModel(180, 68) ]; class _ChartDataModel { diff --git a/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart b/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart index fd714823..679a143e 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart @@ -6,9 +6,9 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ButtonZooming extends StatefulWidget { - final SubItemList sample; const ButtonZooming(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _ButtonZoomingState createState() => _ButtonZoomingState(sample); } @@ -63,10 +63,10 @@ final List<_ChartData> chartData = <_ChartData>[ ]; class _ButtonZoomingState extends State { - final SubItemList sample; _ButtonZoomingState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -98,7 +98,7 @@ class _ButtonZoomingState extends State { enableSelectionZooming: true, ); return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( frontHeaderHeight: 50, needCloseButton: false, @@ -151,7 +151,7 @@ class _ButtonZoomingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -159,22 +159,23 @@ class _ButtonZoomingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); - + final SubItemList sample; + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -294,34 +295,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -330,7 +331,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/gauge/animation/radial_bounceout.dart b/lib/samples/gauge/animation/radial_bounceout.dart index 338f2663..3e539fc9 100644 --- a/lib/samples/gauge/animation/radial_bounceout.dart +++ b/lib/samples/gauge/animation/radial_bounceout.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialBounceOutExample extends StatefulWidget { - final SubItemList sample; const RadialBounceOutExample(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialBounceOutExampleState createState() => _RadialBounceOutExampleState(sample); } class _RadialBounceOutExampleState extends State { - final SubItemList sample; _RadialBounceOutExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialBounceOutExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialBounceOutExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialBounceOutExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -201,16 +202,16 @@ SfRadialGauge getRadialBounceOutExample(bool isTileView) { fontStyle: FontStyle.italic), minorTicksPerInterval: 9, interval: 2, pointers: [NeedlePointer(value: 0, needleStartWidth: 2, needleEndWidth: 2, - needleColor: Color(0xFFF67280), needleLength: 0.8, lengthUnit: GaugeSizeUnit.factor, + needleColor: const Color(0xFFF67280), needleLength: 0.8, lengthUnit: GaugeSizeUnit.factor, enableAnimation: true, animationType: AnimationType.bounceOut, animationDuration: 1500, knobStyle: KnobStyle(knobRadius:8, sizeUnit: GaugeSizeUnit.logicalPixel, - color: Color(0xFFF67280)) + color: const Color(0xFFF67280)) )], minorTickStyle: MinorTickStyle(length: 0.08, thickness: 1, lengthUnit: GaugeSizeUnit.factor, - color: Color(0xFFC4C4C4)), - axisLineStyle:AxisLineStyle(color: Color(0xFFDADADA), + color: const Color(0xFFC4C4C4)), + axisLineStyle:AxisLineStyle(color: const Color(0xFFDADADA), thicknessUnit: GaugeSizeUnit.factor, thickness: 0.1)), diff --git a/lib/samples/gauge/animation/radial_easeanimation.dart b/lib/samples/gauge/animation/radial_easeanimation.dart index baea8f79..8a2758c4 100644 --- a/lib/samples/gauge/animation/radial_easeanimation.dart +++ b/lib/samples/gauge/animation/radial_easeanimation.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialEaseExample extends StatefulWidget { - final SubItemList sample; const RadialEaseExample(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialEaseExampleState createState() => _RadialEaseExampleState(sample); } class _RadialEaseExampleState extends State { - final SubItemList sample; _RadialEaseExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialEaseExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialEaseExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialEaseExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -103,14 +105,11 @@ class _FrontPanelState extends State { super.initState(); } - @override void dispose() { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { setState((){ @@ -118,7 +117,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,17 +129,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -148,15 +148,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -165,7 +165,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -221,18 +221,18 @@ SfRadialGauge getRadialEaseExample(bool isTileView) { annotations: [ GaugeAnnotation( positionFactor: 1, axisValue: 0, widget: Container(height: isTileView ? 30 : 45, width:isTileView ? 30 : 45, - decoration: new BoxDecoration( - image: new DecorationImage( + decoration: BoxDecoration( + image: DecorationImage( image: ExactAssetImage('images/shotput.png'), fit: BoxFit.fitHeight, ), ))), - GaugeAnnotation(widget: Container(child: Text('Distance', + GaugeAnnotation(widget: Container(child: const Text('Distance', style: TextStyle( fontSize: 20)),)) ], pointers: [ - RangePointer(value: 11.5, width: 0.1, color: Color(0xFFF67280), + RangePointer(value: 11.5, width: 0.1, color: const Color(0xFFF67280), enableAnimation: true, sizeUnit: GaugeSizeUnit.factor, animationType: AnimationType.ease,), MarkerPointer(value: 11.5, markerType: MarkerType.image, diff --git a/lib/samples/gauge/animation/radial_easeincirc.dart b/lib/samples/gauge/animation/radial_easeincirc.dart index cb973058..1ceffbb6 100644 --- a/lib/samples/gauge/animation/radial_easeincirc.dart +++ b/lib/samples/gauge/animation/radial_easeincirc.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialEaseInCircExample extends StatefulWidget { - final SubItemList sample; const RadialEaseInCircExample(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialEaseInCircExampleState createState() => _RadialEaseInCircExampleState(sample); } class _RadialEaseInCircExampleState extends State { - final SubItemList sample; _RadialEaseInCircExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialEaseInCircExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialEaseInCircExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialEaseInCircExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; @override @@ -102,19 +104,16 @@ class _FrontPanelState extends State { super.initState(); } - @override void dispose() { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -126,17 +125,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -144,15 +144,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -161,7 +161,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -219,7 +219,7 @@ SfRadialGauge getRadialEaseInCircExample(bool isTileView) { pointers: [RangePointer(width: 15, pointerOffset: 10, value: 45, animationDuration: 1000, animationType: AnimationType.easeInCirc, enableAnimation: true, - color: Color(0xFFF8B195))] + color: const Color(0xFFF8B195))] ) ], ); diff --git a/lib/samples/gauge/animation/radial_easeout.dart b/lib/samples/gauge/animation/radial_easeout.dart index 65e6f43c..e137ee44 100644 --- a/lib/samples/gauge/animation/radial_easeout.dart +++ b/lib/samples/gauge/animation/radial_easeout.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialEaseOutAnimation extends StatefulWidget { - final SubItemList sample; const RadialEaseOutAnimation(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialEaseOutAnimationState createState() => _RadialEaseOutAnimationState(sample); } class _RadialEaseOutAnimationState extends State { - final SubItemList sample; _RadialEaseOutAnimationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialEaseOutAnimationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialEaseOutAnimationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialEaseOutAnimationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -109,13 +111,11 @@ class _FrontPanelState extends State { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -127,17 +127,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -145,15 +146,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -162,7 +163,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -212,7 +213,7 @@ SfRadialGauge getRadialEaseOutAnimation(bool isTileView) { thickness: 40), pointers: [ RangePointer(enableAnimation: true, animationType: AnimationType.easeOutBack, - width: 40, color: Color(0xFF00A8B5), value: 40), + width: 40, color: const Color(0xFF00A8B5), value: 40), NeedlePointer(knobStyle: KnobStyle(knobRadius: 5, sizeUnit: GaugeSizeUnit.logicalPixel, color: _easeOutNeedleColor), diff --git a/lib/samples/gauge/animation/radial_elasticout.dart b/lib/samples/gauge/animation/radial_elasticout.dart index 6d6212ad..57b6672f 100644 --- a/lib/samples/gauge/animation/radial_elasticout.dart +++ b/lib/samples/gauge/animation/radial_elasticout.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialElasticOutAnimation extends StatefulWidget { - final SubItemList sample; const RadialElasticOutAnimation(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialElasticOutAnimationState createState() => _RadialElasticOutAnimationState(sample); } class _RadialElasticOutAnimationState extends State { - final SubItemList sample; _RadialElasticOutAnimationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialElasticOutAnimationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialElasticOutAnimationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialElasticOutAnimationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -109,13 +111,11 @@ class _FrontPanelState extends State { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -127,17 +127,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -145,15 +146,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -162,7 +163,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -213,9 +214,9 @@ SfRadialGauge getRadialElasticOutAnimation(bool isTileView) { pointers: [RangePointer(value: 70, width: 5, animationDuration: 2000, enableAnimation: true, animationType: AnimationType.elasticOut, - color: Color(0xFF00A8B5)), + color: const Color(0xFF00A8B5)), NeedlePointer(value: 70, needleStartWidth: 0, - needleColor: Color(0xFF00A8B5), + needleColor: const Color(0xFF00A8B5), lengthUnit: GaugeSizeUnit.factor, needleLength: 1, enableAnimation: true, diff --git a/lib/samples/gauge/animation/radial_linearanimation.dart b/lib/samples/gauge/animation/radial_linearanimation.dart index ef2c3011..be7f9565 100644 --- a/lib/samples/gauge/animation/radial_linearanimation.dart +++ b/lib/samples/gauge/animation/radial_linearanimation.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialLinearAnimation extends StatefulWidget { - final SubItemList sample; const RadialLinearAnimation(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialLinearAnimationState createState() => _RadialLinearAnimationState(sample); } class _RadialLinearAnimationState extends State { - final SubItemList sample; _RadialLinearAnimationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialLinearAnimationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialLinearAnimationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialLinearAnimationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -109,8 +111,6 @@ class _FrontPanelState extends State { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { setState((){ @@ -118,7 +118,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -130,17 +130,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -148,15 +149,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -165,7 +166,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -206,7 +207,7 @@ class _BackPanelState extends State { } SfRadialGauge getRadialLinearAnimation(bool isTileView) { - SfRadialGauge _gauge = SfRadialGauge( + final SfRadialGauge _gauge = SfRadialGauge( axes: [ RadialAxis(startAngle: 270, endAngle: 270, showLabels: false, radiusFactor: 0.8, diff --git a/lib/samples/gauge/animation/radial_slowmiddle.dart b/lib/samples/gauge/animation/radial_slowmiddle.dart index f63ecae0..9690191a 100644 --- a/lib/samples/gauge/animation/radial_slowmiddle.dart +++ b/lib/samples/gauge/animation/radial_slowmiddle.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialSlowMiddleAnimation extends StatefulWidget { - final SubItemList sample; const RadialSlowMiddleAnimation(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialSlowMiddleAnimationState createState() => _RadialSlowMiddleAnimationState(sample); } class _RadialSlowMiddleAnimationState extends State { - final SubItemList sample; _RadialSlowMiddleAnimationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RadialSlowMiddleAnimationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RadialSlowMiddleAnimationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RadialSlowMiddleAnimationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -109,13 +111,11 @@ class _FrontPanelState extends State { super.dispose(); } - - _FrontPanelState(this.sample); @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -127,17 +127,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -145,15 +146,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -162,7 +163,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -218,15 +219,15 @@ SfRadialGauge getRadialSlowMiddleAnimation(bool isTileView) { pointers: [ NeedlePointer(needleLength: 0.95, needleStartWidth: 0, lengthUnit: GaugeSizeUnit.factor, - needleEndWidth: 5, needleColor: Color(0xFFC06C84), + needleEndWidth: 5, needleColor: const Color(0xFFC06C84), knobStyle: KnobStyle(knobRadius: 0), value: 11, enableAnimation: true, animationType: AnimationType.slowMiddle ), NeedlePointer(needleLength: 0.7, needleStartWidth: 0, lengthUnit: GaugeSizeUnit.factor, - needleEndWidth: 5, needleColor: Color(0xFFF67280), + needleEndWidth: 5, needleColor: const Color(0xFFF67280), value: 2, enableAnimation: true, animationType: AnimationType.slowMiddle, - knobStyle: KnobStyle(color: Color(0xFFF67280), + knobStyle: KnobStyle(color: const Color(0xFFF67280), sizeUnit: GaugeSizeUnit.logicalPixel, knobRadius: 10), ), diff --git a/lib/samples/gauge/annotation/direction_compass.dart b/lib/samples/gauge/annotation/direction_compass.dart index 4fc60b7c..52f0ea12 100644 --- a/lib/samples/gauge/annotation/direction_compass.dart +++ b/lib/samples/gauge/annotation/direction_compass.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialCompass extends StatefulWidget { - final SubItemList sample; const RadialCompass(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialCompassState createState() => _RadialCompassState(sample); } class _RadialCompassState extends State { - final SubItemList sample; _RadialCompassState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialCompassState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialCompassState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialCompassState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -206,20 +207,20 @@ SfRadialGauge getRadialCompass(bool isTileView) { markerType: MarkerType.triangle), NeedlePointer(value: 310, needleLength: 0.5, lengthUnit: GaugeSizeUnit.factor, - needleColor: Color(0xFFC4C4C4), needleStartWidth: 1, + needleColor: const Color(0xFFC4C4C4), needleStartWidth: 1, needleEndWidth: 1, knobStyle: KnobStyle(knobRadius: 0), - tailStyle: TailStyle(color: Color(0xFFC4C4C4), width: 1, + tailStyle: TailStyle(color: const Color(0xFFC4C4C4), width: 1, lengthUnit: GaugeSizeUnit.factor, length: 0.5)), NeedlePointer(value: 221, needleLength: 0.5, lengthUnit:GaugeSizeUnit.factor, - needleColor: Color(0xFFC4C4C4), needleStartWidth: 1, + needleColor: const Color(0xFFC4C4C4), needleStartWidth: 1, needleEndWidth: 1, knobStyle: KnobStyle(knobRadius: 0, sizeUnit: GaugeSizeUnit.factor ),), NeedlePointer(value: 40, needleLength: 0.5, lengthUnit: GaugeSizeUnit.factor, - needleColor: Color(0xFFC4C4C4), needleStartWidth: 1, + needleColor: const Color(0xFFC4C4C4), needleStartWidth: 1, needleEndWidth: 1, knobStyle: KnobStyle(knobRadius: 0),) ], annotations: [GaugeAnnotation(angle: 230, positionFactor: 0.38, diff --git a/lib/samples/gauge/annotation/image_annotation.dart b/lib/samples/gauge/annotation/image_annotation.dart index e6094bb7..0822a8c0 100644 --- a/lib/samples/gauge/annotation/image_annotation.dart +++ b/lib/samples/gauge/annotation/image_annotation.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialImageAnnotation extends StatefulWidget { - final SubItemList sample; const RadialImageAnnotation(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialImageAnnotationState createState() => _RadialImageAnnotationState(sample); } class _RadialImageAnnotationState extends State { - final SubItemList sample; _RadialImageAnnotationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialImageAnnotationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialImageAnnotationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialImageAnnotationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -195,20 +196,20 @@ SfRadialGauge getRadialImageAnnotation(bool isTileView) { showLabels: false, axisLineStyle: AxisLineStyle(thickness: 20), pointers: [RangePointer(value: 73, - width: 20, color: Color(0xFFFFCD60), + width: 20, color: const Color(0xFFFFCD60), enableAnimation: true, cornerStyle: CornerStyle.bothCurve)], annotations: [ GaugeAnnotation(widget: Column(children: [Container( width: isTileView ? 30.00 : 50.00 , height: isTileView ? 30.00 : 50.00, - decoration: new BoxDecoration( - image: new DecorationImage( + decoration: BoxDecoration( + image: DecorationImage( image: ExactAssetImage('images/sun.png'), fit: BoxFit.fitHeight, ), )), - Padding(padding: EdgeInsets.fromLTRB(0, 2, 0, 0), + Padding(padding: const EdgeInsets.fromLTRB(0, 2, 0, 0), child: Container(child:Text('73°F', style: TextStyle( fontWeight: FontWeight.bold, diff --git a/lib/samples/gauge/annotation/text_annotation.dart b/lib/samples/gauge/annotation/text_annotation.dart index ae5a058e..33799cdf 100644 --- a/lib/samples/gauge/annotation/text_annotation.dart +++ b/lib/samples/gauge/annotation/text_annotation.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialTextAnnotation extends StatefulWidget { - final SubItemList sample; const RadialTextAnnotation(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialTextAnnotationState createState() => _RadialTextAnnotationState(sample); } class _RadialTextAnnotationState extends State { - final SubItemList sample; _RadialTextAnnotationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialTextAnnotationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialTextAnnotationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialTextAnnotationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +147,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -215,7 +215,7 @@ SfRadialGauge getRadialTextAnnotation(bool isTileView) { fontWeight: FontWeight.bold, fontSize: isTileView ? 18 : 25))))], axisLineStyle: AxisLineStyle( - color: Color(0xFF00A8B5), + color: const Color(0xFF00A8B5), thickness: 30, dashArray: [8, 10] )) ], diff --git a/lib/samples/gauge/axis_feature/custom_labels.dart b/lib/samples/gauge/axis_feature/custom_labels.dart index f7852535..17239b56 100644 --- a/lib/samples/gauge/axis_feature/custom_labels.dart +++ b/lib/samples/gauge/axis_feature/custom_labels.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class GaugeCustomLabels extends StatefulWidget { - final SubItemList sample; const GaugeCustomLabels(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _GaugeCustomLabelsState createState() => _GaugeCustomLabelsState(sample); } class _GaugeCustomLabelsState extends State { - final SubItemList sample; _GaugeCustomLabelsState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _GaugeCustomLabelsState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _GaugeCustomLabelsState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _GaugeCustomLabelsState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -107,7 +108,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -119,34 +120,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -155,7 +156,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -215,7 +216,7 @@ SfRadialGauge getGaugeCustomLabels(bool isTileView) { pointers: [ NeedlePointer(value: 70, lengthUnit: GaugeSizeUnit.factor, needleLength: 0.55, needleEndWidth: isTileView ? 10 : _endWidth, - needleColor: Color(0xFFF67280), knobStyle: KnobStyle(knobRadius: 0.1, + needleColor: const Color(0xFFF67280), knobStyle: KnobStyle(knobRadius: 0.1, sizeUnit: GaugeSizeUnit.factor, color: Colors.white)), diff --git a/lib/samples/gauge/axis_feature/default_gauge_view.dart b/lib/samples/gauge/axis_feature/default_gauge_view.dart index e7d87b9e..d117cb33 100644 --- a/lib/samples/gauge/axis_feature/default_gauge_view.dart +++ b/lib/samples/gauge/axis_feature/default_gauge_view.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialGaugeDefault extends StatefulWidget { - final SubItemList sample; const RadialGaugeDefault(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialGaugeDefaultState createState() => _RadialGaugeDefaultState(sample); } class _RadialGaugeDefaultState extends State { - final SubItemList sample; _RadialGaugeDefaultState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialGaugeDefaultState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialGaugeDefaultState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialGaugeDefaultState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +147,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/gauge/axis_feature/multiple_axis.dart b/lib/samples/gauge/axis_feature/multiple_axis.dart index 29ef0127..9291030d 100644 --- a/lib/samples/gauge/axis_feature/multiple_axis.dart +++ b/lib/samples/gauge/axis_feature/multiple_axis.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class MultipleAxisExample extends StatefulWidget { - final SubItemList sample; const MultipleAxisExample(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _MultipleAxisExampleState createState() => _MultipleAxisExampleState(sample); } class _MultipleAxisExampleState extends State { - final SubItemList sample; _MultipleAxisExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _MultipleAxisExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _MultipleAxisExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _MultipleAxisExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -102,7 +103,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,34 +115,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; @@ -151,7 +152,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -197,14 +198,14 @@ SfRadialGauge getMultipleAxisGauge(bool isTileView) { RadialAxis(minimum: 32 , maximum: 212, interval: 36, radiusFactor: isTileView ? 0.5 :_radius, labelOffset: 15, needsRotateLabels: true, - minorTickStyle: MinorTickStyle(color: Color(0xFF00A8B5), thickness: 1.5, + minorTickStyle: MinorTickStyle(color: const Color(0xFF00A8B5), thickness: 1.5, lengthUnit: GaugeSizeUnit.factor, length: 0.07), - majorTickStyle: MajorTickStyle(color: Color(0xFF00A8B5), thickness: 1.5, + majorTickStyle: MajorTickStyle(color: const Color(0xFF00A8B5), thickness: 1.5, lengthUnit: GaugeSizeUnit.factor, length: 0.15), - axisLineStyle: AxisLineStyle(color:Color(0xFF00A8B5), thickness: 3, ), - axisLabelStyle: GaugeTextStyle(color: Color(0xFF00A8B5), fontSize: 12), + axisLineStyle: AxisLineStyle(color:const Color(0xFF00A8B5), thickness: 3, ), + axisLabelStyle: GaugeTextStyle(color: const Color(0xFF00A8B5), fontSize: 12), ), RadialAxis(minimum: 0 , maximum: 100, interval: 10, @@ -221,9 +222,9 @@ SfRadialGauge getMultipleAxisGauge(bool isTileView) { axisLabelStyle: GaugeTextStyle(fontSize: 12), annotations: [ GaugeAnnotation(angle: 90, positionFactor: 1, - widget: Row(children: [Container(child: Text('33°C :', style: TextStyle(fontSize: 12, + widget: Row(children: [Container(child: const Text('33°C :', style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold, fontFamily: 'Times'),)), - Container(child: Text(' 91.4°F', style: TextStyle(fontSize: 12, + Container(child: const Text(' 91.4°F', style: TextStyle(fontSize: 12, color: Color(0xFF00A8B5), fontWeight: FontWeight.bold, fontFamily: 'Times'),))],) ) ], diff --git a/lib/samples/gauge/axis_feature/non_linearlabel.dart b/lib/samples/gauge/axis_feature/non_linearlabel.dart index ce112b24..b9682507 100644 --- a/lib/samples/gauge/axis_feature/non_linearlabel.dart +++ b/lib/samples/gauge/axis_feature/non_linearlabel.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialNonLinearLabel extends StatefulWidget { - final SubItemList sample; const RadialNonLinearLabel (this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialNonLinearLabelState createState() => _RadialNonLinearLabelState(sample); } class _RadialNonLinearLabelState extends State { - final SubItemList sample; _RadialNonLinearLabelState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialNonLinearLabelState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialNonLinearLabelState extends State { headerClosingHeight: 350, color: model.cardThemeColor, titleVisibleOnPanelClosed: true, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _RadialNonLinearLabelState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -102,7 +103,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,34 +115,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +150,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -227,7 +227,6 @@ double _radius = 0.06; class CustomAxis extends RadialAxis{ CustomAxis({ double radiusFactor = 1, - double centerX = 0.5, List pointers, GaugeTextStyle axisLabelStyle, AxisLineStyle axisLineStyle, @@ -255,7 +254,7 @@ class CustomAxis extends RadialAxis{ List generateVisibleLabels(){ final List _visibleLabels = []; for (num i = 0; i < 9; i++) { - double _value = _calculateLabelValue(i); + final double _value = _calculateLabelValue(i); final CircularAxisLabel label = CircularAxisLabel(axisLabelStyle, _value.toInt().toString(), i, false); label.value = _value; diff --git a/lib/samples/gauge/axis_feature/radiallabel_customization.dart b/lib/samples/gauge/axis_feature/radiallabel_customization.dart index 3b682f2b..877a709c 100644 --- a/lib/samples/gauge/axis_feature/radiallabel_customization.dart +++ b/lib/samples/gauge/axis_feature/radiallabel_customization.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialLabelCustomization extends StatefulWidget { - final SubItemList sample; const RadialLabelCustomization(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialLabelCustomizationState createState() => _RadialLabelCustomizationState(sample); } class _RadialLabelCustomizationState extends State { - final SubItemList sample; _RadialLabelCustomizationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialLabelCustomizationState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialLabelCustomizationState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialLabelCustomizationState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -212,7 +213,7 @@ SfRadialGauge getRadialLabelCustomization(bool isTileView) { length: 20) )], axisLabelStyle: GaugeTextStyle(fontSize: 12, fontWeight: FontWeight.w500), - axisLineStyle: AxisLineStyle(thickness: 3, color: Color(0xFF00A8B5)) + axisLineStyle: AxisLineStyle(thickness: 3, color: const Color(0xFF00A8B5)) ), ], ); diff --git a/lib/samples/gauge/axis_feature/range_colors.dart b/lib/samples/gauge/axis_feature/range_colors.dart index 78d44495..6f282680 100644 --- a/lib/samples/gauge/axis_feature/range_colors.dart +++ b/lib/samples/gauge/axis_feature/range_colors.dart @@ -7,19 +7,19 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeColorForLabels extends StatefulWidget { - final SubItemList sample; const RangeColorForLabels(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RangeColorForLabelsState createState() => _RangeColorForLabelsState(sample); } class _RangeColorForLabelsState extends State { - final SubItemList sample; _RangeColorForLabelsState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -45,7 +45,7 @@ class _RangeColorForLabelsState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -79,7 +79,7 @@ class _RangeColorForLabelsState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -87,14 +87,16 @@ class _RangeColorForLabelsState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; @@ -108,14 +110,12 @@ class _FrontPanelState extends State { void dispose() { super.dispose(); } - - - _FrontPanelState(this.sample); + @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -127,33 +127,34 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; + @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -162,7 +163,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -221,19 +222,19 @@ SfRadialGauge getRangeColorForLabels(bool isTileView) { lengthUnit: GaugeSizeUnit.factor, thickness: 1), ranges: [GaugeRange(startValue: 0, endValue: 35, - color: Color(0xFFF8B195), + color: const Color(0xFFF8B195), sizeUnit: GaugeSizeUnit.factor, rangeOffset: 0.06, startWidth: 0.05, endWidth: 0.25), GaugeRange(startValue: 35, endValue: 70, rangeOffset: 0.06, sizeUnit: GaugeSizeUnit.factor, - color: Color(0xFFC06C84), + color: const Color(0xFFC06C84), startWidth: 0.05, endWidth: 0.25), GaugeRange(startValue: 70, endValue: 100, rangeOffset: 0.06, sizeUnit: GaugeSizeUnit.factor, - color: Color(0xFF355C7D), + color: const Color(0xFF355C7D), startWidth: 0.05, endWidth: 0.25), ] ) diff --git a/lib/samples/gauge/axis_feature/tick_customization.dart b/lib/samples/gauge/axis_feature/tick_customization.dart index 3aca387d..de875839 100644 --- a/lib/samples/gauge/axis_feature/tick_customization.dart +++ b/lib/samples/gauge/axis_feature/tick_customization.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialTickCustomization extends StatefulWidget { - final SubItemList sample; const RadialTickCustomization(this.sample, {Key key}) : super(key: key); - + final SubItemList sample; + @override _RadialTickCustomizationState createState() => _RadialTickCustomizationState(sample); } class _RadialTickCustomizationState extends State< RadialTickCustomization> { - final SubItemList sample; _RadialTickCustomizationState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialTickCustomizationState extends State< RadialTickCustomization> { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialTickCustomizationState extends State< RadialTickCustomization> { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialTickCustomizationState extends State< RadialTickCustomization> { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); - + final SubItemList subItemList; + @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,34 +112,33 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); - + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); - + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); + @override void initState() { WidgetsBinding.instance.addPostFrameCallback(_afterLayout); super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +147,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( diff --git a/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart b/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart index 89fb9b8b..e1a7f1f1 100644 --- a/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart +++ b/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialPointerDragging extends StatefulWidget { - final SubItemList sample; const RadialPointerDragging(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialPointerDraggingState createState() => _RadialPointerDraggingState(sample); } class _RadialPointerDraggingState extends State { - final SubItemList sample; _RadialPointerDraggingState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialPointerDraggingState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialPointerDraggingState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _RadialPointerDraggingState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -102,7 +103,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +115,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -211,31 +212,31 @@ SfRadialGauge getRadialPointerDragging(bool isTileView) { markerHeight: 30, markerWidth: 30, offsetUnit: GaugeSizeUnit.factor, color: Colors.white, - markerType: MarkerType.circle, borderWidth: 8,borderColor: Color(0xFFFFCD60) + markerType: MarkerType.circle, borderWidth: 8,borderColor: const Color(0xFFFFCD60) ), ], ranges: [GaugeRange(startValue: 0, endValue: 19.5, - color: Color(0xFF355C7D), + color: const Color(0xFF355C7D), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), GaugeRange(startValue: 20, endValue: 39.5, - color: Color(0xFFC06C84), + color: const Color(0xFFC06C84), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), GaugeRange(startValue: 40, endValue: 59.5, - color: Color(0xFFF67280), + color: const Color(0xFFF67280), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), GaugeRange(startValue: 60, endValue: 79.5, - color: Color(0xFFF8B195), + color: const Color(0xFFF8B195), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), GaugeRange(startValue: 80, endValue: 99.5, - color: Color(0xFF74B49B), + color: const Color(0xFF74B49B), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), GaugeRange(startValue: 100, endValue: 120, - color: Color(0xFF00A8B5), + color: const Color(0xFF00A8B5), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.1, endWidth: 0.1), ] diff --git a/lib/samples/gauge/pointers/multiple_needle.dart b/lib/samples/gauge/pointers/multiple_needle.dart index 92cb4346..77a8bf57 100644 --- a/lib/samples/gauge/pointers/multiple_needle.dart +++ b/lib/samples/gauge/pointers/multiple_needle.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class MultipleNeedleExample extends StatefulWidget { - final SubItemList sample; const MultipleNeedleExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _MultipleNeedleExampleState createState() => _MultipleNeedleExampleState(sample); } class _MultipleNeedleExampleState extends State { - final SubItemList sample; _MultipleNeedleExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _MultipleNeedleExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _MultipleNeedleExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _MultipleNeedleExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -209,7 +210,7 @@ SfRadialGauge getMultipleNeedleExample(bool isTileView) { length: 0.1) ), RadialAxis(axisLineStyle: AxisLineStyle(thicknessUnit: GaugeSizeUnit.factor, - thickness: 0.08, color: Color(0xFFFFCD60) + thickness: 0.08, color:const Color(0xFFFFCD60) ), startAngle: 270, endAngle: 270, @@ -228,17 +229,17 @@ SfRadialGauge getMultipleNeedleExample(bool isTileView) { length: 0.1), pointers: [ - NeedlePointer(value: 8, needleLength: 0.35, needleColor: Color(0xFFF67280), + NeedlePointer(value: 8, needleLength: 0.35, needleColor: const Color(0xFFF67280), lengthUnit: GaugeSizeUnit.factor, needleStartWidth: 0, needleEndWidth: isTileView ? 3 : 5, enableAnimation: true, knobStyle: KnobStyle(knobRadius: 0), animationType: AnimationType.ease), NeedlePointer(value: 3, needleLength: 0.85, lengthUnit: GaugeSizeUnit.factor, - needleColor: Color(0xFFF67280), + needleColor: const Color(0xFFF67280), needleStartWidth: 0, needleEndWidth: isTileView ? 3 : 5, enableAnimation: true, animationType: AnimationType.ease, - knobStyle: KnobStyle( borderColor: Color(0xFFF67280), + knobStyle: KnobStyle( borderColor: const Color(0xFFF67280), borderWidth: 0.015, color: Colors.white, sizeUnit: GaugeSizeUnit.factor, knobRadius: isTileView ? 0.04 : 0.05)), diff --git a/lib/samples/gauge/pointers/multiple_ranges.dart b/lib/samples/gauge/pointers/multiple_ranges.dart index 6cfee690..e1bc9c1a 100644 --- a/lib/samples/gauge/pointers/multiple_ranges.dart +++ b/lib/samples/gauge/pointers/multiple_ranges.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class MultipleRangePointerExample extends StatefulWidget { - final SubItemList sample; const MultipleRangePointerExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _MultipleRangePointerExampleState createState() => _MultipleRangePointerExampleState(sample); } class _MultipleRangePointerExampleState extends State { - final SubItemList sample; _MultipleRangePointerExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _MultipleRangePointerExampleState extends State( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _MultipleRangePointerExampleState extends State _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -199,7 +200,7 @@ SfRadialGauge getMultipleRangePointerExampleGauge(bool isTileView) { thickness: 0.15), annotations: [GaugeAnnotation(angle: 180, widget: Row(children: [Container( - child: Text('50', style: TextStyle(color: Color(0xFF00A8B5), + child: Text('50', style: TextStyle(color: const Color(0xFF00A8B5), fontFamily: 'Times', fontSize: isTileView ? 18 : 22, fontWeight: FontWeight.w400, fontStyle: FontStyle.italic ),), @@ -213,7 +214,7 @@ SfRadialGauge getMultipleRangePointerExampleGauge(bool isTileView) { pointers:[RangePointer(value: 50, cornerStyle: CornerStyle.bothCurve, enableAnimation: true, animationDuration: 1200, animationType: AnimationType.ease, sizeUnit: GaugeSizeUnit.factor, - color: Color(0xFF00A8B5), width: 0.15), + color: const Color(0xFF00A8B5), width: 0.15), ] ), ], diff --git a/lib/samples/gauge/pointers/radial_marker.dart b/lib/samples/gauge/pointers/radial_marker.dart index 01d2da45..1f68d27a 100644 --- a/lib/samples/gauge/pointers/radial_marker.dart +++ b/lib/samples/gauge/pointers/radial_marker.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialMarkerExample extends StatefulWidget { - final SubItemList sample; const RadialMarkerExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialMarkerExampleState createState() => _RadialMarkerExampleState(sample); } class _RadialMarkerExampleState extends State { - final SubItemList sample; _RadialMarkerExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialMarkerExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialMarkerExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialMarkerExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -195,7 +196,7 @@ SfRadialGauge getRadialMarkerExample(bool isTileView) { showLabels: false, showAxisLine: false, pointers: [MarkerPointer(value: 70, markerWidth: 20, markerHeight: 20, - color: Color(0xFFF67280), + color: const Color(0xFFF67280), markerType: MarkerType.invertedTriangle, markerOffset: -7 )], @@ -223,7 +224,7 @@ SfRadialGauge getRadialMarkerExample(bool isTileView) { ranges: [GaugeRange(startValue: 0, endValue: 100, sizeUnit: GaugeSizeUnit.factor, startWidth: 0.4, endWidth: 0.4, - color: Color(0xFF00A8B5), + color: const Color(0xFF00A8B5), )], showTicks: false), ], diff --git a/lib/samples/gauge/pointers/text_pointer.dart b/lib/samples/gauge/pointers/text_pointer.dart index f3b9f3b0..ed4ccfa9 100644 --- a/lib/samples/gauge/pointers/text_pointer.dart +++ b/lib/samples/gauge/pointers/text_pointer.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RadialTextPointer extends StatefulWidget { - final SubItemList sample; const RadialTextPointer(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RadialTextPointerState createState() => _RadialTextPointerState(sample); } class _RadialTextPointerState extends State { - final SubItemList sample; _RadialTextPointerState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RadialTextPointerState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RadialTextPointerState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RadialTextPointerState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -201,21 +202,21 @@ SfRadialGauge getRadialTextPointer(bool isTileView) { ranges:[ GaugeRange(startValue:0,endValue:20,startWidth:0.45,endWidth:0.45, sizeUnit: GaugeSizeUnit.factor, - color:Color(0xFFDD3800)), + color:const Color(0xFFDD3800)), GaugeRange(startValue:20.5,endValue:40,startWidth:0.45, sizeUnit: GaugeSizeUnit.factor, - endWidth:0.45,color:Color(0xFFFF4100)), + endWidth:0.45,color:const Color(0xFFFF4100)), GaugeRange(startValue:40.5,endValue:60,startWidth:0.45, sizeUnit: GaugeSizeUnit.factor, - endWidth:0.45,color:Color(0xFFFFBA00)), + endWidth:0.45,color:const Color(0xFFFFBA00)), GaugeRange(startValue:60.5,endValue:80,startWidth:0.45, sizeUnit: GaugeSizeUnit.factor, - endWidth:0.45,color:Color(0xFFFFDF10)), + endWidth:0.45,color:const Color(0xFFFFDF10)), GaugeRange(startValue:80.5,endValue:100, sizeUnit: GaugeSizeUnit.factor, - startWidth:0.45,endWidth:0.45,color:Color(0xFF8BE724)), + startWidth:0.45,endWidth:0.45,color:const Color(0xFF8BE724)), GaugeRange(startValue:100.5,endValue:120,startWidth:0.45,endWidth:0.45, sizeUnit: GaugeSizeUnit.factor, - color:Color(0xFF64BE00)), + color: const Color(0xFF64BE00)), ] diff --git a/lib/samples/gauge/ranges/multiple_ranges.dart b/lib/samples/gauge/ranges/multiple_ranges.dart index 02712d3e..e5a240b6 100644 --- a/lib/samples/gauge/ranges/multiple_ranges.dart +++ b/lib/samples/gauge/ranges/multiple_ranges.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class MultipleRangesExample extends StatefulWidget { - final SubItemList sample; const MultipleRangesExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _MultipleRangesExampleState createState() => _MultipleRangesExampleState(sample); } class _MultipleRangesExampleState extends State { - final SubItemList sample; _MultipleRangesExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _MultipleRangesExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _MultipleRangesExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,18 @@ class _MultipleRangesExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -102,7 +104,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +116,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +135,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +152,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -202,15 +204,15 @@ SfRadialGauge getMultipleRangesExampleGauge(bool isTileView) { ))], ranges: [ GaugeRange(startValue: 0, endValue: 18, sizeUnit: GaugeSizeUnit.factor, - startWidth: 0, endWidth: 0.1, color: Color(0xFFA8AAE2) ), + startWidth: 0, endWidth: 0.1, color: const Color(0xFFA8AAE2) ), GaugeRange(startValue: 20, endValue: 38, startWidth: 0.1, sizeUnit: GaugeSizeUnit.factor, - endWidth: 0.15, color: Color.fromRGBO(168, 170, 226, 1)), + endWidth: 0.15, color: const Color.fromRGBO(168, 170, 226, 1)), GaugeRange(startValue: 40, endValue: 58 ,startWidth: 0.15, sizeUnit: GaugeSizeUnit.factor, - endWidth: 0.2, color: Color(0xFF7B7DC7)), + endWidth: 0.2, color: const Color(0xFF7B7DC7)), GaugeRange(startValue: 60, endValue: 78, startWidth: 0.2, sizeUnit: GaugeSizeUnit.factor, - endWidth: 0.25, color: Color.fromRGBO(73, 76, 162, 1)), + endWidth: 0.25, color: const Color.fromRGBO(73, 76, 162, 1)), ] ), diff --git a/lib/samples/gauge/ranges/range_dataLabel.dart b/lib/samples/gauge/ranges/range_dataLabel.dart index 604d7f7a..1f6e4dd2 100644 --- a/lib/samples/gauge/ranges/range_dataLabel.dart +++ b/lib/samples/gauge/ranges/range_dataLabel.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeDataLabelExample extends StatefulWidget { - final SubItemList sample; const RangeDataLabelExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RangeDataLabelExampleState createState() => _RangeDataLabelExampleState(sample); } class _RangeDataLabelExampleState extends State { - final SubItemList sample; _RangeDataLabelExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RangeDataLabelExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RangeDataLabelExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RangeDataLabelExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -193,23 +194,23 @@ SfRadialGauge getRangeDataLabelExample(bool isTileView) { RadialAxis(showLabels: false, showAxisLine: false, showTicks: false, minimum: 0, maximum: 99, radiusFactor: 0.9, ranges: [GaugeRange(startValue: 0, endValue: 33, - color: Color(0xFFFE2A25), label: 'Slow', + color: const Color(0xFFFE2A25), label: 'Slow', sizeUnit: GaugeSizeUnit.factor, labelStyle: GaugeTextStyle(fontFamily: 'Times', fontSize: isTileView ? 16 : 20), startWidth: 0.65, endWidth: 0.65 ),GaugeRange(startValue: 33, endValue: 66, - color:Color(0xFFFFBA00), label: 'Moderate', + color: const Color(0xFFFFBA00), label: 'Moderate', labelStyle: GaugeTextStyle(fontFamily: 'Times', fontSize: isTileView ? 16 : 20), startWidth: 0.65, endWidth: 0.65, sizeUnit: GaugeSizeUnit.factor, ), GaugeRange(startValue: 66, endValue: 99, - color:Color(0xFF00AB47), label: 'Fast', + color: const Color(0xFF00AB47), label: 'Fast', labelStyle: GaugeTextStyle(fontFamily: 'Times', fontSize: isTileView ? 16 : 20), sizeUnit: GaugeSizeUnit.factor, startWidth: 0.65, endWidth: 0.65, ), GaugeRange(startValue: 0, endValue: 99, - color:Color.fromRGBO(155, 155, 155, 0.3), + color: const Color.fromRGBO(155, 155, 155, 0.3), rangeOffset: 0.5, sizeUnit: GaugeSizeUnit.factor, startWidth: 0.15, endWidth: 0.15, ), diff --git a/lib/samples/gauge/ranges/range_thickness.dart b/lib/samples/gauge/ranges/range_thickness.dart index e71e2796..ea13d4ab 100644 --- a/lib/samples/gauge/ranges/range_thickness.dart +++ b/lib/samples/gauge/ranges/range_thickness.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class RangeThicknessExample extends StatefulWidget { - final SubItemList sample; const RangeThicknessExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _RangeThicknessExampleState createState() => _RangeThicknessExampleState(sample); } class _RangeThicknessExampleState extends State { - final SubItemList sample; _RangeThicknessExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _RangeThicknessExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _RangeThicknessExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _RangeThicknessExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -208,7 +209,7 @@ SfRadialGauge getRangeThicknessExampleGauge(bool isTileView) { ))], ranges: [ GaugeRange(startValue: 30, endValue: 100, startWidth: 0.05, - color : Color(0xFF00A8B5), rangeOffset: 0.08, + color : const Color(0xFF00A8B5), rangeOffset: 0.08, endWidth: 0.2, sizeUnit: GaugeSizeUnit.factor) ] ), diff --git a/lib/samples/gauge/showcase/clock_sample.dart b/lib/samples/gauge/showcase/clock_sample.dart index c05b2e2e..d05807aa 100644 --- a/lib/samples/gauge/showcase/clock_sample.dart +++ b/lib/samples/gauge/showcase/clock_sample.dart @@ -7,18 +7,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class ClockExample extends StatefulWidget { - final SubItemList sample; const ClockExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _ClockExampleState createState() => _ClockExampleState(sample); } class _ClockExampleState extends State { - final SubItemList sample; _ClockExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -44,7 +44,7 @@ class _ClockExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -78,7 +78,7 @@ class _ClockExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -86,22 +86,23 @@ class _ClockExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { + _FrontPanelState(this.sample); final SubItemList sample; Timer timer; - _FrontPanelState(this.sample); @override void initState() { super.initState(); - this.timer = Timer.periodic(Duration(milliseconds: 1000), updateData); + timer = Timer.periodic(Duration(milliseconds: 1000), updateData); } void updateData(Timer timer){ @@ -132,7 +133,7 @@ class _FrontPanelState extends State { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -144,18 +145,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -163,15 +164,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -180,7 +181,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -249,7 +250,7 @@ SfRadialGauge getClockExample(bool isTileView) { NeedlePointer(value: 5, needleLength: 0.7, lengthUnit: GaugeSizeUnit.factor, - needleColor: Color(0xFF00A8B5), + needleColor: const Color(0xFF00A8B5), needleStartWidth: 0.5, needleEndWidth: 1, knobStyle: KnobStyle(knobRadius: 0,), @@ -283,7 +284,7 @@ SfRadialGauge getClockExample(bool isTileView) { NeedlePointer(value: 8, needleLength: 0.7, lengthUnit: GaugeSizeUnit.factor, - needleColor: Color(0xFF00A8B5), + needleColor: const Color(0xFF00A8B5), needleStartWidth: 0.5, needleEndWidth: 1, knobStyle: KnobStyle(knobRadius: 0), @@ -327,7 +328,7 @@ SfRadialGauge getClockExample(bool isTileView) { needleStartWidth: 0.5, needleEndWidth: 1.5, value: 2, - knobStyle: KnobStyle(color: Color(0xFF00A8B5), + knobStyle: KnobStyle(color: const Color(0xFF00A8B5), sizeUnit: GaugeSizeUnit.factor, knobRadius: 0.05), needleColor: _needleColor @@ -339,10 +340,10 @@ SfRadialGauge getClockExample(bool isTileView) { needleStartWidth: 0.8, needleEndWidth: 0.8, value: _value, - needleColor: Color(0xFF00A8B5), + needleColor: const Color(0xFF00A8B5), tailStyle: TailStyle(width: 0.8, length: 0.2, lengthUnit: GaugeSizeUnit.factor, - color: Color(0xFF00A8B5)), + color: const Color(0xFF00A8B5)), knobStyle: KnobStyle(knobRadius: 0.03, sizeUnit: GaugeSizeUnit.factor, color: Colors.white) diff --git a/lib/samples/gauge/showcase/distance_tracker.dart b/lib/samples/gauge/showcase/distance_tracker.dart index ed78abb8..b9599432 100644 --- a/lib/samples/gauge/showcase/distance_tracker.dart +++ b/lib/samples/gauge/showcase/distance_tracker.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class DistanceTrackerExample extends StatefulWidget { - final SubItemList sample; const DistanceTrackerExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _DistanceTrackerExampleState createState() => _DistanceTrackerExampleState(sample); } class _DistanceTrackerExampleState extends State { - final SubItemList sample; _DistanceTrackerExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _DistanceTrackerExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _DistanceTrackerExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,21 +85,22 @@ class _DistanceTrackerExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore:prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -111,18 +112,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore:prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -130,15 +131,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -147,7 +148,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -201,7 +202,7 @@ SfRadialGauge getDistanceTrackerExample(bool isTileView) { style: TextStyle(fontWeight: FontWeight.bold, fontStyle: FontStyle.italic, fontSize: isTileView ? 20 : 30 )), - Padding(padding: EdgeInsets.fromLTRB(0,2,0,0), + Padding(padding: const EdgeInsets.fromLTRB(0,2,0,0), child: Text('km/h', style: TextStyle(fontWeight: FontWeight.bold, fontStyle: FontStyle.italic, fontSize: isTileView ? 12 : 14 @@ -219,7 +220,7 @@ SfRadialGauge getDistanceTrackerExample(bool isTileView) { pointers: [RangePointer(value: 142, width: 17, pointerOffset: -2, enableAnimation: true, cornerStyle: CornerStyle.bothCurve, - color: Color(0xFFF67280), + color: const Color(0xFFF67280), )] ), diff --git a/lib/samples/gauge/showcase/gauge_overview.dart b/lib/samples/gauge/showcase/gauge_overview.dart index 8db39a0f..89c8b897 100644 --- a/lib/samples/gauge/showcase/gauge_overview.dart +++ b/lib/samples/gauge/showcase/gauge_overview.dart @@ -6,18 +6,18 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; class GaugeOverviewExample extends StatefulWidget { - final SubItemList sample; const GaugeOverviewExample(this.sample, {Key key}) : super(key: key); + final SubItemList sample; @override _GaugeOverviewExampleState createState() => _GaugeOverviewExampleState(sample); } class _GaugeOverviewExampleState extends State { - final SubItemList sample; _GaugeOverviewExampleState(this.sample); + final SubItemList sample; bool panelOpen; - final frontPanelVisible = ValueNotifier(true); + final ValueNotifier frontPanelVisible = ValueNotifier(true); @override void initState() { @@ -43,7 +43,7 @@ class _GaugeOverviewExampleState extends State { @override Widget build(BuildContext context) { return ScopedModelDescendant( - builder: (context, _, model) => SafeArea( + builder: (BuildContext context, _, SampleListModel model) => SafeArea( child: Backdrop( needCloseButton: false, panelVisible: frontPanelVisible, @@ -77,7 +77,7 @@ class _GaugeOverviewExampleState extends State { headerClosingHeight: 350, titleVisibleOnPanelClosed: true, color: model.cardThemeColor, - borderRadius: BorderRadius.vertical( + borderRadius: const BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), )); @@ -85,16 +85,17 @@ class _GaugeOverviewExampleState extends State { } class FrontPanel extends StatefulWidget { - final SubItemList subItemList; + //ignore: prefer_const_constructors_in_immutables FrontPanel(this.subItemList); + final SubItemList subItemList; @override - _FrontPanelState createState() => _FrontPanelState(this.subItemList); + _FrontPanelState createState() => _FrontPanelState(subItemList); } class _FrontPanelState extends State { - final SubItemList sample; _FrontPanelState(this.sample); + final SubItemList sample; @override Widget build(BuildContext context) { setState((){ @@ -102,7 +103,7 @@ class _FrontPanelState extends State { }); return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Scaffold( backgroundColor: model.cardThemeColor, body: Padding( @@ -114,18 +115,18 @@ class _FrontPanelState extends State { } class BackPanel extends StatefulWidget { - final SubItemList sample; - + //ignore: prefer_const_constructors_in_immutables BackPanel(this.sample); + final SubItemList sample; @override _BackPanelState createState() => _BackPanelState(sample); } class _BackPanelState extends State { - final SubItemList sample; - GlobalKey _globalKey = GlobalKey(); _BackPanelState(this.sample); + final SubItemList sample; + final GlobalKey _globalKey = GlobalKey(); @override void initState() { @@ -133,15 +134,15 @@ class _BackPanelState extends State { super.initState(); } - _afterLayout(_) { + void _afterLayout(dynamic _) { _getSizesAndPosition(); } - _getSizesAndPosition() { + void _getSizesAndPosition() { final RenderBox renderBoxRed = _globalKey.currentContext.findRenderObject(); - final size = renderBoxRed.size; - final position = renderBoxRed.localToGlobal(Offset.zero); - double appbarHeight = 60; + final Size size = renderBoxRed.size; + final Offset position = renderBoxRed.localToGlobal(Offset.zero); + const double appbarHeight = 60; BackdropState.frontPanelHeight = position.dy + (size.height - appbarHeight) + 20; } @@ -150,7 +151,7 @@ class _BackPanelState extends State { Widget build(BuildContext context) { return ScopedModelDescendant( rebuildOnChange: true, - builder: (context, _, model) { + builder: (BuildContext context, _, SampleListModel model) { return Container( color: model.backgroundColor, child: Padding( @@ -208,40 +209,40 @@ SfRadialGauge getGaugeOverviewExample(bool isTileView) { startWidth: 0.265, sizeUnit: GaugeSizeUnit.factor, endWidth: 0.265, - color: Color.fromRGBO(34,144,199, 0.75)), + color: const Color.fromRGBO(34,144,199, 0.75)), GaugeRange(startValue: 0, endValue: 10, startWidth: 0.265, sizeUnit: GaugeSizeUnit.factor, endWidth: 0.265, - color: Color.fromRGBO(34,195,199, 0.75)), + color: const Color.fromRGBO(34,195,199, 0.75)), GaugeRange(startValue: 10, endValue: 30, startWidth: 0.265, sizeUnit: GaugeSizeUnit.factor, endWidth: 0.265, - color: Color.fromRGBO(123,199,34, 0.75)), + color: const Color.fromRGBO(123,199,34, 0.75)), GaugeRange(startValue: 30, endValue: 40, startWidth: 0.265, sizeUnit: GaugeSizeUnit.factor, endWidth: 0.265, - color: Color.fromRGBO(238,193,34, 0.75)), + color: const Color.fromRGBO(238,193,34, 0.75)), GaugeRange(startValue: 40, endValue: 150, startWidth: 0.265, sizeUnit: GaugeSizeUnit.factor, endWidth: 0.265, - color: Color.fromRGBO(238,79,34, 0.65)), + color: const Color.fromRGBO(238,79,34, 0.65)), ], annotations: [ GaugeAnnotation(angle: 90, positionFactor: 0.35, - widget: Container(child: Text( - 'Temp.°C', style: TextStyle(color: Color(0xFFF8B195), + widget: Container(child: const Text( + 'Temp.°C', style: TextStyle(color: Color(0xFFF8B195), fontSize: 16)))), GaugeAnnotation(angle: 90, positionFactor: 0.8, widget: Container( - child: Text(' 22.5 ', style: TextStyle( + child: const Text(' 22.5 ', style: TextStyle( fontWeight: FontWeight.bold, fontSize: 20),), ) @@ -259,14 +260,14 @@ SfRadialGauge getGaugeOverviewExample(bool isTileView) { animationDuration: 1200, knobStyle: KnobStyle(knobRadius: isTileView ? 0.06 : 0.09, sizeUnit: GaugeSizeUnit.factor, - borderColor: Color(0xFFF8B195), + borderColor: const Color(0xFFF8B195), color: Colors.white, borderWidth: isTileView ? 0.035 : 0.05), - tailStyle: TailStyle(color: Color(0xFFF8B195), + tailStyle: TailStyle(color: const Color(0xFFF8B195), width:isTileView ? 4 : 8, lengthUnit: GaugeSizeUnit.factor, length: isTileView ? 0.15 : 0.2), - needleColor: Color(0xFFF8B195),) + needleColor: const Color(0xFFF8B195),) ], axisLabelStyle: GaugeTextStyle(fontSize: isTileView ? 10 : 12), majorTickStyle: MajorTickStyle( diff --git a/lib/widgets/animateOpacityWidget.dart b/lib/widgets/animateOpacityWidget.dart index 0d15ccb7..439e57bd 100755 --- a/lib/widgets/animateOpacityWidget.dart +++ b/lib/widgets/animateOpacityWidget.dart @@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; class AnimateOpacityWidget extends StatefulWidget { + // ignore: prefer_const_constructors_in_immutables AnimateOpacityWidget( {@required this.opacity, @required this.child, this.controller}); @@ -24,8 +25,8 @@ class AnimateOpacityWidgetState extends State { super.initState(); } - onScroll() { - var opacity = widget.controller.offset * 0.01; + void onScroll() { + final num opacity = widget.controller.offset * 0.01; if (opacity >= 0 && opacity <= 1) { setState(() { _opacity = opacity; diff --git a/lib/widgets/bottom_sheet.dart b/lib/widgets/bottom_sheet.dart index 9eaecea7..d479c998 100755 --- a/lib/widgets/bottom_sheet.dart +++ b/lib/widgets/bottom_sheet.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; Future showRoundedModalBottomSheet({ @required BuildContext context, @required WidgetBuilder builder, - Color color: Colors.white, - double radius: 10.0, - bool autoResize: true, - bool dismissOnTap: true, + Color color = Colors.white, + double radius = 10.0, + bool autoResize = true, + bool dismissOnTap = true, }) { assert(context != null); assert(builder != null); @@ -25,7 +25,7 @@ Future showRoundedModalBottomSheet({ ); } -const Duration _kRoundedBottomSheetDuration = const Duration(milliseconds: 300); +const Duration _kRoundedBottomSheetDuration = Duration(milliseconds: 300); const double _kMinFlingVelocity = 600.0; const double _kCloseProgressThreshold = 0.5; @@ -83,19 +83,23 @@ class _CustomBottomSheetState extends State { widget.animationController.status == AnimationStatus.reverse; void _handleDragUpdate(DragUpdateDetails details) { - if (_dismissUnderway) return; + if (_dismissUnderway) + return; widget.animationController.value -= details.primaryDelta / (_childHeight ?? details.primaryDelta); } void _handleDragEnd(DragEndDetails details) { - if (_dismissUnderway) return; + if (_dismissUnderway) + return; if (details.velocity.pixelsPerSecond.dy > _kMinFlingVelocity) { final double flingVelocity = -details.velocity.pixelsPerSecond.dy / _childHeight; if (widget.animationController.value > 0.0) widget.animationController.fling(velocity: flingVelocity); - if (flingVelocity < 0.0) widget.onClosing(); + if (flingVelocity < 0.0) { + widget.onClosing(); + } } else if (widget.animationController.value < _kCloseProgressThreshold) { if (widget.animationController.value > 0.0) widget.animationController.fling(velocity: -1.0); @@ -151,8 +155,8 @@ class RoundedCornerModalRoute extends PopupRoute { this.barrierLabel, this.color, this.radius, - this.autoResize: false, - this.dismissOnTap: true, + this.autoResize = false, + this.dismissOnTap = true, RouteSettings settings, }) : super(settings: settings); @@ -226,7 +230,7 @@ class _RoundedModalBottomSheetState return GestureDetector( child: AnimatedBuilder( animation: widget.route.animation, - builder: (context, child) => CustomSingleChildLayout( + builder: (BuildContext context, Widget child) => CustomSingleChildLayout( delegate: _RoundedModalBottomSheetLayout( widget.route.autoResize ? MediaQuery.of(context).viewInsets.bottom @@ -235,7 +239,7 @@ class _RoundedModalBottomSheetState child: CustomBottomSheet( animationController: widget.route.animationController, onClosing: () => Navigator.pop(context), - builder: (context) => Container( + builder: (BuildContext context) => Container( decoration: BoxDecoration( color: widget.route.color, borderRadius: BorderRadius.only( diff --git a/lib/widgets/checkbox.dart b/lib/widgets/checkbox.dart index 1bd423ae..a314fa98 100755 --- a/lib/widgets/checkbox.dart +++ b/lib/widgets/checkbox.dart @@ -3,13 +3,14 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; class BottomSheetCheckbox extends StatefulWidget { + // ignore: prefer_const_constructors_in_immutables BottomSheetCheckbox( {@required this.switchValue, @required this.valueChanged, this.activeColor}); final bool switchValue; - final ValueChanged valueChanged; + final ValueChanged valueChanged; final Color activeColor; @override diff --git a/lib/widgets/customDropDown.dart b/lib/widgets/customDropDown.dart index 04473420..881d33c8 100755 --- a/lib/widgets/customDropDown.dart +++ b/lib/widgets/customDropDown.dart @@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; class DropDown extends StatefulWidget { + // ignore: prefer_const_constructors_in_immutables DropDown({@required this.value, @required this.valueChanged, this.item}); final String value; diff --git a/lib/widgets/custom_button.dart b/lib/widgets/custom_button.dart index 479a20b3..b28e5dbf 100755 --- a/lib/widgets/custom_button.dart +++ b/lib/widgets/custom_button.dart @@ -3,7 +3,9 @@ library button_picker; import 'package:flutter/material.dart'; class CustomButton extends StatefulWidget { + // ignore: prefer_const_constructors_in_immutables CustomButton({ + // ignore: avoid_unused_constructor_parameters Key key, @required this.minValue, @required this.maxValue, @@ -84,7 +86,7 @@ class _CustomButton extends State { if (widget.loop) { setState(() { /// Calculate the correct value if you go over maxValue in a loop - double diff = (_counter + widget.step) - widget.maxValue; + final num diff = (_counter + widget.step) - widget.maxValue; _counter = diff >= 1 ? widget.minValue + diff - 1 : widget.minValue; }); } @@ -95,7 +97,7 @@ class _CustomButton extends State { if (_counter - widget.step < widget.minValue) { if (widget.loop) { setState(() { - double diff = widget.minValue - (_counter - widget.step); + final num diff = widget.minValue - (_counter - widget.step); _counter = diff >= 1 ? widget.maxValue - diff + 1 : widget.maxValue; }); } diff --git a/lib/widgets/flutter_backdrop.dart b/lib/widgets/flutter_backdrop.dart index 867a4b14..145781b2 100755 --- a/lib/widgets/flutter_backdrop.dart +++ b/lib/widgets/flutter_backdrop.dart @@ -1,11 +1,47 @@ +import 'dart:math' as math; import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; -import 'dart:math' as math; -const _flingVelocity = 2.0; +const num _flingVelocity = 2.0; // ignore: must_be_immutable class Backdrop extends StatefulWidget { + Backdrop({ + this.needCloseButton = true, + this.enableBackPanelAnimation = false, + this.frontPanelOpenPercentage = 0.3, + this.sampleListModel, + @required this.frontLayer, + @required this.backLayer, + @required this.sideDrawer, + this.frontHeader, + this.borderRadius, + this.shape, + this.frontHeaderHeight = 20.0, + this.headerClosingHeight, + this.titleVisibleOnPanelClosed = true, + this.frontPanelPadding = EdgeInsets.zero, + this.toggleFrontLayer = true, + this.color, + + //--------Appbar properties------------ + this.appBarLeadingMenuIcon, + this.appBarAnimatedLeadingMenuIcon, + this.appBarAutomaticallyImplyLeading = true, + this.appBarTitle, + this.appBarActions, + this.appBarBackgroundColor, + this.appBarIconTheme, + this.appBarTextTheme, + this.appBarCenterTitle, + this.appBarTitleSpacing = NavigationToolbar.kMiddleSpacing, + this.panelVisible, + }) : assert(frontLayer != null), + assert(frontHeaderHeight > 0.0 || + (appBarLeadingMenuIcon != null || + appBarAnimatedLeadingMenuIcon != null)), + assert(backLayer != null); + //----------------------Front and Back Panel properties----------------------- /// This is the front panel which will contain the main body. @@ -143,63 +179,30 @@ class Backdrop extends StatefulWidget { final bool needCloseButton; - Backdrop({ - this.needCloseButton = true, - this.enableBackPanelAnimation = false, - this.frontPanelOpenPercentage = 0.3, - this.sampleListModel, - @required this.frontLayer, - @required this.backLayer, - @required this.sideDrawer, - this.frontHeader, - this.borderRadius, - this.shape, - this.frontHeaderHeight = 20.0, - this.headerClosingHeight, - this.titleVisibleOnPanelClosed = true, - this.frontPanelPadding = EdgeInsets.zero, - this.toggleFrontLayer = true, - this.color, - - //--------Appbar properties------------ - this.appBarLeadingMenuIcon, - this.appBarAnimatedLeadingMenuIcon, - this.appBarAutomaticallyImplyLeading = true, - this.appBarTitle, - this.appBarActions, - this.appBarBackgroundColor, - this.appBarIconTheme, - this.appBarTextTheme, - this.appBarCenterTitle, - this.appBarTitleSpacing = NavigationToolbar.kMiddleSpacing, - this.panelVisible, - }) : assert(frontLayer != null), - assert(frontHeaderHeight > 0.0 || - (appBarLeadingMenuIcon != null || - appBarAnimatedLeadingMenuIcon != null)), - assert(backLayer != null); - @override BackdropState createState() => BackdropState(controller, sampleListModel); } class BackdropState extends State with SingleTickerProviderStateMixin { - static double frontPanelHeight = 0; - bool panelVisible; - final _backDropKey = GlobalKey(debugLabel: 'Backdrop'); - bool test; - AnimationController controller; - GlobalKey _scaffoldKey = GlobalKey(debugLabel: 'Scaffold'); - SampleListModel sampleListModel; - BackdropState( AnimationController _controller, SampleListModel _sampleListModel, {this.test = false}) { + // ignore: prefer_initializing_formals controller = _controller; + // ignore: prefer_initializing_formals sampleListModel = _sampleListModel; } + static double frontPanelHeight = 0; + bool panelVisible; + final dynamic _backDropKey = GlobalKey(debugLabel: 'Backdrop'); + bool test; + AnimationController controller; + final GlobalKey _scaffoldKey = + GlobalKey(debugLabel: 'Scaffold'); + SampleListModel sampleListModel; + @override void initState() { super.initState(); @@ -208,10 +211,12 @@ class BackdropState extends State vsync: this, duration: Duration(milliseconds: 100), value: (widget.panelVisible?.value ?? true) ? 1.0 : 0.0) - ..addStatusListener((status) { + ..addStatusListener((AnimationStatus status) { if (status == AnimationStatus.completed) panelVisible = true; - else if (status == AnimationStatus.dismissed) panelVisible = false; + else if (status == AnimationStatus.dismissed) { + panelVisible = false; + } }) ..addListener(() { setState(() {}); @@ -221,7 +226,7 @@ class BackdropState extends State // Ensure that the value notifier is updated when the panel is opened or closed if (widget.panelVisible != null) { - controller.addStatusListener((status) { + controller.addStatusListener((AnimationStatus status) { if (status == AnimationStatus.completed) widget.panelVisible.value = true; else if (status == AnimationStatus.dismissed) @@ -259,7 +264,8 @@ class BackdropState extends State void _handleDragEnd(DragEndDetails details) { if (controller.isAnimating || - controller.status == AnimationStatus.completed) return; + controller.status == AnimationStatus.completed) + return; final double fVelocity = details.velocity.pixelsPerSecond.dy / _backdropHeight; @@ -297,7 +303,7 @@ class BackdropState extends State ]; } - Widget res = CrossFadeTransition( + final Widget res = CrossFadeTransition( progress: controller, alignment: AlignmentDirectional.centerStart, child0: @@ -318,17 +324,17 @@ class BackdropState extends State return toolBarWidgets; } - Size panelSize = Size(0, 0); + Size panelSize = const Size(0, 0); @override Widget build(BuildContext context) { return LayoutBuilder( - builder: (context, constraints) { + builder: (BuildContext context, BoxConstraints constraints) { panelSize = constraints.biggest; double closedPercentage = 0; double closedPercentageSearch = 0; if (widget.enableBackPanelAnimation) { closedPercentage = widget.titleVisibleOnPanelClosed - ? (panelSize.height - (panelSize.height - (frontPanelHeight))) / + ? (panelSize.height - (panelSize.height - frontPanelHeight)) / panelSize.height : 1.0; @@ -338,11 +344,11 @@ class BackdropState extends State : 1.0; } else { closedPercentage = - (panelSize.height - (panelSize.height - (frontPanelHeight))) / + (panelSize.height - (panelSize.height - frontPanelHeight)) / panelSize.height; closedPercentageSearch = 0.0; } - final panelDetailsPosition = Tween( + final Animation panelDetailsPosition = Tween( begin: Offset(0.0, closedPercentage), end: Offset(0.0, closedPercentageSearch)) .animate(controller.view); @@ -362,7 +368,7 @@ class BackdropState extends State alignment: AlignmentDirectional.centerStart, child0: Semantics(namesRoute: true, child: widget.appBarTitle), - child1: Semantics(namesRoute: true, child: Text('')), + child1: Semantics(namesRoute: true, child: const Text('')), ), actions: appBarMenuButton(controller), elevation: 0.0, @@ -411,7 +417,7 @@ class BackdropState extends State double _getParallax() { if (widget.enableBackPanelAnimation) { - return -controller.value * (frontPanelHeight) * 0.5; + return -controller.value * frontPanelHeight * 0.5; } else { return 0; } @@ -476,17 +482,6 @@ class CrossFadeTransition extends AnimatedWidget { } class BackdropPanel extends StatelessWidget { - final VoidCallback onTap; - final GestureDragUpdateCallback onVerticalDragUpdate; - final GestureDragEndCallback onVerticalDragEnd; - final Widget frontHeader; - final Widget child; - final BorderRadius borderRadius; - final ShapeBorder shape; - final double frontHeaderHeight; - final EdgeInsets padding; - final Color color; - const BackdropPanel({ Key key, this.onTap, @@ -501,6 +496,17 @@ class BackdropPanel extends StatelessWidget { this.color, }) : super(key: key); + final VoidCallback onTap; + final GestureDragUpdateCallback onVerticalDragUpdate; + final GestureDragEndCallback onVerticalDragEnd; + final Widget frontHeader; + final Widget child; + final BorderRadius borderRadius; + final ShapeBorder shape; + final double frontHeaderHeight; + final EdgeInsets padding; + final Color color; + @override Widget build(BuildContext context) { return Padding( diff --git a/lib/widgets/render.dart b/lib/widgets/render.dart index 4a8364f7..0345813a 100755 --- a/lib/widgets/render.dart +++ b/lib/widgets/render.dart @@ -1,33 +1,35 @@ +import 'dart:math' show min, max; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart'; -import 'dart:math' show min, max; - +//ignore: prefer_generic_function_type_aliases typedef void RenderCustomListViewCallback(double stuckAmount); class CustomListViewRenderer extends RenderBox with ContainerRenderObjectMixin, RenderBoxContainerDefaultsMixin { - RenderCustomListViewCallback _callback; - ScrollableState _scrollable; - bool _overlapHeaders; - CustomListViewRenderer({ @required ScrollableState scrollable, RenderCustomListViewCallback callback, - bool overlapHeaders: false, + bool overlapHeaders = false, RenderBox header, RenderBox content, }) : assert(scrollable != null), _scrollable = scrollable, _callback = callback, _overlapHeaders = overlapHeaders { - if (content != null) add(content); - if (header != null) add(header); + if (content != null) + add(content); + if (header != null) + add(header); } + RenderCustomListViewCallback _callback; + ScrollableState _scrollable; + bool _overlapHeaders; + set scrollable(ScrollableState newValue) { assert(newValue != null); if (_scrollable == newValue) { @@ -81,48 +83,48 @@ class CustomListViewRenderer extends RenderBox assert(childCount == 2); // layout both header and content widget - final childConstraints = constraints.loosen(); + final BoxConstraints childConstraints = constraints.loosen(); _headerBox.layout(childConstraints, parentUsesSize: true); _contentBox.layout(childConstraints, parentUsesSize: true); - final headerHeight = _headerBox.size.height; - final contentHeight = _contentBox.size.height; + final num headerHeight = _headerBox.size.height; + final num contentHeight = _contentBox.size.height; // determine size of ourselves based on content widget - final width = max(constraints.minWidth, _contentBox.size.width); - final height = max(constraints.minHeight, + final num width = max(constraints.minWidth, _contentBox.size.width); + final num height = max(constraints.minHeight, _overlapHeaders ? contentHeight : headerHeight + contentHeight); - size = new Size(width, height); + size = Size(width, height); assert(size.width == constraints.constrainWidth(width)); assert(size.height == constraints.constrainHeight(height)); assert(size.isFinite); // place content underneath header - final contentParentData = - _contentBox.parentData as MultiChildLayoutParentData; + final MultiChildLayoutParentData contentParentData = + _contentBox.parentData; contentParentData.offset = - new Offset(0.0, _overlapHeaders ? 0.0 : headerHeight); + Offset(0.0, _overlapHeaders ? 0.0 : headerHeight); // determine by how much the header should be stuck to the top final double stuckOffset = determineStuckOffset(); // place header over content relative to scroll offset final double maxOffset = height - headerHeight; - final headerParentData = - _headerBox.parentData as MultiChildLayoutParentData; + final MultiChildLayoutParentData headerParentData = + _headerBox.parentData; headerParentData.offset = - new Offset(0.0, max(0.0, min(-stuckOffset, maxOffset))); + Offset(0.0, max(0.0, min(-stuckOffset, maxOffset))); // report to widget how much the header is stuck. if (_callback != null) { - final stuckAmount = + final num stuckAmount = max(min(headerHeight, stuckOffset), -headerHeight) / headerHeight; _callback(stuckAmount); } } double determineStuckOffset() { - final scrollBox = _scrollable.context.findRenderObject(); + final RenderObject scrollBox = _scrollable.context.findRenderObject(); if (scrollBox?.attached ?? false) { try { return localToGlobal(Offset.zero, ancestor: scrollBox).dy; @@ -137,7 +139,7 @@ class CustomListViewRenderer extends RenderBox void setupParentData(RenderObject child) { super.setupParentData(child); if (child.parentData is! MultiChildLayoutParentData) { - child.parentData = new MultiChildLayoutParentData(); + child.parentData = MultiChildLayoutParentData(); } } diff --git a/lib/widgets/search_bar.dart b/lib/widgets/search_bar.dart index 4bc8d921..55a43c6a 100755 --- a/lib/widgets/search_bar.dart +++ b/lib/widgets/search_bar.dart @@ -2,17 +2,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_examples/model/model.dart'; class SearchBar extends StatefulWidget { + //ignore: prefer_const_constructors_in_immutables SearchBar({Key key, this.sampleListModel}) : super(key: key); final SampleListModel sampleListModel; @override - _SearchBarState createState() => new _SearchBarState(sampleListModel); + _SearchBarState createState() => _SearchBarState(sampleListModel); } class _SearchBarState extends State with WidgetsBindingObserver { - final SampleListModel sampleListModel; - _SearchBarState(this.sampleListModel); + + final SampleListModel sampleListModel; TextEditingController editingController = TextEditingController(); @@ -20,7 +21,8 @@ class _SearchBarState extends State with WidgetsBindingObserver { List duplicateSampleItems; - var items = List(); + //ignore: prefer_collection_literals + List items = List(); Widget searchIcon = Icon(Icons.search, color: Colors.grey); final FocusNode _isFocus = FocusNode(); bool isOpen = false; @@ -52,25 +54,28 @@ class _SearchBarState extends State with WidgetsBindingObserver { } void filterSearchResults(String query) { - List dummySearchControlList = List(); + // ignore: prefer_collection_literals + final List dummySearchControlList = List(); dummySearchControlList.addAll(duplicateControlItems); - List dummySearchSamplesList = List(); + // ignore: prefer_collection_literals + final List dummySearchSamplesList = List(); dummySearchSamplesList.addAll(duplicateSampleItems); if (query.isNotEmpty) { searchIcon = null; - List dummyControlListData = List(); + // ignore: prefer_collection_literals + final List dummyControlListData = List(); for (int i = 0; i < dummySearchControlList.length; i++) { - var item = dummySearchControlList[i]; + final SampleList item = dummySearchControlList[i]; if (item.title.toLowerCase().contains(query.toLowerCase())) { dummyControlListData.add(item); } } - - List dummySampleListData = List(); + // ignore: prefer_collection_literals + final List dummySampleListData = List(); for (int i = 0; i < dummySearchSamplesList.length; i++) { - var item = dummySearchSamplesList[i]; + final SubItemList item = dummySearchSamplesList[i]; if (item.title.toLowerCase().contains(query.toLowerCase())) { dummySampleListData.add(item); } @@ -103,13 +108,13 @@ class _SearchBarState extends State with WidgetsBindingObserver { width: double.infinity, decoration: BoxDecoration( color: sampleListModel.searchBoxColor, - borderRadius: BorderRadius.all(Radius.circular(5.0))), + borderRadius: const BorderRadius.all(Radius.circular(5.0))), child: Padding( padding: const EdgeInsets.fromLTRB(10, 0, 0, 0), child: Container( child: TextField( focusNode: _isFocus, - onChanged: (value) { + onChanged: (String value) { filterSearchResults(value); }, onEditingComplete: () { @@ -117,8 +122,8 @@ class _SearchBarState extends State with WidgetsBindingObserver { }, controller: editingController, decoration: InputDecoration( - labelStyle: TextStyle(fontFamily: 'MontserratMedium'), - hintText: "Search", + labelStyle:const TextStyle(fontFamily: 'MontserratMedium'), + hintText: 'Search', border: InputBorder.none, hintStyle: TextStyle( fontSize: 15, diff --git a/lib/widgets/switch.dart b/lib/widgets/switch.dart index 30cd5bb1..2b32760f 100755 --- a/lib/widgets/switch.dart +++ b/lib/widgets/switch.dart @@ -3,13 +3,14 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; class BottomSheetSwitch extends StatefulWidget { + // ignore: prefer_const_constructors_in_immutables BottomSheetSwitch( {@required this.switchValue, @required this.valueChanged, this.activeColor}); final bool switchValue; - final ValueChanged valueChanged; + final ValueChanged valueChanged; final Color activeColor; @override diff --git a/lib/widgets/widget.dart b/lib/widgets/widget.dart index 036af565..90f29260 100755 --- a/lib/widgets/widget.dart +++ b/lib/widgets/widget.dart @@ -2,20 +2,21 @@ import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; import './render.dart'; +//ignore: prefer_generic_function_type_aliases typedef Widget StickyHeaderWidgetBuilder( BuildContext context, double stuckAmount); class CustomListView extends MultiChildRenderObjectWidget { - /// Constructs a new [CustomListView] widget. + /// Constructs a [CustomListView] widget. CustomListView({ Key key, @required this.header, @required this.content, - this.overlapHeaders: false, + this.overlapHeaders = false, this.callback, }) : super( key: key, - children: [content, header], + children: [content, header], ); /// Header to be shown at the top of the parent [Scrollable] content. @@ -33,12 +34,12 @@ class CustomListView extends MultiChildRenderObjectWidget { @override CustomListViewRenderer createRenderObject(BuildContext context) { - var scrollable = Scrollable.of(context); + final ScrollableState scrollable = Scrollable.of(context); assert(scrollable != null); - return new CustomListViewRenderer( + return CustomListViewRenderer( scrollable: scrollable, - callback: this.callback, - overlapHeaders: this.overlapHeaders, + callback: callback, + overlapHeaders: overlapHeaders, ); } @@ -47,8 +48,8 @@ class CustomListView extends MultiChildRenderObjectWidget { BuildContext context, CustomListViewRenderer renderObject) { renderObject ..scrollable = Scrollable.of(context) - ..callback = this.callback - ..overlapHeaders = this.overlapHeaders; + ..callback = callback + ..overlapHeaders = overlapHeaders; } } @@ -60,12 +61,12 @@ class CustomListView extends MultiChildRenderObjectWidget { /// Place this widget inside a [ListView], [GridView], [CustomScrollView], [SingleChildScrollView] or similar. /// class CustomListViewBuilder extends StatefulWidget { - /// Constructs a new [CustomListViewBuilder] widget. + /// Constructs a [CustomListViewBuilder] widget. const CustomListViewBuilder({ Key key, @required this.builder, this.content, - this.overlapHeaders: false, + this.overlapHeaders = false, }) : super(key: key); /// Called when the sticky amount changes for the header. @@ -80,7 +81,7 @@ class CustomListViewBuilder extends StatefulWidget { @override _CustomListViewBuilderState createState() => - new _CustomListViewBuilderState(); + _CustomListViewBuilderState(); } class _CustomListViewBuilderState extends State { @@ -88,10 +89,10 @@ class _CustomListViewBuilderState extends State { @override Widget build(BuildContext context) { - return new CustomListView( + return CustomListView( overlapHeaders: widget.overlapHeaders, - header: new LayoutBuilder( - builder: (context, _) => widget.builder(context, _stuckAmount ?? 0.0), + header: LayoutBuilder( + builder: (BuildContext context, _) => widget.builder(context, _stuckAmount ?? 0.0), ), content: widget.content, callback: (double stuckAmount) {