From 47ef0813a39880e1284f05621ca0f27e4596c065 Mon Sep 17 00:00:00 2001 From: Kelrap <99418823+Kelrap@users.noreply.github.com> Date: Tue, 20 May 2025 13:01:18 -0400 Subject: [PATCH] Cleaned up name submission criteria (#2835) * Cleaned up name submission criteria * chore: formatting --------- Co-authored-by: ggurdin --- lib/pages/new_group/new_group.dart | 9 ++++++--- lib/pages/new_group/new_group_view.dart | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index 4e9d4cc57..bcb397fd7 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -48,6 +48,8 @@ class NewGroupController extends State { bool requiredCodeToJoin = false; // bool publicGroup = false; + + bool get canSubmit => nameController.text.trim().isNotEmpty; // Pangea# bool groupCanBeFound = false; @@ -250,10 +252,11 @@ class NewGroupController extends State { focusNode.requestFocus(); return; } - // Pangea# - if (nameController.text.trim().isEmpty && - createGroupType == CreateGroupType.space) { + // if (nameController.text.trim().isEmpty && + // createGroupType == CreateGroupType.space) { + if (!canSubmit) { + // Pangea# setState(() => error = L10n.of(context).pleaseFillOut); return; } diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index fc99a5225..6bbae6fe4 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -131,9 +131,9 @@ class NewGroupView extends StatelessWidget { onFieldSubmitted: (value) { controller.loading ? null : controller.submitAction(); }, - validator: (value) => value == null || value.isEmpty - ? L10n.of(context).pleaseFillOut - : null, + validator: (value) => controller.canSubmit + ? null + : L10n.of(context).pleaseFillOut, focusNode: controller.focusNode, // Pangea# ),