Merge branch 'krille/use-stream-builder' into 'master'
Krille/use stream builder See merge request ChristianPauly/fluffychat-flutter!40
This commit is contained in:
Christian Pauly
commit
facf1f87a9
|
|
@ -1,4 +1,3 @@
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
|
|
@ -131,14 +130,6 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
if (participants != null) setState(() => members = participants);
|
||||
}
|
||||
|
||||
StreamSubscription onUpdate;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
onUpdate?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (widget.room == null) {
|
||||
|
|
@ -156,14 +147,15 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
final int actualMembersCount =
|
||||
widget.room.mInvitedMemberCount + widget.room.mJoinedMemberCount;
|
||||
final bool canRequestMoreMembers = members.length < actualMembersCount;
|
||||
this.onUpdate ??= widget.room.onUpdate.stream
|
||||
.listen((id) => setState(() => members = null));
|
||||
return AdaptivePageLayout(
|
||||
primaryPage: FocusPage.SECOND,
|
||||
firstScaffold: ChatList(
|
||||
activeChat: widget.room.id,
|
||||
),
|
||||
secondScaffold: Scaffold(
|
||||
secondScaffold: StreamBuilder(
|
||||
stream: widget.room.onUpdate.stream,
|
||||
builder: (context, snapshot) {
|
||||
return Scaffold(
|
||||
body: NestedScrollView(
|
||||
headerSliverBuilder:
|
||||
(BuildContext context, bool innerBoxIsScrolled) => <Widget>[
|
||||
|
|
@ -184,7 +176,8 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
),
|
||||
ChatSettingsPopupMenu(widget.room, false)
|
||||
],
|
||||
title: Text(widget.room.getLocalizedDisplayname(L10n.of(context)),
|
||||
title: Text(
|
||||
widget.room.getLocalizedDisplayname(L10n.of(context)),
|
||||
style: TextStyle(
|
||||
color: Theme.of(context)
|
||||
.appBarTheme
|
||||
|
|
@ -194,14 +187,16 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
backgroundColor: Theme.of(context).appBarTheme.color,
|
||||
flexibleSpace: FlexibleSpaceBar(
|
||||
background: ContentBanner(widget.room.avatar,
|
||||
onEdit: widget.room.canSendEvent("m.room.avatar") && !kIsWeb
|
||||
onEdit: widget.room.canSendEvent("m.room.avatar") &&
|
||||
!kIsWeb
|
||||
? () => setAvatarAction(context)
|
||||
: null),
|
||||
),
|
||||
),
|
||||
],
|
||||
body: ListView.builder(
|
||||
itemCount: members.length + 1 + (canRequestMoreMembers ? 1 : 0),
|
||||
itemCount:
|
||||
members.length + 1 + (canRequestMoreMembers ? 1 : 0),
|
||||
itemBuilder: (BuildContext context, int i) => i == 0
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
|
|
@ -209,13 +204,14 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
ListTile(
|
||||
leading: widget.room.canSendEvent("m.room.topic")
|
||||
? CircleAvatar(
|
||||
backgroundColor:
|
||||
Theme.of(context).scaffoldBackgroundColor,
|
||||
backgroundColor: Theme.of(context)
|
||||
.scaffoldBackgroundColor,
|
||||
foregroundColor: Colors.grey,
|
||||
child: Icon(Icons.edit),
|
||||
)
|
||||
: null,
|
||||
title: Text("${L10n.of(context).groupDescription}:",
|
||||
title: Text(
|
||||
"${L10n.of(context).groupDescription}:",
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).primaryColor,
|
||||
fontWeight: FontWeight.bold)),
|
||||
|
|
@ -226,7 +222,10 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
linkStyle: TextStyle(color: Colors.blueAccent),
|
||||
textStyle: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).textTheme.bodyText2.color,
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.bodyText2
|
||||
.color,
|
||||
),
|
||||
),
|
||||
onTap: widget.room.canSendEvent("m.room.topic")
|
||||
|
|
@ -251,12 +250,14 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
foregroundColor: Colors.grey,
|
||||
child: Icon(Icons.people),
|
||||
),
|
||||
title: Text(L10n.of(context).changeTheNameOfTheGroup),
|
||||
title: Text(
|
||||
L10n.of(context).changeTheNameOfTheGroup),
|
||||
subtitle: Text(widget.room
|
||||
.getLocalizedDisplayname(L10n.of(context))),
|
||||
onTap: () => setDisplaynameAction(context),
|
||||
),
|
||||
if (widget.room.canSendEvent("m.room.canonical_alias") &&
|
||||
if (widget.room
|
||||
.canSendEvent("m.room.canonical_alias") &&
|
||||
widget.room.joinRules == JoinRules.public)
|
||||
ListTile(
|
||||
leading: CircleAvatar(
|
||||
|
|
@ -268,26 +269,28 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
onTap: () => setCanonicalAliasAction(context),
|
||||
title: Text(L10n.of(context).setInvitationLink),
|
||||
subtitle: Text(
|
||||
(widget.room.canonicalAlias?.isNotEmpty ?? false)
|
||||
(widget.room.canonicalAlias?.isNotEmpty ??
|
||||
false)
|
||||
? widget.room.canonicalAlias
|
||||
: L10n.of(context).none),
|
||||
),
|
||||
PopupMenuButton(
|
||||
child: ListTile(
|
||||
leading: CircleAvatar(
|
||||
backgroundColor:
|
||||
Theme.of(context).scaffoldBackgroundColor,
|
||||
backgroundColor: Theme.of(context)
|
||||
.scaffoldBackgroundColor,
|
||||
foregroundColor: Colors.grey,
|
||||
child: Icon(Icons.public)),
|
||||
title: Text(
|
||||
L10n.of(context).whoIsAllowedToJoinThisGroup),
|
||||
title: Text(L10n.of(context)
|
||||
.whoIsAllowedToJoinThisGroup),
|
||||
subtitle: Text(
|
||||
widget.room.joinRules
|
||||
.getLocalizedString(L10n.of(context)),
|
||||
),
|
||||
),
|
||||
onSelected: (JoinRules joinRule) =>
|
||||
SimpleDialogs(context).tryRequestWithLoadingDialog(
|
||||
SimpleDialogs(context)
|
||||
.tryRequestWithLoadingDialog(
|
||||
widget.room.setJoinRules(joinRule),
|
||||
),
|
||||
itemBuilder: (BuildContext context) =>
|
||||
|
|
@ -314,16 +317,19 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
foregroundColor: Colors.grey,
|
||||
child: Icon(Icons.visibility),
|
||||
),
|
||||
title:
|
||||
Text(L10n.of(context).visibilityOfTheChatHistory),
|
||||
title: Text(L10n.of(context)
|
||||
.visibilityOfTheChatHistory),
|
||||
subtitle: Text(
|
||||
widget.room.historyVisibility
|
||||
.getLocalizedString(L10n.of(context)),
|
||||
),
|
||||
),
|
||||
onSelected: (HistoryVisibility historyVisibility) =>
|
||||
SimpleDialogs(context).tryRequestWithLoadingDialog(
|
||||
widget.room.setHistoryVisibility(historyVisibility),
|
||||
onSelected:
|
||||
(HistoryVisibility historyVisibility) =>
|
||||
SimpleDialogs(context)
|
||||
.tryRequestWithLoadingDialog(
|
||||
widget.room
|
||||
.setHistoryVisibility(historyVisibility),
|
||||
),
|
||||
itemBuilder: (BuildContext context) =>
|
||||
<PopupMenuEntry<HistoryVisibility>>[
|
||||
|
|
@ -357,13 +363,13 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
PopupMenuButton(
|
||||
child: ListTile(
|
||||
leading: CircleAvatar(
|
||||
backgroundColor:
|
||||
Theme.of(context).scaffoldBackgroundColor,
|
||||
backgroundColor: Theme.of(context)
|
||||
.scaffoldBackgroundColor,
|
||||
foregroundColor: Colors.grey,
|
||||
child: Icon(Icons.info_outline),
|
||||
),
|
||||
title:
|
||||
Text(L10n.of(context).areGuestsAllowedToJoin),
|
||||
title: Text(
|
||||
L10n.of(context).areGuestsAllowedToJoin),
|
||||
subtitle: Text(
|
||||
widget.room.guestAccess
|
||||
.getLocalizedString(L10n.of(context)),
|
||||
|
|
@ -380,8 +386,8 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
PopupMenuItem<GuestAccess>(
|
||||
value: GuestAccess.can_join,
|
||||
child: Text(
|
||||
GuestAccess.can_join
|
||||
.getLocalizedString(L10n.of(context)),
|
||||
GuestAccess.can_join.getLocalizedString(
|
||||
L10n.of(context)),
|
||||
),
|
||||
),
|
||||
if (widget.room.canChangeGuestAccess)
|
||||
|
|
@ -389,7 +395,8 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
value: GuestAccess.forbidden,
|
||||
child: Text(
|
||||
GuestAccess.forbidden
|
||||
.getLocalizedString(L10n.of(context)),
|
||||
.getLocalizedString(
|
||||
L10n.of(context)),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
@ -412,7 +419,8 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
title: Text(L10n.of(context).inviteContact),
|
||||
leading: CircleAvatar(
|
||||
child: Icon(Icons.add),
|
||||
backgroundColor: Theme.of(context).primaryColor,
|
||||
backgroundColor:
|
||||
Theme.of(context).primaryColor,
|
||||
foregroundColor: Colors.white,
|
||||
),
|
||||
onTap: () => Navigator.of(context).push(
|
||||
|
|
@ -428,8 +436,10 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
: i < members.length + 1
|
||||
? ParticipantListItem(members[i - 1])
|
||||
: ListTile(
|
||||
title: Text(L10n.of(context).loadCountMoreParticipants(
|
||||
(actualMembersCount - members.length).toString())),
|
||||
title: Text(L10n.of(context)
|
||||
.loadCountMoreParticipants(
|
||||
(actualMembersCount - members.length)
|
||||
.toString())),
|
||||
leading: CircleAvatar(
|
||||
backgroundColor:
|
||||
Theme.of(context).scaffoldBackgroundColor,
|
||||
|
|
@ -442,7 +452,8 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/components/adaptive_page_layout.dart';
|
||||
import 'package:fluffychat/components/avatar.dart';
|
||||
|
|
@ -35,28 +33,18 @@ class ChatEncryptionSettings extends StatefulWidget {
|
|||
}
|
||||
|
||||
class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
|
||||
Room room;
|
||||
|
||||
StreamSubscription roomUpdate;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
roomUpdate?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
room ??= Matrix.of(context).client.getRoomById(widget.id);
|
||||
roomUpdate ??= room.onUpdate.stream.listen((s) => setState(() => null));
|
||||
final room = Matrix.of(context).client.getRoomById(widget.id);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(L10n.of(context).participatingUserDevices),
|
||||
),
|
||||
body: Column(
|
||||
children: <Widget>[
|
||||
FutureBuilder<List<DeviceKeys>>(
|
||||
body: StreamBuilder(
|
||||
stream: room.onUpdate.stream,
|
||||
builder: (context, snapshot) {
|
||||
return FutureBuilder<List<DeviceKeys>>(
|
||||
future: room.getUserDeviceKeys(),
|
||||
builder: (BuildContext context, snapshot) {
|
||||
if (snapshot.hasError) {
|
||||
|
|
@ -112,15 +100,17 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
|
|||
.keys["ed25519:${deviceKeys[i].deviceId}"]
|
||||
.beautified,
|
||||
style: TextStyle(
|
||||
color:
|
||||
Theme.of(context).textTheme.bodyText2.color),
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.bodyText2
|
||||
.color),
|
||||
),
|
||||
value: deviceKeys[i].verified,
|
||||
onChanged: (bool newVal) {
|
||||
if (newVal == true) {
|
||||
if (deviceKeys[i].blocked) {
|
||||
deviceKeys[i]
|
||||
.setBlocked(false, Matrix.of(context).client);
|
||||
deviceKeys[i].setBlocked(
|
||||
false, Matrix.of(context).client);
|
||||
}
|
||||
deviceKeys[i]
|
||||
.setVerified(true, Matrix.of(context).client);
|
||||
|
|
@ -140,15 +130,8 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
|
|||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
Divider(thickness: 1, height: 1),
|
||||
ListTile(
|
||||
title: Text("Outbound MegOlm session ID:"),
|
||||
subtitle: Text(
|
||||
room.outboundGroupSession?.session_id()?.beautified ?? "None"),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,21 +52,17 @@ class ChatList extends StatefulWidget {
|
|||
|
||||
class _ChatListState extends State<ChatList> {
|
||||
bool get searchMode => searchController.text?.isNotEmpty ?? false;
|
||||
StreamSubscription sub;
|
||||
final TextEditingController searchController = TextEditingController();
|
||||
SelectMode selectMode = SelectMode.normal;
|
||||
Timer coolDown;
|
||||
PublicRoomsResponse publicRoomsResponse;
|
||||
bool loadingPublicRooms = false;
|
||||
String searchServer;
|
||||
|
||||
Future<bool> waitForFirstSync(BuildContext context) async {
|
||||
Future<void> waitForFirstSync(BuildContext context) async {
|
||||
Client client = Matrix.of(context).client;
|
||||
if (client.prevBatch?.isEmpty ?? true) {
|
||||
await client.onFirstSync.stream.first;
|
||||
}
|
||||
sub ??= client.onSync.stream
|
||||
.listen((s) => mounted ? setState(() => null) : null);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -205,29 +201,22 @@ class _ChatListState extends State<ChatList> {
|
|||
|
||||
@override
|
||||
void dispose() {
|
||||
sub?.cancel();
|
||||
searchController.removeListener(
|
||||
() => setState(() => null),
|
||||
);
|
||||
_intentDataStreamSubscription?.cancel();
|
||||
_intentFileStreamSubscription?.cancel();
|
||||
_onShareContentChangedSub?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
StreamSubscription _onShareContentChangedSub;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_onShareContentChangedSub ??= Matrix.of(context)
|
||||
.onShareContentChanged
|
||||
.stream
|
||||
.listen((c) => setState(() => null));
|
||||
if (Matrix.of(context).shareContent != null) {
|
||||
selectMode = SelectMode.share;
|
||||
} else if (selectMode == SelectMode.share) {
|
||||
setState(() => selectMode = SelectMode.normal);
|
||||
}
|
||||
return StreamBuilder(
|
||||
stream: Matrix.of(context).onShareContentChanged.stream,
|
||||
builder: (context, snapshot) {
|
||||
final selectMode = Matrix.of(context).shareContent == null
|
||||
? SelectMode.normal
|
||||
: SelectMode.share;
|
||||
return Scaffold(
|
||||
drawer: selectMode == SelectMode.share
|
||||
? null
|
||||
|
|
@ -335,7 +324,8 @@ class _ChatListState extends State<ChatList> {
|
|||
foregroundColor: Colors.white,
|
||||
backgroundColor: Colors.blue,
|
||||
label: L10n.of(context).createNewGroup,
|
||||
labelStyle: TextStyle(fontSize: 18.0, color: Colors.black),
|
||||
labelStyle:
|
||||
TextStyle(fontSize: 18.0, color: Colors.black),
|
||||
onTap: () => Navigator.of(context).pushAndRemoveUntil(
|
||||
AppRoute.defaultRoute(context, NewGroupView()),
|
||||
(r) => r.isFirst),
|
||||
|
|
@ -345,30 +335,38 @@ class _ChatListState extends State<ChatList> {
|
|||
foregroundColor: Colors.white,
|
||||
backgroundColor: Colors.green,
|
||||
label: L10n.of(context).newPrivateChat,
|
||||
labelStyle: TextStyle(fontSize: 18.0, color: Colors.black),
|
||||
labelStyle:
|
||||
TextStyle(fontSize: 18.0, color: Colors.black),
|
||||
onTap: () => Navigator.of(context).pushAndRemoveUntil(
|
||||
AppRoute.defaultRoute(context, NewPrivateChatView()),
|
||||
AppRoute.defaultRoute(
|
||||
context, NewPrivateChatView()),
|
||||
(r) => r.isFirst),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: FutureBuilder<bool>(
|
||||
body: StreamBuilder(
|
||||
stream: Matrix.of(context).client.onSync.stream,
|
||||
builder: (context, snapshot) {
|
||||
return FutureBuilder<void>(
|
||||
future: waitForFirstSync(context),
|
||||
builder: (BuildContext context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
List<Room> rooms = List<Room>.from(Matrix.of(context).client.rooms);
|
||||
List<Room> rooms =
|
||||
List<Room>.from(Matrix.of(context).client.rooms);
|
||||
rooms.removeWhere((Room room) =>
|
||||
searchMode &&
|
||||
!room.displayname
|
||||
.toLowerCase()
|
||||
.contains(searchController.text.toLowerCase() ?? ""));
|
||||
if (rooms.isEmpty && (!searchMode || publicRoomsResponse == null)) {
|
||||
!room.displayname.toLowerCase().contains(
|
||||
searchController.text.toLowerCase() ?? ""));
|
||||
if (rooms.isEmpty &&
|
||||
(!searchMode || publicRoomsResponse == null)) {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Icon(
|
||||
searchMode ? Icons.search : Icons.chat_bubble_outline,
|
||||
searchMode
|
||||
? Icons.search
|
||||
: Icons.chat_bubble_outline,
|
||||
size: 80,
|
||||
color: Colors.grey,
|
||||
),
|
||||
|
|
@ -388,14 +386,18 @@ class _ChatListState extends State<ChatList> {
|
|||
? Material(
|
||||
elevation: 2,
|
||||
child: ListTile(
|
||||
title: Text(L10n.of(context).publicRooms),
|
||||
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
|
||||
return Matrix.of(context)
|
||||
.client
|
||||
.statusList
|
||||
.isEmpty
|
||||
? Container()
|
||||
: PreferredSize(
|
||||
preferredSize: Size.fromHeight(89),
|
||||
|
|
@ -403,10 +405,14 @@ class _ChatListState extends State<ChatList> {
|
|||
height: 81,
|
||||
child: ListView.builder(
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount:
|
||||
Matrix.of(context).client.statusList.length,
|
||||
itemBuilder: (BuildContext context, int i) =>
|
||||
PresenceListItem(Matrix.of(context)
|
||||
itemCount: Matrix.of(context)
|
||||
.client
|
||||
.statusList
|
||||
.length,
|
||||
itemBuilder:
|
||||
(BuildContext context, int i) =>
|
||||
PresenceListItem(
|
||||
Matrix.of(context)
|
||||
.client
|
||||
.statusList[i]),
|
||||
),
|
||||
|
|
@ -417,10 +423,11 @@ class _ChatListState extends State<ChatList> {
|
|||
return i < rooms.length
|
||||
? ChatListItem(
|
||||
rooms[i],
|
||||
activeChat: widget.activeChat == rooms[i].id,
|
||||
activeChat:
|
||||
widget.activeChat == rooms[i].id,
|
||||
)
|
||||
: PublicRoomListItem(
|
||||
publicRoomsResponse.publicRooms[i - rooms.length]);
|
||||
: PublicRoomListItem(publicRoomsResponse
|
||||
.publicRooms[i - rooms.length]);
|
||||
});
|
||||
} else {
|
||||
return Center(
|
||||
|
|
@ -428,7 +435,9 @@ class _ChatListState extends State<ChatList> {
|
|||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue