2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Adjust design of navrail

Browse source
This commit is contained in:
Christian Kußowski 2026-02-15 10:34:03 +01:00
commit 727e442c94
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
6 changed files with 226 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/config/routes.dart
View file

@ -197,6 +197,7 @@ abstract class AppRoutes {
? TwoColumnLayout(
mainView: Settings(key: state.pageKey),
sideView: child,
hasNavigationRail: false,
)
: child,
),

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

@ -1,11 +1,9 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat_list/chat_list.dart';
import 'package:fluffychat/pages/chat_list/start_chat_fab.dart';
import 'package:fluffychat/widgets/navigation_rail.dart';
import 'chat_list_body.dart';
@ -48,16 +46,10 @@ class ChatListView extends StatelessWidget {
child: Scaffold(
body: ChatListViewBody(controller),
floatingActionButton:
!controller.isSearchMode && controller.activeSpaceId == null
? FloatingActionButton(
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Theme.of(
context,
).colorScheme.onPrimary,
onPressed: () => context.go('/rooms/newprivatechat'),
tooltip: L10n.of(context).newChat,
child: const Icon(Icons.edit_square),
)
!controller.isSearchMode &&
controller.activeSpaceId == null &&
!FluffyThemes.isColumnMode(context)
? StartChatFab()
: const SizedBox.shrink(),
),
),

21
lib/pages/chat_list/start_chat_fab.dart Normal file
View file

@ -0,0 +1,21 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:fluffychat/l10n/l10n.dart';
class StartChatFab extends StatelessWidget {
const StartChatFab({super.key});
@override
Widget build(BuildContext context) {
return FloatingActionButton(
heroTag: 'start_chat_fab',
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Theme.of(context).colorScheme.onPrimary,
onPressed: () => context.go('/rooms/newprivatechat'),
tooltip: L10n.of(context).newChat,
child: const Icon(Icons.edit_square),
);
}
}

67
lib/pages/settings/settings_view.dart
View file

