feat(app): Добавить fluttergen (#3)

Co-authored-by: PetrovY <y.petrov@friflex.com>

.gitignore

@@ -43,3 +43,44 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+ios/.gitignore
+ios/Podfile
+ios/Podfile.lock
+ios/Flutter/AppFrameworkInfo.plist
+ios/Flutter/Debug.xcconfig
+ios/Flutter/Release.xcconfig
+ios/Runner/AppDelegate.swift
+ios/Runner/Info.plist
+ios/Runner/Runner-Bridging-Header.h
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
+ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
+ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
+ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+ios/Runner/Base.lproj/LaunchScreen.storyboard
+ios/Runner/Base.lproj/Main.storyboard
+ios/Runner.xcodeproj/project.pbxproj
+ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+ios/Runner.xcworkspace/contents.xcworkspacedata
+ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+ios/RunnerTests/RunnerTests.swift

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "17025dd88227cd9532c33fa78f5250d548d87e9a"
+  revision: "c519ee916eaeb88923e67befb89c0f1dabfa83e6"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
+      create_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6
-      base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
+      base_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6
-    - platform: android
+    - platform: macos
-      create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
+      create_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6
-      base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
+      base_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6
 
   # User provided section
 

.vscode/tasks.json

@@ -1,6 +1,19 @@
 {
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "fluttergen",
+            "type": "shell",
+            "command": "/Users/yura/.pub-cache/bin/fluttergen",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            },
+            "problemMatcher": []
+        },
         {
             "label": "build_runner --delete-conflicting-outputs",
             "type": "shell",
@@ -41,13 +54,13 @@
         {
             "label": "switch_to_gms",
             "type": "shell",
-            "command": "./switch_service.sh gms",
+            "command": "./tools/switch_service.sh gms",
-            "problemMatcher": [] 
+            "problemMatcher": []
         },
         {
             "label": "switch_to_aurora",
             "type": "shell",
-            "command": "./switch_service.sh aurora",
+            "command": "./tools/switch_service.sh aurora",
             "problemMatcher": []
         }
     ]

assets/icons/home.svg

@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="20" cy="20" r="20" fill="#03B1B5"/>
+<path d="M11 17L20 10L29 17V28C29 28.5304 28.7893 29.0391 28.4142 29.4142C28.0391 29.7893 27.5304 30 27 30H13C12.4696 30 11.9609 29.7893 11.5858 29.4142C11.2107 29.0391 11 28.5304 11 28V17Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 30V20H23V30" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

l10n.yaml

@@ -1,3 +1,5 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
-output-localization-file: app_localizations.dart
+output-dir: lib/l10n/gen
+output-localization-file: app_localizations.dart
+synthetic-package: false

lib/app/app.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:friflex_starter/app/app_context_ext.dart';
 import 'package:friflex_starter/app/theme/app_theme.dart';
 import 'package:friflex_starter/app/theme/theme_notifier.dart';
 import 'package:friflex_starter/di/di_container.dart';
+import 'package:friflex_starter/l10n/gen/app_localizations.dart';
 import 'package:friflex_starter/l10n/localization_notifier.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';

lib/app/app_context_ext.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:friflex_starter/app/theme/theme_notifier.dart';
 import 'package:friflex_starter/di/di_container.dart';
+import 'package:friflex_starter/l10n/gen/app_localizations.dart';
 import 'package:friflex_starter/l10n/localization_notifier.dart';
 import 'package:provider/provider.dart';
 

lib/di/di_container.dart

