Relative imports

leoafarias · May 7, 2021 · d7e0509 · d7e0509
1 parent 0eb301e
commit d7e0509
Show file tree

Hide file tree

Showing 75 changed files with 345 additions and 296 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -4,11 +4,3 @@ analyzer:
     # Ignore generated files
     - "**/*.g.dart"
     - "lib/src/generated/*.dart"
-linter:
-  rules:
-    prefer_const_constructors: true
-    prefer_const_constructors_in_immutables: true
-    prefer_const_declarations: true
-    prefer_const_literals_to_create_immutables: true
-    public_member_api_docs: false
-    prefer_relative_imports: false
diff --git a/lib/app_shell.dart b/lib/app_shell.dart
@@ -4,21 +4,22 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/nav_button.dart';
-import 'package:sidekick/components/atoms/shortcuts.dart';
-import 'package:sidekick/components/atoms/top_app_bar.dart';
-import 'package:sidekick/components/organisms/app_bottom_bar.dart';
-import 'package:sidekick/components/organisms/info_drawer.dart';
-import 'package:sidekick/components/organisms/search_bar.dart';
-import 'package:sidekick/constants.dart';
-import 'package:sidekick/modules/flutter_releases/fluttter_releases.screen.dart';
-import 'package:sidekick/modules/projects/projects.screen.dart';
-import 'package:sidekick/providers/navigation_provider.dart';
-import 'package:sidekick/providers/selected_info_provider.dart';
-import 'package:sidekick/screens/home_screen.dart';
-import 'package:sidekick/screens/packages_screen.dart';
-import 'package:sidekick/theme.dart';
-import 'package:sidekick/utils/layout_size.dart';
+
+import 'components/atoms/nav_button.dart';
+import 'components/atoms/shortcuts.dart';
+import 'components/atoms/top_app_bar.dart';
+import 'components/organisms/app_bottom_bar.dart';
+import 'components/organisms/info_drawer.dart';
+import 'components/organisms/search_bar.dart';
+import 'constants.dart';
+import 'modules/flutter_releases/fluttter_releases.screen.dart';
+import 'modules/projects/projects.screen.dart';
+import 'providers/navigation_provider.dart';
+import 'providers/selected_info_provider.dart';
+import 'screens/home_screen.dart';
+import 'screens/packages_screen.dart';
+import 'theme.dart';
+import 'utils/layout_size.dart';
 
 final _scaffoldKey = GlobalKey<ScaffoldState>();
 

diff --git a/lib/components/atoms/cache_date_display.dart b/lib/components/atoms/cache_date_display.dart
@@ -3,7 +3,8 @@ import 'dart:io';
 import 'package:date_time_format/date_time_format.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:sidekick/dto/release.dto.dart';
