Merge 7173d85db5 into 9c260313ce

lib/pages/chat_list/space_view.dart

@@ -345,7 +345,8 @@ class _SpaceViewState extends State<SpaceView> {
                     .whereType<Room>()
                     .toList();
                 final filter = _filterController.text.trim().toLowerCase();
-                return CustomScrollView(
+                return SafeArea(
+                  child: CustomScrollView(
                     slivers: [
                       SliverAppBar(
                         floating: true,
@@ -521,7 +522,8 @@ class _SpaceViewState extends State<SpaceView> {
                                       item.numJoinedMembers.toString(),
                                       style: TextStyle(
                                         fontSize: 13,
-                                      color: theme.textTheme.bodyMedium!.color,
+                                        color:
+                                            theme.textTheme.bodyMedium!.color,
                                       ),
                                     ),
                                     const SizedBox(width: 4),
@@ -546,6 +548,7 @@ class _SpaceViewState extends State<SpaceView> {
                       ),
                       const SliverPadding(padding: EdgeInsets.only(top: 32)),
                     ],
+                  ),
                 );
               },
             ),

lib/pages/settings/settings_view.dart

@@ -59,6 +59,7 @@ class SettingsView extends StatelessWidget {
                   ),
             body: ListTileTheme(
               iconColor: theme.colorScheme.onSurface,
+              child: SafeArea(
                 child: ListView(
                   key: const Key('SettingsListViewContent'),
                   children: <Widget>[
@@ -195,8 +196,8 @@ class SettingsView extends StatelessWidget {
                     ListTile(
                       leading: const Icon(Icons.notifications_outlined),
                       title: Text(L10n.of(context).notifications),
-                    tileColor:
-                        activeRoute.startsWith('/rooms/settings/notifications')
+                      tileColor: activeRoute
+                              .startsWith('/rooms/settings/notifications')
                           ? theme.colorScheme.surfaceContainerHigh
                           : null,
                       onTap: () => context.go('/rooms/settings/notifications'),
@@ -205,7 +206,8 @@ class SettingsView extends StatelessWidget {
                       leading: const Icon(Icons.devices_outlined),
                       title: Text(L10n.of(context).devices),
                       onTap: () => context.go('/rooms/settings/devices'),
-                    tileColor: activeRoute.startsWith('/rooms/settings/devices')
+                      tileColor:
+                          activeRoute.startsWith('/rooms/settings/devices')
                               ? theme.colorScheme.surfaceContainerHigh
                               : null,
                     ),
@@ -262,6 +264,7 @@ class SettingsView extends StatelessWidget {
               ),
             ),
           ),
+        ),
       ],
     );
   }