Merge pull request 'feat(diary): update' (#151) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#151
This commit is contained in:
mso7nueh
2024-11-12 11:16:14 +00:00
3 changed files with 30 additions and 4 deletions

View File

@@ -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<DiaryScreen> {
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<DiaryScreen> {
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<DiaryScreen> {
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<DiaryScreen> {
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(

View File

@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';
class GlossaryModerationRequestModalWidget extends StatefulWidget {
const GlossaryModerationRequestModalWidget({super.key});
@override
State<GlossaryModerationRequestModalWidget> createState() => _GlossaryModerationRequestModalWidgetState();
}
class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModerationRequestModalWidget> {
@override
Widget build(BuildContext context) {
return Dialog(
child: Column(),
);
}
}

View File

@@ -42,6 +42,7 @@ class _SatietyRatingWidgetState extends State<SatietyRatingWidget> {
initialRating: 3,
itemCount: 6,
itemSize: MediaQuery.of(context).size.width / 6 - (124 / 6),
updateOnDrag: true,
itemBuilder: (context, index) {
switch (index) {
case 0: