aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logout crash

Browse Source
onboarding
Christian Pauly 5 years ago
parent f5322e5683
commit 6badbdddc6
2 changed files with 246 additions and 222 deletions
Show Stats Download Patch File Download Diff File

464
lib/views/chat_list.dart
Unescape Escape View File

@ -20,6 +20,7 @@ import '../utils/app_route.dart';
import '../utils/url_launcher.dart'; import '../utils/url_launcher.dart';
import '../utils/client_presence_extension.dart'; import '../utils/client_presence_extension.dart';
import 'archive.dart'; import 'archive.dart';
import 'homeserver_picker.dart';
import 'new_group.dart'; import 'new_group.dart';
import 'new_private_chat.dart'; import 'new_private_chat.dart';
import 'settings.dart'; import 'settings.dart';
@ -222,236 +223,263 @@ class _ChatListState extends State<ChatList> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return StreamBuilder( return StreamBuilder<LoginState>(
stream: Matrix.of(context).onShareContentChanged.stream, stream: Matrix.of(context).client.onLoginStateChanged.stream,
builder: (context, snapshot) { builder: (context, snapshot) {
final selectMode = Matrix.of(context).shareContent == null if (snapshot.data == LoginState.loggedOut) {
? SelectMode.normal Timer(Duration(seconds: 1), () {
: SelectMode.share; Matrix.of(context).clean();
return Scaffold( Navigator.of(context).pushAndRemoveUntil(
drawer: selectMode == SelectMode.share AppRoute.defaultRoute(context, HomeserverPicker()),
? null (r) => false);
: Drawer( });
child: SafeArea( }
child: ListView( return StreamBuilder(
padding: EdgeInsets.zero, stream: Matrix.of(context).onShareContentChanged.stream,
children: <Widget>[ builder: (context, snapshot) {
ListTile( final selectMode = Matrix.of(context).shareContent == null
leading: Icon(Icons.edit), ? SelectMode.normal
title: Text(L10n.of(context).setStatus), : SelectMode.share;
onTap: () => _setStatus(context), return Scaffold(
), drawer: selectMode == SelectMode.share
Divider(height: 1), ? null
ListTile( : Drawer(
leading: Icon(Icons.people_outline), child: SafeArea(
title: Text(L10n.of(context).createNewGroup), child: ListView(
onTap: () => _drawerTapAction(NewGroupView()), padding: EdgeInsets.zero,
children: <Widget>[
ListTile(
leading: Icon(Icons.edit),
title: Text(L10n.of(context).setStatus),
onTap: () => _setStatus(context),
),
Divider(height: 1),
ListTile(
leading: Icon(Icons.people_outline),
title: Text(L10n.of(context).createNewGroup),
onTap: () => _drawerTapAction(NewGroupView()),
),
ListTile(
leading: Icon(Icons.person_add),
title: Text(L10n.of(context).newPrivateChat),
onTap: () =>
_drawerTapAction(NewPrivateChatView()),
),
Divider(height: 1),
ListTile(
leading: Icon(Icons.archive),
title: Text(L10n.of(context).archive),
onTap: () => _drawerTapAction(
Archive(),
),
),
ListTile(
leading: Icon(Icons.settings),
title: Text(L10n.of(context).settings),
onTap: () => _drawerTapAction(
SettingsView(),
),
),
Divider(height: 1),
ListTile(
leading: Icon(Icons.share),
title: Text(L10n.of(context).inviteContact),
onTap: () {
Navigator.of(context).pop();
Share.share(L10n.of(context).inviteText(
Matrix.of(context).client.userID,
"https://matrix.to/#/${Matrix.of(context).client.userID}"));
},
),
],
),
), ),
ListTile( ),
leading: Icon(Icons.person_add), appBar: AppBar(
title: Text(L10n.of(context).newPrivateChat), elevation: _scrolledToTop ? 0 : null,
onTap: () => _drawerTapAction(NewPrivateChatView()), leading: selectMode != SelectMode.share
? null
: IconButton(
icon: Icon(Icons.close),
onPressed: () =>
Matrix.of(context).shareContent = null,
), ),
Divider(height: 1), titleSpacing: 0,
ListTile( title: selectMode == SelectMode.share
leading: Icon(Icons.archive), ? Text(L10n.of(context).share)
title: Text(L10n.of(context).archive), : Container(
onTap: () => _drawerTapAction( padding: EdgeInsets.all(8),
Archive(), height: 42,
margin: EdgeInsets.only(right: 8),
decoration: BoxDecoration(
color: Theme.of(context).secondaryHeaderColor,
borderRadius: BorderRadius.circular(90),
), ),
), child: TextField(
ListTile( autocorrect: false,
leading: Icon(Icons.settings), controller: searchController,
title: Text(L10n.of(context).settings), decoration: InputDecoration(
onTap: () => _drawerTapAction( suffixIcon: loadingPublicRooms
SettingsView(), ? Container(
alignment: Alignment.centerRight,
child: Container(
width: 20,
height: 20,
child: CircularProgressIndicator(),
),
)
: Icon(Icons.search),
contentPadding: EdgeInsets.all(9),
border: InputBorder.none,
hintText: L10n.of(context).searchForAChat,
),
), ),
), ),
Divider(height: 1),
ListTile(
leading: Icon(Icons.share),
title: Text(L10n.of(context).inviteContact),
onTap: () {
Navigator.of(context).pop();
Share.share(L10n.of(context).inviteText(
Matrix.of(context).client.userID,
"https://matrix.to/#/${Matrix.of(context).client.userID}"));
},
),
],
),
),
),
appBar: AppBar(
elevation: _scrolledToTop ? 0 : null,
leading: selectMode != SelectMode.share
? null
: IconButton(
icon: Icon(Icons.close),
onPressed: () => Matrix.of(context).shareContent = null,
),
titleSpacing: 0,
title: selectMode == SelectMode.share
? Text(L10n.of(context).share)
: Container(
padding: EdgeInsets.all(8),
height: 42,
margin: EdgeInsets.only(right: 8),
decoration: BoxDecoration(
color: Theme.of(context).secondaryHeaderColor,
borderRadius: BorderRadius.circular(90),
),
child: TextField(
autocorrect: false,
controller: searchController,
decoration: InputDecoration(
suffixIcon: loadingPublicRooms
? Container(
alignment: Alignment.centerRight,
child: Container(
width: 20,
height: 20,
child: CircularProgressIndicator(),
),
)
: Icon(Icons.search),
contentPadding: EdgeInsets.all(9),
border: InputBorder.none,
hintText: L10n.of(context).searchForAChat,
),
),
),
),
floatingActionButton: (AdaptivePageLayout.columnMode(context) ||
selectMode == SelectMode.share)
? null
: SpeedDial(
child: Icon(Icons.add),
overlayColor: blackWhiteColor(context),
foregroundColor: Colors.white,
backgroundColor: Theme.of(context).primaryColor,
children: [
SpeedDialChild(
child: Icon(Icons.people_outline),
foregroundColor: Colors.white,
backgroundColor: Colors.blue,
label: L10n.of(context).createNewGroup,
labelStyle:
TextStyle(fontSize: 18.0, color: Colors.black),
onTap: () => Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(context, NewGroupView()),
(r) => r.isFirst),
),
SpeedDialChild(
child: Icon(Icons.person_add),
foregroundColor: Colors.white,
backgroundColor: Colors.green,
label: L10n.of(context).newPrivateChat,
labelStyle:
TextStyle(fontSize: 18.0, color: Colors.black),
onTap: () => Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context, NewPrivateChatView()),
(r) => r.isFirst),
),
],
), ),
body: StreamBuilder( floatingActionButton:
stream: Matrix.of(context).client.onSync.stream, (AdaptivePageLayout.columnMode(context) ||
builder: (context, snapshot) { selectMode == SelectMode.share)
return FutureBuilder<void>( ? null
future: waitForFirstSync(context), : SpeedDial(
builder: (BuildContext context, snapshot) { child: Icon(Icons.add),
if (snapshot.hasData) { overlayColor: blackWhiteColor(context),
List<Room> rooms = foregroundColor: Colors.white,
List<Room>.from(Matrix.of(context).client.rooms); backgroundColor: Theme.of(context).primaryColor,
rooms.removeWhere((Room room) => children: [
searchMode && SpeedDialChild(
!room.displayname.toLowerCase().contains( child: Icon(Icons.people_outline),
searchController.text.toLowerCase() ?? "")); foregroundColor: Colors.white,
if (rooms.isEmpty && backgroundColor: Colors.blue,
(!searchMode || publicRoomsResponse == null)) { label: L10n.of(context).createNewGroup,
return Center( labelStyle: TextStyle(
child: Column( fontSize: 18.0, color: Colors.black),
mainAxisSize: MainAxisSize.min, onTap: () => Navigator.of(context)
children: <Widget>[ .pushAndRemoveUntil(
Icon( AppRoute.defaultRoute(
searchMode context, NewGroupView()),
? Icons.search (r) => r.isFirst),
: Icons.chat_bubble_outline, ),
size: 80, SpeedDialChild(
color: Colors.grey, child: Icon(Icons.person_add),
foregroundColor: Colors.white,
backgroundColor: Colors.green,
label: L10n.of(context).newPrivateChat,
labelStyle: TextStyle(
fontSize: 18.0, color: Colors.black),
onTap: () => Navigator.of(context)
.pushAndRemoveUntil(
AppRoute.defaultRoute(
context, NewPrivateChatView()),
(r) => r.isFirst),
), ),
Text(searchMode
? L10n.of(context).noRoomsFound
: L10n.of(context).startYourFirstChat),
], ],
), ),
); body: StreamBuilder(
} stream: Matrix.of(context).client.onSync.stream,
final int publicRoomsCount = builder: (context, snapshot) {
(publicRoomsResponse?.publicRooms?.length ?? 0); return FutureBuilder<void>(
final int totalCount = rooms.length + publicRoomsCount; future: waitForFirstSync(context),
return ListView.separated( builder: (BuildContext context, snapshot) {
controller: _scrollController, if (snapshot.hasData) {
separatorBuilder: (BuildContext context, int i) => List<Room> rooms = List<Room>.from(
i == totalCount - publicRoomsCount Matrix.of(context).client.rooms);
? Material( rooms.removeWhere((Room room) =>
elevation: 2, searchMode &&
child: ListTile( !room.displayname.toLowerCase().contains(
title: Text( searchController.text.toLowerCase() ??
L10n.of(context).publicRooms), ""));
), if (rooms.isEmpty &&
) (!searchMode ||
: Container(), publicRoomsResponse == null)) {
itemCount: totalCount + 1, return Center(
itemBuilder: (BuildContext context, int i) { child: Column(
if (i == 0) { mainAxisSize: MainAxisSize.min,
return (Matrix.of(context) children: <Widget>[
.client Icon(
.statusList searchMode
.isEmpty || ? Icons.search
selectMode == SelectMode.share) : Icons.chat_bubble_outline,
? Container() size: 80,
: PreferredSize( color: Colors.grey,
preferredSize: Size.fromHeight(89), ),
child: Container( Text(searchMode
height: 81, ? L10n.of(context).noRoomsFound
child: ListView.builder( : L10n.of(context)
scrollDirection: Axis.horizontal, .startYourFirstChat),
itemCount: Matrix.of(context) ],
.client ),
.statusList );
.length,
itemBuilder:
(BuildContext context, int i) =>
PresenceListItem(
Matrix.of(context)
.client
.statusList[i]),
),
),
);
} }
i--; final int publicRoomsCount =
return i < rooms.length (publicRoomsResponse?.publicRooms?.length ??
? ChatListItem( 0);
rooms[i], final int totalCount =
activeChat: rooms.length + publicRoomsCount;
widget.activeChat == rooms[i].id, return ListView.separated(
) controller: _scrollController,
: PublicRoomListItem(publicRoomsResponse separatorBuilder:
.publicRooms[i - rooms.length]); (BuildContext context, int i) =>
}); i == totalCount - publicRoomsCount
} else { ? Material(
return Center( elevation: 2,
child: CircularProgressIndicator(), child: ListTile(
title: Text(L10n.of(context)
.publicRooms),
),
)
: Container(),
itemCount: totalCount + 1,
itemBuilder: (BuildContext context, int i) {
if (i == 0) {
return (Matrix.of(context)
.client
.statusList
.isEmpty ||
selectMode == SelectMode.share)
? Container()
: PreferredSize(
preferredSize:
Size.fromHeight(89),
child: Container(
height: 81,
child: ListView.builder(
scrollDirection:
Axis.horizontal,
itemCount: Matrix.of(context)
.client
.statusList
.length,
itemBuilder: (BuildContext
context,
int i) =>
PresenceListItem(
Matrix.of(context)
.client
.statusList[i]),
),
),
);
}
i--;
return i < rooms.length
? ChatListItem(
rooms[i],
activeChat: widget.activeChat ==
rooms[i].id,
)
: PublicRoomListItem(publicRoomsResponse
.publicRooms[i - rooms.length]);
});
} else {
return Center(
child: CircularProgressIndicator(),
);
}
},
); );
} }),
}, );
); });
}),
);
}); });
} }
} }

4
lib/views/settings.dart
Unescape Escape View File

@ -2,7 +2,6 @@ import 'dart:io';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/components/settings_themes.dart'; import 'package:fluffychat/components/settings_themes.dart';
import 'package:fluffychat/views/homeserver_picker.dart';
import 'package:fluffychat/views/settings_devices.dart'; import 'package:fluffychat/views/settings_devices.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -46,9 +45,6 @@ class _SettingsState extends State<Settings> {
MatrixState matrix = Matrix.of(context); MatrixState matrix = Matrix.of(context);
await SimpleDialogs(context) await SimpleDialogs(context)
.tryRequestWithLoadingDialog(matrix.client.logout()); .tryRequestWithLoadingDialog(matrix.client.logout());
matrix.clean();
await Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(context, HomeserverPicker()), (r) => false);
} }
void setJitsiInstanceAction(BuildContext context) async { void setJitsiInstanceAction(BuildContext context) async {

Write Preview
Loading…
Cancel
Save