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

Merge branch 'krille/design-improvements' into 'master'

Browse source 
Design improvements

See merge request ChristianPauly/fluffychat-flutter!57
This commit is contained in:
Christian Pauly 2020-05-15 17:57:53 +00:00
parent c196bf28ef 37da184f8d
commit 05e1435bb4
10 changed files with 279 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lib/components/dialogs/presence_dialog.dart Normal file
View file

@ -0,0 +1,72 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/views/chat.dart';
import 'package:flutter/material.dart';
import 'package:fluffychat/utils/presence_extension.dart';
import '../avatar.dart';
import '../matrix.dart';
class PresenceDialog extends StatelessWidget {
final Uri avatarUrl;
final String displayname;
final Presence presence;
const PresenceDialog(
this.presence, {
this.avatarUrl,
this.displayname,
Key key,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return AlertDialog(
title: ListTile(
contentPadding: EdgeInsets.zero,
leading: Avatar(avatarUrl, displayname),
title: Text(displayname),
subtitle: Text(presence.sender),
),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(presence.getLocalizedStatusMessage(context)),
if (presence.presence != null)
Text(
presence.presence.toString().split('.').last,
style: TextStyle(
color: presence.currentlyActive == true
? Colors.green
: Theme.of(context).primaryColor,
),
)
],
),
actions: <Widget>[
if (presence.sender != Matrix.of(context).client.userID)
FlatButton(
child: Text(L10n.of(context).sendAMessage),
onPressed: () async {
final roomId = await User(
presence.sender,
room: Room(id: '', client: Matrix.of(context).client),
).startDirectChat();
await Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
ChatView(roomId),
),
(Route r) => r.isFirst);
},
),
FlatButton(
child: Text(L10n.of(context).close),
onPressed: () => Navigator.of(context).pop(),
),
],
);
}
}

5
lib/components/list_items/message.dart
View file

@ -9,6 +9,7 @@ import 'package:fluffychat/utils/event_extension.dart';
import 'package:fluffychat/utils/string_color.dart';
import 'package:flutter/material.dart';
import '../adaptive_page_layout.dart';
import '../avatar.dart';
import '../matrix.dart';
import 'state_message.dart';
@ -74,6 +75,9 @@ class Message extends StatelessWidget {
margin: BubbleEdges.symmetric(horizontal: 4),
color: color,
nip: nip,
child: Container(
constraints:
BoxConstraints(maxWidth: AdaptivePageLayout.defaultMinWidth),
child: Stack(
children: <Widget>[
Column(
@ -145,6 +149,7 @@ class Message extends StatelessWidget {
),
),
),
),
];
final avatarOrSizedBox = sameSender
? SizedBox(width: Avatar.defaultSize)

56
lib/components/list_items/presence_list_item.dart
View file

@ -1,12 +1,9 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/views/chat.dart';
import 'package:fluffychat/components/dialogs/presence_dialog.dart';
import 'package:flutter/material.dart';
import '../avatar.dart';
import '../matrix.dart';
import 'package:fluffychat/utils/presence_extension.dart';
class PresenceListItem extends StatelessWidget {
final Presence presence;
@ -36,52 +33,10 @@ class PresenceListItem extends StatelessWidget {
return InkWell(
onTap: () => showDialog(
context: context,
builder: (c) => AlertDialog(
title: ListTile(
contentPadding: EdgeInsets.zero,
leading: Avatar(avatarUrl, displayname),
title: Text(displayname),
subtitle: Text(presence.sender),
),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(presence.getLocalizedStatusMessage(context)),
if (presence.presence != null)
Text(
presence.presence.toString().split('.').last,
style: TextStyle(
color: presence.currentlyActive == true
? Colors.green
: Theme.of(context).primaryColor,
),
)
],
),
actions: <Widget>[
if (presence.sender != Matrix.of(context).client.userID)
FlatButton(
child: Text(L10n.of(context).sendAMessage),
onPressed: () async {
final roomId = await User(
presence.sender,
room: Room(id: '', client: Matrix.of(context).client),
).startDirectChat();
await Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
ChatView(roomId),
),
(Route r) => r.isFirst);
},
),
FlatButton(
child: Text(L10n.of(context).close),
onPressed: () => Navigator.of(context).pop(),
),
],
),
builder: (c) => PresenceDialog(
presence,
avatarUrl: avatarUrl,
displayname: displayname,
),
child: Container(
width: 80,
@ -100,6 +55,7 @@ class PresenceListItem extends StatelessWidget {
],
),
),
),
);
});
}

12
lib/l10n/intl_de.arb
View file

