Refactor preferences

This commit is contained in:
problematicconsumer
2023-09-06 12:56:30 +03:30
parent cf1acb0b25
commit ef1846e553
26 changed files with 303 additions and 229 deletions

View File

@@ -2,9 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_localized_locales/flutter_localized_locales.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/locale/locale.dart';
import 'package:hiddify/core/prefs/general_prefs.dart';
import 'package:hiddify/core/theme/theme.dart';
import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/features/settings/widgets/theme_mode_switch_button.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -16,10 +14,9 @@ class GeneralSettingTiles extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
final locale = ref.watch(localeControllerProvider);
final locale = ref.watch(localeProvider);
final theme = ref.watch(themeControllerProvider);
final themeController = ref.watch(themeControllerProvider.notifier);
final theme = ref.watch(themeProvider);
return Column(
children: [
@@ -31,12 +28,12 @@ class GeneralSettingTiles extends HookConsumerWidget {
),
leading: const Icon(Icons.language),
onTap: () async {
final selectedLocale = await showDialog<LocalePref>(
final selectedLocale = await showDialog<AppLocale>(
context: context,
builder: (context) {
return SimpleDialog(
title: Text(t.settings.general.locale),
children: LocalePref.values
children: AppLocale.values
.map(
(e) => RadioListTile(
title: Text(
@@ -54,42 +51,36 @@ class GeneralSettingTiles extends HookConsumerWidget {
},
);
if (selectedLocale != null) {
await ref
.read(localeControllerProvider.notifier)
.change(selectedLocale);
await ref.read(localeProvider.notifier).update(selectedLocale);
}
},
),
ListTile(
title: Text(t.settings.general.themeMode),
subtitle: Text(
switch (theme.themeMode) {
switch (theme.mode) {
ThemeMode.system => t.settings.general.themeModes.system,
ThemeMode.light => t.settings.general.themeModes.light,
ThemeMode.dark => t.settings.general.themeModes.dark,
},
),
trailing: ThemeModeSwitch(
themeMode: theme.themeMode,
onChanged: (value) {
themeController.change(themeMode: value);
},
themeMode: theme.mode,
onChanged: ref.read(themeModeProvider.notifier).update,
),
leading: const Icon(Icons.light_mode),
onTap: () async {
await themeController.change(
themeMode: Theme.of(context).brightness == Brightness.light
? ThemeMode.dark
: ThemeMode.light,
);
await ref.read(themeModeProvider.notifier).update(
Theme.of(context).brightness == Brightness.light
? ThemeMode.dark
: ThemeMode.light,
);
},
),
SwitchListTile(
title: Text(t.settings.general.trueBlack),
value: theme.trueBlack,
onChanged: (value) {
themeController.change(trueBlack: value);
},
onChanged: ref.read(trueBlackThemeProvider.notifier).update,
),
if (PlatformUtils.isDesktop) ...[
SwitchListTile(