fix: Adapt to new provider strucutre

This commit is contained in:
Anton Stubenbord
2023-05-11 12:37:17 +02:00
parent d5c68e023c
commit f388f77d63
43 changed files with 540 additions and 1254 deletions

View File

@@ -11,38 +11,14 @@ part 'saved_view_cubit.freezed.dart';
class SavedViewCubit extends Cubit<SavedViewState> {
final SavedViewRepository _savedViewRepository;
final LabelRepository _labelRepository;
SavedViewCubit(this._savedViewRepository, this._labelRepository)
: super(
SavedViewState.initial(
correspondents: _labelRepository.state.correspondents,
documentTypes: _labelRepository.state.documentTypes,
storagePaths: _labelRepository.state.storagePaths,
tags: _labelRepository.state.tags,
),
) {
_labelRepository.addListener(
this,
onChanged: (labels) {
emit(
state.copyWith(
correspondents: labels.correspondents,
documentTypes: labels.documentTypes,
tags: labels.tags,
storagePaths: labels.storagePaths,
),
);
},
);
SavedViewCubit(this._savedViewRepository) : super(const SavedViewState.initial()) {
_savedViewRepository.addListener(
this,
onChanged: (views) {
emit(
state.maybeWhen(
loaded: (savedViews, correspondents, documentTypes, tags, storagePaths) =>
(state as _SavedViewLoadedState).copyWith(
loaded: (savedViews) => (state as _SavedViewLoadedState).copyWith(
savedViews: views.savedViews,
),
orElse: () => state,
@@ -64,13 +40,11 @@ class SavedViewCubit extends Cubit<SavedViewState> {
final views = await _savedViewRepository.findAll();
final values = {for (var element in views) element.id!: element};
if (!isClosed) {
emit(SavedViewState.loaded(
savedViews: values,
correspondents: state.correspondents,
documentTypes: state.documentTypes,
storagePaths: state.storagePaths,
tags: state.tags,
));
emit(
SavedViewState.loaded(
savedViews: values,
),
);
}
}
@@ -79,7 +53,6 @@ class SavedViewCubit extends Cubit<SavedViewState> {
@override
Future<void> close() {
_savedViewRepository.removeListener(this);
_labelRepository.removeListener(this);
return super.close();
}
}

View File

File diff suppressed because it is too large Load Diff

View File

@@ -2,32 +2,12 @@ part of 'saved_view_cubit.dart';
@freezed
class SavedViewState with _$SavedViewState {
const factory SavedViewState.initial({
required Map<int, Correspondent> correspondents,
required Map<int, DocumentType> documentTypes,
required Map<int, Tag> tags,
required Map<int, StoragePath> storagePaths,
}) = _SavedViewIntialState;
const factory SavedViewState.initial() = _SavedViewIntialState;
const factory SavedViewState.loading({
required Map<int, Correspondent> correspondents,
required Map<int, DocumentType> documentTypes,
required Map<int, Tag> tags,
required Map<int, StoragePath> storagePaths,
}) = _SavedViewLoadingState;
const factory SavedViewState.loading() = _SavedViewLoadingState;
const factory SavedViewState.loaded({
required Map<int, SavedView> savedViews,
required Map<int, Correspondent> correspondents,
required Map<int, DocumentType> documentTypes,
required Map<int, Tag> tags,
required Map<int, StoragePath> storagePaths,
}) = _SavedViewLoadedState;
const factory SavedViewState.loaded({required Map<int, SavedView> savedViews}) =
_SavedViewLoadedState;
const factory SavedViewState.error({
required Map<int, Correspondent> correspondents,
required Map<int, DocumentType> documentTypes,
required Map<int, Tag> tags,
required Map<int, StoragePath> storagePaths,
}) = _SavedViewErrorState;
const factory SavedViewState.error() = _SavedViewErrorState;
}

View File

@@ -5,6 +5,7 @@ import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
import 'package:paperless_mobile/core/config/hive/hive_config.dart';
import 'package:paperless_mobile/core/database/tables/global_settings.dart';
import 'package:paperless_mobile/core/database/tables/local_user_app_state.dart';
import 'package:paperless_mobile/core/navigation/push_routes.dart';
import 'package:paperless_mobile/core/widgets/hint_card.dart';
import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart';
import 'package:paperless_mobile/features/saved_view_details/cubit/saved_view_details_cubit.dart';
@@ -21,17 +22,13 @@ class SavedViewList extends StatelessWidget {
return BlocBuilder<SavedViewCubit, SavedViewState>(
builder: (context, state) {
return state.when(
initial: (correspondents, documentTypes, tags, storagePaths) => Container(),
loading: (correspondents, documentTypes, tags, storagePaths) => Center(
child: Text("Saved views loading..."), //TODO: INTL
initial: () => SliverToBoxAdapter(child: Container()),
loading: () => SliverToBoxAdapter(
child: Center(
child: Text("Saved views loading..."), //TODO: INTL
),
),
loaded: (
savedViews,
correspondents,
documentTypes,
tags,
storagePaths,
) {
loaded: (savedViews) {
if (savedViews.isEmpty) {
return SliverToBoxAdapter(
child: HintCard(
@@ -50,30 +47,7 @@ class SavedViewList extends StatelessWidget {
S.of(context)!.nFiltersSet(view.filterRules.length),
),
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (ctxt) => MultiBlocProvider(
providers: [
BlocProvider(
create: (context) => SavedViewDetailsCubit(
ctxt.read(),
ctxt.read(),
context.read(),
Hive.box<LocalUserAppState>(HiveBoxes.localUserAppState).get(
Hive.box<GlobalSettings>(HiveBoxes.globalSettings)
.getValue()!
.currentLoggedInUser!,
)!,
savedView: view,
),
),
],
child: SavedViewDetailsPage(
onDelete: context.read<SavedViewCubit>().remove,
),
),
),
);
pushSavedViewDetailsRoute(context, savedView: view);
},
);
},
@@ -81,13 +55,7 @@ class SavedViewList extends StatelessWidget {
),
);
},
error: (
correspondents,
documentTypes,
tags,
storagePaths,
) =>
Center(
error: () => Center(
child: Text(
"An error occurred while trying to load the saved views.",
),