@ -354,6 +354,11 @@
"type": "text",
"placeholders": {}
},
"Currenlty active": "Jetzt gerade online",
"@Currenlty active": {
"type": "text",
"placeholders": {}
},
"dateAndTimeOfDay": "{date}, {timeOfDay}",
"@dateAndTimeOfDay": {
"type": "text",
@ -687,7 +692,7 @@
"username": {}
}
},
"lastActiveAgo": "Zuletzt aktiv: {localizedTimeShort}",
"lastActiveAgo": "Zuletzt gesehen: {localizedTimeShort}",
"@lastActiveAgo": {
"type": "text",
"placeholders": {
@ -997,6 +1002,11 @@
"username": {}
}
},
"Seen a long time ago": "Vor sehr langer Zeit gesehen",
"@Seen a long time ago": {
"type": "text",
"placeholders": {}
},
"seenByUserAndUser": "Gelesen von {username} und {username2}",
"@seenByUserAndUser": {
"type": "text",

12
lib/l10n/intl_messages.arb
View file

@ -1,5 +1,5 @@
{
"@@last_modified": "2020-05-12T08:42:24.358124",
"@@last_modified": "2020-05-15T15:34:50.065646",
"About": "About",
"@About": {
"type": "text",
@ -354,6 +354,11 @@
"type": "text",
"placeholders": {}
},
"Currenlty active": "Currenlty active",
"@Currenlty active": {
"type": "text",
"placeholders": {}
},
"dateAndTimeOfDay": "{date}, {timeOfDay}",
"@dateAndTimeOfDay": {
"type": "text",
@ -995,6 +1000,11 @@
"type": "text",
"placeholders": {}
},
"Seen a long time ago": "Seen a long time ago",
"@Seen a long time ago": {
"type": "text",
"placeholders": {}
},
"seenByUser": "Seen by {username}",
"@seenByUser": {
"type": "text",

4
lib/l10n/l10n.dart
View file

@ -261,6 +261,8 @@ class L10n extends MatrixLocalizations {
String get createNewGroup => Intl.message("Create new group");
String get currentlyActive => Intl.message('Currenlty active');
String dateAndTimeOfDay(String date, String timeOfDay) => Intl.message(
"$date, $timeOfDay",
name: "dateAndTimeOfDay",
@ -599,6 +601,8 @@ class L10n extends MatrixLocalizations {
String get searchForAChat => Intl.message("Search for a chat");
String get lastSeenLongTimeAgo => Intl.message('Seen a long time ago');
String seenByUser(String username) => Intl.message(
"Seen by $username",
name: "seenByUser",

4
lib/l10n/messages_de.dart
View file

@ -83,7 +83,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m31(username, targetName) => "${username} hat ${targetName} hinausgeworfen und verbannt";
static m32(localizedTimeShort) => "Zuletzt aktiv: ${localizedTimeShort}";
static m32(localizedTimeShort) => "Zuletzt gesehen: ${localizedTimeShort}";
static m33(count) => "${count} weitere Teilnehmer laden";
@ -181,6 +181,7 @@ class MessageLookup extends MessageLookupByLibrary {
"Create" : MessageLookupByLibrary.simpleMessage("Create"),
"Create account now" : MessageLookupByLibrary.simpleMessage("Account jetzt erstellen"),
"Create new group" : MessageLookupByLibrary.simpleMessage("Neue Gruppe"),
"Currenlty active" : MessageLookupByLibrary.simpleMessage("Jetzt gerade online"),
"Dark" : MessageLookupByLibrary.simpleMessage("Dunkel"),
"Delete" : MessageLookupByLibrary.simpleMessage("Löschen"),
"Delete message" : MessageLookupByLibrary.simpleMessage("Nachricht löschen"),
@ -273,6 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
"Revoke all permissions" : MessageLookupByLibrary.simpleMessage("Alle Berechtigungen zurücknehmen"),
"Saturday" : MessageLookupByLibrary.simpleMessage("Samstag"),
"Search for a chat" : MessageLookupByLibrary.simpleMessage("Durchsuche die Chats"),
"Seen a long time ago" : MessageLookupByLibrary.simpleMessage("Vor sehr langer Zeit gesehen"),
"Send" : MessageLookupByLibrary.simpleMessage("Senden"),
"Send a message" : MessageLookupByLibrary.simpleMessage("Nachricht schreiben"),
"Send file" : MessageLookupByLibrary.simpleMessage("Datei senden"),

2
lib/l10n/messages_messages.dart
View file

@ -181,6 +181,7 @@ class MessageLookup extends MessageLookupByLibrary {
"Create" : MessageLookupByLibrary.simpleMessage("Create"),
"Create account now" : MessageLookupByLibrary.simpleMessage("Create account now"),
"Create new group" : MessageLookupByLibrary.simpleMessage("Create new group"),
"Currenlty active" : MessageLookupByLibrary.simpleMessage("Currenlty active"),
"Dark" : MessageLookupByLibrary.simpleMessage("Dark"),
"Delete" : MessageLookupByLibrary.simpleMessage("Delete"),
"Delete message" : MessageLookupByLibrary.simpleMessage("Delete message"),
@ -275,6 +276,7 @@ class MessageLookup extends MessageLookupByLibrary {
"Revoke all permissions" : MessageLookupByLibrary.simpleMessage("Revoke all permissions"),
"Saturday" : MessageLookupByLibrary.simpleMessage("Saturday"),
"Search for a chat" : MessageLookupByLibrary.simpleMessage("Search for a chat"),
"Seen a long time ago" : MessageLookupByLibrary.simpleMessage("Seen a long time ago"),
"Send" : MessageLookupByLibrary.simpleMessage("Send"),
"Send a message" : MessageLookupByLibrary.simpleMessage("Send a message"),
"Send file" : MessageLookupByLibrary.simpleMessage("Send file"),

23
lib/utils/room_status_extension.dart Normal file
View file

@ -0,0 +1,23 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:flutter/widgets.dart';
import 'date_time_extension.dart';
extension RoomStatusExtension on Room {
Presence get directChatPresence => client.presences[directChatMatrixID];
String getLocalizedStatus(BuildContext context) {
if (isDirectChat) {
if (directChatPresence != null) {
if (directChatPresence.currentlyActive == true) {
return L10n.of(context).currentlyActive;
}
return L10n.of(context)
.lastActiveAgo(directChatPresence.time.localizedTimeShort(context));
}
return L10n.of(context).lastSeenLongTimeAgo;
}
return L10n.of(context).countParticipants(mJoinedMemberCount.toString());
}
}

69
lib/views/chat.dart
View file

@ -1,10 +1,13 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:file_picker/file_picker.dart';
import 'package:fluffychat/components/adaptive_page_layout.dart';
import 'package:fluffychat/components/avatar.dart';
import 'package:fluffychat/components/chat_settings_popup_menu.dart';
import 'package:fluffychat/components/dialogs/presence_dialog.dart';
import 'package:fluffychat/components/dialogs/recording_dialog.dart';
import 'package:fluffychat/components/dialogs/simple_dialogs.dart';
import 'package:fluffychat/components/encryption_button.dart';
@ -12,6 +15,8 @@ import 'package:fluffychat/components/list_items/message.dart';
import 'package:fluffychat/components/matrix.dart';
import 'package:fluffychat/components/reply_content.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/utils/room_status_extension.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -19,6 +24,7 @@ import 'package:bot_toast/bot_toast.dart';
import 'package:image_picker/image_picker.dart';
import 'package:pedantic/pedantic.dart';
import 'chat_details.dart';
import 'chat_list.dart';
import '../components/input_bar.dart';
@ -359,22 +365,44 @@ class _ChatState extends State<_Chat> {
onPressed: () => setState(() => selectedEvents.clear()),
)
: null,
titleSpacing: 0,
title: selectedEvents.isEmpty
? Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: !kIsWeb && Platform.isIOS
? CrossAxisAlignment.center
: CrossAxisAlignment.start,
? StreamBuilder<Object>(
stream: Matrix.of(context)
.client
.onPresence
.stream
.where((p) => p.sender == room.directChatMatrixID),
builder: (context, snapshot) {
return ListTile(
leading: Avatar(room.avatar, room.displayname),
contentPadding: EdgeInsets.zero,
onTap: () =>
room.isDirectChat && room.directChatPresence == null
? null
: room.isDirectChat
? showDialog(
context: context,
builder: (c) => PresenceDialog(
room.directChatPresence,
avatarUrl: room.avatar,
displayname: room.displayname,
),
)
: Navigator.of(context).push(
AppRoute.defaultRoute(
context,
ChatDetails(room),
),
),
title: Text(room.getLocalizedDisplayname(L10n.of(context))),
subtitle: typingText.isEmpty
? Text(
room.getLocalizedStatus(context),
)
: Row(
children: <Widget>[
Text(room.getLocalizedDisplayname(L10n.of(context))),
AnimatedContainer(
duration: Duration(milliseconds: 500),
height: typingText.isEmpty ? 0 : 20,
child: Row(
children: <Widget>[
typingText.isEmpty
? Container()
: Icon(Icons.edit,
Icon(Icons.edit,
color: Theme.of(context).primaryColor,
size: 13),
SizedBox(width: 4),
@ -388,9 +416,8 @@ class _ChatState extends State<_Chat> {
),
],
),
),
],
)
);
})
: Text(L10n.of(context)
.numberSelected(selectedEvents.length.toString())),
actions: selectMode
@ -456,6 +483,14 @@ class _ChatState extends State<_Chat> {
if (timeline.events.isEmpty) return Container();
return ListView.builder(
padding: EdgeInsets.symmetric(
horizontal: max(
0,
(MediaQuery.of(context).size.width -
AdaptivePageLayout.defaultMinWidth *
2) /
2),
),
reverse: true,
itemCount: timeline.events.length + 2,
controller: _scrollController,