WIP - more decoupling of blocs

lib/features/edit_label/view/add_label_page.dart

@@ -28,7 +28,7 @@ class AddLabelPage<T extends Label> extends StatelessWidget {
       ),
       child: AddLabelFormWidget(
         pageTitle: pageTitle,
-        label: fromJsonT({'name': initialName}),
+        label: initialName != null ? fromJsonT({'name': initialName}) : null,
         additionalFields: additionalFields,
         fromJsonT: fromJsonT,
       ),

lib/features/edit_label/view/edit_label_page.dart

@@ -70,33 +70,38 @@ class EditLabelForm<T extends Label> extends StatelessWidget {
     );
   }
 
-  void _onDelete(BuildContext context) {
+  void _onDelete(BuildContext context) async {
     if ((label.documentCount ?? 0) > 0) {
-      showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          title: Text(S.of(context).editLabelPageConfirmDeletionDialogTitle),
-          content: Text(
-            S.of(context).editLabelPageDeletionDialogText,
-          ),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.pop(context),
-              child: Text(S.of(context).genericActionCancelLabel),
-            ),
-            TextButton(
-              onPressed: () {
-                BlocProvider.of<EditLabelCubit<T>>(context).delete(label);
-                Navigator.pop(context);
-              },
-              child: Text(
-                S.of(context).genericActionDeleteLabel,
-                style: TextStyle(color: Theme.of(context).errorColor),
+      final shouldDelete = await showDialog<bool>(
+            context: context,
+            builder: (context) => AlertDialog(
+              title:
+                  Text(S.of(context).editLabelPageConfirmDeletionDialogTitle),
+              content: Text(
+                S.of(context).editLabelPageDeletionDialogText,
               ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.pop(context, false),
+                  child: Text(S.of(context).genericActionCancelLabel),
+                ),
+                TextButton(
+                  onPressed: () {
+                    Navigator.pop(context, true);
+                  },
+                  child: Text(
+                    S.of(context).genericActionDeleteLabel,
+                    style: TextStyle(color: Theme.of(context).errorColor),
+                  ),
+                ),
+              ],
             ),
-          ],
-        ),
-      );
+          ) ??
+          false;
+      if (shouldDelete) {
+        BlocProvider.of<EditLabelCubit<T>>(context).delete(label);
+        Navigator.pop(context);
+      }
     } else {
       BlocProvider.of<EditLabelCubit<T>>(context).delete(label);
       Navigator.pop(context);

lib/features/edit_label/view/impl/edit_document_type_page.dart

@@ -2,8 +2,8 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
+import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_cubit.dart';
 
 class EditDocumentTypePage extends StatelessWidget {
   final DocumentType documentType;
@@ -12,7 +12,7 @@ class EditDocumentTypePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LabelCubit<DocumentType>(
+      create: (context) => EditLabelCubit<DocumentType>(
         RepositoryProvider.of<LabelRepository<DocumentType>>(context),
       ),
       child: EditLabelPage<DocumentType>(

lib/features/edit_label/view/impl/edit_storage_path_page.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
+import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_cubit.dart';
 import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
 
 class EditStoragePathPage extends StatelessWidget {
@@ -13,7 +13,7 @@ class EditStoragePathPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LabelCubit<StoragePath>(
+      create: (context) => EditLabelCubit<StoragePath>(
         RepositoryProvider.of<LabelRepository<StoragePath>>(context),
       ),
       child: EditLabelPage<StoragePath>(

lib/features/edit_label/view/impl/edit_tag_page.dart

@@ -4,8 +4,8 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_extra_fields/form_builder_extra_fields.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
+import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_cubit.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 
 class EditTagPage extends StatelessWidget {
@@ -16,7 +16,7 @@ class EditTagPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LabelCubit<Tag>(
+      create: (context) => EditLabelCubit<Tag>(
         RepositoryProvider.of<LabelRepository<Tag>>(context),
       ),
       child: EditLabelPage<Tag>(

lib/features/edit_label/view/label_form.dart

@@ -10,7 +10,7 @@ import 'package:paperless_mobile/util.dart';
 class SubmitButtonConfig<T extends Label> {
   final Widget icon;
   final Widget label;
-  final Future<void> Function(T) onSubmit;
+  final Future<T> Function(T) onSubmit;
 
   SubmitButtonConfig({
     required this.icon,
@@ -117,8 +117,9 @@ class _LabelFormState<T extends Label> extends State<LabelForm<T>> {
           ...widget.initialValue?.toJson() ?? {},
           ..._formKey.currentState!.value
         };
-        await widget.submitButtonConfig.onSubmit(widget.fromJsonT(mergedJson));
-        Navigator.pop(context);
+        final createdLabel = await widget.submitButtonConfig
+            .onSubmit(widget.fromJsonT(mergedJson));
+        Navigator.pop(context, createdLabel);
       } on PaperlessValidationErrors catch (errorMessages) {
         setState(() => _errors = errorMessages);
       } on PaperlessServerException catch (error, stackTrace) {