chore: Always show filter for messages
This commit is contained in:
parent
f31887b6d2
commit
e40d9b5df2
6 changed files with 13 additions and 20 deletions
|
|
@ -32,7 +32,6 @@ enum AppSettings<T> {
|
|||
fontSizeFactor<double>('chat.fluffy.font_size_factor', 1.0),
|
||||
hideRedactedEvents<bool>('chat.fluffy.hideRedactedEvents', false),
|
||||
hideUnknownEvents<bool>('chat.fluffy.hideUnknownEvents', true),
|
||||
separateChatTypes<bool>('chat.fluffy.separateChatTypes', false),
|
||||
autoplayImages<bool>('chat.fluffy.autoplay_images', true),
|
||||
sendTypingNotifications<bool>('chat.fluffy.send_typing_notifications', true),
|
||||
sendPublicReadReceipts<bool>('chat.fluffy.send_public_read_receipts', true),
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
|
|||
await client.accountDataLoading;
|
||||
await client.userDeviceKeysLoading;
|
||||
while (client.prevBatch == null) {
|
||||
await client.onSync.stream.first;
|
||||
await client.onSyncStatus.stream.first;
|
||||
}
|
||||
await client.updateUserDeviceKeys();
|
||||
_wipe = wipe;
|
||||
|
|
|
|||
|
|
@ -374,9 +374,7 @@ class ChatListController extends State<ChatList>
|
|||
|
||||
@override
|
||||
void initState() {
|
||||
activeFilter = AppSettings.separateChatTypes.value
|
||||
? ActiveFilter.messages
|
||||
: ActiveFilter.allChats;
|
||||
activeFilter = ActiveFilter.allChats;
|
||||
_initReceiveSharingIntent();
|
||||
_activeSpaceId = widget.activeSpace;
|
||||
|
||||
|
|
|
|||
|
|
@ -140,18 +140,17 @@ class ChatListViewBody extends StatelessWidget {
|
|||
scrollDirection: Axis.horizontal,
|
||||
children:
|
||||
[
|
||||
if (AppSettings.separateChatTypes.value)
|
||||
ActiveFilter.messages
|
||||
else
|
||||
ActiveFilter.allChats,
|
||||
ActiveFilter.groups,
|
||||
ActiveFilter.unread,
|
||||
ActiveFilter.allChats,
|
||||
|
||||
if (spaceDelegateCandidates.isNotEmpty &&
|
||||
!AppSettings
|
||||
.displayNavigationRail
|
||||
.value &&
|
||||
!FluffyThemes.isColumnMode(context))
|
||||
ActiveFilter.spaces,
|
||||
ActiveFilter.unread,
|
||||
ActiveFilter.groups,
|
||||
ActiveFilter.messages,
|
||||
]
|
||||
.map(
|
||||
(filter) => Padding(
|
||||
|
|
|
|||
|
|
@ -349,10 +349,6 @@ class SettingsStyleView extends StatelessWidget {
|
|||
title: L10n.of(context).presencesToggle,
|
||||
setting: AppSettings.showPresences,
|
||||
),
|
||||
SettingsSwitchListTile.adaptive(
|
||||
title: L10n.of(context).separateChatTypes,
|
||||
setting: AppSettings.separateChatTypes,
|
||||
),
|
||||
SettingsSwitchListTile.adaptive(
|
||||
title: L10n.of(context).displayNavigationRail,
|
||||
setting: AppSettings.displayNavigationRail,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue