From b18bef78db627bfe75b35bb3a742ed905805ed9c Mon Sep 17 00:00:00 2001 From: Bruno Gabriel dos Santos Date: Thu, 31 Oct 2024 12:17:17 -0300 Subject: [PATCH] style: add relative imports style --- pokedex/.metadata | 10 +-- pokedex/analysis_options.yaml | 1 + pokedex/lib/design/components/badge_type.dart | 7 +- .../design/components/circular_matrix.dart | 2 +- pokedex/lib/design/components/error_page.dart | 5 +- .../lib/design/components/loading_page.dart | 2 +- .../components/pokemon_information.dart | 9 +-- pokedex/lib/design/components/stat_line.dart | 5 +- .../extensions/design_string_extensions.dart | 2 +- .../feature/about/domain/about_use_case.dart | 5 +- .../about/presentation/cubit/about_cubit.dart | 4 +- .../about/presentation/page/about_page.dart | 11 +-- .../presentation/widgets/about_success.dart | 21 +++--- .../presentation/widgets/about_tile.dart | 4 +- .../widgets/about_weaknesses_list.dart | 4 +- .../presentation/cubit/details_cubit.dart | 2 +- .../presentation/page/details_page.dart | 17 ++--- .../presentation/widgets/details_header.dart | 10 +-- .../presentation/widgets/details_success.dart | 11 +-- .../evolution/domain/evolution_use_case.dart | 7 +- .../domain/mapper/evolution_mapper.dart | 7 +- .../presentation/cubit/evolution_cubit.dart | 4 +- .../presentation/page/evolution_page.dart | 13 ++-- .../widgets/evolution_chain_chart.dart | 4 +- .../widgets/evolution_empty_state.dart | 11 +-- .../widgets/evolution_method_chart.dart | 2 +- .../widgets/evolution_success.dart | 13 ++-- .../presentation/widgets/pokemon_chart.dart | 6 +- .../presentation/bloc/pokemons_bloc.dart | 5 +- .../presentation/page/pokemons_page.dart | 8 +-- .../presentation/widgets/pokemon_card.dart | 12 ++-- .../widgets/pokemons_success.dart | 12 ++-- .../search/domain/search_use_case.dart | 2 +- .../presentation/cubit/search_cubit.dart | 2 +- .../search/presentation/page/search_page.dart | 8 +-- .../widgets/search_pokemon_delegate.dart | 11 +-- .../presentation/widgets/search_success.dart | 4 +- .../stats/domain/entities/stats_entity.dart | 5 +- .../feature/stats/domain/stats_use_case.dart | 11 +-- .../stats/presentation/cubit/stats_cubit.dart | 4 +- .../stats/presentation/page/stats_page.dart | 11 +-- .../presentation/widgets/stats_success.dart | 19 +++--- .../widgets/stats_types_list.dart | 68 +++++++++---------- pokedex/lib/main.dart | 6 +- pokedex/lib/routes/app_routes.dart | 6 +- .../shared/extensions/list_extensions.dart | 2 +- .../extensions/pokemon_type_extensions.dart | 4 +- pokedex/pubspec.yaml | 2 +- 48 files changed, 210 insertions(+), 191 deletions(-) diff --git a/pokedex/.metadata b/pokedex/.metadata index c689480..706ff77 100644 --- a/pokedex/.metadata +++ b/pokedex/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "2663184aa79047d0a33a14a3b607954f8fdd8730" + revision: "603104015dd692ea3403755b55d07813d5cf8965" channel: "stable" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + create_revision: 603104015dd692ea3403755b55d07813d5cf8965 + base_revision: 603104015dd692ea3403755b55d07813d5cf8965 - platform: android - create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + create_revision: 603104015dd692ea3403755b55d07813d5cf8965 + base_revision: 603104015dd692ea3403755b55d07813d5cf8965 # User provided section diff --git a/pokedex/analysis_options.yaml b/pokedex/analysis_options.yaml index fe275d2..6fa6223 100644 --- a/pokedex/analysis_options.yaml +++ b/pokedex/analysis_options.yaml @@ -15,6 +15,7 @@ linter: - prefer_single_quotes - curly_braces_in_flow_control_structures - slash_for_doc_comments + - prefer_relative_imports analyzer: exclude: diff --git a/pokedex/lib/design/components/badge_type.dart b/pokedex/lib/design/components/badge_type.dart index 8b110b0..3474598 100644 --- a/pokedex/lib/design/components/badge_type.dart +++ b/pokedex/lib/design/components/badge_type.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/extensions/design_string_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../shared/extensions/string_extensions.dart'; +import '../constants/pokedex_spacing.dart'; +import '../extensions/design_string_extensions.dart'; class BadgeType extends StatelessWidget { const BadgeType({ diff --git a/pokedex/lib/design/components/circular_matrix.dart b/pokedex/lib/design/components/circular_matrix.dart index 2dc889b..27ab232 100644 --- a/pokedex/lib/design/components/circular_matrix.dart +++ b/pokedex/lib/design/components/circular_matrix.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; +import '../constants/pokedex_spacing.dart'; class CircularMatrix extends StatelessWidget { const CircularMatrix({ diff --git a/pokedex/lib/design/components/error_page.dart b/pokedex/lib/design/components/error_page.dart index e261368..26a5810 100644 --- a/pokedex/lib/design/components/error_page.dart +++ b/pokedex/lib/design/components/error_page.dart @@ -3,8 +3,9 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../shared/extensions/string_extensions.dart'; +import '../constants/pokedex_spacing.dart'; class ErrorPage extends StatelessWidget { const ErrorPage({ diff --git a/pokedex/lib/design/components/loading_page.dart b/pokedex/lib/design/components/loading_page.dart index 4578cbc..017f17a 100644 --- a/pokedex/lib/design/components/loading_page.dart +++ b/pokedex/lib/design/components/loading_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; +import '../../shared/extensions/string_extensions.dart'; class LoadingPage extends StatelessWidget { const LoadingPage({ diff --git a/pokedex/lib/design/components/pokemon_information.dart b/pokedex/lib/design/components/pokemon_information.dart index 67fe723..aab32ea 100644 --- a/pokedex/lib/design/components/pokemon_information.dart +++ b/pokedex/lib/design/components/pokemon_information.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/badge_type.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../shared/extensions/int_extensions.dart'; +import '../../shared/extensions/string_extensions.dart'; +import '../constants/pokedex_spacing.dart'; +import 'badge_type.dart'; class PokemonInformation extends StatelessWidget { const PokemonInformation({ diff --git a/pokedex/lib/design/components/stat_line.dart b/pokedex/lib/design/components/stat_line.dart index 805b0cf..f4b4eb5 100644 --- a/pokedex/lib/design/components/stat_line.dart +++ b/pokedex/lib/design/components/stat_line.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/components/stat_chart.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; + +import '../constants/pokedex_theme_data.dart'; +import 'stat_chart.dart'; class StatLine extends StatelessWidget { const StatLine({ diff --git a/pokedex/lib/design/extensions/design_string_extensions.dart b/pokedex/lib/design/extensions/design_string_extensions.dart index 53a86a4..a9a47ff 100644 --- a/pokedex/lib/design/extensions/design_string_extensions.dart +++ b/pokedex/lib/design/extensions/design_string_extensions.dart @@ -1,4 +1,4 @@ -import 'package:pokedex_flutter/design/constants/pokedex_type_color.dart'; +import '../constants/pokedex_type_color.dart'; extension DesignStringExtensions on String { PokedexTypeColor get pokemonColor => PokedexTypeColor.values.firstWhere( diff --git a/pokedex/lib/feature/about/domain/about_use_case.dart b/pokedex/lib/feature/about/domain/about_use_case.dart index 1dc2eb0..ad6cd62 100644 --- a/pokedex/lib/feature/about/domain/about_use_case.dart +++ b/pokedex/lib/feature/about/domain/about_use_case.dart @@ -1,8 +1,9 @@ import 'package:collection/collection.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/about/domain/entity/about_entity.dart'; -import 'package:pokedex_flutter/shared/extensions/type_extensions.dart'; + +import '../../../shared/extensions/type_extensions.dart'; +import 'entity/about_entity.dart'; abstract class AboutUseCase { Future getAbout(Pokemon pokemon); diff --git a/pokedex/lib/feature/about/presentation/cubit/about_cubit.dart b/pokedex/lib/feature/about/presentation/cubit/about_cubit.dart index 5e1190a..ec5f332 100644 --- a/pokedex/lib/feature/about/presentation/cubit/about_cubit.dart +++ b/pokedex/lib/feature/about/presentation/cubit/about_cubit.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/about/domain/about_use_case.dart'; -import 'package:pokedex_flutter/feature/about/domain/entity/about_entity.dart'; +import '../../domain/about_use_case.dart'; +import '../../domain/entity/about_entity.dart'; part 'about_state.dart'; diff --git a/pokedex/lib/feature/about/presentation/page/about_page.dart b/pokedex/lib/feature/about/presentation/page/about_page.dart index f73c165..05cd987 100644 --- a/pokedex/lib/feature/about/presentation/page/about_page.dart +++ b/pokedex/lib/feature/about/presentation/page/about_page.dart @@ -2,11 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/feature/about/presentation/cubit/about_cubit.dart'; -import 'package:pokedex_flutter/feature/about/presentation/widgets/about_success.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; + +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../cubit/about_cubit.dart'; +import '../widgets/about_success.dart'; class AboutPage extends StatefulWidget { const AboutPage({ diff --git a/pokedex/lib/feature/about/presentation/widgets/about_success.dart b/pokedex/lib/feature/about/presentation/widgets/about_success.dart index 34d2ace..adabce7 100644 --- a/pokedex/lib/feature/about/presentation/widgets/about_success.dart +++ b/pokedex/lib/feature/about/presentation/widgets/about_success.dart @@ -1,16 +1,17 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_type_color.dart'; -import 'package:pokedex_flutter/feature/about/presentation/constants/about_strings.dart'; -import 'package:pokedex_flutter/feature/about/presentation/cubit/about_cubit.dart'; -import 'package:pokedex_flutter/feature/about/presentation/widgets/about_tile.dart'; -import 'package:pokedex_flutter/feature/about/presentation/widgets/about_weaknesses_list.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../design/constants/pokedex_type_color.dart'; +import '../../../../shared/extensions/int_extensions.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; +import '../constants/about_strings.dart'; +import '../cubit/about_cubit.dart'; +import 'about_tile.dart'; +import 'about_weaknesses_list.dart'; class AboutSuccess extends StatelessWidget { const AboutSuccess({ diff --git a/pokedex/lib/feature/about/presentation/widgets/about_tile.dart b/pokedex/lib/feature/about/presentation/widgets/about_tile.dart index 05f3182..83cd945 100644 --- a/pokedex/lib/feature/about/presentation/widgets/about_tile.dart +++ b/pokedex/lib/feature/about/presentation/widgets/about_tile.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; class AboutTile extends StatelessWidget { const AboutTile({ diff --git a/pokedex/lib/feature/about/presentation/widgets/about_weaknesses_list.dart b/pokedex/lib/feature/about/presentation/widgets/about_weaknesses_list.dart index a7a3fac..906a4ef 100644 --- a/pokedex/lib/feature/about/presentation/widgets/about_weaknesses_list.dart +++ b/pokedex/lib/feature/about/presentation/widgets/about_weaknesses_list.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/components/badge_type.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; +import '../../../../design/components/badge_type.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; class AboutWeaknessesList extends StatelessWidget { const AboutWeaknessesList({super.key, required this.weaknesses}); diff --git a/pokedex/lib/feature/details/presentation/cubit/details_cubit.dart b/pokedex/lib/feature/details/presentation/cubit/details_cubit.dart index 98e7933..ace3ffc 100644 --- a/pokedex/lib/feature/details/presentation/cubit/details_cubit.dart +++ b/pokedex/lib/feature/details/presentation/cubit/details_cubit.dart @@ -1,7 +1,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/details/domain/details_use_case.dart'; +import '../../domain/details_use_case.dart'; part 'details_state.dart'; diff --git a/pokedex/lib/feature/details/presentation/page/details_page.dart b/pokedex/lib/feature/details/presentation/page/details_page.dart index 11116ee..bebdd23 100644 --- a/pokedex/lib/feature/details/presentation/page/details_page.dart +++ b/pokedex/lib/feature/details/presentation/page/details_page.dart @@ -4,14 +4,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; import 'package:go_router/go_router.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/feature/details/presentation/cubit/details_cubit.dart'; -import 'package:pokedex_flutter/feature/details/presentation/widgets/details_success.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; +import '../cubit/details_cubit.dart'; +import '../widgets/details_success.dart'; class DetailsPage extends StatefulWidget { const DetailsPage({ diff --git a/pokedex/lib/feature/details/presentation/widgets/details_header.dart b/pokedex/lib/feature/details/presentation/widgets/details_header.dart index 06c7682..801de20 100644 --- a/pokedex/lib/feature/details/presentation/widgets/details_header.dart +++ b/pokedex/lib/feature/details/presentation/widgets/details_header.dart @@ -2,11 +2,11 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/circular_matrix.dart'; -import 'package:pokedex_flutter/design/components/pokemon_information.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; +import '../../../../design/components/circular_matrix.dart'; +import '../../../../design/components/pokemon_information.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../shared/extensions/int_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; class DetailsHeader extends StatelessWidget { const DetailsHeader({super.key, required this.pokemon}); diff --git a/pokedex/lib/feature/details/presentation/widgets/details_success.dart b/pokedex/lib/feature/details/presentation/widgets/details_success.dart index 0472911..8355180 100644 --- a/pokedex/lib/feature/details/presentation/widgets/details_success.dart +++ b/pokedex/lib/feature/details/presentation/widgets/details_success.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/feature/about/presentation/page/about_page.dart'; -import 'package:pokedex_flutter/feature/details/presentation/widgets/details_header.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/page/evolution_page.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/page/stats_page.dart'; + +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../about/presentation/page/about_page.dart'; +import '../../../evolution/presentation/page/evolution_page.dart'; +import '../../../stats/presentation/page/stats_page.dart'; +import 'details_header.dart'; class DetailsSuccess extends StatefulWidget { const DetailsSuccess({super.key, required this.pokemon}); diff --git a/pokedex/lib/feature/evolution/domain/evolution_use_case.dart b/pokedex/lib/feature/evolution/domain/evolution_use_case.dart index 33696fa..ae726a3 100644 --- a/pokedex/lib/feature/evolution/domain/evolution_use_case.dart +++ b/pokedex/lib/feature/evolution/domain/evolution_use_case.dart @@ -2,9 +2,10 @@ import 'dart:collection'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/entity/evolution_entity.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/mapper/evolution_mapper.dart'; -import 'package:pokedex_flutter/shared/data/pair.dart'; + +import '../../../shared/data/pair.dart'; +import 'entity/evolution_entity.dart'; +import 'mapper/evolution_mapper.dart'; abstract class EvolutionUseCase { Future getEvoluions(Pokemon pokemon); diff --git a/pokedex/lib/feature/evolution/domain/mapper/evolution_mapper.dart b/pokedex/lib/feature/evolution/domain/mapper/evolution_mapper.dart index 03d3e0f..e6117e5 100644 --- a/pokedex/lib/feature/evolution/domain/mapper/evolution_mapper.dart +++ b/pokedex/lib/feature/evolution/domain/mapper/evolution_mapper.dart @@ -1,8 +1,9 @@ import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/entity/evolution_entity.dart'; -import 'package:pokedex_flutter/shared/data/pair.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../../../shared/data/pair.dart'; +import '../../../../shared/extensions/string_extensions.dart'; +import '../entity/evolution_entity.dart'; abstract class EvolutionMapper { EvolutionDescriptionEntity toEntity(Pair pair); diff --git a/pokedex/lib/feature/evolution/presentation/cubit/evolution_cubit.dart b/pokedex/lib/feature/evolution/presentation/cubit/evolution_cubit.dart index d86f4b6..76cc25a 100644 --- a/pokedex/lib/feature/evolution/presentation/cubit/evolution_cubit.dart +++ b/pokedex/lib/feature/evolution/presentation/cubit/evolution_cubit.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/entity/evolution_entity.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/evolution_use_case.dart'; +import '../../domain/entity/evolution_entity.dart'; +import '../../domain/evolution_use_case.dart'; part 'evolution_state.dart'; diff --git a/pokedex/lib/feature/evolution/presentation/page/evolution_page.dart b/pokedex/lib/feature/evolution/presentation/page/evolution_page.dart index 9a353d3..60d921c 100644 --- a/pokedex/lib/feature/evolution/presentation/page/evolution_page.dart +++ b/pokedex/lib/feature/evolution/presentation/page/evolution_page.dart @@ -2,12 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/cubit/evolution_cubit.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/widgets/evolution_empty_state.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/widgets/evolution_success.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; + +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../cubit/evolution_cubit.dart'; +import '../widgets/evolution_empty_state.dart'; +import '../widgets/evolution_success.dart'; class EvolutionPage extends StatefulWidget { const EvolutionPage({super.key, required this.pokemon}); diff --git a/pokedex/lib/feature/evolution/presentation/widgets/evolution_chain_chart.dart b/pokedex/lib/feature/evolution/presentation/widgets/evolution_chain_chart.dart index ce82579..46861c1 100644 --- a/pokedex/lib/feature/evolution/presentation/widgets/evolution_chain_chart.dart +++ b/pokedex/lib/feature/evolution/presentation/widgets/evolution_chain_chart.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/widgets/evolution_method_chart.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/widgets/pokemon_chart.dart'; +import 'evolution_method_chart.dart'; +import 'pokemon_chart.dart'; class EvolutionChainChart extends StatelessWidget { const EvolutionChainChart({ diff --git a/pokedex/lib/feature/evolution/presentation/widgets/evolution_empty_state.dart b/pokedex/lib/feature/evolution/presentation/widgets/evolution_empty_state.dart index f58b9e8..5f194f9 100644 --- a/pokedex/lib/feature/evolution/presentation/widgets/evolution_empty_state.dart +++ b/pokedex/lib/feature/evolution/presentation/widgets/evolution_empty_state.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/constants/evolution_strings.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/cubit/evolution_cubit.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; + +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../constants/evolution_strings.dart'; +import '../cubit/evolution_cubit.dart'; class EvolutionEmptyState extends StatelessWidget { const EvolutionEmptyState({super.key}); diff --git a/pokedex/lib/feature/evolution/presentation/widgets/evolution_method_chart.dart b/pokedex/lib/feature/evolution/presentation/widgets/evolution_method_chart.dart index 59ed668..0fd1f61 100644 --- a/pokedex/lib/feature/evolution/presentation/widgets/evolution_method_chart.dart +++ b/pokedex/lib/feature/evolution/presentation/widgets/evolution_method_chart.dart @@ -1,7 +1,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; class EvolutionMethodChart extends StatelessWidget { const EvolutionMethodChart({ diff --git a/pokedex/lib/feature/evolution/presentation/widgets/evolution_success.dart b/pokedex/lib/feature/evolution/presentation/widgets/evolution_success.dart index 7963f43..c38657f 100644 --- a/pokedex/lib/feature/evolution/presentation/widgets/evolution_success.dart +++ b/pokedex/lib/feature/evolution/presentation/widgets/evolution_success.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/feature/evolution/domain/entity/evolution_entity.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/constants/evolution_strings.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/cubit/evolution_cubit.dart'; -import 'package:pokedex_flutter/feature/evolution/presentation/widgets/evolution_chain_chart.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; + +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../../domain/entity/evolution_entity.dart'; +import '../constants/evolution_strings.dart'; +import '../cubit/evolution_cubit.dart'; +import 'evolution_chain_chart.dart'; class EvolutionSuccess extends StatelessWidget { const EvolutionSuccess({super.key}); diff --git a/pokedex/lib/feature/evolution/presentation/widgets/pokemon_chart.dart b/pokedex/lib/feature/evolution/presentation/widgets/pokemon_chart.dart index 1d393d0..8461804 100644 --- a/pokedex/lib/feature/evolution/presentation/widgets/pokemon_chart.dart +++ b/pokedex/lib/feature/evolution/presentation/widgets/pokemon_chart.dart @@ -1,9 +1,9 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/extensions/int_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; class PokemonChart extends StatelessWidget { const PokemonChart({ diff --git a/pokedex/lib/feature/pokemons/presentation/bloc/pokemons_bloc.dart b/pokedex/lib/feature/pokemons/presentation/bloc/pokemons_bloc.dart index 7e9cdd6..8abbc9e 100644 --- a/pokedex/lib/feature/pokemons/presentation/bloc/pokemons_bloc.dart +++ b/pokedex/lib/feature/pokemons/presentation/bloc/pokemons_bloc.dart @@ -2,8 +2,9 @@ import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/pokemons/domain/pokemons_use_case.dart'; -import 'package:pokedex_flutter/shared/events/event_transformations.dart'; + +import '../../../../shared/events/event_transformations.dart'; +import '../../domain/pokemons_use_case.dart'; part 'pokemons_event.dart'; part 'pokemons_state.dart'; diff --git a/pokedex/lib/feature/pokemons/presentation/page/pokemons_page.dart b/pokedex/lib/feature/pokemons/presentation/page/pokemons_page.dart index f8fd281..8dce65d 100644 --- a/pokedex/lib/feature/pokemons/presentation/page/pokemons_page.dart +++ b/pokedex/lib/feature/pokemons/presentation/page/pokemons_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/bloc/pokemons_bloc.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/widgets/pokemons_success.dart'; +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../bloc/pokemons_bloc.dart'; +import '../widgets/pokemons_success.dart'; class PokemonsPage extends StatelessWidget { const PokemonsPage({super.key}); diff --git a/pokedex/lib/feature/pokemons/presentation/widgets/pokemon_card.dart b/pokedex/lib/feature/pokemons/presentation/widgets/pokemon_card.dart index 4d322ce..4e62fb4 100644 --- a/pokedex/lib/feature/pokemons/presentation/widgets/pokemon_card.dart +++ b/pokedex/lib/feature/pokemons/presentation/widgets/pokemon_card.dart @@ -2,12 +2,12 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/circular_matrix.dart'; -import 'package:pokedex_flutter/design/components/pokemon_information.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; +import '../../../../design/components/circular_matrix.dart'; +import '../../../../design/components/pokemon_information.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../shared/extensions/int_extensions.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; class PokemonCard extends StatelessWidget { const PokemonCard({ diff --git a/pokedex/lib/feature/pokemons/presentation/widgets/pokemons_success.dart b/pokedex/lib/feature/pokemons/presentation/widgets/pokemons_success.dart index 74f00e4..04e2498 100644 --- a/pokedex/lib/feature/pokemons/presentation/widgets/pokemons_success.dart +++ b/pokedex/lib/feature/pokemons/presentation/widgets/pokemons_success.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/bloc/pokemons_bloc.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/constants/pokemons_strings.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/widgets/pokemon_card.dart'; +import '../../../../design/components/loading_page.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../bloc/pokemons_bloc.dart'; +import '../constants/pokemons_strings.dart'; +import 'pokemon_card.dart'; class PokemonsSuccess extends StatefulWidget { const PokemonsSuccess({super.key}); diff --git a/pokedex/lib/feature/search/domain/search_use_case.dart b/pokedex/lib/feature/search/domain/search_use_case.dart index 6a81cd5..bb6c16f 100644 --- a/pokedex/lib/feature/search/domain/search_use_case.dart +++ b/pokedex/lib/feature/search/domain/search_use_case.dart @@ -1,6 +1,6 @@ import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/cache/application_cache.dart'; +import '../../../cache/application_cache.dart'; abstract class SearchUseCase { Future> getAllPokemons(); diff --git a/pokedex/lib/feature/search/presentation/cubit/search_cubit.dart b/pokedex/lib/feature/search/presentation/cubit/search_cubit.dart index ece099b..1a98a6b 100644 --- a/pokedex/lib/feature/search/presentation/cubit/search_cubit.dart +++ b/pokedex/lib/feature/search/presentation/cubit/search_cubit.dart @@ -2,7 +2,7 @@ import 'package:equatable/equatable.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/search/domain/search_use_case.dart'; +import '../../domain/search_use_case.dart'; part 'search_state.dart'; diff --git a/pokedex/lib/feature/search/presentation/page/search_page.dart b/pokedex/lib/feature/search/presentation/page/search_page.dart index b98c489..c2842fc 100644 --- a/pokedex/lib/feature/search/presentation/page/search_page.dart +++ b/pokedex/lib/feature/search/presentation/page/search_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/feature/search/presentation/cubit/search_cubit.dart'; -import 'package:pokedex_flutter/feature/search/presentation/widgets/search_success.dart'; +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../cubit/search_cubit.dart'; +import '../widgets/search_success.dart'; class SearchPage extends StatelessWidget { const SearchPage({super.key}); diff --git a/pokedex/lib/feature/search/presentation/widgets/search_pokemon_delegate.dart b/pokedex/lib/feature/search/presentation/widgets/search_pokemon_delegate.dart index 2e9af7a..0409eb4 100644 --- a/pokedex/lib/feature/search/presentation/widgets/search_pokemon_delegate.dart +++ b/pokedex/lib/feature/search/presentation/widgets/search_pokemon_delegate.dart @@ -2,11 +2,12 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/feature/search/presentation/constants/search_strings.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/extensions/int_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; +import '../constants/search_strings.dart'; class SearchPokemonDelegate extends SearchDelegate { SearchPokemonDelegate( diff --git a/pokedex/lib/feature/search/presentation/widgets/search_success.dart b/pokedex/lib/feature/search/presentation/widgets/search_success.dart index 5f96e7e..0099529 100644 --- a/pokedex/lib/feature/search/presentation/widgets/search_success.dart +++ b/pokedex/lib/feature/search/presentation/widgets/search_success.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:pokedex_flutter/feature/search/presentation/cubit/search_cubit.dart'; -import 'package:pokedex_flutter/feature/search/presentation/widgets/search_pokemon_delegate.dart'; +import '../cubit/search_cubit.dart'; +import 'search_pokemon_delegate.dart'; class SearchSuccess extends StatefulWidget { const SearchSuccess({super.key}); diff --git a/pokedex/lib/feature/stats/domain/entities/stats_entity.dart b/pokedex/lib/feature/stats/domain/entities/stats_entity.dart index 6e82c5e..01c6f2a 100644 --- a/pokedex/lib/feature/stats/domain/entities/stats_entity.dart +++ b/pokedex/lib/feature/stats/domain/entities/stats_entity.dart @@ -1,6 +1,7 @@ import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/stats/domain/entities/stats_value_entity.dart'; -import 'package:pokedex_flutter/shared/data/pair.dart'; + +import '../../../../shared/data/pair.dart'; +import 'stats_value_entity.dart'; class StatsEntity { StatsEntity({ diff --git a/pokedex/lib/feature/stats/domain/stats_use_case.dart b/pokedex/lib/feature/stats/domain/stats_use_case.dart index 063bc6c..a8fb0ae 100644 --- a/pokedex/lib/feature/stats/domain/stats_use_case.dart +++ b/pokedex/lib/feature/stats/domain/stats_use_case.dart @@ -1,11 +1,12 @@ import 'package:collection/collection.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/stats/domain/entities/stats_entity.dart'; -import 'package:pokedex_flutter/feature/stats/domain/entities/stats_value_entity.dart'; -import 'package:pokedex_flutter/shared/data/pair.dart'; -import 'package:pokedex_flutter/shared/extensions/int_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/type_extensions.dart'; + +import '../../../shared/data/pair.dart'; +import '../../../shared/extensions/int_extensions.dart'; +import '../../../shared/extensions/type_extensions.dart'; +import 'entities/stats_entity.dart'; +import 'entities/stats_value_entity.dart'; abstract class StatsUseCase { Future getStats(Pokemon pokemon); diff --git a/pokedex/lib/feature/stats/presentation/cubit/stats_cubit.dart b/pokedex/lib/feature/stats/presentation/cubit/stats_cubit.dart index 2ca3a65..1439cc7 100644 --- a/pokedex/lib/feature/stats/presentation/cubit/stats_cubit.dart +++ b/pokedex/lib/feature/stats/presentation/cubit/stats_cubit.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:injectable/injectable.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/feature/stats/domain/entities/stats_entity.dart'; -import 'package:pokedex_flutter/feature/stats/domain/stats_use_case.dart'; +import '../../domain/entities/stats_entity.dart'; +import '../../domain/stats_use_case.dart'; part 'stats_state.dart'; diff --git a/pokedex/lib/feature/stats/presentation/page/stats_page.dart b/pokedex/lib/feature/stats/presentation/page/stats_page.dart index 750f749..9787876 100644 --- a/pokedex/lib/feature/stats/presentation/page/stats_page.dart +++ b/pokedex/lib/feature/stats/presentation/page/stats_page.dart @@ -2,11 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:get_it/get_it.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/error_page.dart'; -import 'package:pokedex_flutter/design/components/loading_page.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/cubit/stats_cubit.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/widgets/stats_success.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; + +import '../../../../design/components/error_page.dart'; +import '../../../../design/components/loading_page.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../cubit/stats_cubit.dart'; +import '../widgets/stats_success.dart'; class StatsPage extends StatefulWidget { const StatsPage({ diff --git a/pokedex/lib/feature/stats/presentation/widgets/stats_success.dart b/pokedex/lib/feature/stats/presentation/widgets/stats_success.dart index f21bcb5..27cdbd3 100644 --- a/pokedex/lib/feature/stats/presentation/widgets/stats_success.dart +++ b/pokedex/lib/feature/stats/presentation/widgets/stats_success.dart @@ -1,15 +1,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/components/stat_line.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/feature/stats/domain/entities/stats_value_entity.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/cubit/stats_cubit.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/strings/stats_strings.dart'; -import 'package:pokedex_flutter/feature/stats/presentation/widgets/stats_types_list.dart'; -import 'package:pokedex_flutter/shared/extensions/pokemon_type_extensions.dart'; -import 'package:pokedex_flutter/shared/extensions/string_extensions.dart'; + +import '../../../../design/components/stat_line.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/extensions/pokemon_type_extensions.dart'; +import '../../../../shared/extensions/string_extensions.dart'; +import '../../domain/entities/stats_value_entity.dart'; +import '../cubit/stats_cubit.dart'; +import '../strings/stats_strings.dart'; +import 'stats_types_list.dart'; class StatsSuccess extends StatefulWidget { const StatsSuccess({ diff --git a/pokedex/lib/feature/stats/presentation/widgets/stats_types_list.dart b/pokedex/lib/feature/stats/presentation/widgets/stats_types_list.dart index 0107480..ac7ebd8 100644 --- a/pokedex/lib/feature/stats/presentation/widgets/stats_types_list.dart +++ b/pokedex/lib/feature/stats/presentation/widgets/stats_types_list.dart @@ -1,10 +1,10 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/components/badge_type.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_spacing.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/shared/data/pair.dart'; -import 'package:pokedex_flutter/shared/extensions/double_extensions.dart'; +import '../../../../design/components/badge_type.dart'; +import '../../../../design/constants/pokedex_spacing.dart'; +import '../../../../design/constants/pokedex_theme_data.dart'; +import '../../../../shared/data/pair.dart'; +import '../../../../shared/extensions/double_extensions.dart'; class StatsTypesList extends StatelessWidget { const StatsTypesList({ @@ -26,38 +26,36 @@ class StatsTypesList extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - ...slices - .map( - (types) => Padding( - padding: const EdgeInsets.only(bottom: PokedexSpacing.kM), - child: Row( - children: [ - ...types.map( - (type) => Padding( - padding: const EdgeInsets.only( - right: PokedexSpacing.kS, + ...slices.map( + (types) => Padding( + padding: const EdgeInsets.only(bottom: PokedexSpacing.kM), + child: Row( + children: [ + ...types.map( + (type) => Padding( + padding: const EdgeInsets.only( + right: PokedexSpacing.kS, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + BadgeType.circular( + type: type.first, + diameter: 34, + diameterPadding: 6, ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - BadgeType.circular( - type: type.first, - diameter: 34, - diameterPadding: 6, - ), - Text( - type.second.toEffectivenessFactor(), - style: textTheme, - ), - ], + Text( + type.second.toEffectivenessFactor(), + style: textTheme, ), - ), - ) - ], - ), - ), - ) - + ], + ), + ), + ) + ], + ), + ), + ) ], ); }, diff --git a/pokedex/lib/main.dart b/pokedex/lib/main.dart index 92c0d83..5d5c5fb 100644 --- a/pokedex/lib/main.dart +++ b/pokedex/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_theme_data.dart'; -import 'package:pokedex_flutter/di/injection.dart'; -import 'package:pokedex_flutter/routes/app_routes.dart'; +import 'design/constants/pokedex_theme_data.dart'; +import 'di/injection.dart'; +import 'routes/app_routes.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/pokedex/lib/routes/app_routes.dart b/pokedex/lib/routes/app_routes.dart index 4f80395..dd22116 100644 --- a/pokedex/lib/routes/app_routes.dart +++ b/pokedex/lib/routes/app_routes.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; -import 'package:pokedex_flutter/feature/details/presentation/page/details_page.dart'; -import 'package:pokedex_flutter/feature/pokemons/presentation/page/pokemons_page.dart'; -import 'package:pokedex_flutter/feature/search/presentation/page/search_page.dart'; +import '../feature/details/presentation/page/details_page.dart'; +import '../feature/pokemons/presentation/page/pokemons_page.dart'; +import '../feature/search/presentation/page/search_page.dart'; abstract class AppRoutes { static GoRouter router = GoRouter( diff --git a/pokedex/lib/shared/extensions/list_extensions.dart b/pokedex/lib/shared/extensions/list_extensions.dart index 665d2cd..e2176fc 100644 --- a/pokedex/lib/shared/extensions/list_extensions.dart +++ b/pokedex/lib/shared/extensions/list_extensions.dart @@ -1,4 +1,4 @@ -import 'package:pokedex_flutter/shared/data/pair.dart'; +import '../data/pair.dart'; extension ListExtensions on List { List> zip(List next) { diff --git a/pokedex/lib/shared/extensions/pokemon_type_extensions.dart b/pokedex/lib/shared/extensions/pokemon_type_extensions.dart index d9a34d5..cd48273 100644 --- a/pokedex/lib/shared/extensions/pokemon_type_extensions.dart +++ b/pokedex/lib/shared/extensions/pokemon_type_extensions.dart @@ -1,6 +1,6 @@ import 'package:pokedex/pokedex.dart'; -import 'package:pokedex_flutter/design/constants/pokedex_type_color.dart'; -import 'package:pokedex_flutter/design/extensions/design_string_extensions.dart'; +import '../../design/constants/pokedex_type_color.dart'; +import '../../design/extensions/design_string_extensions.dart'; extension PokemonTypeExtensions on PokemonType { PokedexTypeColor get color => type.name.pokemonColor; diff --git a/pokedex/pubspec.yaml b/pokedex/pubspec.yaml index d3c3d42..1444bf9 100644 --- a/pokedex/pubspec.yaml +++ b/pokedex/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.5.3 + sdk: ^3.5.4 dependencies: flutter: