Merge pull request #166 from Onix-Systems/feat/project_modify_components

feat/project_modify_components

Author: cozvtieg9

lib/app/localization/generated/intl/messages_en.dart

@@ -242,6 +242,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "overwrite": MessageLookupByLibrary.simpleMessage("Overwrite"),
         "parseErrorMessage": MessageLookupByLibrary.simpleMessage(
             "Failed to Parse Swagger Components. Please try again or contact support if issue not resolved."),
+        "parseSwaggerFile":
+            MessageLookupByLibrary.simpleMessage("Parse Swagger file"),
         "pasteJsonHere":
             MessageLookupByLibrary.simpleMessage("Paste JSON here"),
         "path": MessageLookupByLibrary.simpleMessage("Path"),

lib/app/localization/generated/intl/messages_uk.dart

@@ -249,6 +249,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "overwrite": MessageLookupByLibrary.simpleMessage("Перезаписати"),
         "parseErrorMessage": MessageLookupByLibrary.simpleMessage(
             "Не вдалося отримати компоненти Swagger. Спробуйте знову або зв\'яжіться з підтримкою, якщо не вдається отримати компоненти."),
+        "parseSwaggerFile":
+            MessageLookupByLibrary.simpleMessage("Парсити Swagger файл"),
         "pasteJsonHere":
             MessageLookupByLibrary.simpleMessage("Вставте JSON сюди"),
         "path": MessageLookupByLibrary.simpleMessage("Шлях"),

lib/app/localization/generated/l10n.dart

@@ -191,5 +191,6 @@
   "requestAlreadyExistsError": "Such request already exists",
   "addChildren": "Add children?",
   "addChildrenContent": "Class depends on {children} that do not exist.\nGenerate them?",
-  "jsonParserEmptyValueFailure": "Value of '{name}' is empty. Either remove '{name}' or add value."
+  "jsonParserEmptyValueFailure": "Value of '{name}' is empty. Either remove '{name}' or add value.",
+  "parseSwaggerFile": "Parse Swagger file"
 }

lib/app/localization/l10n/intl_en.arb

@@ -191,5 +191,6 @@
   "requestAlreadyExistsError": "Такий запит вже існує",
   "addChildren": "Додати залежності?",
   "addChildrenContent": "Клас залежить від {children} котрих ще не існує.\nЗгенерувати їх?",
-  "jsonParserEmptyValueFailure": "Значення '{name}' порожнє. Видаліть '{name}' або додайте значення."
+  "jsonParserEmptyValueFailure": "Значення '{name}' порожнє. Видаліть '{name}' або додайте значення.",
+  "parseSwaggerFile": "Парсити Swagger файл"
 }

lib/app/localization/l10n/intl_uk.arb

@@ -1,8 +1,7 @@
 //@formatter:off
 import 'package:go_router/go_router.dart';
-import 'package:onix_flutter_bricks/domain/entity/config/branch_config.dart';
-import 'package:onix_flutter_bricks/domain/entity/config/config.dart';
 import 'package:onix_flutter_bricks/presentation/screen/data_components_screen_v2/data_components_screen_v2.dart';
+import 'package:onix_flutter_bricks/presentation/screen/edit_project_screen/edit_project_screen.dart';
 import 'package:onix_flutter_bricks/presentation/screen/figma_styles_screen/figma_styles_screen.dart';
 import 'package:onix_flutter_bricks/presentation/screen/generation_screen/generation_screen.dart';
 import 'package:onix_flutter_bricks/presentation/screen/platforms_screen/platforms_screen.dart';
