fluffychat merge - resolve conflicts

android/app/src/main/AndroidManifest.xml

@@ -18,14 +18,12 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE"
                      android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <!-- #Pangea -->
     <uses-permission android:name="com.android.vending.BILLING" />

lib/pages/chat_list/chat_list_item.dart

@@ -144,14 +144,7 @@ class ChatListItem extends StatelessWidget {
                           right: 0,
                           child: Avatar(
                             border: space == null
-                                ? room.isSpace
+                                ? null
-                                    ? BorderSide(
-                                        width: 0,
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .outline,
-                                      )
-                                    : null
                                 : BorderSide(
                                     width: 2,
                                     color: backgroundColor ??
@@ -175,6 +168,8 @@ class ChatListItem extends StatelessWidget {
                         Positioned(
                           top: 0,
                           right: 0,
+                          child: GestureDetector(
+                            onTap: () => onLongPress?.call(context),
                             child: AnimatedScale(
                               duration: FluffyThemes.animationDuration,
                               curve: FluffyThemes.animationCurve,
@@ -189,6 +184,7 @@ class ChatListItem extends StatelessWidget {
                               ),
                             ),
                           ),
+                        ),
                       ],
                     ),
                   ),

lib/pages/chat_list/chat_list_view.dart

@@ -1,6 +1,14 @@
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
+import 'package:fluffychat/pages/chat_list/navi_rail_item.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/stream_extension.dart';
+import 'package:fluffychat/widgets/avatar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:go_router/go_router.dart';
+import 'package:matrix/matrix.dart';
 
 import '../../widgets/matrix.dart';
 import 'chat_list_body.dart';
@@ -12,6 +20,7 @@ class ChatListView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final client = Matrix.of(context).client;
     return StreamBuilder<Object?>(
       stream: Matrix.of(context).onShareContentChanged.stream,
       builder: (_, __) {
@@ -19,9 +28,13 @@ class ChatListView extends StatelessWidget {
         return PopScope(
           canPop: controller.selectMode == SelectMode.normal &&
               !controller.isSearchMode &&
-              controller.activeFilter == ActiveFilter.allChats,
+              controller.activeSpaceId == null,
-          onPopInvoked: (pop) async {
+          onPopInvoked: (pop) {
             if (pop) return;
+            if (controller.activeSpaceId != null) {
+              controller.clearActiveSpace();
+              return;
+            }
             final selMode = controller.selectMode;
             if (controller.isSearchMode) {
               controller.cancelSearch();
@@ -32,6 +45,90 @@ class ChatListView extends StatelessWidget {
               return;
             }
           },
+          child: Row(
+            children: [
+              if (FluffyThemes.isColumnMode(context) &&
+                  controller.widget.displayNavigationRail) ...[
+                StreamBuilder(
+                  key: ValueKey(
+                    client.userID.toString(),
+                  ),
+                  stream: client.onSync.stream
+                      .where((s) => s.hasRoomUpdate)
+                      .rateLimit(const Duration(seconds: 1)),
+                  builder: (context, _) {
+                    final allSpaces = Matrix.of(context)
+                        .client
+                        .rooms
+                        .where((room) => room.isSpace);
+                    final rootSpaces = allSpaces
+                        .where(
+                          (space) => !allSpaces.any(
+                            (parentSpace) => parentSpace.spaceChildren
+                                .any((child) => child.roomId == space.id),
+                          ),
+                        )
+                        .toList();
+
+                    return SizedBox(
+                      width: FluffyThemes.navRailWidth,
+                      child: ListView.builder(
+                        scrollDirection: Axis.vertical,
+                        itemCount: rootSpaces.length + 2,
+                        itemBuilder: (context, i) {
+                          if (i == 0) {
+                            return NaviRailItem(
+                              isSelected: controller.activeSpaceId == null,
+                              onTap: controller.clearActiveSpace,
+                              icon: const Icon(Icons.forum_outlined),
+                              selectedIcon: const Icon(Icons.forum),
+                              toolTip: L10n.of(context)!.chats,
+                              unreadBadgeFilter: (room) => true,
+                            );
+                          }
+                          i--;
+                          if (i == rootSpaces.length) {
+                            return NaviRailItem(
+                              isSelected: false,
+                              onTap: () => context.go('/rooms/newspace'),
+                              icon: const Icon(Icons.add),
+                              toolTip: L10n.of(context)!.createNewSpace,
+                            );
+                          }
+                          final space = rootSpaces[i];
+                          final displayname =
+                              rootSpaces[i].getLocalizedDisplayname(
+                            MatrixLocals(L10n.of(context)!),
+                          );
+                          final spaceChildrenIds =
+                              space.spaceChildren.map((c) => c.roomId).toSet();
+                          return NaviRailItem(
+                            toolTip: displayname,
+                            isSelected: controller.activeSpaceId == space.id,
+                            onTap: () =>
+                                controller.setActiveSpace(rootSpaces[i].id),
+                            unreadBadgeFilter: (room) =>
+                                spaceChildrenIds.contains(room.id),
+                            icon: Avatar(
+                              mxContent: rootSpaces[i].avatar,
+                              name: displayname,
+                              size: 32,
+                              borderRadius: BorderRadius.circular(
+                                AppConfig.borderRadius / 4,
+                              ),
+                            ),
+                          );
+                        },
+                      ),
+                    );
+                  },
+                ),
+                Container(
+                  color: Theme.of(context).dividerColor,
+                  width: 1,
+                ),
+              ],
+              Expanded(
                 child: GestureDetector(
                   onTap: FocusManager.instance.primaryFocus?.unfocus,
                   excludeFromSemantics: true,
@@ -49,7 +146,8 @@ class ChatListView extends StatelessWidget {
                         //   helpLabel: L10n.of(context)!.newChat,
                         //   child:
                         // Pangea#
-                  selectMode == SelectMode.normal && !controller.isSearchMode
+                        selectMode == SelectMode.normal &&
+                                !controller.isSearchMode
                             ? FloatingActionButton.extended(
                                 onPressed: controller.addChatAction,
                                 icon: const Icon(Icons.add_outlined),
@@ -61,6 +159,9 @@ class ChatListView extends StatelessWidget {
                             : const SizedBox.shrink(),
                   ),
                 ),
+              ),
+            ],
+          ),
         );
       },
     );

lib/pages/chat_list/space_view.dart

@@ -163,10 +163,7 @@ class _SpaceViewState extends State<SpaceView> {
     final room = Matrix.of(context).client.getRoomById(widget.spaceId);
     final displayname =
         room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
-    return PopScope(
+    return Scaffold(
-      canPop: false,
-      onPopInvoked: (_) => widget.onBack(),
-      child: Scaffold(
       appBar: AppBar(
         leading: Center(
           child: CloseButton(
@@ -281,9 +278,8 @@ class _SpaceViewState extends State<SpaceView> {
                         onChanged: (_) => setState(() {}),
                         textInputAction: TextInputAction.search,
                         decoration: InputDecoration(
-                            fillColor: Theme.of(context)
+                          fillColor:
-                                .colorScheme
+                              Theme.of(context).colorScheme.secondaryContainer,
-                                .secondaryContainer,
                           border: OutlineInputBorder(
                             borderSide: BorderSide.none,
                             borderRadius: BorderRadius.circular(99),
@@ -471,7 +467,6 @@ class _SpaceViewState extends State<SpaceView> {
                 );
               },
             ),
-      ),
     );
   }
 }

lib/widgets/avatar.dart

@@ -45,26 +45,26 @@ class Avatar extends StatelessWidget {
     final noPic = mxContent == null ||
         mxContent.toString().isEmpty ||
         mxContent.toString() == 'null';
-    final textWidget = Center(
+    final textWidget = Container(
+      color: name?.lightColorAvatar,
+      alignment: Alignment.center,
       child: Text(
         fallbackLetters,
         style: TextStyle(
-          color: noPic ? Colors.white : null,
+          color: Colors.white,
           fontSize: (size / 2.5).roundToDouble(),
         ),
       ),
     );
     final borderRadius = this.borderRadius ?? BorderRadius.circular(size / 2);
     final presenceUserId = this.presenceUserId;
-    final color =
-        noPic ? name?.lightColorAvatar : Theme.of(context).secondaryHeaderColor;
     final container = Stack(
       children: [
         SizedBox(
           width: size,
           height: size,
           child: Material(
-            color: color,
+            color: Theme.of(context).colorScheme.surfaceContainerLowest,
             shape: RoundedRectangleBorder(
               borderRadius: borderRadius,
               side: border ?? BorderSide.none,
@@ -73,13 +73,13 @@ class Avatar extends StatelessWidget {
             child: noPic
                 ? textWidget
                 : MxcImage(
-                    key: Key(mxContent.toString()),
+                    key: ValueKey(mxContent.toString()),
+                    cacheKey: '${mxContent}_$size',
                     uri: mxContent,
                     fit: BoxFit.cover,
                     width: size,
                     height: size,
                     placeholder: (_) => textWidget,
-                    cacheKey: mxContent.toString(),
                   ),
           ),
         ),

lib/widgets/mxc_image.dart

@@ -48,10 +48,10 @@ class MxcImage extends StatefulWidget {
 class _MxcImageState extends State<MxcImage> {
   static final Map<String, Uint8List> _imageDataCache = {};
   Uint8List? _imageDataNoCache;
-  Uint8List? get _imageData {
+
-    final cacheKey = widget.cacheKey;
+  Uint8List? get _imageData => widget.cacheKey == null
-    return cacheKey == null ? _imageDataNoCache : _imageDataCache[cacheKey];
+      ? _imageDataNoCache
-  }
+      : _imageDataCache[widget.cacheKey];
 
   set _imageData(Uint8List? data) {
     if (data == null) return;

pubspec.lock

@@ -2692,13 +2692,13 @@ packages:
     source: hosted
     version: "1.2.0"
   win32:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: win32
-      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.1"
+    version: "5.5.0"
   win32_registry:
     dependency: transitive
     description:

pubspec.yaml

@@ -216,3 +216,4 @@ dependency_overrides:
     git:
       url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git
       ref: null-safety
+  win32: 5.5.0