full ui rework, configurable path, archive old code

Pebkac03 · Aug 7, 2024 · cc9965c · cc9965c
1 parent d893db4
commit cc9965c
Show file tree

Hide file tree

Showing 45 changed files with 991 additions and 235 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "explorer.fileNesting.enabled": true,
     "explorer.fileNesting.patterns": {
         "*.dart": "${capture}.mobile.dart, ${capture}.tablet.dart, ${capture}.desktop.dart, ${capture}.form.dart, ${capture}.g.dart, ${capture}.freezed.dart, ${capture}.logger.dart, ${capture}.locator.dart, ${capture}.router.dart, ${capture}.dialogs.dart, ${capture}.bottomsheets.dart"
-    }
+    },
+    "cmake.configureOnOpen": false
 }
 
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -1,21 +1,23 @@
+import 'package:espanso_gui_v2/services/espanso_matches_service.dart';
+import 'package:espanso_gui_v2/services/file_service.dart';
+import 'package:espanso_gui_v2/services/theme_service.dart';
+import 'package:espanso_gui_v2/services/theme_service_service.dart';
+import 'package:espanso_gui_v2/ui/archive/espanso/espanso_view.dart';
 import 'package:espanso_gui_v2/ui/bottom_sheets/notice/notice_sheet.dart';
 import 'package:espanso_gui_v2/ui/dialogs/info_alert/info_alert_dialog.dart';
+import 'package:espanso_gui_v2/ui/views/espanso_new/espanso_new_view.dart';
 import 'package:espanso_gui_v2/ui/views/home/home_view.dart';
 import 'package:espanso_gui_v2/ui/views/startup/startup_view.dart';
 import 'package:stacked/stacked_annotations.dart';
 import 'package:stacked_services/stacked_services.dart';
-import 'package:espanso_gui_v2/ui/views/espanso/espanso_view.dart';
-import 'package:espanso_gui_v2/services/espanso_matches_service.dart';
-import 'package:espanso_gui_v2/services/file_service.dart';
-import 'package:espanso_gui_v2/services/theme_service_service.dart';
-import 'package:espanso_gui_v2/services/theme_service.dart';
 // @stacked-import
 
 @StackedApp(
   routes: [
     MaterialRoute(page: HomeView),
     MaterialRoute(page: StartupView),
     MaterialRoute(page: EspansoView),
+    MaterialRoute(page: EspansoNewView),
 // @stacked-route
   ],
   dependencies: [

diff --git a/lib/app/app.router.dart b/lib/app/app.router.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,8 @@
-import 'package:flutter/material.dart';
 import 'package:espanso_gui_v2/app/app.bottomsheets.dart';
 import 'package:espanso_gui_v2/app/app.dialogs.dart';
 import 'package:espanso_gui_v2/app/app.locator.dart';
 import 'package:espanso_gui_v2/app/app.router.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -25,7 +25,7 @@ class MainApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      initialRoute: Routes.espansoView,
+      initialRoute: Routes.espansoNewView,
       onGenerateRoute: StackedRouter().onGenerateRoute,
       navigatorKey: StackedService.navigatorKey,
       navigatorObservers: [

diff --git a/lib/models/espanso_match_model.freezed.dart b/lib/models/espanso_match_model.freezed.dart
@@ -62,7 +62,9 @@ mixin _$EspansoMatch {
   /// list of variables
   set variables(List<dynamic> value) => throw _privateConstructorUsedError;
 
-  @JsonKey(ignore: true)
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   $EspansoMatchCopyWith<EspansoMatch> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -96,6 +98,8 @@ class _$EspansoMatchCopyWithImpl<$Res, $Val extends EspansoMatch>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -139,6 +143,8 @@ class _$EspansoMatchCopyWithImpl<$Res, $Val extends EspansoMatch>
     ) as $Val);
   }
 
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $EspansoTriggerFieldCopyWith<$Res> get trigger {
@@ -147,6 +153,8 @@ class _$EspansoMatchCopyWithImpl<$Res, $Val extends EspansoMatch>
     });
   }
 
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $EspansoReplaceFieldCopyWith<$Res> get replace {
@@ -187,6 +195,8 @@ class __$$EspansoMatchImplCopyWithImpl<$Res>
       _$EspansoMatchImpl _value, $Res Function(_$EspansoMatchImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -279,7 +289,9 @@ class _$EspansoMatchImpl extends _EspansoMatch {
     return 'EspansoMatch(trigger: $trigger, replace: $replace, label: $label, propagateCase: $propagateCase, titleCase: $titleCase, onlyOnWord: $onlyOnWord, variables: $variables)';
   }
 
-  @JsonKey(ignore: true)
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
   _$$EspansoMatchImplCopyWith<_$EspansoMatchImpl> get copyWith =>
@@ -297,61 +309,63 @@ abstract class _EspansoMatch extends EspansoMatch {
       required List<dynamic> variables}) = _$EspansoMatchImpl;
   _EspansoMatch._() : super._();
 
-  @override
-
   /// string to trigger expansion
+  @override
   EspansoTriggerField get trigger;
 
   /// string to trigger expansion
   set trigger(EspansoTriggerField value);
-  @override
 
   /// what the trigger expands to
+  @override
   EspansoReplaceField get replace;
 
   /// what the trigger expands to
   set replace(EspansoReplaceField value);
-  @override
 
   /// The label to display as the match's identifier in UI elements.
   ///
   /// If empty, defaults to first trigger.
+  @override
   String get label;
 
   /// The label to display as the match's identifier in UI elements.
   ///
   /// If empty, defaults to first trigger.
   set label(String value);
-  @override
 
   /// ex. alh - although, Alh - Although, ALH - ALTHOUGH
+  @override
   bool get propagateCase;
 
   /// ex. alh - although, Alh - Although, ALH - ALTHOUGH
   set propagateCase(bool value);
-  @override
 
   /// if propagateCase should capitalize each word. `false` by default
+  @override
   bool get titleCase;
 
   /// if propagateCase should capitalize each word. `false` by default
   set titleCase(bool value);
-  @override
 
   /// only trigger on matching word
+  @override
   bool get onlyOnWord;
 
   /// only trigger on matching word
   set onlyOnWord(bool value);
-  @override
 
   /// list of variables
+  @override
   List<dynamic> get variables;
 
   /// list of variables
   set variables(List<dynamic> value);
+
+  /// Create a copy of EspansoMatch
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   _$$EspansoMatchImplCopyWith<_$EspansoMatchImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }