Skip to content

Commit

Permalink
fix analyzer issues
Browse files Browse the repository at this point in the history
  • Loading branch information
insinfo committed Jul 13, 2021
1 parent c783b8e commit 358480c
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 57 deletions.
2 changes: 2 additions & 0 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ authors:
environment:
sdk: '>=2.4.0 <3.0.0'

publish_to: none

dependencies:
angular: ^6.0.0-alpha+1
#angular_components: ^0.14.0-alpha+1
Expand Down
41 changes: 13 additions & 28 deletions lib/src/datepicker/day_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import '../fontawesome/directives.dart';
/// Creates an [EsDayPickerComponent], this will be the view showed in the [NgEsDatePicker] when user clicks
/// day header button
@Component(
selector: 'es-day-picker',
templateUrl: 'day_picker.html',
directives: [coreDirectives, fontAwesomeDirectives])
selector: 'es-day-picker', templateUrl: 'day_picker.html', directives: [coreDirectives, fontAwesomeDirectives])
class EsDayPickerComponent {
/// provides access to [EsDatePickerComponent] parent container
EsDatePickerComponent datePicker;
Expand Down Expand Up @@ -48,22 +46,16 @@ class EsDayPickerComponent {
/// provides the maximun mode that can be displayed
String maxMode = 'year';

Map<String, bool> selectColorBtn(DisplayedDate dt) => {
'btn-primary': dt.selected,
'btn-light': !dt.selected,
'active': dt.current,
'disabled': dt.disabled
};
Map<String, bool> typeTextToButton(DisplayedDate dt) => {
'text-muted': dt.secondary,
'font-weight-bold': dt.current && !dt.selected
};
Map<String, bool> selectColorBtn(DisplayedDate dt) =>
{'btn-primary': dt.selected, 'btn-light': !dt.selected, 'active': dt.current, 'disabled': dt.disabled};
Map<String, bool> typeTextToButton(DisplayedDate dt) =>
{'text-muted': dt.secondary, 'font-weight-bold': dt.current && !dt.selected};

bool get isDisabledMaxMode => datePicker.datePickerMode == maxMode;

///
List<DateTime> getDates(DateTime startDate, num n) {
var dates = List<DateTime>(n);
var dates = List<DateTime>.filled(n, null);
var current = startDate;
var i = 0;
var date;
Expand Down Expand Up @@ -92,8 +84,7 @@ class EsDayPickerComponent {
var firstThursday = DateTime(checkDate.year, DateTime.january, 1);

if (firstThursday.weekday != (DateTime.thursday)) {
firstThursday = DateTime(checkDate.year, DateTime.january,
1 + ((4 - firstThursday.weekday) + 7) % 7);
firstThursday = DateTime(checkDate.year, DateTime.january, 1 + ((4 - firstThursday.weekday) + 7) % 7);
}

// The weeknumber is the number of weeks between the
Expand All @@ -105,11 +96,9 @@ class EsDayPickerComponent {
var initDate = datePicker.initDate;
num year = initDate.year;
num month = initDate.month;
var firstDayOfMonth =
DateTime(year, month, 1 - DateTime(year, month, 1, 12).weekday, 12);
var firstDayOfMonth = DateTime(year, month, 1 - DateTime(year, month, 1, 12).weekday, 12);
var difference = datePicker.startingDay - firstDayOfMonth.day;
var numDisplayedFromPreviousMonth =
(difference > 0) ? 7 - difference : -difference;
var numDisplayedFromPreviousMonth = (difference > 0) ? 7 - difference : -difference;
var firstDate = firstDayOfMonth;
if (numDisplayedFromPreviousMonth > 0) {
//todo luisvt: not sure what to do with next line
Expand All @@ -119,8 +108,7 @@ class EsDayPickerComponent {
var _days = getDates(firstDate, 42);
var days = <DisplayedDate>[];
for (num i = 0; i < 42; i++) {
var _dateObject =
datePicker.createDateObject(_days[i], datePicker.formatDay);
var _dateObject = datePicker.createDateObject(_days[i], datePicker.formatDay);
_dateObject.secondary = _days[i].month != month;
days.add(_dateObject);
}
Expand All @@ -132,17 +120,14 @@ class EsDayPickerComponent {
});
}
initializeDateFormatting(locale);
monthTitle =
DateFormat(datePicker.formatMonthTitle, locale).format(initDate);
monthTitle = DateFormat(datePicker.formatMonthTitle, locale).format(initDate);
yearTitle = DateFormat(datePicker.formatYear, locale).format(initDate);
rows = datePicker.split(days, 7);
//if (datePicker.showWeeks) {
weekNumbers.clear();
num thursdayIndex = (4 + 7 - datePicker.startingDay) % 7,
numWeeks = rows.length;
num thursdayIndex = (4 + 7 - datePicker.startingDay) % 7, numWeeks = rows.length;
for (num curWeek = 0; curWeek < numWeeks; curWeek++) {
weekNumbers
.add(getISO8601WeekNumber(rows[curWeek][thursdayIndex].date) + 1);
weekNumbers.add(getISO8601WeekNumber(rows[curWeek][thursdayIndex].date) + 1);
}
//}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/datepicker/month_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class EsMonthPickerComponent {
{'btn-primary': dt.selected, 'btn-light': !dt.selected, 'active': dt.current, 'disabled': dt.disabled};

void refreshViewHandler() {
var months = List<DisplayedDate>(12);
var months = List<DisplayedDate>.filled(12, null);
var initDate = datePicker.initDate;
num year = initDate.year;
DateTime date;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/datepicker/year_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class EsYearPickerComponent {
bool isCurrentRowSelected(DisplayedDate dt) => dt.current && !dt.selected;

void refreshViewHandler() {
var years = List<DisplayedDate>(datePicker.yearRange);
var years = List<DisplayedDate>.filled(datePicker.yearRange, null);
DateTime date;
var initDate = datePicker.initDate;
for (var i = 0, start = getStartingYear(initDate.year); i < datePicker.yearRange; i++) {
Expand Down
10 changes: 2 additions & 8 deletions lib/src/dropdown/toggle.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import 'dart:async';

import 'package:angular/angular.dart';
import 'dart:html';
import 'dropdown.dart';

/// Creates a component that will toggle the state of a dropdown-menu,
/// in other words when clicked will open or close the dropdown-menu
@Directive(
selector: 'es-dropdown-toggle, .dropdown-toggle',
exportAs: 'esdropdowntoggle')
@Directive(selector: 'es-dropdown-toggle, .dropdown-toggle', exportAs: 'esdropdowntoggle')
class EsDropdownToggleDirective {
EsDropdownDirective dropdown;

Expand Down Expand Up @@ -40,9 +36,7 @@ class EsDropdownToggleDirective {
document.querySelectorAll('es-dropdown.show')?.forEach((e) {
if (elementRef.parent != e) {
e.classes.remove('show');
e
.querySelector('es-dropdown-toggle')
?.setAttribute('aria-expanded', 'false');
e.querySelector('es-dropdown-toggle')?.setAttribute('aria-expanded', 'false');
}
});

Expand Down
10 changes: 4 additions & 6 deletions lib/src/multi_select_tree/model/multi_select_tree_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ class MultiSelectTreeNode {
bool showOtherProperties;
List<MultiSelectTreeNode> children;

MultiSelectTreeNode(
String name, bool otherProperties, List<dynamic> children) {
MultiSelectTreeNode(String name, bool otherProperties, List<dynamic> children) {
this.name = name;
// ignore: prefer_collection_literals
this.children = List<MultiSelectTreeNode>();

this.children = <MultiSelectTreeNode>[];
showChildren = false;
isRoot = false;
isSelected = false;
Expand All @@ -20,8 +19,7 @@ class MultiSelectTreeNode {
if (children != null) {
for (var node in children) {
// ignore: omit_local_variable_types
MultiSelectTreeNode t = MultiSelectTreeNode(
node.name, node.showOtherProperties, node.children);
MultiSelectTreeNode t = MultiSelectTreeNode(node.name, node.showOtherProperties, node.children);
this.children.add(t);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/multi_select_tree/multi_select_tree.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MultiSelectTreeComponent implements OnInit, OnDestroy {
MultiSelectTreeComponent(this._treeService);

// ignore: prefer_collection_literals
List<MultiSelectTreeNode> rootNodeList = List<MultiSelectTreeNode>();
List<MultiSelectTreeNode> rootNodeList = <MultiSelectTreeNode>[];
StreamController<List<MultiSelectTreeNode>> propagateController = StreamController<List<MultiSelectTreeNode>>();

@Input('data')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TreeNodeComponent {
TreeNodeComponent(this._treeService);

// ignore: prefer_collection_literals
List<MultiSelectTreeNode> selectedNodes = List<MultiSelectTreeNode>();
List<MultiSelectTreeNode> selectedNodes = <MultiSelectTreeNode>[];

@Input('node')
MultiSelectTreeNode node;
Expand All @@ -30,20 +30,17 @@ class TreeNodeComponent {
n.showChildren = !n.showChildren;
}

void handleIndeterminate(MultiSelectTreeNode n, MultiSelectTreeNode parent,
bool isIndeterminateState) {
void handleIndeterminate(MultiSelectTreeNode n, MultiSelectTreeNode parent, bool isIndeterminateState) {
n.isIndeterminate = isIndeterminateState;
updateParentIndeterminate(parent, isIndeterminateState);
}

void updateParentIndeterminate(
MultiSelectTreeNode node, bool isIndeterminate) {
void updateParentIndeterminate(MultiSelectTreeNode node, bool isIndeterminate) {
if (node == null) return;
node.isIndeterminate = isIndeterminate;
}

void selectNode(
MultiSelectTreeNode n, MultiSelectTreeNode parent, bool isChecked) {
void selectNode(MultiSelectTreeNode n, MultiSelectTreeNode parent, bool isChecked) {
n.isSelected = isChecked;
__updateChildren(n, isChecked);
__updateParent(n, parent, isChecked);
Expand All @@ -60,8 +57,7 @@ class TreeNodeComponent {
}
}

void __updateParent(
MultiSelectTreeNode n, MultiSelectTreeNode parent, bool isChecked) {
void __updateParent(MultiSelectTreeNode n, MultiSelectTreeNode parent, bool isChecked) {
if (parent != null) {
// ignore: omit_local_variable_types
List<MultiSelectTreeNode> siblings = parent.getChildren();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import '../model/multi_select_tree_model.dart';

@Injectable()
class TreeService {
StreamController<List<MultiSelectTreeNode>> streamController =
StreamController<List<MultiSelectTreeNode>>();
StreamController<List<MultiSelectTreeNode>> streamController = StreamController<List<MultiSelectTreeNode>>();
// ignore: prefer_collection_literals
final List<MultiSelectTreeNode> _selectedNodes = List<MultiSelectTreeNode>();
final List<MultiSelectTreeNode> _selectedNodes = <MultiSelectTreeNode>[];
List<MultiSelectTreeNode> getSelectedNodes() {
return _selectedNodes;
}
Expand Down

0 comments on commit 358480c

Please sign in to comment.