reorg and fonts

moved services to app module and added variable fonts

Author: fredgrott

todo_app/domain_layer_non_rxdart/lib/domain_layer_non_rxdart.dart

@@ -8,11 +8,3 @@
  * 
  */
 library domain_layer_non_rxdart;
-
-
-export 'src/init_logging.dart';
-export 'src/services/app_services.dart';
-export 'src/services/asset_image_loading_service.dart';
-export 'src/services/logging_appenders_service.dart';
-export 'src/services/services_provider.dart';
-export 'src/set_up_appenders.dart';

todo_app/domain_layer_non_rxdart/pubspec.yaml

@@ -15,10 +15,7 @@ dependencies:
   equatable: ^2.0.5
   fluent_validation: ^2.1.1
   validators: ^3.0.0
-  logging: ^1.2.0
-  logging_appenders: ^1.2.0+1
-  path_provider: ^2.1.1
-  
+      
 
 
 dev_dependencies:

todo_app/todoapp_vanilla/assets/google_fonts/RobotoFlex-VariableFont_GRAD,XTRA,YOPQ,YTAS,YTDE,YTFI,YTLC,YTUC,opsz,slnt,wdth,wght.ttf

@@ -5,8 +5,9 @@
 
 
 import 'package:catcher/catcher.dart';
