Refactor: models

lib/common/enums.dart

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-abstract class EnumWithDBCodeABC<T> {
+abstract interface class EnumWithDBCode<T> {
   int get dbCode;
 }
 
-enum HabitsRecordScrollBehavior implements EnumWithDBCodeABC {
+enum HabitsRecordScrollBehavior implements EnumWithDBCode {
   unknown(code: 0),
   scrollable(code: 1),
   page(code: 2);
@@ -54,7 +54,7 @@ enum DonateWay {
   }
 }
 
-enum UserAction implements EnumWithDBCodeABC {
+enum UserAction implements EnumWithDBCode {
   nothing(code: 0),
   tap(code: 1),
   doubleTap(code: 2),

lib/common/rules.dart

@@ -20,7 +20,6 @@ import 'types.dart';
 HabitDailyGoal onDailyGoalTextInputChanged(
   num newDailyGoal, {
   required TextEditingController controller,
-  num defaultValue = defaultHabitDailyGoal,
   num maxValue = maxHabitdailyGoal,
   bool allowInputZero = false,
 }) {

lib/model/app_reminder_config.dart

@@ -24,7 +24,7 @@ import 'common.dart';
 part 'app_reminder_config.g.dart';
 
 @JsonEnum(valueField: "code")
-enum AppReminderConfigType implements EnumWithDBCodeABC<AppReminderConfigType> {
+enum AppReminderConfigType implements EnumWithDBCode<AppReminderConfigType> {
   daily(code: 1);
 
   final int code;
@@ -80,8 +80,7 @@ class AppReminderConfig implements JsonAdaptor {
   }
 
   @override
-  int get hashCode =>
-      hash3(enabled.hashCode, type.hashCode, timeOfDay.hashCode);
+  int get hashCode => hash3(enabled, type, timeOfDay);
 
   @override
   String toString() {

lib/model/cache.dart

@@ -16,7 +16,7 @@ import '../common/types.dart';
 import '../logging/helper.dart';
 import '../persistent/profile/profile_helper.dart';
 
-abstract class Cache<K> {
+abstract interface class Cache<K> {
   T? getCache<T>(K key);
   Future<void> updateCache<T>(K key, T? value,
       {void Function(bool, T?)? onUpdated});

lib/model/custom_date_format.dart

@@ -23,7 +23,7 @@ import 'common.dart';
 part 'custom_date_format.g.dart';
 
 @JsonEnum(valueField: 'code')
-enum YearMonthDayFormtEnum implements EnumWithDBCodeABC {
+enum YearMonthDayFormtEnum implements EnumWithDBCode {
   yearMonthDay(code: 1),
   monthDayYear(code: 2),
   dayMonthYear(code: 3);
@@ -37,7 +37,7 @@ enum YearMonthDayFormtEnum implements EnumWithDBCodeABC {
 }
 
 @JsonEnum(valueField: 'code')
-enum DateSplitCharEnum implements EnumWithDBCodeABC {
+enum DateSplitCharEnum implements EnumWithDBCode {
   dash(code: 1, char: '-'),
   slash(code: 2, char: '/'),
   space(code: 3, char: ' '),

lib/model/habit_date.dart

@@ -146,9 +146,7 @@ class HabitDate implements DateTime, DateTimeExtensionsABC {
   int get hashCode => _date.hashCode;
 
   @override
-  String toString() {
-    return _date.toString();
-  }
+  String toString() => "${_date.year}-${_date.month}-${_date.day}";
 
   @override
   bool operator <(DateTime other) => _date < other;

lib/model/habit_detail_chart.dart

@@ -187,12 +187,12 @@ class HabitDetailFreqChartData {
   }
 
   @override
-  String toString() {
-    return 'HabitDetailFreqChartData(p=$_partiallyCompleted,a=$_autoComplate,'
-        'c=$_complate,o=$_overfulfil || pv=$_partiallyCompletedTotalValue,'
-        'av=$_autoComplateTotalValue,cv=$_complateTotalValue,'
-        'ov=$_overfulfilTotalValue}';
-  }
+  String toString() => 'HabitDetailFreqChartData('
+      'pavo=$_partiallyCompleted|$_autoComplate|$_complate|$_overfulfil,'
+      'pv=$_partiallyCompletedTotalValue,'
+      'av=$_autoComplateTotalValue,'
+      'cv=$_complateTotalValue,'
+      'ov=$_overfulfilTotalValue)';
 }
 
 class HabitDetailScoreChartDate {
@@ -212,8 +212,6 @@ class HabitDetailScoreChartDate {
   }
 
   @override
-  String toString() {
-    return 'HabitDetailScoreChartDate{totalScore: '
-        '$totalScore, count: $count, avgScore: $avgScore}';
-  }
+  String toString() =>
+      'HabitDetailScoreChartDate(ts=$totalScore,c=$count,avs=$avgScore)';
 }

lib/model/habit_display.dart

@@ -26,7 +26,7 @@ import 'habit_summary.dart';
 
 part 'habit_display.g.dart';
 
-enum HabitDisplaySortType implements EnumWithDBCodeABC {
+enum HabitDisplaySortType implements EnumWithDBCode {
   manual(code: 1),
   name(code: 2),
   colorType(code: 3),
@@ -59,7 +59,7 @@ enum HabitDisplaySortType implements EnumWithDBCodeABC {
       ];
 }
 
-enum HabitDisplaySortDirection implements EnumWithDBCodeABC {
+enum HabitDisplaySortDirection implements EnumWithDBCode {
   asc(code: 1),
   desc(code: 2);
 
@@ -82,19 +82,6 @@ enum HabitDisplaySortDirection implements EnumWithDBCodeABC {
 
 enum HabitDisplayEditMode { create, edit }
 
-enum HabitsDisplayFilterKey {
-  // Compatibility with old version configuration options
-  allowInProgressHabits(key: "allowActivedHabits"),
-  allowArchivedHabits(),
-  allowCompleteHabits();
-
-  final String? _key;
-
-  const HabitsDisplayFilterKey({String? key}) : _key = key;
-
-  String get key => _key ?? name;
-}
-
 class HabitDisplayEditParams {
   final HabitUUID uuid;
   final DateTime createT;
@@ -115,16 +102,18 @@ class HabitDisplayEditParams {
 
   @override
   String toString() {
-    return "HabitEditParams($uuid, $createT, $modifyT)";
+    return "HabitEditParams($uuid,$createT,$modifyT)";
   }
 }
 
 @CopyWith()
+@JsonSerializable()
 class HabitsDisplayFilter {
   static const _defaultAllowInProgressHabits = true;
   static const _defualtAllowArchivedHabits = false;
   static const _defaultAllowCompleteHabits = true;
 
+  @JsonKey(name: "allowActivedHabits")
   final bool allowInProgressHabits;
   final bool allowArchivedHabits;
   final bool allowCompleteHabits;
@@ -146,24 +135,10 @@ class HabitsDisplayFilter {
         allowArchivedHabits = _defualtAllowArchivedHabits,
         allowCompleteHabits = _defaultAllowCompleteHabits;
 
-  HabitsDisplayFilter.fromMap(Map<String, Object?> data)
-      : allowInProgressHabits =
-            (data[HabitsDisplayFilterKey.allowInProgressHabits.key] ??
-                _defaultAllowInProgressHabits) as bool,
-        allowArchivedHabits =
-            (data[HabitsDisplayFilterKey.allowArchivedHabits.key] ??
-                _defualtAllowArchivedHabits) as bool,
-        allowCompleteHabits =
-            (data[HabitsDisplayFilterKey.allowCompleteHabits.key] ??
-                _defaultAllowCompleteHabits) as bool;
-
-  Map<String, Object?> toMap() {
-    return {
-      HabitsDisplayFilterKey.allowInProgressHabits.key: allowInProgressHabits,
-      HabitsDisplayFilterKey.allowArchivedHabits.key: allowArchivedHabits,
-      HabitsDisplayFilterKey.allowCompleteHabits.key: allowCompleteHabits,
-    };
-  }
+  factory HabitsDisplayFilter.fromJson(JsonMap data) =>
+      _$HabitsDisplayFilterFromJson(data);
+
+  JsonMap toJson() => _$HabitsDisplayFilterToJson(this);
 
   bool Function(HabitSummaryData) getDisplayFilterFunction() {
     bool func(HabitSummaryData data) {
@@ -195,7 +170,7 @@ class HabitsDisplayFilter {
       hash3(allowInProgressHabits, allowArchivedHabits, allowCompleteHabits);
 
   @override
-  String toString() => "$runtimeType(${toMap()})";
+  String toString() => "$runtimeType(${toJson()})";
 }
 
 @JsonSerializable(