refactor

p0dyakov · Dec 19, 2022 · b331c3d · b331c3d
1 parent 1e00895
commit b331c3d
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 28 deletions.
diff --git a/lib/src/core/extension/src/build_context.dart b/lib/src/core/extension/src/build_context.dart
@@ -8,9 +8,9 @@ import 'package:shop/src/core/database/hive/app_database.dart';
 import 'package:shop/src/core/model/dependencies_storage.dart';
 import 'package:shop/src/core/model/environment_storage.dart';
 import 'package:shop/src/core/model/repository_storage.dart';
-import 'package:shop/src/core/widget/dependencies_scope.dart';
-import 'package:shop/src/core/widget/environment_scope.dart';
-import 'package:shop/src/core/widget/repository_scope.dart';
+import 'package:shop/src/core/widget/scope/dependencies_scope.dart';
+import 'package:shop/src/core/widget/scope/environment_scope.dart';
+import 'package:shop/src/core/widget/scope/repository_scope.dart';
 
 extension BuildContextX on BuildContext {
  // Scopes

diff --git a/lib/src/core/logic/.keep b/lib/src/core/logic/.keep
diff --git a/lib/src/core/model/dependencies_storage.dart b/lib/src/core/model/dependencies_storage.dart
@@ -11,14 +11,11 @@ abstract class IDependenciesStorage {
 }
 
 class DependenciesStorage implements IDependenciesStorage {
- final String _databaseName;
  final SharedPreferences _sharedPreferences;
 
  DependenciesStorage({
- required String databaseName,
  required SharedPreferences sharedPreferences,
- }) : _databaseName = databaseName,
- _sharedPreferences = sharedPreferences;
+ }) : _sharedPreferences = sharedPreferences;
 
  Dio? _dio;
 

