Merge pull request #740 from LokeshPalani/master

FLUT-7280- [Others] Moved the source file to master

Author: LavanyaA

lib/model/sample_view.dart

@@ -193,11 +193,6 @@ class DirectionalitySampleViewState<T extends DirectionalitySampleView>
     TextDirection.rtl,
   ];
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   /// Must call super.
   @override
   void dispose() {

lib/samples/chart/cartesian_charts/user_interactions/events/events.dart

@@ -198,8 +198,7 @@ class _EventsState extends SampleViewState {
       },
       onMarkerRender: (MarkerRenderArgs args) {
         if (!isCardView) {
-          actionsList.insert(
-              0, 'Marker (${args.pointIndex.toString()}) was rendered');
+          actionsList.insert(0, 'Marker (${args.pointIndex}) was rendered');
           if (args.pointIndex == 5) {
             SchedulerBinding.instance.addPostFrameCallback((_) {
               (consoleKey.currentState)?.setState(() {});
@@ -268,8 +267,7 @@ class _EventsState extends SampleViewState {
       ColumnSeries<ChartSampleData, String>(
         onPointTap: (ChartPointDetails args) {
           if (!isCardView) {
-            actionsList.insert(
-                0, 'Point (${args.pointIndex.toString()}) was tapped');
+            actionsList.insert(0, 'Point (${args.pointIndex}) was tapped');
             (consoleKey.currentState)?.setState(() {});
           }
         },

lib/samples/chart/cartesian_charts/user_interactions/trackball/customized_trackball.dart

@@ -285,7 +285,7 @@ class _TrackballTemplateState extends SampleViewState {
       for (int i = 0; i < seriesIndices.length; i++) {
         columnChildWidgets.children.add(
           Text(
-              '${trackballDetails.groupingModeInfo!.visibleSeriesList[i].name.toString()} : \$${trackballDetails.groupingModeInfo!.points[i].y.toString()}',
+              '${trackballDetails.groupingModeInfo!.visibleSeriesList[i].name} : \$${trackballDetails.groupingModeInfo!.points[i].y}',
               textAlign: TextAlign.left,
               style: _getTrackballTextStyle()),
         );
@@ -294,8 +294,7 @@ class _TrackballTemplateState extends SampleViewState {
     } else {
       columnWidgets.children.add(Text(trackballDetails.point!.x.toString(),
           style: _getTrackballTextStyle()));
-      columnWidgets.children.add(Text(
-          '\$${trackballDetails.point!.y.toString()}',
+      columnWidgets.children.add(Text('\$${trackballDetails.point!.y}',
           style: TextStyle(
               fontWeight: FontWeight.bold,
               color: model.themeData.colorScheme.brightness == Brightness.dark

lib/samples/datagrid/columns/datagrid_custom_header.dart

@@ -132,7 +132,7 @@ class _CustomHeaderDataGridState extends SampleViewState {
   void buildShowMenu(BuildContext context, DataGridCellTapDetails details) {
     const double rowHeight = 56.0;
     final RenderBox renderBox =
-        Overlay.of(context)!.context.findRenderObject()! as RenderBox;
+        Overlay.of(context).context.findRenderObject()! as RenderBox;
     final Offset newPosition = renderBox.globalToLocal(details.globalPosition);
     final double dx = newPosition.dx - details.localPosition.dx;
     final double dy = newPosition.dy - details.localPosition.dy + rowHeight;

lib/samples/date_picker/date_picker_getting_started.dart

@@ -733,7 +733,7 @@ class _DateRangePickerOptionState extends State<_DateRangePickerOption> {
           child: Text(DateFormat('MM-dd-yyyy').format(_date),
               style: TextStyle(
                   fontSize: 15,
-                  color: theme.textTheme.subtitle2?.color,
+                  color: theme.textTheme.titleSmall?.color,
                   fontWeight: FontWeight.w600)),
         ));
   }

lib/samples/date_picker/hijri_calendar.dart

@@ -704,7 +704,7 @@ class _DateRangePickerOptionState extends State<_DateRangePickerOption> {
                     _date.year.toString(),
                 style: TextStyle(
                     fontSize: 15,
-                    color: theme.textTheme.subtitle2?.color,
+                    color: theme.textTheme.titleSmall?.color,
                     fontWeight: FontWeight.w600))));
   }
 }

lib/samples/maps/directionality.dart

@@ -193,7 +193,7 @@ class _MapsWithDirectionalityState extends DirectionalitySampleViewState {
               child: Align(
                   child: Text(_title,
                       textDirection: TextDirection.rtl,
-                      style: Theme.of(context).textTheme.subtitle1))),
+                      style: Theme.of(context).textTheme.titleMedium))),
           Expanded(
             child: SfMaps(
               layers: <MapLayer>[
@@ -224,7 +224,8 @@ class _MapsWithDirectionalityState extends DirectionalitySampleViewState {
                                   text: model.locale == const Locale('ar', 'AE')
                                       ? _stateWiseGRPDetails[index].stateLocale
                                       : _stateWiseGRPDetails[index].state,
-                                  style: _themeData.textTheme.caption!.copyWith(
+                                  style:
+                                      _themeData.textTheme.bodySmall!.copyWith(
                                     height: 1.5,
                                     color: _isLightTheme
                                         ? const Color.fromRGBO(255, 255, 255, 1)

lib/samples/maps/localization.dart

@@ -129,7 +129,7 @@ class _MapsWithLocalizationState extends LocalizationSampleViewState {
                 child: Align(
                     child: Text(_title,
                         textDirection: TextDirection.rtl,
-                        style: _themeData.textTheme.subtitle1))),
+                        style: _themeData.textTheme.titleMedium))),
             Expanded(
               child: SfMapsTheme(
                 data: SfMapsThemeData(
@@ -169,7 +169,7 @@ class _MapsWithLocalizationState extends LocalizationSampleViewState {
                                     Text(
                                       _stateDataLabelsLocale[index],
                                       textDirection: TextDirection.ltr,
-                                      style: _themeData.textTheme.caption!
+                                      style: _themeData.textTheme.bodySmall!
                                           .copyWith(color: textColor),
                                     ),
                                     const SizedBox(height: 5.0),
@@ -179,7 +179,7 @@ class _MapsWithLocalizationState extends LocalizationSampleViewState {
                                               .toString() +
                                           'M sq. km',
                                       textDirection: TextDirection.ltr,
-                                      style: _themeData.textTheme.caption!
+                                      style: _themeData.textTheme.bodySmall!
                                           .copyWith(color: textColor),
                                     ),
                                   ],

lib/samples/maps/shape_layer/bubble/bubble.dart

@@ -350,7 +350,7 @@ class _MapBubblePageState extends SampleViewState
                     padding: const EdgeInsets.only(top: 15, bottom: 30),
                     child: Align(
                         child: Text('Social Media Users Statistics',
-                            style: Theme.of(context).textTheme.subtitle1))),
+                            style: Theme.of(context).textTheme.titleMedium))),
                 Expanded(
                   child: SfMaps(
                     layers: <MapLayer>[
@@ -376,7 +376,7 @@ class _MapBubblePageState extends SampleViewState
                             child: Text(_getCustomizedString(index),
                                 style: Theme.of(context)
                                     .textTheme
-                                    .caption!
+                                    .bodySmall!
                                     .copyWith(color: _tooltipTextColor)),
                           );
                         },

lib/samples/maps/shape_layer/equal_color_mapping/equal_color_mapping.dart

@@ -188,7 +188,7 @@ class _MapEqualColorMappingPageState extends SampleViewState {
             padding: const EdgeInsets.only(top: 15, bottom: 30),
             child: Align(
                 child: Text('European Time Zones',
-                    style: Theme.of(context).textTheme.subtitle1))),
+                    style: Theme.of(context).textTheme.titleMedium))),
         Expanded(
             child: SfMaps(
           layers: <MapLayer>[
@@ -214,7 +214,7 @@ class _MapEqualColorMappingPageState extends SampleViewState {
                     _timeZones[index].countryName +
                         ' : ' +
                         _timeZones[index].gmtTime,
-                    style: themeData.textTheme.caption!.copyWith(
+                    style: themeData.textTheme.bodySmall!.copyWith(
                       color: isLightTheme
                           ? const Color.fromRGBO(255, 255, 255, 1)
                           : const Color.fromRGBO(10, 10, 10, 1),