Fix #54

lib/views/chat_encryption_settings.dart

@@ -58,8 +58,7 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
                   return Center(child: CircularProgressIndicator());
                 }
                 final List<DeviceKeys> deviceKeys = snapshot.data;
-                return Expanded(
+                return ListView.separated(
-                  child: ListView.separated(
                   separatorBuilder: (BuildContext context, int i) =>
                       Divider(height: 1),
                   itemCount: deviceKeys.length,
@@ -100,17 +99,15 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
                               .keys["ed25519:${deviceKeys[i].deviceId}"]
                               .beautified,
                           style: TextStyle(
-                                color: Theme.of(context)
+                              color:
-                                    .textTheme
+                                  Theme.of(context).textTheme.bodyText2.color),
-                                    .bodyText2
-                                    .color),
                         ),
                         value: deviceKeys[i].verified,
                         onChanged: (bool newVal) {
                           if (newVal == true) {
                             if (deviceKeys[i].blocked) {
-                                deviceKeys[i].setBlocked(
+                              deviceKeys[i]
-                                    false, Matrix.of(context).client);
+                                  .setBlocked(false, Matrix.of(context).client);
                             }
                             deviceKeys[i]
                                 .setVerified(true, Matrix.of(context).client);
@@ -127,7 +124,6 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
                       ),
                     ],
                   ),
-                  ),
                 );
               },
             );

pubspec.lock

@@ -64,13 +64,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.3"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
   collection:
     dependency: transitive
     description:
@@ -120,13 +113,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.3"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
   famedlysdk:
     dependency: "direct main"
     description:
@@ -446,7 +432,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.6.4"
   path_drawing:
     dependency: transitive
     description:
@@ -524,6 +510,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.2"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   receive_sharing_intent:
     dependency: "direct main"
     description: