From 9daca26261d99c888ac29330839085f7f8140914 Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Sun, 16 Jun 2024 13:05:30 +0200 Subject: [PATCH] refactored bang layers --- .../bangs/data/services/{bang_source.dart => source.dart} | 2 +- .../bangs/data/services/{bang_source.g.dart => source.g.dart} | 2 +- app/lib/features/bangs/domain/providers.dart | 2 +- .../bangs/domain/repositories/{bang_data.dart => data.dart} | 2 +- .../domain/repositories/{bang_data.g.dart => data.g.dart} | 2 +- .../domain/repositories/{bang_search.dart => search.dart} | 2 +- .../domain/repositories/{bang_search.g.dart => search.g.dart} | 2 +- app/lib/features/bangs/domain/repositories/sync.dart | 2 +- app/lib/features/bangs/presentation/screens/search.dart | 4 ++-- app/lib/features/bangs/presentation/widgets/site_search.dart | 2 +- app/lib/features/search_browser/domain/providers.dart | 2 +- .../search_browser/presentation/widgets/tabs/search_tab.dart | 2 +- app/lib/features/settings/presentation/screens/settings.dart | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename app/lib/features/bangs/data/services/{bang_source.dart => source.dart} (97%) rename app/lib/features/bangs/data/services/{bang_source.g.dart => source.g.dart} (96%) rename app/lib/features/bangs/domain/repositories/{bang_data.dart => data.dart} (99%) rename app/lib/features/bangs/domain/repositories/{bang_data.g.dart => data.g.dart} (97%) rename app/lib/features/bangs/domain/repositories/{bang_search.dart => search.dart} (96%) rename app/lib/features/bangs/domain/repositories/{bang_search.g.dart => search.g.dart} (96%) diff --git a/app/lib/features/bangs/data/services/bang_source.dart b/app/lib/features/bangs/data/services/source.dart similarity index 97% rename from app/lib/features/bangs/data/services/bang_source.dart rename to app/lib/features/bangs/data/services/source.dart index fbfead4c..7263a07f 100644 --- a/app/lib/features/bangs/data/services/bang_source.dart +++ b/app/lib/features/bangs/data/services/source.dart @@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart'; import 'package:http/http.dart' as http; import 'package:riverpod_annotation/riverpod_annotation.dart'; -part 'bang_source.g.dart'; +part 'source.g.dart'; @Riverpod() class BangSource extends _$BangSource { diff --git a/app/lib/features/bangs/data/services/bang_source.g.dart b/app/lib/features/bangs/data/services/source.g.dart similarity index 96% rename from app/lib/features/bangs/data/services/bang_source.g.dart rename to app/lib/features/bangs/data/services/source.g.dart index e6a1df54..da928c33 100644 --- a/app/lib/features/bangs/data/services/bang_source.g.dart +++ b/app/lib/features/bangs/data/services/source.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'bang_source.dart'; +part of 'source.dart'; // ************************************************************************** // RiverpodGenerator diff --git a/app/lib/features/bangs/domain/providers.dart b/app/lib/features/bangs/domain/providers.dart index 247e3eb3..9e78f807 100644 --- a/app/lib/features/bangs/domain/providers.dart +++ b/app/lib/features/bangs/domain/providers.dart @@ -1,6 +1,6 @@ import 'package:bang_navigator/features/bangs/data/models/bang.dart'; import 'package:bang_navigator/features/bangs/data/models/bang_data.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_data.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/data.dart'; import 'package:bang_navigator/features/bangs/domain/repositories/sync.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/app/lib/features/bangs/domain/repositories/bang_data.dart b/app/lib/features/bangs/domain/repositories/data.dart similarity index 99% rename from app/lib/features/bangs/domain/repositories/bang_data.dart rename to app/lib/features/bangs/domain/repositories/data.dart index c7c634b6..04708834 100644 --- a/app/lib/features/bangs/domain/repositories/bang_data.dart +++ b/app/lib/features/bangs/domain/repositories/data.dart @@ -10,7 +10,7 @@ import 'package:drift/drift.dart'; import 'package:exceptions/exceptions.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -part 'bang_data.g.dart'; +part 'data.g.dart'; @Riverpod(keepAlive: true) class BangDataRepository extends _$BangDataRepository { diff --git a/app/lib/features/bangs/domain/repositories/bang_data.g.dart b/app/lib/features/bangs/domain/repositories/data.g.dart similarity index 97% rename from app/lib/features/bangs/domain/repositories/bang_data.g.dart rename to app/lib/features/bangs/domain/repositories/data.g.dart index 7afb6d8a..7b471732 100644 --- a/app/lib/features/bangs/domain/repositories/bang_data.g.dart +++ b/app/lib/features/bangs/domain/repositories/data.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'bang_data.dart'; +part of 'data.dart'; // ************************************************************************** // RiverpodGenerator diff --git a/app/lib/features/bangs/domain/repositories/bang_search.dart b/app/lib/features/bangs/domain/repositories/search.dart similarity index 96% rename from app/lib/features/bangs/domain/repositories/bang_search.dart rename to app/lib/features/bangs/domain/repositories/search.dart index 19f5466b..26ee7acc 100644 --- a/app/lib/features/bangs/domain/repositories/bang_search.dart +++ b/app/lib/features/bangs/domain/repositories/search.dart @@ -5,7 +5,7 @@ import 'package:bang_navigator/features/bangs/data/models/bang_data.dart'; import 'package:bang_navigator/features/bangs/data/providers.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -part 'bang_search.g.dart'; +part 'search.g.dart'; @Riverpod() class BangSearch extends _$BangSearch { diff --git a/app/lib/features/bangs/domain/repositories/bang_search.g.dart b/app/lib/features/bangs/domain/repositories/search.g.dart similarity index 96% rename from app/lib/features/bangs/domain/repositories/bang_search.g.dart rename to app/lib/features/bangs/domain/repositories/search.g.dart index fdddf0a2..24d4be13 100644 --- a/app/lib/features/bangs/domain/repositories/bang_search.g.dart +++ b/app/lib/features/bangs/domain/repositories/search.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'bang_search.dart'; +part of 'search.dart'; // ************************************************************************** // RiverpodGenerator diff --git a/app/lib/features/bangs/domain/repositories/sync.dart b/app/lib/features/bangs/domain/repositories/sync.dart index 040d9885..746630e2 100644 --- a/app/lib/features/bangs/domain/repositories/sync.dart +++ b/app/lib/features/bangs/domain/repositories/sync.dart @@ -1,7 +1,7 @@ import 'package:bang_navigator/features/bangs/data/database/database.dart'; import 'package:bang_navigator/features/bangs/data/models/bang.dart'; import 'package:bang_navigator/features/bangs/data/providers.dart'; -import 'package:bang_navigator/features/bangs/data/services/bang_source.dart'; +import 'package:bang_navigator/features/bangs/data/services/source.dart'; import 'package:drift/isolate.dart'; import 'package:exceptions/exceptions.dart'; import 'package:riverpod/riverpod.dart'; diff --git a/app/lib/features/bangs/presentation/screens/search.dart b/app/lib/features/bangs/presentation/screens/search.dart index b999867b..2555a2cc 100644 --- a/app/lib/features/bangs/presentation/screens/search.dart +++ b/app/lib/features/bangs/presentation/screens/search.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:bang_navigator/core/routing/routes.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_search.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/search.dart'; import 'package:bang_navigator/features/bangs/presentation/widgets/bang_details.dart'; import 'package:bang_navigator/features/search_browser/domain/entities/modes.dart'; import 'package:bang_navigator/features/search_browser/domain/entities/sheet.dart'; @@ -87,7 +87,7 @@ class BangSearchScreen extends HookConsumerWidget { exception: error, ), ), - loading: () => const Center(child: CircularProgressIndicator()), + loading: () => const SizedBox.shrink(), ), ); } diff --git a/app/lib/features/bangs/presentation/widgets/site_search.dart b/app/lib/features/bangs/presentation/widgets/site_search.dart index bbcb8943..d164b48e 100644 --- a/app/lib/features/bangs/presentation/widgets/site_search.dart +++ b/app/lib/features/bangs/presentation/widgets/site_search.dart @@ -1,5 +1,5 @@ import 'package:bang_navigator/features/bangs/domain/providers.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_data.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/data.dart'; import 'package:bang_navigator/features/bangs/presentation/widgets/bang_chips.dart'; import 'package:bang_navigator/features/bangs/presentation/widgets/search_field.dart'; import 'package:bang_navigator/features/search_browser/domain/providers.dart'; diff --git a/app/lib/features/search_browser/domain/providers.dart b/app/lib/features/search_browser/domain/providers.dart index 54353bd2..cfcda982 100644 --- a/app/lib/features/search_browser/domain/providers.dart +++ b/app/lib/features/search_browser/domain/providers.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:bang_navigator/features/bangs/data/models/bang_data.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_data.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/data.dart'; import 'package:bang_navigator/features/search_browser/domain/entities/sheet.dart'; import 'package:bang_navigator/features/search_browser/domain/services/create_tab.dart'; import 'package:flutter/widgets.dart'; diff --git a/app/lib/features/search_browser/presentation/widgets/tabs/search_tab.dart b/app/lib/features/search_browser/presentation/widgets/tabs/search_tab.dart index 2028ae79..2aff9a07 100644 --- a/app/lib/features/search_browser/presentation/widgets/tabs/search_tab.dart +++ b/app/lib/features/search_browser/presentation/widgets/tabs/search_tab.dart @@ -1,6 +1,6 @@ import 'package:bang_navigator/core/routing/routes.dart'; import 'package:bang_navigator/features/bangs/domain/providers.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_data.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/data.dart'; import 'package:bang_navigator/features/bangs/presentation/widgets/bang_chips.dart'; import 'package:bang_navigator/features/bangs/presentation/widgets/search_field.dart'; import 'package:bang_navigator/features/search_browser/domain/providers.dart'; diff --git a/app/lib/features/settings/presentation/screens/settings.dart b/app/lib/features/settings/presentation/screens/settings.dart index 372ac87a..693b1aa4 100644 --- a/app/lib/features/settings/presentation/screens/settings.dart +++ b/app/lib/features/settings/presentation/screens/settings.dart @@ -1,7 +1,7 @@ import 'package:bang_navigator/core/extension/date_time.dart'; import 'package:bang_navigator/features/bangs/data/models/bang.dart'; import 'package:bang_navigator/features/bangs/domain/providers.dart'; -import 'package:bang_navigator/features/bangs/domain/repositories/bang_data.dart'; +import 'package:bang_navigator/features/bangs/domain/repositories/data.dart'; import 'package:bang_navigator/features/bangs/domain/repositories/sync.dart'; import 'package:bang_navigator/features/settings/data/models/settings.dart'; import 'package:bang_navigator/features/settings/data/repositories/settings_repository.dart';