Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linting #777

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This file configures the analyzer to use the lint rule set from `package:lint`

# include: package:lint/strict.yaml # For production apps
# include: package:lint/casual.yaml # For code samples, hackathons and other non-production code
include: package:lint/package.yaml # Use this for packages with public API

# You might want to exclude auto-generated files from dart analysis
analyzer:
exclude:
#- '**.freezed.dart'
#- '**.g.dart'

# You can customize the lint rules set to your own liking. A list of all rules
# can be found at https://dart-lang.github.io/linter/lints/options/options.html
linter:
rules:
# Util classes are awesome!
# avoid_classes_with_only_static_members: false

# Make constructors the first thing in every class
# sort_constructors_first: true

# Choose wisely, but you don't have to
# prefer_double_quotes: true
# prefer_single_quotes: true
92 changes: 60 additions & 32 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,56 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev"
source: hosted
version: "2.9.0"
version: "2.10.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: caac504f942f41dfadcf45229ce8c47065b93919a12739f20d6173a883c5ec73
url: "https://pub.dev"
source: hosted
version: "1.0.2"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
Expand All @@ -64,42 +71,56 @@ packages:
dependency: transitive
description:
name: intl
url: "https://pub.dartlang.org"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.18.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev"
source: hosted
version: "0.12.12"
version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev"
source: hosted
version: "1.8.2"
simple_gesture_detector:
dependency: transitive
description:
name: simple_gesture_detector
url: "https://pub.dartlang.org"
sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
sky_engine:
Expand All @@ -111,30 +132,34 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.2.0"
table_calendar:
dependency: "direct main"
description:
Expand All @@ -146,23 +171,26 @@ packages:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev"
source: hosted
version: "0.4.12"
version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
sdks:
dart: ">=2.17.0-0 <3.0.0"
dart: ">=2.18.0 <3.0.0"
flutter: ">=1.17.0"
18 changes: 14 additions & 4 deletions lib/src/customization/calendar_builders.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,34 @@

import 'package:flutter/widgets.dart';

import '../shared/utils.dart' show DayBuilder, FocusedDayBuilder;
import 'package:table_calendar/src/shared/utils.dart'
show DayBuilder, FocusedDayBuilder;

/// Signature for a function that creates a single event marker for a given `day`.
/// Contains a single `event` associated with that `day`.
typedef SingleMarkerBuilder<T> = Widget? Function(
BuildContext context, DateTime day, T event);
BuildContext context,
DateTime day,
T event,
);

/// Signature for a function that creates an event marker for a given `day`.
/// Contains a list of `events` associated with that `day`.
typedef MarkerBuilder<T> = Widget? Function(
BuildContext context, DateTime day, List<T> events);
BuildContext context,
DateTime day,
List<T> events,
);

/// Signature for a function that creates a background highlight for a given `day`.
///
/// Used for highlighting current range selection.
/// Contains a value determining if the given `day` falls within the selected range.
typedef HighlightBuilder = Widget? Function(
BuildContext context, DateTime day, bool isWithinRange);
BuildContext context,
DateTime day,
bool isWithinRange,
);