@ -6,13 +6,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/fluffy_share.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/navigation_rail.dart';
import '../../widgets/mxc_image_viewer.dart';
import 'settings.dart';
@ -29,21 +27,8 @@ class SettingsView extends StatelessWidget {
context,
).routeInformationProvider.value.uri.path;
return Row(
children: [
if (FluffyThemes.isColumnMode(context)) ...[
SpacesNavigationRail(
activeSpaceId: null,
onGoToChats: () => context.go('/rooms'),
onGoToSpaceId: (spaceId) => context.go('/rooms?spaceId=$spaceId'),
),
Container(color: Theme.of(context).dividerColor, width: 1),
],
Expanded(
child: Scaffold(
appBar: FluffyThemes.isColumnMode(context)
? null
: AppBar(
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context).settings),
leading: Center(
child: BackButton(onPressed: () => context.go('/rooms')),
@ -60,8 +45,7 @@ class SettingsView extends StatelessWidget {
final profile = snapshot.data;
final avatar = profile?.avatarUrl;
final mxid =
Matrix.of(context).client.userID ??
L10n.of(context).user;
Matrix.of(context).client.userID ?? L10n.of(context).user;
final displayname =
profile?.displayName ?? mxid.localpart ?? mxid;
return Row(
@ -77,8 +61,7 @@ class SettingsView extends StatelessWidget {
onTap: avatar != null
? () => showDialog(
context: context,
builder: (_) =>
MxcImageViewer(avatar),
builder: (_) => MxcImageViewer(avatar),
)
: null,
),
@ -90,9 +73,7 @@ class SettingsView extends StatelessWidget {
elevation: 2,
onPressed: controller.setAvatarAction,
heroTag: null,
child: const Icon(
Icons.camera_alt_outlined,
),
child: const Icon(Icons.camera_alt_outlined),
),
),
],
@ -105,13 +86,9 @@ class SettingsView extends StatelessWidget {
children: [
TextButton.icon(
onPressed: controller.setDisplaynameAction,
icon: const Icon(
Icons.edit_outlined,
size: 16,
),
icon: const Icon(Icons.edit_outlined, size: 16),
style: TextButton.styleFrom(
foregroundColor:
theme.colorScheme.onSurface,
foregroundColor: theme.colorScheme.onSurface,
iconColor: theme.colorScheme.onSurface,
),
label: Text(
@ -122,15 +99,10 @@ class SettingsView extends StatelessWidget {
),
),
TextButton.icon(
onPressed: () =>
FluffyShare.share(mxid, context),
icon: const Icon(
Icons.copy_outlined,
size: 14,
),
onPressed: () => FluffyShare.share(mxid, context),
icon: const Icon(Icons.copy_outlined, size: 14),
style: TextButton.styleFrom(
foregroundColor:
theme.colorScheme.secondary,
foregroundColor: theme.colorScheme.secondary,
iconColor: theme.colorScheme.secondary,
),
label: Text(
@ -150,9 +122,7 @@ class SettingsView extends StatelessWidget {
FutureBuilder(
future: Matrix.of(context).client.getWellknown(),
builder: (context, snapshot) {
final accountManageUrl = snapshot
.data
?.additionalProperties
final accountManageUrl = snapshot.data?.additionalProperties
.tryGetMap<String, Object?>(
'org.matrix.msc2965.authentication',
)
@ -198,8 +168,7 @@ class SettingsView extends StatelessWidget {
ListTile(
leading: const Icon(Icons.notifications_outlined),
title: Text(L10n.of(context).notifications),
tileColor:
activeRoute.startsWith('/rooms/settings/notifications')
tileColor: activeRoute.startsWith('/rooms/settings/notifications')
? theme.colorScheme.surfaceContainerHigh
: null,
onTap: () => context.go('/rooms/settings/notifications'),
@ -224,8 +193,7 @@ class SettingsView extends StatelessWidget {
leading: const Icon(Icons.shield_outlined),
title: Text(L10n.of(context).security),
onTap: () => context.go('/rooms/settings/security'),
tileColor:
activeRoute.startsWith('/rooms/settings/security')
tileColor: activeRoute.startsWith('/rooms/settings/security')
? theme.colorScheme.surfaceContainerHigh
: null,
),
@ -234,13 +202,11 @@ class SettingsView extends StatelessWidget {
leading: const Icon(Icons.dns_outlined),
title: Text(
L10n.of(context).aboutHomeserver(
Matrix.of(context).client.userID?.domain ??
'homeserver',
Matrix.of(context).client.userID?.domain ?? 'homeserver',
),
),
onTap: () => context.go('/rooms/settings/homeserver'),
tileColor:
activeRoute.startsWith('/rooms/settings/homeserver')
tileColor: activeRoute.startsWith('/rooms/settings/homeserver')
? theme.colorScheme.surfaceContainerHigh
: null,
),
@ -263,9 +229,6 @@ class SettingsView extends StatelessWidget {
],
),
),
),
),
],
);
}
}

6
lib/widgets/layouts/two_column_layout.dart
View file

@ -5,11 +5,13 @@ import 'package:fluffychat/config/themes.dart';
class TwoColumnLayout extends StatelessWidget {
final Widget mainView;
final Widget sideView;
final bool hasNavigationRail;
const TwoColumnLayout({
super.key,
required this.mainView,
required this.sideView,
this.hasNavigationRail = true,
});
@override
Widget build(BuildContext context) {
@ -22,7 +24,9 @@ class TwoColumnLayout extends StatelessWidget {
Container(
clipBehavior: Clip.antiAlias,
decoration: const BoxDecoration(),
width: FluffyThemes.columnWidth + FluffyThemes.navRailWidth,
width:
FluffyThemes.columnWidth +
(hasNavigationRail ? FluffyThemes.navRailWidth : 0),
child: mainView,
),
Container(width: 1.0, color: theme.dividerColor),

21
lib/widgets/navigation_rail.dart
View file

@ -7,6 +7,7 @@ import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat_list/navi_rail_item.dart';
import 'package:fluffychat/pages/chat_list/start_chat_fab.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/stream_extension.dart';
import 'package:fluffychat/widgets/avatar.dart';
@ -27,9 +28,6 @@ class SpacesNavigationRail extends StatelessWidget {
@override
Widget build(BuildContext context) {
final client = Matrix.of(context).client;
final isSettings = GoRouter.of(
context,
).routeInformationProvider.value.uri.path.startsWith('/rooms/settings');
return Material(
child: SafeArea(
child: StreamBuilder(
@ -55,7 +53,7 @@ class SpacesNavigationRail extends StatelessWidget {
itemBuilder: (context, i) {
if (i == 0) {
return NaviRailItem(
isSelected: activeSpaceId == null && !isSettings,
isSelected: activeSpaceId == null,
onTap: onGoToChats,
icon: const Padding(
padding: EdgeInsets.all(10.0),
@ -110,18 +108,9 @@ class SpacesNavigationRail extends StatelessWidget {
},
),
),
NaviRailItem(
isSelected: isSettings,
onTap: () => context.go('/rooms/settings'),
icon: const Padding(
padding: EdgeInsets.all(10.0),
child: Icon(Icons.settings_outlined),
),
selectedIcon: const Padding(
padding: EdgeInsets.all(10.0),
child: Icon(Icons.settings),
),
toolTip: L10n.of(context).settings,
Padding(
padding: const EdgeInsets.all(12.0),
child: StartChatFab(),
),
],
),