diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 196d2aa1..0b639038 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -24,7 +24,8 @@ jobs: - name: Install Android SDK run: | apt-get update - https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip + apt-get install -y openjdk-11-jdk wget + wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip unzip commandlinetools.zip mkdir -p $HOME/Android/Sdk/cmdline-tools/latest mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/ diff --git a/android/.idea/caches/deviceStreaming.xml b/android/.idea/caches/deviceStreaming.xml new file mode 100644 index 00000000..5a2f8669 --- /dev/null +++ b/android/.idea/caches/deviceStreaming.xml @@ -0,0 +1,329 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml new file mode 100644 index 00000000..efe09167 --- /dev/null +++ b/android/.idea/gradle.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/migrations.xml b/android/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/android/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml new file mode 100644 index 00000000..48725873 --- /dev/null +++ b/android/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml new file mode 100644 index 00000000..bf609e00 --- /dev/null +++ b/android/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/android/.idea/modules/android.iml b/android/.idea/modules/android.iml new file mode 100644 index 00000000..2af55b99 --- /dev/null +++ b/android/.idea/modules/android.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml new file mode 100644 index 00000000..16660f1d --- /dev/null +++ b/android/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml new file mode 100644 index 00000000..df82a64e --- /dev/null +++ b/android/.idea/workspace.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 1731295514828 + + + + \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index e5218dce..26791c12 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { android { namespace = "com.eatvioapp.app" compileSdk = flutter.compileSdkVersion - ndkVersion = "28.0.12433566" + ndkVersion = flutter.ndkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_21 diff --git a/android/settings.gradle b/android/settings.gradle index b5e1b3f5..42a51c65 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.3.2" apply false - id "org.jetbrains.kotlin.android" version "2.0.20" apply false + id "com.android.application" version "8.7.2" apply false + id "org.jetbrains.kotlin.android" version "2.0.21" apply false } include ":app" diff --git a/assets/icons/satiety_emoji_left.svg b/assets/icons/satiety_emoji_left.svg new file mode 100644 index 00000000..e2a21bda --- /dev/null +++ b/assets/icons/satiety_emoji_left.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/icons/satiety_emoji_right.svg b/assets/icons/satiety_emoji_right.svg new file mode 100644 index 00000000..6791ee88 --- /dev/null +++ b/assets/icons/satiety_emoji_right.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/features/diary/presentation/bloc/diary_cubit.dart b/lib/features/diary/presentation/bloc/diary_cubit.dart index d7f31da6..62d81086 100644 --- a/lib/features/diary/presentation/bloc/diary_cubit.dart +++ b/lib/features/diary/presentation/bloc/diary_cubit.dart @@ -10,6 +10,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; class DiaryCubit extends Cubit { final DiaryRepository diaryRepository; final GlossaryRepository glossaryRepository; + double currentSelectedSatietyRating = 3; DiaryCubit({ required this.diaryRepository, @@ -19,7 +20,12 @@ class DiaryCubit extends Cubit { getDiaryDay(String date, [bool needLoading = true]) async { if (needLoading) emit(const DiaryState.loading()); try { - emit(DiaryState.loaded(diary: await diaryRepository.getDiaryByDate(date))); + emit( + DiaryState.loaded( + diary: await diaryRepository.getDiaryByDate(date), + currentSelectedSatietyRating: currentSelectedSatietyRating, + ), + ); } catch (e) { emit(DiaryState.error(errorMessage: e.toString())); throw e; @@ -109,4 +115,9 @@ class DiaryCubit extends Cubit { ); await getDiaryDay(date, false); } + + updateCurrentSelectedSatietyRating(double value) { + currentSelectedSatietyRating = value; + emit((state as DiaryStateLoaded).copyWith(currentSelectedSatietyRating: currentSelectedSatietyRating)); + } } diff --git a/lib/features/diary/presentation/bloc/diary_state.dart b/lib/features/diary/presentation/bloc/diary_state.dart index c9b58a8d..85221b31 100644 --- a/lib/features/diary/presentation/bloc/diary_state.dart +++ b/lib/features/diary/presentation/bloc/diary_state.dart @@ -15,5 +15,6 @@ class DiaryState with _$DiaryState { const factory DiaryState.loaded({ required DiaryDayModel diary, + required double currentSelectedSatietyRating, }) = DiaryStateLoaded; } diff --git a/lib/features/diary/presentation/bloc/diary_state.freezed.dart b/lib/features/diary/presentation/bloc/diary_state.freezed.dart index 513d217d..6e0778c4 100644 --- a/lib/features/diary/presentation/bloc/diary_state.freezed.dart +++ b/lib/features/diary/presentation/bloc/diary_state.freezed.dart @@ -21,7 +21,9 @@ mixin _$DiaryState { TResult Function() $default, { required TResult Function() loading, required TResult Function(String errorMessage) error, - required TResult Function(DiaryDayModel diary) loaded, + required TResult Function( + DiaryDayModel diary, double currentSelectedSatietyRating) + loaded, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -29,7 +31,8 @@ mixin _$DiaryState { TResult? Function()? $default, { TResult? Function()? loading, TResult? Function(String errorMessage)? error, - TResult? Function(DiaryDayModel diary)? loaded, + TResult? Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -37,7 +40,8 @@ mixin _$DiaryState { TResult Function()? $default, { TResult Function()? loading, TResult Function(String errorMessage)? error, - TResult Function(DiaryDayModel diary)? loaded, + TResult Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, required TResult orElse(), }) => throw _privateConstructorUsedError; @@ -133,7 +137,9 @@ class _$DiaryStateImpl implements _DiaryState { TResult Function() $default, { required TResult Function() loading, required TResult Function(String errorMessage) error, - required TResult Function(DiaryDayModel diary) loaded, + required TResult Function( + DiaryDayModel diary, double currentSelectedSatietyRating) + loaded, }) { return $default(); } @@ -144,7 +150,8 @@ class _$DiaryStateImpl implements _DiaryState { TResult? Function()? $default, { TResult? Function()? loading, TResult? Function(String errorMessage)? error, - TResult? Function(DiaryDayModel diary)? loaded, + TResult? Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, }) { return $default?.call(); } @@ -155,7 +162,8 @@ class _$DiaryStateImpl implements _DiaryState { TResult Function()? $default, { TResult Function()? loading, TResult Function(String errorMessage)? error, - TResult Function(DiaryDayModel diary)? loaded, + TResult Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, required TResult orElse(), }) { if ($default != null) { @@ -250,7 +258,9 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading { TResult Function() $default, { required TResult Function() loading, required TResult Function(String errorMessage) error, - required TResult Function(DiaryDayModel diary) loaded, + required TResult Function( + DiaryDayModel diary, double currentSelectedSatietyRating) + loaded, }) { return loading(); } @@ -261,7 +271,8 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading { TResult? Function()? $default, { TResult? Function()? loading, TResult? Function(String errorMessage)? error, - TResult? Function(DiaryDayModel diary)? loaded, + TResult? Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, }) { return loading?.call(); } @@ -272,7 +283,8 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading { TResult Function()? $default, { TResult Function()? loading, TResult Function(String errorMessage)? error, - TResult Function(DiaryDayModel diary)? loaded, + TResult Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, required TResult orElse(), }) { if (loading != null) { @@ -396,7 +408,9 @@ class _$DiaryStateErrorImpl implements DiaryStateError { TResult Function() $default, { required TResult Function() loading, required TResult Function(String errorMessage) error, - required TResult Function(DiaryDayModel diary) loaded, + required TResult Function( + DiaryDayModel diary, double currentSelectedSatietyRating) + loaded, }) { return error(errorMessage); } @@ -407,7 +421,8 @@ class _$DiaryStateErrorImpl implements DiaryStateError { TResult? Function()? $default, { TResult? Function()? loading, TResult? Function(String errorMessage)? error, - TResult? Function(DiaryDayModel diary)? loaded, + TResult? Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, }) { return error?.call(errorMessage); } @@ -418,7 +433,8 @@ class _$DiaryStateErrorImpl implements DiaryStateError { TResult Function()? $default, { TResult Function()? loading, TResult Function(String errorMessage)? error, - TResult Function(DiaryDayModel diary)? loaded, + TResult Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, required TResult orElse(), }) { if (error != null) { @@ -484,7 +500,7 @@ abstract class _$$DiaryStateLoadedImplCopyWith<$Res> { $Res Function(_$DiaryStateLoadedImpl) then) = __$$DiaryStateLoadedImplCopyWithImpl<$Res>; @useResult - $Res call({DiaryDayModel diary}); + $Res call({DiaryDayModel diary, double currentSelectedSatietyRating}); $DiaryDayModelCopyWith<$Res> get diary; } @@ -503,12 +519,17 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res> @override $Res call({ Object? diary = null, + Object? currentSelectedSatietyRating = null, }) { return _then(_$DiaryStateLoadedImpl( diary: null == diary ? _value.diary : diary // ignore: cast_nullable_to_non_nullable as DiaryDayModel, + currentSelectedSatietyRating: null == currentSelectedSatietyRating + ? _value.currentSelectedSatietyRating + : currentSelectedSatietyRating // ignore: cast_nullable_to_non_nullable + as double, )); } @@ -526,14 +547,17 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res> /// @nodoc class _$DiaryStateLoadedImpl implements DiaryStateLoaded { - const _$DiaryStateLoadedImpl({required this.diary}); + const _$DiaryStateLoadedImpl( + {required this.diary, required this.currentSelectedSatietyRating}); @override final DiaryDayModel diary; + @override + final double currentSelectedSatietyRating; @override String toString() { - return 'DiaryState.loaded(diary: $diary)'; + return 'DiaryState.loaded(diary: $diary, currentSelectedSatietyRating: $currentSelectedSatietyRating)'; } @override @@ -541,11 +565,16 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded { return identical(this, other) || (other.runtimeType == runtimeType && other is _$DiaryStateLoadedImpl && - (identical(other.diary, diary) || other.diary == diary)); + (identical(other.diary, diary) || other.diary == diary) && + (identical(other.currentSelectedSatietyRating, + currentSelectedSatietyRating) || + other.currentSelectedSatietyRating == + currentSelectedSatietyRating)); } @override - int get hashCode => Object.hash(runtimeType, diary); + int get hashCode => + Object.hash(runtimeType, diary, currentSelectedSatietyRating); /// Create a copy of DiaryState /// with the given fields replaced by the non-null parameter values. @@ -562,9 +591,11 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded { TResult Function() $default, { required TResult Function() loading, required TResult Function(String errorMessage) error, - required TResult Function(DiaryDayModel diary) loaded, + required TResult Function( + DiaryDayModel diary, double currentSelectedSatietyRating) + loaded, }) { - return loaded(diary); + return loaded(diary, currentSelectedSatietyRating); } @override @@ -573,9 +604,10 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded { TResult? Function()? $default, { TResult? Function()? loading, TResult? Function(String errorMessage)? error, - TResult? Function(DiaryDayModel diary)? loaded, + TResult? Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, }) { - return loaded?.call(diary); + return loaded?.call(diary, currentSelectedSatietyRating); } @override @@ -584,11 +616,12 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded { TResult Function()? $default, { TResult Function()? loading, TResult Function(String errorMessage)? error, - TResult Function(DiaryDayModel diary)? loaded, + TResult Function(DiaryDayModel diary, double currentSelectedSatietyRating)? + loaded, required TResult orElse(), }) { if (loaded != null) { - return loaded(diary); + return loaded(diary, currentSelectedSatietyRating); } return orElse(); } @@ -632,10 +665,13 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded { } abstract class DiaryStateLoaded implements DiaryState { - const factory DiaryStateLoaded({required final DiaryDayModel diary}) = + const factory DiaryStateLoaded( + {required final DiaryDayModel diary, + required final double currentSelectedSatietyRating}) = _$DiaryStateLoadedImpl; DiaryDayModel get diary; + double get currentSelectedSatietyRating; /// Create a copy of DiaryState /// with the given fields replaced by the non-null parameter values. diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart index bb9e530a..91fdbf29 100644 --- a/lib/features/diary/presentation/pages/diary_screen.dart +++ b/lib/features/diary/presentation/pages/diary_screen.dart @@ -4,6 +4,7 @@ import 'package:eatvio_app/core/const.dart'; import 'package:eatvio_app/features/diary/models/diary_day_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/satiety_rating_widget.dart'; import 'package:eatvio_app/features/glossary/models/glossary_model.dart'; import 'package:eatvio_app/locator_service.dart'; import 'package:eatvio_app/theme/theme_helper.dart'; @@ -15,6 +16,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:image_picker/image_picker.dart'; import 'package:rive/rive.dart'; +import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:table_calendar/table_calendar.dart'; class DiaryScreen extends StatefulWidget { @@ -59,7 +61,12 @@ class _DiaryScreenState extends State { children: [ _calendar(state), if (state is DiaryStateLoading) _loader(), - if (state is DiaryStateLoaded) _meals(state.diary), + if (state is DiaryStateLoaded) + _meals( + state.diary, + state.currentSelectedSatietyRating, + ), + if (state is DiaryStateLoaded) _chart(), const SizedBox(height: 32), ], ), @@ -130,7 +137,10 @@ class _DiaryScreenState extends State { ); } - _meals(DiaryDayModel diaryDay) { + _meals( + DiaryDayModel diaryDay, + double currentSelectedSatietyRating, + ) { return Material( borderRadius: BorderRadius.circular(20), color: Colors.white, @@ -189,12 +199,125 @@ class _DiaryScreenState extends State { diaryDay.meals[currentSelectedMealNumber - 1].photos, diaryDay, ), + SatietyRatingWidget( + currentSelectedSatietyRating: currentSelectedSatietyRating, + ), ], ), ), ); } + _chart() { + final List chartData = [ + ChartData( + 1924, + 200, + '100%', + Color(0xFFFF9500), + ), + ChartData( + 1925, + 50, + '100%', + Color(0xFFFF3B30), + ), + ChartData( + 1926, + 70, + '100%', + Color(0xFF4CD964), + ), + ChartData( + 1926, + 70, + '100%', + Color(0xFF007AFF), + ), + ]; + + return Container( + padding: const EdgeInsets.all(16), + margin: const EdgeInsets.only(top: 12), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + color: Colors.white, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + 'Ваш КБЖУ от дневной\nсуточной нормы', + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFF323F4B), + fontWeight: FontWeight.w500, + fontSize: 18, + height: 1, + ), + ), + Transform.rotate( + angle: -1.5708, + child: ClipRect( + child: Align( + alignment: Alignment.centerRight, + widthFactor: 0.5, + child: SfCircularChart( + series: [ + RadialBarSeries( + dataSource: chartData, + xValueMapper: (ChartData data, _) => data.x, + yValueMapper: (ChartData data, _) => data.y, + pointColorMapper: (ChartData data, _) => data.color, + trackColor: Color.fromRGBO(59, 130, 246, 1), + trackOpacity: 0.1, + gap: "8%", + radius: "110%", + innerRadius: '20%', + cornerStyle: CornerStyle.bothCurve, + ), + ], + ), + ), + ), + ), + _chartData('Калории', '0 ккал'), + const SizedBox(height: 8), + _chartData('Белки', '0 грамм'), + const SizedBox(height: 8), + _chartData('Жиры', '0 грамм'), + const SizedBox(height: 8), + _chartData('Углеводы', '0 грамм'), + ], + ), + ); + } + + _chartData(String title, String value) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + title, + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.w500, + color: Color(0xFF323F4B), + ), + ), + Text( + value, + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.w500, + color: Color(0xFF323F4B), + ), + ), + ], + ); + } + _showImagePicker(DiaryDayModel diaryDay) { showCupertinoModalPopup( context: context, @@ -271,19 +394,20 @@ class _DiaryScreenState extends State { child: IconButton.filled( style: IconButton.styleFrom( backgroundColor: Colors.white, + elevation: 0, ), - onPressed: () { - setState(() { - if (currentSelectedPhotoIndex == photos.length - 1 && currentSelectedPhotoIndex != 0) { - currentSelectedPhotoIndex = photos.length - 2; - } - }); - diaryCubit.deletePhoto( + onPressed: () async { + await diaryCubit.deletePhoto( photo: photos[currentSelectedPhotoIndex], diaryId: diaryDay.id, mealId: diaryDay.meals[currentSelectedMealNumber - 1].id, date: _selectedDay.toString(), ); + setState(() { + if (currentSelectedPhotoIndex == photos.length - 1 && currentSelectedPhotoIndex != 0) { + currentSelectedPhotoIndex = photos.length - 2; + } + }); }, icon: Icon( Icons.close_rounded, @@ -669,3 +793,16 @@ class _DiaryScreenState extends State { ); } } + +class ChartData { + int x, y; + String text; + Color color; + + ChartData( + this.x, + this.y, + this.text, + this.color, + ); +} diff --git a/lib/features/diary/presentation/widgets/satiety_rating_widget.dart b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart new file mode 100644 index 00000000..d12fa114 --- /dev/null +++ b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart @@ -0,0 +1,178 @@ +import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_rating_bar/flutter_rating_bar.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class SatietyRatingWidget extends StatefulWidget { + final double currentSelectedSatietyRating; + + const SatietyRatingWidget({ + super.key, + required this.currentSelectedSatietyRating, + }); + + @override + State createState() => _SatietyRatingWidgetState(); +} + +class _SatietyRatingWidgetState extends State { + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.only(top: 24), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'Ваша сытость после приёма пищи', + style: TextStyle( + fontSize: 16, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + SvgPicture.asset( + 'assets/icons/satiety_emoji_left.svg', + height: 32, + width: 32, + ), + RatingBar.builder( + initialRating: 3, + itemCount: 6, + itemSize: MediaQuery.of(context).size.width / 6 - (124 / 6), + itemBuilder: (context, index) { + switch (index) { + case 0: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 1 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFFC82222), + border: widget.currentSelectedSatietyRating == 1 + ? Border.all( + width: 2, + color: Color(0xFFAA3333), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 1 + ? BorderRadius.horizontal( + left: Radius.circular(8), + right: Radius.circular(2), + ) + : BorderRadius.horizontal( + left: Radius.circular(8), + ), + ), + ); + case 1: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 2 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFFFF3E3E), + border: widget.currentSelectedSatietyRating == 2 + ? Border.all( + width: 2, + color: Color(0xFF550000), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 2 ? BorderRadius.circular(2) : null, + ), + ); + case 2: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 3 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFFF8C926), + border: widget.currentSelectedSatietyRating == 3 + ? Border.all( + width: 2, + color: Color(0xFF8C5D00), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 3 ? BorderRadius.circular(2) : null, + ), + ); + case 3: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 4 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFFFFF3BF), + border: widget.currentSelectedSatietyRating == 4 + ? Border.all( + width: 2, + color: Color(0xFFB5911B), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 4 ? BorderRadius.circular(2) : null, + ), + ); + case 4: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 5 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFF62E833), + border: widget.currentSelectedSatietyRating == 5 + ? Border.all( + width: 2, + color: Color(0xFF276918), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 5 ? BorderRadius.circular(2) : null, + ), + ); + default: + return Container( + width: MediaQuery.of(context).size.width / 6, + height: 16, + margin: widget.currentSelectedSatietyRating == 6 ? EdgeInsets.symmetric(horizontal: 2) : null, + decoration: BoxDecoration( + color: Color(0xFF4DCE20), + border: widget.currentSelectedSatietyRating == 6 + ? Border.all( + width: 2, + color: Color(0xFF184D12), + strokeAlign: BorderSide.strokeAlignOutside, + ) + : null, + borderRadius: widget.currentSelectedSatietyRating == 6 + ? BorderRadius.horizontal( + left: Radius.circular(2), + right: Radius.circular(8), + ) + : BorderRadius.horizontal( + right: Radius.circular(8), + ), + ), + ); + } + }, + onRatingUpdate: (value) => context.read().updateCurrentSelectedSatietyRating(value), + ), + SvgPicture.asset( + 'assets/icons/satiety_emoji_right.svg', + height: 32, + width: 32, + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/main.dart b/lib/main.dart index ce09857f..816adbe7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,7 +11,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:keyboard_dismisser/keyboard_dismisser.dart'; -Future main() async { +void main() async { WidgetsFlutterBinding.ensureInitialized(); await di.init(); runApp(MyApp()); diff --git a/pubspec.yaml b/pubspec.yaml index b589dd00..080157d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -50,6 +50,7 @@ dependencies: rive: ^0.13.15 mask_text_input_formatter: ^2.9.0 lottie: ^3.1.3 + flutter_rating_bar: ^4.0.1 dev_dependencies: build_runner: ^2.4.13