Change prefs

This commit is contained in:
problematicconsumer
2023-09-07 13:43:46 +03:30
parent d52404a040
commit 854b522d97
10 changed files with 47 additions and 44 deletions

View File

@@ -33,7 +33,7 @@ Future<void> lazyBootstrap(WidgetsBinding widgetsBinding) async {
overrides: [sharedPreferencesProvider.overrideWithValue(sharedPreferences)], overrides: [sharedPreferencesProvider.overrideWithValue(sharedPreferences)],
); );
final debug = container.read(debugModeProvider) || kDebugMode; final debug = container.read(debugModeNotifierProvider) || kDebugMode;
final filesEditor = container.read(filesEditorServiceProvider); final filesEditor = container.read(filesEditorServiceProvider);
await filesEditor.init(); await filesEditor.init();
@@ -42,7 +42,7 @@ Future<void> lazyBootstrap(WidgetsBinding widgetsBinding) async {
await container.read(runtimeDetailsServiceProvider).init(); await container.read(runtimeDetailsServiceProvider).init();
_loggy.info("basic setup took [${_stopWatch.elapsedMilliseconds}]ms"); _loggy.info("basic setup took [${_stopWatch.elapsedMilliseconds}]ms");
final silentStart = container.read(silentStartProvider); final silentStart = container.read(silentStartNotifierProvider);
if (silentStart) { if (silentStart) {
FlutterNativeSplash.remove(); FlutterNativeSplash.remove();
} }

View File

@@ -13,7 +13,7 @@ class AppView extends HookConsumerWidget with PresLogger {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final router = ref.watch(routerProvider); final router = ref.watch(routerProvider);
final locale = ref.watch(localeNotifierProvider).locale; final locale = ref.watch(localeNotifierProvider).flutterLocale;
final theme = ref.watch(themeProvider); final theme = ref.watch(themeProvider);
ref.watch(commonControllersProvider); ref.watch(commonControllersProvider);
@@ -21,7 +21,7 @@ class AppView extends HookConsumerWidget with PresLogger {
return MaterialApp.router( return MaterialApp.router(
routerConfig: router, routerConfig: router,
locale: locale, locale: locale,
supportedLocales: AppLocale.locales, supportedLocales: AppLocaleUtils.supportedLocales,
localizationsDelegates: GlobalMaterialLocalizations.delegates, localizationsDelegates: GlobalMaterialLocalizations.delegates,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
themeMode: theme.mode, themeMode: theme.mode,

View File

@@ -5,7 +5,7 @@ part 'core_providers.g.dart';
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
TranslationsEn translations(TranslationsRef ref) => TranslationsEn translations(TranslationsRef ref) =>
ref.watch(localeNotifierProvider).translations(); ref.watch(localeNotifierProvider).build();
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
AppTheme theme(ThemeRef ref) => AppTheme( AppTheme theme(ThemeRef ref) => AppTheme(

View File

@@ -1,5 +1,33 @@
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/utils/pref_notifier.dart'; import 'package:hiddify/utils/pref_notifier.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
final silentStartProvider = PrefNotifier.provider("silent_start", false); part 'general_prefs.g.dart';
final debugModeProvider = PrefNotifier.provider("debug_mode", false); @Riverpod(keepAlive: true)
class SilentStartNotifier extends _$SilentStartNotifier {
late final _pref =
Pref(ref.watch(sharedPreferencesProvider), "silent_start", false);
@override
bool build() => _pref.getValue();
Future<void> update(bool value) {
state = value;
return _pref.update(value);
}
}
@Riverpod(keepAlive: true)
class DebugModeNotifier extends _$DebugModeNotifier {
late final _pref =
Pref(ref.watch(sharedPreferencesProvider), "debug_mode", false);
@override
bool build() => _pref.getValue();
Future<void> update(bool value) {
state = value;
return _pref.update(value);
}
}

View File

@@ -1,5 +1,3 @@
import 'package:dartx/dartx.dart';
import 'package:flutter/widgets.dart';
import 'package:hiddify/data/data_providers.dart'; import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/gen/fonts.gen.dart'; import 'package:hiddify/gen/fonts.gen.dart';
import 'package:hiddify/gen/translations.g.dart'; import 'package:hiddify/gen/translations.g.dart';
@@ -24,32 +22,7 @@ class LocaleNotifier extends _$LocaleNotifier {
} }
} }
enum AppLocale { extension AppLocaleX on AppLocale {
en, String get preferredFontFamily =>
fa; this == AppLocale.fa ? FontFamily.shabnam : "";
Locale get locale {
return Locale(name);
}
static List<Locale> get locales =>
AppLocale.values.map((e) => e.locale).toList();
static AppLocale fromString(String e) {
return AppLocale.values.firstOrNullWhere((element) => element.name == e) ??
AppLocale.en;
}
static AppLocale deviceLocale() {
return AppLocale.fromString(
AppLocaleUtils.findDeviceLocale().languageCode,
);
}
TranslationsEn translations() {
final appLocale = AppLocaleUtils.parse(name);
return appLocale.build();
}
String get preferredFontFamily => this == fa ? FontFamily.shabnam : "";
} }

View File

@@ -22,7 +22,7 @@ class WindowController extends _$WindowController
await windowManager.waitUntilReadyToShow( await windowManager.waitUntilReadyToShow(
windowOptions, windowOptions,
() async { () async {
if (ref.read(silentStartProvider)) { if (ref.read(silentStartNotifierProvider)) {
loggy.debug("silent start is enabled, hiding window"); loggy.debug("silent start is enabled, hiding window");
await windowManager.hide(); await windowManager.hide();
} }

View File

@@ -23,7 +23,7 @@ class LogsPage extends HookConsumerWidget with PresLogger {
final asyncState = ref.watch(logsNotifierProvider); final asyncState = ref.watch(logsNotifierProvider);
final notifier = ref.watch(logsNotifierProvider.notifier); final notifier = ref.watch(logsNotifierProvider.notifier);
final debug = ref.watch(debugModeProvider); final debug = ref.watch(debugModeNotifierProvider);
final filesEditor = ref.watch(filesEditorServiceProvider); final filesEditor = ref.watch(filesEditorServiceProvider);
final List<PopupMenuEntry> popupButtons = debug || PlatformUtils.isDesktop final List<PopupMenuEntry> popupButtons = debug || PlatformUtils.isDesktop

View File

@@ -26,7 +26,7 @@ class ConfigOptionsPage extends HookConsumerWidget {
), ),
body: ListView( body: ListView(
children: [ children: [
if (ref.watch(debugModeProvider)) if (ref.watch(debugModeNotifierProvider))
SwitchListTile( SwitchListTile(
title: Text(t.settings.config.executeConfigAsIs), title: Text(t.settings.config.executeConfigAsIs),
subtitle: Text(t.settings.config.executeConfigAsIsMsg), subtitle: Text(t.settings.config.executeConfigAsIsMsg),

View File

@@ -12,7 +12,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider); final t = ref.watch(translationsProvider);
final debug = ref.watch(debugModeProvider); final debug = ref.watch(debugModeNotifierProvider);
return Column( return Column(
children: [ children: [
@@ -47,7 +47,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {
}, },
); );
} }
await ref.read(debugModeProvider.notifier).update(value); await ref.read(debugModeNotifierProvider.notifier).update(value);
}, },
), ),
], ],

View File

@@ -87,9 +87,11 @@ class GeneralSettingTiles extends HookConsumerWidget {
if (PlatformUtils.isDesktop) ...[ if (PlatformUtils.isDesktop) ...[
SwitchListTile( SwitchListTile(
title: Text(t.settings.general.silentStart), title: Text(t.settings.general.silentStart),
value: ref.watch(silentStartProvider), value: ref.watch(silentStartNotifierProvider),
onChanged: (value) async { onChanged: (value) async {
await ref.read(silentStartProvider.notifier).update(value); await ref
.read(silentStartNotifierProvider.notifier)
.update(value);
}, },
), ),
], ],