flutter
/
flutter_app
6
1
Fork 0
Code Issues 14 Pull Requests Releases 1 Wiki Activity

add contact names to message bubbles #69

Merged
sarah merged 2 commits from displaynames into trunk 2021-05-05 23:30:51 +00:00
Conversation 2 Commits 2 Files Changed 3 +12 -3
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cwtch/cwtchNotifier.dart
View File

@ -147,7 +147,7 @@ class CwtchNotifier {
case "ServerStateChange":
print("server state change: $data");
profileCN.getProfile(data["ProfileOnion"]).contactList.contacts.forEach((contact) {
if (contact.isGroup && contact.server == data["GroupServer"]) {
if (contact.isGroup == true && contact.server == data["GroupServer"]) {
print("server state change: $data " + contact.server);
contact.status = data["ConnectionState"];
}

2
lib/views/messageview.dart
View File

@ -61,7 +61,7 @@ class _MessageViewState extends State<MessageView> {
void _pushContactSettings() {
Navigator.of(context).push(MaterialPageRoute<void>(
builder: (BuildContext bcontext) {
if (Provider.of<ContactInfoState>(context, listen: false).isGroup) {
if (Provider.of<ContactInfoState>(context, listen: false).isGroup == true) {
return MultiProvider(
providers: [ChangeNotifierProvider.value(value: Provider.of<ContactInfoState>(context))],
child: GroupSettingsView(),

11
lib/widgets/messagebubble.dart
View File

@ -25,7 +25,16 @@ class MessageBubbleState extends State<MessageBubble> {
prettyDate = DateFormat.yMd().add_jm().format(Provider.of<MessageState>(context).timestamp);
}
var wdgSender = Text(Provider.of<MessageState>(context).senderOnion ?? "",
var senderDisplayStr = "";
if (Provider.of<MessageState>(context).senderOnion != null) {
var contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageState>(context).senderOnion);
if (contact == null) {
senderDisplayStr = Provider.of<MessageState>(context).senderOnion;
} else {
senderDisplayStr = contact.nickname ?? contact.onion;
}
}
var wdgSender = SelectableText(senderDisplayStr,
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
var wdgMessage = SelectableText(