diff --git a/lib/pangea/chat_settings/pages/pangea_room_details.dart b/lib/pangea/chat_settings/pages/pangea_room_details.dart index 542b49d38..f6bf5b4a8 100644 --- a/lib/pangea/chat_settings/pages/pangea_room_details.dart +++ b/lib/pangea/chat_settings/pages/pangea_room_details.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat_details/chat_details.dart'; import 'package:fluffychat/pangea/chat_settings/pages/chat_details_content.dart'; @@ -29,31 +28,29 @@ class PangeaRoomDetailsView extends StatelessWidget { ); } - final isColumnMode = FluffyThemes.isColumnMode(context); return StreamBuilder( stream: room.client.onRoomState.stream .where((update) => update.roomId == room.id), builder: (context, snapshot) { - return Scaffold( - appBar: room.isSpace - ? null - : AppBar( - leading: controller.widget.embeddedCloseButton ?? - const Center(child: BackButton()), - ), - body: Padding( - padding: EdgeInsetsGeometry.symmetric( - vertical: isColumnMode ? 30.0 : 12.0, - horizontal: isColumnMode ? 50.0 : 8.0, - ), - child: MaxWidthBody( - maxWidth: 900, - showBorder: false, - innerPadding: const EdgeInsets.symmetric(horizontal: 16.0), - withScrolling: !room.isSpace, - child: room.isSpace - ? SpaceDetailsContent(controller, room) - : ChatDetailsContent(controller, room), + return SafeArea( + child: Scaffold( + appBar: room.isSpace + ? null + : AppBar( + leading: controller.widget.embeddedCloseButton ?? + const Center(child: BackButton()), + ), + body: Padding( + padding: const EdgeInsetsGeometry.all(16.0), + child: MaxWidthBody( + maxWidth: 900, + showBorder: false, + innerPadding: const EdgeInsets.symmetric(horizontal: 16.0), + withScrolling: !room.isSpace, + child: room.isSpace + ? SpaceDetailsContent(controller, room) + : ChatDetailsContent(controller, room), + ), ), ), ); diff --git a/lib/pangea/chat_settings/pages/space_details_content.dart b/lib/pangea/chat_settings/pages/space_details_content.dart index a2816373e..a37fb50c2 100644 --- a/lib/pangea/chat_settings/pages/space_details_content.dart +++ b/lib/pangea/chat_settings/pages/space_details_content.dart @@ -8,6 +8,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/pangea/analytics_summary/learning_progress_indicators.dart'; import 'package:fluffychat/pangea/chat_settings/pages/room_details_buttons.dart'; import 'package:fluffychat/pangea/chat_settings/pages/room_participants_widget.dart'; import 'package:fluffychat/pangea/chat_settings/pages/space_details_button_row.dart'; @@ -206,6 +207,7 @@ class SpaceDetailsContent extends StatelessWidget { return Column( mainAxisSize: MainAxisSize.min, children: [ + if (!isColumnMode) const LearningProgressIndicators(), Row( crossAxisAlignment: isColumnMode ? CrossAxisAlignment.start