Minor fixes

android/app/build.gradle

@@ -53,13 +53,18 @@ android {
 
     signingConfigs {
         release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
+            if (keystorePropertiesFile.exists()) {
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            }
         }
     }
     buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+        }
         release {
             signingConfig signingConfigs.release
             minifyEnabled true

lib/main.dart

@@ -21,6 +21,7 @@ class App extends StatelessWidget {
       child: MaterialApp(
         title: 'FluffyWeb',
         theme: ThemeData(
+          brightness: Brightness.light,
           primaryColor: Color(0xFF5625BA),
           backgroundColor: Colors.white,
           scaffoldBackgroundColor: Colors.white,
@@ -35,6 +36,7 @@ class App extends StatelessWidget {
             ),
           ),
           appBarTheme: AppBarTheme(
+            brightness: Brightness.light,
             color: Colors.white,
             elevation: 1,
             textTheme: TextTheme(

lib/views/invitation_selection.dart

@@ -26,6 +26,10 @@ class InvitationSelection extends StatelessWidget {
         userMap[roomUsers[j].id] = true;
       }
     }
+    contacts.sort((a, b) => a
+        .calcDisplayname()
+        .toLowerCase()
+        .compareTo(b.calcDisplayname().toLowerCase()));
     return contacts;
   }
 

lib/views/settings.dart

@@ -4,9 +4,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/components/adaptive_page_layout.dart';
 import 'package:fluffychat/components/content_banner.dart';
 import 'package:fluffychat/components/matrix.dart';
-import 'package:fluffychat/utils/app_route.dart';
 import 'package:fluffychat/views/chat_list.dart';
-import 'package:fluffychat/views/login.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
@@ -32,9 +30,8 @@ class _SettingsState extends State<Settings> {
   Future<dynamic> profileFuture;
   dynamic profile;
   void logoutAction(BuildContext context) async {
+    await Navigator.of(context).pop();
     MatrixState matrix = Matrix.of(context);
-    await Navigator.of(context).pushAndRemoveUntil(
-        AppRoute.defaultRoute(context, LoginPage()), (r) => false);
     await matrix.tryRequestWithLoadingDialog(matrix.client.logout());
     matrix.clean();
   }