+
+import '../../dto/release.dto.dart';
 
 class CacheDateDisplay extends HookWidget {
   final ReleaseDto version;

diff --git a/lib/components/atoms/cache_size_display.dart b/lib/components/atoms/cache_size_display.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/providers/fvm_cache.provider.dart';
-import 'package:sidekick/utils/dir_stat.dart';
+
+import '../../modules/fvm/fvm.provider.dart';
+import '../../utils/dir_stat.dart';
+import 'typography.dart';
 
 class CacheSizeDisplay extends HookWidget {
   const CacheSizeDisplay({Key key}) : super(key: key);

diff --git a/lib/components/atoms/console.dart b/lib/components/atoms/console.dart
@@ -4,8 +4,9 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/providers/fvm_console_provider.dart';
+
+import '../../modules/fvm/fvm.provider.dart';
+import 'typography.dart';
 
 class Console extends HookWidget {
   final bool expand;
@@ -20,7 +21,7 @@ class Console extends HookWidget {
 
   @override
   Widget build(BuildContext context) {
-    final output = useProvider(combinedConsoleProvider);
+    final output = useProvider(fvmStdoutProvider);
     final lines = useState<List<String>>(['']);
 
     useValueChanged(output, (_, __) {

diff --git a/lib/components/atoms/copy_button.dart b/lib/components/atoms/copy_button.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:sidekick/utils/notify.dart';
+
+import '../../utils/notify.dart';
 
 class CopyButton extends StatelessWidget {
   final String content;

diff --git a/lib/components/atoms/local_link_button.dart b/lib/components/atoms/local_link_button.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:open_file/open_file.dart';
-import 'package:sidekick/components/atoms/typography.dart';
 import 'package:truncate/truncate.dart';
 
+import 'typography.dart';
+
 class LocalLinkButton extends StatelessWidget {
   final String localPath;
   const LocalLinkButton(

diff --git a/lib/components/atoms/screen.dart b/lib/components/atoms/screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:sidekick/components/atoms/blur_background.dart';
-import 'package:sidekick/components/atoms/typography.dart';
+
+import 'blur_background.dart';
+import 'typography.dart';
 
 class Screen extends StatelessWidget {
   final String title;

diff --git a/lib/components/atoms/shortcuts.dart b/lib/components/atoms/shortcuts.dart
@@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:sidekick/providers/navigation_provider.dart';
+
+import '../../providers/navigation_provider.dart';
 
 class NavigationIntent extends Intent {
   final NavigationRoutes route;

diff --git a/lib/components/atoms/top_app_bar.dart b/lib/components/atoms/top_app_bar.dart
@@ -2,12 +2,13 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/components/molecules/update_available_button.dart';
-import 'package:sidekick/constants.dart';
-import 'package:sidekick/modules/settings/settings.screen.dart';
-import 'package:sidekick/providers/navigation_provider.dart';
-import 'package:sidekick/theme.dart';
+
+import '../../constants.dart';
+import '../../modules/settings/settings.screen.dart';
+import '../../providers/navigation_provider.dart';
+import '../../theme.dart';
+import '../molecules/update_available_button.dart';
+import 'typography.dart';
 
 class TopAppBar extends StatelessWidget implements PreferredSizeWidget {
   const TopAppBar({key}) : super(key: key);

diff --git a/lib/components/molecules/advanced_info_tile.dart b/lib/components/molecules/advanced_info_tile.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:sidekick/components/atoms/copy_button.dart';
-import 'package:sidekick/components/atoms/group_tile.dart';
-import 'package:sidekick/components/atoms/list_tile.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/dto/release.dto.dart';
-import 'package:sidekick/utils/open_link.dart';
+
+import '../../dto/release.dto.dart';
+import '../../utils/open_link.dart';
+import '../atoms/copy_button.dart';
+import '../atoms/group_tile.dart';
+import '../atoms/list_tile.dart';
+import '../atoms/typography.dart';
 
 class AdvancedInfoTile extends StatelessWidget {
   final ReleaseDto version;

diff --git a/lib/components/molecules/app_version_info.dart b/lib/components/molecules/app_version_info.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:sidekick/utils/check_update.dart';
-import 'package:sidekick/utils/manage_updates.dart';
-import 'package:sidekick/version.dart';
+
+import '../../utils/check_update.dart';
+import '../../utils/manage_updates.dart';
+import '../../version.dart';
 
 class AppVersionInfo extends HookWidget {
   const AppVersionInfo({Key key}) : super(key: key);

diff --git a/lib/components/molecules/cache_info_tile.dart b/lib/components/molecules/cache_info_tile.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:open_file/open_file.dart';
-import 'package:sidekick/components/atoms/cache_date_display.dart';
-import 'package:sidekick/components/atoms/group_tile.dart';
-import 'package:sidekick/components/atoms/list_tile.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/dto/release.dto.dart';
+
+import '../../dto/release.dto.dart';
+import '../atoms/cache_date_display.dart';
+import '../atoms/group_tile.dart';
+import '../atoms/list_tile.dart';
+import '../atoms/typography.dart';
 
 class CacheInfoTile extends StatelessWidget {
   final ReleaseDto version;

diff --git a/lib/components/molecules/cache_version_actions.dart b/lib/components/molecules/cache_version_actions.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/molecules/delete_dialog.dart';
-import 'package:sidekick/dto/release.dto.dart';
-import 'package:sidekick/providers/fvm_queue.provider.dart';
-import 'package:sidekick/providers/selected_info_provider.dart';
 
-import '../../providers/fvm_queue.provider.dart';
+import '../../dto/release.dto.dart';
+import '../../modules/fvm/fvm_queue.provider.dart';
+import '../../providers/selected_info_provider.dart';
 import '../atoms/typography.dart';
+import 'delete_dialog.dart';
 
 enum InstalledActions {
   remove,

diff --git a/lib/components/molecules/cache_version_item.dart b/lib/components/molecules/cache_version_item.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/list_tile.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/components/molecules/cache_version_actions.dart';
-import 'package:sidekick/components/molecules/cache_version_status.dart';
-import 'package:sidekick/components/organisms/global_info_dialog.dart';
-import 'package:sidekick/dto/release.dto.dart';
-import 'package:sidekick/providers/selected_info_provider.dart';
+
+import '../../dto/release.dto.dart';
+import '../../providers/selected_info_provider.dart';
+import '../atoms/list_tile.dart';
+import '../atoms/typography.dart';
+import '../organisms/global_info_dialog.dart';
+import 'cache_version_actions.dart';
+import 'cache_version_status.dart';
 
 class CacheVersionItem extends StatelessWidget {
   final ReleaseDto version;

diff --git a/lib/components/molecules/cache_version_select.dart b/lib/components/molecules/cache_version_select.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/dto/release.dto.dart';
+
+import '../../dto/release.dto.dart';
+import '../atoms/typography.dart';
 
 class CacheVersionSelect extends StatelessWidget {
   final List<ReleaseDto> versions;

diff --git a/lib/components/molecules/cache_version_status.dart b/lib/components/molecules/cache_version_status.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/molecules/cache_version_status_master.dart';
-import 'package:sidekick/components/molecules/setup_button.dart';
-import 'package:sidekick/dto/channel.dto.dart';
-import 'package:sidekick/dto/master.dto.dart';
-import 'package:sidekick/dto/release.dto.dart';
-import 'package:sidekick/providers/fvm_queue.provider.dart';
+
+import '../../dto/channel.dto.dart';
+import '../../dto/master.dto.dart';
+import '../../dto/release.dto.dart';
+import '../../modules/fvm/fvm_queue.provider.dart';
+import 'cache_version_status_master.dart';
+import 'setup_button.dart';
 
 class CacheVersionStatus extends StatelessWidget {
   final ReleaseDto version;

diff --git a/lib/components/molecules/cache_version_status_master.dart b/lib/components/molecules/cache_version_status_master.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/molecules/setup_button.dart';
-import 'package:sidekick/dto/channel.dto.dart';
+
+import '../../dto/channel.dto.dart';
+import 'setup_button.dart';
 
 class CacheVersionStatusMaster extends StatelessWidget {
   final ChannelDto masterChannel;

diff --git a/lib/components/molecules/channel_showcase.dart b/lib/components/molecules/channel_showcase.dart
@@ -1,10 +1,11 @@
 import 'package:date_time_format/date_time_format.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/components/molecules/version_install_button.dart';
-import 'package:sidekick/dto/channel.dto.dart';
-import 'package:sidekick/providers/selected_info_provider.dart';
+
+import '../../dto/channel.dto.dart';
+import '../../providers/selected_info_provider.dart';
+import '../atoms/typography.dart';
+import 'version_install_button.dart';
 
 class ChannelShowcase extends StatelessWidget {
   final ChannelDto channel;

diff --git a/lib/components/molecules/delete_dialog.dart b/lib/components/molecules/delete_dialog.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:sidekick/dto/release.dto.dart';
+
+import '../../dto/release.dto.dart';
 
 void showDeleteDialog(
   BuildContext context, {

diff --git a/lib/components/molecules/empty_data_set/empty_packages.dart b/lib/components/molecules/empty_data_set/empty_packages.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/empty_data_set.dart';
-import 'package:sidekick/modules/settings/settings.screen.dart';
+
+import '../../../modules/settings/settings.screen.dart';
+import '../../atoms/empty_data_set.dart';
 
 class EmptyPackages extends StatelessWidget {
   const EmptyPackages({Key key}) : super(key: key);

diff --git a/lib/components/molecules/empty_data_set/empty_projects.dart b/lib/components/molecules/empty_data_set/empty_projects.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/empty_data_set.dart';
-import 'package:sidekick/modules/settings/settings.screen.dart';
+
+import '../../../modules/settings/settings.screen.dart';
+import '../../atoms/empty_data_set.dart';
 
 class EmptyProjects extends StatelessWidget {
   const EmptyProjects({key}) : super(key: key);

diff --git a/lib/components/molecules/empty_data_set/empty_versions.dart b/lib/components/molecules/empty_data_set/empty_versions.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:sidekick/components/atoms/empty_data_set.dart';
-import 'package:sidekick/providers/navigation_provider.dart';
+
+import '../../../providers/navigation_provider.dart';
+import '../../atoms/empty_data_set.dart';
 
 class EmptyVersions extends StatelessWidget {
   const EmptyVersions({Key key}) : super(key: key);

diff --git a/lib/components/molecules/github_repo_info.dart b/lib/components/molecules/github_repo_info.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:github/github.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/utils/open_link.dart';
+
+import '../../utils/open_link.dart';
 
 class GithubRepoInfo extends StatelessWidget {
   final Repository repo;

diff --git a/lib/components/molecules/package_item.dart b/lib/components/molecules/package_item.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:sidekick/components/atoms/list_tile.dart';
-import 'package:sidekick/components/atoms/typography.dart';
-import 'package:sidekick/components/molecules/github_repo_info.dart';
-import 'package:sidekick/components/molecules/package_score_display.dart';
-import 'package:sidekick/dto/package_detail.dto.dart';
-import 'package:sidekick/utils/open_link.dart';
+
+import '../../dto/package_detail.dto.dart';
+import '../../utils/open_link.dart';
+import '../atoms/list_tile.dart';
+import '../atoms/typography.dart';
+import 'github_repo_info.dart';
+import 'package_score_display.dart';
 
 class PackageItem extends StatelessWidget {
   final PackageDetail package;

diff --git a/lib/components/molecules/package_score_display.dart b/lib/components/molecules/package_score_display.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:pub_api_client/pub_api_client.dart';
-import 'package:sidekick/components/atoms/typography.dart';
+
+import '../atoms/typography.dart';
 
 class PackageScoreDisplay extends StatelessWidget {
   final PackageScore score;