From a66791d7771579518dc3aa1f21ab103e01d0f30f Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Tue, 12 Nov 2024 14:13:17 +0300 Subject: [PATCH] feat(diary): update --- .../diary/presentation/pages/diary_screen.dart | 16 ++++++++++++---- ...lossary_moderation_request_modal_widget.dart | 17 +++++++++++++++++ .../widgets/satiety_rating_widget.dart | 1 + 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart index 71376057..79f9ac2f 100644 --- a/lib/features/diary/presentation/pages/diary_screen.dart +++ b/lib/features/diary/presentation/pages/diary_screen.dart @@ -5,6 +5,7 @@ import 'package:eatvio_app/features/diary/models/diary_day_model.dart'; import 'package:eatvio_app/features/diary/models/nutrition_model.dart'; import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart'; +import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart'; import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart'; import 'package:eatvio_app/features/glossary/models/glossary_model.dart'; import 'package:eatvio_app/locator_service.dart'; @@ -37,7 +38,7 @@ class _DiaryScreenState extends State { final productNameController = TextEditingController(); final quantityController = TextEditingController(); int currentSelectedPhotoIndex = 0; - String time = "${DateTime.now().hour.toString().padLeft(2, '0')} : ${DateTime.now().minute.toString().padLeft(2, '0')}"; + String time = "${DateTime.now().hour.toString().padLeft(2, '0')}:${DateTime.now().minute.toString().padLeft(2, '0')}"; DateTime _time = DateTime.now(); _showDatePicker() { @@ -56,7 +57,7 @@ class _DiaryScreenState extends State { onDateTimeChanged: (newTime) { setState(() { _time = newTime; - time = "${_time.hour.toString().padLeft(2, '0')} : ${_time.minute.toString().padLeft(2, '0')}"; + time = "${_time.hour.toString().padLeft(2, '0')}:${_time.minute.toString().padLeft(2, '0')}"; }); }, ), @@ -64,6 +65,12 @@ class _DiaryScreenState extends State { InkWell( onTap: () { Navigator.of(context).pop(); + showModalBottomSheet( + useRootNavigator: true, + useSafeArea: false, + context: context, + builder: (context) => GlossaryModerationRequestModalWidget(), + ); }, borderRadius: BorderRadius.circular(20), child: Ink( @@ -136,13 +143,14 @@ class _DiaryScreenState extends State { onTap: () => _showDatePicker(), borderRadius: BorderRadius.circular(100), child: Ink( - width: MediaQuery.of(context).size.width / 5, height: 32, decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), color: Color(0xFFF1F2F6), ), - child: Center( + child: Container( + alignment: Alignment.center, + padding: EdgeInsets.symmetric(horizontal: 16), child: Text( time, style: TextStyle( diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart new file mode 100644 index 00000000..c51a4cb7 --- /dev/null +++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart @@ -0,0 +1,17 @@ +import 'package:flutter/material.dart'; + +class GlossaryModerationRequestModalWidget extends StatefulWidget { + const GlossaryModerationRequestModalWidget({super.key}); + + @override + State createState() => _GlossaryModerationRequestModalWidgetState(); +} + +class _GlossaryModerationRequestModalWidgetState extends State { + @override + Widget build(BuildContext context) { + return Dialog( + child: Column(), + ); + } +} diff --git a/lib/features/diary/presentation/widgets/satiety_rating_widget.dart b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart index 4376f274..69af3f22 100644 --- a/lib/features/diary/presentation/widgets/satiety_rating_widget.dart +++ b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart @@ -42,6 +42,7 @@ class _SatietyRatingWidgetState extends State { initialRating: 3, itemCount: 6, itemSize: MediaQuery.of(context).size.width / 6 - (124 / 6), + updateOnDrag: true, itemBuilder: (context, index) { switch (index) { case 0: