fix: reg, verify, loaders, grey screen when like

2025-07-30 12:34:27 +03:00
parent aacbc0ce5a
commit 09a1ec0947
13 changed files with 260 additions and 144 deletions
--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
@@ -60,10 +60,11 @@ class RegistrationCubit extends Cubit<RegistrationState> {
        ),
      );
      await TokenStorage.saveTokenInStorage(token);
-      AppRouter.navigatorKey.currentContext?.pushNamed('verifyEmailScreen');
      await sl<FirebaseApi>().registerPushToken();
+      AppRouter.navigatorKey.currentContext?.replaceNamed('verifyEmailScreen');
    } catch (e, st) {
      log(e.toString(), stackTrace: st);
+      emit(RegistrationState(sheet: state.sheet, error: e.toString()));
    }
  }

--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart
@@ -7,5 +7,6 @@ part 'registration_state.freezed.dart';
 abstract class RegistrationState with _$RegistrationState {
  const factory RegistrationState({
    required UserRegistrationSheet sheet,
+    String? error,
  }) = _RegistrationState;
 }
--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -43,142 +43,161 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
  Widget build(BuildContext context) {
    return BlocProvider<RegistrationCubit>(
      create: (BuildContext context) => registrationCubit,
-      child: BlocBuilder<RegistrationCubit, RegistrationState>(
-        builder: (BuildContext context, RegistrationState state) {
-          return Scaffold(
-            floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-            floatingActionButton: Row(
-              children: [
-                Container(
-                  height: 48,
-                  width: MediaQuery.of(context).size.width * 0.2,
-                  padding: const EdgeInsets.only(left: 16, right: 4),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'backButtonRegistration',
-                    highlightElevation: 0,
-                    focusElevation: 0,
-                    elevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: const Color(0xFFEAF2FD),
-                    onPressed: () async {
-                      setState(() {
-                        pageController.previousPage(
-                          duration: const Duration(milliseconds: 350),
-                          curve: Curves.easeInOut,
-                        );
-                      });
-                    },
-                    label: Icon(
-                      Icons.arrow_back_ios_new_rounded,
-                      color: appTheme.blueA400,
-                    ),
+      child: BlocListener<RegistrationCubit, RegistrationState>(
+        listener: (context, state) {
+          if (state.error != null && state.error!.isNotEmpty) {
+            showDialog(
+              context: context,
+              builder: (context) => AlertDialog(
+                title: const Text('Ошибка при регистрации'),
+                content: Text(state.error!),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.pop(context),
+                    child: const Text('OK'),
                  ),
-                ),
-                Container(
-                  height: 48,
-                  width: MediaQuery.of(context).size.width * 0.8,
-                  padding: const EdgeInsets.only(left: 4, right: 16),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'nextButtonRegistration',
-                    highlightElevation: 0,
-                    elevation: 0,
-                    focusElevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: appTheme.blueA400,
-                    onPressed: () async {
-                      if (await canGoNext(state, context)) {
+                ],
+              ),
+            );
+          }
+        },
+        child: BlocBuilder<RegistrationCubit, RegistrationState>(
+          builder: (BuildContext context, RegistrationState state) {
+            return Scaffold(
+              floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+              floatingActionButton: Row(
+                children: [
+                  Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width * 0.2,
+                    padding: const EdgeInsets.only(left: 16, right: 4),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'backButtonRegistration',
+                      highlightElevation: 0,
+                      focusElevation: 0,
+                      elevation: 0,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: const Color(0xFFEAF2FD),
+                      onPressed: () async {
                        setState(() {
-                          pageController.nextPage(
+                          pageController.previousPage(
                            duration: const Duration(milliseconds: 350),
                            curve: Curves.easeInOut,
                          );
                        });
-                      }
-                    },
-                    label: Text(
-                      'Продолжить',
-                      style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
+                      },
+                      label: Icon(
+                        Icons.arrow_back_ios_new_rounded,
+                        color: appTheme.blueA400,
+                      ),
                    ),
                  ),
-                ),
-              ],
-            ),
-            appBar: AppBar(
-              automaticallyImplyLeading: false,
-              leading: Builder(
-                builder: (context) => IconButton(
-                  icon: const Icon(Icons.close_rounded),
-                  onPressed: () => GoRouter.of(context).pop(),
-                ),
-              ),
-              centerTitle: true,
-              title: SvgPicture.asset(
-                ImageConstant.imgLogoEatvio,
-                height: 48,
-                fit: BoxFit.contain,
-              ),
-              actions: [
-                Padding(
-                  padding: const EdgeInsets.only(right: 16),
-                  child: Text('шаг $step из 15'),
-                ),
-              ],
-              bottom: PreferredSize(
-                preferredSize: Size(MediaQuery.of(context).size.width, 32),
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: TweenAnimationBuilder<double>(
-                    duration: const Duration(milliseconds: 350),
-                    curve: Curves.easeInOut,
-                    tween: Tween<double>(
-                      begin: 1 / 15,
-                      end: progressValue,
+                  Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width * 0.8,
+                    padding: const EdgeInsets.only(left: 4, right: 16),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'nextButtonRegistration',
+                      highlightElevation: 0,
+                      elevation: 0,
+                      focusElevation: 0,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: appTheme.blueA400,
+                      onPressed: () async {
+                        if (await canGoNext(state, context)) {
+                          setState(() {
+                            pageController.nextPage(
+                              duration: const Duration(milliseconds: 350),
+                              curve: Curves.easeInOut,
+                            );
+                          });
+                        }
+                      },
+                      label: Text(
+                        'Продолжить',
+                        style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
+                      ),
                    ),
-                    builder: (context, value, _) => LinearProgressIndicator(
-                      value: value,
-                      borderRadius: BorderRadius.circular(16),
-                      minHeight: 8,
-                      backgroundColor: Colors.grey.shade100,
-                      valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
+                  ),
+                ],
+              ),
+              appBar: AppBar(
+                automaticallyImplyLeading: false,
+                leading: Builder(
+                  builder: (context) => IconButton(
+                    icon: const Icon(Icons.close_rounded),
+                    onPressed: () => GoRouter.of(context).pop(),
+                  ),
+                ),
+                centerTitle: true,
+                title: SvgPicture.asset(
+                  ImageConstant.imgLogoEatvio,
+                  height: 48,
+                  fit: BoxFit.contain,
+                ),
+                actions: [
+                  Padding(
+                    padding: const EdgeInsets.only(right: 16),
+                    child: Text('шаг $step из 15'),
+                  ),
+                ],
+                bottom: PreferredSize(
+                  preferredSize: Size(MediaQuery.of(context).size.width, 32),
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: TweenAnimationBuilder<double>(
+                      duration: const Duration(milliseconds: 350),
+                      curve: Curves.easeInOut,
+                      tween: Tween<double>(
+                        begin: 1 / 15,
+                        end: progressValue,
+                      ),
+                      builder: (context, value, _) => LinearProgressIndicator(
+                        value: value,
+                        borderRadius: BorderRadius.circular(16),
+                        minHeight: 8,
+                        backgroundColor: Colors.grey.shade100,
+                        valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
+                      ),
                    ),
                  ),
                ),
              ),
-            ),
-            body: PageView(
-              physics: const NeverScrollableScrollPhysics(),
-              controller: pageController,
-              onPageChanged: (index) {
-                setState(() {
-                  step = index + 1;
-                  progressValue = step / 15;
-                });
-              },
-              children: [
-                // LanguageSelectScreen(sheet: state.sheet),
-                PhoneScreen(sheet: state.sheet),
-                CredentialsScreen(sheet: state.sheet),
-                NameScreen(sheet: state.sheet),
-                GenderScreen(sheet: state.sheet),
-                DateOfBirthScreen(sheet: state.sheet),
-                CityOfLivingScreen(sheet: state.sheet),
-                BodyCircumferencesScreen(sheet: state.sheet),
-                WeightScreen(sheet: state.sheet),
-                HeightScreen(sheet: state.sheet),
-                BloodPressureScreen(sheet: state.sheet),
-                AllergiesScreen(sheet: state.sheet),
-                MedicineIntakeScreen(sheet: state.sheet),
-                FavoriteSportsScreen(sheet: state.sheet),
-                FavoriteFoodsScreen(sheet: state.sheet),
-                AdditionalInformationScreen(sheet: state.sheet),
-              ],
-            ),
-          );
-        },
+              body: PageView(
+                physics: const NeverScrollableScrollPhysics(),
+                controller: pageController,
+                onPageChanged: (index) {
+                  setState(() {
+                    step = index + 1;
+                    progressValue = step / 15;
+                  });
+                },
+                children: [
+                  // LanguageSelectScreen(sheet: state.sheet),
+                  PhoneScreen(sheet: state.sheet),
+                  CredentialsScreen(sheet: state.sheet),
+                  NameScreen(sheet: state.sheet),
+                  GenderScreen(sheet: state.sheet),
+                  DateOfBirthScreen(sheet: state.sheet),
+                  CityOfLivingScreen(sheet: state.sheet),
+                  BodyCircumferencesScreen(sheet: state.sheet),
+                  WeightScreen(sheet: state.sheet),
+                  HeightScreen(sheet: state.sheet),
+                  BloodPressureScreen(sheet: state.sheet),
+                  AllergiesScreen(sheet: state.sheet),
+                  MedicineIntakeScreen(sheet: state.sheet),
+                  FavoriteSportsScreen(sheet: state.sheet),
+                  FavoriteFoodsScreen(sheet: state.sheet),
+                  AdditionalInformationScreen(sheet: state.sheet),
+                ],
+              ),
+            );
+          },
+        ),
      ),
    );
  }
