Сделал Lab6
This commit is contained in:
parent
2cab244d82
commit
08679029aa
20
lib/components/utils/debounce.dart
Normal file
20
lib/components/utils/debounce.dart
Normal file
@ -0,0 +1,20 @@
|
||||
import 'dart:async';
|
||||
import 'dart:ui';
|
||||
|
||||
class Debounce { //помощник
|
||||
factory Debounce() => _instance; //обращение через статический конструктор
|
||||
|
||||
Debounce._();
|
||||
|
||||
static final Debounce _instance = Debounce._();
|
||||
|
||||
static Timer? _timer;
|
||||
|
||||
static void run(//создаём задержку для ввода пользователя в поисковую строку
|
||||
VoidCallback action, {
|
||||
Duration delay = const Duration(milliseconds: 500),
|
||||
}) {
|
||||
_timer?.cancel();
|
||||
_timer = Timer(delay, action);
|
||||
}
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
|
||||
import '../../domain/models/card.dart';
|
||||
|
||||
typedef OnErrorCallback = void Function(String? error);
|
||||
|
||||
abstract class ApiInterface{
|
||||
Future<List<CardData>?> loadData();
|
||||
}
|
@ -13,10 +13,10 @@ class AgentsRepository extends ApiInterface {
|
||||
requestBody: true,
|
||||
));
|
||||
|
||||
static const String _baseUrl = 'https://valorant-api.com/v1/agents';
|
||||
static const String _baseUrl = 'https://valorant-api.com/v1/ agents';
|
||||
|
||||
@override
|
||||
Future<List<CardData>?> loadData({String? q}) async {
|
||||
Future<List<CardData>?> loadData({OnErrorCallback? onError,String? q,}) async {
|
||||
try {
|
||||
// Формирование URL для запроса
|
||||
final Response<dynamic> response = await _dio.get(_baseUrl);
|
||||
@ -37,7 +37,7 @@ class AgentsRepository extends ApiInterface {
|
||||
return data;
|
||||
} on DioException catch (e) {
|
||||
// Обработка ошибок запроса
|
||||
print('Ошибка при загрузке данных: $e');
|
||||
onError?.call(e.error?.toString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_test_app/presentation/home_page/bloc/bloc.dart';
|
||||
import 'data/repositories/characters_repository.dart';
|
||||
import 'presentation/home_page/home_page.dart';
|
||||
|
||||
void main() {
|
||||
@ -17,7 +20,15 @@ class MyApp extends StatelessWidget {
|
||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange),
|
||||
useMaterial3: true,
|
||||
),
|
||||
home: const MyHomePage(title: 'Афанасьев Степан Сергеевич'),
|
||||
home: RepositoryProvider<AgentsRepository>( //даём нашему репозиторию доступ
|
||||
lazy: true, //ленивое создание объекта
|
||||
create: (_) => AgentsRepository(),
|
||||
child: BlocProvider<HomeBloc>( //даём доступ Bloc для нашей страницы
|
||||
lazy: false,
|
||||
create: (context) => HomeBloc(context.read<AgentsRepository>()), //в конструктор нашего Блока передаём репозиторий с нашей апи, то есть у нас появляется доступ по дереву к апи
|
||||
child: const MyHomePage(title: 'Агенты Valorant'),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
30
lib/presentation/home_page/bloc/bloc.dart
Normal file
30
lib/presentation/home_page/bloc/bloc.dart
Normal file
@ -0,0 +1,30 @@
|
||||
import 'package:flutter_test_app/presentation/home_page/bloc/state.dart';
|
||||
import 'package:flutter_test_app/presentation/home_page/bloc/events.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import '../../../data/repositories/characters_repository.dart';
|
||||
|
||||
class HomeBloc extends Bloc<HomeEvent, HomeState>{//наследуем от Bloc и передаём состояния
|
||||
final AgentsRepository rep;
|
||||
|
||||
HomeBloc(this.rep) : super(const HomeState()) {
|
||||
on<HomeLoadDataEvent>(_onLoadData);
|
||||
}
|
||||
|
||||
Future<void> _onLoadData(
|
||||
HomeLoadDataEvent event, Emitter<HomeState> emit) async {
|
||||
emit(state.copyWith(isLoading: true)); //метода emit изменяет наши состояния
|
||||
|
||||
String? error;
|
||||
|
||||
final data = await rep.loadData( //загрузка данных
|
||||
q: event.search,
|
||||
onError: (e) => error = e,
|
||||
);
|
||||
|
||||
emit(state.copyWith( //метода emit изменяет наши состояния
|
||||
isLoading: false, //флаг загрузки меняем на false
|
||||
data: data,
|
||||
error: error,
|
||||
));
|
||||
}
|
||||
}
|
9
lib/presentation/home_page/bloc/events.dart
Normal file
9
lib/presentation/home_page/bloc/events.dart
Normal file
@ -0,0 +1,9 @@
|
||||
abstract class HomeEvent{ //наследуем все события
|
||||
const HomeEvent();
|
||||
}
|
||||
|
||||
class HomeLoadDataEvent extends HomeEvent{
|
||||
final String? search; //событие поиска
|
||||
|
||||
const HomeLoadDataEvent({this.search}); //событие на загрузку данных
|
||||
}
|
34
lib/presentation/home_page/bloc/state.dart
Normal file
34
lib/presentation/home_page/bloc/state.dart
Normal file
@ -0,0 +1,34 @@
|
||||
import 'package:copy_with_extension/copy_with_extension.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import '../../../domain/models/card.dart';
|
||||
|
||||
@CopyWith()
|
||||
class HomeState extends Equatable{ //сравнение двух состояний через Equatable
|
||||
final List<CardData>? data;
|
||||
final bool isLoading; //отображение загрузки
|
||||
final String? error; //отображение ошибок
|
||||
|
||||
const HomeState({
|
||||
this.data,
|
||||
this.isLoading = false,
|
||||
this.error,
|
||||
});
|
||||
|
||||
HomeState copyWith({ //copyWith создаёт копию объекта с изменением некоторых данных
|
||||
List<CardData>? data,
|
||||
bool? isLoading,
|
||||
String? error,
|
||||
}) =>
|
||||
HomeState(
|
||||
data: data ?? this.data,
|
||||
isLoading: isLoading ?? this.isLoading,
|
||||
error: error ?? this.error,
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
data,
|
||||
isLoading,
|
||||
error,
|
||||
];
|
||||
}
|
@ -1,13 +1,15 @@
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_test_app/data/repositories/mock_repository.dart';
|
||||
import 'package:flutter_test_app/main.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../data/repositories/characters_repository.dart';
|
||||
import '../../domain/models/card.dart';
|
||||
import '../details_page/details_page.dart';
|
||||
|
||||
|
||||
import 'bloc/bloc.dart';
|
||||
import 'bloc/events.dart';
|
||||
import 'bloc/state.dart';
|
||||
import '../../components/utils/debounce.dart';
|
||||
part 'card.dart';
|
||||
|
||||
class MyHomePage extends StatefulWidget {
|
||||
@ -44,21 +46,27 @@ class Body extends StatefulWidget {
|
||||
class _BodyState extends State<Body> {
|
||||
final searchController = TextEditingController();
|
||||
final ScrollController _scrollController = ScrollController();
|
||||
late Future<List<CardData>?> data;
|
||||
final repo = AgentsRepository();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
data = repo.loadData();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) { // привязываем логику к кадру
|
||||
context.read<HomeBloc>().add(const HomeLoadDataEvent()); // добавляем данные после считывания
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
searchController.dispose();
|
||||
searchController.dispose(); // очистка контроллера
|
||||
_scrollController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
Future<void> _onRefresh() {
|
||||
context
|
||||
.read<HomeBloc>()
|
||||
.add(HomeLoadDataEvent(search: searchController.text));
|
||||
return Future.value(null); //прекращение отображения загрузки
|
||||
}
|
||||
|
||||
// Метод для прокрутки к определённой карточке
|
||||
void _scrollToCard(String searchQuery, List<CardData>? dataList) {
|
||||
@ -78,53 +86,52 @@ class _BodyState extends State<Body> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
||||
child: Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: CupertinoSearchTextField(
|
||||
controller: searchController,
|
||||
onSubmitted: (search) {
|
||||
data.then((dataList) {
|
||||
_scrollToCard(search, dataList);
|
||||
});
|
||||
},
|
||||
),
|
||||
return Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: CupertinoSearchTextField(
|
||||
controller: searchController,
|
||||
onChanged: (search ) { //вызов задержки пока пользователь не перестанет печатать в поисковой строке
|
||||
Debounce.run(() => context
|
||||
.read<HomeBloc>()
|
||||
.add(HomeLoadDataEvent(search: search)));
|
||||
},
|
||||
),
|
||||
Expanded(
|
||||
child: Center(
|
||||
child: FutureBuilder<List<CardData>?>(
|
||||
future: data,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
return const CircularProgressIndicator();
|
||||
} else if (snapshot.hasError) {
|
||||
return Text('Error: ${snapshot.error}');
|
||||
} else if (snapshot.hasData && snapshot.data != null) {
|
||||
return ListView.builder(
|
||||
controller: _scrollController,
|
||||
itemCount: snapshot.data!.length,
|
||||
itemBuilder: (context, index) {
|
||||
final cardData = snapshot.data![index];
|
||||
return _Card.fromData(
|
||||
cardData,
|
||||
onLike: (String title, bool isLiked) =>
|
||||
_showSnackBar(context, title, isLiked),
|
||||
onTap: () => _navToDetails(context, cardData),
|
||||
);
|
||||
},
|
||||
);
|
||||
} else {
|
||||
return const Text('No data available');
|
||||
}
|
||||
),
|
||||
BlocBuilder<HomeBloc, HomeState>( //ждёт изменения состояния
|
||||
builder: (context, state) => state.error != null
|
||||
? Text(
|
||||
state.error ?? '',
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.headlineSmall
|
||||
?.copyWith(color: Colors.red),
|
||||
)
|
||||
: state.isLoading
|
||||
? const CircularProgressIndicator()
|
||||
: Expanded(
|
||||
child: RefreshIndicator(
|
||||
onRefresh: _onRefresh,
|
||||
child: ListView.builder(
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: state.data?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
final data = state.data?[index];
|
||||
return data != null
|
||||
? _Card.fromData(
|
||||
data,
|
||||
onLike: (String title, bool isLiked) =>
|
||||
_showSnackBar(context, title, isLiked),
|
||||
onTap: () => _navToDetails(context, data),
|
||||
)
|
||||
: const SizedBox.shrink();
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
|
48
pubspec.lock
48
pubspec.lock
@ -166,6 +166,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.2"
|
||||
copy_with_extension:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: copy_with_extension
|
||||
sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.4"
|
||||
copy_with_extension_gen:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: copy_with_extension_gen
|
||||
sha256: "51cd11094096d40824c8da629ca7f16f3b7cea5fc44132b679617483d43346b0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.4"
|
||||
crypto:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -214,6 +230,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
equatable:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: equatable
|
||||
sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.7"
|
||||
fake_async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -243,6 +267,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_bloc:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_bloc
|
||||
sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "8.1.6"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@ -416,6 +448,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
nested:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: nested
|
||||
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.0"
|
||||
package_config:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -448,6 +488,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
provider:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: provider
|
||||
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.1.2"
|
||||
pub_semver:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
@ -40,6 +40,9 @@ dependencies:
|
||||
pretty_dio_logger: ^1.3.1
|
||||
json_annotation: ^4.8.1
|
||||
html: ^0.15.0
|
||||
equatable: ^2.0.5
|
||||
flutter_bloc: ^8.1.5
|
||||
copy_with_extension_gen: ^5.0.4
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
Loading…
Reference in New Issue
Block a user