feat: new design
This commit is contained in:
Christian Pauly
parent
9a244a7302
commit
1d7d8dcae0
19 changed files with 3428 additions and 696 deletions
246
lib/views/home_view_parts/chat_list.dart
Normal file
246
lib/views/home_view_parts/chat_list.dart
Normal file
|
|
@ -0,0 +1,246 @@
|
|||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/components/connection_status_header.dart';
|
||||
import 'package:fluffychat/components/default_app_bar_search_field.dart';
|
||||
import 'package:fluffychat/components/list_items/chat_list_item.dart';
|
||||
import 'package:fluffychat/components/matrix.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:future_loading_dialog/future_loading_dialog.dart';
|
||||
|
||||
enum ChatListType { messages, groups, all }
|
||||
|
||||
enum SelectMode { normal, select }
|
||||
|
||||
class ChatList extends StatefulWidget {
|
||||
final String activeChat;
|
||||
final ChatListType type;
|
||||
final void Function(AppBar appBar) onCustomAppBar;
|
||||
|
||||
const ChatList({
|
||||
Key key,
|
||||
this.activeChat,
|
||||
@required this.type,
|
||||
this.onCustomAppBar,
|
||||
}) : super(key: key);
|
||||
@override
|
||||
_ChatListState createState() => _ChatListState();
|
||||
}
|
||||
|
||||
class _ChatListState extends State<ChatList> {
|
||||
bool get searchMode => searchController.text?.isNotEmpty ?? false;
|
||||
final TextEditingController searchController = TextEditingController();
|
||||
final _selectedRoomIds = <String>{};
|
||||
|
||||
void _toggleSelection(String roomId) {
|
||||
setState(() => _selectedRoomIds.contains(roomId)
|
||||
? _selectedRoomIds.remove(roomId)
|
||||
: _selectedRoomIds.add(roomId));
|
||||
widget.onCustomAppBar(
|
||||
_selectedRoomIds.isEmpty
|
||||
? null
|
||||
: AppBar(
|
||||
centerTitle: false,
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.close_outlined),
|
||||
onPressed: () {
|
||||
_selectedRoomIds.clear();
|
||||
widget.onCustomAppBar(null);
|
||||
},
|
||||
),
|
||||
title: Text(
|
||||
L10n.of(context)
|
||||
.numberSelected(_selectedRoomIds.length.toString()),
|
||||
),
|
||||
actions: [
|
||||
if (_selectedRoomIds.length == 1)
|
||||
IconButton(
|
||||
tooltip: L10n.of(context).toggleUnread,
|
||||
icon: Icon(Matrix.of(context)
|
||||
.client
|
||||
.getRoomById(_selectedRoomIds.single)
|
||||
.isUnread
|
||||
? Icons.mark_chat_read_outlined
|
||||
: Icons.mark_chat_unread_outlined),
|
||||
onPressed: () => _toggleUnread(context),
|
||||
),
|
||||
if (_selectedRoomIds.length == 1)
|
||||
IconButton(
|
||||
tooltip: L10n.of(context).toggleFavorite,
|
||||
icon: Icon(Icons.push_pin_outlined),
|
||||
onPressed: () => _toggleFavouriteRoom(context),
|
||||
),
|
||||
if (_selectedRoomIds.length == 1)
|
||||
IconButton(
|
||||
icon: Icon(Matrix.of(context)
|
||||
.client
|
||||
.getRoomById(_selectedRoomIds.single)
|
||||
.pushRuleState ==
|
||||
PushRuleState.notify
|
||||
? Icons.notifications_off_outlined
|
||||
: Icons.notifications_outlined),
|
||||
tooltip: L10n.of(context).toggleMuted,
|
||||
onPressed: () => _toggleMuted(context),
|
||||
),
|
||||
IconButton(
|
||||
icon: Icon(Icons.archive_outlined),
|
||||
tooltip: L10n.of(context).archive,
|
||||
onPressed: () => _archiveAction(context),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _toggleUnread(BuildContext context) {
|
||||
final room = Matrix.of(context).client.getRoomById(_selectedRoomIds.single);
|
||||
return showFutureLoadingDialog(
|
||||
context: context,
|
||||
future: () => room.setUnread(!room.isUnread),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _toggleFavouriteRoom(BuildContext context) {
|
||||
final room = Matrix.of(context).client.getRoomById(_selectedRoomIds.single);
|
||||
return showFutureLoadingDialog(
|
||||
context: context,
|
||||
future: () => room.setFavourite(!room.isFavourite),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _toggleMuted(BuildContext context) {
|
||||
final room = Matrix.of(context).client.getRoomById(_selectedRoomIds.single);
|
||||
return showFutureLoadingDialog(
|
||||
context: context,
|
||||
future: () => room.setPushRuleState(
|
||||
room.pushRuleState == PushRuleState.notify
|
||||
? PushRuleState.mentions_only
|
||||
: PushRuleState.notify),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _archiveAction(BuildContext context) async {
|
||||
final confirmed = await showOkCancelAlertDialog(
|
||||
context: context,
|
||||
title: L10n.of(context).areYouSure,
|
||||
) ==
|
||||
OkCancelResult.ok;
|
||||
if (!confirmed) return;
|
||||
await showFutureLoadingDialog(
|
||||
context: context,
|
||||
future: () => _archiveSelectedRooms(context),
|
||||
);
|
||||
setState(() => null);
|
||||
}
|
||||
|
||||
Future<void> _archiveSelectedRooms(BuildContext context) async {
|
||||
final client = Matrix.of(context).client;
|
||||
while (_selectedRoomIds.isNotEmpty) {
|
||||
final roomId = _selectedRoomIds.first;
|
||||
await client.getRoomById(roomId).leave();
|
||||
_toggleSelection(roomId);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> waitForFirstSync(BuildContext context) async {
|
||||
var client = Matrix.of(context).client;
|
||||
if (client.prevBatch?.isEmpty ?? true) {
|
||||
await client.onFirstSync.stream.first;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final selectMode =
|
||||
_selectedRoomIds.isEmpty ? SelectMode.normal : SelectMode.select;
|
||||
return Column(children: [
|
||||
ConnectionStatusHeader(),
|
||||
Expanded(
|
||||
child: StreamBuilder(
|
||||
stream: Matrix.of(context)
|
||||
.client
|
||||
.onSync
|
||||
.stream
|
||||
.where((s) => s.hasRoomUpdate),
|
||||
builder: (context, snapshot) {
|
||||
return FutureBuilder<void>(
|
||||
future: waitForFirstSync(context),
|
||||
builder: (BuildContext context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
var rooms =
|
||||
List<Room>.from(Matrix.of(context).client.rooms);
|
||||
rooms.removeWhere((room) =>
|
||||
room.lastEvent == null ||
|
||||
(searchMode &&
|
||||
!room.displayname.toLowerCase().contains(
|
||||
searchController.text.toLowerCase() ?? '')));
|
||||
if (widget.type == ChatListType.messages) {
|
||||
rooms.removeWhere((room) => !room.isDirectChat);
|
||||
} else if (widget.type == ChatListType.groups) {
|
||||
rooms.removeWhere((room) => room.isDirectChat);
|
||||
}
|
||||
if (rooms.isEmpty && (!searchMode)) {
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Icon(
|
||||
searchMode
|
||||
? Icons.search_outlined
|
||||
: Icons.maps_ugc_outlined,
|
||||
size: 80,
|
||||
color: Colors.grey,
|
||||
),
|
||||
Text(
|
||||
searchMode
|
||||
? L10n.of(context).noRoomsFound
|
||||
: L10n.of(context).startYourFirstChat,
|
||||
style: TextStyle(
|
||||
color: Colors.grey,
|
||||
fontSize: 16,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
final totalCount = rooms.length;
|
||||
return ListView.builder(
|
||||
itemCount: totalCount + 1,
|
||||
itemBuilder: (BuildContext context, int i) => i == 0
|
||||
? Padding(
|
||||
padding: EdgeInsets.all(12),
|
||||
child: DefaultAppBarSearchField(
|
||||
hintText: L10n.of(context).search,
|
||||
prefixIcon: Icon(Icons.search_outlined),
|
||||
searchController: searchController,
|
||||
onChanged: (_) => setState(() => null),
|
||||
padding: EdgeInsets.zero,
|
||||
),
|
||||
)
|
||||
: ChatListItem(
|
||||
rooms[i - 1],
|
||||
selected:
|
||||
_selectedRoomIds.contains(rooms[i - 1].id),
|
||||
onTap: selectMode == SelectMode.select &&
|
||||
widget.onCustomAppBar != null
|
||||
? () => _toggleSelection(rooms[i - 1].id)
|
||||
: null,
|
||||
onLongPress: widget.onCustomAppBar != null
|
||||
? () => _toggleSelection(rooms[i - 1].id)
|
||||
: null,
|
||||
activeChat: widget.activeChat == rooms[i - 1].id,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
}),
|
||||
),
|
||||
]);
|
||||
}
|
||||
}
|
||||
215
lib/views/home_view_parts/discover.dart
Normal file
215
lib/views/home_view_parts/discover.dart
Normal file
|
|
@ -0,0 +1,215 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||
import 'package:adaptive_page_layout/adaptive_page_layout.dart';
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/components/avatar.dart';
|
||||
import 'package:fluffychat/components/default_app_bar_search_field.dart';
|
||||
import 'package:future_loading_dialog/future_loading_dialog.dart';
|
||||
import 'package:fluffychat/components/matrix.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
|
||||
class Discover extends StatefulWidget {
|
||||
final String alias;
|
||||
|
||||
final String server;
|
||||
|
||||
const Discover({
|
||||
Key key,
|
||||
this.alias,
|
||||
this.server,
|
||||
}) : super(key: key);
|
||||
@override
|
||||
_DiscoverState createState() => _DiscoverState();
|
||||
}
|
||||
|
||||
class _DiscoverState extends State<Discover> {
|
||||
Future<PublicRoomsResponse> _publicRoomsResponse;
|
||||
Timer _coolDown;
|
||||
String _genericSearchTerm;
|
||||
|
||||
void _search(BuildContext context, String query) async {
|
||||
_coolDown?.cancel();
|
||||
_coolDown = Timer(
|
||||
Duration(milliseconds: 500),
|
||||
() => setState(() {
|
||||
_genericSearchTerm = query;
|
||||
_publicRoomsResponse = null;
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
Future<String> _joinRoomAndWait(
|
||||
BuildContext context,
|
||||
String roomId,
|
||||
String alias,
|
||||
) async {
|
||||
if (Matrix.of(context).client.getRoomById(roomId) != null) {
|
||||
return roomId;
|
||||
}
|
||||
final newRoomId = await Matrix.of(context)
|
||||
.client
|
||||
.joinRoomOrAlias(alias?.isNotEmpty ?? false ? alias : roomId);
|
||||
await Matrix.of(context)
|
||||
.client
|
||||
.onRoomUpdate
|
||||
.stream
|
||||
.firstWhere((r) => r.id == newRoomId);
|
||||
return newRoomId;
|
||||
}
|
||||
|
||||
void _joinGroupAction(BuildContext context, PublicRoom room) async {
|
||||
if (await showOkCancelAlertDialog(
|
||||
context: context,
|
||||
okLabel: L10n.of(context).joinRoom,
|
||||
title: '${room.name} (${room.numJoinedMembers ?? 0})',
|
||||
message: room.topic ?? L10n.of(context).noDescription,
|
||||
) ==
|
||||
OkCancelResult.cancel) {
|
||||
return;
|
||||
}
|
||||
final success = await showFutureLoadingDialog(
|
||||
context: context,
|
||||
future: () => _joinRoomAndWait(
|
||||
context,
|
||||
room.roomId,
|
||||
room.canonicalAlias ?? room.aliases.first,
|
||||
),
|
||||
);
|
||||
if (success.error == null) {
|
||||
await AdaptivePageLayout.of(context)
|
||||
.pushNamedAndRemoveUntilIsFirst('/rooms/${success.result}');
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
_genericSearchTerm = widget.alias;
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final server = _genericSearchTerm?.isValidMatrixId ?? false
|
||||
? _genericSearchTerm.domain
|
||||
: widget.server;
|
||||
_publicRoomsResponse ??= Matrix.of(context)
|
||||
.client
|
||||
.searchPublicRooms(
|
||||
server: server,
|
||||
genericSearchTerm: _genericSearchTerm,
|
||||
)
|
||||
.catchError((error) {
|
||||
if (widget.alias == null) {
|
||||
throw error;
|
||||
}
|
||||
return PublicRoomsResponse.fromJson({
|
||||
'chunk': [],
|
||||
});
|
||||
}).then((PublicRoomsResponse res) {
|
||||
if (widget.alias != null &&
|
||||
!res.chunk.any((room) =>
|
||||
room.aliases.contains(widget.alias) ||
|
||||
room.canonicalAlias == widget.alias)) {
|
||||
// we have to tack on the original alias
|
||||
res.chunk.add(PublicRoom.fromJson(<String, dynamic>{
|
||||
'aliases': [widget.alias],
|
||||
'name': widget.alias,
|
||||
}));
|
||||
}
|
||||
return res;
|
||||
});
|
||||
return ListView(
|
||||
children: [
|
||||
Padding(
|
||||
padding: EdgeInsets.all(12),
|
||||
child: DefaultAppBarSearchField(
|
||||
hintText: L10n.of(context).search,
|
||||
prefixIcon: Icon(Icons.search_outlined),
|
||||
onChanged: (t) => _search(context, t),
|
||||
padding: EdgeInsets.zero,
|
||||
),
|
||||
),
|
||||
FutureBuilder<PublicRoomsResponse>(
|
||||
future: _publicRoomsResponse,
|
||||
builder: (BuildContext context,
|
||||
AsyncSnapshot<PublicRoomsResponse> snapshot) {
|
||||
if (snapshot.hasError) {
|
||||
return Center(child: Text(snapshot.error.toString()));
|
||||
}
|
||||
if (snapshot.connectionState != ConnectionState.done) {
|
||||
return Center(child: CircularProgressIndicator());
|
||||
}
|
||||
final publicRoomsResponse = snapshot.data;
|
||||
if (publicRoomsResponse.chunk.isEmpty) {
|
||||
return Center(
|
||||
child: Text(
|
||||
'No public groups found...',
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
);
|
||||
}
|
||||
return GridView.builder(
|
||||
shrinkWrap: true,
|
||||
padding: EdgeInsets.all(12),
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: 2,
|
||||
childAspectRatio: 1,
|
||||
crossAxisSpacing: 16,
|
||||
mainAxisSpacing: 16,
|
||||
),
|
||||
itemCount: publicRoomsResponse.chunk.length,
|
||||
itemBuilder: (BuildContext context, int i) => Material(
|
||||
elevation: 2,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: InkWell(
|
||||
onTap: () => _joinGroupAction(
|
||||
context,
|
||||
publicRoomsResponse.chunk[i],
|
||||
),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Avatar(
|
||||
Uri.parse(
|
||||
publicRoomsResponse.chunk[i].avatarUrl ?? ''),
|
||||
publicRoomsResponse.chunk[i].name),
|
||||
Text(
|
||||
publicRoomsResponse.chunk[i].name,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
maxLines: 1,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
Text(
|
||||
L10n.of(context).countParticipants(
|
||||
publicRoomsResponse.chunk[i].numJoinedMembers ??
|
||||
0),
|
||||
style: TextStyle(fontSize: 10.5),
|
||||
maxLines: 1,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
Text(
|
||||
publicRoomsResponse.chunk[i].topic ??
|
||||
L10n.of(context).noDescription,
|
||||
maxLines: 4,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
67
lib/views/home_view_parts/status_list.dart
Normal file
67
lib/views/home_view_parts/status_list.dart
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
import 'package:fluffychat/components/list_items/status_list_tile.dart';
|
||||
import 'package:fluffychat/components/matrix.dart';
|
||||
import 'package:fluffychat/utils/status.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class StatusList extends StatefulWidget {
|
||||
const StatusList({Key key}) : super(key: key);
|
||||
@override
|
||||
_StatusListState createState() => _StatusListState();
|
||||
}
|
||||
|
||||
class _StatusListState extends State<StatusList> {
|
||||
bool _onlyContacts = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListView(children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
RaisedButton(
|
||||
elevation: _onlyContacts ? 7 : null,
|
||||
color: !_onlyContacts ? null : Theme.of(context).primaryColor,
|
||||
child: Text(
|
||||
'Contacts',
|
||||
style: TextStyle(color: _onlyContacts ? Colors.white : null),
|
||||
),
|
||||
onPressed: () => setState(() => _onlyContacts = true),
|
||||
),
|
||||
RaisedButton(
|
||||
elevation: !_onlyContacts ? 7 : null,
|
||||
color: _onlyContacts ? null : Theme.of(context).primaryColor,
|
||||
child: Text(
|
||||
'All',
|
||||
style: TextStyle(color: !_onlyContacts ? Colors.white : null),
|
||||
),
|
||||
onPressed: () => setState(() => _onlyContacts = false),
|
||||
),
|
||||
],
|
||||
),
|
||||
Divider(height: 1),
|
||||
StreamBuilder<Object>(
|
||||
stream: Matrix.of(context)
|
||||
.client
|
||||
.onAccountData
|
||||
.stream
|
||||
.where((a) => a.type == Status.namespace),
|
||||
builder: (context, snapshot) {
|
||||
final statuses = Matrix.of(context).statuses.values.toList()
|
||||
..sort((a, b) => b.dateTime.compareTo(a.dateTime));
|
||||
if (_onlyContacts) {
|
||||
final client = Matrix.of(context).client;
|
||||
statuses.removeWhere(
|
||||
(p) => client.getDirectChatFromUserId(p.senderId) == null);
|
||||
}
|
||||
return ListView.separated(
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
shrinkWrap: true,
|
||||
padding: EdgeInsets.only(bottom: 24),
|
||||
separatorBuilder: (_, __) => Divider(height: 1),
|
||||
itemCount: statuses.length,
|
||||
itemBuilder: (context, i) => StatusListTile(status: statuses[i]),
|
||||
);
|
||||
}),
|
||||
]);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue