Создание карточки в коллекции + экран поиска коллекции

2025-04-02 21:40:31 +03:00
parent fb7ff84087
commit 17dff72655
36 changed files with 2495 additions and 277 deletions
--- a/lib/screens/collections/collection_detail_screen.dart
+++ b/lib/screens/collections/collection_detail_screen.dart
@@ -13,7 +13,7 @@ import 'package:remever/components/extensions/context.dart';
 import 'package:remever/database/database.dart';
 import 'package:remever/gen/assets.gen.dart';
 import 'package:remever/inject.dart';
-import 'package:remever/screens/collections/widgets/learning_card.dart';
+import 'package:remever/screens/collections/widgets/ticket_card.dart';
 import 'package:remever/screens/dialogs/info_dialog.dart';
 import 'package:remever/services/tickets/tickets_interface.dart';
 import 'package:remever/widgets/primary_button.dart';
@@ -104,8 +104,8 @@ class CollectionDetailScreen extends StatelessWidget {
              color: AppColors.disabled,
            ),
            const WSpace(2),
-            StreamBuilder<List<Collection>>(
-              stream: getIt<TicketsInterface>().watchTicketsList(),
+            StreamBuilder<List<Ticket>>(
+              stream: getIt<TicketsInterface>().watchTicketsList(collection.id),
              builder: (context, snapshot) {
                return _buildCount(snapshot.data?.length ?? 0);
              },
@@ -210,7 +210,7 @@ class CollectionDetailScreen extends StatelessWidget {
      physics: BouncingScrollPhysics(),
      itemCount: 10,
      itemBuilder:
-          (BuildContext context, int index) => LearningCard(index: index),
+          (BuildContext context, int index) => TicketCard(index: index),
    );
  }
 }
