Skip to content

Commit f9b1ee2

Browse files
ParthBaraiyaAnkitPanchal10
authored andcommitted
📌 Fix formatting issue.
- Fix late initialization error in EventController. - Add flutter_calendar_page.iml in .gitignore. - Updated workflow to check formatting options. - Add CONTRIBUTING.md file.
1 parent e2b357a commit f9b1ee2

File tree

6 files changed

+45
-53
lines changed

6 files changed

+45
-53
lines changed

.github/workflows/flutter_analyze.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ jobs:
2323
- name: Install dependencies
2424
run: flutter pub get
2525

26+
- name: Formatting check
27+
run: flutter format . --dry-run --set-exit-if-changed
28+
2629
- name: Analyse
2730
run: flutter analyze

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Way to contribute
2+
3+
1. Fork the repo and create your branch from `master` or `devlop`.
4+
2. Clone the project to your own machine.
5+
3. Commit changes to your own branch
6+
4. Make sure your code lints.
7+
5. Push your work back up to your fork.
8+
6. Create a pull request on `devlop` branch.
9+
7. And Done!

flutter_calendar_page.iml

Lines changed: 0 additions & 14 deletions
This file was deleted.

lib/src/day_view/day_view.dart

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,10 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
213213

214214
late DateWidgetBuilder _dayTitleBuilder;
215215

216-
late EventController<T> _controller;
216+
EventController<T>? _controller;
217217

218218
late ScrollController _scrollController;
219219

220-
bool _controllerAdded = false;
221-
222220
late VoidCallback _reloadCallback;
223221

224222
final _scrollConfiguration = EventScrollConfiguration<T>();
@@ -249,10 +247,10 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
249247
final newController = widget.controller ??
250248
CalendarControllerProvider.of<T>(context).controller;
251249

252-
if (_controller != newController) {
250+
if (newController != _controller) {
253251
_controller = newController;
254252

255-
_controller
253+
_controller!
256254
// Removes existing callback.
257255
..removeListener(_reloadCallback)
258256

@@ -261,8 +259,6 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
261259
..addListener(_reloadCallback);
262260
}
263261

264-
_controllerAdded = true;
265-
266262
_updateViewDimensions();
267263
}
268264

@@ -274,9 +270,9 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
274270
CalendarControllerProvider.of<T>(context).controller;
275271

276272
if (newController != _controller) {
277-
_controller.removeListener(_reloadCallback);
273+
_controller?.removeListener(_reloadCallback);
278274
_controller = newController;
279-
_controller.addListener(_reloadCallback);
275+
_controller?.addListener(_reloadCallback);
280276
}
281277

282278
// Update date range.
@@ -301,7 +297,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
301297

302298
@override
303299
void dispose() {
304-
_controller.removeListener(_reloadCallback);
300+
_controller?.removeListener(_reloadCallback);
305301
_pageController.dispose();
306302
super.dispose();
307303
}
@@ -356,7 +352,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
356352
verticalLineOffset: widget.verticalLineOffset,
357353
showVerticalLine: widget.showVerticalLine,
358354
height: _height,
359-
controller: _controller,
355+
controller: controller,
360356
hourHeight: _hourHeight,
361357
eventArranger: _eventArranger,
362358
minuteSlotSize: widget.minuteSlotSize,
@@ -379,9 +375,11 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
379375
/// This will throw [AssertionError] if controller is called before its
380376
/// initialization is complete.
381377
EventController<T> get controller {
382-
assert(_controllerAdded, "EventController is not initialized yet.");
378+
if (_controller == null) {
379+
throw "EventController is not initialized yet.";
380+
}
383381

384-
return _controller;
382+
return _controller!;
385383
}
386384

387385
/// Reloads page.

lib/src/month_view/month_view.dart

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
167167

168168
late DateWidgetBuilder _headerBuilder;
169169

170-
late EventController<T> _controller;
171-
172-
bool _controllerAdded = false;
170+
EventController<T>? _controller;
173171

174172
late VoidCallback _reloadCallback;
175173

@@ -199,10 +197,10 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
199197
final newController = widget.controller ??
200198
CalendarControllerProvider.of<T>(context).controller;
201199

