Merge pull request syncfusion#714 from sfHariHaraSudhan/master

FLUT-7164 - [Others] Moved changes from 4th volume release to master
louaid · Dec 22, 2022 · 9d7c46b · 9d7c46b
2 parents 14197b0 + d5e0f67
commit 9d7c46b
Show file tree

Hide file tree

Showing 18 changed files with 55,257 additions and 583 deletions.
diff --git a/README.md b/README.md
@@ -82,15 +82,12 @@ Explore the full capabilities of our Flutter widgets on your device by installin
 
 <p align="center">
   <a href="https://play.google.com/store/apps/details?id=com.syncfusion.flutter.examples"><img src="https://cdn.syncfusion.com/content/images/FTControl/google-play-store.png"/></a>
-  <a href="https://apps.apple.com/us/app/syncfusion-flutter-ui-widgets/id1475231341"><img src="https://cdn.syncfusion.com/content/images/FTControl/ios-store.png"/></a>
-  <a href="https://flutter.syncfusion.com"><img src="https://cdn.syncfusion.com/content/images/FTControl/web-sample-browser.png"/></a> 
+  <a href="https://flutter.syncfusion.com"><img src="https://cdn.syncfusion.com/content/images/FTControl/web-sample-browser.png"/></a>
+  <a href="https://www.microsoft.com/en-us/p/syncfusion-flutter-gallery/9nhnbwcsf85d?activetab=pivot:overviewtab"><img src="https://cdn.syncfusion.com/content/images/FTControl/windows-store.png"/></a> 
 </p>
 <p align="center">
-  <a href="https://www.microsoft.com/en-us/p/syncfusion-flutter-gallery/9nhnbwcsf85d?activetab=pivot:overviewtab"><img src="https://cdn.syncfusion.com/content/images/FTControl/windows-store.png"/></a> 
   <a href="https://install.appcenter.ms/orgs/syncfusion-demos/apps/syncfusion-flutter-gallery/distribution_groups/release"><img src="https://cdn.syncfusion.com/content/images/FTControl/macos-app-center.png"/></a>
   <a href="https://snapcraft.io/syncfusion-flutter-gallery"><img src="https://cdn.syncfusion.com/content/images/FTControl/snap-store.png"/></a>
-</p>
-<p align="center">
   <a href="https://github.com/syncfusion/flutter-examples"><img src="https://cdn.syncfusion.com/content/images/FTControl/github-samples.png"/></a>
 </p>
 

diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
 #Fri Sep 30 17:48:46 IST 2022
-gradle.version=5.4.1
+gradle.version=5.4.1
diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/android/local.properties b/android/local.properties
@@ -1,4 +1,4 @@
 sdk.dir=C:\\Users\\SriramKiranSenthilku\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\src\\flutter
 flutter.buildMode=release
