laba6_i_do_this
This commit is contained in:
parent
46ac39cceb
commit
a3719aa0cd
19
lib/components/utils/debounce.dart
Normal file
19
lib/components/utils/debounce.dart
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
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,7 +1,10 @@
|
|||||||
import 'dart:ffi';
|
import 'dart:ffi';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:mobile_app/presentation/home_page/bloc/bloc.dart';
|
||||||
import 'package:mobile_app/presentation/home_page/home_page.dart';
|
import 'package:mobile_app/presentation/home_page/home_page.dart';
|
||||||
|
import 'package:mobile_app/repositories/bar_repository.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
runApp(const MyApp());
|
runApp(const MyApp());
|
||||||
@ -13,11 +16,20 @@ class MyApp extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: 'Flutter Demo',
|
title: 'Flutter Demo',
|
||||||
|
debugShowCheckedModeBanner: false,
|
||||||
theme: ThemeData(
|
theme: ThemeData(
|
||||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
||||||
useMaterial3: true,
|
useMaterial3: true,
|
||||||
),
|
),
|
||||||
home: const MyHomePage(title: 'Шаныгин Александр Владимирович'),
|
home: RepositoryProvider<BarRepository>(
|
||||||
|
lazy: true,
|
||||||
|
create: (_) => BarRepository(),
|
||||||
|
child: BlocProvider<HomeBloc>(
|
||||||
|
lazy: false,
|
||||||
|
create: (context) => HomeBloc(context.read<BarRepository>()),
|
||||||
|
child: const MyHomePage(title: 'qqqqqqqq',),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
22
lib/presentation/home_page/bloc/bloc.dart
Normal file
22
lib/presentation/home_page/bloc/bloc.dart
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:mobile_app/repositories/bar_repository.dart';
|
||||||
|
import 'package:mobile_app/presentation/home_page/bloc/events.dart';
|
||||||
|
import 'package:mobile_app/presentation/home_page/bloc/state.dart';
|
||||||
|
|
||||||
|
class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||||
|
final BarRepository repo;
|
||||||
|
|
||||||
|
HomeBloc(this.repo) : super(const HomeState()) {
|
||||||
|
on<HomeLoadDataEvent>(_onLoadData);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async {
|
||||||
|
emit(state.copyWith(isLoading: true));
|
||||||
|
final data = await repo.loadData(q: event.search);
|
||||||
|
|
||||||
|
emit(state.copyWith(
|
||||||
|
isLoading: false,
|
||||||
|
data: data,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
8
lib/presentation/home_page/bloc/events.dart
Normal file
8
lib/presentation/home_page/bloc/events.dart
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
abstract class HomeEvent {
|
||||||
|
const HomeEvent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class HomeLoadDataEvent extends HomeEvent {
|
||||||
|
final String? search;
|
||||||
|
const HomeLoadDataEvent({this.search});
|
||||||
|
}
|
19
lib/presentation/home_page/bloc/state.dart
Normal file
19
lib/presentation/home_page/bloc/state.dart
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:mobile_app/domain/models/card.dart';
|
||||||
|
|
||||||
|
class HomeState extends Equatable {
|
||||||
|
final List<CardData>? data;
|
||||||
|
final bool isLoading;
|
||||||
|
|
||||||
|
const HomeState({this.data, this.isLoading = false});
|
||||||
|
|
||||||
|
HomeState copyWith({List<CardData>? data,
|
||||||
|
bool? isLoading,}) =>
|
||||||
|
HomeState(
|
||||||
|
data: data ?? this.data,
|
||||||
|
isLoading: isLoading ?? this.isLoading,
|
||||||
|
);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [data, isLoading];
|
||||||
|
}
|
@ -1,12 +1,18 @@
|
|||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||||
|
import 'package:mobile_app/components/utils/debounce.dart';
|
||||||
import 'package:mobile_app/domain/models/card.dart';
|
import 'package:mobile_app/domain/models/card.dart';
|
||||||
import 'package:mobile_app/presentation/details_page/details_page.dart';
|
import 'package:mobile_app/presentation/details_page/details_page.dart';
|
||||||
import 'package:mobile_app/repositories/mock_repository.dart';
|
import 'package:mobile_app/repositories/mock_repository.dart';
|
||||||
import 'package:mobile_app/repositories/bar_repository.dart';
|
import 'package:mobile_app/repositories/bar_repository.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 {
|
||||||
const MyHomePage({super.key, required this.title});
|
const MyHomePage({super.key, required this.title});
|
||||||
@ -42,21 +48,29 @@ class Body extends StatefulWidget {
|
|||||||
class _BodyState extends State<Body> {
|
class _BodyState extends State<Body> {
|
||||||
late TextEditingController searchController;
|
late TextEditingController searchController;
|
||||||
late Future<List<CardData>?> data;
|
late Future<List<CardData>?> data;
|
||||||
|
String lastSearchText = '';
|
||||||
final BarRepository repo = BarRepository();
|
final BarRepository repo = BarRepository();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
searchController = TextEditingController();
|
searchController = TextEditingController(); // Инициализация searchController
|
||||||
data = repo.loadData(null); // Инициализация начальных данных
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
searchController.dispose(); // Освобождаем контроллер при уничтожении виджета
|
searchController.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _onRefresh() {
|
||||||
|
context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
|
||||||
|
return Future.value(null);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Padding(
|
return Padding(
|
||||||
@ -68,31 +82,38 @@ class _BodyState extends State<Body> {
|
|||||||
child: CupertinoSearchTextField(
|
child: CupertinoSearchTextField(
|
||||||
controller: searchController,
|
controller: searchController,
|
||||||
onChanged: (search) {
|
onChanged: (search) {
|
||||||
setState(() {
|
Debounce.run(() {
|
||||||
data = repo.loadData(search.isNotEmpty ? search : null); // Обновление данных при поиске
|
lastSearchText = search;
|
||||||
|
if (search.isEmpty) {
|
||||||
|
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
||||||
|
} else {
|
||||||
|
context.read<HomeBloc>().add(
|
||||||
|
HomeLoadDataEvent(search: search));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Expanded(
|
|
||||||
child: Center(
|
BlocBuilder<HomeBloc, HomeState>(
|
||||||
child: FutureBuilder<List<CardData>?>( // FutureBuilder ждет результат
|
builder: (context, state) => state.isLoading
|
||||||
future: data,
|
? const CircularProgressIndicator()
|
||||||
builder: (context, snapshot) =>
|
: Expanded(
|
||||||
SingleChildScrollView(
|
child: RefreshIndicator(
|
||||||
child: snapshot.hasData
|
onRefresh: _onRefresh,
|
||||||
? Column(
|
child: ListView. builder(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
padding: EdgeInsets.zero,
|
||||||
children: snapshot.data?.map((data) {
|
itemCount: state.data?.length ?? 0,
|
||||||
return _Card.fromData(
|
itemBuilder: (context, index) {
|
||||||
|
final data = state.data?[index];
|
||||||
|
return data != null
|
||||||
|
? _Card.fromData(
|
||||||
data,
|
data,
|
||||||
onLike: (String title, bool isLiked) =>
|
onLike: (title, isLiked) => _showSnackBar(context, title, isLiked),
|
||||||
_showSnackBar(context, title, isLiked),
|
|
||||||
onTap: () =>_navToDetails(context, data),
|
onTap: () =>_navToDetails(context, data),
|
||||||
);
|
|
||||||
}).toList() ?? [],
|
|
||||||
)
|
)
|
||||||
: const CircularProgressIndicator(),
|
: const SizedBox. shrink();
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import 'package:mobile_app/domain/models/card.dart';
|
import 'package:mobile_app/domain/models/card.dart';
|
||||||
|
|
||||||
abstract class ApiInterface {
|
abstract class ApiInterface {
|
||||||
Future<List<CardData>?> loadData(String? q);
|
Future<List<CardData>?> loadData({String? q});
|
||||||
}
|
}
|
@ -15,7 +15,7 @@ class BarRepository extends ApiInterface {
|
|||||||
static const String _baseUrl = 'https://www.thecocktaildb.com/api/json/v1/1';
|
static const String _baseUrl = 'https://www.thecocktaildb.com/api/json/v1/1';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<List<CardData>?> loadData(String? q) async {
|
Future<List<CardData>?> loadData({String? q}) async {
|
||||||
try {
|
try {
|
||||||
final String url = q != null
|
final String url = q != null
|
||||||
? '$_baseUrl/search.php?s=$q' // Поиск по названию
|
? '$_baseUrl/search.php?s=$q' // Поиск по названию
|
||||||
|
40
pubspec.lock
40
pubspec.lock
@ -38,6 +38,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.11.0"
|
version: "2.11.0"
|
||||||
|
bloc:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: bloc
|
||||||
|
sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "8.1.4"
|
||||||
boolean_selector:
|
boolean_selector:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -198,6 +206,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.0"
|
version: "2.0.0"
|
||||||
|
equatable:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: equatable
|
||||||
|
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.0.5"
|
||||||
fake_async:
|
fake_async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -227,6 +243,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:
|
||||||
@ -400,6 +424,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.0"
|
version: "2.0.0"
|
||||||
|
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:
|
||||||
@ -432,6 +464,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:
|
||||||
|
@ -38,6 +38,8 @@ dependencies:
|
|||||||
json_annotation: ^4.9.0
|
json_annotation: ^4.9.0
|
||||||
dio: ^5.4.2+1
|
dio: ^5.4.2+1
|
||||||
pretty_dio_logger: ^1.3.1
|
pretty_dio_logger: ^1.3.1
|
||||||
|
flutter_bloc: ^8.1.5
|
||||||
|
equatable: ^2.0.5
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user