Compare commits

..
3 changed files with 91 additions and 57 deletions

View file

@ -10,6 +10,7 @@ import "package:nexus/controllers/client.dart";
import "package:nexus/controllers/client_state.dart";
import "package:nexus/controllers/settings.dart";
import "package:nexus/controllers/unified_push.dart";
import "package:nexus/controllers/spec_versions.dart";
import "package:nexus/models/account_data.dart";
import "package:nexus/models/settings_category.dart";
import "package:nexus/main.dart";
@ -20,9 +21,6 @@ class SettingsSectionsController
@override
Future<IMap<String, IList<SettingsCategory>>> build() async {
final settings = await ref.watch(SettingsController.provider.future);
final specVersionsResponse = await ref
.watch(ClientController.provider.notifier)
.getSpecVersions();
return .new({
"General": .new([
@ -52,6 +50,7 @@ class SettingsSectionsController
title: "Use Dynamic Theme",
icon: Icons.palette,
description: "Toggle on or off Dynamic Theme. Only available on Android, Linux, Windows, or MacOS.",
description: "Toggle on or off Dynamic Theme. Only available on Android, Linux, Windows, or MacOS.",
builder: (title, description, icon) => SwitchListTile(
title: Text(title),
subtitle: Text(description),
@ -78,6 +77,7 @@ class SettingsSectionsController
.new(
title: "Linux Mobile Mode",
description: "Enables some fixes for Linux mobile, e.g. disabling dragging appbar for moving window.",
description: "Enables some fixes for Linux mobile, e.g. disabling dragging appbar for moving window.",
icon: Icons.construction,
builder: (title, description, icon) => SwitchListTile(
title: Text(title),
@ -145,9 +145,13 @@ class SettingsSectionsController
.new(
title: "Invite Blocking",
description: "Block invites, either completely, or block only invites from users without shared private rooms (depends on server support).",
description: "Block invites, either completely, or block only invites from users without shared private rooms (depends on server support).",
builder: (title, description, icon) => Consumer(
builder: (context, ref, _) =>
DialogListTile<DefaultInviteAction>(
builder: (context, ref, _) {
final specVersionsResponse = ref.watch(
SpecVersionsController.provider,
);
return DialogListTile<DefaultInviteAction>(
icon: Icon(icon),
title: title,
subtitle: Text(description),
@ -155,7 +159,11 @@ class SettingsSectionsController
.watch(AccountDataController.provider)
.invitePermissionConfig
.defaultAction,
options: specVersionsResponse.unstableFeatures.msc4494
options:
specVersionsResponse.maybeWhen(
data: (data) => data.unstableFeatures.msc4494,
orElse: () => true,
)
? DefaultInviteAction.values
: IList(DefaultInviteAction.values)
.remove(.denyPublic)
@ -165,7 +173,9 @@ class SettingsSectionsController
.deny => "Deny",
.denyPublic => "Deny public",
},
onChanged: (value) => ref
onChanged: specVersionsResponse.maybeWhen(
data: (_) =>
(value) => ref
.watch(ClientController.provider.notifier)
.setAccountData(
.new(
@ -176,7 +186,10 @@ class SettingsSectionsController
),
)
.onError(showError),
orElse: () => null,
),
);
},
),
icon: Icons.person_off,
),
@ -197,6 +210,8 @@ class SettingsSectionsController
onPressed: () async {
Navigator.of(context)
.popUntil((route) => route.isFirst);
Navigator.of(context)
.popUntil((route) => route.isFirst);
await WidgetsBinding.instance.endOfFrame;

View file

@ -0,0 +1,15 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/models/spec_versions_response.dart";
class SpecVersionsController extends AsyncNotifier<SpecVersionsResponse> {
@override
Future<SpecVersionsResponse> build() =>
ref.watch(ClientController.provider.notifier).getSpecVersions();
static final provider =
AsyncNotifierProvider.autoDispose<
SpecVersionsController,
SpecVersionsResponse
>(SpecVersionsController.new);
}

View file

@ -170,14 +170,17 @@ class const SettingsPage({super.key}) extends ConsumerWidget {
)
: Row(
children: [
NavigationRailM3E(
MaterialUiCompatibilityBridge(
child: NavigationRailM3E(
type: .alwaysExpand,
trailing: searchBar,
scrollable: true,
sections: sections
.mapTo(
(categoryGroup, categories) =>
NavigationRailM3ESection(
(
categoryGroup,
categories,
) => NavigationRailM3ESection(
header: DividerText(categoryGroup),
destinations: categories
.map(
@ -195,6 +198,7 @@ class const SettingsPage({super.key}) extends ConsumerWidget {
onDestinationSelected: (value) =>
selected.value = value,
),
),
VerticalDivider(),
Expanded(
child: SuperListView(