Change id generation

vicolo-dev · Aug 25, 2024 · 1567d70 · 1567d70
1 parent 62f328a
commit 1567d70
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 86 deletions.
diff --git a/lib/alarm/types/alarm_event.dart b/lib/alarm/types/alarm_event.dart
@@ -1,7 +1,7 @@
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
 import 'package:clock_app/common/types/notification_type.dart';
-import 'package:flutter/foundation.dart';
+import 'package:clock_app/common/utils/id.dart';
 
 // enum AlarmEventType{
 //   schedule,
@@ -26,7 +26,7 @@ class AlarmEvent extends ListItem {
     required this.scheduleId,
     required this.startDate,
     required this.isActive,
-  }) : id = UniqueKey().hashCode;
+  }) : id = getId();
 
   AlarmEvent.fromJson(Json json) {
     if (json == null) {

diff --git a/lib/alarm/types/alarm_runner.dart b/lib/alarm/types/alarm_runner.dart
@@ -1,17 +1,17 @@
 import 'package:clock_app/alarm/logic/schedule_alarm.dart';
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/notification_type.dart';
-import 'package:flutter/material.dart';
+import 'package:clock_app/common/utils/id.dart';
 
 class AlarmRunner extends JsonSerializable {
   late int _id;
   DateTime? _currentScheduleDateTime;
 
-  int get id => _id;
+   get id => _id;
   DateTime? get currentScheduleDateTime => _currentScheduleDateTime;
 
   AlarmRunner() {
-    _id = UniqueKey().hashCode;
+    _id = getId();
   }
 
   Future<void> schedule(DateTime dateTime, String description) async {
@@ -27,10 +27,10 @@ class AlarmRunner extends JsonSerializable {
 
   AlarmRunner.fromJson(Json? json) {
     if (json == null) {
-      _id = UniqueKey().hashCode;
+      _id = getId();
       return;
     }
-    _id = json['id'] ?? UniqueKey().hashCode;
+    _id = json['id'] ?? getId();
     int millisecondsSinceEpoch = json['currentScheduleDateTime'] ?? 0;
     _currentScheduleDateTime = millisecondsSinceEpoch == 0
         ? null

diff --git a/lib/alarm/types/alarm_task.dart b/lib/alarm/types/alarm_task.dart
@@ -1,6 +1,7 @@
 import 'package:clock_app/alarm/data/alarm_task_schemas.dart';
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
+import 'package:clock_app/common/utils/id.dart';
 import 'package:clock_app/settings/types/setting_group.dart';
 import 'package:flutter/material.dart';
 
@@ -55,21 +56,21 @@ class AlarmTask extends CustomizableListItem {
 
   AlarmTask(this.type)
       : _schema = alarmTaskSchemasMap[type]!.copy(),
-        _id = UniqueKey().hashCode;
+        _id = getId();
 
   AlarmTask.from(AlarmTask task)
       : type = task.type,
-        _id = UniqueKey().hashCode,
+        _id = getId(),
         _schema = task._schema.copy();
 
   AlarmTask.fromJson(Json json) {
     if (json == null) {
-      _id = UniqueKey().hashCode;
+      _id = getId();
       type = AlarmTaskType.math;
       _schema = alarmTaskSchemasMap[type]!.copy();
       return;
     }
-    _id = json['id'] ?? UniqueKey().hashCode;
+    _id = json['id'] ?? getId();
     type = AlarmTaskType.values.byName(json['type']);
     _schema = alarmTaskSchemasMap[type]!.copy();
     _schema.loadFromJson(json['schema']);

diff --git a/lib/clock/types/city.dart b/lib/clock/types/city.dart
@@ -1,6 +1,6 @@
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
-import 'package:flutter/material.dart';
+import 'package:clock_app/common/utils/id.dart';
 
 class City extends ListItem {
   late String _name = "Unknown";
@@ -17,7 +17,7 @@ class City extends ListItem {
   @override
   bool get isDeletable => true;
 
-  City(this._name, this._country, this._timezone) : _id = UniqueKey().hashCode;
+  City(this._name, this._country, this._timezone) : _id = getId();
 
   @override
   copy() {
@@ -26,13 +26,13 @@ class City extends ListItem {
 
   City.fromJson(Json json) {
     if (json == null) {
-      _id = UniqueKey().hashCode;
+      _id = getId();
       return;
     }
     _name = json['name'] ?? 'Unknown';
     _country = json['country'] ?? 'Unknown';
     _timezone = json['timezone'] ?? 'America/Detroit';
-    _id = json['id'] ?? UniqueKey().hashCode;
+    _id = json['id'] ?? getId();
   }
 
   @override

diff --git a/lib/common/types/file_item.dart b/lib/common/types/file_item.dart
@@ -2,8 +2,7 @@ import 'dart:convert';
 
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
-import 'package:clock_app/common/types/timer_state.dart';
-import 'package:flutter/material.dart';
+import 'package:clock_app/common/utils/id.dart';
 
 enum FileItemType {
   audio,
@@ -33,14 +32,14 @@ class FileItem extends ListItem {
   bool get isDeletable => _isDeletable;
 
   FileItem(this.name, this._uri, this._type, {isDeletable = true})
-      : _id = UniqueKey().hashCode,
+      : _id = getId(),
         _isDeletable = isDeletable;
 
   @override
   FileItem.fromJson(Json json)
       : _id = json != null
-            ? json['id'] ?? UniqueKey().hashCode
-            : UniqueKey().hashCode,
+            ? json['id'] ?? getId()
+            : getId(),
         _type = json != null
             ? json['type'] != null
                 ? FileItemType.values

diff --git a/lib/common/types/list_filter.dart b/lib/common/types/list_filter.dart
@@ -1,5 +1,6 @@
 import 'package:clock_app/common/types/list_item.dart';
 import 'package:clock_app/common/utils/debug.dart';
+import 'package:clock_app/common/utils/id.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -37,7 +38,7 @@ class ListFilter<Item extends ListItem> extends ListFilterItem<Item> {
 
   ListFilter(this.getLocalizedName, bool Function(Item) filterFunction,
       {int? id})
-      : _id = id ?? UniqueKey().hashCode,
+      : _id = id ?? getId(),
         _filterFunction = filterFunction;
 
   int get id => _id;

diff --git a/lib/common/types/tag.dart b/lib/common/types/tag.dart
@@ -1,5 +1,6 @@
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
+import 'package:clock_app/common/utils/id.dart';
 import 'package:flutter/material.dart';
 
 class Tag extends ListItem {
@@ -8,16 +9,16 @@ class Tag extends ListItem {
   String description;
   Color color;
   Tag(this.name, {this.description = "", this.color = Colors.blue})
-      : _id = UniqueKey().hashCode;
+      : _id = getId();
 
   Tag.fromJson(Json json)
-      : _id = json?['id'] ?? UniqueKey().hashCode,
+      : _id = json?['id'] ?? getId(),
         name = json?['name'] ?? "Unknown",
         description = json?['description'] ?? "",
         color = Color(json?['color'] ?? 0);
 
   Tag.from(Tag tag)
-      : _id = UniqueKey().hashCode,
+      : _id = getId(),
         name = tag.name,
         description = tag.description,
         color = tag.color;

diff --git a/lib/common/utils/id.dart b/lib/common/utils/id.dart
@@ -0,0 +1,5 @@
+import 'package:flutter/material.dart';
+
+int getId() {
+  return UniqueKey().hashCode + DateTime.now().microsecondsSinceEpoch;
+}
diff --git a/lib/settings/data/backup_settings_schema.dart b/lib/settings/data/backup_settings_schema.dart
@@ -24,36 +24,36 @@ SettingGroup backupSettingsSchema = SettingGroup(
       "Settings",
       (context) => AppLocalizations.of(context)!.settingsTitle,
       [
-      SettingPageLink("Export", (context) => AppLocalizations.of(context)!.exportSettingsSetting, BackupScreen()),
-      SettingPageLink("Import", (context) => AppLocalizations.of(context)!.importSettingsSetting, BackupScreen()),
-        // SettingAction(
-        //   "Export",
-        //   (context) => AppLocalizations.of(context)!.exportSettingsSetting,
-        //   (context) async {
-        //     saveBackupFile(json.encode(appSettings.valueToJson()), "settings");
-        //   },
-        //   searchTags: ["settings", "export", "backup", "save"],
-        //   getDescription: (context) =>
-        //       AppLocalizations.of(context)!.exportSettingsSettingDescription,
-        // ),
-        // SettingAction(
-        //   "Import",
-        //   (context) => AppLocalizations.of(context)!.importSettingsSetting,
-        //   (context) async {
-        //     loadBackupFile(
-        //       (data) async {
-        //         appSettings.loadValueFromJson(json.decode(data));
-        //         appSettings.callAllListeners();
-        //         App.refreshTheme(context);
-        //         await appSettings.save();
-        //         if (context.mounted) setDigitalClockWidgetData(context);
-        //       },
-        //     );
-        //   },
-        //   searchTags: ["settings", "import", "backup", "load"],
-        //   getDescription: (context) =>
-        //       AppLocalizations.of(context)!.importSettingsSettingDescription,
-        // ),
+      // SettingPageLink("Export", (context) => AppLocalizations.of(context)!.exportSettingsSetting, BackupScreen()),
+      // SettingPageLink("Import", (context) => AppLocalizations.of(context)!.importSettingsSetting, BackupScreen()),
+        SettingAction(
+          "Export",
+          (context) => AppLocalizations.of(context)!.exportSettingsSetting,
+          (context) async {
+            saveBackupFile(json.encode(appSettings.valueToJson()), "settings");
+          },
+          searchTags: ["settings", "export", "backup", "save"],
+          getDescription: (context) =>
+              AppLocalizations.of(context)!.exportSettingsSettingDescription,
+        ),
+        SettingAction(
+          "Import",
+          (context) => AppLocalizations.of(context)!.importSettingsSetting,
+          (context) async {
+            loadBackupFile(
+              (data) async {
+                appSettings.loadValueFromJson(json.decode(data));
+                appSettings.callAllListeners();
+                App.refreshTheme(context);
+                await appSettings.save();
+                if (context.mounted) setDigitalClockWidgetData(context);
+              },
+            );
+          },
+          searchTags: ["settings", "import", "backup", "load"],
+          getDescription: (context) =>
+              AppLocalizations.of(context)!.importSettingsSettingDescription,
+        ),
       ],
     ),
   ],

diff --git a/lib/settings/screens/backup_screen.dart b/lib/settings/screens/backup_screen.dart
@@ -16,14 +16,12 @@ import 'package:clock_app/widgets/logic/update_widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-class SettingCheckBox extends StatelessWidget {
-  const SettingCheckBox(
+class BackupOptionCheckBox extends StatelessWidget {
+  const BackupOptionCheckBox(
       {super.key,
-      required this.settingItem,
-      required this.isChecked,
-      required this.onChanged});
+      required this.option, required this.onChanged});
 
-  final bool isChecked;
+  final BackupOption option;
   final void Function(bool?) onChanged;
 
   @override
@@ -33,11 +31,11 @@ class SettingCheckBox extends StatelessWidget {
         Checkbox(
           // checkColor: Colors.white,
           // fillColor: MaterialStateProperty.resolveWith(getColor),
-          value: isChecked,
+          value: option.selected,
           onChanged: onChanged,
         ),
         Text(
-          settingItem.displayName(context),
+          option.getName(context),
           style: Theme.of(context).textTheme.headlineMedium,
         ),
       ],
@@ -195,13 +193,12 @@ class _BackupExportScreenState extends State<BackupExportScreen> {
                 },
               ),
               const SizedBox(height: 16),
-              ...widget.settingGroup.settingItems.map(
-                (settingItem) => SettingCheckBox(
-                  settingItem: settingItem,
-                  isChecked: _settingsToRestore[settingItem.id] ?? false,
+              ...backupOptions.map(
+                (option) => BackupOptionCheckBox(
+                  option: option,
                   onChanged: (bool? value) {
                     setState(() {
-                      _settingsToRestore[settingItem.id] = value!;
+                      option.selected = value ?? false;
                     });
                   },
                 ),

diff --git a/lib/stopwatch/types/stopwatch.dart b/lib/stopwatch/types/stopwatch.dart
@@ -1,11 +1,11 @@
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/timer_state.dart';
 import 'package:clock_app/common/utils/duration.dart';
+import 'package:clock_app/common/utils/id.dart';
 import 'package:clock_app/common/utils/json_serialize.dart';
 import 'package:clock_app/common/utils/logger.dart';
 import 'package:clock_app/stopwatch/types/lap.dart';
 import 'package:clock_app/timer/types/time_duration.dart';
-import 'package:flutter/material.dart';
 
 // All time units are in milliseconds
 class ClockStopwatch extends JsonSerializable {
@@ -54,7 +54,7 @@ class ClockStopwatch extends JsonSerializable {
   }
 
   ClockStopwatch()
-      : _id = UniqueKey().hashCode,
+      : _id = getId(),
         _elapsedMillisecondsOnPause = 0,
         _startTime = DateTime(0),
         _state = TimerState.stopped;
@@ -63,7 +63,7 @@ class ClockStopwatch extends JsonSerializable {
       : _elapsedMillisecondsOnPause = 0,
         _startTime = DateTime(0),
         _state = TimerState.stopped,
-        _id = UniqueKey().hashCode;
+        _id = getId();
 
   copyFrom(ClockStopwatch stopwatch) {
     _elapsedMillisecondsOnPause = stopwatch._elapsedMillisecondsOnPause;
@@ -153,7 +153,7 @@ class ClockStopwatch extends JsonSerializable {
 
   ClockStopwatch.fromJson(Json json) {
     if (json == null) {
-      _id = UniqueKey().hashCode;
+      _id = getId();
       return;
     }
     _elapsedMillisecondsOnPause = json['elapsedMillisecondsOnPause'] ?? 0;
@@ -163,7 +163,7 @@ class ClockStopwatch extends JsonSerializable {
     _state = TimerState.values.firstWhere(
         (e) => e.toString() == (json['state'] ?? ''),
         orElse: () => TimerState.stopped);
-    _id = json['id'] ?? UniqueKey().hashCode;
+    _id = json['id'] ?? getId();
     // _finishedLaps = [];
     _laps = listFromString(json['laps'] ?? '[]');
     updateFastestAndSlowestLap();

diff --git a/lib/theme/types/theme_item.dart b/lib/theme/types/theme_item.dart
@@ -1,20 +1,20 @@
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/list_item.dart';
+import 'package:clock_app/common/utils/id.dart';
 import 'package:clock_app/settings/types/setting_group.dart';
-import 'package:flutter/material.dart';
 
 abstract class ThemeItem extends CustomizableListItem {
   late int _id;
   SettingGroup _settings;
   bool _isDefault = false;
 
   ThemeItem(SettingGroup defaultSettings, bool isDefault, [int? id])
-      : _id = id ?? UniqueKey().hashCode,
+      : _id = id ?? getId(),
         _settings = defaultSettings,
         _isDefault = isDefault;
 
   ThemeItem.from(ThemeItem themeItem)
-      : _id = UniqueKey().hashCode,
+      : _id = getId(),
         _isDefault = false,
         _settings = themeItem.settings.copy();
 
@@ -45,10 +45,10 @@ abstract class ThemeItem extends CustomizableListItem {
 
   ThemeItem.fromJson(Json json, SettingGroup settings) : _settings = settings {
     if (json == null) {
-      _id = UniqueKey().hashCode;
+      _id = getId();
       return;
     }
-    _id = json['id'] ?? UniqueKey().hashCode;
+    _id = json['id'] ?? getId();
     _isDefault = json['isDefault'] ?? false;
     settings.loadValueFromJson(json['settings']);
   }