From 76b3f29ac270eaddc1652168c3d44deaae305f83 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 17 Jun 2025 14:20:45 -0400 Subject: [PATCH] chore: remove access toggles and join with code button from new space page --- lib/pages/new_group/new_group.dart | 17 ++--- lib/pages/new_group/new_group_view.dart | 87 ++++++++----------------- 2 files changed, 34 insertions(+), 70 deletions(-) diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index b918f532d..395804047 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -38,6 +38,8 @@ class NewGroupController extends State { TextEditingController nameController = TextEditingController(); // #Pangea + // bool publicGroup = false; + // bool groupCanBeFound = false; ActivityPlanModel? selectedActivity; Uint8List? selectedActivityImage; String? selectedActivityImageFilename; @@ -45,12 +47,8 @@ class NewGroupController extends State { final GlobalKey formKey = GlobalKey(); final FocusNode focusNode = FocusNode(); - bool requiredCodeToJoin = false; - // bool publicGroup = false; - bool get canSubmit => nameController.text.trim().isNotEmpty; // Pangea# - bool groupCanBeFound = false; Uint8List? avatar; @@ -71,7 +69,6 @@ class NewGroupController extends State { // #Pangea // void setPublicGroup(bool b) => // setState(() => publicGroup = groupCanBeFound = b); - void setRequireCode(bool b) => setState(() => requiredCodeToJoin = b); void setSelectedActivity( ActivityPlanModel? activity, @@ -103,7 +100,9 @@ class NewGroupController extends State { } // Pangea# - void setGroupCanBeFound(bool b) => setState(() => groupCanBeFound = b); + // #Pangea + // void setGroupCanBeFound(bool b) => setState(() => groupCanBeFound = b); + // Pangea# void selectPhoto() async { final photo = await selectFiles( @@ -230,10 +229,8 @@ class NewGroupController extends State { name: nameController.text, introChatName: L10n.of(context).introductions, announcementsChatName: L10n.of(context).announcements, - visibility: - groupCanBeFound ? sdk.Visibility.public : sdk.Visibility.private, - joinRules: - requiredCodeToJoin ? sdk.JoinRules.knock : sdk.JoinRules.public, + visibility: sdk.Visibility.private, + joinRules: sdk.JoinRules.knock, avatar: avatar, avatarUrl: avatarUrl, ); diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index c6c825c10..f07747ac2 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -4,7 +4,6 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/new_group/new_group.dart'; import 'package:fluffychat/pangea/activity_suggestions/activity_suggestion_carousel.dart'; -import 'package:fluffychat/pangea/spaces/utils/space_code.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; @@ -38,20 +37,6 @@ class NewGroupView extends StatelessWidget { : L10n.of(context).newChat, // Pangea# ), - actions: [ - if (controller.createGroupType == CreateGroupType.space) - TextButton( - onPressed: controller.loading - ? null - : () => SpaceCodeUtil.joinWithSpaceCodeDialog(context), - child: Text( - L10n.of(context).joinByCode, - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - ), - ), - ), - ], ), body: MaxWidthBody( // #Pangea @@ -141,51 +126,33 @@ class NewGroupView extends StatelessWidget { ), const SizedBox(height: 16), // #Pangea - if (controller.createGroupType == CreateGroupType.space) - // Pangea# - SwitchListTile.adaptive( - contentPadding: const EdgeInsets.symmetric(horizontal: 32), - secondary: const Icon(Icons.public_outlined), - // #Pangea - // title: Text( - // controller.createGroupType == CreateGroupType.space - // ? L10n.of(context).spaceIsPublic - // : L10n.of(context).groupIsPublic, - // ), - title: Text(L10n.of(context).requireCodeToJoin), - // value: controller.publicGroup, - // onChanged: - // controller.loading ? null : controller.setPublicGroup, - value: controller.requiredCodeToJoin, - onChanged: - controller.loading ? null : controller.setRequireCode, - // Pangea# - ), - // #Pangea - if (controller.createGroupType == CreateGroupType.space) - // Pangea# - AnimatedSize( - duration: FluffyThemes.animationDuration, - curve: FluffyThemes.animationCurve, - child: - // #Pangea - // controller.publicGroup ? - // Pangea# - SwitchListTile.adaptive( - contentPadding: const EdgeInsets.symmetric(horizontal: 32), - secondary: const Icon(Icons.search_outlined), - // #Pangea - // title: Text(L10n.of(context).groupCanBeFoundViaSearch), - title: Text(L10n.of(context).canFindInSearch), - // Pangea# - value: controller.groupCanBeFound, - onChanged: - controller.loading ? null : controller.setGroupCanBeFound, - ), - // #Pangea - // : const SizedBox.shrink(), - // Pangea# - ), + // SwitchListTile.adaptive( + // contentPadding: const EdgeInsets.symmetric(horizontal: 32), + // secondary: const Icon(Icons.public_outlined), + // title: Text( + // controller.createGroupType == CreateGroupType.space + // ? L10n.of(context).spaceIsPublic + // : L10n.of(context).groupIsPublic, + // ), + // value: controller.publicGroup, + // onChanged: controller.loading ? null : controller.setPublicGroup, + // ), + // AnimatedSize( + // duration: FluffyThemes.animationDuration, + // curve: FluffyThemes.animationCurve, + // child: controller.publicGroup + // ? SwitchListTile.adaptive( + // contentPadding: + // const EdgeInsets.symmetric(horizontal: 32), + // secondary: const Icon(Icons.search_outlined), + // title: Text(L10n.of(context).groupCanBeFoundViaSearch), + // value: controller.groupCanBeFound, + // onChanged: controller.loading + // ? null + // : controller.setGroupCanBeFound, + // ) + // : const SizedBox.shrink(), + // ), // AnimatedSize( // duration: FluffyThemes.animationDuration, // curve: FluffyThemes.animationCurve,