--- a/lib/features/registration/presentation/pages/verify_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_screen.dart
@@ -1,5 +1,6 @@
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
@@ -19,6 +20,7 @@ class VerifyScreen extends StatefulWidget {

 class _VerifyScreenState extends State<VerifyScreen> {
  late final WebViewController _controller;
+  bool _isLoading = true;

  @override
  void initState() {
@@ -27,6 +29,11 @@ class _VerifyScreenState extends State<VerifyScreen> {
      ..setJavaScriptMode(JavaScriptMode.unrestricted)
      ..setNavigationDelegate(
        NavigationDelegate(
+          onPageFinished: (url) {
+            setState(() {
+              _isLoading = false;
+            });
+          },
          onNavigationRequest: (NavigationRequest request) async {
            if (request.url.contains('user_detailz') && !request.url.contains('change-phone-verify') || request.url.contains('email/verify')) {
              GoRouter.of(context).pop();
@@ -105,11 +112,17 @@ class _VerifyScreenState extends State<VerifyScreen> {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      appBar: AppBar(
-        toolbarHeight: 0,
-      ),
+      appBar: AppBar(toolbarHeight: 0),
      body: SafeArea(
-        child: WebViewWidget(controller: _controller),
+        child: Stack(
+          children: [
+            WebViewWidget(controller: _controller),
+            if (_isLoading)
+              const Center(
+                child: Loader(),
+              ),
+          ],
+        ),
      ),
    );
  }