Merge pull request #2344 from acterglobal/ben-tasks-overall-improvements

Tasks overall design improvements
acterglobal · Nov 4, 2024 · b937d58 · b937d58
2 parents e51aeb8 + 51e0d62
commit b937d58
Show file tree

Hide file tree

Showing 34 changed files with 1,552 additions and 861 deletions.
diff --git a/.changes/2434-task-quick-actions.md b/.changes/2434-task-quick-actions.md
@@ -0,0 +1 @@
+- Create Tasks right from the quick actions, including to select the target space and list.
diff --git a/app/lib/common/actions/select_space.dart b/app/lib/common/actions/select_space.dart
@@ -0,0 +1,22 @@
+import 'package:acter/common/providers/space_providers.dart';
+import 'package:acter/common/widgets/spaces/space_selector_drawer.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+const Key selectSpaceDrawerKey = Key('space-widgets-select-space-drawer');
+
+Future<String?> selectSpace({
+  required BuildContext context,
+  required WidgetRef ref,
+  required String canCheck,
+}) async {
+  final newSelectedSpaceId = await selectSpaceDrawer(
+    context: context,
+    currentSpaceId: ref.read(selectedSpaceIdProvider),
+    canCheck: canCheck,
+    title: Text(L10n.of(context).selectSpace),
+  );
+  ref.read(selectedSpaceIdProvider.notifier).state = newSelectedSpaceId;
+  return newSelectedSpaceId;
+}
diff --git a/app/lib/common/widgets/spaces/select_space_form_field.dart b/app/lib/common/widgets/spaces/select_space_form_field.dart
@@ -14,7 +14,7 @@ class SelectSpaceFormField extends ConsumerWidget {
   final String? emptyText;
   final String canCheck;
   final bool mandatory;
-  final bool useCompatView;
+  final bool useCompactView;
 
   const SelectSpaceFormField({
     super.key,
@@ -23,7 +23,7 @@ class SelectSpaceFormField extends ConsumerWidget {
     this.emptyText,
     this.mandatory = true,
     required this.canCheck,
-    this.useCompatView = false,
+    this.useCompactView = false,
   });
 
   void selectSpace(BuildContext context, WidgetRef ref) async {
@@ -55,7 +55,7 @@ class SelectSpaceFormField extends ConsumerWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  if (!useCompatView)
+                  if (!useCompactView)
                     Text(
                       title ?? lang.space,
                       style: Theme.of(context).textTheme.bodyMedium,
@@ -105,9 +105,9 @@ class SelectSpaceFormField extends ConsumerWidget {
           (p0) => SpaceChip(
             spaceId: p0.roomId,
             onTapOpenSpaceDetail: false,
-            useCompatView: useCompatView,
+            useCompactView: useCompactView,
             onTapSelectSpace: () {
-              if (useCompatView) selectSpace(context, ref);
+              if (useCompactView) selectSpace(context, ref);
             },
           ),
         ) ??

diff --git a/app/lib/features/comments/widgets/comments_section_widget.dart b/app/lib/features/comments/widgets/comments_section_widget.dart
@@ -36,6 +36,9 @@ class CommentsSectionWidget extends ConsumerWidget {
     );
   }
 
+  static CommentListSkeletonWidget loading() =>
+      const CommentListSkeletonWidget();
+
   Widget buildCommentSectionUI(
     BuildContext context,
     CommentsManager commentManager,

diff --git a/app/lib/features/events/pages/create_event_page.dart b/app/lib/features/events/pages/create_event_page.dart
@@ -1,11 +1,11 @@
+import 'package:acter/common/actions/select_space.dart';
 import 'package:acter/common/extensions/options.dart';
 import 'package:acter/common/providers/space_providers.dart';
 import 'package:acter/common/toolkit/buttons/primary_action_button.dart';
 import 'package:acter/common/utils/routes.dart';
 import 'package:acter/common/utils/utils.dart';
 import 'package:acter/common/widgets/html_editor.dart';
 import 'package:acter/common/widgets/spaces/select_space_form_field.dart';
-import 'package:acter/common/widgets/spaces/space_selector_drawer.dart';
 import 'package:acter/features/events/model/keys.dart';
 import 'package:acter/features/events/utils/events_utils.dart';
 import 'package:acter/features/home/providers/client_providers.dart';
@@ -417,7 +417,11 @@ class CreateEventPageConsumerState extends ConsumerState<CreateEventPage> {
   Future<void> _handleCreateEvent() async {
     final lang = L10n.of(context);
     String? spaceId = ref.read(selectedSpaceIdProvider);
-    spaceId ??= await selectSpace();
+    spaceId ??= await selectSpace(
+      context: context,
+      ref: ref,
+      canCheck: 'CanPostEvent',
+    );
     if (!mounted) return;
 
     if (spaceId == null) {
@@ -487,15 +491,4 @@ class CreateEventPageConsumerState extends ConsumerState<CreateEventPage> {
       );
     }
   }
-
-  Future<String?> selectSpace() async {
-    final newSelectedSpaceId = await selectSpaceDrawer(
-      context: context,
-      currentSpaceId: ref.read(selectedSpaceIdProvider),
-      canCheck: 'CanPostEvent',
-      title: Text(L10n.of(context).selectSpace),
-    );
-    ref.read(selectedSpaceIdProvider.notifier).state = newSelectedSpaceId;
-    return newSelectedSpaceId;
-  }
 }
diff --git a/app/lib/features/home/widgets/quick_action_buttons.dart b/app/lib/features/home/widgets/quick_action_buttons.dart
@@ -3,7 +3,7 @@ import 'package:acter/common/themes/colors/color_scheme.dart';
 import 'package:acter/common/utils/routes.dart';
 import 'package:acter/common/widgets/action_button_widget.dart';
 import 'package:acter/features/main/providers/main_providers.dart';
-import 'package:acter/features/tasks/sheets/create_update_task_list.dart';
+import 'package:acter/features/tasks/actions/create_task.dart';
 import 'package:atlas_icons/atlas_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -42,10 +42,9 @@ class QuickActionButtons extends ConsumerWidget {
     final canAddEvent =
         ref.watch(hasSpaceWithPermissionProvider('CanPostEvent')).valueOrNull ??
             false;
-    final canAddTask = ref
-            .watch(hasSpaceWithPermissionProvider('CanPostTaskList'))
-            .valueOrNull ??
-        false;
+    final canAddTask =
+        ref.watch(hasSpaceWithPermissionProvider('CanPostTask')).valueOrNull ??
+            false;
     final canAddBoost =
         ref.watch(hasSpaceWithPermissionProvider('CanPostNews')).valueOrNull ??
             false;
@@ -64,12 +63,12 @@ class QuickActionButtons extends ConsumerWidget {
       if (canAddTask)
         ActionButtonWidget(
           iconData: Atlas.list,
-          title: lang.addTaskList,
+          title: lang.addTask,
           color: taskFeatureColor,
           padding: const EdgeInsets.symmetric(vertical: 6),
           onPressed: () {
             ref.read(quickActionVisibilityProvider.notifier).state = false;
-            showCreateUpdateTaskListBottomSheet(context);
+            showCreateTaskBottomSheet(context);
           },
         ),
       if (canAddEvent)

diff --git a/app/lib/features/home/widgets/sidebar_widget.dart b/app/lib/features/home/widgets/sidebar_widget.dart
@@ -12,7 +12,7 @@ import 'package:acter/features/bug_report/providers/bug_report_providers.dart';
 import 'package:acter/features/home/data/keys.dart';
 import 'package:acter/features/home/widgets/activities_icon.dart';
 import 'package:acter/features/home/widgets/chats_icon.dart';
-import 'package:acter/features/tasks/sheets/create_update_task_list.dart';
+import 'package:acter/features/tasks/actions/create_task.dart';
 import 'package:acter/router/providers/router_providers.dart';
 import 'package:acter/router/utils.dart';
 import 'package:acter_avatar/acter_avatar.dart';
@@ -231,10 +231,9 @@ class SidebarWidget extends ConsumerWidget {
     final canAddEvent =
         ref.watch(hasSpaceWithPermissionProvider('CanPostEvent')).valueOrNull ??
             false;
-    final canAddTask = ref
-            .watch(hasSpaceWithPermissionProvider('CanPostTaskList'))
-            .valueOrNull ??
-        false;
+    final canAddTask =
+        ref.watch(hasSpaceWithPermissionProvider('CanPostTask')).valueOrNull ??
+            false;
     final canAddBoost =
         ref.watch(hasSpaceWithPermissionProvider('CanPostNews')).valueOrNull ??
             false;
@@ -258,11 +257,11 @@ class SidebarWidget extends ConsumerWidget {
         PopupMenuItem(
           child: ActionButtonWidget(
             iconData: Atlas.list,
-            title: lang.addTaskList,
+            title: lang.addTask,
             color: taskFeatureColor,
             onPressed: () {
               if (context.canPop()) Navigator.pop(context);
-              showCreateUpdateTaskListBottomSheet(context);
+              showCreateTaskBottomSheet(context);
             },
           ),
         ),

diff --git a/app/lib/features/home/widgets/space_chip.dart b/app/lib/features/home/widgets/space_chip.dart
@@ -10,47 +10,62 @@ import 'package:skeletonizer/skeletonizer.dart';
 class SpaceChip extends ConsumerWidget {
   final String spaceId;
   final bool onTapOpenSpaceDetail;
-  final bool useCompatView;
+  final bool useCompactView;
   final VoidCallback? onTapSelectSpace;
 
   const SpaceChip({
     super.key,
     required this.spaceId,
     this.onTapOpenSpaceDetail = true,
-    this.useCompatView = false,
+    this.useCompactView = false,
     this.onTapSelectSpace,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (useCompatView) {
+    if (useCompactView) {
       return renderCompactView(context, ref);
     }
     return renderFullChip(context, ref);
   }
 
-  static Widget loading() {
-    return Skeletonizer(
-      child: Chip(
-        avatar: ActerAvatar(
-          options: const AvatarOptions(
-            AvatarInfo(uniqueId: 'unique Id'),
-            size: 24,
+  static Widget loading({useCompactView = false}) =>
+      useCompactView ? loadingCompact() : loadingFull();
+
+  static Widget loadingFull() => Skeletonizer(
+        child: Chip(
+          avatar: ActerAvatar(
+            options: const AvatarOptions(
+              AvatarInfo(uniqueId: 'unique Id'),
+              size: 24,
+            ),
           ),
+          label: const Text('unique name'),
         ),
-        label: const Text('unique name'),
-      ),
-    );
-  }
+      );
+
+  static Widget loadingCompact() => const Skeletonizer(
+        child: Wrap(
+          children: [
+            Text('In: '),
+            SizedBox(width: 4),
+            Text('displayName'),
+          ],
+        ),
+      );
 
   Widget renderCompactView(BuildContext context, WidgetRef ref) {
     final lang = L10n.of(context);
     final displayName =
         ref.watch(roomDisplayNameProvider(spaceId)).valueOrNull ?? spaceId;
-    return Row(
+    return Wrap(
+      crossAxisAlignment: WrapCrossAlignment.center,
       children: [
-        Text(lang.inSpaceLabelInline),
-        Text(lang.colonCharacter),
+        Text(
+          lang.inSpaceLabelInline,
+          style: Theme.of(context).textTheme.labelLarge,
+        ),
+        const SizedBox(width: 4),
         InkWell(
           onTap: () {
             if (onTapOpenSpaceDetail) {

diff --git a/app/lib/features/pins/pages/create_pin_page.dart b/app/lib/features/pins/pages/create_pin_page.dart
@@ -118,7 +118,7 @@ class _CreatePinConsumerState extends ConsumerState<CreatePinPage> {
                         alignment: Alignment.centerLeft,
                         child: SelectSpaceFormField(
                           canCheck: 'CanPostPin',
-                          useCompatView: true,
+                          useCompactView: true,
                         ),
                       ),
                       const SizedBox(height: 14),

diff --git a/app/lib/features/pins/pages/pin_details_page.dart b/app/lib/features/pins/pages/pin_details_page.dart
@@ -307,7 +307,7 @@ class _PinDetailsPageState extends ConsumerState<PinDetailsPage> {
   Widget pinSpaceNameUI(ActerPin pin) {
     return SpaceChip(
       spaceId: pin.roomIdStr(),
-      useCompatView: true,
+      useCompactView: true,
     );
   }
 

diff --git a/app/lib/features/space/providers/space_navbar_provider.dart b/app/lib/features/space/providers/space_navbar_provider.dart
@@ -47,7 +47,7 @@ final tabsProvider =
     }
 
     if (appSettings.tasks().active()) {
-      final taskList = await ref.watch(taskListProvider(spaceId).future);
+      final taskList = await ref.watch(taskListsProvider(spaceId).future);
       if (taskList.isNotEmpty) {
         tabs.add(TabEntry.tasks);
       }

diff --git a/app/lib/features/space/widgets/space_sections/tasks_section.dart b/app/lib/features/space/widgets/space_sections/tasks_section.dart
@@ -23,7 +23,7 @@ class TasksSection extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final lang = L10n.of(context);
-    final tasksLoader = ref.watch(taskListProvider(spaceId));
+    final tasksLoader = ref.watch(taskListsProvider(spaceId));
     return tasksLoader.when(
       data: (tasks) => buildTasksSectionUI(context, tasks),
       error: (e, s) {