Merge pull request #309 from MaddinMade/termsOfService-animation

adds termsOfService animation
NearHuscarl · Mar 15, 2022 · 4210e2c · 4210e2c
2 parents 7e2b8d4 + 052baca
commit 4210e2c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/lib/src/widgets/cards/login_card.dart b/lib/src/widgets/cards/login_card.dart
@@ -618,27 +618,26 @@ class _LoginCardState extends State<_LoginCard> with TickerProviderStateMixin {
             alignment: Alignment.topLeft,
             color: theme.cardTheme.color,
             width: cardWidth,
-            padding: const EdgeInsets.symmetric(
-              horizontal: cardPadding,
-              vertical: 10,
-            ),
+            padding: const EdgeInsets.symmetric(horizontal: cardPadding),
             onExpandCompleted: () => _postSwitchAuthController.forward(),
-            child: _buildConfirmPasswordField(textFieldWidth, messages, auth),
+            child: Column(children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 10.0),
+                child:
+                    _buildConfirmPasswordField(textFieldWidth, messages, auth),
+              ),
+              for (var e in auth.termsOfService)
+                TermCheckbox(
+                  termOfService: e,
+                  validation: auth.isSignup,
+                ),
+            ]),
           ),
           Container(
             padding: Paddings.fromRBL(cardPadding),
             width: cardWidth,
             child: Column(
               children: <Widget>[
-                if (auth.isSignup && auth.termsOfService.isNotEmpty)
-                  ...auth.termsOfService
-                      .map((e) => ScaleTransition(
-                            scale: _buttonScaleAnimation,
-                            child: TermCheckbox(
-                              termOfService: e,
-                            ),
-                          ))
-                      .toList(),
                 !widget.hideForgotPasswordButton
                     ? _buildForgotPassword(theme, messages)
                     : SizedBox.fromSize(

diff --git a/lib/src/widgets/term_of_service_checkbox.dart b/lib/src/widgets/term_of_service_checkbox.dart
@@ -4,8 +4,13 @@ import 'package:url_launcher/url_launcher.dart';
 
 class TermCheckbox extends StatefulWidget {
   final TermOfService termOfService;
+  final bool validation;
 
-  const TermCheckbox({Key? key, required this.termOfService}) : super(key: key);
+  const TermCheckbox({
+    Key? key,
+    required this.termOfService,
+    this.validation = true,
+  }) : super(key: key);
 
   @override
   _TermCheckboxState createState() => _TermCheckboxState();
@@ -49,8 +54,9 @@ class _TermCheckboxState extends State<TermCheckbox> {
               textAlign: TextAlign.left,
             ),
       validator: (bool? value) {
-        if (widget.termOfService.mandatory == true &&
-            widget.termOfService.getStatus() != true) {
+        if (widget.validation &&
+            widget.termOfService.mandatory &&
+            !widget.termOfService.getStatus()) {
           return widget.termOfService.validationErrorMessage;
         }
         return null;