laba6_i_do_this

2024-11-08 17:25:26 +04:00 · 2024-11-08 17:25:26 +04:00 · a3719aa0cd
commit a3719aa0cd
parent 46ac39cceb
10 changed files with 171 additions and 28 deletions
--- a/lib/components/utils/debounce.dart
+++ b/lib/components/utils/debounce.dart
@ -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);
+  }
+}
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,7 +1,10 @@
 import 'dart:ffi';

 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/repositories/bar_repository.dart';

 void main() {
  runApp(const MyApp());
@ -13,11 +16,20 @@ class MyApp extends StatelessWidget {
  Widget build(BuildContext context) {
    return MaterialApp(
      title: 'Flutter Demo',
+      debugShowCheckedModeBanner: false,
      theme: ThemeData(
        colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
        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',),
+        ),
+      ),
    );
  }
 }
--- a/lib/presentation/home_page/bloc/bloc.dart
+++ b/lib/presentation/home_page/bloc/bloc.dart
@ -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,
+    ));
+  }
+}
--- a/lib/presentation/home_page/bloc/events.dart
+++ b/lib/presentation/home_page/bloc/events.dart
@ -0,0 +1,8 @@
+abstract class HomeEvent {
+  const HomeEvent();
+}
+
+class HomeLoadDataEvent extends HomeEvent {
+  final String? search;
+  const HomeLoadDataEvent({this.search});
+}
--- a/lib/presentation/home_page/bloc/state.dart
+++ b/lib/presentation/home_page/bloc/state.dart
@ -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];
+}
--- a/lib/presentation/home_page/home_page.dart
+++ b/lib/presentation/home_page/home_page.dart
@ -1,12 +1,18 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.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/presentation/details_page/details_page.dart';
 import 'package:mobile_app/repositories/mock_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';
 class MyHomePage extends StatefulWidget {
  const MyHomePage({super.key, required this.title});
@ -42,21 +48,29 @@ class Body extends StatefulWidget {
 class _BodyState extends State<Body> {
  late TextEditingController searchController;
  late Future<List<CardData>?> data;
+  String lastSearchText = '';
  final BarRepository repo = BarRepository();

  @override
  void initState() {
    super.initState();
-    searchController = TextEditingController();
-    data = repo.loadData(null); // Инициализация начальных данных
+    searchController = TextEditingController(); // Инициализация searchController
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      context.read<HomeBloc>().add(const HomeLoadDataEvent());
+    });
  }

  @override
  void dispose() {
-    searchController.dispose(); // Освобождаем контроллер при уничтожении виджета
+    searchController.dispose();
    super.dispose();
  }

+  Future<void> _onRefresh() {
+    context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
+    return Future.value(null);
+  }
+
  @override
  Widget build(BuildContext context) {
    return Padding(
@ -68,35 +82,42 @@ class _BodyState extends State<Body> {
            child: CupertinoSearchTextField(
              controller: searchController,
              onChanged: (search) {
-                setState(() {
-                  data = repo.loadData(search.isNotEmpty ? search : null); // Обновление данных при поиске
+                Debounce.run(() {
+                    lastSearchText = search;
+                    if (search.isEmpty) {
+                      context.read<HomeBloc>().add(const HomeLoadDataEvent());
+                    } else {
+                      context.read<HomeBloc>().add(
+                          HomeLoadDataEvent(search: search));
+                    }
                });
              },
            ),
          ),
-          Expanded(
-            child: Center(
-              child: FutureBuilder<List<CardData>?>( // FutureBuilder ждет результат
-                future: data,
-                builder: (context, snapshot) =>
-                    SingleChildScrollView(
-                      child: snapshot.hasData
-                          ? Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: snapshot.data?.map((data) {
-                          return _Card.fromData(
+
+          BlocBuilder<HomeBloc, HomeState>(
+            builder: (context, state) => 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),
-                          );
-                        }).toList() ?? [],
-                      )
-                          : const CircularProgressIndicator(),
-                    ),
+                            onLike: (title, isLiked) => _showSnackBar(context, title, isLiked),
+                            onTap: () =>_navToDetails(context, data),
+                          )
+                          : const SizedBox. shrink();
+                    },
+                  ),
+                ),
              ),
            ),
-          ),
        ],
      ),
    );
--- a/lib/repositories/api_interface.dart
+++ b/lib/repositories/api_interface.dart
@ -1,5 +1,5 @@
 import 'package:mobile_app/domain/models/card.dart';

 abstract class ApiInterface {
-  Future<List<CardData>?> loadData(String? q);
+  Future<List<CardData>?> loadData({String? q});
 }
--- a/lib/repositories/bar_repository.dart
+++ b/lib/repositories/bar_repository.dart
@ -15,7 +15,7 @@ class BarRepository extends ApiInterface {
  static const String _baseUrl = 'https://www.thecocktaildb.com/api/json/v1/1';

  @override
-  Future<List<CardData>?> loadData(String? q) async {
+  Future<List<CardData>?> loadData({String? q}) async {
    try {
      final String url = q != null
          ? '$_baseUrl/search.php?s=$q' // Поиск по названию
--- a/pubspec.lock
+++ b/pubspec.lock
@ -38,6 +38,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.11.0"
+  bloc:
+    dependency: transitive
+    description:
+      name: bloc
+      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.4"
  boolean_selector:
    dependency: transitive
    description:
@ -198,6 +206,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    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:
    dependency: transitive
    description:
@ -227,6 +243,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:
@ -400,6 +424,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:
@ -432,6 +464,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:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -38,6 +38,8 @@ dependencies:
  json_annotation: ^4.9.0
  dio: ^5.4.2+1
  pretty_dio_logger: ^1.3.1
+  flutter_bloc: ^8.1.5
+  equatable: ^2.0.5

 dev_dependencies:
  flutter_test: