From d8f7c117684c4cdef3c4d42894e6f49a17f1a3b8 Mon Sep 17 00:00:00 2001 From: sofia7ya Date: Wed, 18 Dec 2024 16:27:22 +0400 Subject: [PATCH] =?UTF-8?q?lab6=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20(*=20^=20=CF=89=20^)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/repositories/potter_repository.dart | 4 ++-- lib/presentation/home_page/home_page.dart | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/data/repositories/potter_repository.dart b/lib/data/repositories/potter_repository.dart index 6c0cdf6..29570f0 100644 --- a/lib/data/repositories/potter_repository.dart +++ b/lib/data/repositories/potter_repository.dart @@ -12,7 +12,7 @@ class PotterRepository extends ApiInterface { requestBody: true, )); - static const String _baseUrl = 'https://api.potterdb.com'; + static const String _baseUrl = 'https://api.pot----terdb.com'; @override Future loadData({ @@ -37,7 +37,7 @@ class PotterRepository extends ApiInterface { final HomeData data = dto.toDomain(); return data; } on DioException catch (e) { - onError?.call(e.error?.toString()); + onError?.call(e.error?.toString() ?? e.type.toString()); return null; } } diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 7e6ea73..edc7a4e 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -49,7 +49,7 @@ class _BodyState extends State<_Body> { } void _onNextPageListener() { - if (scrollController.offset > scrollController.position.maxScrollExtent) { + if (scrollController.offset >= scrollController.position.maxScrollExtent) { // preventing multiple pagination request on multiple swipes final bloc = context.read(); if (!bloc.state.isPaginationLoading) { @@ -84,7 +84,8 @@ class _BodyState extends State<_Body> { ), ), BlocBuilder( - builder: (context, state) => state.error != null + builder: (context, state) + => state.error != null ? Text( state.error ?? '', style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), @@ -95,7 +96,6 @@ class _BodyState extends State<_Body> { child: RefreshIndicator( onRefresh: _onRefresh, child: ListView.builder( - physics: BouncingScrollPhysics(), controller: scrollController, padding: EdgeInsets.zero, itemCount: state.data?.data?.length ?? 0,