Skip to content

Commit 9d7c46b

Browse files
author
LavanyaA
authored
Merge pull request #714 from sfHariHaraSudhan/master
FLUT-7164 - [Others] Moved changes from 4th volume release to master
2 parents 14197b0 + d5e0f67 commit 9d7c46b

File tree

18 files changed

+55257
-583
lines changed

18 files changed

+55257
-583
lines changed

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,12 @@ Explore the full capabilities of our Flutter widgets on your device by installin
8282

8383
<p align="center">
8484
<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>
85-
<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>
86-
<a href="https://flutter.syncfusion.com"><img src="https://cdn.syncfusion.com/content/images/FTControl/web-sample-browser.png"/></a>
85+
<a href="https://flutter.syncfusion.com"><img src="https://cdn.syncfusion.com/content/images/FTControl/web-sample-browser.png"/></a>
86+
<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>
8787
</p>
8888
<p align="center">
89-
<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>
9089
<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>
9190
<a href="https://snapcraft.io/syncfusion-flutter-gallery"><img src="https://cdn.syncfusion.com/content/images/FTControl/snap-store.png"/></a>
92-
</p>
93-
<p align="center">
9491
<a href="https://github.com/syncfusion/flutter-examples"><img src="https://cdn.syncfusion.com/content/images/FTControl/github-samples.png"/></a>
9592
</p>
9693

‎android/.gradle/buildOutputCleanup/buildOutputCleanup.lock‎

0 Bytes
Binary file not shown.

‎android/.gradle/buildOutputCleanup/cache.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#Fri Sep 30 17:48:46 IST 2022
2-
gradle.version=5.4.1
2+
gradle.version=5.4.1

‎android/.gradle/buildOutputCleanup/outputFiles.bin‎

59.6 KB
Binary file not shown.

‎android/local.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
sdk.dir=C:\\Users\\SriramKiranSenthilku\\AppData\\Local\\Android\\sdk
22
flutter.sdk=C:\\src\\flutter
33
flutter.buildMode=release
4-
flutter.versionName=20.3.47
4+
flutter.versionName=20.4.38

‎assets/europe.json‎

Lines changed: 54610 additions & 52 deletions
Large diffs are not rendered by default.

