ThatOneJackalGuy/OpenContacts
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #16 from Nutcake/isovel/contact-status-parity

Browse source 
feat: match contact status formatting w/ Resonite
This commit is contained in:
Nutcake 2023-11-11 12:00:33 +01:00 committed by GitHub
commit 585c5fae58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/widgets/friends/friend_list_tile.dart
View file

@ -5,6 +5,7 @@ import 'package:recon/auxiliary.dart';
import 'package:recon/clients/messaging_client.dart'; import 'package:recon/clients/messaging_client.dart';
import 'package:recon/models/message.dart'; import 'package:recon/models/message.dart';
import 'package:recon/models/users/friend.dart'; import 'package:recon/models/users/friend.dart';
import 'package:recon/models/users/online_status.dart';
import 'package:recon/widgets/formatted_text.dart'; import 'package:recon/widgets/formatted_text.dart';
import 'package:recon/widgets/friends/friend_online_status_indicator.dart'; import 'package:recon/widgets/friends/friend_online_status_indicator.dart';
import 'package:recon/widgets/generic_avatar.dart'; import 'package:recon/widgets/generic_avatar.dart';
@ -58,25 +59,34 @@ class FriendListTile extends StatelessWidget {
width: 4, width: 4,
), ),
Text(toBeginningOfSentenceCase(friend.userStatus.onlineStatus.name) ?? "Unknown"), Text(toBeginningOfSentenceCase(friend.userStatus.onlineStatus.name) ?? "Unknown"),
if (currentSession != null && currentSession.isVisible) ...[ if (!(friend.userStatus.onlineStatus == OnlineStatus.offline ||
const Text(" in "), friend.userStatus.onlineStatus == OnlineStatus.invisible))
if (currentSession.name.isNotEmpty) if (currentSession != null) ...[
Expanded( const Text(" in "),
child: FormattedText( if (currentSession.name.isNotEmpty)
currentSession.formattedName, Expanded(
overflow: TextOverflow.ellipsis, child: FormattedText(
maxLines: 1, currentSession.formattedName,
), overflow: TextOverflow.ellipsis,
) maxLines: 1,
else ),
)
else
Expanded(
child: Text(
"${currentSession.accessLevel.toReadableString()} World",
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
)
] else if (friend.userStatus.appVersion.isNotEmpty)
Expanded( Expanded(
child: Text( child: Text(
"${currentSession.accessLevel.toReadableString()} session", " on version ${friend.userStatus.appVersion}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,
), ),
) ),
]
], ],
), ),
onTap: () async { onTap: () async {

5
lib/widgets/friends/friend_online_status_indicator.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:recon/models/users/online_status.dart'; import 'package:recon/models/users/online_status.dart';
import 'package:recon/models/users/user_status.dart'; import 'package:recon/models/users/user_status.dart';
import 'package:flutter/material.dart';
class FriendOnlineStatusIndicator extends StatelessWidget { class FriendOnlineStatusIndicator extends StatelessWidget {
const FriendOnlineStatusIndicator({required this.userStatus, super.key}); const FriendOnlineStatusIndicator({required this.userStatus, super.key});
@ -14,8 +14,9 @@ class FriendOnlineStatusIndicator extends StatelessWidget {
dimension: 10, dimension: 10,
child: Image.asset( child: Image.asset(
"assets/images/logo-white.png", "assets/images/logo-white.png",
alignment: Alignment.center,
color: userStatus.onlineStatus.color(context), color: userStatus.onlineStatus.color(context),
filterQuality: FilterQuality.medium,
isAntiAlias: true,
), ),
) )
: Icon( : Icon(