This commit is contained in:
goldfest228 2024-12-12 13:08:00 +04:00
parent 8b07f85f9b
commit 5b6082e6eb
10 changed files with 215 additions and 64 deletions

View 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);
}
}

View File

@ -1,6 +1,8 @@
import '../../domain/models/card.dart'; import '../../domain/models/card.dart';
typedef OnErrorCallback = void Function(String? error);
abstract class ApiInterface{ abstract class ApiInterface{
Future<List<CardData>?> loadData(); Future<List<CardData>?> loadData();
} }

View File

@ -16,7 +16,7 @@ class WeaponsRepository extends ApiInterface {
static const String _baseUrl = 'https://valorant-api.com/v1/weapons'; static const String _baseUrl = 'https://valorant-api.com/v1/weapons';
@override @override
Future<List<CardData>?> loadData({String? q}) async { Future<List<CardData>?> loadData({OnErrorCallback? onError,String? q,}) async {
try { try {
// Формирование URL для запроса // Формирование URL для запроса
final Response<dynamic> response = await _dio.get(_baseUrl); final Response<dynamic> response = await _dio.get(_baseUrl);
@ -37,7 +37,7 @@ class WeaponsRepository extends ApiInterface {
return data; return data;
} on DioException catch (e) { } on DioException catch (e) {
// Обработка ошибок запроса // Обработка ошибок запроса
print('Ошибка при загрузке данных: $e'); onError?.call(e.error?.toString());
return null; return null;
} }
} }

View File

@ -1,4 +1,7 @@
import 'package:flutter/material.dart'; 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/weapons_repository.dart';
import 'presentation/home_page/home_page.dart'; import 'presentation/home_page/home_page.dart';
void main() { void main() {
@ -17,7 +20,15 @@ class MyApp extends StatelessWidget {
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange), colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange),
useMaterial3: true, useMaterial3: true,
), ),
home: const MyHomePage(title: 'Лобашов Иван Дмитриевич'), home: RepositoryProvider<WeaponsRepository>( //даём нашему репозиторию доступ
lazy: true, //ленивое создание объекта
create: (_) => WeaponsRepository(),
child: BlocProvider<HomeBloc>( //даём доступ Bloc для нашей страницы
lazy: false,
create: (context) => HomeBloc(context.read<WeaponsRepository>()), //в конструктор нашего Блока передаём репозиторий с нашей апи, то есть у нас появляется доступ по дереву к апи
child: const MyHomePage(title: 'Каталог оружий Valorant'),
),
),
); );
} }
} }

View 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/weapons_repository.dart';
class HomeBloc extends Bloc<HomeEvent, HomeState>{//наследуем от Bloc и передаём состояния
final WeaponsRepository 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,
));
}
}

View File

@ -0,0 +1,9 @@
abstract class HomeEvent{ //наследуем все события
const HomeEvent();
}
class HomeLoadDataEvent extends HomeEvent{
final String? search; //событие поиска
const HomeLoadDataEvent({this.search}); //событие на загрузку данных
}

View 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,
];
}

View File