@@ -29,6 +28,7 @@ class AppRouter {
   static const _swaggerParserScreen = '/swagger_parser';
   static const _summaryScreen = '/summary';
   static const _generationScreen = '/generation';
+  static const _editProjectScreen = '/edit_project';
   //{consts end}
 
   static final AppRouter _instance = AppRouter._privateConstructor();
@@ -45,6 +45,7 @@ class AppRouter {
   static String get swaggerParserScreen => _swaggerParserScreen;
   static String get summaryScreen => _summaryScreen;
   static String get generationScreen => _generationScreen;
+  static String get editProjectScreen => _editProjectScreen;
 
   //{getters end}
 
@@ -68,73 +69,58 @@ class AppRouter {
         GoRoute(
           path: _projectNameScreen,
           name: 'ProjectNameScreen',
-          builder: (context, state) => ProjectNameScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const ProjectNameScreen(),
         ),
         GoRoute(
           path: _procedureSelectionScreen,
           name: 'ProcedureSelectionScreen',
-          builder: (context, state) => ProcedureSelectionScreen(
-            branchConfig: state.extra as BranchConfig,
-          ),
+          builder: (context, state) => const ProcedureSelectionScreen(),
         ),
         GoRoute(
           path: _platformsScreen,
           name: 'PlatformsScreen',
-          builder: (context, state) => PlatformsScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const PlatformsScreen(),
         ),
         GoRoute(
           path: _projectSettingsScreen,
           name: 'ProjectSettingsScreen',
-          builder: (context, state) => ProjectSettingsScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const ProjectSettingsScreen(),
         ),
         GoRoute(
           path: _screensScreen,
           name: 'ScreensScreen',
-          builder: (context, state) => ScreensScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const ScreensScreen(),
         ),
         GoRoute(
           path: _stylesScreen,
           name: 'StylesScreen',
-          builder: (context, state) => FigmaStylesScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const FigmaStylesScreen(),
         ),
         GoRoute(
           path: _dataComponentsScreen,
           name: 'DataComponentsScreen',
-          builder: (context, state) => DataComponentsScreenV2(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const DataComponentsScreenV2(),
         ),
         GoRoute(
           path: _swaggerParserScreen,
           name: 'SwaggerParserScreen',
-          builder: (context, state) => SwaggerParserScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const SwaggerParserScreen(),
         ),
         GoRoute(
           path: _summaryScreen,
           name: 'SummaryScreen',
-          builder: (context, state) => SummaryScreen(
-            config: state.extra as Config,
-          ),
+          builder: (context, state) => const SummaryScreen(),
         ),
         GoRoute(
           path: _generationScreen,
           name: 'GenerationScreen',
-          builder: (context, state) => GenerationScreen(
-            extra: state.extra as GenerationScreenExtra,
-          ),
+          builder: (context, state) => const GenerationScreen(),
         ),
+        GoRoute(
+          path: _editProjectScreen,
+          name: 'EditProjectScreen',
+          builder: (context, state) => const EditProjectScreen(),
+        )
         //{routes end}
       ],
     );

lib/app/router/app_router.dart

@@ -0,0 +1,9 @@
+extension ClearString on String {
+  String clearSpaces() {
+    var result = this;
+    while (result.contains('  ')) {
+      result = result.replaceAll('  ', ' ');
+    }
+    return result;
+  }
+}

lib/app/util/extenstion/string_extensions.dart

@@ -1,5 +1,6 @@
 import 'package:get_it/get_it.dart';
 import 'package:onix_flutter_bricks/domain/repository/screen_repository.dart';
+import 'package:onix_flutter_bricks/domain/service/config_service/config_service.dart';
 import 'package:onix_flutter_bricks/domain/usecase/docs_generation/generate_documentation_usecase.dart';
 import 'package:onix_flutter_bricks/domain/usecase/fastlane/generate_fastlane_files_use_case.dart';
 import 'package:onix_flutter_bricks/domain/usecase/file_generation/generate_flavors_usecase.dart';
@@ -27,10 +28,12 @@ import 'package:onix_flutter_bricks/domain/usecase/swagger/edit_data_object_use_
 import 'package:onix_flutter_bricks/domain/usecase/swagger/edit_source_name_use_case.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/edit_source_request_use_case.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/empty_swagger_components_usecase.dart';
+import 'package:onix_flutter_bricks/domain/usecase/swagger/fetch_components_from_json_usecase.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/fetch_swagger_data_usecase.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/get_component_by_name_use_case.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/get_swagger_components_usecase.dart';
 import 'package:onix_flutter_bricks/domain/usecase/swagger/is_component_exists_use_case.dart';
+import 'package:onix_flutter_bricks/domain/usecase/swagger/restore_components_use_case.dart';
 import 'package:onix_flutter_bricks/presentation/screen/data_components_screen_v2/bloc/data_components_screen_v2_bloc_imports.dart';
 import 'package:onix_flutter_bricks/presentation/screen/data_components_screen_v2/widget/dialogs/add_edit_component_dialog/bloc/component_dialog_cubit.dart';
 import 'package:onix_flutter_bricks/presentation/screen/data_components_screen_v2/widget/dialogs/add_request_dialog/bloc/add_request_dialog_cubit.dart';
@@ -43,7 +46,6 @@ import 'package:onix_flutter_bricks/presentation/screen/procedure_selection_scre
 import 'package:onix_flutter_bricks/presentation/screen/project_name_screen/bloc/project_name_screen_bloc.dart';
 import 'package:onix_flutter_bricks/presentation/screen/project_settings_screen/bloc/project_settings_screen_bloc.dart';
 import 'package:onix_flutter_bricks/presentation/screen/screens_screen/bloc/screens_screen_bloc.dart';
-import 'package:onix_flutter_bricks/presentation/screen/screens_screen/widgets/figma_styles_dialog/bloc/figma_styles_dialog_bloc.dart';
 import 'package:onix_flutter_bricks/presentation/screen/splash_screen/bloc/splash_screen_bloc.dart';
 import 'package:onix_flutter_bricks/presentation/screen/summary_screen/bloc/summary_screen_bloc.dart';
 import 'package:onix_flutter_bricks/presentation/screen/swagger_parser_screen/bloc/swagger_parser_screen_bloc.dart';
@@ -52,93 +54,121 @@ void registerBloc(GetIt getIt) {
   getIt
     ..registerFactory<GenerationScreenBloc>(
       () => GenerationScreenBloc(
-        GetIt.I.get<GenerateDocumentationUseCase>(),
-        GetIt.I.get<GenerateScreensUseCase>(),
-        GetIt.I.get<AddOutputMessageUseCase>(),
-        GetIt.I.get<RunProcessUseCase>(),
-        GetIt.I.get<RunOsaScriptProcessUseCase>(),
-        GetIt.I.get<GenerateSigningConfigUseCase>(),
-        GetIt.I.get<GenerateStylesUseCase>(),
-        GetIt.I.get<GetGenerationOutputStream>(),
-        GetIt.I.get<GenerateFastlaneFilesUseCase>(),
-        GetIt.I.get<CreateSwaggerComponentsUseCase>(),
-        GetIt.I.get<GenerateGitCliffFilesUseCase>(),
+        configService: getIt.get<ConfigService>(),
+        generateDocumentationUseCase: getIt.get<GenerateDocumentationUseCase>(),
+        generateFastlaneFilesUseCase: getIt.get<GenerateFastlaneFilesUseCase>(),
+        generateGitCliffFilesUseCase: getIt.get<GenerateGitCliffFilesUseCase>(),
+        generateScreensUseCase: getIt.get<GenerateScreensUseCase>(),
+        generateStylesUseCase: getIt.get<GenerateStylesUseCase>(),
+        addOutputMessageUseCase: getIt.get<AddOutputMessageUseCase>(),
+        getGenerationOutputStream: getIt.get<GetGenerationOutputStream>(),
+        runProcessUseCase: getIt.get<RunProcessUseCase>(),
+        runOsaScriptProcessUseCase: getIt.get<RunOsaScriptProcessUseCase>(),
+        createSwaggerComponentsUseCase:
+            getIt.get<CreateSwaggerComponentsUseCase>(),
+        generateSigningConfigUseCase: getIt.get<GenerateSigningConfigUseCase>(),
+      ),
+    )
+    ..registerFactory<SummaryScreenBloc>(
+      () => SummaryScreenBloc(
+        screenRepository: getIt.get<ScreenRepository>(),
+        configService: getIt.get<ConfigService>(),
       ),
     )
-    ..registerFactory<SummaryScreenBloc>(SummaryScreenBloc.new)
     ..registerFactory<SwaggerParserScreenBloc>(
       () => SwaggerParserScreenBloc(
-        GetIt.I.get<FetchSwaggerDataUseCase>(),
-        GetIt.I.get<ClearSwaggerComponentsUseCase>(),
+        fetchSwaggerDataUseCase: getIt.get<FetchSwaggerDataUseCase>(),
+        getComponentsUseCase: getIt.get<GetComponentsUseCase>(),
+        restoreComponentsUseCase: getIt.get<RestoreComponentsUseCase>(),
+        clearSwaggerComponentsUseCase:
+            getIt.get<ClearSwaggerComponentsUseCase>(),
+        configService: getIt.get<ConfigService>(),
       ),
     )
-    ..registerFactory<ScreensScreenBloc>(ScreensScreenBloc.new)
-    ..registerFactory<FigmaStylesScreenBloc>(
-      () => FigmaStylesScreenBloc(
-        GetIt.I.get<GetFigmaStylesUseCase>(),
+    ..registerFactory<ScreensScreenBloc>(
+      () => ScreensScreenBloc(
+        configService: getIt.get<ConfigService>(),
+        screenRepository: getIt.get<ScreenRepository>(),
       ),
     )
-    ..registerFactory<FigmaStylesDialogBloc>(
-      () => FigmaStylesDialogBloc(
-        GetIt.I.get<GetFigmaStylesUseCase>(),
+    ..registerFactory<FigmaStylesScreenBloc>(
+      () => FigmaStylesScreenBloc(
+        getFigmaStylesUseCase: getIt.get<GetFigmaStylesUseCase>(),
+        configService: getIt.get<ConfigService>(),
       ),
     )
     ..registerFactory<ProjectSettingsScreenBloc>(
       () => ProjectSettingsScreenBloc(
-        screenRepository: GetIt.I.get<ScreenRepository>(),
+        screenRepository: getIt.get<ScreenRepository>(),
+        configService: getIt.get<ConfigService>(),
+      ),
+    )
+    ..registerFactory<PlatformsScreenBloc>(
+      () => PlatformsScreenBloc(
+        configService: getIt.get<ConfigService>(),
       ),
     )
-    ..registerFactory<PlatformsScreenBloc>(PlatformsScreenBloc.new)
     ..registerFactory<ProjectNameScreenBloc>(
       () => ProjectNameScreenBloc(
-        GetIt.I.get<GetBranchesProcessUseCase>(),
+        getBranchesProcessUseCase: getIt.get<GetBranchesProcessUseCase>(),
+        configService: getIt.get<ConfigService>(),
+      ),
+    )
+    ..registerFactory<SplashScreenBloc>(
+      () => SplashScreenBloc(
+        configService: getIt.get<ConfigService>(),
       ),
     )
-    ..registerFactory<SplashScreenBloc>(SplashScreenBloc.new)
     ..registerFactory<ProcedureSelectionScreenBloc>(
       () => ProcedureSelectionScreenBloc(
-        GetIt.I.get<GenerateSigningConfigUseCase>(),
-        GetIt.I.get<GenerateFlavorsUseCase>(),
-        GetIt.I.get<GetSigningFingerprintUseCase>(),
-        GetIt.I.get<ClearSwaggerComponentsUseCase>(),
-        GetIt.I.get<ClearScreensUseCase>(),
-        GetIt.I.get<GetGenerationOutputStream>(),
-        GetIt.I.get<ClearOutputUseCase>(),
-        GetIt.I.get<RunProcessUseCase>(),
+        configService: getIt.get<ConfigService>(),
+        generateSigningConfigUseCase: getIt.get<GenerateSigningConfigUseCase>(),
+        generateFlavorsUseCase: getIt.get<GenerateFlavorsUseCase>(),
+        getSigningFingerprintUseCase: getIt.get<GetSigningFingerprintUseCase>(),
+        clearSwaggerComponentsUseCase:
+            getIt.get<ClearSwaggerComponentsUseCase>(),
+        clearScreensUseCase: getIt.get<ClearScreensUseCase>(),
+        getGenerationOutputStream: getIt.get<GetGenerationOutputStream>(),
+        clearOutputUseCase: getIt.get<ClearOutputUseCase>(),
+        runProcessUseCase: getIt.get<RunProcessUseCase>(),
+        fetchComponentsFromJsonUseCase:
+            getIt.get<FetchComponentsFromJsonUseCase>(),
+        getComponentsUseCase: getIt.get<GetComponentsUseCase>(),
       ),
     )
     ..registerFactory<DataComponentsScreenV2Bloc>(
       () => DataComponentsScreenV2Bloc(
-        getSwaggerComponentsUseCase: GetIt.I.get<GetSwaggerComponentsUseCase>(),
-        addSourceUseCase: GetIt.I.get<AddSourceUseCase>(),
-        deleteSourceUseCase: GetIt.I.get<DeleteSourceUseCase>(),
-        editSourceNameUseCase: GetIt.I.get<EditSourceNameUseCase>(),
-        deleteDataObjectComponentUseCase: GetIt.I.get<DeleteComponentUseCase>(),
-        deleteSourceRequestUseCase: GetIt.I.get<DeleteSourceRequestUseCase>(),
+        getSwaggerComponentsUseCase: getIt.get<GetComponentsUseCase>(),
+        addSourceUseCase: getIt.get<AddSourceUseCase>(),
+        deleteSourceUseCase: getIt.get<DeleteSourceUseCase>(),
+        editSourceNameUseCase: getIt.get<EditSourceNameUseCase>(),
+        deleteDataObjectComponentUseCase: getIt.get<DeleteComponentUseCase>(),
+        deleteSourceRequestUseCase: getIt.get<DeleteSourceRequestUseCase>(),
+        configService: getIt.get<ConfigService>(),
       ),
     )
     ..registerFactory<ComponentDialogCubit>(
       () => ComponentDialogCubit(
-        addDataObjectComponentUseCase: GetIt.I.get<AddComponentUseCase>(),
-        editDataObjectComponentUseCase: GetIt.I.get<EditComponentUseCase>(),
-        getSwaggerComponentsUseCase: GetIt.I.get<GetSwaggerComponentsUseCase>(),
-        isComponentExistsUseCase: GetIt.I.get<IsComponentExistsUseCase>(),
+        addDataObjectComponentUseCase: getIt.get<AddComponentUseCase>(),
+        editDataObjectComponentUseCase: getIt.get<EditComponentUseCase>(),
+        getSwaggerComponentsUseCase: getIt.get<GetComponentsUseCase>(),
+        isComponentExistsUseCase: getIt.get<IsComponentExistsUseCase>(),
       ),
     )
     ..registerFactory<AddRequestDialogCubit>(
       () => AddRequestDialogCubit(
-        getSwaggerComponentsUseCase: GetIt.I.get<GetSwaggerComponentsUseCase>(),
-        addSourceRequestUseCase: GetIt.I.get<AddSourceRequestUseCase>(),
-        editSourceRequestUseCase: GetIt.I.get<EditSourceRequestUseCase>(),
-        addComponentUseCase: GetIt.I.get<AddComponentUseCase>(),
-        getComponentByNameUseCase: GetIt.I.get<GetComponentByNameUseCase>(),
-        isComponentExistsUseCase: GetIt.I.get<IsComponentExistsUseCase>(),
+        getSwaggerComponentsUseCase: getIt.get<GetComponentsUseCase>(),
+        addSourceRequestUseCase: getIt.get<AddSourceRequestUseCase>(),
+        editSourceRequestUseCase: getIt.get<EditSourceRequestUseCase>(),
+        addComponentUseCase: getIt.get<AddComponentUseCase>(),
+        getComponentByNameUseCase: getIt.get<GetComponentByNameUseCase>(),
+        isComponentExistsUseCase: getIt.get<IsComponentExistsUseCase>(),
       ),
     )
     ..registerFactory<AddRequestParamsDialogCubit>(
       () => AddRequestParamsDialogCubit(
-        getComponentByNameUseCase: GetIt.I.get<GetComponentByNameUseCase>(),
-        getSwaggerComponentsUseCase: GetIt.I.get<GetSwaggerComponentsUseCase>(),
+        getComponentByNameUseCase: getIt.get<GetComponentByNameUseCase>(),
+        getSwaggerComponentsUseCase: getIt.get<GetComponentsUseCase>(),
       ),
     )
     ..registerFactory<ClassFromJsonDialogCubit>(ClassFromJsonDialogCubit.new);

lib/core/di/bloc.dart

@@ -17,12 +17,12 @@ void registerRepositories(GetIt getIt) {
     )
     ..registerLazySingleton<FigmaRepository>(
       () => FigmaRepositoryImpl(
-        figmaRemoteDataSource: GetIt.I.get<FigmaRemoteDataSource>(),
+        figmaRemoteDataSource: getIt.get<FigmaRemoteDataSource>(),
       ),
     )
     ..registerLazySingleton<SwaggerRepository>(
       () => SwaggerRepositoryImpl(
-        GetIt.I.get<SwaggerRemoteSource>(),
+        getIt.get<SwaggerRemoteSource>(),
       ),
     ); //{repositories end}
 }