update

lib/logic/cubit/forms/initializing/root_user_form_cubit.dart

@@ -5,10 +5,10 @@ import 'package:selfprivacy/logic/api_maps/hetzner.dart';
 import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
 import 'package:selfprivacy/logic/models/user.dart';
 
-class UserFormCubit extends FormCubit {
+class RootUserFormCubit extends FormCubit {
   HetznerApi apiClient = HetznerApi();
 
-  UserFormCubit(this.initializingCubit) {
+  RootUserFormCubit(this.initializingCubit) {
     var userRegExp = RegExp(r"\W");
     var passwordRegExp = RegExp(r"[\n\r\s]+");
 

lib/logic/cubit/forms/user/user_form_cubit.dart

@@ -3,10 +3,11 @@ import 'dart:async';
 import 'package:cubit_form/cubit_form.dart';
 import 'package:selfprivacy/logic/cubit/users/users_cubit.dart';
 import 'package:selfprivacy/logic/models/user.dart';
+import 'package:selfprivacy/utils/password_generator.dart';
 
-class CloudFlareFormCubit extends FormCubit {
+class UserFormCubit extends FormCubit {
-  CloudFlareFormCubit({
+  UserFormCubit({
-    this.userCubit,
+    this.usersCubit,
     User user,
   }) {
     var isEdit = user != null;
@@ -24,7 +25,7 @@ class CloudFlareFormCubit extends FormCubit {
     );
 
     password = FieldCubit(
-      initalValue: isEdit ? user.password : '',
+      initalValue: isEdit ? user.password : genPass(),
       validations: [
         RequiredStringValidation('required'),
         ValidationModel<String>(
@@ -41,11 +42,15 @@ class CloudFlareFormCubit extends FormCubit {
       login: login.state.value,
       password: password.state.value,
     );
-    userCubit.add(user);
+    usersCubit.add(user);
   }
 
   FieldCubit<String> login;
   FieldCubit<String> password;
 
-  UsersCubit userCubit;
+  void genNewPassword() {
+    password.externalSetValue(genPass());
+  }
+
+  UsersCubit usersCubit;
 }

lib/logic/cubit/users/users_cubit.dart

@@ -9,14 +9,14 @@ class UsersCubit extends Cubit<UsersState> {
   UsersCubit() : super(UsersState([]));
 
   void add(User user) {
-    var users = state.users;
+    var users = [...state.users];
     users.add(user);
 
     emit(UsersState(users));
   }
 
   void remove(User user) {
-    var users = state.users;
+    var users = [...state.users];
     users.remove(user);
 
     emit(UsersState(users));

lib/ui/pages/initializing/initializing.dart

@@ -7,7 +7,7 @@ import 'package:selfprivacy/config/text_themes.dart';
 import 'package:selfprivacy/logic/cubit/forms/initializing/cloudflare_form_cubit.dart';
 import 'package:selfprivacy/logic/cubit/forms/initializing/domain_form_cubit.dart';
 import 'package:selfprivacy/logic/cubit/forms/initializing/hetzner_form_cubit.dart';
-import 'package:selfprivacy/logic/cubit/forms/initializing/user_form_cubit.dart';
+import 'package:selfprivacy/logic/cubit/forms/initializing/root_user_form_cubit.dart';
 import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
 import 'package:selfprivacy/logic/cubit/providers/providers_cubit.dart';
 import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
@@ -217,9 +217,9 @@ class InitializingPage extends StatelessWidget {
 
   Widget _stepUser(AppConfigCubit initializingCubit) {
     return BlocProvider(
-      create: (context) => UserFormCubit(initializingCubit),
+      create: (context) => RootUserFormCubit(initializingCubit),
       child: Builder(builder: (context) {
-        var formCubit = context.watch<UserFormCubit>();
+        var formCubit = context.watch<RootUserFormCubit>();
 
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,

lib/ui/pages/users/new_user.dart

@@ -1,73 +1,76 @@
 part of 'users.dart';
 
-class _NewUser extends StatefulWidget {
+class _NewUser extends StatelessWidget {
-  const _NewUser({Key key}) : super(key: key);
-
-  @override
-  __NewUserState createState() => __NewUserState();
-}
-
-class __NewUserState extends State<_NewUser> {
-  var passController = TextEditingController(text: genPass());
-
   @override
   Widget build(BuildContext context) {
-    // final usersCubit = context.watch<UsersCubit>();
+    final usersCubit = context.watch<UsersCubit>();
 
     return BrandModalSheet(
-      child: Container(
+      child: BlocProvider(
-        child: Column(
+        create: (context) => UserFormCubit(usersCubit: usersCubit),
-          crossAxisAlignment: CrossAxisAlignment.start,
+        child: Builder(builder: (context) {
-          children: [
+          var formCubit = context.watch<UserFormCubit>();
-            BrandHeader(title: 'Новый пользователь'),
+
-            SizedBox(width: 14),
+          return BlocListener<UserFormCubit, FormCubitState>(
-            Padding(
+            listener: (context, state) {
-              padding: brandPagePadding2,
+              if (state.isSubmitted) {
-              child: Column(
+                Navigator.pop(context);
-                children: [
+              }
-                  TextField(
+            },
-                    decoration: InputDecoration(
+            child: Column(
-                      labelText: 'Логин',
+              crossAxisAlignment: CrossAxisAlignment.start,
-                      suffixText: '@example',
+              children: [
-                    ),
+                BrandHeader(title: 'Новый пользователь'),
-                  ),
+                SizedBox(width: 14),
-                  SizedBox(height: 20),
+                Padding(
-                  TextField(
+                  padding: brandPagePadding2,
-                    controller: passController,
+                  child: Column(
-                    decoration: InputDecoration(
+                    children: [
-                      alignLabelWithHint: false,
+                      CubitFormTextField(
-                      labelText: 'Пароль',
+                        formFieldCubit: formCubit.login,
-                      suffixIcon: Padding(
+                        decoration: InputDecoration(
-                        padding: const EdgeInsets.only(right: 8),
+                          labelText: 'Логин',
-                        child: IconButton(
+                          suffixText: '@example',
-                          icon: Icon(
-                            BrandIcons.refresh,
-                            color: BrandColors.blue,
-                          ),
-                          onPressed: () {
-                            passController.value =
-                                TextEditingValue(text: genPass());
-                          },
                         ),
                       ),
-                    ),
+                      SizedBox(height: 20),
+                      CubitFormTextField(
+                        formFieldCubit: formCubit.password,
+                        decoration: InputDecoration(
+                          alignLabelWithHint: false,
+                          labelText: 'Пароль',
+                          suffixIcon: Padding(
+                            padding: const EdgeInsets.only(right: 8),
+                            child: IconButton(
+                              icon: Icon(
+                                BrandIcons.refresh,
+                                color: BrandColors.blue,
+                              ),
+                              onPressed: formCubit.genNewPassword,
+                            ),
+                          ),
+                        ),
+                      ),
+                      SizedBox(height: 30),
+                      BrandButton.rised(
+                        onPressed: formCubit.state.isSubmitting
+                            ? null
+                            : () {
+                                formCubit.trySubmit();
+                              },
+                        title: 'Создать',
+                      ),
+                      SizedBox(height: 40),
+                      Text(
+                          'Новый пользователь автоматически получит доступ ко всем сервисам. Ещё какое-то описание.'),
+                      SizedBox(height: 30),
+                    ],
                   ),
-                  SizedBox(height: 30),
+                ),
-                  BrandButton.rised(
+              ],
-                    onPressed: () {
-                      Navigator.pop(context);
-                    },
-                    title: 'Создать',
-                  ),
-                  SizedBox(height: 40),
-                  Text(
-                      'Новый пользователь автоматически получит доступ ко всем сервисам. Ещё какое-то описание.'),
-                  SizedBox(height: 30),
-                ],
-              ),
             ),
-          ],
+          );
-        ),
+        }),
       ),
     );
   }

lib/ui/pages/users/user_details.dart

@@ -67,6 +67,7 @@ class _UserDetails extends StatelessWidget {
                                         ),
                                       ),
                                       onPressed: () {
+                                        context.read<UsersCubit>().remove(user);
                                         Navigator.of(context)..pop()..pop();
                                       },
                                     ),

lib/ui/pages/users/users.dart

@@ -1,7 +1,9 @@
+import 'package:cubit_form/cubit_form.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/config/brand_colors.dart';
 import 'package:selfprivacy/config/brand_theme.dart';
 import 'package:selfprivacy/logic/cubit/app_config/app_config_cubit.dart';
+import 'package:selfprivacy/logic/cubit/forms/user/user_form_cubit.dart';
 import 'package:selfprivacy/logic/cubit/users/users_cubit.dart';
 import 'package:selfprivacy/logic/models/user.dart';
 import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
@@ -11,7 +13,6 @@ import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
 import 'package:selfprivacy/ui/components/brand_modal_sheet/brand_modal_sheet.dart';
 import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
 import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
-import 'package:selfprivacy/utils/password_generator.dart';
 
 part 'fab.dart';
 part 'new_user.dart';

pubspec.lock

@@ -182,7 +182,7 @@ packages:
       name: cubit_form
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.15"
+    version: "0.0.16"
   cupertino_icons:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -10,7 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
   crypto: ^2.1.5
-  cubit_form: ^0.0.15
+  cubit_form: ^0.0.16
   cupertino_icons: ^1.0.0
   dio: ^3.0.10
   easy_localization: ^2.3.3