/// Class containing all custom builders for `TableCalendar`.
class CalendarBuilders<T> {
Expand Down
36 changes: 18 additions & 18 deletions lib/src/customization/calendar_style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -165,68 +165,68 @@ class CalendarStyle {
this.markersAlignment = Alignment.bottomCenter,
this.markersMaxCount = 4,
this.cellMargin = const EdgeInsets.all(6.0),
this.cellPadding = const EdgeInsets.all(0),
this.cellPadding = EdgeInsets.zero,
this.cellAlignment = Alignment.center,
this.markersOffset = const PositionedOffset(),
this.rangeHighlightColor = const Color(0xFFBBDDFF),
this.markerDecoration = const BoxDecoration(
color: const Color(0xFF263238),
color: Color(0xFF263238),
shape: BoxShape.circle,
),
this.todayTextStyle = const TextStyle(
color: const Color(0xFFFAFAFA),
color: Color(0xFFFAFAFA),
fontSize: 16.0,
), //
this.todayDecoration = const BoxDecoration(
color: const Color(0xFF9FA8DA),
color: Color(0xFF9FA8DA),
shape: BoxShape.circle,
),
this.selectedTextStyle = const TextStyle(
color: const Color(0xFFFAFAFA),
color: Color(0xFFFAFAFA),
fontSize: 16.0,
),
this.selectedDecoration = const BoxDecoration(
color: const Color(0xFF5C6BC0),
color: Color(0xFF5C6BC0),
shape: BoxShape.circle,
),
this.rangeStartTextStyle = const TextStyle(
color: const Color(0xFFFAFAFA),
color: Color(0xFFFAFAFA),
fontSize: 16.0,
),
this.rangeStartDecoration = const BoxDecoration(
color: const Color(0xFF6699FF),
color: Color(0xFF6699FF),
shape: BoxShape.circle,
),
this.rangeEndTextStyle = const TextStyle(
color: const Color(0xFFFAFAFA),
color: Color(0xFFFAFAFA),
fontSize: 16.0,
),
this.rangeEndDecoration = const BoxDecoration(
color: const Color(0xFF6699FF),
color: Color(0xFF6699FF),
shape: BoxShape.circle,
),
this.withinRangeTextStyle = const TextStyle(),
this.withinRangeDecoration = const BoxDecoration(shape: BoxShape.circle),
this.outsideTextStyle = const TextStyle(color: const Color(0xFFAEAEAE)),
this.outsideTextStyle = const TextStyle(color: Color(0xFFAEAEAE)),
this.outsideDecoration = const BoxDecoration(shape: BoxShape.circle),
this.disabledTextStyle = const TextStyle(color: const Color(0xFFBFBFBF)),
this.disabledTextStyle = const TextStyle(color: Color(0xFFBFBFBF)),
this.disabledDecoration = const BoxDecoration(shape: BoxShape.circle),
this.holidayTextStyle = const TextStyle(color: const Color(0xFF5C6BC0)),
this.holidayTextStyle = const TextStyle(color: Color(0xFF5C6BC0)),
this.holidayDecoration = const BoxDecoration(
border: const Border.fromBorderSide(
const BorderSide(color: const Color(0xFF9FA8DA), width: 1.4),
border: Border.fromBorderSide(
BorderSide(color: Color(0xFF9FA8DA), width: 1.4),
),
shape: BoxShape.circle,
),
this.weekendTextStyle = const TextStyle(color: const Color(0xFF5A5A5A)),
this.weekendTextStyle = const TextStyle(color: Color(0xFF5A5A5A)),
this.weekendDecoration = const BoxDecoration(shape: BoxShape.circle),
this.weekNumberTextStyle =
const TextStyle(fontSize: 12, color: const Color(0xFFBFBFBF)),
const TextStyle(fontSize: 12, color: Color(0xFFBFBFBF)),
this.defaultTextStyle = const TextStyle(),
this.defaultDecoration = const BoxDecoration(shape: BoxShape.circle),
this.rowDecoration = const BoxDecoration(),
this.tableBorder = const TableBorder(),
this.tablePadding = const EdgeInsets.all(0),
this.tablePadding = EdgeInsets.zero,
});
}

Expand Down
6 changes: 3 additions & 3 deletions lib/src/customization/days_of_week_style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import 'package:flutter/widgets.dart';

import '../shared/utils.dart' show TextFormatter;
import 'package:table_calendar/src/shared/utils.dart' show TextFormatter;

/// Class containing styling for `TableCalendar`'s days of week panel.
class DaysOfWeekStyle {
Expand All @@ -30,7 +30,7 @@ class DaysOfWeekStyle {
const DaysOfWeekStyle({
this.dowTextFormatter,
this.decoration = const BoxDecoration(),
this.weekdayStyle = const TextStyle(color: const Color(0xFF4F4F4F)),
this.weekendStyle = const TextStyle(color: const Color(0xFF6A6A6A)),
this.weekdayStyle = const TextStyle(color: Color(0xFF4F4F4F)),
this.weekendStyle = const TextStyle(color: Color(0xFF6A6A6A)),
});
}
Loading