Revert "Merge branch 'mve3' into main"

This reverts commit 01db066, reversing
changes made to 3bf0ccf.

Author: minikin

catalyst_voices/apps/voices/lib/common/formatters/date_formatter.dart

@@ -10,14 +10,10 @@ abstract class DateFormatter {
   /// - Yesterday
   /// - 2 days ago
   /// - Other cases: yMMMMd date format.
-  static String formatRecentDate(
-    VoicesLocalizations l10n,
-    DateTime dateTime, {
-    DateTime? from,
-  }) {
-    from ??= DateTimeExt.now();
+  static String formatRecentDate(VoicesLocalizations l10n, DateTime dateTime) {
+    final now = DateTimeExt.now();
 
-    final today = DateTime(from.year, from.month, from.day, 12);
+    final today = DateTime(now.year, now.month, now.day, 12);
     if (dateTime.isSameDateAs(today)) return l10n.today;
 
     final tomorrow = today.plusDays(1);
@@ -31,23 +27,4 @@ abstract class DateFormatter {
 
     return DateFormat.yMMMMd().format(dateTime);
   }
-
-  static String formatInDays(
-    VoicesLocalizations l10n,
-    DateTime dateTime, {
-    DateTime? from,
-  }) {
-    from ??= DateTimeExt.now();
-
-    final days = dateTime.isAfter(from) ? dateTime.difference(from).inDays : 0;
-
-    return l10n.inXDays(days);
-  }
-
-  static String formatShortMonth(
-    VoicesLocalizations l10n,
-    DateTime dateTime,
-  ) {
-    return DateFormat.MMM().format(dateTime);
-  }
 }

catalyst_voices/apps/voices/lib/pages/account/unlock_keychain_dialog.dart

@@ -155,7 +155,6 @@ class _UnlockPassword extends StatelessWidget {
   Widget build(BuildContext context) {
     return VoicesPasswordTextField(
       controller: controller,
-      autofocus: true,
       decoration: VoicesTextFieldDecoration(
         labelText: context.l10n.unlockDialogHint,
         errorText: error?.message(context),

catalyst_voices/apps/voices/lib/pages/workspace/workspace_guidance_view.dart

@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 
 class GuidanceView extends StatefulWidget {
   final List<Guidance> guidances;
-
   const GuidanceView(this.guidances, {super.key});
 
   @override
@@ -19,6 +18,25 @@ class _GuidanceViewState extends State<GuidanceView> {
 
   GuidanceType? selectedType;
 
+  @override
+  void initState() {
+    super.initState();
+    filteredGuidances
+      ..clear()
+      ..addAll(widget.guidances);
+  }
+
+  @override
+  void didUpdateWidget(GuidanceView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.guidances != widget.guidances) {
+      filteredGuidances
+        ..clear()
+        ..addAll(widget.guidances);
+      _filterGuidances(selectedType);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -56,25 +74,6 @@ class _GuidanceViewState extends State<GuidanceView> {
     );
   }
 
-  @override
-  void didUpdateWidget(GuidanceView oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.guidances != widget.guidances) {
-      filteredGuidances
-        ..clear()
-        ..addAll(widget.guidances);
-      _filterGuidances(selectedType);
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    filteredGuidances
-      ..clear()
-      ..addAll(widget.guidances);
-  }
-
   void _filterGuidances(GuidanceType? type) {
     selectedType = type;
     filteredGuidances

catalyst_voices/apps/voices/lib/widgets/empty_state/empty_state.dart

@@ -1,5 +1,4 @@
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
-import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:flutter/material.dart';
 
 /// A menu of the app that
@@ -69,7 +68,7 @@ class _MenuButton extends StatelessWidget {
 
     final textStyle = textTheme.bodyMedium?.copyWith(
       color:
-          menuItem.isEnabled ? textTheme.bodySmall?.color : theme.disabledColor,
+          menuItem.enabled ? textTheme.bodySmall?.color : theme.disabledColor,
     );
 
     final children = menuChildren;
@@ -86,7 +85,7 @@ class _MenuButton extends StatelessWidget {
                     child: IconTheme(
                       data: IconThemeData(
                         size: 24,
-                        color: menuItem.isEnabled
+                        color: menuItem.enabled
                             ? textTheme.bodySmall?.color
                             : theme.disabledColor,
                       ),
@@ -139,29 +138,32 @@ class _MenuButton extends StatelessWidget {
 }
 
 /// Model representing Menu Item
-final class MenuItem extends BasicPopupMenuItem {
-  const MenuItem({
-    required super.id,
-    required super.label,
-    super.isEnabled = true,
-    super.icon,
-    super.showDivider = false,
+class MenuItem {
+  final int id;
+  final String label;
+  final Widget? icon;
+  final bool showDivider;
+  final bool enabled;
+
+  MenuItem({
+    required this.id,
+    required this.label,
+    this.icon,
+    this.showDivider = false,
+    this.enabled = true,
   });
 }
 
 /// Model representing Submenu Item
 /// and extending from MenuItem
-final class SubMenuItem extends MenuItem {
-  final List<MenuItem> children;
+class SubMenuItem extends MenuItem {
+  List<MenuItem> children;
 
-  const SubMenuItem({
+  SubMenuItem({
     required super.id,
     required super.label,
     required this.children,
     super.icon,
     super.showDivider,
   });
-
-  @override
-  List<Object?> get props => super.props + [children];
 }