ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fluffychat merge

Browse source
This commit is contained in:
ggurdin 2025-06-10 10:21:14 -04:00
commit 6d420b6f4a
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
7 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/config/app_config.dart
View file

@ -140,9 +140,7 @@ abstract class AppConfig {
static bool swipeRightToLeftToReply = true;
static bool? sendOnEnter;
static bool showPresences = true;
// #Pangea
static bool displayNavigationRail = true;
// Pangea#
static bool displayNavigationRail = false;
static bool experimentalVoip = false;
static const bool hideTypingUsernames = false;
static const bool hideAllStateEvents = false;

2
lib/config/setting_keys.dart
View file

@ -32,10 +32,8 @@ abstract class SettingKeys {
'chat.fluffy.swipeRightToLeftToReply';
static const String experimentalVoip = 'chat.fluffy.experimental_voip';
static const String showPresences = 'chat.fluffy.show_presences';
// #Pangea
static const String displayNavigationRail =
'chat.fluffy.display_navigation_rail';
// Pangea#
}
enum AppSettings<T> {

3
lib/l10n/intl_en.arb
View file

@ -4928,9 +4928,6 @@
"ban": "Ban",
"unban": "Unban",
"kick": "Kick",
"approve": "Approve",
"youHaveKnocked": "You have knocked",
"pleaseWaitUntilInvited": "Please wait now, until someone from the room invites you.",
"lemma": "Lemma",
"grammarFeature": "Grammar feature",
"grammarTag": "Grammar tag",

9
lib/pages/chat_list/chat_list_body.dart
View file

@ -183,9 +183,11 @@ class ChatListViewBody extends StatelessWidget {
// ActiveFilter.messages
// else
// ActiveFilter.allChats,
// ActiveFilter.groups,
// ActiveFilter.unread,
// if (spaceDelegateCandidates.isNotEmpty &&
// !controller.widget.displayNavigationRail)
// !AppConfig.displayNavigationRail &&
// !FluffyThemes.isColumnMode(context))
// ActiveFilter.spaces,
// ]
// .map(
@ -197,9 +199,8 @@ class ChatListViewBody extends StatelessWidget {
// selected: filter == controller.activeFilter,
// onSelected: (_) =>
// controller.setActiveFilter(filter),
// label: Text(
// filter.toLocalizedString(context),
// ),
// label:
// Text(filter.toLocalizedString(context)),
// ),
// ),
// )

4
lib/pages/chat_list/chat_list_view.dart
View file

@ -33,12 +33,8 @@ class ChatListView extends StatelessWidget {
},
child: Row(
children: [
// #Pangea
// if (FluffyThemes.isColumnMode(context) &&
// controller.widget.displayNavigationRail) ...[
if (FluffyThemes.isColumnMode(context) ||
AppConfig.displayNavigationRail) ...[
// Pangea#
SpacesNavigationRail(
activeSpaceId: controller.activeSpaceId,
onGoToChats: controller.clearActiveSpace,

5
lib/pages/chat_list/navi_rail_item.dart
View file

@ -62,14 +62,11 @@ class NaviRailItem extends StatelessWidget {
bottom: 8,
left: 0,
child: AnimatedContainer(
// #Pangea
// width: isSelected ? 8 : 0,
width: isSelected
? isColumnMode
? FluffyThemes.isColumnMode(context)
? 8
: 4
: 0,
// Pangea#
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
decoration: BoxDecoration(

2
lib/widgets/matrix.dart
View file

@ -489,11 +489,9 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
AppConfig.showPresences =
store.getBool(SettingKeys.showPresences) ?? AppConfig.showPresences;
// #Pangea
AppConfig.displayNavigationRail =
store.getBool(SettingKeys.displayNavigationRail) ??
AppConfig.displayNavigationRail;
// Pangea#
}
@override