aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Crash in settings when using MAS

Browse Source
pull/1641/head
krille-chan 1 week ago
parent 7a83927833
commit 99c49e3df2
No known key found for this signature in database
3 changed files with 188 additions and 201 deletions
Show Stats Download Patch File Download Diff File

8
lib/pages/settings/settings.dart
Unescape Escape View File

@ -199,14 +199,6 @@ class SettingsController extends State<Settings> {
checkBootstrap(); checkBootstrap();
} }
Future<String?> getOidcAccountManageUrl() async {
final client = Matrix.of(context).client;
final wellKnown = client.wellKnown ?? await client.getWellknown();
return wellKnown.additionalProperties
.tryGetMap<String, Object?>('org.matrix.msc2965.authentication')
?.tryGet<String>('account');
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final client = Matrix.of(context).client; final client = Matrix.of(context).client;

379
lib/pages/settings/settings_view.dart
Unescape Escape View File

@ -25,6 +25,12 @@ class SettingsView extends StatelessWidget {
final showChatBackupBanner = controller.showChatBackupBanner; final showChatBackupBanner = controller.showChatBackupBanner;
final activeRoute = final activeRoute =
GoRouter.of(context).routeInformationProvider.value.uri.path; GoRouter.of(context).routeInformationProvider.value.uri.path;
final accountManageUrl = Matrix.of(context)
.client
.wellKnown
?.additionalProperties
.tryGetMap<String, Object?>('org.matrix.msc2965.authentication')
?.tryGet<String>('account');
return Row( return Row(
children: [ children: [
if (FluffyThemes.isColumnMode(context)) ...[ if (FluffyThemes.isColumnMode(context)) ...[
@ -52,208 +58,197 @@ class SettingsView extends StatelessWidget {
), ),
body: ListTileTheme( body: ListTileTheme(
iconColor: theme.colorScheme.onSurface, iconColor: theme.colorScheme.onSurface,
child: FutureBuilder( child: ListView(
future: controller.getOidcAccountManageUrl(), key: const Key('SettingsListViewContent'),
builder: (context, snapshot) { children: <Widget>[
final accountManageUrl = snapshot.data; FutureBuilder<Profile>(
return ListView( future: controller.profileFuture,
key: const Key('SettingsListViewContent'), builder: (context, snapshot) {
children: <Widget>[ final profile = snapshot.data;
FutureBuilder<Profile>( final mxid = Matrix.of(context).client.userID ??
future: controller.profileFuture, L10n.of(context).user;
builder: (context, snapshot) { final displayname =
final profile = snapshot.data; profile?.displayName ?? mxid.localpart ?? mxid;
final mxid = Matrix.of(context).client.userID ?? return Row(
L10n.of(context).user; children: [
final displayname = Padding(
profile?.displayName ?? mxid.localpart ?? mxid; padding: const EdgeInsets.all(32.0),
return Row( child: Stack(
children: [ children: [
Padding( Avatar(
padding: const EdgeInsets.all(32.0), mxContent: profile?.avatarUrl,
child: Stack( name: displayname,
children: [ size: Avatar.defaultSize * 2.5,
Avatar(
mxContent: profile?.avatarUrl,
name: displayname,
size: Avatar.defaultSize * 2.5,
),
if (profile != null)
Positioned(
bottom: 0,
right: 0,
child: FloatingActionButton.small(
elevation: 2,
onPressed: controller.setAvatarAction,
heroTag: null,
child: const Icon(
Icons.camera_alt_outlined,
),
),
),
],
), ),
), if (profile != null)
Expanded( Positioned(
child: Column( bottom: 0,
mainAxisAlignment: MainAxisAlignment.center, right: 0,
crossAxisAlignment: CrossAxisAlignment.start, child: FloatingActionButton.small(
children: [ elevation: 2,
TextButton.icon( onPressed: controller.setAvatarAction,
onPressed: heroTag: null,
controller.setDisplaynameAction, child: const Icon(
icon: const Icon( Icons.camera_alt_outlined,
Icons.edit_outlined,
size: 16,
),
style: TextButton.styleFrom(
foregroundColor:
theme.colorScheme.onSurface,
iconColor: theme.colorScheme.onSurface,
),
label: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
),
), ),
), ),
TextButton.icon( ),
onPressed: () => ],
FluffyShare.share(mxid, context), ),
icon: const Icon( ),
Icons.copy_outlined, Expanded(
size: 14, child: Column(
), mainAxisAlignment: MainAxisAlignment.center,
style: TextButton.styleFrom( crossAxisAlignment: CrossAxisAlignment.start,
foregroundColor: children: [
theme.colorScheme.secondary, TextButton.icon(
iconColor: theme.colorScheme.secondary, onPressed: controller.setDisplaynameAction,
), icon: const Icon(
label: Text( Icons.edit_outlined,
mxid, size: 16,
maxLines: 1, ),
overflow: TextOverflow.ellipsis, style: TextButton.styleFrom(
// style: const TextStyle(fontSize: 12), foregroundColor:
), theme.colorScheme.onSurface,
iconColor: theme.colorScheme.onSurface,
),
label: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
), ),
], ),
), ),
), TextButton.icon(
], onPressed: () =>
); FluffyShare.share(mxid, context),
}, icon: const Icon(
), Icons.copy_outlined,
if (accountManageUrl != null) size: 14,
ListTile( ),
leading: const Icon(Icons.account_circle_outlined), style: TextButton.styleFrom(
title: Text(L10n.of(context).manageAccount), foregroundColor:
trailing: const Icon(Icons.open_in_new_outlined), theme.colorScheme.secondary,
onTap: () => launchUrlString( iconColor: theme.colorScheme.secondary,
accountManageUrl, ),
mode: LaunchMode.inAppBrowserView, label: Text(
mxid,
maxLines: 1,
overflow: TextOverflow.ellipsis,
// style: const TextStyle(fontSize: 12),
),
),
],
),
), ),
), ],
Divider(color: theme.dividerColor), );
if (showChatBackupBanner == null) },
ListTile( ),
leading: const Icon(Icons.backup_outlined), if (accountManageUrl != null)
title: Text(L10n.of(context).chatBackup), ListTile(
trailing: const CircularProgressIndicator.adaptive(), leading: const Icon(Icons.account_circle_outlined),
) title: Text(L10n.of(context).manageAccount),
else trailing: const Icon(Icons.open_in_new_outlined),
SwitchListTile.adaptive( onTap: () => launchUrlString(
controlAffinity: ListTileControlAffinity.trailing, accountManageUrl,
value: controller.showChatBackupBanner == false, mode: LaunchMode.inAppBrowserView,
secondary: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
onChanged: controller.firstRunBootstrapAction,
),
Divider(
color: theme.dividerColor,
),
ListTile(
leading: const Icon(Icons.format_paint_outlined),
title: Text(L10n.of(context).changeTheme),
tileColor:
activeRoute.startsWith('/rooms/settings/style')
? theme.colorScheme.surfaceContainerHigh
: null,
onTap: () => context.go('/rooms/settings/style'),
), ),
ListTile( ),
leading: const Icon(Icons.notifications_outlined), Divider(color: theme.dividerColor),
title: Text(L10n.of(context).notifications), if (showChatBackupBanner == null)
tileColor: activeRoute ListTile(
.startsWith('/rooms/settings/notifications') leading: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
trailing: const CircularProgressIndicator.adaptive(),
)
else
SwitchListTile.adaptive(
controlAffinity: ListTileControlAffinity.trailing,
value: controller.showChatBackupBanner == false,
secondary: const Icon(Icons.backup_outlined),
title: Text(L10n.of(context).chatBackup),
onChanged: controller.firstRunBootstrapAction,
),
Divider(
color: theme.dividerColor,
),
ListTile(
leading: const Icon(Icons.format_paint_outlined),
title: Text(L10n.of(context).changeTheme),
tileColor: activeRoute.startsWith('/rooms/settings/style')
? theme.colorScheme.surfaceContainerHigh
: null,
onTap: () => context.go('/rooms/settings/style'),
),
ListTile(
leading: const Icon(Icons.notifications_outlined),
title: Text(L10n.of(context).notifications),
tileColor:
activeRoute.startsWith('/rooms/settings/notifications')
? theme.colorScheme.surfaceContainerHigh ? theme.colorScheme.surfaceContainerHigh
: null, : null,
onTap: () => onTap: () => context.go('/rooms/settings/notifications'),
context.go('/rooms/settings/notifications'), ),
), ListTile(
ListTile( leading: const Icon(Icons.devices_outlined),
leading: const Icon(Icons.devices_outlined), title: Text(L10n.of(context).devices),
title: Text(L10n.of(context).devices), onTap: () => context.go('/rooms/settings/devices'),
onTap: () => context.go('/rooms/settings/devices'), tileColor: activeRoute.startsWith('/rooms/settings/devices')
tileColor: ? theme.colorScheme.surfaceContainerHigh
activeRoute.startsWith('/rooms/settings/devices') : null,
? theme.colorScheme.surfaceContainerHigh ),
: null, ListTile(
), leading: const Icon(Icons.forum_outlined),
ListTile( title: Text(L10n.of(context).chat),
leading: const Icon(Icons.forum_outlined), onTap: () => context.go('/rooms/settings/chat'),
title: Text(L10n.of(context).chat), tileColor: activeRoute.startsWith('/rooms/settings/chat')
onTap: () => context.go('/rooms/settings/chat'), ? theme.colorScheme.surfaceContainerHigh
tileColor: : null,
activeRoute.startsWith('/rooms/settings/chat') ),
? theme.colorScheme.surfaceContainerHigh ListTile(
: null, leading: const Icon(Icons.shield_outlined),
), title: Text(L10n.of(context).security),
ListTile( onTap: () => context.go('/rooms/settings/security'),
leading: const Icon(Icons.shield_outlined), tileColor:
title: Text(L10n.of(context).security), activeRoute.startsWith('/rooms/settings/security')
onTap: () => context.go('/rooms/settings/security'), ? theme.colorScheme.surfaceContainerHigh
tileColor: : null,
activeRoute.startsWith('/rooms/settings/security') ),
? theme.colorScheme.surfaceContainerHigh Divider(color: theme.dividerColor),
: null, ListTile(
), leading: const Icon(Icons.dns_outlined),
Divider(color: theme.dividerColor), title: Text(
ListTile( L10n.of(context).aboutHomeserver(
leading: const Icon(Icons.dns_outlined), Matrix.of(context).client.userID?.domain ??
title: Text( 'homeserver',
L10n.of(context).aboutHomeserver(
Matrix.of(context).client.userID?.domain ??
'homeserver',
),
),
onTap: () => context.go('/rooms/settings/homeserver'),
tileColor:
activeRoute.startsWith('/rooms/settings/homeserver')
? theme.colorScheme.surfaceContainerHigh
: null,
),
ListTile(
leading: const Icon(Icons.privacy_tip_outlined),
title: Text(L10n.of(context).privacy),
onTap: () => launchUrlString(AppConfig.privacyUrl),
),
ListTile(
leading: const Icon(Icons.info_outline_rounded),
title: Text(L10n.of(context).about),
onTap: () => PlatformInfos.showDialog(context),
),
Divider(color: theme.dividerColor),
ListTile(
leading: const Icon(Icons.logout_outlined),
title: Text(L10n.of(context).logout),
onTap: controller.logoutAction,
), ),
], ),
); onTap: () => context.go('/rooms/settings/homeserver'),
}, tileColor:
activeRoute.startsWith('/rooms/settings/homeserver')
? theme.colorScheme.surfaceContainerHigh
: null,
),
ListTile(
leading: const Icon(Icons.privacy_tip_outlined),
title: Text(L10n.of(context).privacy),
onTap: () => launchUrlString(AppConfig.privacyUrl),
),
ListTile(
leading: const Icon(Icons.info_outline_rounded),
title: Text(L10n.of(context).about),
onTap: () => PlatformInfos.showDialog(context),
),
Divider(color: theme.dividerColor),
ListTile(
leading: const Icon(Icons.logout_outlined),
title: Text(L10n.of(context).logout),
onTap: controller.logoutAction,
),
],
), ),
), ),
), ),

2
lib/pages/settings_homeserver/settings_homeserver_view.dart
Unescape Escape View File

@ -35,7 +35,7 @@ class SettingsHomeserverView extends StatelessWidget {
), ),
), ),
body: MaxWidthBody( body: MaxWidthBody(
withScrolling: false, withScrolling: true,
child: SelectionArea( child: SelectionArea(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

Write Preview
Loading…
Cancel
Save