From bc32fe7941ebbab221c0b429d14b11a9c06b38d2 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:25:03 +0300 Subject: [PATCH 01/12] removed unused method and its use. --- .../all_spaces/widgets/sidebar_widget.dart | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 17566da7..e4a5d14d 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -36,7 +36,8 @@ class _SidebarWidgetState extends State { @override void initState() { super.initState(); - _selectedId = widget.selectedSpaceUuid; // Initialize with the passed selected space UUID + _selectedId = + widget.selectedSpaceUuid; // Initialize with the passed selected space UUID } @override @@ -61,8 +62,8 @@ class _SidebarWidgetState extends State { return widget.communities.where((community) { final containsQueryInCommunity = community.name.toLowerCase().contains(_searchQuery.toLowerCase()); - final containsQueryInSpaces = - community.spaces.any((space) => _containsQuery(space, _searchQuery.toLowerCase())); + final containsQueryInSpaces = community.spaces + .any((space) => _containsQuery(space, _searchQuery.toLowerCase())); return containsQueryInCommunity || containsQueryInSpaces; }).toList(); @@ -71,8 +72,8 @@ class _SidebarWidgetState extends State { // Helper function to determine if any space or its children match the search query bool _containsQuery(SpaceModel space, String query) { final matchesSpace = space.name.toLowerCase().contains(query); - final matchesChildren = - space.children.any((child) => _containsQuery(child, query)); // Recursive check for children + final matchesChildren = space.children.any( + (child) => _containsQuery(child, query)); // Recursive check for children // If the space or any of its children match the query, expand this space if (matchesSpace || matchesChildren) { @@ -106,7 +107,8 @@ class _SidebarWidgetState extends State { width: 300, decoration: subSectionContainerDecoration, child: Column( - mainAxisSize: MainAxisSize.min, // Ensures the Column only takes necessary height + mainAxisSize: + MainAxisSize.min, // Ensures the Column only takes necessary height crossAxisAlignment: CrossAxisAlignment.start, children: [ // Communities title with the add button @@ -153,9 +155,9 @@ class _SidebarWidgetState extends State { // Community list Expanded( child: ListView( - children: filteredCommunities.map((community) { - return _buildCommunityTile(context, community); - }).toList(), + children: filteredCommunities + .map((community) => _buildCommunityTile(context, community)) + .toList(), ), ), ], @@ -192,9 +194,7 @@ class _SidebarWidgetState extends State { SelectCommunityEvent(selectedCommunity: community), ); }, - onExpansionChanged: (String title, bool expanded) { - _handleExpansionChange(community.uuid, expanded); - }, + onExpansionChanged: (title, expanded) {}, children: hasChildren ? community.spaces .where((space) => (space.status != SpaceStatus.deleted || @@ -205,7 +205,8 @@ class _SidebarWidgetState extends State { ); } - Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) { + Widget _buildSpaceTile(SpaceModel space, CommunityModel community, + {int depth = 1}) { bool isExpandedSpace = _isSpaceOrChildSelected(space); return Padding( padding: EdgeInsets.only(left: depth * 16.0), @@ -214,9 +215,7 @@ class _SidebarWidgetState extends State { key: ValueKey(space.uuid), isSelected: _selectedId == space.uuid, initiallyExpanded: isExpandedSpace, - onExpansionChanged: (bool expanded) { - _handleExpansionChange(space.uuid ?? '', expanded); - }, + onExpansionChanged: (expanded) {}, onItemSelected: () { setState(() { _selectedId = space.uuid; @@ -224,14 +223,15 @@ class _SidebarWidgetState extends State { }); context.read().add( - SelectSpaceEvent(selectedCommunity: community, selectedSpace: space), + SelectSpaceEvent( + selectedCommunity: community, selectedSpace: space), ); }, children: space.children.isNotEmpty - ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList() + ? space.children + .map((childSpace) => _buildSpaceTile(childSpace, community)) + .toList() : [], // Recursively render child spaces if available )); } - - void _handleExpansionChange(String uuid, bool expanded) {} } From 978934399e96766eb9b4064cdffca696be9b6670 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:25:28 +0300 Subject: [PATCH 02/12] fixed invalid use of a private type in a public API in `SidebarWidget`. --- .../spaces_management/all_spaces/widgets/sidebar_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index e4a5d14d..81cec22f 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -25,7 +25,7 @@ class SidebarWidget extends StatefulWidget { }); @override - _SidebarWidgetState createState() => _SidebarWidgetState(); + State createState() => _SidebarWidgetState(); } class _SidebarWidgetState extends State { From 35a99ccda7c7ddc3d0654f562235ff993a02b492 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:27:04 +0300 Subject: [PATCH 03/12] removed unnecessary comments from `SidebarWidget`. --- .../all_spaces/widgets/sidebar_widget.dart | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 81cec22f..2e486cc6 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -29,15 +29,14 @@ class SidebarWidget extends StatefulWidget { } class _SidebarWidgetState extends State { - String _searchQuery = ''; // Track search query + String _searchQuery = ''; String? _selectedSpaceUuid; String? _selectedId; @override void initState() { super.initState(); - _selectedId = - widget.selectedSpaceUuid; // Initialize with the passed selected space UUID + _selectedId = widget.selectedSpaceUuid; } @override @@ -50,15 +49,12 @@ class _SidebarWidgetState extends State { } } - // Function to filter communities based on the search query List _filterCommunities() { if (_searchQuery.isEmpty) { - // Reset the selected community and space UUIDs if there's no query _selectedSpaceUuid = null; return widget.communities; } - // Filter communities and expand only those that match the query return widget.communities.where((community) { final containsQueryInCommunity = community.name.toLowerCase().contains(_searchQuery.toLowerCase()); @@ -69,13 +65,12 @@ class _SidebarWidgetState extends State { }).toList(); } - // Helper function to determine if any space or its children match the search query bool _containsQuery(SpaceModel space, String query) { final matchesSpace = space.name.toLowerCase().contains(query); final matchesChildren = space.children.any( - (child) => _containsQuery(child, query)); // Recursive check for children + (child) => _containsQuery(child, query), + ); - // If the space or any of its children match the query, expand this space if (matchesSpace || matchesChildren) { _selectedSpaceUuid = space.uuid; } @@ -84,12 +79,10 @@ class _SidebarWidgetState extends State { } bool _isSpaceOrChildSelected(SpaceModel space) { - // Return true if the current space or any of its child spaces is selected if (_selectedSpaceUuid == space.uuid) { return true; } - // Recursively check if any child spaces match the query for (var child in space.children) { if (_isSpaceOrChildSelected(child)) { return true; @@ -107,11 +100,9 @@ class _SidebarWidgetState extends State { width: 300, decoration: subSectionContainerDecoration, child: Column( - mainAxisSize: - MainAxisSize.min, // Ensures the Column only takes necessary height + mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Communities title with the add button Container( decoration: subSectionContainerDecoration, padding: const EdgeInsets.all(16.0), @@ -143,7 +134,6 @@ class _SidebarWidgetState extends State { ], ), ), - // Search bar CustomSearchBar( onSearchChanged: (query) { setState(() { @@ -152,7 +142,6 @@ class _SidebarWidgetState extends State { }, ), const SizedBox(height: 16), - // Community list Expanded( child: ListView( children: filteredCommunities @@ -185,7 +174,7 @@ class _SidebarWidgetState extends State { onItemSelected: () { setState(() { _selectedId = community.uuid; - _selectedSpaceUuid = null; // Update the selected community + _selectedSpaceUuid = null; }); context.read().add(CommunitySelectedEvent()); @@ -231,7 +220,7 @@ class _SidebarWidgetState extends State { ? space.children .map((childSpace) => _buildSpaceTile(childSpace, community)) .toList() - : [], // Recursively render child spaces if available + : [], )); } } From bfd3d4542e2a6829bc2871d65b6a00a49e35397a Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:28:50 +0300 Subject: [PATCH 04/12] refactor: simplify onSearchChanged callback to use expressions. --- .../all_spaces/widgets/sidebar_widget.dart | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 2e486cc6..7c362dd7 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -135,11 +135,7 @@ class _SidebarWidgetState extends State { ), ), CustomSearchBar( - onSearchChanged: (query) { - setState(() { - _searchQuery = query; - }); - }, + onSearchChanged: (query) => setState(() => _searchQuery = query), ), const SizedBox(height: 16), Expanded( From cd9821679effb740aaa61b4716689c53272a007d Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:29:38 +0300 Subject: [PATCH 05/12] added trailing commas. --- .../all_spaces/widgets/sidebar_widget.dart | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 7c362dd7..482bb447 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -109,10 +109,12 @@ class _SidebarWidgetState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text('Communities', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: ColorsManager.blackColor, - )), + Text( + 'Communities', + style: Theme.of(context).textTheme.titleMedium?.copyWith( + color: ColorsManager.blackColor, + ), + ), GestureDetector( onTap: () => _navigateToBlank(context), child: Container( @@ -194,29 +196,29 @@ class _SidebarWidgetState extends State { {int depth = 1}) { bool isExpandedSpace = _isSpaceOrChildSelected(space); return Padding( - padding: EdgeInsets.only(left: depth * 16.0), - child: SpaceTile( - title: space.name, - key: ValueKey(space.uuid), - isSelected: _selectedId == space.uuid, - initiallyExpanded: isExpandedSpace, - onExpansionChanged: (expanded) {}, - onItemSelected: () { - setState(() { - _selectedId = space.uuid; - _selectedSpaceUuid = space.uuid; - }); + padding: EdgeInsets.only(left: depth * 16.0), + child: SpaceTile( + title: space.name, + key: ValueKey(space.uuid), + isSelected: _selectedId == space.uuid, + initiallyExpanded: isExpandedSpace, + onExpansionChanged: (expanded) {}, + onItemSelected: () { + setState(() { + _selectedId = space.uuid; + _selectedSpaceUuid = space.uuid; + }); - context.read().add( - SelectSpaceEvent( - selectedCommunity: community, selectedSpace: space), - ); - }, - children: space.children.isNotEmpty - ? space.children - .map((childSpace) => _buildSpaceTile(childSpace, community)) - .toList() - : [], - )); + context.read().add( + SelectSpaceEvent(selectedCommunity: community, selectedSpace: space), + ); + }, + children: space.children.isNotEmpty + ? space.children + .map((childSpace) => _buildSpaceTile(childSpace, community)) + .toList() + : [], + ), + ); } } From c2f5a8df10ba6d9f4b44da229b018c697fb286e4 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:31:17 +0300 Subject: [PATCH 06/12] refactor: streamline context usage and improve readability in SidebarWidget --- .../all_spaces/widgets/sidebar_widget.dart | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 482bb447..d241a9c1 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/cent import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart'; import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; +import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/style.dart'; class SidebarWidget extends StatefulWidget { @@ -111,7 +112,7 @@ class _SidebarWidgetState extends State { children: [ Text( 'Communities', - style: Theme.of(context).textTheme.titleMedium?.copyWith( + style: context.textTheme.titleMedium?.copyWith( color: ColorsManager.blackColor, ), ), @@ -153,9 +154,7 @@ class _SidebarWidgetState extends State { } void _navigateToBlank(BuildContext context) { - setState(() { - _selectedId = ''; - }); + setState(() => _selectedId = ''); context.read().add( NewCommunityEvent(communities: widget.communities), ); @@ -194,14 +193,14 @@ class _SidebarWidgetState extends State { Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) { - bool isExpandedSpace = _isSpaceOrChildSelected(space); + bool spaceIsExpanded = _isSpaceOrChildSelected(space); return Padding( padding: EdgeInsets.only(left: depth * 16.0), child: SpaceTile( title: space.name, key: ValueKey(space.uuid), isSelected: _selectedId == space.uuid, - initiallyExpanded: isExpandedSpace, + initiallyExpanded: spaceIsExpanded, onExpansionChanged: (expanded) {}, onItemSelected: () { setState(() { From 55695ca5db761e532469b0251a171f43a324516f Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:33:50 +0300 Subject: [PATCH 07/12] refactor: improve readability and structure in SidebarWidget's space tile handling --- .../all_spaces/widgets/sidebar_widget.dart | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index d241a9c1..1e6b2bf5 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -113,8 +113,8 @@ class _SidebarWidgetState extends State { Text( 'Communities', style: context.textTheme.titleMedium?.copyWith( - color: ColorsManager.blackColor, - ), + color: ColorsManager.blackColor, + ), ), GestureDetector( onTap: () => _navigateToBlank(context), @@ -183,23 +183,30 @@ class _SidebarWidgetState extends State { onExpansionChanged: (title, expanded) {}, children: hasChildren ? community.spaces - .where((space) => (space.status != SpaceStatus.deleted || - space.status != SpaceStatus.parentDeleted)) - .map((space) => _buildSpaceTile(space, community)) + .where((space) { + final isDeleted = space.status != SpaceStatus.deleted; + final isParentDeleted = space.status != SpaceStatus.parentDeleted; + return (isDeleted || isParentDeleted); + }) + .map((space) => _buildSpaceTile(space: space, community: community)) .toList() : null, ); } - Widget _buildSpaceTile(SpaceModel space, CommunityModel community, - {int depth = 1}) { + Widget _buildSpaceTile({ + required SpaceModel space, + required CommunityModel community, + int depth = 1, + }) { bool spaceIsExpanded = _isSpaceOrChildSelected(space); + final isSelected = _selectedId == space.uuid; return Padding( padding: EdgeInsets.only(left: depth * 16.0), child: SpaceTile( title: space.name, key: ValueKey(space.uuid), - isSelected: _selectedId == space.uuid, + isSelected: isSelected, initiallyExpanded: spaceIsExpanded, onExpansionChanged: (expanded) {}, onItemSelected: () { @@ -212,11 +219,14 @@ class _SidebarWidgetState extends State { SelectSpaceEvent(selectedCommunity: community, selectedSpace: space), ); }, - children: space.children.isNotEmpty - ? space.children - .map((childSpace) => _buildSpaceTile(childSpace, community)) - .toList() - : [], + children: space.children + .map( + (childSpace) => _buildSpaceTile( + space: childSpace, + community: community, + ), + ) + .toList(), ), ); } From 62ee9a72d6143e47f6946421ecf60f22e347a330 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:47:00 +0300 Subject: [PATCH 08/12] moved `SidebarHeader` and `SidebarAddCommunityButton` to their own files. --- .../widgets/sidebar_add_community_button.dart | 32 ++++++++ .../all_spaces/widgets/sidebar_header.dart | 29 +++++++ .../all_spaces/widgets/sidebar_widget.dart | 78 +++++-------------- 3 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart create mode 100644 lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart new file mode 100644 index 00000000..2f434350 --- /dev/null +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart @@ -0,0 +1,32 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; +import 'package:syncrow_web/utils/color_manager.dart'; +import 'package:syncrow_web/utils/constants/assets.dart'; + +class SidebarAddCommunityButton extends StatelessWidget { + const SidebarAddCommunityButton({super.key}); + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => _navigateToBlank(context), + child: Container( + width: 30, + height: 30, + decoration: const BoxDecoration( + color: ColorsManager.whiteColors, + shape: BoxShape.circle, + ), + child: Center( + child: SvgPicture.asset( + Assets.roundedAddIcon, + width: 24, + height: 24, + ), + ), + ), + ); + } + + void _navigateToBlank(BuildContext context) {} +} diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart new file mode 100644 index 00000000..1e386d4f --- /dev/null +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart @@ -0,0 +1,29 @@ +import 'package:flutter/material.dart'; +import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart'; +import 'package:syncrow_web/utils/color_manager.dart'; +import 'package:syncrow_web/utils/extension/build_context_x.dart'; +import 'package:syncrow_web/utils/style.dart'; + +class SidebarHeader extends StatelessWidget { + const SidebarHeader({super.key}); + + @override + Widget build(BuildContext context) { + return Container( + decoration: subSectionContainerDecoration, + padding: const EdgeInsets.all(16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Communities', + style: context.textTheme.titleMedium?.copyWith( + color: ColorsManager.blackColor, + ), + ), + const SidebarAddCommunityButton(), + ], + ), + ); + } +} diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 1e6b2bf5..a98dead8 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -1,18 +1,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:syncrow_web/common/widgets/search_bar.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart'; +import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_header.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart'; import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; -import 'package:syncrow_web/utils/constants/assets.dart'; -import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/style.dart'; class SidebarWidget extends StatefulWidget { @@ -20,9 +17,9 @@ class SidebarWidget extends StatefulWidget { final String? selectedSpaceUuid; const SidebarWidget({ - super.key, required this.communities, this.selectedSpaceUuid, + super.key, }); @override @@ -36,21 +33,19 @@ class _SidebarWidgetState extends State { @override void initState() { - super.initState(); _selectedId = widget.selectedSpaceUuid; + super.initState(); } @override void didUpdateWidget(covariant SidebarWidget oldWidget) { - super.didUpdateWidget(oldWidget); if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) { - setState(() { - _selectedId = widget.selectedSpaceUuid; - }); + setState(() => _selectedId = widget.selectedSpaceUuid); } + super.didUpdateWidget(oldWidget); } - List _filterCommunities() { + List _filteredCommunities() { if (_searchQuery.isEmpty) { _selectedSpaceUuid = null; return widget.communities; @@ -59,17 +54,20 @@ class _SidebarWidgetState extends State { return widget.communities.where((community) { final containsQueryInCommunity = community.name.toLowerCase().contains(_searchQuery.toLowerCase()); - final containsQueryInSpaces = community.spaces - .any((space) => _containsQuery(space, _searchQuery.toLowerCase())); + final containsQueryInSpaces = community.spaces.any((space) => + _containsQuery(space: space, query: _searchQuery.toLowerCase())); return containsQueryInCommunity || containsQueryInSpaces; }).toList(); } - bool _containsQuery(SpaceModel space, String query) { + bool _containsQuery({ + required SpaceModel space, + required String query, + }) { final matchesSpace = space.name.toLowerCase().contains(query); final matchesChildren = space.children.any( - (child) => _containsQuery(child, query), + (child) => _containsQuery(space: child, query: query), ); if (matchesSpace || matchesChildren) { @@ -95,7 +93,7 @@ class _SidebarWidgetState extends State { @override Widget build(BuildContext context) { - final filteredCommunities = _filterCommunities(); + final filteredCommunities = _filteredCommunities(); return Container( width: 300, @@ -104,39 +102,7 @@ class _SidebarWidgetState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - decoration: subSectionContainerDecoration, - padding: const EdgeInsets.all(16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Communities', - style: context.textTheme.titleMedium?.copyWith( - color: ColorsManager.blackColor, - ), - ), - GestureDetector( - onTap: () => _navigateToBlank(context), - child: Container( - width: 30, - height: 30, - decoration: const BoxDecoration( - color: ColorsManager.whiteColors, - shape: BoxShape.circle, - ), - child: Center( - child: SvgPicture.asset( - Assets.roundedAddIcon, - width: 24, - height: 24, - ), - ), - ), - ), - ], - ), - ), + const SidebarHeader(), CustomSearchBar( onSearchChanged: (query) => setState(() => _searchQuery = query), ), @@ -153,15 +119,8 @@ class _SidebarWidgetState extends State { ); } - void _navigateToBlank(BuildContext context) { - setState(() => _selectedId = ''); - context.read().add( - NewCommunityEvent(communities: widget.communities), - ); - } - Widget _buildCommunityTile(BuildContext context, CommunityModel community) { - bool hasChildren = community.spaces.isNotEmpty; + final hasChildren = community.spaces.isNotEmpty; return CommunityTile( title: community.name, @@ -197,12 +156,11 @@ class _SidebarWidgetState extends State { Widget _buildSpaceTile({ required SpaceModel space, required CommunityModel community, - int depth = 1, }) { - bool spaceIsExpanded = _isSpaceOrChildSelected(space); + final spaceIsExpanded = _isSpaceOrChildSelected(space); final isSelected = _selectedId == space.uuid; return Padding( - padding: EdgeInsets.only(left: depth * 16.0), + padding: const EdgeInsetsDirectional.only(start: 16.0), child: SpaceTile( title: space.name, key: ValueKey(space.uuid), From c7c88987631551721db1dde86065c7bce5cfeb77 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 12:52:38 +0300 Subject: [PATCH 09/12] removed redundant code. --- .../all_spaces/widgets/sidebar_widget.dart | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index a98dead8..b7eacc0b 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -120,8 +120,6 @@ class _SidebarWidgetState extends State { } Widget _buildCommunityTile(BuildContext context, CommunityModel community) { - final hasChildren = community.spaces.isNotEmpty; - return CommunityTile( title: community.name, key: ValueKey(community.uuid), @@ -140,16 +138,14 @@ class _SidebarWidgetState extends State { ); }, onExpansionChanged: (title, expanded) {}, - children: hasChildren - ? community.spaces - .where((space) { - final isDeleted = space.status != SpaceStatus.deleted; - final isParentDeleted = space.status != SpaceStatus.parentDeleted; - return (isDeleted || isParentDeleted); - }) - .map((space) => _buildSpaceTile(space: space, community: community)) - .toList() - : null, + children: community.spaces + .where((space) { + final isDeleted = space.status != SpaceStatus.deleted; + final isParentDeleted = space.status != SpaceStatus.parentDeleted; + return (isDeleted || isParentDeleted); + }) + .map((space) => _buildSpaceTile(space: space, community: community)) + .toList(), ); } From 6493f02bccc7c3de144b5375c4807c04389aa79a Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 13:08:23 +0300 Subject: [PATCH 10/12] simplify if statements readabaility. --- .../all_spaces/widgets/sidebar_widget.dart | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index b7eacc0b..92e72326 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -78,14 +78,11 @@ class _SidebarWidgetState extends State { } bool _isSpaceOrChildSelected(SpaceModel space) { - if (_selectedSpaceUuid == space.uuid) { - return true; - } + if (_selectedSpaceUuid == space.uuid) return true; + for (var child in space.children) { - if (_isSpaceOrChildSelected(child)) { - return true; - } + if (_isSpaceOrChildSelected(child)) return true; } return false; From 79f5ef7871df02a53f511ac9df114eba14ec82c3 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 13:12:48 +0300 Subject: [PATCH 11/12] simplify space selection logic. --- .../all_spaces/widgets/sidebar_widget.dart | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index 92e72326..b103184e 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -78,14 +78,9 @@ class _SidebarWidgetState extends State { } bool _isSpaceOrChildSelected(SpaceModel space) { - if (_selectedSpaceUuid == space.uuid) return true; - - - for (var child in space.children) { - if (_isSpaceOrChildSelected(child)) return true; - } - - return false; + final isSpaceSelected = _selectedSpaceUuid == space.uuid; + final anySubSpaceIsSelected = space.children.any(_isSpaceOrChildSelected); + return isSpaceSelected || anySubSpaceIsSelected; } @override From acad0e8c9c79431f6a5158bc7df90a8f4468ac52 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 13 Apr 2025 14:50:07 +0300 Subject: [PATCH 12/12] SP-1189-FE-Add-Button-Not-clickable-Opening-Pop-up-in-Community-Screen --- .../widgets/sidebar_add_community_button.dart | 51 +++++++++++++------ .../all_spaces/widgets/sidebar_header.dart | 8 +-- .../all_spaces/widgets/sidebar_widget.dart | 5 +- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart index 2f434350..5c769d48 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart @@ -1,32 +1,51 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart'; +import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart'; +import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart'; import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; class SidebarAddCommunityButton extends StatelessWidget { - const SidebarAddCommunityButton({super.key}); + const SidebarAddCommunityButton({ + required this.existingCommunityNames, + super.key, + }); + + final List existingCommunityNames; @override Widget build(BuildContext context) { - return GestureDetector( - onTap: () => _navigateToBlank(context), - child: Container( - width: 30, - height: 30, - decoration: const BoxDecoration( - color: ColorsManager.whiteColors, - shape: BoxShape.circle, - ), - child: Center( - child: SvgPicture.asset( - Assets.roundedAddIcon, - width: 24, - height: 24, + return SizedBox.square( + dimension: 30, + child: IconButton( + style: IconButton.styleFrom( + iconSize: 20, + backgroundColor: ColorsManager.circleImageBackground, + shape: const CircleBorder( + side: BorderSide( + color: ColorsManager.lightGrayBorderColor, + width: 3, + ), ), ), + onPressed: () => _showCreateCommunityDialog(context), + icon: SvgPicture.asset(Assets.addIcon), ), ); } - void _navigateToBlank(BuildContext context) {} + void _showCreateCommunityDialog(BuildContext context) => showDialog( + context: context, + builder: (context) => CreateCommunityDialog( + isEditMode: false, + existingCommunityNames: existingCommunityNames, + onCreateCommunity: (name, description) { + context.read().add( + CreateCommunityEvent(name, description, context), + ); + }, + ), + ); } diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart index 1e386d4f..135be109 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart @@ -5,13 +5,15 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/style.dart'; class SidebarHeader extends StatelessWidget { - const SidebarHeader({super.key}); + const SidebarHeader({required this.existingCommunityNames, super.key}); + + final List existingCommunityNames; @override Widget build(BuildContext context) { return Container( decoration: subSectionContainerDecoration, - padding: const EdgeInsets.all(16.0), + padding: const EdgeInsets.all(16), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -21,7 +23,7 @@ class SidebarHeader extends StatelessWidget { color: ColorsManager.blackColor, ), ), - const SidebarAddCommunityButton(), + SidebarAddCommunityButton(existingCommunityNames: existingCommunityNames), ], ), ); diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart index b103184e..35bb8ad2 100644 --- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart +++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart @@ -94,7 +94,10 @@ class _SidebarWidgetState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - const SidebarHeader(), + SidebarHeader( + existingCommunityNames: + widget.communities.map((community) => community.name).toList(), + ), CustomSearchBar( onSearchChanged: (query) => setState(() => _searchQuery = query), ),