Merge branch 'krille/fixdesign-for-smaller-screens' into 'main'

chore: Fix design for smaller screens

See merge request famedly/fluffychat!685

lib/pages/add_story/invite_story_page.dart

@@ -79,9 +79,11 @@ class _InviteStoryPageState extends State<InviteStoryPage> {
           onPressed: () => Navigator.of(context).pop<bool>(false),
         ),
         title: Text(L10n.of(context)!.whoCanSeeMyStories),
-        bottom: PreferredSize(
+        elevation: 0,
-          preferredSize: const Size.fromHeight(56),
+      ),
-          child: ListTile(
+      body: Column(
+        children: [
+          ListTile(
             title: Text(L10n.of(context)!.whoCanSeeMyStoriesDesc),
             leading: CircleAvatar(
               backgroundColor: Theme.of(context).secondaryHeaderColor,
@@ -89,18 +91,20 @@ class _InviteStoryPageState extends State<InviteStoryPage> {
               child: const Icon(Icons.lock),
             ),
           ),
-        ),
+          const Divider(height: 1),
-      ),
+          Expanded(
-      body: FutureBuilder<List<User>>(
+            child: FutureBuilder<List<User>>(
                 future: loadContacts,
                 builder: (context, snapshot) {
                   final contacts = snapshot.data;
                   if (contacts == null) {
                     final error = snapshot.error;
                     if (error != null) {
-                return Center(child: Text(error.toLocalizedString(context)));
+                      return Center(
+                          child: Text(error.toLocalizedString(context)));
                     }
-              return const Center(child: CircularProgressIndicator.adaptive());
+                    return const Center(
+                        child: CircularProgressIndicator.adaptive());
                   }
                   _undecided = contacts.map((u) => u.id).toSet();
                   return ListView.builder(
@@ -118,6 +122,9 @@ class _InviteStoryPageState extends State<InviteStoryPage> {
                     ),
                   );
                 }),
+          ),
+        ],
+      ),
       floatingActionButton: FloatingActionButton.extended(
         onPressed: _inviteAction,
         label: Text(L10n.of(context)!.publish),

lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart

@@ -28,9 +28,14 @@ class ChatEncryptionSettingsView extends StatelessWidget {
               VRouter.of(context).toSegments(['rooms', controller.roomId]),
         ),
         title: Text(L10n.of(context).tapOnDeviceToVerify),
-        bottom: PreferredSize(
+        elevation: 0,
-          preferredSize: const Size.fromHeight(56),
+      ),
-          child: ListTile(
+      body: MaxWidthBody(
+        withScrolling: true,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
               title: Text(L10n.of(context).deviceVerifyDescription),
               leading: CircleAvatar(
                 backgroundColor: Theme.of(context).secondaryHeaderColor,
@@ -38,11 +43,8 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                 child: const Icon(Icons.lock),
               ),
             ),
-        ),
+            const Divider(height: 1),
-      ),
+            StreamBuilder(
-      body: MaxWidthBody(
-        withScrolling: true,
-        child: StreamBuilder(
                 stream: room.onUpdate.stream,
                 builder: (context, snapshot) {
                   return FutureBuilder<List<DeviceKeys>>(
@@ -57,8 +59,8 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                       }
                       if (!snapshot.hasData) {
                         return const Center(
-                        child:
+                            child: CircularProgressIndicator.adaptive(
-                            CircularProgressIndicator.adaptive(strokeWidth: 2));
+                                strokeWidth: 2));
                       }
                       final deviceKeys = snapshot.data;
                       return ListView.builder(
@@ -119,8 +121,8 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                                 if (deviceKeys[i].blocked ||
                                     !deviceKeys[i].verified) {
                                   items.add(PopupMenuItem(
-                                value:
+                                    value: deviceKeys[i].userId ==
-                                    deviceKeys[i].userId == room.client.userID
+                                            room.client.userID
                                         ? 'verify'
                                         : 'verify_user',
                                     child: Text(L10n.of(context).verifyStart),
@@ -180,6 +182,8 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                     },
                   );
                 }),
+          ],
+        ),
       ),
     );
   }

lib/pages/settings_stories/settings_stories_view.dart

@@ -17,9 +17,11 @@ class SettingsStoriesView extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         title: Text(L10n.of(context)!.whoCanSeeMyStories),
-        bottom: PreferredSize(
+        elevation: 0,
-          preferredSize: const Size.fromHeight(56),
+      ),
-          child: ListTile(
+      body: Column(
+        children: [
+          ListTile(
             title: Text(L10n.of(context)!.whoCanSeeMyStoriesDesc),
             leading: CircleAvatar(
               backgroundColor: Theme.of(context).secondaryHeaderColor,
@@ -27,9 +29,9 @@ class SettingsStoriesView extends StatelessWidget {
               child: const Icon(Icons.lock),
             ),
           ),
-        ),
+          const Divider(height: 1),
-      ),
+          Expanded(
-      body: FutureBuilder(
+            child: FutureBuilder(
               future: controller.loadUsers,
               builder: (context, snapshot) {
                 final error = snapshot.error;
@@ -59,6 +61,9 @@ class SettingsStoriesView extends StatelessWidget {
                 );
               },
             ),
+          ),
+        ],
+      ),
     );
   }
 }