fluffychat merge

lib/config/themes.dart

@@ -106,6 +106,8 @@ abstract class FluffyThemes {
         surfaceTintColor: colorScheme.surface,
         backgroundColor: colorScheme.surface,
         // Pangea#
+        actionsPadding:
+            isColumnMode ? const EdgeInsets.symmetric(horizontal: 16.0) : null,
         systemOverlayStyle: SystemUiOverlayStyle(
           statusBarColor: Colors.transparent,
           statusBarIconBrightness: brightness.reversed,
@@ -128,6 +130,7 @@ abstract class FluffyThemes {
       ),
       snackBarTheme: isColumnMode
           ? const SnackBarThemeData(
+              showCloseIcon: true,
               behavior: SnackBarBehavior.floating,
               width: FluffyThemes.columnWidth * 1.5,
             )

lib/pages/chat/chat_input_row.dart

@@ -5,7 +5,6 @@
 
 // import 'package:fluffychat/config/app_config.dart';
 // import 'package:fluffychat/l10n/l10n.dart';
-// import 'package:fluffychat/pages/chat/encryption_button.dart';
 // import 'package:fluffychat/utils/other_party_can_receive.dart';
 // import 'package:fluffychat/utils/platform_infos.dart';
 // import 'package:fluffychat/widgets/avatar.dart';
@@ -53,12 +52,12 @@
 //                   height: height,
 //                   child: TextButton(
 //                     style: TextButton.styleFrom(
-//                       foregroundColor: Colors.orange,
+//                       foregroundColor: theme.colorScheme.error,
 //                     ),
 //                     onPressed: controller.deleteErrorEventsAction,
 //                     child: Row(
 //                       children: <Widget>[
-//                         const Icon(Icons.delete),
+//                         const Icon(Icons.delete_forever_outlined),
 //                         Text(L10n.of(context).delete),
 //                       ],
 //                     ),
@@ -228,6 +227,7 @@
 //                 ),
 //               Container(
 //                 height: height,
+//                 width: height,
 //                 alignment: Alignment.center,
 //                 child: IconButton(
 //                   tooltip: L10n.of(context).emojis,
@@ -256,17 +256,12 @@
 //                   onPressed: controller.emojiPickerAction,
 //                 ),
 //               ),
-//               Container(
-//                 height: height,
-//                 alignment: Alignment.center,
-//                 child: EncryptionButton(controller.room),
-//               ),
 //               if (Matrix.of(context).isMultiAccount &&
 //                   Matrix.of(context).hasComplexBundles &&
 //                   Matrix.of(context).currentBundle!.length > 1)
 //                 Container(
-//                   width: height,
 //                   height: height,
+//                   width: height,
 //                   alignment: Alignment.center,
 //                   child: _ChatAccountPicker(controller),
 //                 ),

lib/pages/chat/chat_view.dart

@@ -138,6 +138,7 @@ class ChatView extends StatelessWidget {
     //         icon: const Icon(Icons.call_outlined),
     //         tooltip: L10n.of(context).placeCall,
     //       ),
+    //     EncryptionButton(controller.room),
     //     ChatSettingsPopupMenu(controller.room, true),
     //   ];
     // }

lib/pages/chat_details/chat_details_view.dart

@@ -265,9 +265,12 @@ class ChatDetailsView extends StatelessWidget {
                           Divider(color: theme.dividerColor),
                           ListTile(
                             leading: CircleAvatar(
-                              backgroundColor: theme.scaffoldBackgroundColor,
+                              backgroundColor:
+                                  theme.colorScheme.surfaceContainer,
                               foregroundColor: iconColor,
-                              child: const Icon(Icons.shield_outlined),
+                              child: const Icon(
+                                Icons.admin_panel_settings_outlined,
+                              ),
                             ),
                             title: Text(
                               L10n.of(context).accessAndVisibility,
@@ -285,10 +288,11 @@ class ChatDetailsView extends StatelessWidget {
                               L10n.of(context).whoCanPerformWhichAction,
                             ),
                             leading: CircleAvatar(
-                              backgroundColor: theme.scaffoldBackgroundColor,
+                              backgroundColor:
+                                  theme.colorScheme.surfaceContainer,
                               foregroundColor: iconColor,
                               child: const Icon(
-                                Icons.edit_attributes_outlined,
+                                Icons.tune_outlined,
                               ),
                             ),
                             trailing: const Icon(Icons.chevron_right_outlined),

lib/pages/chat_list/status_msg_list.dart

@@ -76,7 +76,12 @@ class StatusMessageList extends StatelessWidget {
               return SizedBox(
                 height: StatusMessageList.height,
                 child: ListView.builder(
-                  padding: const EdgeInsets.all(8),
+                  padding: const EdgeInsets.only(
+                    left: 8.0,
+                    right: 8.0,
+                    top: 8.0,
+                    bottom: 6.0,
+                  ),
                   scrollDirection: Axis.horizontal,
                   itemCount: presences.length,
                   itemBuilder: (context, i) => PresenceAvatar(
@@ -118,7 +123,7 @@ class PresenceAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final avatarSize = height - 16 - 16 - 8;
+    final avatarSize = height - 16 - 16 - 6;
     final client = Matrix.of(context).client;
     return FutureBuilder<Profile>(
       future: client.getProfileFromUserId(presence.userid),