GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 14:59:29 +01:00
Code Issues Projects Releases Wiki Activity

feat: Display indicator for unread muted rooms

Browse Source
This commit is contained in:
Christian Pauly 2022-02-14 11:22:36 +01:00
parent be34303609
commit 3d7287993f
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/chat/chat.dart
View File

@ -224,7 +224,7 @@ class ChatController extends State<Chat> {
} }
filteredEvents = timeline!.getFilteredEvents(unfolded: unfolded); filteredEvents = timeline!.getFilteredEvents(unfolded: unfolded);
timeline!.requestKeys(); timeline!.requestKeys();
if (room!.notificationCount > 0 && if (room!.hasNewMessages &&
timeline != null && timeline != null &&
timeline!.events.isNotEmpty && timeline!.events.isNotEmpty &&
Matrix.of(context).webHasFocus) { Matrix.of(context).webHasFocus) {

17
lib/pages/chat_list/chat_list_item.dart
View File

@ -150,7 +150,7 @@ class ChatListItem extends StatelessWidget {
final ownMessage = final ownMessage =
room.lastEvent?.senderId == Matrix.of(context).client.userID; room.lastEvent?.senderId == Matrix.of(context).client.userID;
final unread = room.isUnread || room.membership == Membership.invite; final unread = room.isUnread || room.membership == Membership.invite;
final unreadBubbleSize = unread final unreadBubbleSize = unread || room.hasNewMessages
? room.notificationCount > 0 ? room.notificationCount > 0
? 20.0 ? 20.0
: 14.0 : 14.0
@ -291,15 +291,18 @@ class ChatListItem extends StatelessWidget {
curve: Curves.bounceInOut, curve: Curves.bounceInOut,
padding: const EdgeInsets.symmetric(horizontal: 7), padding: const EdgeInsets.symmetric(horizontal: 7),
height: unreadBubbleSize, height: unreadBubbleSize,
width: room.notificationCount == 0 && !unread width:
? 0 room.notificationCount == 0 && !unread && !room.hasNewMessages
: (unreadBubbleSize - 9) * ? 0
room.notificationCount.toString().length + : (unreadBubbleSize - 9) *
9, room.notificationCount.toString().length +
9,
decoration: BoxDecoration( decoration: BoxDecoration(
color: room.highlightCount > 0 color: room.highlightCount > 0
? Colors.red ? Colors.red
: Theme.of(context).primaryColor, : room.notificationCount > 0
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withAlpha(100),
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
), ),
child: Center( child: Center(

4
lib/pages/chat_list/stories_header.dart
View File

@ -132,8 +132,8 @@ class StoriesHeader extends StatelessWidget {
size: 100, size: 100,
fontSize: 24, fontSize: 24,
), ),
unread: room.notificationCount > 0 || unread: room.membership == Membership.invite ||
room.membership == Membership.invite, room.hasNewMessages,
onPressed: () => _goToStoryAction(context, room.id), onPressed: () => _goToStoryAction(context, room.id),
onLongPressed: () => _contextualActions(context, room), onLongPressed: () => _contextualActions(context, room),
), ),

2
pubspec.lock
View File

@ -832,7 +832,7 @@ packages:
name: matrix name: matrix
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.8.5" version: "0.8.6"
matrix_api_lite: matrix_api_lite:
dependency: transitive dependency: transitive
description: description:

4
pubspec.yaml
View File

@ -51,7 +51,7 @@ dependencies:
intl: any intl: any
localstorage: ^4.0.0+1 localstorage: ^4.0.0+1
lottie: ^1.2.1 lottie: ^1.2.1
matrix: ^0.8.5 matrix: ^0.8.6
matrix_link_text: ^1.0.2 matrix_link_text: ^1.0.2
open_noti_settings: ^0.4.0 open_noti_settings: ^0.4.0
package_info_plus: ^1.2.1 package_info_plus: ^1.2.1
@ -119,4 +119,4 @@ dependency_overrides:
hosted: hosted:
name: geolocator_android name: geolocator_android
url: https://hanntech-gmbh.gitlab.io/free2pass/flutter-geolocator-floss url: https://hanntech-gmbh.gitlab.io/free2pass/flutter-geolocator-floss
provider: 5.0.0 provider: 5.0.0