--- a/lib/screens/collections/collection_search_screen.dart
+++ b/lib/screens/collections/collection_search_screen.dart
@@ -0,0 +1,273 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:remever/common/resources.dart';
+import 'package:remever/common/utils.dart';
+import 'package:remever/common/widgets/loose_focus.dart';
+import 'package:remever/common/widgets/typography.dart';
+import 'package:remever/common/widgets/w_if.dart';
+import 'package:remever/common/widgets/wspace.dart';
+import 'package:remever/components/extensions/context.dart';
+import 'package:remever/components/extensions/state.dart';
+import 'package:remever/database/database.dart';
+import 'package:remever/gen/assets.gen.dart';
+import 'package:remever/inject.dart';
+import 'package:remever/router.gr.dart';
+import 'package:remever/screens/collections/collections_screen.dart';
+import 'package:remever/screens/collections/widgets/collection_progress_bar.dart';
+import 'package:remever/services/collection/collections_interface.dart';
+
+@RoutePage()
+class CollectionSearchScreen extends StatefulWidget {
+  const CollectionSearchScreen({super.key, required this.onCollectionSelect});
+
+  final void Function(Collection) onCollectionSelect;
+
+  @override
+  State<CollectionSearchScreen> createState() => _CollectionSearchScreenState();
+}
+
+class _CollectionSearchScreenState extends State<CollectionSearchScreen> {
+  final TextEditingController _searchController = TextEditingController();
+
+  String? _search;
+
+  @override
+  void initState() {
+    _searchController.addListener(() {
+      safeSetState(() {
+        _search = _searchController.text;
+      });
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  void _onCreateTap() {
+    context.pushRoute(CrudCollectionRoute());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return LooseFocus(
+      child: Scaffold(
+        backgroundColor: AppColors.bg,
+        appBar: _buildAppBar(context),
+        body: _buildBody(context),
+      ),
+    );
+  }
+
+  AppBar _buildAppBar(BuildContext context) {
+    return AppBar(
+      toolbarHeight: 66.h,
+      backgroundColor: AppColors.white,
+      shadowColor: Colors.transparent,
+      title: SizedBox(
+        height: 48.h,
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            color: AppColors.white,
+            borderRadius: BorderRadius.circular(12).r,
+            border: Border.all(color: AppColors.bg),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12).r,
+            child: Center(
+              child: TextField(
+                autofocus: true,
+                controller: _searchController,
+                textCapitalization: TextCapitalization.sentences,
+                maxLines: 1,
+                cursorColor: AppColors.danger,
+                decoration: const InputDecoration.collapsed(
+                  hintText: 'Поиск',
+                  hintStyle: TextStyle(color: AppColors.gray),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+      centerTitle: true,
+      leading: IconButton(
+        onPressed: () async {
+          context.back();
+        },
+        icon: const Icon(CupertinoIcons.left_chevron, color: Colors.black),
+      ),
+    );
+  }
+
+  Widget _buildBody(BuildContext context) {
+    return Column(
+      children: [
+        _buildCreateButton(),
+        Expanded(
+          child: StreamBuilder<List<Collection>>(
+            stream: getIt<CollectionsInterface>().watchCollectionsList(
+              search: _search,
+            ),
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) {
+                return const LoadingList();
+              }
+
+              if (snapshot.hasError) {
+                return const ErrorList();
+              }
+
+              final collections = snapshot.data;
+              if (collections == null || collections.isEmpty) {
+                return const EmptyList();
+              }
+
+              return ListView.builder(
+                itemCount: collections.length,
+                padding: const EdgeInsets.symmetric(horizontal: 16).r,
+                itemBuilder:
+                    (context, index) => Padding(
+                      padding: const EdgeInsets.only(bottom: 8).r,
+                      child: GestureDetector(
+                        onTap: () {
+                          widget.onCollectionSelect(collections[index]);
+
+                          context.back();
+                        },
+                        child: _Collection(collection: collections[index]),
+                      ),
+                    ),
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  Padding _buildCreateButton() {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 28).r,
+      child: GestureDetector(
+        onTap: () => _onCreateTap(),
+        child: Row(
+          children: [
+            SizedBox.square(
+              dimension: 20.r,
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: AppColors.white,
+                  shape: BoxShape.circle,
+                ),
+                child: Center(
+                  child: Icon(Icons.add, color: AppColors.disabled, size: 15.r),
+                ),
+              ),
+            ),
+            WSpace(4),
+            AppTypography('Создать новую коллекцию', type: Regular16px()),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _Collection extends StatelessWidget {
+  const _Collection({required this.collection});
+
+  final Collection collection;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      constraints: BoxConstraints(minHeight: 66.h, maxHeight: 84.h),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(12).r,
+        color: AppColors.white,
+      ),
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8).r,
+      child: Row(
+        children: <Widget>[_buildAvatar(), const WSpace(5), _buildInfo()],
+      ),
+    );
+  }
+
+  ///
+  /// Построение основной информации
+  ///
+  Widget _buildInfo() {
+    return SizedBox(
+      width: 230.w,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          _buildTitle(),
+          const HSpace(4),
+          Row(
+            children: <Widget>[
+              Assets.icons.typeCards.image(
+                height: 18.h,
+                width: 18.w,
+                color: AppColors.disabled,
+              ),
+              const WSpace(2),
+              AppTypography(
+                '${collection.likesCount.toString()} ${Utils.declOfNum(collection.likesCount, ['карточек', 'карточки', 'карточек'])}',
+                type: Regular14px(),
+                color: AppColors.disabled,
+              ),
+            ],
+          ),
+          const HSpace(6),
+          const CollectionProgressBar(),
+        ],
+      ),
+    );
+  }
+
+  ///
+  /// Название коллекции
+  ///
+  Widget _buildTitle() {
+    return AppTypography(
+      collection.title,
+      type: Medium16px(),
+      maxLines: 2,
+      softWrap: true,
+    );
+  }
+
+  ///
+  /// Обложка коллекции
+  ///
+  Widget _buildAvatar() {
+    return SizedBox.square(
+      dimension: 50.r,
+      child: DecoratedBox(
+        decoration: BoxDecoration(shape: BoxShape.circle, color: AppColors.bg),
+
+        child: Wif(
+          condition: collection.image != null,
+          builder:
+              (context) => ClipOval(
+                child: Image.memory(collection.image!, fit: BoxFit.cover),
+              ),
+          fallback:
+              (context) => Center(
+                child: AppTypography(
+                  collection.title.substring(0, 1),
+                  type: Bold34px(),
+                ),
+              ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/screens/collections/collections_screen.dart
+++ b/lib/screens/collections/collections_screen.dart
@@ -83,16 +83,16 @@ class _CollectionScreenState extends State<CollectionScreen> {
            stream: getIt<CollectionsInterface>().watchCollectionsList(),
            builder: (context, snapshot) {
              if (snapshot.connectionState == ConnectionState.waiting) {
-                return const _LoadingList();
+                return const LoadingList();
              }

              if (snapshot.hasError) {
-                return const _ErrorList();
+                return const ErrorList();
              }

              final collections = snapshot.data;
              if (collections == null || collections.isEmpty) {
-                return const _EmptyList();
+                return const EmptyList();
              }

              return ListView.builder(
@@ -113,8 +113,8 @@ class _CollectionScreenState extends State<CollectionScreen> {
  }
 }

-class _LoadingList extends StatelessWidget {
-  const _LoadingList();
+class LoadingList extends StatelessWidget {
+  const LoadingList({super.key});

  @override
  Widget build(BuildContext context) {
@@ -125,8 +125,8 @@ class _LoadingList extends StatelessWidget {
  }
 }

-class _ErrorList extends StatelessWidget {
-  const _ErrorList();
+class ErrorList extends StatelessWidget {
+  const ErrorList({super.key});

  @override
  Widget build(BuildContext context) {
@@ -139,8 +139,8 @@ class _ErrorList extends StatelessWidget {
  }
 }

-class _EmptyList extends StatelessWidget {
-  const _EmptyList();
+class EmptyList extends StatelessWidget {
+  const EmptyList({super.key});

  @override
  Widget build(BuildContext context) {
--- a/lib/screens/collections/widgets/learning_card.dart
+++ b/lib/screens/collections/widgets/learning_card.dart
@@ -14,8 +14,8 @@ import 'package:remever/screens/dialogs/replace_diaog.dart';

 enum CardType { CREATE, SHOW }

-class LearningCard extends StatelessWidget {
-  LearningCard({
+class TicketCard extends StatelessWidget {
+  TicketCard({
    required this.index,
    super.key,
    this.type = CardType.SHOW,