From d838d3a474c4f4f4eb484fb07a56777fc20e2002 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Fri, 3 Jan 2020 11:47:31 +0100
Subject: [PATCH] Minor fixes

---
 android/app/build.gradle            | 13 +++++++++----
 lib/main.dart                       |  2 ++
 lib/views/invitation_selection.dart |  4 ++++
 lib/views/settings.dart             |  5 +----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index faf963e..794929a 100644
--- a/android/app/build.gradle
+++ b/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
diff --git a/lib/main.dart b/lib/main.dart
index f8133b7..426dc70 100644
--- a/lib/main.dart
+++ b/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(
diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart
index 6af6b6a..b6481e1 100644
--- a/lib/views/invitation_selection.dart
+++ b/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;
   }
 
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index ec16a90..427885b 100644
--- a/lib/views/settings.dart
+++ b/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();
   }