From 3227a31343cd443b2e57a207a577eeaaae6e343c Mon Sep 17 00:00:00 2001 From: kranthi Date: Thu, 6 Oct 2022 14:57:44 +0530 Subject: [PATCH 1/4] bug fixed --- .fvm/flutter_sdk | 1 + .fvm/fvm_config.json | 4 +++ .../ios/Flutter/flutter_export_environment.sh | 13 ++++++++ example/pubspec.lock | 30 +++++++++---------- lib/src/day_based_changable_picker.dart | 1 + pubspec.lock | 12 ++++---- 6 files changed, 40 insertions(+), 21 deletions(-) create mode 120000 .fvm/flutter_sdk create mode 100644 .fvm/fvm_config.json create mode 100644 example/ios/Flutter/flutter_export_environment.sh diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk new file mode 120000 index 0000000..210ffab --- /dev/null +++ b/.fvm/flutter_sdk @@ -0,0 +1 @@ +C:/Users/dhruv/fvm/versions/2.8.0 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json new file mode 100644 index 0000000..af9d3d5 --- /dev/null +++ b/.fvm/fvm_config.json @@ -0,0 +1,4 @@ +{ + "flutterSdkVersion": "2.8.0", + "flavors": {} +} \ No newline at end of file diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh new file mode 100644 index 0000000..e5b1ff3 --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=C:\src\flutter\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\dhruv\OneDrive\Desktop\flutter_date_pickers\example" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib\main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/example/pubspec.lock b/example/pubspec.lock index a7c4b91..84523f7 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "0.3.0" + version: "0.4.0" flutter_localizations: dependency: "direct main" description: flutter @@ -100,13 +100,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.4" meta: dependency: transitive description: @@ -120,7 +113,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -132,7 +125,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -167,14 +160,21 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.3" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=1.17.0" diff --git a/lib/src/day_based_changable_picker.dart b/lib/src/day_based_changable_picker.dart index 631f82b..9e18a5a 100644 --- a/lib/src/day_based_changable_picker.dart +++ b/lib/src/day_based_changable_picker.dart @@ -179,6 +179,7 @@ class _DayBasedChangeablePickerState padding: widget.datePickerLayoutSettings.contentPadding, child: _buildMonthNavigationRow()), ), + SizedBox( height: 40, width: double.infinity,), Expanded( child: Semantics( sortKey: MonthPickerSortKey.calendar, diff --git a/pubspec.lock b/pubspec.lock index 6bd166a..194698f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -78,7 +78,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -139,7 +139,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" typed_data: dependency: transitive description: @@ -153,6 +153,6 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" From 1d009e9d7fd0558e11a1dafd5a781aed891437a3 Mon Sep 17 00:00:00 2001 From: DHRUVA-N-L-CHOUDHARY <96297602+DHRUVA-N-L-CHOUDHARY@users.noreply.github.com> Date: Mon, 10 Oct 2022 01:13:55 +0530 Subject: [PATCH 2/4] Delete .fvm directory --- .fvm/flutter_sdk | 1 - .fvm/fvm_config.json | 4 ---- 2 files changed, 5 deletions(-) delete mode 120000 .fvm/flutter_sdk delete mode 100644 .fvm/fvm_config.json diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk deleted file mode 120000 index 210ffab..0000000 --- a/.fvm/flutter_sdk +++ /dev/null @@ -1 +0,0 @@ -C:/Users/dhruv/fvm/versions/2.8.0 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index af9d3d5..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "2.8.0", - "flavors": {} -} \ No newline at end of file From e043177a9dc12a5299ccdabf6ee4e091a16a8da8 Mon Sep 17 00:00:00 2001 From: kranthi Date: Mon, 10 Oct 2022 01:58:25 +0530 Subject: [PATCH 3/4] bugfixing --- .fvm/flutter_sdk | 2 +- .fvm/fvm_config.json | 2 +- .../ios/Flutter/flutter_export_environment.sh | 6 +-- example/pubspec.lock | 2 +- lib/src/day_based_changable_picker.dart | 50 +++++++++++-------- pubspec.lock | 2 +- 6 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk index 210ffab..caf885e 120000 --- a/.fvm/flutter_sdk +++ b/.fvm/flutter_sdk @@ -1 +1 @@ -C:/Users/dhruv/fvm/versions/2.8.0 \ No newline at end of file +C:/Users/dhruv/fvm/versions/2.8.1 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index af9d3d5..b8e6b4f 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.8.0", + "flutterSdkVersion": "2.8.1", "flavors": {} } \ No newline at end of file diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index e5b1ff3..bc9859a 100644 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -1,6 +1,6 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=C:\src\flutter\flutter" +export "FLUTTER_ROOT=C:\Users\dhruv\fvm\versions\2.8.1" export "FLUTTER_APPLICATION_PATH=C:\Users\dhruv\OneDrive\Desktop\flutter_date_pickers\example" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib\main.dart" @@ -8,6 +8,6 @@ export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1" export "DART_OBFUSCATION=false" -export "TRACK_WIDGET_CREATION=true" +export "TRACK_WIDGET_CREATION=false" export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=.dart_tool/package_config.json" +export "PACKAGE_CONFIG=.packages" diff --git a/example/pubspec.lock b/example/pubspec.lock index 84523f7..14ba300 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: diff --git a/lib/src/day_based_changable_picker.dart b/lib/src/day_based_changable_picker.dart index 9e18a5a..adef506 100644 --- a/lib/src/day_based_changable_picker.dart +++ b/lib/src/day_based_changable_picker.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:ffi'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; @@ -65,6 +66,8 @@ class DayBasedChangeablePicker extends StatefulWidget { /// Called when the user changes the month final ValueChanged? onMonthChanged; + + final double? spacing; /// Create picker with option to change month. DayBasedChangeablePicker({ @@ -81,6 +84,7 @@ class DayBasedChangeablePicker extends StatefulWidget { this.onSelectionError, this.eventDecorationBuilder, this.onMonthChanged, + this.spacing = 40.0, }) : initiallyShowDate = _getInitiallyShownDate(initiallyShownDate, selection), super(key: key); @@ -166,28 +170,32 @@ class _DayBasedChangeablePickerState // ignore: prefer_expression_function_bodies Widget build(BuildContext context) { return SizedBox( - width: widget.datePickerLayoutSettings.monthPickerPortraitWidth, - height: widget.datePickerLayoutSettings.maxDayPickerHeight, - child: Column( - children: [ - widget.datePickerLayoutSettings.hideMonthNavigationRow - ? const SizedBox() - : SizedBox( - height: widget.datePickerLayoutSettings.dayPickerRowHeight, - child: Padding( - //match _DayPicker main layout padding - padding: widget.datePickerLayoutSettings.contentPadding, - child: _buildMonthNavigationRow()), - ), - SizedBox( height: 40, width: double.infinity,), - Expanded( - child: Semantics( - sortKey: MonthPickerSortKey.calendar, - child: _buildDayPickerPageView(), - ), + width: widget.datePickerLayoutSettings.monthPickerPortraitWidth, + height: widget.datePickerLayoutSettings.maxDayPickerHeight, + child: Column( + children: [ + widget.datePickerLayoutSettings.hideMonthNavigationRow + ? const SizedBox() + : SizedBox( + height: widget.datePickerLayoutSettings.dayPickerRowHeight, + child: Padding( + //match _DayPicker main layout padding + padding: widget.datePickerLayoutSettings.contentPadding, + child: _buildMonthNavigationRow()), + ), + SizedBox( + height: widget.spacing, + width: double.infinity, + ), + Expanded( + child: Semantics( + sortKey: MonthPickerSortKey.calendar, + child: _buildDayPickerPageView(), ), - ], - )); + ), + ], + ), + ); } @override diff --git a/pubspec.lock b/pubspec.lock index 194698f..5c56907 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.8.1" boolean_selector: dependency: transitive description: From ef6ba7bca41d9681c52319978467761605a3aa58 Mon Sep 17 00:00:00 2001 From: DHRUVA-N-L-CHOUDHARY <96297602+DHRUVA-N-L-CHOUDHARY@users.noreply.github.com> Date: Mon, 10 Oct 2022 02:00:34 +0530 Subject: [PATCH 4/4] Delete .fvm directory --- .fvm/flutter_sdk | 1 - .fvm/fvm_config.json | 4 ---- 2 files changed, 5 deletions(-) delete mode 120000 .fvm/flutter_sdk delete mode 100644 .fvm/fvm_config.json diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk deleted file mode 120000 index caf885e..0000000 --- a/.fvm/flutter_sdk +++ /dev/null @@ -1 +0,0 @@ -C:/Users/dhruv/fvm/versions/2.8.1 \ No newline at end of file diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index b8e6b4f..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "2.8.1", - "flavors": {} -} \ No newline at end of file