vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
problematicconsumer
2023-12-28 10:43:57 +03:30
parent 3712c50c4e
commit 65847d3ea3
5 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/features/common/general_pref_tiles.dart
View File

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/core/analytics/analytics_controller.dart'; import 'package:hiddify/core/analytics/analytics_controller.dart';
import 'package:hiddify/core/localization/locale_extensions.dart'; import 'package:hiddify/core/localization/locale_extensions.dart';
import 'package:hiddify/core/localization/locale_preferences.dart'; import 'package:hiddify/core/localization/locale_preferences.dart';
@@ -33,7 +32,7 @@ class LocalePrefTile extends HookConsumerWidget {
title: Text(e.localeName), title: Text(e.localeName),
value: e, value: e,
groupValue: locale, groupValue: locale,
onChanged: (e) => context.pop(e), onChanged: Navigator.of(context).maybePop,
), ),
) )
.toList(), .toList(),
@@ -75,7 +74,7 @@ class RegionPrefTile extends HookConsumerWidget {
title: Text(e.present(t)), title: Text(e.present(t)),
value: e, value: e,
groupValue: region, groupValue: region,
onChanged: (e) => context.pop(e), onChanged: Navigator.of(context).maybePop,
), ),
) )
.toList(), .toList(),

3
lib/features/settings/widgets/advanced_setting_tiles.dart
View File

@@ -1,7 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/preferences/general_preferences.dart'; import 'package:hiddify/core/preferences/general_preferences.dart';
import 'package:hiddify/core/router/router.dart'; import 'package:hiddify/core/router/router.dart';
@@ -78,7 +77,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {
content: Text(t.settings.advanced.debugModeMsg), content: Text(t.settings.advanced.debugModeMsg),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => context.pop(true), onPressed: () => Navigator.of(context).maybePop(true),
child: Text( child: Text(
MaterialLocalizations.of(context).okButtonLabel, MaterialLocalizations.of(context).okButtonLabel,
), ),

3
lib/features/settings/widgets/general_setting_tiles.dart
View File

@@ -1,7 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/preferences/general_preferences.dart'; import 'package:hiddify/core/preferences/general_preferences.dart';
import 'package:hiddify/core/theme/app_theme_mode.dart'; import 'package:hiddify/core/theme/app_theme_mode.dart';
@@ -40,7 +39,7 @@ class GeneralSettingTiles extends HookConsumerWidget {
title: Text(e.present(t)), title: Text(e.present(t)),
value: e, value: e,
groupValue: themeMode, groupValue: themeMode,
onChanged: (e) => context.pop(e), onChanged: Navigator.of(context).maybePop,
), ),
) )
.toList(), .toList(),

1
lib/features/settings/widgets/settings_input_dialog.dart
View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/utils/utils.dart'; import 'package:hiddify/utils/utils.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';

8
lib/singbox/service/platform_singbox_service.dart
View File

@@ -29,15 +29,7 @@ class PlatformSingboxService with InfraLogger implements SingboxService {
final alerts = final alerts =
_alertsChannel.receiveBroadcastStream().map(SingboxStatus.fromEvent); _alertsChannel.receiveBroadcastStream().map(SingboxStatus.fromEvent);
loggy.debug("[TLOG] Status first recieved");
final _2 = await alerts.first;
loggy.debug("[TLOG] alert First recieved");
final _1 = await status.first;
loggy.debug("[TLOG] Waiting for first entry");
_status = ValueConnectableStream(Rx.merge([status, alerts])).autoConnect(); _status = ValueConnectableStream(Rx.merge([status, alerts])).autoConnect();
await _status.first; await _status.first;
} }