Skip to content

Commit 79a98d2

Browse files
iamvivekkaushikiamvivekkaushik
committed
[Updated] dateType constructor param name to calendarType
1 parent 989430e commit 79a98d2

File tree

11 files changed

+72
-109
lines changed

11 files changed

+72
-109
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.2.6] - 2/04/2024
2+
3+
* Added Support for Gregorian Calendar
4+
15
## [1.2.5] - 17/06/2023
26

37
* Updated Intl

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ DatePicker(
6363
this.daysCount,
6464
this.onDateChange,
6565
this.locale = "en_US",
66+
this.calendarType = CalendarType.gregorianDate,
6667
}) : super(key: key);
6768
```
6869

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -140,7 +140,7 @@
140140
97C146E61CF9000F007C117D /* Project object */ = {
141141
isa = PBXProject;
142142
attributes = {
143-
LastUpgradeCheck = 1020;
143+
LastUpgradeCheck = 1430;
144144
ORGANIZATIONNAME = "The Chromium Authors";
145145
TargetAttributes = {
146146
97C146ED1CF9000F007C117D = {
@@ -184,10 +184,12 @@
184184
/* Begin PBXShellScriptBuildPhase section */
185185
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
186186
isa = PBXShellScriptBuildPhase;
187+
alwaysOutOfDate = 1;
187188
buildActionMask = 2147483647;
188189
files = (
189190
);
190191
inputPaths = (
192+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
191193
);
192194
name = "Thin Binary";
193195
outputPaths = (
@@ -198,6 +200,7 @@
198200
};
199201
9740EEB61CF901F6004384FC /* Run Script */ = {
200202
isa = PBXShellScriptBuildPhase;
203+
alwaysOutOfDate = 1;
201204
buildActionMask = 2147483647;
202205
files = (
203206
);
@@ -286,7 +289,7 @@
286289
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
287290
GCC_WARN_UNUSED_FUNCTION = YES;
288291
GCC_WARN_UNUSED_VARIABLE = YES;
289-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
292+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
290293
MTL_ENABLE_DEBUG_INFO = NO;
291294
SDKROOT = iphoneos;
292295
TARGETED_DEVICE_FAMILY = "1,2";
@@ -365,7 +368,7 @@
365368
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
366369
GCC_WARN_UNUSED_FUNCTION = YES;
367370
GCC_WARN_UNUSED_VARIABLE = YES;
368-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
371+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
369372
MTL_ENABLE_DEBUG_INFO = YES;
370373
ONLY_ACTIVE_ARCH = YES;
371374
SDKROOT = iphoneos;
@@ -414,7 +417,7 @@
414417
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415418
GCC_WARN_UNUSED_FUNCTION = YES;
416419
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
420+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
418421
MTL_ENABLE_DEBUG_INFO = NO;
419422
SDKROOT = iphoneos;
420423
TARGETED_DEVICE_FAMILY = "1,2";

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/ios/Runner/Info.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4448
</dict>
4549
</plist>

‎example/pubspec.lock‎

Lines changed: 21 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.18.0"
43+
version: "1.17.2"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -82,62 +82,38 @@ packages:
8282
url: "https://pub.dev"
8383
source: hosted
8484
version: "0.19.0"
85-
leak_tracker:
86-
dependency: transitive
87-
description:
88-
name: leak_tracker
89-
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
90-
url: "https://pub.dev"
91-
source: hosted
92-
version: "10.0.0"
93-
leak_tracker_flutter_testing:
94-
dependency: transitive
95-
description:
96-
name: leak_tracker_flutter_testing
97-
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
98-
url: "https://pub.dev"
99-
source: hosted
100-
version: "2.0.1"
101-
leak_tracker_testing:
102-
dependency: transitive
103-
description:
104-
name: leak_tracker_testing
105-
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
106-
url: "https://pub.dev"
107-
source: hosted
108-
version: "2.0.1"
10985
matcher:
11086
dependency: transitive
11187
description:
11288
name: matcher
113-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
89+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
11490
url: "https://pub.dev"
11591
source: hosted
116-
version: "0.12.16+1"
92+
version: "0.12.16"
11793
material_color_utilities:
11894
dependency: transitive
11995
description:
12096
name: material_color_utilities
121-
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
97+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
12298
url: "https://pub.dev"
12399
source: hosted
124-
version: "0.8.0"
100+
version: "0.5.0"
125101
meta:
126102
dependency: transitive
127103
description:
128104
name: meta
129-
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
105+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
130106
url: "https://pub.dev"
131107
source: hosted
132-
version: "1.11.0"
108+
version: "1.9.1"
133109
path:
134110
dependency: transitive
135111
description:
136112
name: path
137-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
113+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
138114
url: "https://pub.dev"
139115
source: hosted
140-
version: "1.9.0"
116+
version: "1.8.3"
141117
sky_engine:
142118
dependency: transitive
143119
description: flutter
@@ -155,18 +131,18 @@ packages:
155131
dependency: transitive
156132
description:
157133
name: stack_trace
158-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
134+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
159135
url: "https://pub.dev"
160136
source: hosted
161-
version: "1.11.1"
137+
version: "1.11.0"
162138
stream_channel:
163139
dependency: transitive
164140
description:
165141
name: stream_channel
166-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
142+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
167143
url: "https://pub.dev"
168144
source: hosted
169-
version: "2.1.2"
145+
version: "2.1.1"
170146
string_scanner:
171147
dependency: transitive
172148
description:
@@ -187,10 +163,10 @@ packages:
187163
dependency: transitive
188164
description:
189165
name: test_api
190-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
166+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
191167
url: "https://pub.dev"
192168
source: hosted
193-
version: "0.6.1"
169+
version: "0.6.0"
194170
vector_math:
195171
dependency: transitive
196172
description:
@@ -199,13 +175,13 @@ packages:
199175
url: "https://pub.dev"
200176
source: hosted
201177
version: "2.1.4"
202-
vm_service:
178+
web:
203179
dependency: transitive
204180
description:
205-
name: vm_service
206-
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
181+
name: web
182+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
207183
url: "https://pub.dev"
208184
source: hosted
209-
version: "13.0.0"
185+
version: "0.1.4-beta"
210186
sdks:
211-
dart: ">=3.2.0-0 <4.0.0"
187+
dart: ">=3.1.0-185.0.dev <4.0.0"

‎lib/date_picker_widget.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class DatePicker extends StatefulWidget {
6060
final int daysCount;
6161

6262
/// Calendar type
63-
final DateType dateType;
63+
final CalendarType calendarType;
6464

6565
/// Directionality
6666
final TextDirection? directionality;
@@ -86,7 +86,7 @@ class DatePicker extends StatefulWidget {
8686
this.daysCount = 500,
8787
this.onDateChange,
8888
this.locale = "en_US",
89-
this.dateType = DateType.gregorianDate,
89+
this.calendarType = CalendarType.gregorianDate,
9090
this.directionality,
9191
}) : assert(
9292
activeDates == null || inactiveDates == null,
@@ -140,7 +140,7 @@ class _DatePickerState extends State<DatePicker> {
140140
@override
141141
Widget build(BuildContext context) {
142142
return Directionality(
143-
textDirection: (widget.directionality) ?? ((widget.dateType == DateType.persianDate)
143+
textDirection: (widget.directionality) ?? ((widget.calendarType == CalendarType.persianDate)
144144
? TextDirection.rtl
145145
: TextDirection.ltr),
146146
child: Container(
@@ -154,11 +154,11 @@ class _DatePickerState extends State<DatePicker> {
154154
// if widget.startDate is null then use the initialDateValue
155155
DateTime date;
156156
DateTime _date = widget.startDate.add(Duration(days: index));
157-
switch (widget.dateType) {
158-
case DateType.persianDate:
157+
switch (widget.calendarType) {
158+
case CalendarType.persianDate:
159159
date = PersianDate.toJalali(_date.year, _date.month, _date.day);
160160
break;
161-
case DateType.gregorianDate:
161+
case CalendarType.gregorianDate:
162162
date = DateTime(_date.year, _date.month, _date.day);
163163
break;
164164
default:
@@ -192,8 +192,8 @@ class _DatePickerState extends State<DatePicker> {
192192
? DateUtils.isSameDay(date, _currentDate!)
193193
: false;
194194
// Return the Date Widget
195-
switch (widget.dateType) {
196-
case DateType.gregorianDate:
195+
switch (widget.calendarType) {
196+
case CalendarType.gregorianDate:
197197
return GregorianDateWidget(
198198
date: date,
199199
monthTextStyle: isDeactivated
@@ -227,7 +227,7 @@ class _DatePickerState extends State<DatePicker> {
227227
});
228228
},
229229
);
230-
case DateType.persianDate:
230+
case CalendarType.persianDate:
231231
return PersianDateWidget(
232232
date: date,
233233
monthTextStyle: isDeactivated

‎lib/date_type.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

22
part of 'date_picker_widget.dart';
33

4-
enum DateType {
5-
4+
enum CalendarType {
65
persianDate,
76
gregorianDate,
87
}

0 commit comments

Comments
 (0)