@@ -15,7 +15,8 @@ import 'package:i_app_services/i_app_services.dart';
 /// {@endtemplate}
 final class DiContainer {
   /// {@macro dependencies_container}
-  DiContainer({required this.env, required IDebugService dService}) : debugService = dService;
+  DiContainer({required this.env, required IDebugService dService})
+      : debugService = dService;
   final AppEnv env;
 
   /// Сервис для отладки, получаем из конструктора

lib/features/debug/debug_screen.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:friflex_starter/app/app_context_ext.dart';
+import 'package:friflex_starter/app/theme/app_colors_scheme.dart';
+import 'package:friflex_starter/gen/assets.gen.dart';
+import 'package:friflex_starter/gen/fonts.gen.dart';
 
 class DebugScreen extends StatelessWidget {
   const DebugScreen({Key? key}) : super(key: key);
@@ -9,30 +12,77 @@ class DebugScreen extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: const Text('Debug Screen')),
       body: Center(
-        child: Column(
+        child: ListView(
-          mainAxisSize: MainAxisSize.min,
+          padding: const EdgeInsets.all(16),
           children: [
+            Text(
+              'Реализация SecureStorage: ${context.di.secureStorage.nameImpl}',
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Окружение: ${context.di.appConfig.env.name}',
+            ),
+            const SizedBox(height: 16),
             ElevatedButton(
               onPressed: () {
-                throw Exception(
+                context.theme.changeTheme();
-                    'Тестовая ошибка Exception для отладки FlutterError',);
               },
-              child: const Text('Вызывать ошибку FlutterError'),
+              child: const Text('Сменить тему'),
+            ),
+            const SizedBox(height: 16),
+            ColoredBox(
+              color: context.colors.testColor,
+              child: const SizedBox(height: 100, width: 100),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Текущая тема: ${context.theme.themeMode}',
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Текущий репозиторий: ${context.di.repositories.authRepository.name}',
             ),
             const SizedBox(height: 16),
             ElevatedButton(
-              onPressed: () async {
+              onPressed: () {
-                await callError();
+                context.localization.changeLocal(
+                  const Locale('ru', 'RU'),
+                );
               },
-              child: const Text('Вызывать ошибку PlatformDispatcher'),
+              child: const Text('Сменить язык на Rусский'),
             ),
             const SizedBox(height: 16),
             ElevatedButton(
-              onPressed: () async {
+              onPressed: () {
-                await context.di.debugService.openDebugScreen(context);
+                context.localization.changeLocal(
+                  const Locale('en', 'EN'),
+                );
               },
-              child: const Text('Вызывать Экран отладки'),
+              child: const Text('Сменить язык на Английский'),
             ),
+            const SizedBox(height: 16),
+            Text(
+              'Тестовое слово montserrat bold: ${context.l10n.helloWorld}',
+              style: TextStyle(
+                color: context.colors.testColor,
+                fontFamily: Assets.fonts.montserratBold,
+              ),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Тестовое слово montserrat medium: ${context.l10n.helloWorld}',
+              style: TextStyle(
+                color: context.colors.testColor,
+                fontFamily: FontFamily.montserrat,
+              ),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Текущий язык: ${context.l10n.localeName}',
+            ),
+            const SizedBox(height: 16),
+            const Text('Тестовая иконка из assets'),
+            Assets.icons.home.svg(),
           ],
         ),
       ),

lib/features/main/presentation/screens/main_screen.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:friflex_starter/app/app_context_ext.dart';
-import 'package:friflex_starter/app/theme/app_colors_scheme.dart';
 
 class MainScreen extends StatelessWidget {
   const MainScreen({super.key});
@@ -10,67 +8,7 @@ class MainScreen extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         title: const Text('Main Screen'),
-      ),
+      ),    
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              'Реализация SecureStorage: ${context.di.secureStorage.nameImpl}',
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Окружение: ${context.di.appConfig.env.name}',
-            ),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () {
-                context.theme.changeTheme();
-              },
-              child: const Text('Сменить тему'),
-            ),
-            const SizedBox(height: 16),
-            ColoredBox(
-              color: context.colors.testColor,
-              child: const SizedBox(height: 100, width: 100),
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Текущая тема: ${context.theme.themeMode}',
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Текущий репозиторий: ${context.di.repositories.authRepository.name}',
-            ),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () {
-                context.localization.changeLocal(
-                  const Locale('ru', 'RU'),
-                );
-              },
-              child: const Text('Сменить язык на Rусский'),
-            ),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () {
-                context.localization.changeLocal(
-                  const Locale('en', 'EN'),
-                );
-              },
-              child: const Text('Сменить язык на Английский'),
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Тестовое слово: ${context.l10n.helloWorld}',
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Текущий язык: ${context.l10n.localeName}',
-            ),
-          ],
-        ),
-      ),
     );
   }
 }

lib/gen/assets.gen.dart