‎lib/sample_details.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,7 +2619,6 @@
26192619
"controlList": [
26202620
{
26212621
"title": "DataGrid",
2622-
"status": "Updated",
26232622
"description": "Displays large amounts of data with different data types in a tabular view",
26242623
"image": "images/Datagrid.png",
26252624
"displayType": "tab",
@@ -2733,7 +2732,6 @@
27332732
"subItems": [
27342733
{
27352734
"type": "sample",
2736-
"status": "New",
27372735
"title": "Filtering",
27382736
"key": "filtering_datagrid",
27392737
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/datagrid/datagrid_filtering.dart"
@@ -3145,20 +3143,17 @@
31453143
"description": "View the PDF document seamlessly and efficiently",
31463144
"image": "images/pdf_viewer.png",
31473145
"displayType": "tab",
3148-
"status": "Updated",
31493146
"controlId": 1,
31503147
"subItems": [
31513148
{
31523149
"type": "sample",
31533150
"title": "Getting Started",
3154-
"status": "Updated",
31553151
"key": "pdf_viewer_getting_started",
31563152
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/pdf_viewer/pdf_viewer_getting_started.dart"
31573153
},
31583154
{
31593155
"type": "sample",
31603156
"title": "Custom Toolbar",
3161-
"status": "Updated",
31623157
"key": "pdf_viewer_custom_toolbar",
31633158
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/pdf_viewer/pdf_viewer_custom_toolbar.dart"
31643159
},
@@ -3279,18 +3274,21 @@
32793274
"type": "sample",
32803275
"title": "Expenses Report",
32813276
"key": "expenses_report",
3277+
"status": "Updated",
32823278
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/expenses_report/expenses_report.dart"
32833279
},
32843280
{
32853281
"type": "sample",
32863282
"title": "Invoice",
32873283
"key": "invoice_excel",
3284+
"status": "Updated",
32883285
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/invoice/invoice.dart"
32893286
},
32903287
{
32913288
"type": "sample",
32923289
"title": "Yearly Sales",
32933290
"key": "yearly_sales",
3291+
"status": "Updated",
32943292
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/yearly_sales/yearly_sales.dart"
32953293
},
32963294
{
@@ -3327,7 +3325,6 @@
33273325
"type": "sample",
33283326
"title": "CSV Export",
33293327
"key": "save_as_csv",
3330-
"status": "New",
33313328
"codeLink": "https://github.com/syncfusion/flutter-examples/blob/master/lib/samples/xlsio/save_as_csv/save_as_csv.dart"
33323329
}
33333330
]

‎lib/samples/gauge/showcase/sleep_tracker.dart‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ class SleepTrackerSample extends SampleView {
2222
class _SleepTrackerSampleState extends SampleViewState {
2323
_SleepTrackerSampleState();
2424

25+
double wakeTime = 3;
26+
double sleepTime = 12;
27+
double sleepingTime = 9;
28+
2529
@override
2630
Widget build(BuildContext context) {
2731
final bool isLandscape =
@@ -335,8 +339,9 @@ class _SleepTrackerSampleState extends SampleViewState {
335339
if (!isCardView)
336340
Text(
337341
_sleepMinutes == '00'
338-
? '$_sleepHours hrs'
339-
: '$_sleepHours hrs ' '$_sleepMinutes mins',
342+
? '${sleepingTime > 11.99 ? sleepingTime.round() : sleepingTime.floor()} hrs'
343+
: '${sleepingTime > 11.99 ? sleepingTime.round() : sleepingTime.floor()} hrs '
344+
'$_sleepMinutes mins',
340345
style: TextStyle(
341346
fontSize: isCardView ? 14 : 20,
342347
fontWeight: FontWeight.w500),
@@ -378,7 +383,11 @@ class _SleepTrackerSampleState extends SampleViewState {
378383
_wakeupTimeAnnotation =
379384
((hour >= 6 && hour < 10) ? '0' + hourValue : hourValue) +
380385
':' +
381-
(minutesValue.length == 1 ? '0' + minutesValue : minutesValue) +
386+
(minutesValue.length == 1
387+
? hour >= 11
388+
? '59'
389+
: '0' + minutesValue
390+
: minutesValue) +
382391
(_hourValue >= 6 ? ' pm' : ' pm');
383392

384393
_wakeupTime = (_hourValue + 6 < 10
@@ -387,12 +396,18 @@ class _SleepTrackerSampleState extends SampleViewState {
387396
':' +
388397
(minutesValue.length == 1 ? '0' + minutesValue : minutesValue);
389398

390-
final DateFormat dateFormat = DateFormat('HH:mm');
391-
final DateTime wakeup = dateFormat.parse(_wakeupTime);
392-
final DateTime sleep =
393-
dateFormat.parse(_bedTime == '09:00 pm' ? '12:00' : _bedTime);
399+
final DateFormat dateFormat = DateFormat('dd/MM/yyyy HH:mm');
400+
final double wakeupValue = double.parse(_wakeupTime.replaceAll(':', '.'));
401+
final DateTime wakeup = dateFormat
402+
.parse('01/01/1970 ' + _wakeupTime)
403+
.add(const Duration(hours: 18))
404+
.subtract(Duration(minutes: wakeupValue >= 5.30 ? 0 : 30));
405+
final DateTime sleep = dateFormat.parse(_bedTime == '09:00 pm'
406+
? '02/01/1970 12:00'
407+
: '02/01/1970 ' + _bedTime);
394408
final String sleepDuration = sleep.difference(wakeup).toString();
395-
_sleepHours = sleepDuration.split(':')[0];
409+
wakeTime = value;
410+
sleepingTime = sleepTime - wakeTime;
396411
_sleepMinutes = sleepDuration.split(':')[1];
397412
});
398413
}
@@ -443,12 +458,17 @@ class _SleepTrackerSampleState extends SampleViewState {
443458
':' +
444459
(minutesValue.length == 1 ? '0' + minutesValue : minutesValue);
445460

446-
final DateFormat dateFormat = DateFormat('HH:mm');
447-
final DateTime wakeup =
448-
dateFormat.parse(_wakeupTime == '06:00 am' ? '03:00' : _wakeupTime);
449-
final DateTime sleep = dateFormat.parse(_bedTime);
461+
final DateFormat dateFormat = DateFormat('dd/MM/yyyy HH:mm');
462+
final DateTime wakeup = dateFormat
463+
.parse(_wakeupTime == '06:00 am'
464+
? '01/01/1970 03:00'
465+
: '01/01/1970 ' + _wakeupTime)
466+
.subtract(const Duration(hours: 6))
467+
.subtract(const Duration(minutes: 30));
468+
final DateTime sleep = dateFormat.parse('02/01/1970 ' + _bedTime);
450469
final String sleepDuration = sleep.difference(wakeup).toString();
451-
_sleepHours = sleepDuration.split(':')[0];
470+
sleepTime = bedTimeValue;
471+
sleepingTime = sleepTime - wakeTime;
452472
_sleepMinutes = sleepDuration.split(':')[1];
453473
});
454474
}
@@ -491,7 +511,6 @@ class _SleepTrackerSampleState extends SampleViewState {
491511
String _bedTimeAnnotation = '06:00 am';
492512
bool _isWakeupTime = true;
493513
bool _isBedTime = true;
494-
String _sleepHours = '9';
495514
String _sleepMinutes = '00';
496515
String _bedTime = '09:00 pm';
497516
String _wakeupTime = '06:00 am';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class _MapEqualColorMappingPageState extends SampleViewState {
7474
_CountryTimeInGMT('Malta', 'GMT+2'),
7575
_CountryTimeInGMT('Montenegro', 'GMT+2'),
7676
_CountryTimeInGMT('Netherlands', 'GMT+2'),
77+
_CountryTimeInGMT('Norway', 'GMT+2'),
7778
_CountryTimeInGMT('Poland', 'GMT+2'),
7879
_CountryTimeInGMT('Portugal', 'GMT+1'),
7980
_CountryTimeInGMT('Romania', 'GMT+3'),

0 commit comments

Comments
 (0)