Skip to content

Commit 8340f5d

Browse files
committed
Fixed some hash, equal overrides and missing nulls
1 parent 7f37917 commit 8340f5d

File tree

5 files changed

+55
-2
lines changed

5 files changed

+55
-2
lines changed

lib/domain/gcode_macro.dart

+17
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,21 @@ class GCodeMacro {
2222
String toString() {
2323
return 'GCodeMacro{name: $name, uuid: $uuid, showWhilePrinting: $showWhilePrinting}';
2424
}
25+
26+
@override
27+
bool operator ==(Object other) =>
28+
identical(this, other) ||
29+
other is GCodeMacro &&
30+
runtimeType == other.runtimeType &&
31+
name == other.name &&
32+
uuid == other.uuid &&
33+
visible == other.visible &&
34+
showWhilePrinting == other.showWhilePrinting;
35+
36+
@override
37+
int get hashCode =>
38+
name.hashCode ^
39+
uuid.hashCode ^
40+
visible.hashCode ^
41+
showWhilePrinting.hashCode;
2542
}

lib/domain/macro_group.dart

+12
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,16 @@ class MacroGroup {
2222
String toString() {
2323
return 'MacroGroup{name: $name, uuid: $uuid}';
2424
}
25+
26+
@override
27+
bool operator ==(Object other) =>
28+
identical(this, other) ||
29+
other is MacroGroup &&
30+
runtimeType == other.runtimeType &&
31+
name == other.name &&
32+
uuid == other.uuid &&
33+
macros == other.macros;
34+
35+
@override
36+
int get hashCode => name.hashCode ^ uuid.hashCode ^ macros.hashCode;
2537
}

lib/domain/printer_setting.dart

+10-2
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,14 @@ class PrinterSetting extends HiveObject {
172172
extrudeSteps == other.extrudeSteps &&
173173
lastPrintProgress == other.lastPrintProgress &&
174174
_lastPrintState == other._lastPrintState &&
175+
macroGroups == other.macroGroups &&
176+
fcmIdentifier == other.fcmIdentifier &&
177+
lastModified == other.lastModified &&
175178
_webSocket == other._webSocket &&
176179
_printerService == other._printerService &&
177180
_klippyService == other._klippyService &&
178-
_fileService == other._fileService;
181+
_fileService == other._fileService &&
182+
_databaseService == other._databaseService;
179183

180184
@override
181185
int get hashCode =>
@@ -195,8 +199,12 @@ class PrinterSetting extends HiveObject {
195199
extrudeSteps.hashCode ^
196200
lastPrintProgress.hashCode ^
197201
_lastPrintState.hashCode ^
202+
macroGroups.hashCode ^
203+
fcmIdentifier.hashCode ^
204+
lastModified.hashCode ^
198205
_webSocket.hashCode ^
199206
_printerService.hashCode ^
200207
_klippyService.hashCode ^
201-
_fileService.hashCode;
208+
_fileService.hashCode ^
209+
_databaseService.hashCode;
202210
}

lib/domain/temperature_preset.dart

+14
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,18 @@ class TemperaturePreset {
2020
String toString() {
2121
return 'TemperatureTemplate{name: $name, uuid: $uuid, bedTemp: $bedTemp, extruderTemp: $extruderTemp}';
2222
}
23+
24+
@override
25+
bool operator ==(Object other) =>
26+
identical(this, other) ||
27+
other is TemperaturePreset &&
28+
runtimeType == other.runtimeType &&
29+
name == other.name &&
30+
uuid == other.uuid &&
31+
bedTemp == other.bedTemp &&
32+
extruderTemp == other.extruderTemp;
33+
34+
@override
35+
int get hashCode =>
36+
name.hashCode ^ uuid.hashCode ^ bedTemp.hashCode ^ extruderTemp.hashCode;
2337
}

lib/dto/files/gcode_file.dart

+2
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,13 @@ class GCodeFile {
8787
String? get smallImagePath {
8888
//ToDo: Filter for small <.<
8989
if (thumbnails.isNotEmpty) return thumbnails.first.relativePath;
90+
return null;
9091
}
9192

9293
String? get bigImagePath {
9394
//ToDo: Filter for big <.<
9495
if (thumbnails.isNotEmpty) return thumbnails.last.relativePath;
96+
return null;
9597
}
9698

9799
DateTime? get modifiedDate {

0 commit comments

Comments
 (0)