-flutter.versionName=20.3.47
+flutter.versionName=20.4.38
diff --git a/assets/europe.json b/assets/europe.json
diff --git a/lib/sample_details.json b/lib/sample_details.json
@@ -2619,7 +2619,6 @@
     "controlList": [
       {
         "title": "DataGrid",
-        "status": "Updated",
         "description": "Displays large amounts of data with different data types in a tabular view",
         "image": "images/Datagrid.png",
         "displayType": "tab",
@@ -2733,7 +2732,6 @@
             "subItems": [
               {
                 "type": "sample",
-                "status": "New",
                 "title": "Filtering",
                 "key": "filtering_datagrid",
                 "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/datagrid/datagrid_filtering.dart"
@@ -3145,20 +3143,17 @@
         "description": "View the PDF document seamlessly and efficiently",
         "image": "images/pdf_viewer.png",
         "displayType": "tab",
-        "status": "Updated",
         "controlId": 1,
         "subItems": [
           {
             "type": "sample",
             "title": "Getting Started",
-            "status": "Updated",
             "key": "pdf_viewer_getting_started",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/pdf_viewer/pdf_viewer_getting_started.dart"
           },
           {
             "type": "sample",
             "title": "Custom Toolbar",
-             "status": "Updated",
             "key": "pdf_viewer_custom_toolbar",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/pdf_viewer/pdf_viewer_custom_toolbar.dart"
           },
@@ -3279,18 +3274,21 @@
             "type": "sample",
             "title": "Expenses Report",
             "key": "expenses_report",
+            "status": "Updated",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/expenses_report/expenses_report.dart"
           },
           {
             "type": "sample",
             "title": "Invoice",
             "key": "invoice_excel",
+            "status": "Updated",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/invoice/invoice.dart"
           },
           {
             "type": "sample",
             "title": "Yearly Sales",
             "key": "yearly_sales",
+            "status": "Updated",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/yearly_sales/yearly_sales.dart"
           },
           {
@@ -3327,7 +3325,6 @@
             "type": "sample",
             "title": "CSV Export",
             "key": "save_as_csv",
-            "status": "New",
             "codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/save_as_csv/save_as_csv.dart"
           }
         ]

diff --git a/lib/samples/gauge/showcase/sleep_tracker.dart b/lib/samples/gauge/showcase/sleep_tracker.dart
@@ -22,6 +22,10 @@ class SleepTrackerSample extends SampleView {
 class _SleepTrackerSampleState extends SampleViewState {
   _SleepTrackerSampleState();
 
+  double wakeTime = 3;
+  double sleepTime = 12;
+  double sleepingTime = 9;
+
   @override
   Widget build(BuildContext context) {
     final bool isLandscape =
@@ -335,8 +339,9 @@ class _SleepTrackerSampleState extends SampleViewState {
             if (!isCardView)
               Text(
                 _sleepMinutes == '00'
-                    ? '$_sleepHours hrs'
-                    : '$_sleepHours hrs ' '$_sleepMinutes mins',
+                    ? '${sleepingTime > 11.99 ? sleepingTime.round() : sleepingTime.floor()} hrs'
+                    : '${sleepingTime > 11.99 ? sleepingTime.round() : sleepingTime.floor()} hrs '
+                        '$_sleepMinutes mins',
                 style: TextStyle(
                     fontSize: isCardView ? 14 : 20,
                     fontWeight: FontWeight.w500),
@@ -378,7 +383,11 @@ class _SleepTrackerSampleState extends SampleViewState {
       _wakeupTimeAnnotation =
           ((hour >= 6 && hour < 10) ? '0' + hourValue : hourValue) +
               ':' +
-              (minutesValue.length == 1 ? '0' + minutesValue : minutesValue) +
+              (minutesValue.length == 1
+                  ? hour >= 11
+                      ? '59'
+                      : '0' + minutesValue
+                  : minutesValue) +
               (_hourValue >= 6 ? ' pm' : ' pm');
 
       _wakeupTime = (_hourValue + 6 < 10
@@ -387,12 +396,18 @@ class _SleepTrackerSampleState extends SampleViewState {
           ':' +
           (minutesValue.length == 1 ? '0' + minutesValue : minutesValue);
 
-      final DateFormat dateFormat = DateFormat('HH:mm');
-      final DateTime wakeup = dateFormat.parse(_wakeupTime);
-      final DateTime sleep =
-          dateFormat.parse(_bedTime == '09:00 pm' ? '12:00' : _bedTime);
+      final DateFormat dateFormat = DateFormat('dd/MM/yyyy HH:mm');
+      final double wakeupValue = double.parse(_wakeupTime.replaceAll(':', '.'));
+      final DateTime wakeup = dateFormat
+          .parse('01/01/1970 ' + _wakeupTime)
+          .add(const Duration(hours: 18))
+          .subtract(Duration(minutes: wakeupValue >= 5.30 ? 0 : 30));
+      final DateTime sleep = dateFormat.parse(_bedTime == '09:00 pm'
+          ? '02/01/1970 12:00'
+          : '02/01/1970 ' + _bedTime);
       final String sleepDuration = sleep.difference(wakeup).toString();
-      _sleepHours = sleepDuration.split(':')[0];
+      wakeTime = value;
+      sleepingTime = sleepTime - wakeTime;
       _sleepMinutes = sleepDuration.split(':')[1];
     });
   }
@@ -443,12 +458,17 @@ class _SleepTrackerSampleState extends SampleViewState {
               ':' +
               (minutesValue.length == 1 ? '0' + minutesValue : minutesValue);
 
-      final DateFormat dateFormat = DateFormat('HH:mm');
-      final DateTime wakeup =
-          dateFormat.parse(_wakeupTime == '06:00 am' ? '03:00' : _wakeupTime);
-      final DateTime sleep = dateFormat.parse(_bedTime);
+      final DateFormat dateFormat = DateFormat('dd/MM/yyyy HH:mm');
+      final DateTime wakeup = dateFormat
+          .parse(_wakeupTime == '06:00 am'
+              ? '01/01/1970 03:00'
+              : '01/01/1970 ' + _wakeupTime)
+          .subtract(const Duration(hours: 6))
+          .subtract(const Duration(minutes: 30));
+      final DateTime sleep = dateFormat.parse('02/01/1970 ' + _bedTime);
       final String sleepDuration = sleep.difference(wakeup).toString();
-      _sleepHours = sleepDuration.split(':')[0];
+      sleepTime = bedTimeValue;
+      sleepingTime = sleepTime - wakeTime;
       _sleepMinutes = sleepDuration.split(':')[1];
     });
   }
@@ -491,7 +511,6 @@ class _SleepTrackerSampleState extends SampleViewState {
   String _bedTimeAnnotation = '06:00 am';
   bool _isWakeupTime = true;
   bool _isBedTime = true;
-  String _sleepHours = '9';
   String _sleepMinutes = '00';
   String _bedTime = '09:00 pm';
   String _wakeupTime = '06:00 am';

diff --git a/lib/samples/maps/shape_layer/equal_color_mapping/equal_color_mapping.dart b/lib/samples/maps/shape_layer/equal_color_mapping/equal_color_mapping.dart
@@ -74,6 +74,7 @@ class _MapEqualColorMappingPageState extends SampleViewState {
       _CountryTimeInGMT('Malta', 'GMT+2'),
       _CountryTimeInGMT('Montenegro', 'GMT+2'),
       _CountryTimeInGMT('Netherlands', 'GMT+2'),
+      _CountryTimeInGMT('Norway', 'GMT+2'),
       _CountryTimeInGMT('Poland', 'GMT+2'),
       _CountryTimeInGMT('Portugal', 'GMT+1'),
       _CountryTimeInGMT('Romania', 'GMT+3'),