GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 14:59:29 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Christian Pauly 2020-01-03 11:47:31 +01:00
parent 541cdec4ca
commit d838d3a474
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/app/build.gradle
View File

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

2
lib/main.dart
View File

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

4
lib/views/invitation_selection.dart
View File

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

5
lib/views/settings.dart
View File

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