From cc63344d86c82d0b707ae8c8eca71c38c822df3e Mon Sep 17 00:00:00 2001 From: Serxiolog Date: Sun, 24 Nov 2024 21:19:36 +0400 Subject: [PATCH] Design fix --- lib/Components/extensions/context_x.dart | 3 +- lib/Components/locale/l10n/app_locale.dart | 25 ++++++------ lib/Components/utils/debounce.dart | 7 +++- lib/data/dtos/anime_dto.dart | 6 +-- lib/data/dtos/anime_dto.g.dart | 9 ++--- lib/data/mappers/anime_mapper.dart | 22 ++++++----- lib/data/repositories/anime_repository.dart | 38 +++++++++--------- lib/data/repositories/api_interface.dart | 3 +- lib/data/repositories/mock_repository.dart | 7 ++-- lib/main.dart | 7 ++-- lib/presentation/common/svg_objects.dart | 1 - lib/presentation/home_page/bloc/bloc.dart | 3 +- lib/presentation/home_page/bloc/events.dart | 3 +- lib/presentation/home_page/bloc/state.dart | 6 +-- lib/presentation/home_page/bloc/state.g.dart | 3 +- lib/presentation/home_page/card.dart | 12 ++---- lib/presentation/home_page/home_page.dart | 39 +++++++------------ lib/presentation/like_bloc/like_bloc.dart | 4 +- lib/presentation/like_bloc/like_event.dart | 2 +- lib/presentation/like_bloc/like_state.dart | 2 +- lib/presentation/locale_bloc/locale_bloc.dart | 5 ++- .../locale_bloc/locale_events.dart | 2 +- .../locale_bloc/locale_state.dart | 3 +- .../locale_bloc/locale_state.g.dart | 12 +++--- 24 files changed, 94 insertions(+), 130 deletions(-) diff --git a/lib/Components/extensions/context_x.dart b/lib/Components/extensions/context_x.dart index 69472f9..e72a258 100644 --- a/lib/Components/extensions/context_x.dart +++ b/lib/Components/extensions/context_x.dart @@ -1,7 +1,6 @@ - import 'package:first_project/Components/locale/l10n/app_locale.dart'; import 'package:flutter/cupertino.dart'; extension LocalContextX on BuildContext { AppLocale get locale => AppLocale.of(this)!; -} \ No newline at end of file +} diff --git a/lib/Components/locale/l10n/app_locale.dart b/lib/Components/locale/l10n/app_locale.dart index 71a191e..3187a6c 100644 --- a/lib/Components/locale/l10n/app_locale.dart +++ b/lib/Components/locale/l10n/app_locale.dart @@ -82,7 +82,8 @@ abstract class AppLocale { /// Additional delegates can be added by appending to this list in /// MaterialApp. This list does not have to be used at all if a custom list /// of delegates is preferred or required. - static const List> localizationsDelegates = >[ + static const List> localizationsDelegates = + >[ delegate, GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, @@ -90,10 +91,7 @@ abstract class AppLocale { ]; /// A list of this localizations delegate's supported locales. - static const List supportedLocales = [ - Locale('en'), - Locale('ru') - ]; + static const List supportedLocales = [Locale('en'), Locale('ru')]; /// No description provided for @search. /// @@ -136,18 +134,17 @@ class _AppLocaleDelegate extends LocalizationsDelegate { } AppLocale lookupAppLocale(Locale locale) { - - // Lookup logic when only language code is specified. switch (locale.languageCode) { - case 'en': return AppLocaleEn(); - case 'ru': return AppLocaleRu(); + case 'en': + return AppLocaleEn(); + case 'ru': + return AppLocaleRu(); } throw FlutterError( - 'AppLocale.delegate failed to load unsupported locale "$locale". This is likely ' - 'an issue with the localizations generation tool. Please file an issue ' - 'on GitHub with a reproducible sample app and the gen-l10n configuration ' - 'that was used.' - ); + 'AppLocale.delegate failed to load unsupported locale "$locale". This is likely ' + 'an issue with the localizations generation tool. Please file an issue ' + 'on GitHub with a reproducible sample app and the gen-l10n configuration ' + 'that was used.'); } diff --git a/lib/Components/utils/debounce.dart b/lib/Components/utils/debounce.dart index 76bf36b..fc6b172 100644 --- a/lib/Components/utils/debounce.dart +++ b/lib/Components/utils/debounce.dart @@ -10,8 +10,11 @@ class Debouce { static Timer? _timer; - static void run(VoidCallback action, {Duration delay = const Duration(milliseconds: 500),}) { + static void run( + VoidCallback action, { + Duration delay = const Duration(milliseconds: 500), + }) { _timer?.cancel(); _timer = Timer(delay, action); } -} \ No newline at end of file +} diff --git a/lib/data/dtos/anime_dto.dart b/lib/data/dtos/anime_dto.dart index 59789b0..01da857 100644 --- a/lib/data/dtos/anime_dto.dart +++ b/lib/data/dtos/anime_dto.dart @@ -44,10 +44,10 @@ class AnimeImagesJpgDto { final String? largeImage; const AnimeImagesJpgDto(this.image, this.smallImage, this.largeImage); - factory AnimeImagesJpgDto.fromJson(Map json) => _$AnimeImagesJpgDtoFromJson(json); + factory AnimeImagesJpgDto.fromJson(Map json) => + _$AnimeImagesJpgDtoFromJson(json); } - @JsonSerializable(createToJson: false) class PaginationDto { @JsonKey(name: "last_visible_page") @@ -59,4 +59,4 @@ class PaginationDto { const PaginationDto({this.current, this.last, this.next}); factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); -} \ No newline at end of file +} diff --git a/lib/data/dtos/anime_dto.g.dart b/lib/data/dtos/anime_dto.g.dart index 0ce59dd..eb908b0 100644 --- a/lib/data/dtos/anime_dto.g.dart +++ b/lib/data/dtos/anime_dto.g.dart @@ -25,22 +25,19 @@ AnimeDataDto _$AnimeDataDtoFromJson(Map json) => AnimeDataDto( (json['score'] as num?)?.toDouble(), ); -AnimeImagesDto _$AnimeImagesDtoFromJson(Map json) => - AnimeImagesDto( +AnimeImagesDto _$AnimeImagesDtoFromJson(Map json) => AnimeImagesDto( jpg: json['jpg'] == null ? null : AnimeImagesJpgDto.fromJson(json['jpg'] as Map), ); -AnimeImagesJpgDto _$AnimeImagesJpgDtoFromJson(Map json) => - AnimeImagesJpgDto( +AnimeImagesJpgDto _$AnimeImagesJpgDtoFromJson(Map json) => AnimeImagesJpgDto( json['image_url'] as String?, json['small_image_url'] as String?, json['large_image_url'] as String?, ); -PaginationDto _$PaginationDtoFromJson(Map json) => - PaginationDto( +PaginationDto _$PaginationDtoFromJson(Map json) => PaginationDto( current: (json['current_page'] as num?)?.toInt(), last: (json['last_visible_page'] as num?)?.toInt(), next: json['has_next_page'] as bool?, diff --git a/lib/data/mappers/anime_mapper.dart b/lib/data/mappers/anime_mapper.dart index b3d355e..a67f30e 100644 --- a/lib/data/mappers/anime_mapper.dart +++ b/lib/data/mappers/anime_mapper.dart @@ -4,17 +4,19 @@ import 'package:first_project/presentation/home_page/home_page.dart'; extension AnimeDataDtoToModel on AnimeDataDto { CardData toDomain() => CardData( - title ?? 'NOT', - imageUrl: images?.jpg?.image ?? "NONE", - score: score ?? 0, - description: synopsis == null ? "NONE" : synopsis!.split('\n').sublist(0, synopsis!.split('\n').length - 1).join('\n'), - id: id.toString(), - ); + title ?? 'NOT', + imageUrl: images?.jpg?.image ?? "NONE", + score: score ?? 0, + description: synopsis == null + ? "NONE" + : synopsis!.split('\n').sublist(0, synopsis!.split('\n').length - 1).join('\n'), + id: id.toString(), + ); } extension AnimesDataDtoToModel on AnimesDto { HomeData toDomain() => HomeData( - data: data?.map((e) => e.toDomain()).toList(), - nextPage: pagination!.next! ? pagination!.current! + 1 : 0, - ); -} \ No newline at end of file + data: data?.map((e) => e.toDomain()).toList(), + nextPage: pagination!.next! ? pagination!.current! + 1 : 0, + ); +} diff --git a/lib/data/repositories/anime_repository.dart b/lib/data/repositories/anime_repository.dart index 9c49fb8..88c07bc 100644 --- a/lib/data/repositories/anime_repository.dart +++ b/lib/data/repositories/anime_repository.dart @@ -8,31 +8,29 @@ import 'package:pretty_dio_logger/pretty_dio_logger.dart'; class AnimeRepository extends ApiInterface { static final Dio _dio = Dio() - ..interceptors.add(PrettyDioLogger( - requestHeader: true, - requestBody: true, - )); + ..interceptors.add(PrettyDioLogger( + requestHeader: true, + requestBody: true, + )); static const String _baseUrl = 'https://api.jikan.moe'; @override - Future loadData({OnErrorCallback? onError,String? q, int page = 1, int pageSize = 25}) async{ - try - { - const String url = '$_baseUrl/v4/anime'; - Map query = {'q' : q, 'page' : page, 'limit' : pageSize}; - final Response response = - await _dio.get>( - url, - queryParameters: query, - ); - final AnimesDto dto = AnimesDto.fromJson(response.data as Map); - final HomeData data = dto.toDomain(); - return data; - } on DioException catch (e) - { + Future loadData( + {OnErrorCallback? onError, String? q, int page = 1, int pageSize = 25}) async { + try { + const String url = '$_baseUrl/v4/anime'; + Map query = {'q': q, 'page': page, 'limit': pageSize}; + final Response response = await _dio.get>( + url, + queryParameters: query, + ); + final AnimesDto dto = AnimesDto.fromJson(response.data as Map); + final HomeData data = dto.toDomain(); + return data; + } on DioException catch (e) { onError?.call(e.error?.toString()); return null; } } -} \ No newline at end of file +} diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index 1e52124..f80ffb7 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -1,4 +1,3 @@ - import 'package:first_project/domain/models/home.dart'; import 'package:first_project/presentation/home_page/home_page.dart'; @@ -6,4 +5,4 @@ typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { Future loadData({OnErrorCallback? onError}); -} \ No newline at end of file +} diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart index 8df15ad..913b308 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; class MockRepository extends ApiInterface { @override Future loadData({OnErrorCallback? onError}) async { - return HomeData(data:[ + return HomeData(data: [ const CardData( "First", score: 5, @@ -17,8 +17,7 @@ class MockRepository extends ApiInterface { score: 8, icon: Icons.gamepad, description: "ManyText", - imageUrl: - "https://i.pinimg.com/originals/21/73/24/217324138d1bbc91663d4943ebe5de60.jpg", + imageUrl: "https://i.pinimg.com/originals/21/73/24/217324138d1bbc91663d4943ebe5de60.jpg", ), const CardData( "Third", @@ -28,4 +27,4 @@ class MockRepository extends ApiInterface { ), ]); } -} \ No newline at end of file +} diff --git a/lib/main.dart b/lib/main.dart index 3034301..b62bc16 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -23,8 +23,8 @@ class MyApp extends StatelessWidget { return BlocProvider( lazy: false, create: (context) => LocaleBloc(Locale(Platform.localeName)), - child: BlocBuilder( - builder: (context, state) { return MaterialApp( + child: BlocBuilder(builder: (context, state) { + return MaterialApp( title: 'Flutter Demo', locale: state.currentLocale, localizationsDelegates: AppLocale.localizationsDelegates, @@ -48,8 +48,7 @@ class MyApp extends StatelessWidget { ), ), ); - } - ), + }), ); } } diff --git a/lib/presentation/common/svg_objects.dart b/lib/presentation/common/svg_objects.dart index 03ffb5e..dbad5c4 100644 --- a/lib/presentation/common/svg_objects.dart +++ b/lib/presentation/common/svg_objects.dart @@ -32,4 +32,3 @@ class SvgGb extends StatelessWidget { return SvgPicture.asset(R.ASSETS_SVG_GB_SVG); } } - diff --git a/lib/presentation/home_page/bloc/bloc.dart b/lib/presentation/home_page/bloc/bloc.dart index 8d7767c..ee6cc77 100644 --- a/lib/presentation/home_page/bloc/bloc.dart +++ b/lib/presentation/home_page/bloc/bloc.dart @@ -10,8 +10,7 @@ class HomeBloc extends Bloc { on(_onLoadData); } - Future _onLoadData( - HomeLoadDataEvent event, Emitter emit) async { + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { if (event.nextPage == null) { emit(state.copyWith(isLoading: true)); } else { diff --git a/lib/presentation/home_page/bloc/events.dart b/lib/presentation/home_page/bloc/events.dart index 99c63fc..cefba70 100644 --- a/lib/presentation/home_page/bloc/events.dart +++ b/lib/presentation/home_page/bloc/events.dart @@ -1,4 +1,3 @@ - abstract class HomeEvent { const HomeEvent(); } @@ -8,4 +7,4 @@ class HomeLoadDataEvent extends HomeEvent { final int? nextPage; const HomeLoadDataEvent({this.search, this.nextPage}); -} \ No newline at end of file +} diff --git a/lib/presentation/home_page/bloc/state.dart b/lib/presentation/home_page/bloc/state.dart index 0e89776..f74ef71 100644 --- a/lib/presentation/home_page/bloc/state.dart +++ b/lib/presentation/home_page/bloc/state.dart @@ -20,11 +20,7 @@ class HomeState extends Equatable { this.error, }); - HomeState copyWith( - {HomeData? data, - bool? isLoading, - bool? isPaginationLoading, - String? error}) => + HomeState copyWith({HomeData? data, bool? isLoading, bool? isPaginationLoading, String? error}) => HomeState( data: data ?? this.data, isLoading: isLoading ?? this.isLoading, diff --git a/lib/presentation/home_page/bloc/state.g.dart b/lib/presentation/home_page/bloc/state.g.dart index 114ac25..258a914 100644 --- a/lib/presentation/home_page/bloc/state.g.dart +++ b/lib/presentation/home_page/bloc/state.g.dart @@ -72,8 +72,7 @@ class _$HomeStateCWProxyImpl implements _$HomeStateCWProxy { // ignore: cast_nullable_to_non_nullable : isLoading as bool, isPaginationLoading: - isPaginationLoading == const $CopyWithPlaceholder() || - isPaginationLoading == null + isPaginationLoading == const $CopyWithPlaceholder() || isPaginationLoading == null ? _value.isPaginationLoading // ignore: cast_nullable_to_non_nullable : isPaginationLoading as bool, diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart index 7e6877c..6915bef 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/home_page/card.dart @@ -15,8 +15,7 @@ class CardData { required this.description, this.icon = Icons.add_call, this.score = 0, - this.imageUrl = - "https://i.pinimg.com/736x/5f/14/b3/5f14b3f14fcd157bc4dffa39085396cc.jpg", + this.imageUrl = "https://i.pinimg.com/736x/5f/14/b3/5f14b3f14fcd157bc4dffa39085396cc.jpg", this.id, }); } @@ -106,14 +105,11 @@ class _Card extends StatelessWidget { decoration: const BoxDecoration( color: Colors.purple, borderRadius: BorderRadius.only( - topRight: Radius.circular(20), - bottomLeft: Radius.circular(18))), + topRight: Radius.circular(20), bottomLeft: Radius.circular(18))), padding: const EdgeInsets.fromLTRB(8, 2, 8, 2), child: Text(generateStars(score), - style: Theme.of(context) - .textTheme - .bodyMedium - ?.copyWith(color: Colors.white)), + style: + Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white)), ), ), ]), diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 18a7ecb..757cec2 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -84,8 +84,7 @@ class _BodyState extends State<_Body> { } void _onNextPageListener() { - if (scrollController.offset > - scrollController.position.maxScrollExtent - 50) { + if (scrollController.offset > scrollController.position.maxScrollExtent - 50) { final bloc = context.read(); if (!bloc.state.isPaginationLoading) { bloc.add(HomeLoadDataEvent( @@ -109,10 +108,7 @@ class _BodyState extends State<_Body> { builder: (context, state) => state.error != null ? Text( state.error ?? '', - style: Theme.of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.red), + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), ) : state.isLoading ? const CircularProgressIndicator() @@ -126,25 +122,21 @@ class _BodyState extends State<_Body> { controller: searchController, placeholder: context.locale.search, onChanged: (search) { - Debouce.run(() => context - .read() - .add(HomeLoadDataEvent(search: search))); + Debouce.run(() => + context.read().add(HomeLoadDataEvent(search: search))); }, ), ), ), GestureDetector( - onTap: () => context - .read() - .add(const ChangeLocaleEvent()), + onTap: () => context.read().add(const ChangeLocaleEvent()), child: SizedBox.square( dimension: 50, child: Padding( padding: const EdgeInsets.only(right: 15), child: BlocBuilder( builder: (context, state) { - return state.currentLocale.languageCode == - 'ru' + return state.currentLocale.languageCode == 'ru' ? const SvgRu() : const SvgGb(); }, @@ -152,8 +144,7 @@ class _BodyState extends State<_Body> { ), )), ]), - BlocBuilder( - builder: (context, likeState) { + BlocBuilder(builder: (context, likeState) { return Expanded( child: RefreshIndicator( onRefresh: _onRefresh, @@ -168,8 +159,7 @@ class _BodyState extends State<_Body> { data, isLiked: likeState.likedIds?.contains(data.id) == true, onLike: _onLike, - onTap: () => - _navToDetails(context, data), + onTap: () => _navToDetails(context, data), ) : const SizedBox.shrink(); }), @@ -192,11 +182,10 @@ class _BodyState extends State<_Body> { } void _onLike(String? id, String title, bool isLiked) { - if (id != null) - { - context.read().add(ChangeLikeEvent(id)); - _showLiked(context, title, !isLiked); - } + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showLiked(context, title, !isLiked); + } } void _showLiked(BuildContext context, String title, bool isLiked) { @@ -213,9 +202,7 @@ class _BodyState extends State<_Body> { } Future _onRefresh() { - context - .read() - .add(HomeLoadDataEvent(search: searchController.text)); + context.read().add(HomeLoadDataEvent(search: searchController.text)); return Future.value(null); } } diff --git a/lib/presentation/like_bloc/like_bloc.dart b/lib/presentation/like_bloc/like_bloc.dart index 2032915..79101b8 100644 --- a/lib/presentation/like_bloc/like_bloc.dart +++ b/lib/presentation/like_bloc/like_bloc.dart @@ -1,4 +1,3 @@ - import 'package:first_project/presentation/like_bloc/like_event.dart'; import 'package:first_project/presentation/like_bloc/like_state.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -24,7 +23,7 @@ class LikeBloc extends Bloc { if (updatedList.contains(event.id)) { updatedList.remove(event.id); - }else { + } else { updatedList.add(event.id); } @@ -33,5 +32,4 @@ class LikeBloc extends Bloc { emit(state.copyWith(likedIds: updatedList)); } - } diff --git a/lib/presentation/like_bloc/like_event.dart b/lib/presentation/like_bloc/like_event.dart index 43032db..d0326d8 100644 --- a/lib/presentation/like_bloc/like_event.dart +++ b/lib/presentation/like_bloc/like_event.dart @@ -10,4 +10,4 @@ class ChangeLikeEvent extends LikeEvent { final String id; const ChangeLikeEvent(this.id); -} \ No newline at end of file +} diff --git a/lib/presentation/like_bloc/like_state.dart b/lib/presentation/like_bloc/like_state.dart index 77cf109..22948d7 100644 --- a/lib/presentation/like_bloc/like_state.dart +++ b/lib/presentation/like_bloc/like_state.dart @@ -11,4 +11,4 @@ class LikeState extends Equatable { @override List get props => [likedIds]; -} \ No newline at end of file +} diff --git a/lib/presentation/locale_bloc/locale_bloc.dart b/lib/presentation/locale_bloc/locale_bloc.dart index e4da4de..a39d2df 100644 --- a/lib/presentation/locale_bloc/locale_bloc.dart +++ b/lib/presentation/locale_bloc/locale_bloc.dart @@ -11,7 +11,8 @@ class LocaleBloc extends Bloc { } Future _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { - final toChange = AppLocale.supportedLocales.firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); emit(state.copyWith(currentLocale: toChange)); } -} \ No newline at end of file +} diff --git a/lib/presentation/locale_bloc/locale_events.dart b/lib/presentation/locale_bloc/locale_events.dart index f345ef9..c08cd1b 100644 --- a/lib/presentation/locale_bloc/locale_events.dart +++ b/lib/presentation/locale_bloc/locale_events.dart @@ -4,4 +4,4 @@ abstract class LocaleEvent { class ChangeLocaleEvent extends LocaleEvent { const ChangeLocaleEvent(); -} \ No newline at end of file +} diff --git a/lib/presentation/locale_bloc/locale_state.dart b/lib/presentation/locale_bloc/locale_state.dart index f35eff9..84f261c 100644 --- a/lib/presentation/locale_bloc/locale_state.dart +++ b/lib/presentation/locale_bloc/locale_state.dart @@ -1,4 +1,3 @@ - import 'dart:ui'; import 'package:equatable/equatable.dart'; import 'package:copy_with_extension/copy_with_extension.dart'; @@ -13,4 +12,4 @@ class LocaleState extends Equatable { @override List get props => [currentLocale]; -} \ No newline at end of file +} diff --git a/lib/presentation/locale_bloc/locale_state.g.dart b/lib/presentation/locale_bloc/locale_state.g.dart index e374db6..23ee063 100644 --- a/lib/presentation/locale_bloc/locale_state.g.dart +++ b/lib/presentation/locale_bloc/locale_state.g.dart @@ -27,8 +27,7 @@ class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy { final LocaleState _value; @override - LocaleState currentLocale(Locale currentLocale) => - this(currentLocale: currentLocale); + LocaleState currentLocale(Locale currentLocale) => this(currentLocale: currentLocale); @override @@ -42,11 +41,10 @@ class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy { Object? currentLocale = const $CopyWithPlaceholder(), }) { return LocaleState( - currentLocale: - currentLocale == const $CopyWithPlaceholder() || currentLocale == null - ? _value.currentLocale - // ignore: cast_nullable_to_non_nullable - : currentLocale as Locale, + currentLocale: currentLocale == const $CopyWithPlaceholder() || currentLocale == null + ? _value.currentLocale + // ignore: cast_nullable_to_non_nullable + : currentLocale as Locale, ); } }