Skip to content

Commit

Permalink
Implement: Use EEquatableMixin to instead of operator overloading
Browse files Browse the repository at this point in the history
  • Loading branch information
ntut-xuan committed Feb 12, 2024
1 parent c0d8d0a commit 4aa1390
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 20 deletions.
24 changes: 7 additions & 17 deletions lib/src/model/course/course_semester.dart
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
// TODO: remove sdk version selector after migrating to null-safety.
// @dart=2.10
import 'package:equatable/equatable.dart';
import 'package:flutter_app/src/model/json_init.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:sprintf/sprintf.dart';

part 'course_semester.g.dart';

@JsonSerializable()
class SemesterJson {
class SemesterJson with EquatableMixin {
String year;
String semester;

SemesterJson({this.year, this.semester}) {
SemesterJson({required this.year, required this.semester}) {
year = JsonInit.stringInit(year);
semester = JsonInit.stringInit(semester);
}
Expand All @@ -30,17 +29,8 @@ class SemesterJson {
}

@override
bool operator ==(dynamic other) {
if (other is! SemesterJson) {
return false;
}

final isSemesterSame = int.tryParse(other.semester) == int.tryParse(semester);
final isYearSame = int.tryParse(other.year) == int.tryParse(year);

return isSemesterSame && isYearSame;
}

@override
int get hashCode => Object.hashAll([semester.hashCode, year.hashCode]);
List<Object?> get props => [
year,
semester
];
}
2 changes: 0 additions & 2 deletions lib/src/model/course/course_semester.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ packages:
source: hosted
version: "2.1.17"
equatable:
dependency: transitive
dependency: "direct main"
description:
name: equatable
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ dependencies:
uuid: ^4.1.0
intl_utils: ^2.8.5
flutter_native_splash: ^2.2.19 # restricted by path 1.8.2
equatable: ^2.0.5


dependency_overrides:
Expand Down

0 comments on commit 4aa1390

Please sign in to comment.