From 38f48e07d590c0f7f5c0a9e5fe7b200783f4249c Mon Sep 17 00:00:00 2001 From: problematicconsumer Date: Thu, 9 Nov 2023 15:23:48 +0330 Subject: [PATCH] Fix linting and cleanup --- lib/bootstrap.dart | 2 +- lib/core/app/app.dart | 1 - lib/core/router/routes/shared_routes.dart | 2 +- lib/features/about/view/about_page.dart | 2 +- lib/features/common/adaptive_root_scaffold.dart | 6 +++--- lib/features/common/common.dart | 5 ----- lib/features/common/common_controllers.dart | 6 ------ lib/features/intro/{view => }/intro_page.dart | 2 +- lib/features/intro/view/view.dart | 1 - lib/features/logs/view/logs_page.dart | 3 ++- lib/features/profiles/view/profiles_modal.dart | 2 +- lib/features/settings/widgets/advanced_setting_tiles.dart | 2 +- lib/features/settings/widgets/general_setting_tiles.dart | 2 +- 13 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 lib/core/app/app.dart delete mode 100644 lib/features/common/common.dart rename lib/features/intro/{view => }/intro_page.dart (98%) delete mode 100644 lib/features/intro/view/view.dart diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart index 83b34bb8..230502ed 100644 --- a/lib/bootstrap.dart +++ b/lib/bootstrap.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.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/prefs/prefs.dart'; import 'package:hiddify/data/data_providers.dart'; diff --git a/lib/core/app/app.dart b/lib/core/app/app.dart deleted file mode 100644 index f8f58a29..00000000 --- a/lib/core/app/app.dart +++ /dev/null @@ -1 +0,0 @@ -export 'app_view.dart'; diff --git a/lib/core/router/routes/shared_routes.dart b/lib/core/router/routes/shared_routes.dart index 74d43ebf..76410f5f 100644 --- a/lib/core/router/routes/shared_routes.dart +++ b/lib/core/router/routes/shared_routes.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hiddify/core/router/app_router.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/profiles/view/view.dart'; import 'package:hiddify/features/proxies/view/view.dart'; diff --git a/lib/features/about/view/about_page.dart b/lib/features/about/view/about_page.dart index 68669bdd..bbec9e5f 100644 --- a/lib/features/about/view/about_page.dart +++ b/lib/features/about/view/about_page.dart @@ -4,8 +4,8 @@ import 'package:gap/gap.dart'; import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/domain/constants.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/common.dart'; import 'package:hiddify/features/common/new_version_dialog.dart'; import 'package:hiddify/gen/assets.gen.dart'; import 'package:hiddify/services/service_providers.dart'; diff --git a/lib/features/common/adaptive_root_scaffold.dart b/lib/features/common/adaptive_root_scaffold.dart index e6a8e349..9b3936b5 100644 --- a/lib/features/common/adaptive_root_scaffold.dart +++ b/lib/features/common/adaptive_root_scaffold.dart @@ -113,7 +113,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget { extended: true, selectedIndex: selectedWithOffset(drawerDestinationRange), destinations: destinationsSlice(drawerDestinationRange) - .map((_) => AdaptiveScaffold.toRailDestination(_)) + .map((dest) => AdaptiveScaffold.toRailDestination(dest)) .toList(), onDestinationSelected: (index) => selectWithOffset(index, drawerDestinationRange), @@ -129,7 +129,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget { builder: (_) => AdaptiveScaffold.standardNavigationRail( selectedIndex: selectedIndex, destinations: destinations - .map((_) => AdaptiveScaffold.toRailDestination(_)) + .map((dest) => AdaptiveScaffold.toRailDestination(dest)) .toList(), onDestinationSelected: onSelectedIndexChange, ), @@ -140,7 +140,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget { extended: true, selectedIndex: selectedIndex, destinations: destinations - .map((_) => AdaptiveScaffold.toRailDestination(_)) + .map((dest) => AdaptiveScaffold.toRailDestination(dest)) .toList(), onDestinationSelected: onSelectedIndexChange, trailing: sidebarTrailing, diff --git a/lib/features/common/common.dart b/lib/features/common/common.dart deleted file mode 100644 index bed2a3db..00000000 --- a/lib/features/common/common.dart +++ /dev/null @@ -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'; diff --git a/lib/features/common/common_controllers.dart b/lib/features/common/common_controllers.dart index 7d8b394c..3854b879 100644 --- a/lib/features/common/common_controllers.dart +++ b/lib/features/common/common_controllers.dart @@ -1,5 +1,4 @@ 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/window/window_controller.dart'; import 'package:hiddify/features/profiles/notifier/notifier.dart'; @@ -28,11 +27,6 @@ void commonControllers(CommonControllersRef ref) { (previous, next) {}, fireImmediately: true, ); - // ref.listen( - // appUpdateNotifierProvider, - // (previous, next) {}, - // fireImmediately: true, - // ); ref.listen( profilesUpdateNotifierProvider, (previous, next) {}, diff --git a/lib/features/intro/view/intro_page.dart b/lib/features/intro/intro_page.dart similarity index 98% rename from lib/features/intro/view/intro_page.dart rename to lib/features/intro/intro_page.dart index f5671578..c2d926fa 100644 --- a/lib/features/intro/view/intro_page.dart +++ b/lib/features/intro/intro_page.dart @@ -5,7 +5,7 @@ import 'package:gap/gap.dart'; import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/prefs/prefs.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/utils/utils.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; diff --git a/lib/features/intro/view/view.dart b/lib/features/intro/view/view.dart deleted file mode 100644 index 507e9508..00000000 --- a/lib/features/intro/view/view.dart +++ /dev/null @@ -1 +0,0 @@ -export 'intro_page.dart'; diff --git a/lib/features/logs/view/logs_page.dart b/lib/features/logs/view/logs_page.dart index c332e83d..5acc84e6 100644 --- a/lib/features/logs/view/logs_page.dart +++ b/lib/features/logs/view/logs_page.dart @@ -175,7 +175,8 @@ class LogsPage extends HookConsumerWidget with PresLogger { .textTheme .labelMedium ?.copyWith( - color: log.level!.color), + color: log.level!.color, + ), ), if (log.time != null) Text( diff --git a/lib/features/profiles/view/profiles_modal.dart b/lib/features/profiles/view/profiles_modal.dart index 20cae7f2..f207d9e8 100644 --- a/lib/features/profiles/view/profiles_modal.dart +++ b/lib/features/profiles/view/profiles_modal.dart @@ -5,7 +5,7 @@ import 'package:hiddify/core/router/router.dart'; import 'package:hiddify/domain/enums.dart'; import 'package:hiddify/domain/failures.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/utils/utils.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; diff --git a/lib/features/settings/widgets/advanced_setting_tiles.dart b/lib/features/settings/widgets/advanced_setting_tiles.dart index 0f1ed75d..ef916622 100644 --- a/lib/features/settings/widgets/advanced_setting_tiles.dart +++ b/lib/features/settings/widgets/advanced_setting_tiles.dart @@ -6,7 +6,7 @@ import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/router/router.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'; class AdvancedSettingTiles extends HookConsumerWidget { diff --git a/lib/features/settings/widgets/general_setting_tiles.dart b/lib/features/settings/widgets/general_setting_tiles.dart index a66cb81e..d042c1d4 100644 --- a/lib/features/settings/widgets/general_setting_tiles.dart +++ b/lib/features/settings/widgets/general_setting_tiles.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hiddify/core/core_providers.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/utils/utils.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';