rename: v2

lib/acts/act_service.dart

@@ -27,9 +27,7 @@ class ActService {
             actOrderBy: ActOrderBy.descStart,
             offset: offset,
             limit: limit,
-          ))
-              // .map((e) => e.toV1())
-              .toList(),
+          )),
           await _actRepository.count(memId: memId),
         ),
         {

lib/components/date_and_time/date_and_time_period_view.dart

@@ -58,7 +58,7 @@ class DateAndTimePeriodTextFormFields extends StatelessWidget {
           direction: Axis.vertical,
           mainAxisSize: MainAxisSize.min,
           children: [
-            DateAndTimeTextFormFieldV2(
+            DateAndTimeTextFormField(
               _dateAndTimePeriod?.start,
               (pickedDateAndTime) => v(
                 () =>
@@ -76,7 +76,7 @@ class DateAndTimePeriodTextFormFields extends StatelessWidget {
                       end: _dateAndTimePeriod?.end,
                     ),
             ),
-            DateAndTimeTextFormFieldV2(
+            DateAndTimeTextFormField(
               _dateAndTimePeriod?.end,
               (pickedDateAndTime) => v(
                 () => _dateAndTimePeriod?.start == null &&

lib/components/date_and_time/date_and_time_text_form_field.dart

@@ -5,12 +5,12 @@ import 'package:mem/core/date_and_time/date_and_time.dart';
 import 'package:mem/core/date_and_time/date_and_time_period.dart';
 import 'package:mem/logger/log_service.dart';
 
-class DateAndTimeTextFormFieldV2 extends StatelessWidget {
+class DateAndTimeTextFormField extends StatelessWidget {
   final DateAndTime? _dateAndTime;
   final void Function(DateAndTime? pickedDateAndTime) _onChanged;
   final DateAndTimePeriod? _selectableRange;
 
-  const DateAndTimeTextFormFieldV2(
+  const DateAndTimeTextFormField(
     this._dateAndTime,
     this._onChanged, {
     super.key,

lib/components/mem/list/states.dart

@@ -253,11 +253,9 @@ final savedMemNotificationsProvider = StateNotifierProvider.autoDispose<
 
 final activeActsProvider = StateNotifierProvider.autoDispose<
     ListValueStateNotifier<SavedActEntity>, List<SavedActEntity>>(
-  (ref) => v(() => ListValueStateNotifier(
-        ref
-            .watch(actsProvider)
-            // .map((e) => e.toV1())
-            .where((act) => act.isActive)
-            .toList(),
-      )),
+  (ref) => v(
+    () => ListValueStateNotifier(
+      ref.watch(actsProvider).where((act) => act.isActive).toList(),
+    ),
+  ),
 );

lib/core/mem_item.dart

@@ -2,10 +2,10 @@ enum MemItemType {
   memo,
 }
 
-class MemItemV2 {
+class MemItem {
   final int? memId;
   final MemItemType type;
   final dynamic value;
 
-  MemItemV2(this.memId, this.type, this.value);
+  MemItem(this.memId, this.type, this.value);
 }

lib/notifications/notification/notification.dart

@@ -2,13 +2,13 @@ import 'package:mem/framework/repository/entity.dart';
 import 'package:mem/framework/repository/key_with_value.dart';
 import 'package:mem/notifications/notification/channel.dart';
 
-class NotificationV2 with Entity, KeyWithValue<int, Map<String, dynamic>> {
+class Notification with Entity, KeyWithValue<int, Map<String, dynamic>> {
   final String title;
   final String body;
   final NotificationChannel channel;
   final Map<String, dynamic> payload;
 
-  NotificationV2(
+  Notification(
     int id,
     this.title,
     this.body,

lib/notifications/notification_channels.dart

@@ -16,7 +16,7 @@ class NotificationChannels {
 
   late final Map<String, NotificationAction> actionMap;
 
-  Future<NotificationV2> buildNotification(
+  Future<Notification> buildNotification(
     NotificationType notificationType,
     int memId,
   ) =>
@@ -52,7 +52,7 @@ class NotificationChannels {
               break;
           }
 
-          return NotificationV2(
+          return Notification(
             notificationType.buildNotificationId(memId),
             title,
             body,

lib/notifications/notification_repository.dart

@@ -9,15 +9,15 @@ import 'package:mem/values/paths.dart';
 import 'notification/notification.dart';
 import 'flutter_local_notifications_wrapper.dart';
 
-class NotificationRepository extends KeyWithValueRepository<NotificationV2, int>
+class NotificationRepository extends KeyWithValueRepository<Notification, int>
     with DiscardAll {
   final FlutterLocalNotificationsWrapper? _flutterLocalNotificationsWrapper =
       defaultTargetPlatform == TargetPlatform.android
           ? FlutterLocalNotificationsWrapper(androidDefaultIconPath)
           : null;
 
   @override
-  Future<void> receive(NotificationV2 entity) => v(
+  Future<void> receive(Notification entity) => v(
         () async {
           if (await PermissionHandlerWrapper().grant(Permission.notification)) {
             await _flutterLocalNotificationsWrapper?.show(

lib/repositories/mem_item_entity.dart

@@ -3,7 +3,7 @@ import 'package:mem/databases/table_definitions/mem_items.dart';
 import 'package:mem/framework/repository/database_tuple_entity.dart';
 import 'package:mem/framework/repository/entity.dart';
 
-class MemItemEntity extends MemItemV2 with Entity, Copyable<MemItemEntity> {
+class MemItemEntity extends MemItem with Entity, Copyable<MemItemEntity> {
   MemItemEntity(super.memId, super.type, super.value);
 
   MemItemEntity.fromMap(Map<String, dynamic> map)

test/components/date_and_time/date_and_time_period_text_form_fields_test.dart

@@ -12,14 +12,14 @@ void main() {
 
   for (final testCase in [
     TestCase(
-      'pick start',
+      name: 'pick start',
       DateAndTimePeriod(start: DateAndTime.from(now)),
-      (input) => null,
+      null,
     ),
     TestCase(
-      'pick end',
+      name: 'pick end',
       DateAndTimePeriod(end: DateAndTime.from(now)),
-      (input) => null,
+      null,
     ),
   ]) {
     testWidgets(

test/components/date_and_time/date_and_time_text_form_field_test.dart

@@ -17,7 +17,7 @@ void main() {
   }) async {
     await widgetTester.pumpWidget(MaterialApp(
       home: Scaffold(
-        body: DateAndTimeTextFormFieldV2(
+        body: DateAndTimeTextFormField(
           dateAndTime,
           onChanged,
           selectableRange: selectableRange,

test/core/date_and_time_period_test.dart

@@ -266,7 +266,7 @@ void main() {
 
   group(": compare", () {
     for (var testCase in [
-      TestCaseV2(
+      TestCase(
         name: "both are not null",
         [
           DateAndTimePeriod.startNow(),
@@ -275,17 +275,17 @@ void main() {
         DateAndTimePeriod.startNow()
             .compareTo(DateAndTimePeriod(end: DateAndTime.now())),
       ),
-      TestCaseV2(
+      TestCase(
         name: "both are null",
         [null, null],
         0,
       ),
-      TestCaseV2(
+      TestCase(
         name: "a is null, b is not null",
         [null, DateAndTimePeriod.startNow()],
         1,
       ),
-      TestCaseV2(
+      TestCase(
         name: "a is not null, b is null",
         [DateAndTimePeriod.startNow(), null],
         -1,

test/helpers.dart

@@ -44,20 +44,12 @@ Widget buildTestAppWithProvider(
       child: buildTestApp(widget),
     );
 
-class TestCaseV2<I> {
-  final I input;
-  final dynamic expected;
+class TestCase<INPUT, EXPECTED> {
+  final INPUT input;
+  final EXPECTED expected;
   final String? name;
 
-  TestCaseV2(this.input, this.expected, {this.name});
-}
-
-class TestCase<T> {
-  final String name;
-  final T input;
-  final Function(T input) verify;
-
-  TestCase(this.name, this.input, this.verify);
+  TestCase(this.input, this.expected, {this.name});
 }
 
 // Finders