From b5d9663950d9fb17b68eb452875744af1163e2ff Mon Sep 17 00:00:00 2001 From: GokaPek Date: Tue, 24 Sep 2024 13:29:59 +0400 Subject: [PATCH] =?UTF-8?q?4=20=D0=BF=D0=BE=D1=87=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/Presentation/detailPage.dart | 23 +++++ lib/Presentation/home_page/card.dart | 95 -------------------- lib/Presentation/home_page/home_page.dart | 26 +++--- lib/domain/models/card.dart | 105 ++++++++++++++++++++++ 4 files changed, 141 insertions(+), 108 deletions(-) create mode 100644 lib/Presentation/detailPage.dart delete mode 100644 lib/Presentation/home_page/card.dart create mode 100644 lib/domain/models/card.dart diff --git a/lib/Presentation/detailPage.dart b/lib/Presentation/detailPage.dart new file mode 100644 index 0000000..e6c1940 --- /dev/null +++ b/lib/Presentation/detailPage.dart @@ -0,0 +1,23 @@ +import 'package:flutter/material.dart'; + +class DetailPage extends StatelessWidget { + final String info; + + const DetailPage({super.key, required this.info}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Информация о продукции'), + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: Text( + info, + style: const TextStyle(fontSize: 18.0), + ), + ), + ); + } +} \ No newline at end of file diff --git a/lib/Presentation/home_page/card.dart b/lib/Presentation/home_page/card.dart deleted file mode 100644 index 4ab1e7e..0000000 --- a/lib/Presentation/home_page/card.dart +++ /dev/null @@ -1,95 +0,0 @@ -part of 'home_page.dart'; - -class _CardData { - final String text; - final String info; - final String? urlImage; - - _CardData({required this.text, required this.info, required this.urlImage}); -} - -class _Card extends StatefulWidget { - final String text; - final String info; - final String? urlImage; - final VoidCallback? onLike; - - const _Card({super.key, required this.text, required this.info, required this.urlImage, this.onLike}); - - factory _Card.fromData(_CardData data, {VoidCallback? onLike}) => _Card( - text: data.text, - info: data.info, - urlImage: data.urlImage, - onLike: onLike, - ); - - @override - State<_Card> createState() => _CardState(); -} - -class _CardState extends State<_Card> { - bool isLiked = false; - - @override - Widget build(BuildContext context) { - return Card( - elevation: 4.0, - margin: const EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Stack( - children: [ - Image.network( - widget.urlImage ?? 'https://hlebzavod3.ru/images/virtuemart/product/011_IMG_9657.jpg', - fit: BoxFit.cover, - height: 150.0, - width: double.infinity, - ), - Positioned( - top: 8.0, - right: 8.0, - child: GestureDetector( - onTap: () { - setState(() { - isLiked = !isLiked; - }); - if(isLiked) widget.onLike?.call(); - }, - child: Icon( - Icons.favorite, - color: isLiked ? Colors.red : Colors.blueGrey, - size: 30.0, - ), - ), - ), - ], - ), - Padding( - padding: const EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.text, - style: const TextStyle( - fontSize: 18.0, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 5.0), - Text( - widget.info, - style: const TextStyle( - fontSize: 14.0, - color: Colors.grey, - ), - ), - ], - ), - ), - ], - ), - ); - } -} \ No newline at end of file diff --git a/lib/Presentation/home_page/home_page.dart b/lib/Presentation/home_page/home_page.dart index cadfa92..af7f091 100644 --- a/lib/Presentation/home_page/home_page.dart +++ b/lib/Presentation/home_page/home_page.dart @@ -1,6 +1,6 @@ - import 'package:flutter/material.dart'; -part 'card.dart'; +import '../../Presentation/detailPage.dart'; +part '../../domain/models/card.dart'; class MyHomePage extends StatefulWidget { const MyHomePage({super.key, required this.title}); @@ -36,19 +36,19 @@ class Body extends StatelessWidget { @override Widget build(BuildContext context) { final data = [ - _CardData(text: "Батон", + CardData(text: "Батон", info: "Белый хлеб, испечённый в виде продолговатой булки", urlImage: "https://hlebzavod3.ru/images/virtuemart/product/011_IMG_9657.jpg"), - _CardData(text: "Багет", + CardData(text: "Багет", info: "Длинный тонкий вид хлеба французского происхождения", urlImage: "https://main-cdn.sbermegamarket.ru/big1/hlr-system/13/14/29/23/31/01/100027310078b0.jpg"), - _CardData(text: "Круассан", + CardData(text: "Круассан", info: "Небольшое мучное кондитерское изделие, булочка в форме полумесяца из слоёного теста", urlImage: "https://shokoladd.ru/wp-content/uploads/2019/02/Croissant_Chocolate_Plate_Two_547531_2048x1152.jpg"), - _CardData(text: "Чиаба́тта", + CardData(text: "Чиаба́тта", info: "Итальянский пшеничный хлеб, выпекаемый с использованием закваски, дрожжей и оливкового масла", urlImage: "https://avatars.mds.yandex.net/i?id=a9163f90a989a596b26b30ad39beaf47_l-10629685-images-thumbs&n=13"), - _CardData(text: "Булочка без картинки", + CardData(text: "Булочка без картинки", info: "Очень кусьна", urlImage: null) ]; @@ -56,8 +56,8 @@ class Body extends StatelessWidget { child: SingleChildScrollView( child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: data.map((e) => _Card.fromData(e, - onLike: () => _showSnackBar(context),)).toList(), + children: data.map((e) => MyCard.fromData(e, + onLike: () => _showSnackBar(context),)).toList(), ) ) ); @@ -66,10 +66,10 @@ class Body extends StatelessWidget { void _showSnackBar(BuildContext context) { WidgetsBinding.instance.addPostFrameCallback((_){ ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text( - 'Bread liked!', - style: Theme.of(context).textTheme.bodyLarge, - ), + content: Text( + 'Bread liked!', + style: Theme.of(context).textTheme.bodyLarge, + ), backgroundColor: Colors.red, duration: const Duration(seconds: 1), )); diff --git a/lib/domain/models/card.dart b/lib/domain/models/card.dart new file mode 100644 index 0000000..97778dc --- /dev/null +++ b/lib/domain/models/card.dart @@ -0,0 +1,105 @@ +part of '../../Presentation/home_page/home_page.dart'; + +class CardData { + final String text; + final String info; + final String? urlImage; + + CardData({required this.text, required this.info, required this.urlImage}); +} + +class MyCard extends StatefulWidget { + final String text; + final String info; + final String? urlImage; + final VoidCallback? onLike; + + const MyCard({super.key, required this.text, required this.info, required this.urlImage, this.onLike}); + + factory MyCard.fromData(CardData data, {VoidCallback? onLike}) => MyCard( + text: data.text, + info: data.info, + urlImage: data.urlImage, + onLike: onLike, + ); + + @override + State createState() => _MyCardState(); +} + +class _MyCardState extends State { + bool isLiked = false; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => DetailPage(info: widget.info), + ), + ); + }, + child: Card( + elevation: 4.0, + margin: const EdgeInsets.all(10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Stack( + children: [ + Image.network( + widget.urlImage ?? 'https://hlebzavod3.ru/images/virtuemart/product/011_IMG_9657.jpg', + fit: BoxFit.cover, + height: 150.0, + width: double.infinity, + ), + Positioned( + top: 8.0, + right: 8.0, + child: GestureDetector( + onTap: () { + setState(() { + isLiked = !isLiked; + }); + if(isLiked) widget.onLike?.call(); + }, + child: Icon( + Icons.favorite, + color: isLiked ? Colors.red : Colors.blueGrey, + size: 30.0, + ), + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.all(10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.text, + style: const TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 5.0), + Text( + widget.info, + style: const TextStyle( + fontSize: 14.0, + color: Colors.grey, + ), + ), + ], + ), + ), + ], + ), + ), + ); + } +} \ No newline at end of file