From f0948838407378af370eb8ac6aaa866826af6ae4 Mon Sep 17 00:00:00 2001 From: inexcode Date: Tue, 27 Dec 2022 11:41:20 +0300 Subject: [PATCH] remove quantity from new item form and fix fabs --- lib/logic/itemformcubit.dart | 9 +-------- lib/ui/fabs/addcourierfab.dart | 2 +- lib/ui/fabs/additemfab.dart | 2 +- lib/ui/fabs/addorderfab.dart | 2 +- lib/ui/itemsdetails.dart | 9 --------- lib/ui/root.dart | 26 +++++--------------------- 6 files changed, 9 insertions(+), 41 deletions(-) diff --git a/lib/logic/itemformcubit.dart b/lib/logic/itemformcubit.dart index 6011956..76ebd32 100644 --- a/lib/logic/itemformcubit.dart +++ b/lib/logic/itemformcubit.dart @@ -25,11 +25,7 @@ class ItemFormCubit extends FormCubit { initalValue: 100, ); - quantity = FieldCubit( - initalValue: 1, - ); - - super.addFields([title, description, price, quantity]); + super.addFields([title, description, price]); } @override @@ -38,13 +34,11 @@ class ItemFormCubit extends FormCubit { print('title: ${title.state.value}'); print('description: ${description.state.value}'); print('price: ${price.state.value}'); - print('quantity: ${quantity.state.value}'); final Item item = Item( title: title.state.value, description: description.state.value, price: price.state.value, - quantity: quantity.state.value, id: cubit.state.items.isEmpty ? 0 : cubit.state.items.last.id + 1, ); @@ -54,7 +48,6 @@ class ItemFormCubit extends FormCubit { late FieldCubit title; late FieldCubit description; late FieldCubit price; - late FieldCubit quantity; final ItemsCubit cubit; } diff --git a/lib/ui/fabs/addcourierfab.dart b/lib/ui/fabs/addcourierfab.dart index 44cc565..56d39ba 100644 --- a/lib/ui/fabs/addcourierfab.dart +++ b/lib/ui/fabs/addcourierfab.dart @@ -5,7 +5,7 @@ class AddCourierFab extends StatelessWidget { const AddCourierFab({super.key}); @override - Widget build(final BuildContext context) => FloatingActionButton.small( + Widget build(final BuildContext context) => FloatingActionButton( heroTag: 'new_courier_fab', onPressed: () { showModalBottomSheet( diff --git a/lib/ui/fabs/additemfab.dart b/lib/ui/fabs/additemfab.dart index b56e933..72e2334 100644 --- a/lib/ui/fabs/additemfab.dart +++ b/lib/ui/fabs/additemfab.dart @@ -5,7 +5,7 @@ class AddItemFab extends StatelessWidget { const AddItemFab({super.key}); @override - Widget build(final BuildContext context) => FloatingActionButton.small( + Widget build(final BuildContext context) => FloatingActionButton( heroTag: 'new_item_fab', onPressed: () { showModalBottomSheet( diff --git a/lib/ui/fabs/addorderfab.dart b/lib/ui/fabs/addorderfab.dart index 4c89ae1..af433a1 100644 --- a/lib/ui/fabs/addorderfab.dart +++ b/lib/ui/fabs/addorderfab.dart @@ -4,7 +4,7 @@ class AddOrderFab extends StatelessWidget { const AddOrderFab({super.key}); @override - Widget build(final BuildContext context) => FloatingActionButton.small( + Widget build(final BuildContext context) => FloatingActionButton( heroTag: 'new_order_fab', onPressed: () { showModalBottomSheet( diff --git a/lib/ui/itemsdetails.dart b/lib/ui/itemsdetails.dart index c959e86..d15c2c0 100644 --- a/lib/ui/itemsdetails.dart +++ b/lib/ui/itemsdetails.dart @@ -60,15 +60,6 @@ class ItemsDetails extends StatelessWidget { labelText: 'Цена', ), ), - const SizedBox(height: 20), - CubitFormIntField( - formFieldCubit: - context.read().quantity, - decoration: const InputDecoration( - alignLabelWithHint: false, - labelText: 'Количество', - ), - ), const SizedBox(height: 30), FilledButton( onPressed: () => diff --git a/lib/ui/root.dart b/lib/ui/root.dart index 343d2d8..b1433b4 100644 --- a/lib/ui/root.dart +++ b/lib/ui/root.dart @@ -90,27 +90,11 @@ class _RootPageState extends State with TickerProviderStateMixin { bottomNavigationBar: BrandTabBar( controller: tabController, ), - floatingActionButton: SizedBox( - height: 104 + 16, - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: MainAxisAlignment.end, - children: [ - ScaleTransition( - scale: _animationItems, - child: const AddItemFab(), - ), - ScaleTransition( - scale: _animationCouriers, - child: const AddCourierFab(), - ), - ScaleTransition( - scale: _animationOrders, - child: const AddOrderFab(), - ), - ], - ), - ), + floatingActionButton: tabController.index == 0 + ? const AddItemFab() + : tabController.index == 1 + ? const AddCourierFab() + : const AddOrderFab(), ), ), );