Fix linting and cleanup

This commit is contained in:
problematicconsumer
2023-11-09 15:23:48 +03:30
parent a48f36bafd
commit 38f48e07d5
13 changed files with 12 additions and 24 deletions

View File

@@ -4,7 +4,7 @@ import 'dart:io';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:hiddify/core/app/app.dart'; import 'package:hiddify/core/app/app_view.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/data/data_providers.dart'; import 'package:hiddify/data/data_providers.dart';

View File

@@ -1 +0,0 @@
export 'app_view.dart';

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hiddify/core/router/app_router.dart'; import 'package:hiddify/core/router/app_router.dart';
import 'package:hiddify/features/home/view/view.dart'; import 'package:hiddify/features/home/view/view.dart';
import 'package:hiddify/features/intro/view/view.dart'; import 'package:hiddify/features/intro/intro_page.dart';
import 'package:hiddify/features/profile_detail/view/view.dart'; import 'package:hiddify/features/profile_detail/view/view.dart';
import 'package:hiddify/features/profiles/view/view.dart'; import 'package:hiddify/features/profiles/view/view.dart';
import 'package:hiddify/features/proxies/view/view.dart'; import 'package:hiddify/features/proxies/view/view.dart';

View File

@@ -4,8 +4,8 @@ import 'package:gap/gap.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/domain/constants.dart'; import 'package:hiddify/domain/constants.dart';
import 'package:hiddify/domain/failures.dart'; import 'package:hiddify/domain/failures.dart';
import 'package:hiddify/features/common/app_update_notifier.dart';
import 'package:hiddify/features/common/nested_app_bar.dart'; import 'package:hiddify/features/common/nested_app_bar.dart';
import 'package:hiddify/features/common/common.dart';
import 'package:hiddify/features/common/new_version_dialog.dart'; import 'package:hiddify/features/common/new_version_dialog.dart';
import 'package:hiddify/gen/assets.gen.dart'; import 'package:hiddify/gen/assets.gen.dart';
import 'package:hiddify/services/service_providers.dart'; import 'package:hiddify/services/service_providers.dart';

View File

@@ -113,7 +113,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
extended: true, extended: true,
selectedIndex: selectedWithOffset(drawerDestinationRange), selectedIndex: selectedWithOffset(drawerDestinationRange),
destinations: destinationsSlice(drawerDestinationRange) destinations: destinationsSlice(drawerDestinationRange)
.map((_) => AdaptiveScaffold.toRailDestination(_)) .map((dest) => AdaptiveScaffold.toRailDestination(dest))
.toList(), .toList(),
onDestinationSelected: (index) => onDestinationSelected: (index) =>
selectWithOffset(index, drawerDestinationRange), selectWithOffset(index, drawerDestinationRange),
@@ -129,7 +129,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
builder: (_) => AdaptiveScaffold.standardNavigationRail( builder: (_) => AdaptiveScaffold.standardNavigationRail(
selectedIndex: selectedIndex, selectedIndex: selectedIndex,
destinations: destinations destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_)) .map((dest) => AdaptiveScaffold.toRailDestination(dest))
.toList(), .toList(),
onDestinationSelected: onSelectedIndexChange, onDestinationSelected: onSelectedIndexChange,
), ),
@@ -140,7 +140,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
extended: true, extended: true,
selectedIndex: selectedIndex, selectedIndex: selectedIndex,
destinations: destinations destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_)) .map((dest) => AdaptiveScaffold.toRailDestination(dest))
.toList(), .toList(),
onDestinationSelected: onSelectedIndexChange, onDestinationSelected: onSelectedIndexChange,
trailing: sidebarTrailing, trailing: sidebarTrailing,

View File

@@ -1,5 +0,0 @@
export 'app_update_notifier.dart';
export 'confirmation_dialogs.dart';
export 'general_pref_tiles.dart';
export 'profile_tile.dart';
export 'qr_code_scanner_screen.dart';

View File

@@ -1,5 +1,4 @@
import 'package:hiddify/core/prefs/general_prefs.dart'; import 'package:hiddify/core/prefs/general_prefs.dart';
import 'package:hiddify/features/common/app_update_notifier.dart';
import 'package:hiddify/features/common/connectivity/connectivity_controller.dart'; import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
import 'package:hiddify/features/common/window/window_controller.dart'; import 'package:hiddify/features/common/window/window_controller.dart';
import 'package:hiddify/features/profiles/notifier/notifier.dart'; import 'package:hiddify/features/profiles/notifier/notifier.dart';
@@ -28,11 +27,6 @@ void commonControllers(CommonControllersRef ref) {
(previous, next) {}, (previous, next) {},
fireImmediately: true, fireImmediately: true,
); );
// ref.listen(
// appUpdateNotifierProvider,
// (previous, next) {},
// fireImmediately: true,
// );
ref.listen( ref.listen(
profilesUpdateNotifierProvider, profilesUpdateNotifierProvider,
(previous, next) {}, (previous, next) {},

View File

@@ -5,7 +5,7 @@ import 'package:gap/gap.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/domain/constants.dart'; import 'package:hiddify/domain/constants.dart';
import 'package:hiddify/features/common/common.dart'; import 'package:hiddify/features/common/general_pref_tiles.dart';
import 'package:hiddify/gen/assets.gen.dart'; import 'package:hiddify/gen/assets.gen.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';

View File

@@ -1 +0,0 @@
export 'intro_page.dart';

View File

@@ -175,7 +175,8 @@ class LogsPage extends HookConsumerWidget with PresLogger {
.textTheme .textTheme
.labelMedium .labelMedium
?.copyWith( ?.copyWith(
color: log.level!.color), color: log.level!.color,
),
), ),
if (log.time != null) if (log.time != null)
Text( Text(

View File

@@ -5,7 +5,7 @@ import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/domain/enums.dart'; import 'package:hiddify/domain/enums.dart';
import 'package:hiddify/domain/failures.dart'; import 'package:hiddify/domain/failures.dart';
import 'package:hiddify/domain/profiles/profiles.dart'; import 'package:hiddify/domain/profiles/profiles.dart';
import 'package:hiddify/features/common/common.dart'; import 'package:hiddify/features/common/profile_tile.dart';
import 'package:hiddify/features/profiles/notifier/notifier.dart'; import 'package:hiddify/features/profiles/notifier/notifier.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';

View File

@@ -6,7 +6,7 @@ import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/core/router/router.dart'; import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/domain/singbox/singbox.dart'; import 'package:hiddify/domain/singbox/singbox.dart';
import 'package:hiddify/features/common/common.dart'; import 'package:hiddify/features/common/general_pref_tiles.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
class AdvancedSettingTiles extends HookConsumerWidget { class AdvancedSettingTiles extends HookConsumerWidget {

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/features/common/common.dart'; import 'package:hiddify/features/common/general_pref_tiles.dart';
import 'package:hiddify/services/auto_start_service.dart'; import 'package:hiddify/services/auto_start_service.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';