202-
if (_controller != newController) {
200+
if (newController != _controller) {
203201
_controller = newController;
204202

205-
_controller
203+
_controller!
206204
// Removes existing callback.
207205
..removeListener(_reloadCallback)
208206

@@ -211,8 +209,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
211209
..addListener(_reloadCallback);
212210
}
213211

214-
_controllerAdded = true;
215-
216212
updateViewDimensions();
217213
}
218214

@@ -224,9 +220,9 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
224220
CalendarControllerProvider.of<T>(context).controller;
225221

226222
if (newController != _controller) {
227-
_controller.removeListener(_reloadCallback);
223+
_controller?.removeListener(_reloadCallback);
228224
_controller = newController;
229-
_controller.addListener(_reloadCallback);
225+
_controller?.addListener(_reloadCallback);
230226
}
231227

232228
// Update date range.
@@ -246,7 +242,7 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
246242

247243
@override
248244
void dispose() {
249-
_controller.removeListener(_reloadCallback);
245+
_controller?.removeListener(_reloadCallback);
250246
_pageController.dispose();
251247
super.dispose();
252248
}
@@ -301,7 +297,7 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
301297
onDateLongPress: widget.onDateLongPress,
302298
width: _width,
303299
height: _height,
304-
controller: _controller,
300+
controller: controller,
305301
borderColor: widget.borderColor,
306302
borderSize: widget.borderSize,
307303
cellBuilder: _cellBuilder,
@@ -330,9 +326,11 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
330326
/// This will throw [AssertionError] if controller is called before its
331327
/// initialization is complete.
332328
EventController<T> get controller {
333-
assert(_controllerAdded, "EventController is not initialized yet.");
329+
if (_controller == null) {
330+
throw "EventController is not initialized yet.";
331+
}
334332

335-
return _controller;
333+
return _controller!;
336334
}
337335

338336
void _reload() {

lib/src/week_view/week_view.dart

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,9 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
211211
late double _weekTitleWidth;
212212
late int _totalDaysInWeek;
213213

214-
bool _controllerAdded = false;
215-
216214
late VoidCallback _reloadCallback;
217215

218-
late EventController<T> _controller;
216+
EventController<T>? _controller;
219217

220218
late ScrollController _scrollController;
221219
late List<WeekDays> _weekDays;
@@ -254,7 +252,7 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
254252
if (_controller != newController) {
255253
_controller = newController;
256254

257-
_controller
255+
_controller!
258256
// Removes existing callback.
259257
..removeListener(_reloadCallback)
260258

@@ -263,8 +261,6 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
263261
..addListener(_reloadCallback);
264262
}
265263

266-
_controllerAdded = true;
267-
268264
_updateViewDimensions();
269265
}
270266

@@ -276,9 +272,9 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
276272
CalendarControllerProvider.of<T>(context).controller;
277273

278274
if (newController != _controller) {
279-
_controller.removeListener(_reloadCallback);
275+
_controller?.removeListener(_reloadCallback);
280276
_controller = newController;
281-
_controller.addListener(_reloadCallback);
277+
_controller?.addListener(_reloadCallback);
282278
}
283279

284280
_setWeekDays();
@@ -305,7 +301,7 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
305301

306302
@override
307303
void dispose() {
308-
_controller.removeListener(_reloadCallback);
304+
_controller?.removeListener(_reloadCallback);
309305
_pageController.dispose();
310306
super.dispose();
311307
}
@@ -363,12 +359,12 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
363359
timeLineWidth: _timeLineWidth,
364360
verticalLineOffset: 0,
365361
showVerticalLine: true,
366-
controller: _controller,
362+
controller: controller,
367363
hourHeight: _hourHeight,
368364
scrollController: _scrollController,
369365
eventArranger: _eventArranger,
370366
weekDays: _weekDays,
371-
minuteSlotSize: widget.minuteSlotSize,
367+
minuteSlotSize: widget.minuteSlotSize,
372368
scrollConfiguration: _scrollConfiguration,
373369
));
374370
},
@@ -387,9 +383,11 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
387383
/// This will throw [AssertionError] if controller is called before its
388384
/// initialization is complete.
389385
EventController<T> get controller {
390-
assert(_controllerAdded, "EventController is not initialized yet.");
386+
if (_controller == null) {
387+
throw "EventController is not initialized yet.";
388+
}
391389

392-
return _controller;
390+
return _controller!;
393391
}
394392

395393
/// Reloads page.

0 commit comments

Comments
 (0)