Fixed UI issues for Un/Pw flow.

getlantern · Jan 4, 2024 · ea41e4c · ea41e4c
1 parent 33fd476
commit ea41e4c
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 48 deletions.
diff --git a/assets/locales/en.po b/assets/locales/en.po
@@ -1581,9 +1581,9 @@ msgstr "Get Lantern Pro"
 msgid "try_lantern_pro"
 msgstr "Try Lantern for free! "
 
-msgid "continue_for_free"
-msgstr "Continue for Free "
 
+msgid "new_to_lantern"
+msgstr "New to Lantern? "
 
 
 

diff --git a/lib/account/auth/sign_in.dart b/lib/account/auth/sign_in.dart
@@ -1,4 +1,5 @@
 import 'package:email_validator/email_validator.dart';
+import 'package:flutter/gestures.dart';
 import '../../common/common.dart';
 
 @RoutePage<void>(name: 'SignIn')
@@ -57,7 +58,7 @@ class _SignInState extends State<SignIn> {
                 label: widget.authFlow.isReset
                     ? "lantern_pro_email".i18n
                     : "enter_email".i18n,
-                autovalidateMode: AutovalidateMode.onUserInteraction,
+
                 textInputAction: TextInputAction.done,
                 keyboardType: TextInputType.emailAddress,
                 prefixIcon: SvgPicture.asset(ImagePaths.email),
@@ -80,10 +81,22 @@ class _SignInState extends State<SignIn> {
             const SizedBox(height: 24),
             if (widget.authFlow.isSignIn &&
                 sessionModel.hasUserSignedInNotifier.value == false)
-              AppTextButton(
-                text: 'create_account'.i18n.toUpperCase(),
-                onPressed: openPlans,
-              )
+              RichText(
+                text: TextSpan(
+                  text: 'new_to_lantern'.i18n,
+                  style:
+                  tsBody1.copyWith(fontWeight: FontWeight.w400, color: grey5),
+                  children: [
+                    TextSpan(
+                      text: "create_account".i18n.toUpperCase(),
+                      style: tsBody1.copyWith(
+                          fontWeight: FontWeight.w500, color: pink5),
+                      recognizer: TapGestureRecognizer()..onTap = openPlans,
+                    ),
+                  ],
+                ),
+              ),
+
           ],
         ),
       ),

diff --git a/lib/account/auth/verification.dart b/lib/account/auth/verification.dart
@@ -66,7 +66,7 @@ class _VerificationState extends State<Verification> {
               const SizedBox(height: 14),
               if (!widget.authFlow.isVerifyEmail)
                 AppTextButton(
-                  text: 'change_email'.i18n,
+                  text: 'change_email'.i18n.toUpperCase(),
                   onPressed: () {
                     context.popRoute();
                   },

diff --git a/lib/common/ui/base_screen.dart b/lib/common/ui/base_screen.dart
@@ -89,7 +89,7 @@ class BaseScreen extends StatelessWidget {
                                     .short,
                               )
                             : title,
-                        elevation: 1,
+                        elevation: .5,
                         shadowColor: grey3,
                         foregroundColor: foregroundColor,
                         backgroundColor: backgroundColor,

diff --git a/lib/common/ui/custom/text_field.dart b/lib/common/ui/custom/text_field.dart
@@ -151,7 +151,7 @@ class _CTextFieldState extends State<CTextField> {
                   widget.textCapitalization ?? TextCapitalization.none,
               decoration: InputDecoration(
                 contentPadding:
-                    widget.contentPadding ?? const EdgeInsetsDirectional.all(0),
+                    widget.contentPadding ?? const EdgeInsetsDirectional.all(10),
                 isDense: true,
                 floatingLabelBehavior: FloatingLabelBehavior.never,
                 // we handle floating labels using our custom method below

diff --git a/lib/common/ui/pin_field.dart b/lib/common/ui/pin_field.dart
@@ -18,42 +18,7 @@ class PinField extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onLongPress: () {
-        Clipboard.getData('text/plain').then((valueFromClipboard) {
-          if (valueFromClipboard != null &&
-              valueFromClipboard.text!.length == length) {
-            showDialog(
-              context: context,
-              builder: (context) {
-                return AlertDialog(
-                  content: CText('Paste from clipboard?'.i18n, style: tsBody1),
-                  actions: <Widget>[
-                    TextButton(
-                      onPressed: () {
-                        Navigator.pop(context);
-                      },
-                      child: CText(
-                        'No'.i18n,
-                        style: tsButtonGrey,
-                      ),
-                    ),
-                    TextButton(
-                      onPressed: () {
-                        controller.text = valueFromClipboard.text!;
-                        Navigator.pop(context);
-                      },
-                      child: CText(
-                        'Yes'.i18n,
-                        style: tsButtonPink,
-                      ),
-                    ),
-                  ],
-                );
-              },
-            );
-          }
-        });
-      },
+      onLongPress: () => getClipboardData(context),
       child: PinCodeTextField(
         maxLength: length,
         keyboardType: keyboardType,
@@ -85,4 +50,42 @@ class PinField extends StatelessWidget {
       ),
     );
   }
+
+  Future<void> getClipboardData(BuildContext context) async {
+    final copiedData = await Clipboard.getData('text/plain');
+    if (copiedData?.text != null) {
+      final code = copiedData!.text;
+      // ignore: use_build_context_synchronously
+      showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(
+            content: CText('Paste from clipboard?'.i18n, style: tsBody1),
+            actions: <Widget>[
+              TextButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+                child: CText(
+                  'No'.i18n,
+                  style: tsButtonGrey,
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  controller.text = code!;
+                  Navigator.pop(context);
+                  onDone?.call(controller.text);
+                },
+                child: CText(
+                  'Yes'.i18n,
+                  style: tsButtonPink,
+                ),
+              ),
+            ],
+          );
+        },
+      );
+    }
+  }
 }
diff --git a/lib/vpn/vpn_server_location.dart b/lib/vpn/vpn_server_location.dart
@@ -14,11 +14,12 @@ class ServerLocationWidget extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           CText(
-            'Server Location'.i18n,
+            '${'Server Location'.i18n}:',
             style: tsSubtitle3.copiedWith(
               color: unselectedTabIconColor,
             ),
           ),
+          const SizedBox(width: 8),
           Container(
             transform: Matrix4.translationValues(0.0, 2.0, 0.0),
             child: Icon(

diff --git a/lib/vpn/vpn_status.dart b/lib/vpn/vpn_status.dart
@@ -9,7 +9,7 @@ class VPNStatus extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           CText(
-            'VPN Status'.i18n,
+            '${'VPN Status'.i18n}:',
             style: tsSubtitle3.copiedWith(
               color: unselectedTabIconColor,
             ),