-import 'package:todoapp_vanilla/catcher/catcher_report_modes.dart';
-import 'package:todoapp_vanilla/catcher/custom_catcher_logger.dart';
+import 'package:todoapp_vanilla/infrastructure/catcher/catcher_report_modes.dart';
+import 'package:todoapp_vanilla/infrastructure/catcher/custom_catcher_logger.dart';
+
 
 
 CatcherOptions debugOptions = CatcherOptions(pageReportMode, [

todo_app/todoapp_vanilla/assets/google_fonts/RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf

@@ -1,5 +1,7 @@
 
 
+import 'package:flutter/material.dart';
+
 class App {
   // This class is not meant to be instantiated or extended; this constructor
   // prevents instantiation and extension.
@@ -17,4 +19,4 @@ class App {
 
 
 
-}
+}

todo_app/todoapp_vanilla/assets/google_fonts/RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf

@@ -7,14 +7,16 @@
 // license that can be found in the LICENSE file.
 
 import 'package:catcher/core/catcher.dart';
+import 'package:domain_layer_non_rxdart/domain_layer_non_rxdart.dart';
 import 'package:flutter/material.dart';
-import 'package:todoapp_vanilla/catcher/catcher_navigator_key.dart';
-import 'package:todoapp_vanilla/catcher/catcher_options.dart';
+import 'package:todoapp_vanilla/infrastructure/catcher/catcher_navigator_key.dart';
+import 'package:todoapp_vanilla/infrastructure/catcher/catcher_options.dart';
 
 import 'package:todoapp_vanilla/my_app.dart';
 import 'package:todoapp_vanilla/services/app_services.dart';
 import 'package:todoapp_vanilla/services/services_provider.dart';
 
+
 // Flutter 3.3 and beyond we no longer use runGuardedZone
 // Note, there is a move in framework code to
 // supply app initialization callbacks which has not
@@ -28,7 +30,38 @@ import 'package:todoapp_vanilla/services/services_provider.dart';
 // longer used as it slowed down app load time and thus
 // moved to PlatformDispatcher.onError callback which
 // is used in the new Catcher code.
+
+// Theme Persistance Notes:
+// if using hive would be:
+// ```dart
+// class HiveStorage extends SDKThemeStorage {
+//  final box = Hive.box<String>(_boxName);
+//  final key = 'theme';
+//  @override
+//  Future<void> delete() async {
+//    await box.clear();
+//  }
+//
+//  @override
+//  SDLThemeState? read() {
+//    final res = box.get(key);
+//    if (res == null) return null;
+//    return SDKThemeState.fromJson(res);
+//  }
+//
+//  @override
+//  Future<void> write(SDKThemeState state) async {
+//    await box.put(key, state.toJson());
+//  }
+//}
+//
+// ```
+
+
+
+
 Future<void> main() async {
+  // then include hive init in AppServices
   final myServices = await AppServices.initialize();
 
   Catcher(

todo_app/todoapp_vanilla/assets/google_fonts/RobotoSlab-VariableFont_wght.ttf

@@ -4,6 +4,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:todoapp_vanilla/child_widget.dart';
+import 'package:todoapp_vanilla/src/presentation/themes/my_light_hc_flex_color_scheme.dart';
+
 
 class MyApp extends StatefulWidget {
   final GlobalKey<NavigatorState> navigatorKey;
@@ -25,6 +27,7 @@ class _MyAppState extends State<MyApp> {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
       navigatorKey: widget.navigatorKey,
+      highContrastTheme: customLightHCThemeData,
       home: Scaffold(
         appBar: AppBar(
           title: const Text('Plugin example app'),

todo_app/todoapp_vanilla/lib/asset_image_list.dart renamed to todo_app/todoapp_vanilla/lib/infrastructure/asset_image_list.dart

@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import 'package:domain_layer_non_rxdart/src/services/asset_image_loading_service.dart';
-import 'package:domain_layer_non_rxdart/src/services/logging_appenders_service.dart';
-import 'package:domain_layer_non_rxdart/src/services/services_provider.dart';
+
 import 'package:flutter/material.dart';
+import 'package:todoapp_vanilla/services/asset_image_loading_service.dart';
+import 'package:todoapp_vanilla/services/loading_font_service.dart';
+import 'package:todoapp_vanilla/services/logging_appenders_service.dart';
+import 'package:todoapp_vanilla/services/services_provider.dart';
 
 
 class AppServices {
   final LoggingAppendersService loggingAppendersService;
   final AssetImageLoadingService assetImageLoadingService;
+  final LoadingFontService loadingFontService;
 
-  AppServices(this.loggingAppendersService, this.assetImageLoadingService, );
+  AppServices(this.loggingAppendersService, this.assetImageLoadingService, this.loadingFontService );
 
   static Future<AppServices> initialize() async {
 
@@ -23,8 +26,12 @@ class AppServices {
     final assetImageLoadingService = AssetImageLoadingService();
     await assetImageLoadingService.initialize();
 
+
+    final loadingFontService = LoadingFontService();
+    await loadingFontService.initialize();
+
 
-    return AppServices(loggingAppendersService, assetImageLoadingService);
+    return AppServices(loggingAppendersService, assetImageLoadingService, loadingFontService);
   }
 
   static AppServices of(BuildContext context) {

todo_app/todoapp_vanilla/lib/catcher/catcher_navigator_key.dart renamed to todo_app/todoapp_vanilla/lib/infrastructure/catcher/catcher_navigator_key.dart

@@ -0,0 +1,40 @@
+// ignore_for_file: empty_constructor_bodies
+
+import 'package:flutter/services.dart';
+
+class LoadingFontService {
+  LoadingFontService() {}
+
+  Future<void> initialize() async {
+    // I am not updated on the recent AssetManifest API that recently
+    // was added in the Flutter stable channel and so doing it
+    // this way instead.
+    //
+    // Since we are not using GoogleFonts as it is not
+    // fully support variable fonts yet we have to manually
+    // load fonts into the cache
+    final fontDataOne = await rootBundle.load(
+      'assets/google_fonts/RobotoFlex-VariableFont_GRAD,XTRA,YOPQ,YTAS,YTDE,YTFI,YTLC,YTUC,opsz,slnt,wdth,wght.ttf',
+    );
+    final fontLoaderOne = FontLoader('RobotoFlex');
+    fontLoaderOne.addFont(fontDataOne as Future<ByteData>);
+    await fontLoaderOne.load();
+
+    final fontDataTwo =
+        await rootBundle.load('assets/google_fonts/RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf');
+    final fontLoaderTwo = FontLoader('RobotoSerif-Italian');
+    fontLoaderTwo.addFont(fontDataTwo as Future<ByteData>);
+    await fontLoaderTwo.load();
+
+    final fontDataThree =
+        await rootBundle.load('assets/google_fonts/RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf');
+    final fontLoaderThree = FontLoader('RobotoSerif');
+    fontLoaderThree.addFont(fontDataThree as Future<ByteData>);
+    await fontLoaderThree.load();
+
+    final fontDataFour = await rootBundle.load('assets/google_fonts/RobotoSlab-VariableFont_wght.ttf');
+    final fontLoaderFour = FontLoader('RobotoSlab');
+    fontLoaderFour.addFont(fontDataFour as Future<ByteData>);
+    await fontLoaderThree.load();
+  }
+}

todo_app/todoapp_vanilla/lib/catcher/catcher_options.dart renamed to todo_app/todoapp_vanilla/lib/infrastructure/catcher/catcher_options.dart

@@ -4,7 +4,9 @@
 
 // ignore_for_file: empty_constructor_bodies
 
-import 'package:domain_layer_non_rxdart/domain_layer_non_rxdart.dart';
+
+import 'package:todoapp_vanilla/services/init_logging.dart';
+import 'package:todoapp_vanilla/services/set_up_appenders.dart';
 
 class LoggingAppendersService {
   LoggingAppendersService() {}

todo_app/todoapp_vanilla/lib/catcher/catcher_report_modes.dart renamed to todo_app/todoapp_vanilla/lib/infrastructure/catcher/catcher_report_modes.dart

@@ -5,8 +5,9 @@
 // To assist organize stuff as the change
 // to runApp to have callback initializations
 // exposed is not in beta or stable yet
-import 'package:domain_layer_non_rxdart/src/services/app_services.dart';
+
 import 'package:flutter/material.dart';
+import 'package:todoapp_vanilla/services/app_services.dart';
 
 
 

todo_app/todoapp_vanilla/lib/catcher/custom_catcher_logger.dart renamed to todo_app/todoapp_vanilla/lib/infrastructure/catcher/custom_catcher_logger.dart

@@ -0,0 +1,56 @@
+// Copyright 2023 Fredrick Allan Grott. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+
+
+// Note: Under MD2 we copyWith'd to keep brand colors.
+//       While we could use the same approach for MD3 
+//       it would conflict with supporting Material You
+//       dynamic color. A better approach is to accept
+//       that brand colors will only show up in the logo 
+//       of the app in appbar and that theme will at times
+//       show tone and chroma of brand colors but not the 
+//       hue in dynamic color themes.
+
+import 'package:flex_color_scheme/flex_color_scheme.dart';
+import 'package:flutter/material.dart';
+import 'package:todoapp_vanilla/src/presentation/themes/custom_flex_tones.dart';
+
+Color mySeed = Colors.indigoAccent;
+
+
+
+
+
+
+ColorScheme customLightColorScheme = SeedColorScheme.fromSeeds(
+  
+  primaryKey: mySeed ,
+  primary: mySeed,
+  tones: myLightTones,
+
+);
+
+ColorScheme customDarkColorScheme = SeedColorScheme.fromSeeds(
+  brightness: Brightness.dark,
+  primaryKey:  mySeed,
+  tones: myDarkTones,
+
+);
+
+ColorScheme customLightHCColorScheme = SeedColorScheme.fromSeeds(
+  
+  primaryKey:  mySeed,
+  primary: mySeed,
+  tones: myLightHCTones,
+
+);
+
+ColorScheme cusgtomDarkHCColorScheme = SeedColorScheme.fromSeeds (
+  brightness: Brightness.dark,
+  primaryKey:  mySeed,
+  tones: myDarkHCTones,
+
+
+);