diff --git a/lib/src/core/resource/theme/light_theme.dart → ...src/core/resources/theme/light_theme.dart b/lib/src/core/resource/theme/light_theme.dart → ...src/core/resources/theme/light_theme.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 
 final appLightTheme = ThemeData(
  backgroundColor: const Color.fromARGB(255, 249, 249, 249),

diff --git a/lib/src/core/resource/theme/sizes.dart → lib/src/core/resources/theme/sizes.dart b/lib/src/core/resource/theme/sizes.dart → lib/src/core/resources/theme/sizes.dart
diff --git a/lib/src/core/utils/show_draggable_bottom_sheet.dart b/lib/src/core/utils/show_draggable_bottom_sheet.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 
 Future<void> showDraggableBottomSheet({
  required Widget child,

diff --git a/lib/src/core/widget/center_text.dart b/lib/src/core/widget/center_text.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 
 class CenterText extends StatelessWidget {
  const CenterText({

diff --git a/lib/src/core/widget/bloc_scope.dart → lib/src/core/widget/scope/bloc_scope.dart b/lib/src/core/widget/bloc_scope.dart → lib/src/core/widget/scope/bloc_scope.dart
diff --git a/lib/src/core/widget/dependencies_scope.dart → ...core/widget/scope/dependencies_scope.dart b/lib/src/core/widget/dependencies_scope.dart → ...core/widget/scope/dependencies_scope.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:shop/src/core/model/dependencies_storage.dart';
-import 'package:shop/src/core/widget/scope.dart';
+import 'package:shop/src/core/widget/scope/scope.dart';
 
 class DependenciesScope extends Scope {
  static const DelegateAccess<_DependenciesScopeDelegate> _delegateOf =

diff --git a/lib/src/core/widget/environment_scope.dart → .../core/widget/scope/environment_scope.dart b/lib/src/core/widget/environment_scope.dart → .../core/widget/scope/environment_scope.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:shop/src/core/model/environment_storage.dart';
-import 'package:shop/src/core/widget/scope.dart';
+import 'package:shop/src/core/widget/scope/scope.dart';
 
 class EnvironmentScope extends Scope {
  static const DelegateAccess<_EnvironmentScopeDelegate> _delegateOf =

diff --git a/lib/src/core/widget/repository_scope.dart → ...c/core/widget/scope/repository_scope.dart b/lib/src/core/widget/repository_scope.dart → ...c/core/widget/scope/repository_scope.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:shop/src/core/model/repository_storage.dart';
-import 'package:shop/src/core/widget/scope.dart';
+import 'package:shop/src/core/widget/scope/scope.dart';
 
 class RepositoryScope extends Scope {
  static const DelegateAccess<_RepositoryScopeDelegate> _delegateOf =

diff --git a/lib/src/core/widget/scope.dart → lib/src/core/widget/scope/scope.dart b/lib/src/core/widget/scope.dart → lib/src/core/widget/scope/scope.dart
diff --git a/lib/src/core/widget/search.dart b/lib/src/core/widget/search.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 
 class SearchWidget extends StatelessWidget {
  const SearchWidget({

diff --git a/lib/src/feature/app/shop_app.dart b/lib/src/feature/app/shop_app.dart
@@ -3,9 +3,9 @@ import 'package:pure/pure.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shop/src/core/model/dependencies_storage.dart';
 import 'package:shop/src/core/model/repository_storage.dart';
-import 'package:shop/src/core/widget/dependencies_scope.dart';
-import 'package:shop/src/core/widget/environment_scope.dart';
-import 'package:shop/src/core/widget/repository_scope.dart';
+import 'package:shop/src/core/widget/scope/dependencies_scope.dart';
+import 'package:shop/src/core/widget/scope/environment_scope.dart';
+import 'package:shop/src/core/widget/scope/repository_scope.dart';
 import 'package:shop/src/feature/app/bloc/initialization_bloc.dart';
 import 'package:shop/src/feature/app/widget/app_configuration.dart';
 import 'package:shop/src/feature/app/widget/app_lifecycle_scope.dart';
@@ -29,7 +29,6 @@ class ShopApp extends StatelessWidget {
  errorTrackingDisabler: initializationData.errorTrackingDisabler,
  child: DependenciesScope(
  create: (context) => DependenciesStorage(
- databaseName: 'shop_database',
  sharedPreferences: _sharedPreferences,
  ),
  child: RepositoryScope(

diff --git a/lib/src/feature/app/widget/app_configuration.dart b/lib/src/feature/app/widget/app_configuration.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.g.dart';
 import 'package:shop/src/core/extension/extensions.dart';
-import 'package:shop/src/core/resource/theme/light_theme.dart';
+import 'package:shop/src/core/resources/theme/light_theme.dart';
 import 'package:shop/src/core/router/app_router.dart';
 import 'package:shop/src/feature/app/widget/app_router_builder.dart';
 

diff --git a/lib/src/feature/app/widget/app_lifecycle_scope.dart b/lib/src/feature/app/widget/app_lifecycle_scope.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/widget/scope.dart';
+import 'package:shop/src/core/widget/scope/scope.dart';
 import 'package:shop/src/feature/app/logic/error_tracking_manager.dart';
 
 class AppLifecycleScope extends Scope {

diff --git a/lib/src/feature/settings/widget/scope/settings_scope.dart b/lib/src/feature/settings/widget/scope/settings_scope.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:pure/pure.dart';
 import 'package:shop/src/core/extension/extensions.dart';
-import 'package:shop/src/core/widget/bloc_scope.dart';
+import 'package:shop/src/core/widget/scope/bloc_scope.dart';
 import 'package:shop/src/feature/settings/bloc/settings_bloc.dart';
 import 'package:shop/src/feature/settings/enum/app_theme.dart';
 

diff --git a/lib/src/feature/shop/page/products_page.dart b/lib/src/feature/shop/page/products_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 import 'package:shop/src/core/widget/search.dart';
 import 'package:shop/src/feature/shop/model/shop/shop.dart';
 import 'package:shop/src/feature/shop/products_bloc/products_bloc.dart';

diff --git a/lib/src/feature/shop/page/shops_page.dart b/lib/src/feature/shop/page/shops_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 import 'package:shop/src/core/widget/search.dart';
 import 'package:shop/src/feature/shop/shops_bloc/shops_bloc.dart';
 import 'package:shop/src/feature/shop/widget/filters.dart';

diff --git a/lib/src/feature/shop/products_bloc/products_bloc.dart b/lib/src/feature/shop/products_bloc/products_bloc.dart
@@ -1,5 +1,4 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:l/l.dart';
 import 'package:shop/src/core/extension/extensions.dart';
 import 'package:shop/src/feature/app/logic/logger.dart';
 import 'package:shop/src/feature/shop/model/product/product.dart';

diff --git a/lib/src/feature/shop/widget/scope/products_scope.dart b/lib/src/feature/shop/widget/scope/products_scope.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shop/src/core/widget/bloc_scope.dart';
+import 'package:shop/src/core/widget/scope/bloc_scope.dart';
 import 'package:shop/src/feature/shop/model/shop/shop.dart';
 import 'package:shop/src/feature/shop/products_bloc/products_bloc.dart';
 

diff --git a/lib/src/feature/shop/widget/scope/shops_scope.dart b/lib/src/feature/shop/widget/scope/shops_scope.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:shop/src/core/extension/extensions.dart';
-import 'package:shop/src/core/widget/bloc_scope.dart';
+import 'package:shop/src/core/widget/scope/bloc_scope.dart';
 import 'package:shop/src/feature/shop/model/shop/shop.dart';
 import 'package:shop/src/feature/shop/shops_bloc/shops_bloc.dart';
 

diff --git a/lib/src/feature/shop/widget/shop_card.dart b/lib/src/feature/shop/widget/shop_card.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 import 'package:shop/src/feature/shop/model/shop/shop.dart';
 import 'package:shop/src/feature/shop/widget/delivery_info.dart';
 

diff --git a/lib/src/feature/shop/widget/title.dart b/lib/src/feature/shop/widget/title.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:shop/src/core/resource/theme/sizes.dart';
+import 'package:shop/src/core/resources/theme/sizes.dart';
 
 class TitleWidget extends StatelessWidget {
  const TitleWidget(this.text, {Key? key}) : super(key: key);