@ -1,12 +1,16 @@
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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../components/utils/debounce.dart';
import '../../data/repositories/weapons_repository.dart'; import '../../data/repositories/weapons_repository.dart';
import '../../domain/models/card.dart'; import '../../domain/models/card.dart';
import '../details_page/details_page.dart'; import '../details_page/details_page.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'bloc/bloc.dart';
import 'bloc/events.dart';
import 'bloc/state.dart';
part 'card.dart'; part 'card.dart';
class MyHomePage extends StatefulWidget { class MyHomePage extends StatefulWidget {
@ -43,85 +47,74 @@ class Body extends StatefulWidget {
class _BodyState extends State<Body> { class _BodyState extends State<Body> {
final searchController = TextEditingController(); final searchController = TextEditingController();
final ScrollController _scrollController = ScrollController(); final ScrollController _scrollController = ScrollController();
late Future<List<CardData>?> data;
final repo = WeaponsRepository();
List<CardData>? filteredData;
@override @override
void initState() { void initState() {
data = repo.loadData(); WidgetsBinding.instance.addPostFrameCallback((_) { // привязываем логику к кадру
context.read<HomeBloc>().add(const HomeLoadDataEvent()); // добавляем данные после считывания
});
super.initState(); super.initState();
} }
@override @override
void dispose() { void dispose() {
searchController.dispose(); searchController.dispose(); // очистка контроллера
_scrollController.dispose(); _scrollController.dispose();
super.dispose(); super.dispose();
} }
Future<void> _onRefresh() {
// Метод для фильтрации карточек по запросу context
void _filterCards(String searchQuery, List<CardData>? dataList) { .read<HomeBloc>()
if (dataList == null || dataList.isEmpty) return; .add(HomeLoadDataEvent(search: searchController.text));
return Future.value(null); //прекращение отображения загрузки
final filteredList = dataList.where((data) =>
data.text?.toLowerCase().contains(searchQuery.toLowerCase()) ?? false).toList();
setState(() {
filteredData = filteredList;
});
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Column(
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
child: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: CupertinoSearchTextField( child: CupertinoSearchTextField(
controller: searchController, controller: searchController,
onSubmitted: (search) { onChanged: (search ) { //вызов задержки пока пользователь не перестанет печатать в поисковой строке
data.then((dataList) { Debounce.run(() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
_filterCards(search, dataList);
});
}, },
), ),
), ),
Expanded( BlocBuilder<HomeBloc, HomeState>( //ждёт изменения состояния
child: Center( builder: (context, state) => state.error != null
child: FutureBuilder<List<CardData>?>( ? Text(
future: data, state.error ?? '',
builder: (context, snapshot) { style: Theme.of(context)
if (snapshot.connectionState == ConnectionState.waiting) { .textTheme
return const CircularProgressIndicator(); .headlineSmall
} else if (snapshot.hasError) { ?.copyWith(color: Colors.red),
return Text('Error: ${snapshot.error}'); )
} else if (snapshot.hasData && snapshot.data != null) { : state.isLoading
final displayData = filteredData ?? snapshot.data!; ? const CircularProgressIndicator()
return ListView.builder( : Expanded(
controller: _scrollController, child: RefreshIndicator(
itemCount: displayData.length, onRefresh: _onRefresh,
child: ListView.builder(
padding: EdgeInsets.zero,
itemCount: state.data?.length ?? 0,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final cardData = displayData[index]; final data = state.data?[index];
return _Card.fromData( return data != null
cardData, ? _Card.fromData(
data,
onLike: (String title, bool isLiked) => onLike: (String title, bool isLiked) =>
_showSnackBar(context, title, isLiked), _showSnackBar(context, title, isLiked),
onTap: () => _navToDetails(context, cardData), onTap: () => _navToDetails(context, data),
); )
}, : const SizedBox.shrink();
);
} else {
return const Text('No data available');
}
}, },
), ),
), ),
), ),
),
], ],
),
); );
} }

View File

@ -161,6 +161,22 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.1" version: "3.1.1"
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: crypto:
dependency: transitive dependency: transitive
description: description:
@ -209,6 +225,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.1" version: "1.0.1"
equatable:
dependency: "direct main"
description:
name: equatable
sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
url: "https://pub.dev"
source: hosted
version: "2.0.7"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
@ -238,6 +262,14 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" 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: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@ -379,6 +411,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.4" version: "1.0.4"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
@ -411,6 +451,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.4.0" version: "1.4.0"
provider:
dependency: transitive
description:
name: provider
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
url: "https://pub.dev"
source: hosted
version: "6.1.2"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
@ -578,3 +626,4 @@ packages:
version: "3.1.2" version: "3.1.2"
sdks: sdks:
dart: ">=3.1.3 <4.0.0" dart: ">=3.1.3 <4.0.0"
flutter: ">=1.16.0"

View File

@ -40,6 +40,9 @@ dependencies:
pretty_dio_logger: ^1.3.1 pretty_dio_logger: ^1.3.1
json_annotation: ^4.8.1 json_annotation: ^4.8.1
html: ^0.15.0 html: ^0.15.0
equatable: ^2.0.5
flutter_bloc: ^8.1.5
copy_with_extension_gen: ^5.0.4
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: