Merge pull request #4 from pangeachat/visible-login-errors

changed color of login/signup error message to makke them more visible

lib/pages/homeserver_picker/homeserver_picker_view.dart

@@ -1,15 +1,14 @@
 // Flutter imports:
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 // Project imports:
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/pages/connect/p_sso_button.dart';
 import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart';
 import 'package:fluffychat/pangea/widgets/signup/signup_buttons.dart';
 import 'package:fluffychat/widgets/layouts/login_scaffold.dart';
+import 'package:flutter/material.dart';
+// Package imports:
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'homeserver_picker.dart';
 
 class HomeserverPickerView extends StatelessWidget {

lib/pages/login/login_view.dart

@@ -1,12 +1,11 @@
 // Flutter imports:
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 // Project imports:
 import 'package:fluffychat/pangea/utils/password_forgotten.dart';
 import 'package:fluffychat/widgets/layouts/login_scaffold.dart';
+import 'package:flutter/material.dart';
+// Package imports:
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'login.dart';
 
 class LoginView extends StatelessWidget {
@@ -56,7 +55,13 @@ class LoginView extends StatelessWidget {
                     decoration: InputDecoration(
                       prefixIcon: const Icon(Icons.account_box_outlined),
                       errorText: controller.usernameError,
-                      errorStyle: const TextStyle(color: Colors.orange),
+                      // #Pangea
+                      // errorStyle: const TextStyle(color: Colors.orange),
+                      errorStyle: TextStyle(
+                        color: Theme.of(context).textTheme.bodyMedium?.color,
+                        fontSize: 14,
+                      ),
+                      // Pangea#
                       hintText: L10n.of(context)!.emailOrUsername,
                       // #Pangea
                       fillColor: Theme.of(context)
@@ -81,8 +86,12 @@ class LoginView extends StatelessWidget {
                     decoration: InputDecoration(
                       prefixIcon: const Icon(Icons.lock_outlined),
                       errorText: controller.passwordError,
-                      errorStyle: const TextStyle(color: Colors.orange),
                       // #Pangea
+                      // errorStyle: const TextStyle(color: Colors.orange),
+                      errorStyle: TextStyle(
+                        color: Theme.of(context).textTheme.bodyMedium?.color,
+                        fontSize: 14,
+                      ),
                       // prevent enter key from clicking show password button
                       suffixIcon: MouseRegion(
                         cursor: SystemMouseCursors.click,

lib/pangea/pages/sign_up/signup_view.dart

@@ -1,17 +1,16 @@
 // Flutter imports:
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 // Project imports:
 import 'package:fluffychat/pangea/widgets/signup/tos_checkbox.dart';
 import 'package:fluffychat/widgets/layouts/login_scaffold.dart';
+import 'package:flutter/material.dart';
+// Package imports:
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'signup.dart';
 
 class SignupPageView extends StatelessWidget {
   final SignupPageController controller;
-  const SignupPageView(this.controller, {Key? key}) : super(key: key);
+  const SignupPageView(this.controller, {super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -53,7 +52,13 @@ class SignupPageView extends StatelessWidget {
                     ),
                     onPressed: controller.toggleShowPassword,
                   ),
-                  errorStyle: const TextStyle(color: Colors.orange),
+                  // #Pangea
+                  // errorStyle: const TextStyle(color: Colors.orange),
+                  errorStyle: TextStyle(
+                    color: Theme.of(context).textTheme.bodyMedium?.color,
+                    fontSize: 14,
+                  ),
+                  // Pangea#
                   hintText: L10n.of(context)!.chooseAStrongPassword,
                   // #Pangea
                   fillColor: Theme.of(context)
@@ -78,8 +83,12 @@ class SignupPageView extends StatelessWidget {
                   decoration: InputDecoration(
                     prefixIcon: const Icon(Icons.repeat_outlined),
                     hintText: L10n.of(context)!.repeatPassword,
-                    errorStyle: const TextStyle(color: Colors.orange),
                     // #Pangea
+                    // errorStyle: const TextStyle(color: Colors.orange),
+                    errorStyle: TextStyle(
+                      color: Theme.of(context).textTheme.bodyMedium?.color,
+                      fontSize: 14,
+                    ),
                     fillColor: Theme.of(context)
                         .colorScheme
                         .background
@@ -108,12 +117,16 @@ class SignupPageView extends StatelessWidget {
                       .colorScheme
                       .background
                       .withOpacity(0.75),
-                  // #Pangea
+                  // errorStyle: TextStyle(
+                  //   color: controller.emailController.text.isEmpty
+                  //       ? Colors.orangeAccent
+                  //       : Colors.orange,
+                  // ),
                   errorStyle: TextStyle(
-                    color: controller.emailController.text.isEmpty
-                        ? Colors.orangeAccent
-                        : Colors.orange,
+                    color: Theme.of(context).textTheme.bodyMedium?.color,
+                    fontSize: 14,
                   ),
+                  // Pangea#
                 ),
               ),
             ),

lib/pangea/widgets/signup/signup_buttons.dart

@@ -1,25 +1,23 @@
 // Dart imports:
 import 'dart:typed_data';
 
-// Flutter imports:
-import 'package:flutter/material.dart';
-
 // Package imports:
 import 'package:adaptive_dialog/adaptive_dialog.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:go_router/go_router.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:matrix/matrix.dart';
-
 // Project imports:
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+// Flutter imports:
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:matrix/matrix.dart';
 
 class SignupButtons extends StatefulWidget {
-  const SignupButtons({Key? key}) : super(key: key);
+  const SignupButtons({super.key});
 
   @override
   State<SignupButtons> createState() => SignupButtonsState();
@@ -164,7 +162,10 @@ class SignupButtonsState extends State<SignupButtons> {
               prefixIcon: const Icon(Icons.account_box_outlined),
               hintText: L10n.of(context)!.chooseAUsername,
               errorText: signupError,
-              errorStyle: const TextStyle(color: Colors.orange),
+              errorStyle: TextStyle(
+                color: Theme.of(context).textTheme.bodyMedium?.color,
+                fontSize: 14,
+              ),
               fillColor:
                   Theme.of(context).colorScheme.background.withOpacity(0.75),
             ),

lib/pangea/widgets/signup/tos_checkbox.dart

@@ -1,17 +1,15 @@
 // Flutter imports:
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 // Project imports:
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/pages/sign_up/signup.dart';
 import 'package:fluffychat/utils/url_launcher.dart';
+import 'package:flutter/material.dart';
+// Package imports:
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 class TosCheckbox extends StatelessWidget {
   final SignupPageController controller;
-  const TosCheckbox(this.controller, {Key? key}) : super(key: key);
+  const TosCheckbox(this.controller, {super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -55,7 +53,10 @@ class TosCheckbox extends StatelessWidget {
             margin: const EdgeInsets.only(top: 5),
             child: Text(
               controller.signupError ?? '',
-              style: const TextStyle(color: Colors.orange, fontSize: 12),
+              style: TextStyle(
+                color: Theme.of(context).textTheme.bodyMedium?.color,
+                fontSize: 14,
+              ),
             ),
           ),
         ),