inex
/
FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'krille/minor-fixes' into 'master' 

Minor fixes

See merge request ChristianPauly/fluffychat-flutter!96
This commit is contained in:
Christian Pauly 2020-06-27 11:34:28 +00:00
parent d9b1510460 8def2fb81f
commit 3c6786e539
3 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/components/list_items/public_room_list_item.dart
View File

@ -15,18 +15,33 @@ class PublicRoomListItem extends StatelessWidget {
const PublicRoomListItem(this.publicRoomEntry, {Key key}) : super(key: key); const PublicRoomListItem(this.publicRoomEntry, {Key key}) : super(key: key);
void joinAction(BuildContext context) async { void joinAction(BuildContext context) async {
final success = await SimpleDialogs(context).tryRequestWithLoadingDialog( final success = await SimpleDialogs(context)
Matrix.of(context).client.api.joinRoom(publicRoomEntry.roomId)); .tryRequestWithLoadingDialog(_joinRoomAndWait(context));
if (success != false) { if (success != false) {
await Navigator.of(context).push( await Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
context, context,
ChatView(publicRoomEntry.roomId), ChatView(success),
), ),
); );
} }
} }
Future<String> _joinRoomAndWait(BuildContext context) async {
final roomId = await Matrix.of(context)
.client
.api
.joinRoomOrAlias(publicRoomEntry.roomId);
if (Matrix.of(context).client.getRoomById(roomId) == null) {
await Matrix.of(context)
.client
.onRoomUpdate
.stream
.firstWhere((r) => r.id == roomId);
}
return roomId;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final hasTopic = final hasTopic =
@ -43,8 +58,10 @@ class PublicRoomListItem extends StatelessWidget {
subtitle: Text( subtitle: Text(
hasTopic hasTopic
? publicRoomEntry.topic ? publicRoomEntry.topic
: L10n.of(context).countParticipants( : publicRoomEntry.numJoinedMembers == null
publicRoomEntry.numJoinedMembers?.toString() ?? '0'), ? L10n.of(context).joinRoom
: L10n.of(context).countParticipants(
publicRoomEntry.numJoinedMembers.toString()),
maxLines: 1, maxLines: 1,
), ),
onTap: () => joinAction(context), onTap: () => joinAction(context),

2
lib/l10n/l10n.dart
View File

@ -463,6 +463,8 @@ class L10n extends MatrixLocalizations {
args: [username], args: [username],
); );
String get joinRoom => Intl.message('Join room');
String get keysCached => Intl.message("Keys are cached", name: "keysCached"); String get keysCached => Intl.message("Keys are cached", name: "keysCached");
String get keysMissing => String get keysMissing =>

26
lib/views/chat_list.dart
View File

@ -390,17 +390,21 @@ class _ChatListState extends State<ChatList> {
a.lastEvent.originServerTs)); a.lastEvent.originServerTs));
return ListView.separated( return ListView.separated(
controller: _scrollController, controller: _scrollController,
separatorBuilder: separatorBuilder: (BuildContext context,
(BuildContext context, int i) => int i) =>
i == totalCount - publicRoomsCount i == totalCount - publicRoomsCount
? Material( ? ListTile(
elevation: 2, title: Text(
child: ListTile( L10n.of(context).publicRooms +
title: Text(L10n.of(context) ':',
.publicRooms), style: TextStyle(
), fontWeight: FontWeight.bold,
) color: Theme.of(context)
: Container(), .primaryColor,
),
),
)
: Container(),
itemCount: totalCount + 1, itemCount: totalCount + 1,
itemBuilder: (BuildContext context, int i) { itemBuilder: (BuildContext context, int i) {
if (i == 0) { if (i == 0) {