@@ -0,0 +1,135 @@
+/// GENERATED CODE - DO NOT MODIFY BY HAND
+/// *****************************************************
+///  FlutterGen
+/// *****************************************************
+
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart' as _svg;
+import 'package:vector_graphics/vector_graphics.dart' as _vg;
+
+class $AssetsFontsGen {
+  const $AssetsFontsGen();
+
+  /// File path: assets/fonts/Montserrat-Bold.ttf
+  String get montserratBold => 'assets/fonts/Montserrat-Bold.ttf';
+
+  /// File path: assets/fonts/Montserrat-ExtraBold.ttf
+  String get montserratExtraBold => 'assets/fonts/Montserrat-ExtraBold.ttf';
+
+  /// File path: assets/fonts/Montserrat-Medium.ttf
+  String get montserratMedium => 'assets/fonts/Montserrat-Medium.ttf';
+
+  /// File path: assets/fonts/Montserrat-Regular.ttf
+  String get montserratRegular => 'assets/fonts/Montserrat-Regular.ttf';
+
+  /// File path: assets/fonts/Montserrat-SemiBold.ttf
+  String get montserratSemiBold => 'assets/fonts/Montserrat-SemiBold.ttf';
+
+  /// List of all assets
+  List<String> get values => [
+        montserratBold,
+        montserratExtraBold,
+        montserratMedium,
+        montserratRegular,
+        montserratSemiBold
+      ];
+}
+
+class $AssetsIconsGen {
+  const $AssetsIconsGen();
+
+  /// File path: assets/icons/home.svg
+  SvgGenImage get home => const SvgGenImage('assets/icons/home.svg');
+
+  /// List of all assets
+  List<SvgGenImage> get values => [home];
+}
+
+class Assets {
+  Assets._();
+
+  static const $AssetsFontsGen fonts = $AssetsFontsGen();
+  static const $AssetsIconsGen icons = $AssetsIconsGen();
+}
+
+class SvgGenImage {
+  const SvgGenImage(
+    this._assetName, {
+    this.size,
+    this.flavors = const {},
+  }) : _isVecFormat = false;
+
+  const SvgGenImage.vec(
+    this._assetName, {
+    this.size,
+    this.flavors = const {},
+  }) : _isVecFormat = true;
+
+  final String _assetName;
+  final Size? size;
+  final Set<String> flavors;
+  final bool _isVecFormat;
+
+  _svg.SvgPicture svg({
+    Key? key,
+    bool matchTextDirection = false,
+    AssetBundle? bundle,
+    String? package,
+    double? width,
+    double? height,
+    BoxFit fit = BoxFit.contain,
+    AlignmentGeometry alignment = Alignment.center,
+    bool allowDrawingOutsideViewBox = false,
+    WidgetBuilder? placeholderBuilder,
+    String? semanticsLabel,
+    bool excludeFromSemantics = false,
+    _svg.SvgTheme? theme,
+    ColorFilter? colorFilter,
+    Clip clipBehavior = Clip.hardEdge,
+    @deprecated Color? color,
+    @deprecated BlendMode colorBlendMode = BlendMode.srcIn,
+    @deprecated bool cacheColorFilter = false,
+  }) {
+    final _svg.BytesLoader loader;
+    if (_isVecFormat) {
+      loader = _vg.AssetBytesLoader(
+        _assetName,
+        assetBundle: bundle,
+        packageName: package,
+      );
+    } else {
+      loader = _svg.SvgAssetLoader(
+        _assetName,
+        assetBundle: bundle,
+        packageName: package,
+        theme: theme,
+      );
+    }
+    return _svg.SvgPicture(
+      loader,
+      key: key,
+      matchTextDirection: matchTextDirection,
+      width: width,
+      height: height,
+      fit: fit,
+      alignment: alignment,
+      allowDrawingOutsideViewBox: allowDrawingOutsideViewBox,
+      placeholderBuilder: placeholderBuilder,
+      semanticsLabel: semanticsLabel,
+      excludeFromSemantics: excludeFromSemantics,
+      colorFilter: colorFilter ??
+          (color == null ? null : ColorFilter.mode(color, colorBlendMode)),
+      clipBehavior: clipBehavior,
+      cacheColorFilter: cacheColorFilter,
+    );
+  }
+
+  String get path => _assetName;
+
+  String get keyName => _assetName;
+}

lib/gen/fonts.gen.dart

@@ -0,0 +1,15 @@
+/// GENERATED CODE - DO NOT MODIFY BY HAND
+/// *****************************************************
+///  FlutterGen
+/// *****************************************************
+
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+
+class FontFamily {
+  FontFamily._();
+
+  /// Font family: Montserrat
+  static const String montserrat = 'Montserrat';
+}

lib/l10n/gen/app_localizations.dart

@@ -0,0 +1,135 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_localizations_en.dart';
+import 'app_localizations_ru.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
+///
+/// Applications need to include `AppLocalizations.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'gen/app_localizations.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocalizations.localizationsDelegates,
+///   supportedLocales: AppLocalizations.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocalizations.supportedLocales
+/// property.
+abstract class AppLocalizations {
+  AppLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocalizations? of(BuildContext context) {
+    return Localizations.of<AppLocalizations>(context, AppLocalizations);
+  }
+
+  static const LocalizationsDelegate<AppLocalizations> delegate = _AppLocalizationsDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
+    delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+  ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('en'),
+    Locale('ru')
+  ];
+
+  /// The conventional newborn programmer greeting
+  ///
+  /// In en, this message translates to:
+  /// **'Hello World!'**
+  String get helloWorld;
+}
+
+class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
+  const _AppLocalizationsDelegate();
+
+  @override
+  Future<AppLocalizations> load(Locale locale) {
+    return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) => <String>['en', 'ru'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocalizationsDelegate old) => false;
+}
+
+AppLocalizations lookupAppLocalizations(Locale locale) {
+
+
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'en': return AppLocalizationsEn();
+    case 'ru': return AppLocalizationsRu();
+  }
+
+  throw FlutterError(
+    'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.'
+  );
+}

lib/l10n/gen/app_localizations_en.dart

@@ -0,0 +1,11 @@
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocalizationsEn extends AppLocalizations {
+  AppLocalizationsEn([String locale = 'en']) : super(locale);
+
+  @override
+  String get helloWorld => 'Hello World!';
+}

lib/l10n/gen/app_localizations_ru.dart

@@ -0,0 +1,11 @@
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for Russian (`ru`).
+class AppLocalizationsRu extends AppLocalizations {
+  AppLocalizationsRu([String locale = 'ru']) : super(locale);
+
+  @override
+  String get helloWorld => 'Привет, мир!';
+}

lib/router/app_router.dart

