fix: Bug fix

Emon526 · Sep 1, 2023 · e3b19f2 · e3b19f2
1 parent 75578b3
commit e3b19f2
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 79 deletions.
diff --git a/lib/screens/auth/forgotpassword.dart b/lib/screens/auth/forgotpassword.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:form_field_validator/form_field_validator.dart';
-import 'package:mothercare/widget/customexpandedbutton.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../../providers/authprovider.dart';
+import '../../widget/customexpandedbutton.dart';
 import '../../widget/responsivesnackbar.dart';
 
 class ForgotPassword extends StatefulWidget {

diff --git a/lib/screens/onboarding/introduction.dart b/lib/screens/onboarding/introduction.dart
@@ -31,13 +31,14 @@ class IntroductionPageState extends State<IntroductionPage> {
       bodyFlex: 2,
     );
 
-    return SafeArea(
-      child: IntroductionScreen(
-        key: introKey,
-        // allowImplicitScrolling: true,
-        // autoScrollDuration: 3000,
-        globalHeader: Align(
-          alignment: Alignment.topRight,
+    return IntroductionScreen(
+      key: introKey,
+      // allowImplicitScrolling: true,
+      // autoScrollDuration: 3000,
+      globalHeader: Align(
+        alignment: Alignment.bottomRight,
+        child: Padding(
+          padding: const EdgeInsets.all(8.0),
           child: TextButton(
             onPressed: () => _onIntroEnd(context),
             child: Text(
@@ -48,78 +49,78 @@ class IntroductionPageState extends State<IntroductionPage> {
             ),
           ),
         ),
+      ),
 
-        pages: [
-          PageViewModel(
-            title: AppLocalizations.of(context)!.introTitle1,
-            body: AppLocalizations.of(context)!.introBody1,
-            decoration: pageDecoration.copyWith(
-              imageAlignment: Alignment.topCenter,
-            ),
-            image: _buildImage('assets/images/information.svg'),
-            reverse: true,
-          ),
-          PageViewModel(
-            title: AppLocalizations.of(context)!.introTitle2,
-            body: AppLocalizations.of(context)!.introBody2,
-            image: _buildImage('assets/images/checkyourself.svg'),
-            decoration: pageDecoration,
-          ),
-          PageViewModel(
-            title: AppLocalizations.of(context)!.introTitle3,
-            body: AppLocalizations.of(context)!.introBody3,
-            image: _buildImage('assets/images/notifications.svg'),
-            decoration: pageDecoration,
-          ),
-          PageViewModel(
-            title: AppLocalizations.of(context)!.introTitle4,
-            body: AppLocalizations.of(context)!.introBody4,
-            decoration: pageDecoration.copyWith(
-              imageAlignment: Alignment.topCenter,
-            ),
-            image: _buildImage('assets/images/appointment.svg'),
-            reverse: true,
+      pages: [
+        PageViewModel(
+          title: AppLocalizations.of(context)!.introTitle1,
+          body: AppLocalizations.of(context)!.introBody1,
+          decoration: pageDecoration.copyWith(
+            imageAlignment: Alignment.topCenter,
           ),
-          PageViewModel(
-            title: AppLocalizations.of(context)!.introTitle5,
-            body: AppLocalizations.of(context)!.introBody5,
-            image: _buildImage('assets/images/artificial_intelligence.svg'),
-            decoration: pageDecoration,
+          image: _buildImage('assets/images/information.svg'),
+          reverse: true,
+        ),
+        PageViewModel(
+          title: AppLocalizations.of(context)!.introTitle2,
+          body: AppLocalizations.of(context)!.introBody2,
+          image: _buildImage('assets/images/checkyourself.svg'),
+          decoration: pageDecoration,
+        ),
+        PageViewModel(
+          title: AppLocalizations.of(context)!.introTitle3,
+          body: AppLocalizations.of(context)!.introBody3,
+          image: _buildImage('assets/images/notifications.svg'),
+          decoration: pageDecoration,
+        ),
+        PageViewModel(
+          title: AppLocalizations.of(context)!.introTitle4,
+          body: AppLocalizations.of(context)!.introBody4,
+          decoration: pageDecoration.copyWith(
+            imageAlignment: Alignment.topCenter,
           ),
-        ],
-        onDone: () => _onIntroEnd(context),
-        showBackButton: true,
-        // showSkipButton: true,
-        back: Icon(Icons.arrow_back, color: Theme.of(context).primaryColor),
-        // skip: Text(AppLocalizations.of(context)!.skipbutton,
-        //     style: TextStyle(
-        //         fontWeight: FontWeight.w600,
-        //         color: Theme.of(context).primaryColor)),
-        next: Icon(Icons.arrow_forward, color: Theme.of(context).primaryColor),
-        done: Text(AppLocalizations.of(context)!.donebutton,
-            style: TextStyle(
-                fontWeight: FontWeight.w600,
-                color: Theme.of(context).primaryColor)),
-        curve: Curves.fastLinearToSlowEaseIn,
-        // controlsMargin: const EdgeInsets.all(16),
-        // controlsPadding: kIsWeb
-        //     ? const EdgeInsets.all(12.0)
-        //     : const EdgeInsets.fromLTRB(8.0, 4.0, 8.0, 4.0),
-        // dotsDecorator: const DotsDecorator(
-        //   size: Size(10.0, 10.0),
-        //   color: Color(0xFFBDBDBD),
-        //   activeSize: Size(22.0, 10.0),
-        //   activeShape: RoundedRectangleBorder(
-        //     borderRadius: BorderRadius.all(Radius.circular(25.0)),
-        //   ),
-        // ),
-        // dotsContainerDecorator: const ShapeDecoration(
-        //   color: Colors.black87,
-        //   shape: RoundedRectangleBorder(
-        //     borderRadius: BorderRadius.all(Radius.circular(8.0)),
-        //   ),
-        // ),
-      ),
+          image: _buildImage('assets/images/appointment.svg'),
+          reverse: true,
+        ),
+        PageViewModel(
+          title: AppLocalizations.of(context)!.introTitle5,
+          body: AppLocalizations.of(context)!.introBody5,
+          image: _buildImage('assets/images/artificial_intelligence.svg'),
+          decoration: pageDecoration,
+        ),
+      ],
+      onDone: () => _onIntroEnd(context),
+      showBackButton: true,
+      // showSkipButton: true,
+      back: Icon(Icons.arrow_back, color: Theme.of(context).primaryColor),
+      // skip: Text(AppLocalizations.of(context)!.skipbutton,
+      //     style: TextStyle(
+      //         fontWeight: FontWeight.w600,
+      //         color: Theme.of(context).primaryColor)),
+      next: Icon(Icons.arrow_forward, color: Theme.of(context).primaryColor),
+      done: Text(AppLocalizations.of(context)!.donebutton,
+          style: TextStyle(
+              fontWeight: FontWeight.w600,
+              color: Theme.of(context).primaryColor)),
+      curve: Curves.fastLinearToSlowEaseIn,
+      // controlsMargin: const EdgeInsets.all(16),
+      // controlsPadding: kIsWeb
+      //     ? const EdgeInsets.all(12.0)
+      //     : const EdgeInsets.fromLTRB(8.0, 4.0, 8.0, 4.0),
+      // dotsDecorator: const DotsDecorator(
+      //   size: Size(10.0, 10.0),
+      //   color: Color(0xFFBDBDBD),
+      //   activeSize: Size(22.0, 10.0),
+      //   activeShape: RoundedRectangleBorder(
+      //     borderRadius: BorderRadius.all(Radius.circular(25.0)),
+      //   ),
+      // ),
+      // dotsContainerDecorator: const ShapeDecoration(
+      //   color: Colors.black87,
+      //   shape: RoundedRectangleBorder(
+      //     borderRadius: BorderRadius.all(Radius.circular(8.0)),
+      //   ),
+      // ),
     );
   }
 

diff --git a/lib/screens/onboarding/onboarding.dart b/lib/screens/onboarding/onboarding.dart
@@ -2,12 +2,12 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:mothercare/widget/customexpandedbutton.dart';
 import 'package:provider/provider.dart';
 
 import '../../const/consts.dart';
 import '../../providers/languageprovider.dart';
 import '../../utils/utils.dart';
+import '../../widget/customexpandedbutton.dart';
 import '../../widget/selectionbuttonwidget.dart';
 import 'introduction.dart';
 

diff --git a/lib/widget/persistent_nav_bar.dart b/lib/widget/persistent_nav_bar.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:mothercare/utils/utils.dart';
 import 'package:persistent_bottom_nav_bar/persistent_tab_view.dart';
 import 'package:provider/provider.dart';
 import '../providers/nav_bar_provider.dart';
 import '../screens/awareness/awareness.dart';
 import '../screens/breastcancer/breastcancer.dart';
 import '../screens/selfcheck/self_check_page.dart';
+import '../utils/utils.dart';
 import 'drawer_widget.dart';
 
 class PersistentNavBar extends StatelessWidget {