From 6687889d585770b1f0dfea0d2b0114c135b7c1df Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 6 Sep 2024 16:31:27 -0400 Subject: [PATCH] added learning analytics view to chat list appbar --- lib/pages/chat_list/chat_list_body.dart | 4 ---- lib/pages/chat_list/chat_list_header.dart | 10 ++++++++-- lib/pages/chat_list/space_view.dart | 11 ----------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 1993a97a6..b9b388da9 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -3,7 +3,6 @@ import 'package:fluffychat/pages/chat_list/chat_list.dart'; import 'package:fluffychat/pages/chat_list/search_title.dart'; import 'package:fluffychat/pages/chat_list/space_view.dart'; import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; -import 'package:fluffychat/pangea/widgets/chat_list/analytics_summary/learning_progress_indicators.dart'; import 'package:fluffychat/pangea/widgets/chat_list/chat_list_body_text.dart'; import 'package:fluffychat/pangea/widgets/chat_list/chat_list_header_wrapper.dart'; import 'package:fluffychat/pangea/widgets/chat_list/chat_list_item_wrapper.dart'; @@ -165,9 +164,6 @@ class ChatListViewBody extends StatelessWidget { title: L10n.of(context)!.chats, icon: const Icon(Icons.forum_outlined), ), - // #Pangea - const LearningProgressIndicators(), - // Pangea# if (client.prevBatch != null && rooms.isEmpty && !controller.isSearchMode) ...[ diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index a45751201..3ab5bc1bc 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -2,6 +2,7 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list.dart'; import 'package:fluffychat/pages/chat_list/client_chooser_button.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/widgets/chat_list/analytics_summary/learning_progress_indicators.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -22,7 +23,7 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { return SliverAppBar( floating: true, - toolbarHeight: 72, + toolbarHeight: 175, pinned: FluffyThemes.isColumnMode(context) || selectMode != SelectMode.normal, scrolledUnderElevation: selectMode == SelectMode.normal ? 0 : null, @@ -55,7 +56,12 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { key: const ValueKey(SelectMode.select), ) // #Pangea - : ClientChooserButton(controller), + : Column( + children: [ + ClientChooserButton(controller), + const LearningProgressIndicators(), + ], + ), ), // : TextField( // controller: controller.searchController, diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index ebf343bbf..a90c0d094 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -11,7 +11,6 @@ import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/pangea/widgets/chat_list/analytics_summary/learning_progress_indicators.dart'; import 'package:fluffychat/pangea/widgets/chat_list/chat_list_header_wrapper.dart'; import 'package:fluffychat/pangea/widgets/chat_list/chat_list_item_wrapper.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; @@ -734,11 +733,6 @@ class _SpaceViewState extends State { // #Pangea // ChatListHeader(controller: widget.controller), ChatListHeaderWrapper(controller: widget.controller), - SliverList( - delegate: SliverChildListDelegate( - [const LearningProgressIndicators()], - ), - ), // Pangea# SliverList( delegate: SliverChildBuilderDelegate( @@ -825,11 +819,6 @@ class _SpaceViewState extends State { controller: widget.controller, globalSearch: false, ), - SliverList( - delegate: SliverChildListDelegate( - [const LearningProgressIndicators()], - ), - ), // Pangea# SliverAppBar( automaticallyImplyLeading: false,