@@ -14,7 +14,7 @@ class AppRouter {
   static final rootNavigatorKey = GlobalKey<NavigatorState>();
 
   /// Начальный роут приложения
-  static String get initialLocation => '/main';
+  static String get initialLocation => '/debug';
 
   /// Метод для создания экземпляра GoRouter
   static GoRouter createRouter(IDebugService debugService) {

pubspec.lock

@@ -25,7 +25,7 @@ packages:
   app_services:
     dependency: "direct main"
     description:
-      path: "app_services/gms/app_services"
+      path: "app_services/aurora/app_services"
       relative: true
     source: path
     version: "0.0.1"
@@ -37,6 +37,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.0"
+  asn1lib:
+    dependency: transitive
+    description:
+      name: asn1lib
+      sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.8"
   async:
     dependency: transitive
     description:
@@ -165,6 +173,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.0"
+  color:
+    dependency: transitive
+    description:
+      name: color
+      sha256: ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   convert:
     dependency: transitive
     description:
@@ -197,6 +213,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.7"
+  dartx:
+    dependency: transitive
+    description:
+      name: dartx
+      sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   dio:
     dependency: "direct main"
     description:
@@ -213,6 +237,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  encrypt:
+    dependency: transitive
+    description:
+      name: encrypt
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.3"
   envied:
     dependency: "direct main"
     description:
@@ -282,6 +314,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.1.1"
+  flutter_gen:
+    dependency: "direct dev"
+    description:
+      name: flutter_gen
+      sha256: d7e4e57f606d73628b97765a67fdfb5a97e24cd2183e170afa8d1f62e48a9d5c
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.8.0"
+  flutter_gen_core:
+    dependency: transitive
+    description:
+      name: flutter_gen_core
+      sha256: "46ecf0e317413dd065547887c43f93f55e9653e83eb98dc13dd07d40dd225325"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.8.0"
+  flutter_gen_runner:
+    dependency: "direct dev"
+    description:
+      name: flutter_gen_runner
+      sha256: "77f0a02fc30d9fcf2549fe874eb3fde091435724904bcbb1af60aa40cbfab1f4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.8.0"
   flutter_lints:
     dependency: transitive
     description:
@@ -299,10 +355,19 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage
-      sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea"
+      sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5"
       url: "https://pub.dev"
     source: hosted
-    version: "9.2.4"
+    version: "8.0.0"
+  flutter_secure_storage_aurora:
+    dependency: transitive
+    description:
+      path: "."
+      ref: "aurora-0.5.3"
+      resolved-ref: "81fdc77c8211edc37398531f5b528786d8e7ac8b"
+      url: "https://gitlab.com/omprussia/flutter/flutter-community-plugins/flutter_secure_storage_aurora.git"
+    source: git
+    version: "0.5.3"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -339,10 +404,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
+      sha256: "38f9501c7cb6f38961ef0e1eacacee2b2d4715c63cc83fe56449c4d3d0b47255"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "2.1.1"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.17"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -393,6 +466,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
+  hashcodes:
+    dependency: transitive
+    description:
+      name: hashcodes
+      sha256: "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -416,6 +505,14 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  image_size_getter:
+    dependency: transitive
+    description:
+      name: image_size_getter
+      sha256: "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   intl:
     dependency: "direct main"
     description:
@@ -552,14 +649,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
@@ -568,6 +673,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.15"
+  path_provider_aurora:
+    dependency: transitive
+    description:
+      path: "packages/path_provider_aurora"
+      ref: "aurora-path_provider_aurora-0.6.0"
+      resolved-ref: "82e13309171cb454aae989dbbde477282dfa7e20"
+      url: "https://gitlab.com/omprussia/flutter/packages.git"
+    source: git
+    version: "0.6.0"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -600,6 +714,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
@@ -616,6 +738,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.9.1"
   pool:
     dependency: transitive
     description:
@@ -656,62 +786,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.5"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -797,6 +871,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.3"
+  time:
+    dependency: transitive
+    description:
+      name: time
+      sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
   timing:
     dependency: transitive
     description:
@@ -813,6 +895,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.18"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.16"
   vector_math:
     dependency: transitive
     description:
@@ -861,14 +967,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.10.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -877,6 +975,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
   yaml:
     dependency: transitive
     description:

pubspec.yaml

@@ -18,6 +18,7 @@ dependencies:
   provider: 6.1.2
   dio: 5.7.0
   intl: 0.19.0
+  flutter_svg: 2.0.17
   flutter_localizations:
     sdk: flutter
   
@@ -27,9 +28,9 @@ dependencies:
 
   app_services:
     ### Базовая реализация ###
-   path: app_services/gms/app_services
+  
     ### Аврора реализация ###
-    # path: app_services/aurora/app_services
+    path: app_services/aurora/app_services
 
 dev_dependencies:
   flutter_test:
@@ -38,39 +39,37 @@ dev_dependencies:
     hosted: https://pub.friflex.com
     version: 4.0.1
   envied_generator: 1.0.1
-  build_runner: 2.4.14
+  build_runner: 2.4.14 
+  flutter_gen_runner: 5.8.0
+  flutter_gen: 5.8.0
+
 
 flutter:
   uses-material-design: true
-  generate: true
+  generate: false
+  assets:
+    - assets/icons/
+    - assets/fonts/
+    - assets/images/
 
-  # To add assets to your application, add an assets section, like this:
+  fonts:
-  # assets:
+    - family: Montserrat
-  #   - images/a_dot_burr.jpeg
+      fonts:
-  #   - images/a_dot_ham.jpeg
+        - asset: assets/fonts/Montserrat-ExtraBold.ttf
-
+          weight: 800
-  # An image asset can refer to one or more resolution-specific "variants", see
+        - asset: assets/fonts/Montserrat-Bold.ttf
-  # https://flutter.dev/to/resolution-aware-images
+          weight: 700
-
+        - asset: assets/fonts/Montserrat-SemiBold.ttf
-  # For details regarding adding assets from package dependencies, see
+          weight: 600
-  # https://flutter.dev/to/asset-from-package
+        - asset: assets/fonts/Montserrat-Medium.ttf
-
+          weight: 500
-  # To add custom fonts to your application, add a fonts section here,
+        - asset: assets/fonts/Montserrat-Regular.ttf
-  # in this "flutter" section. Each entry in this list should have a
+          weight: 400
-  # "family" key with the font family name, and a "fonts" key with a
+      
-  # list giving the asset and other descriptors for the font. For
+flutter_gen:
-  # example:
+    options: 
-  # fonts:
+      output: lib/gen/
-  #   - family: Schyler
+      line_length: 100
-  #     fonts:
+    integrations:
-  #       - asset: fonts/Schyler-Regular.ttf
+      flutter_svg: true
-  #       - asset: fonts/Schyler-Italic.ttf
+        
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/to/font-from-package

test/widget_test.dart

@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:friflex_starter/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}