diff --git a/assets/icons/chat.svg b/assets/icons/chat.svg new file mode 100644 index 00000000..01f615fe --- /dev/null +++ b/assets/icons/chat.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/comment.svg b/assets/icons/comment.svg new file mode 100644 index 00000000..60b1e584 --- /dev/null +++ b/assets/icons/comment.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg new file mode 100644 index 00000000..4ddffa65 --- /dev/null +++ b/assets/icons/copy.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/assets/icons/diary.svg b/assets/icons/diary.svg new file mode 100644 index 00000000..3ddc00d2 --- /dev/null +++ b/assets/icons/diary.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/exit.svg b/assets/icons/exit.svg new file mode 100644 index 00000000..11e622be --- /dev/null +++ b/assets/icons/exit.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/favorite_blog_posts.svg b/assets/icons/favorite_blog_posts.svg new file mode 100644 index 00000000..b4c30bc7 --- /dev/null +++ b/assets/icons/favorite_blog_posts.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/icons/favorite_recipes.svg b/assets/icons/favorite_recipes.svg new file mode 100644 index 00000000..028fb5b3 --- /dev/null +++ b/assets/icons/favorite_recipes.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/feed.svg b/assets/icons/feed.svg new file mode 100644 index 00000000..3cefd68a --- /dev/null +++ b/assets/icons/feed.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/assets/icons/finance.svg b/assets/icons/finance.svg new file mode 100644 index 00000000..3bb33357 --- /dev/null +++ b/assets/icons/finance.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/glosasry.svg b/assets/icons/glosasry.svg new file mode 100644 index 00000000..1cb5ba2c --- /dev/null +++ b/assets/icons/glosasry.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/like.svg b/assets/icons/like.svg new file mode 100644 index 00000000..4fe0f919 --- /dev/null +++ b/assets/icons/like.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/icons/like_filled.svg b/assets/icons/like_filled.svg new file mode 100644 index 00000000..6233ab3a --- /dev/null +++ b/assets/icons/like_filled.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/icons/meat.svg b/assets/icons/meat.svg new file mode 100644 index 00000000..5205a78c --- /dev/null +++ b/assets/icons/meat.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/assets/icons/my_blog_posts.svg b/assets/icons/my_blog_posts.svg new file mode 100644 index 00000000..4dd28718 --- /dev/null +++ b/assets/icons/my_blog_posts.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/my_diets.svg b/assets/icons/my_diets.svg new file mode 100644 index 00000000..7714b3fa --- /dev/null +++ b/assets/icons/my_diets.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/my_plans.svg b/assets/icons/my_plans.svg new file mode 100644 index 00000000..5e100f69 --- /dev/null +++ b/assets/icons/my_plans.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/my_rating.svg b/assets/icons/my_rating.svg new file mode 100644 index 00000000..8b5e069f --- /dev/null +++ b/assets/icons/my_rating.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/my_recipes.svg b/assets/icons/my_recipes.svg new file mode 100644 index 00000000..246014c5 --- /dev/null +++ b/assets/icons/my_recipes.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/notifications.svg b/assets/icons/notifications.svg new file mode 100644 index 00000000..fe550083 --- /dev/null +++ b/assets/icons/notifications.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/paste.svg b/assets/icons/paste.svg new file mode 100644 index 00000000..a6fe95bf --- /dev/null +++ b/assets/icons/paste.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/profile_settings.svg b/assets/icons/profile_settings.svg new file mode 100644 index 00000000..b3852d07 --- /dev/null +++ b/assets/icons/profile_settings.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/send.svg b/assets/icons/send.svg new file mode 100644 index 00000000..d4b7b65e --- /dev/null +++ b/assets/icons/send.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/share.svg b/assets/icons/share.svg new file mode 100644 index 00000000..711847c2 --- /dev/null +++ b/assets/icons/share.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/subscribers.svg b/assets/icons/subscribers.svg new file mode 100644 index 00000000..4006d4b4 --- /dev/null +++ b/assets/icons/subscribers.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/time.svg b/assets/icons/time.svg new file mode 100644 index 00000000..5037d404 --- /dev/null +++ b/assets/icons/time.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/views.svg b/assets/icons/views.svg new file mode 100644 index 00000000..60ff0928 --- /dev/null +++ b/assets/icons/views.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/assets/icons/Консультации.svg b/assets/icons/Консультации.svg new file mode 100644 index 00000000..0bb87eaa --- /dev/null +++ b/assets/icons/Консультации.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/Шаги.svg b/assets/icons/Шаги.svg new file mode 100644 index 00000000..14563821 --- /dev/null +++ b/assets/icons/Шаги.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/калорийность.svg b/assets/icons/калорийность.svg new file mode 100644 index 00000000..329d1bda --- /dev/null +++ b/assets/icons/калорийность.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/легкая.svg b/assets/icons/легкая.svg new file mode 100644 index 00000000..1f752bc3 --- /dev/null +++ b/assets/icons/легкая.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/овощи.svg b/assets/icons/овощи.svg new file mode 100644 index 00000000..3d0d4eba --- /dev/null +++ b/assets/icons/овощи.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/поддержание формы.svg b/assets/icons/поддержание формы.svg new file mode 100644 index 00000000..eb3aca15 --- /dev/null +++ b/assets/icons/поддержание формы.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/поддержка.svg b/assets/icons/поддержка.svg new file mode 100644 index 00000000..84b48d66 --- /dev/null +++ b/assets/icons/поддержка.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/похудения.svg b/assets/icons/похудения.svg new file mode 100644 index 00000000..680582a8 --- /dev/null +++ b/assets/icons/похудения.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/углеводная.svg b/assets/icons/углеводная.svg new file mode 100644 index 00000000..3926c874 --- /dev/null +++ b/assets/icons/углеводная.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/улучшение самочувствия.svg b/assets/icons/улучшение самочувствия.svg new file mode 100644 index 00000000..0a66c836 --- /dev/null +++ b/assets/icons/улучшение самочувствия.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/формирование пище.svg b/assets/icons/формирование пище.svg new file mode 100644 index 00000000..a50c9209 --- /dev/null +++ b/assets/icons/формирование пище.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/хорошее.svg b/assets/icons/хорошее.svg new file mode 100644 index 00000000..430bea61 --- /dev/null +++ b/assets/icons/хорошее.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/хорошеее.svg b/assets/icons/хорошеее.svg new file mode 100644 index 00000000..8f45b384 --- /dev/null +++ b/assets/icons/хорошеее.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/icons/этапы шаги.svg b/assets/icons/этапы шаги.svg new file mode 100644 index 00000000..8bb51a1c --- /dev/null +++ b/assets/icons/этапы шаги.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/lib/app_router.dart b/lib/app_router.dart index 9b5b46de..6e4bac50 100644 --- a/lib/app_router.dart +++ b/lib/app_router.dart @@ -20,14 +20,14 @@ import 'package:eatvio_app/features/recipes/presentation/pages/about_recipes_scr import 'package:eatvio_app/features/recipes/presentation/pages/recipe_create_screen.dart'; import 'package:eatvio_app/features/recipes/presentation/pages/recipe_edit_screen.dart'; import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart'; -import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; -import 'package:eatvio_app/presentation/diets/diet_create_screen/diet_create_screen.dart'; -import 'package:eatvio_app/presentation/diets/diet_select_screen/diet_select_screen.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart'; -import 'package:eatvio_app/presentation/glossary/glossary_screen/glossary_screen.dart'; -import 'package:eatvio_app/presentation/plans/plan_select_screen/plan_select_screen.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/my_settings_screen.dart'; -import 'package:eatvio_app/presentation/recipe/recipe_select_screen/recipe_select_screen.dart'; +import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; +import 'package:eatvio_app/old/diets/diet_create_screen/diet_create_screen.dart'; +import 'package:eatvio_app/old/diets/diet_select_screen/diet_select_screen.dart'; +import 'package:eatvio_app/old/feed/blog_post_edit_screen/blog_post_edit_screen.dart'; +import 'package:eatvio_app/old/glossary/glossary_screen/glossary_screen.dart'; +import 'package:eatvio_app/old/plans/plan_select_screen/plan_select_screen.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/my_settings_screen.dart'; +import 'package:eatvio_app/old/recipe/recipe_select_screen/recipe_select_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/core/models/base_models.dart b/lib/core/models/base_models.dart index 48de60ef..2293cb9f 100644 --- a/lib/core/models/base_models.dart +++ b/lib/core/models/base_models.dart @@ -19,12 +19,12 @@ class Links with _$Links { class Meta with _$Meta { const factory Meta({ @JsonKey(name: "current_page") required int currentPage, - @JsonKey(name: "from") required int from, + @JsonKey(name: "from") required dynamic from, @JsonKey(name: "last_page") required int lastPage, @JsonKey(name: "links") required List links, @JsonKey(name: "path") required String path, @JsonKey(name: "per_page") required int perPage, - @JsonKey(name: "to") required int to, + @JsonKey(name: "to") required dynamic to, @JsonKey(name: "total") required int total, }) = _Meta; diff --git a/lib/core/models/base_models.freezed.dart b/lib/core/models/base_models.freezed.dart index b62824d5..6571812b 100644 --- a/lib/core/models/base_models.freezed.dart +++ b/lib/core/models/base_models.freezed.dart @@ -236,7 +236,7 @@ mixin _$Meta { @JsonKey(name: "current_page") int get currentPage => throw _privateConstructorUsedError; @JsonKey(name: "from") - int get from => throw _privateConstructorUsedError; + dynamic get from => throw _privateConstructorUsedError; @JsonKey(name: "last_page") int get lastPage => throw _privateConstructorUsedError; @JsonKey(name: "links") @@ -246,7 +246,7 @@ mixin _$Meta { @JsonKey(name: "per_page") int get perPage => throw _privateConstructorUsedError; @JsonKey(name: "to") - int get to => throw _privateConstructorUsedError; + dynamic get to => throw _privateConstructorUsedError; @JsonKey(name: "total") int get total => throw _privateConstructorUsedError; @@ -262,12 +262,12 @@ abstract class $MetaCopyWith<$Res> { @useResult $Res call( {@JsonKey(name: "current_page") int currentPage, - @JsonKey(name: "from") int from, + @JsonKey(name: "from") dynamic from, @JsonKey(name: "last_page") int lastPage, @JsonKey(name: "links") List links, @JsonKey(name: "path") String path, @JsonKey(name: "per_page") int perPage, - @JsonKey(name: "to") int to, + @JsonKey(name: "to") dynamic to, @JsonKey(name: "total") int total}); } @@ -285,12 +285,12 @@ class _$MetaCopyWithImpl<$Res, $Val extends Meta> @override $Res call({ Object? currentPage = null, - Object? from = null, + Object? from = freezed, Object? lastPage = null, Object? links = null, Object? path = null, Object? perPage = null, - Object? to = null, + Object? to = freezed, Object? total = null, }) { return _then(_value.copyWith( @@ -298,10 +298,10 @@ class _$MetaCopyWithImpl<$Res, $Val extends Meta> ? _value.currentPage : currentPage // ignore: cast_nullable_to_non_nullable as int, - from: null == from + from: freezed == from ? _value.from : from // ignore: cast_nullable_to_non_nullable - as int, + as dynamic, lastPage: null == lastPage ? _value.lastPage : lastPage // ignore: cast_nullable_to_non_nullable @@ -318,10 +318,10 @@ class _$MetaCopyWithImpl<$Res, $Val extends Meta> ? _value.perPage : perPage // ignore: cast_nullable_to_non_nullable as int, - to: null == to + to: freezed == to ? _value.to : to // ignore: cast_nullable_to_non_nullable - as int, + as dynamic, total: null == total ? _value.total : total // ignore: cast_nullable_to_non_nullable @@ -339,12 +339,12 @@ abstract class _$$MetaImplCopyWith<$Res> implements $MetaCopyWith<$Res> { @useResult $Res call( {@JsonKey(name: "current_page") int currentPage, - @JsonKey(name: "from") int from, + @JsonKey(name: "from") dynamic from, @JsonKey(name: "last_page") int lastPage, @JsonKey(name: "links") List links, @JsonKey(name: "path") String path, @JsonKey(name: "per_page") int perPage, - @JsonKey(name: "to") int to, + @JsonKey(name: "to") dynamic to, @JsonKey(name: "total") int total}); } @@ -359,12 +359,12 @@ class __$$MetaImplCopyWithImpl<$Res> @override $Res call({ Object? currentPage = null, - Object? from = null, + Object? from = freezed, Object? lastPage = null, Object? links = null, Object? path = null, Object? perPage = null, - Object? to = null, + Object? to = freezed, Object? total = null, }) { return _then(_$MetaImpl( @@ -372,10 +372,10 @@ class __$$MetaImplCopyWithImpl<$Res> ? _value.currentPage : currentPage // ignore: cast_nullable_to_non_nullable as int, - from: null == from + from: freezed == from ? _value.from : from // ignore: cast_nullable_to_non_nullable - as int, + as dynamic, lastPage: null == lastPage ? _value.lastPage : lastPage // ignore: cast_nullable_to_non_nullable @@ -392,10 +392,10 @@ class __$$MetaImplCopyWithImpl<$Res> ? _value.perPage : perPage // ignore: cast_nullable_to_non_nullable as int, - to: null == to + to: freezed == to ? _value.to : to // ignore: cast_nullable_to_non_nullable - as int, + as dynamic, total: null == total ? _value.total : total // ignore: cast_nullable_to_non_nullable @@ -426,7 +426,7 @@ class _$MetaImpl implements _Meta { final int currentPage; @override @JsonKey(name: "from") - final int from; + final dynamic from; @override @JsonKey(name: "last_page") final int lastPage; @@ -447,7 +447,7 @@ class _$MetaImpl implements _Meta { final int perPage; @override @JsonKey(name: "to") - final int to; + final dynamic to; @override @JsonKey(name: "total") final int total; @@ -464,20 +464,28 @@ class _$MetaImpl implements _Meta { other is _$MetaImpl && (identical(other.currentPage, currentPage) || other.currentPage == currentPage) && - (identical(other.from, from) || other.from == from) && + const DeepCollectionEquality().equals(other.from, from) && (identical(other.lastPage, lastPage) || other.lastPage == lastPage) && const DeepCollectionEquality().equals(other._links, _links) && (identical(other.path, path) || other.path == path) && (identical(other.perPage, perPage) || other.perPage == perPage) && - (identical(other.to, to) || other.to == to) && + const DeepCollectionEquality().equals(other.to, to) && (identical(other.total, total) || other.total == total)); } @JsonKey(ignore: true) @override - int get hashCode => Object.hash(runtimeType, currentPage, from, lastPage, - const DeepCollectionEquality().hash(_links), path, perPage, to, total); + int get hashCode => Object.hash( + runtimeType, + currentPage, + const DeepCollectionEquality().hash(from), + lastPage, + const DeepCollectionEquality().hash(_links), + path, + perPage, + const DeepCollectionEquality().hash(to), + total); @JsonKey(ignore: true) @override @@ -496,12 +504,12 @@ class _$MetaImpl implements _Meta { abstract class _Meta implements Meta { const factory _Meta( {@JsonKey(name: "current_page") required final int currentPage, - @JsonKey(name: "from") required final int from, + @JsonKey(name: "from") required final dynamic from, @JsonKey(name: "last_page") required final int lastPage, @JsonKey(name: "links") required final List links, @JsonKey(name: "path") required final String path, @JsonKey(name: "per_page") required final int perPage, - @JsonKey(name: "to") required final int to, + @JsonKey(name: "to") required final dynamic to, @JsonKey(name: "total") required final int total}) = _$MetaImpl; factory _Meta.fromJson(Map json) = _$MetaImpl.fromJson; @@ -511,7 +519,7 @@ abstract class _Meta implements Meta { int get currentPage; @override @JsonKey(name: "from") - int get from; + dynamic get from; @override @JsonKey(name: "last_page") int get lastPage; @@ -526,7 +534,7 @@ abstract class _Meta implements Meta { int get perPage; @override @JsonKey(name: "to") - int get to; + dynamic get to; @override @JsonKey(name: "total") int get total; diff --git a/lib/core/models/base_models.g.dart b/lib/core/models/base_models.g.dart index 5eec9fa3..3c061e32 100644 --- a/lib/core/models/base_models.g.dart +++ b/lib/core/models/base_models.g.dart @@ -23,14 +23,14 @@ Map _$$LinksImplToJson(_$LinksImpl instance) => _$MetaImpl _$$MetaImplFromJson(Map json) => _$MetaImpl( currentPage: (json['current_page'] as num).toInt(), - from: (json['from'] as num).toInt(), + from: json['from'], lastPage: (json['last_page'] as num).toInt(), links: (json['links'] as List) .map((e) => Link.fromJson(e as Map)) .toList(), path: json['path'] as String, perPage: (json['per_page'] as num).toInt(), - to: (json['to'] as num).toInt(), + to: json['to'], total: (json['total'] as num).toInt(), ); diff --git a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart index d8fc116e..cbd8f03c 100644 --- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart +++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart @@ -2,14 +2,13 @@ import 'dart:async'; import 'dart:io'; import 'package:eatvio_app/core/app_export.dart'; +import 'package:eatvio_app/old/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart'; +import 'package:eatvio_app/old/feed/blog_post_create_screen/models/blog_post_create_model.dart'; import 'package:eatvio_app/widgets/custom_text_form_field.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:image_picker/image_picker.dart'; -import '../../../../presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart'; -import '../../../../presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart'; - class BlogPostCreateScreen extends StatefulWidget { const BlogPostCreateScreen({Key? key}) : super(key: key); diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart index 356d3cc7..a4bd7924 100644 --- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart +++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart @@ -190,9 +190,9 @@ class _BottomNavigationBarWidgetState extends State { label: '', icon: BlocBuilder( builder: (BuildContext context, ProfileAvatarState state) { - if (state is ProfileAvatarStateLoaded && state.profile.user.profilePhotoUrl.isNotEmpty) { + if (state is ProfileAvatarStateLoaded && state.profile.user.profilePhotoUrl != null) { return CircleAvatar( - backgroundImage: NetworkImage(state.profile.user.profilePhotoUrl), + backgroundImage: NetworkImage(state.profile.user.profilePhotoUrl!), radius: 16, ); } diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart index 8753bb64..e262e067 100644 --- a/lib/features/feed/presentation/widgets/blog_post_widget.dart +++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart @@ -6,6 +6,7 @@ import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart'; import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:go_router/go_router.dart'; import 'package:share_plus/share_plus.dart'; @@ -62,8 +63,24 @@ class _BlogPostWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(widget.feedBlogPostModel.author.authorName), - Text(calculateDifference(widget.feedBlogPostModel.createdAt)), + Text( + widget.feedBlogPostModel.author.authorName, + style: TextStyle( + height: 1, + color: Colors.black87, + fontWeight: FontWeight.w500, + ), + ), + const SizedBox(height: 4), + Text( + calculateDifference( + widget.feedBlogPostModel.createdAt, + ), + style: TextStyle( + height: 1, + color: Colors.black45, + ), + ), ], ), ], @@ -81,12 +98,18 @@ class _BlogPostWidgetState extends State { ), ), if (widget.feedBlogPostModel.title.isNotEmpty && widget.feedBlogPostModel.description.isNotEmpty) SizedBox(height: 8), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Html( - data: widget.feedBlogPostModel.description, + if (widget.feedBlogPostModel.description.isNotEmpty) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 4), + child: Html( + data: widget.feedBlogPostModel.description, + style: { + "*": Style( + color: Colors.black87, + ), + }, + ), ), - ), if (widget.feedBlogPostModel.title.isNotEmpty || widget.feedBlogPostModel.description.isNotEmpty) SizedBox(height: 8), GestureDetector( onTap: () { @@ -112,7 +135,7 @@ class _BlogPostWidgetState extends State { child: Row( children: [ _iconButton( - icon: Icons.favorite_border_rounded, + icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded, text: totalLikes.toString(), iconColor: isLiked ? Colors.red.withOpacity(0.8) : null, backgroundColor: isLiked ? Colors.red.withOpacity(0.1) : null, @@ -130,7 +153,15 @@ class _BlogPostWidgetState extends State { ), SizedBox(width: 8), _iconButton( - icon: Icons.mode_comment_outlined, + svgIcon: SvgPicture.asset( + 'assets/icons/comment.svg', + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + appTheme.gray600, + BlendMode.srcIn, + ), + ), text: widget.feedBlogPostModel.totalComments.toString(), onTap: () => GoRouter.of(context).pushNamed( 'blogPostScreen', @@ -139,7 +170,12 @@ class _BlogPostWidgetState extends State { ), SizedBox(width: 8), _iconButton( - icon: Icons.reply_rounded, + svgIcon: SvgPicture.asset( + height: 20, + width: 20, + 'assets/icons/share.svg', + colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn), + ), onTap: () => Share.shareUri( Uri.parse( baseUrl + '/ru/blog_post/' + widget.feedBlogPostModel.id.toString(), @@ -171,7 +207,7 @@ class _BlogPostWidgetState extends State { ); } - _iconButton({required IconData icon, String? text, Function()? onTap, Color? iconColor, Color? backgroundColor, Color? textColor}) { + _iconButton({IconData? icon, SvgPicture? svgIcon, String? text, Function()? onTap, Color? iconColor, Color? backgroundColor, Color? textColor}) { return InkWell( onTap: onTap ?? () {}, borderRadius: BorderRadius.circular(16), @@ -185,11 +221,13 @@ class _BlogPostWidgetState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - Icon( - icon, - size: 20, - color: iconColor ?? appTheme.gray600, - ), + if (svgIcon != null) svgIcon, + if (icon != null) + Icon( + icon, + size: 20, + color: iconColor ?? appTheme.gray600, + ), if (text != null) SizedBox(width: 8), if (text != null) Text( diff --git a/lib/features/profile/models/profile_model.dart b/lib/features/profile/models/profile_model.dart index 6aa5fc1a..b6e47d6a 100644 --- a/lib/features/profile/models/profile_model.dart +++ b/lib/features/profile/models/profile_model.dart @@ -41,17 +41,17 @@ class User with _$User { @JsonKey(name: "id") required int id, @JsonKey(name: "name") required String name, @JsonKey(name: "email") required String email, - @JsonKey(name: "email_verified_at") required DateTime emailVerifiedAt, + @JsonKey(name: "email_verified_at") required dynamic emailVerifiedAt, @JsonKey(name: "two_factor_confirmed_at") required dynamic twoFactorConfirmedAt, @JsonKey(name: "current_team_id") required dynamic currentTeamId, - @JsonKey(name: "profile_photo_path") required String profilePhotoPath, + @JsonKey(name: "profile_photo_path") String? profilePhotoPath, @JsonKey(name: "created_at") required DateTime createdAt, @JsonKey(name: "updated_at") required DateTime updatedAt, @JsonKey(name: "is_consultant") required int isConsultant, @JsonKey(name: "is_public_profile") required int isPublicProfile, @JsonKey(name: "slug") required String slug, @JsonKey(name: "user_settings_id") required dynamic userSettingsId, - @JsonKey(name: "profile_photo_url") required String profilePhotoUrl, + @JsonKey(name: "profile_photo_url") String? profilePhotoUrl, @JsonKey(name: "detailz") required UserDetails detailz, }) = _User; diff --git a/lib/features/profile/models/profile_model.freezed.dart b/lib/features/profile/models/profile_model.freezed.dart index ed199108..da499a03 100644 --- a/lib/features/profile/models/profile_model.freezed.dart +++ b/lib/features/profile/models/profile_model.freezed.dart @@ -776,13 +776,13 @@ mixin _$User { @JsonKey(name: "email") String get email => throw _privateConstructorUsedError; @JsonKey(name: "email_verified_at") - DateTime get emailVerifiedAt => throw _privateConstructorUsedError; + dynamic get emailVerifiedAt => throw _privateConstructorUsedError; @JsonKey(name: "two_factor_confirmed_at") dynamic get twoFactorConfirmedAt => throw _privateConstructorUsedError; @JsonKey(name: "current_team_id") dynamic get currentTeamId => throw _privateConstructorUsedError; @JsonKey(name: "profile_photo_path") - String get profilePhotoPath => throw _privateConstructorUsedError; + String? get profilePhotoPath => throw _privateConstructorUsedError; @JsonKey(name: "created_at") DateTime get createdAt => throw _privateConstructorUsedError; @JsonKey(name: "updated_at") @@ -796,7 +796,7 @@ mixin _$User { @JsonKey(name: "user_settings_id") dynamic get userSettingsId => throw _privateConstructorUsedError; @JsonKey(name: "profile_photo_url") - String get profilePhotoUrl => throw _privateConstructorUsedError; + String? get profilePhotoUrl => throw _privateConstructorUsedError; @JsonKey(name: "detailz") UserDetails get detailz => throw _privateConstructorUsedError; @@ -814,17 +814,17 @@ abstract class $UserCopyWith<$Res> { {@JsonKey(name: "id") int id, @JsonKey(name: "name") String name, @JsonKey(name: "email") String email, - @JsonKey(name: "email_verified_at") DateTime emailVerifiedAt, + @JsonKey(name: "email_verified_at") dynamic emailVerifiedAt, @JsonKey(name: "two_factor_confirmed_at") dynamic twoFactorConfirmedAt, @JsonKey(name: "current_team_id") dynamic currentTeamId, - @JsonKey(name: "profile_photo_path") String profilePhotoPath, + @JsonKey(name: "profile_photo_path") String? profilePhotoPath, @JsonKey(name: "created_at") DateTime createdAt, @JsonKey(name: "updated_at") DateTime updatedAt, @JsonKey(name: "is_consultant") int isConsultant, @JsonKey(name: "is_public_profile") int isPublicProfile, @JsonKey(name: "slug") String slug, @JsonKey(name: "user_settings_id") dynamic userSettingsId, - @JsonKey(name: "profile_photo_url") String profilePhotoUrl, + @JsonKey(name: "profile_photo_url") String? profilePhotoUrl, @JsonKey(name: "detailz") UserDetails detailz}); $UserDetailsCopyWith<$Res> get detailz; @@ -846,17 +846,17 @@ class _$UserCopyWithImpl<$Res, $Val extends User> Object? id = null, Object? name = null, Object? email = null, - Object? emailVerifiedAt = null, + Object? emailVerifiedAt = freezed, Object? twoFactorConfirmedAt = freezed, Object? currentTeamId = freezed, - Object? profilePhotoPath = null, + Object? profilePhotoPath = freezed, Object? createdAt = null, Object? updatedAt = null, Object? isConsultant = null, Object? isPublicProfile = null, Object? slug = null, Object? userSettingsId = freezed, - Object? profilePhotoUrl = null, + Object? profilePhotoUrl = freezed, Object? detailz = null, }) { return _then(_value.copyWith( @@ -872,10 +872,10 @@ class _$UserCopyWithImpl<$Res, $Val extends User> ? _value.email : email // ignore: cast_nullable_to_non_nullable as String, - emailVerifiedAt: null == emailVerifiedAt + emailVerifiedAt: freezed == emailVerifiedAt ? _value.emailVerifiedAt : emailVerifiedAt // ignore: cast_nullable_to_non_nullable - as DateTime, + as dynamic, twoFactorConfirmedAt: freezed == twoFactorConfirmedAt ? _value.twoFactorConfirmedAt : twoFactorConfirmedAt // ignore: cast_nullable_to_non_nullable @@ -884,10 +884,10 @@ class _$UserCopyWithImpl<$Res, $Val extends User> ? _value.currentTeamId : currentTeamId // ignore: cast_nullable_to_non_nullable as dynamic, - profilePhotoPath: null == profilePhotoPath + profilePhotoPath: freezed == profilePhotoPath ? _value.profilePhotoPath : profilePhotoPath // ignore: cast_nullable_to_non_nullable - as String, + as String?, createdAt: null == createdAt ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable @@ -912,10 +912,10 @@ class _$UserCopyWithImpl<$Res, $Val extends User> ? _value.userSettingsId : userSettingsId // ignore: cast_nullable_to_non_nullable as dynamic, - profilePhotoUrl: null == profilePhotoUrl + profilePhotoUrl: freezed == profilePhotoUrl ? _value.profilePhotoUrl : profilePhotoUrl // ignore: cast_nullable_to_non_nullable - as String, + as String?, detailz: null == detailz ? _value.detailz : detailz // ignore: cast_nullable_to_non_nullable @@ -943,17 +943,17 @@ abstract class _$$UserImplCopyWith<$Res> implements $UserCopyWith<$Res> { {@JsonKey(name: "id") int id, @JsonKey(name: "name") String name, @JsonKey(name: "email") String email, - @JsonKey(name: "email_verified_at") DateTime emailVerifiedAt, + @JsonKey(name: "email_verified_at") dynamic emailVerifiedAt, @JsonKey(name: "two_factor_confirmed_at") dynamic twoFactorConfirmedAt, @JsonKey(name: "current_team_id") dynamic currentTeamId, - @JsonKey(name: "profile_photo_path") String profilePhotoPath, + @JsonKey(name: "profile_photo_path") String? profilePhotoPath, @JsonKey(name: "created_at") DateTime createdAt, @JsonKey(name: "updated_at") DateTime updatedAt, @JsonKey(name: "is_consultant") int isConsultant, @JsonKey(name: "is_public_profile") int isPublicProfile, @JsonKey(name: "slug") String slug, @JsonKey(name: "user_settings_id") dynamic userSettingsId, - @JsonKey(name: "profile_photo_url") String profilePhotoUrl, + @JsonKey(name: "profile_photo_url") String? profilePhotoUrl, @JsonKey(name: "detailz") UserDetails detailz}); @override @@ -973,17 +973,17 @@ class __$$UserImplCopyWithImpl<$Res> Object? id = null, Object? name = null, Object? email = null, - Object? emailVerifiedAt = null, + Object? emailVerifiedAt = freezed, Object? twoFactorConfirmedAt = freezed, Object? currentTeamId = freezed, - Object? profilePhotoPath = null, + Object? profilePhotoPath = freezed, Object? createdAt = null, Object? updatedAt = null, Object? isConsultant = null, Object? isPublicProfile = null, Object? slug = null, Object? userSettingsId = freezed, - Object? profilePhotoUrl = null, + Object? profilePhotoUrl = freezed, Object? detailz = null, }) { return _then(_$UserImpl( @@ -999,10 +999,10 @@ class __$$UserImplCopyWithImpl<$Res> ? _value.email : email // ignore: cast_nullable_to_non_nullable as String, - emailVerifiedAt: null == emailVerifiedAt + emailVerifiedAt: freezed == emailVerifiedAt ? _value.emailVerifiedAt : emailVerifiedAt // ignore: cast_nullable_to_non_nullable - as DateTime, + as dynamic, twoFactorConfirmedAt: freezed == twoFactorConfirmedAt ? _value.twoFactorConfirmedAt : twoFactorConfirmedAt // ignore: cast_nullable_to_non_nullable @@ -1011,10 +1011,10 @@ class __$$UserImplCopyWithImpl<$Res> ? _value.currentTeamId : currentTeamId // ignore: cast_nullable_to_non_nullable as dynamic, - profilePhotoPath: null == profilePhotoPath + profilePhotoPath: freezed == profilePhotoPath ? _value.profilePhotoPath : profilePhotoPath // ignore: cast_nullable_to_non_nullable - as String, + as String?, createdAt: null == createdAt ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable @@ -1039,10 +1039,10 @@ class __$$UserImplCopyWithImpl<$Res> ? _value.userSettingsId : userSettingsId // ignore: cast_nullable_to_non_nullable as dynamic, - profilePhotoUrl: null == profilePhotoUrl + profilePhotoUrl: freezed == profilePhotoUrl ? _value.profilePhotoUrl : profilePhotoUrl // ignore: cast_nullable_to_non_nullable - as String, + as String?, detailz: null == detailz ? _value.detailz : detailz // ignore: cast_nullable_to_non_nullable @@ -1062,14 +1062,14 @@ class _$UserImpl implements _User { @JsonKey(name: "two_factor_confirmed_at") required this.twoFactorConfirmedAt, @JsonKey(name: "current_team_id") required this.currentTeamId, - @JsonKey(name: "profile_photo_path") required this.profilePhotoPath, + @JsonKey(name: "profile_photo_path") this.profilePhotoPath, @JsonKey(name: "created_at") required this.createdAt, @JsonKey(name: "updated_at") required this.updatedAt, @JsonKey(name: "is_consultant") required this.isConsultant, @JsonKey(name: "is_public_profile") required this.isPublicProfile, @JsonKey(name: "slug") required this.slug, @JsonKey(name: "user_settings_id") required this.userSettingsId, - @JsonKey(name: "profile_photo_url") required this.profilePhotoUrl, + @JsonKey(name: "profile_photo_url") this.profilePhotoUrl, @JsonKey(name: "detailz") required this.detailz}); factory _$UserImpl.fromJson(Map json) => @@ -1086,7 +1086,7 @@ class _$UserImpl implements _User { final String email; @override @JsonKey(name: "email_verified_at") - final DateTime emailVerifiedAt; + final dynamic emailVerifiedAt; @override @JsonKey(name: "two_factor_confirmed_at") final dynamic twoFactorConfirmedAt; @@ -1095,7 +1095,7 @@ class _$UserImpl implements _User { final dynamic currentTeamId; @override @JsonKey(name: "profile_photo_path") - final String profilePhotoPath; + final String? profilePhotoPath; @override @JsonKey(name: "created_at") final DateTime createdAt; @@ -1116,7 +1116,7 @@ class _$UserImpl implements _User { final dynamic userSettingsId; @override @JsonKey(name: "profile_photo_url") - final String profilePhotoUrl; + final String? profilePhotoUrl; @override @JsonKey(name: "detailz") final UserDetails detailz; @@ -1134,8 +1134,8 @@ class _$UserImpl implements _User { (identical(other.id, id) || other.id == id) && (identical(other.name, name) || other.name == name) && (identical(other.email, email) || other.email == email) && - (identical(other.emailVerifiedAt, emailVerifiedAt) || - other.emailVerifiedAt == emailVerifiedAt) && + const DeepCollectionEquality() + .equals(other.emailVerifiedAt, emailVerifiedAt) && const DeepCollectionEquality() .equals(other.twoFactorConfirmedAt, twoFactorConfirmedAt) && const DeepCollectionEquality() @@ -1165,7 +1165,7 @@ class _$UserImpl implements _User { id, name, email, - emailVerifiedAt, + const DeepCollectionEquality().hash(emailVerifiedAt), const DeepCollectionEquality().hash(twoFactorConfirmedAt), const DeepCollectionEquality().hash(currentTeamId), profilePhotoPath, @@ -1198,19 +1198,18 @@ abstract class _User implements User { @JsonKey(name: "name") required final String name, @JsonKey(name: "email") required final String email, @JsonKey(name: "email_verified_at") - required final DateTime emailVerifiedAt, + required final dynamic emailVerifiedAt, @JsonKey(name: "two_factor_confirmed_at") required final dynamic twoFactorConfirmedAt, @JsonKey(name: "current_team_id") required final dynamic currentTeamId, - @JsonKey(name: "profile_photo_path") - required final String profilePhotoPath, + @JsonKey(name: "profile_photo_path") final String? profilePhotoPath, @JsonKey(name: "created_at") required final DateTime createdAt, @JsonKey(name: "updated_at") required final DateTime updatedAt, @JsonKey(name: "is_consultant") required final int isConsultant, @JsonKey(name: "is_public_profile") required final int isPublicProfile, @JsonKey(name: "slug") required final String slug, @JsonKey(name: "user_settings_id") required final dynamic userSettingsId, - @JsonKey(name: "profile_photo_url") required final String profilePhotoUrl, + @JsonKey(name: "profile_photo_url") final String? profilePhotoUrl, @JsonKey(name: "detailz") required final UserDetails detailz}) = _$UserImpl; @@ -1227,7 +1226,7 @@ abstract class _User implements User { String get email; @override @JsonKey(name: "email_verified_at") - DateTime get emailVerifiedAt; + dynamic get emailVerifiedAt; @override @JsonKey(name: "two_factor_confirmed_at") dynamic get twoFactorConfirmedAt; @@ -1236,7 +1235,7 @@ abstract class _User implements User { dynamic get currentTeamId; @override @JsonKey(name: "profile_photo_path") - String get profilePhotoPath; + String? get profilePhotoPath; @override @JsonKey(name: "created_at") DateTime get createdAt; @@ -1257,7 +1256,7 @@ abstract class _User implements User { dynamic get userSettingsId; @override @JsonKey(name: "profile_photo_url") - String get profilePhotoUrl; + String? get profilePhotoUrl; @override @JsonKey(name: "detailz") UserDetails get detailz; diff --git a/lib/features/profile/models/profile_model.g.dart b/lib/features/profile/models/profile_model.g.dart index 42ee3d8c..f0d74ea0 100644 --- a/lib/features/profile/models/profile_model.g.dart +++ b/lib/features/profile/models/profile_model.g.dart @@ -65,17 +65,17 @@ _$UserImpl _$$UserImplFromJson(Map json) => _$UserImpl( id: (json['id'] as num).toInt(), name: json['name'] as String, email: json['email'] as String, - emailVerifiedAt: DateTime.parse(json['email_verified_at'] as String), + emailVerifiedAt: json['email_verified_at'], twoFactorConfirmedAt: json['two_factor_confirmed_at'], currentTeamId: json['current_team_id'], - profilePhotoPath: json['profile_photo_path'] as String, + profilePhotoPath: json['profile_photo_path'] as String?, createdAt: DateTime.parse(json['created_at'] as String), updatedAt: DateTime.parse(json['updated_at'] as String), isConsultant: (json['is_consultant'] as num).toInt(), isPublicProfile: (json['is_public_profile'] as num).toInt(), slug: json['slug'] as String, userSettingsId: json['user_settings_id'], - profilePhotoUrl: json['profile_photo_url'] as String, + profilePhotoUrl: json['profile_photo_url'] as String?, detailz: UserDetails.fromJson(json['detailz'] as Map), ); @@ -84,7 +84,7 @@ Map _$$UserImplToJson(_$UserImpl instance) => 'id': instance.id, 'name': instance.name, 'email': instance.email, - 'email_verified_at': instance.emailVerifiedAt.toIso8601String(), + 'email_verified_at': instance.emailVerifiedAt, 'two_factor_confirmed_at': instance.twoFactorConfirmedAt, 'current_team_id': instance.currentTeamId, 'profile_photo_path': instance.profilePhotoPath, diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index de0336fc..f044b17d 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -9,6 +9,7 @@ import 'package:eatvio_app/features/profile/presentation/widgets/imt_chart_widge import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart'; import 'package:eatvio_app/locator_service.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; class ProfileScreen extends StatefulWidget { final Author? author; @@ -62,35 +63,125 @@ class _ProfileScreenState extends State { padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16), child: Row( children: [ - CircleAvatar( - radius: 32, - backgroundImage: NetworkImage(state.profile.user.profilePhotoUrl), - ), + state.profile.user.profilePhotoUrl != null + ? CircleAvatar( + radius: 32, + backgroundImage: NetworkImage(state.profile.user.profilePhotoUrl!), + ) + : CircleAvatar( + radius: 32, + ), const SizedBox(width: 12), - Column( - crossAxisAlignment: CrossAxisAlignment.start, + Text( + state.profile.user.name, + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.w500, + height: 1, + ), + ), + const Spacer(), + Row( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text( - state.profile.user.name, - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.w500, - height: 1, + Container( + child: SvgPicture.asset( + height: 28, + width: 28, + 'assets/icons/subscribers.svg', + colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), ), ), - if (state.profile.userDetails.additionalInfo.isNotEmpty) - Text( - state.profile.userDetails.additionalInfo, - style: TextStyle( - color: Colors.black.withOpacity(0.4), - height: 1, + SizedBox(width: 8), + Column( + children: [ + Text( + '123', + style: TextStyle( + height: 1, + fontSize: 18, + fontWeight: FontWeight.w500, + color: Colors.black87, + ), ), - ), + Text( + 'Подписчика', + style: TextStyle( + height: 1, + fontSize: 12, + fontWeight: FontWeight.w400, + color: Colors.black38, + ), + ), + ], + ), ], ), + Container( + padding: EdgeInsets.only(left: 16), + child: SvgPicture.asset( + height: 24, + width: 24, + 'assets/icons/share.svg', + colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), + ), + ), ], ), ), + if (state.profile.userDetails.additionalInfo.isNotEmpty) + Container( + alignment: Alignment.centerLeft, + padding: const EdgeInsets.all(16), + child: Text( + state.profile.userDetails.additionalInfo, + style: TextStyle( + color: Colors.black.withOpacity(0.4), + height: 1, + ), + ), + ), + if (widget.author != null) const SizedBox(height: 8), + if (widget.author != null) + Row( + children: [ + SizedBox(width: 16), + Container( + alignment: Alignment.center, + padding: EdgeInsets.all(8), + width: (MediaQuery.of(context).size.width - 40) / 2, + decoration: BoxDecoration( + color: appTheme.blueA400.withOpacity(0.1), + borderRadius: BorderRadius.circular(16), + ), + child: Text( + 'Сообщение', + style: TextStyle( + color: appTheme.blueA400, + ), + ), + ), + SizedBox(width: 8), + Container( + alignment: Alignment.center, + padding: EdgeInsets.all(8), + width: (MediaQuery.of(context).size.width - 40) / 2, + decoration: BoxDecoration( + color: appTheme.blueA400, + borderRadius: BorderRadius.circular(16), + ), + child: Text( + 'Подписаться', + style: TextStyle( + color: Colors.white, + ), + ), + ), + SizedBox(width: 16), + ], + ), + if (widget.author != null) SizedBox(height: 16), if (widget.author == null) _divider(context), if (widget.author == null) Column( diff --git a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart index 650c0990..bbf76a4e 100644 --- a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart +++ b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart @@ -32,70 +32,104 @@ class _CircumferenceChartWidgetState extends State { Widget build(BuildContext context) { return Column( children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Row( - children: [ - Text( - '${widget.chartData.last.chestCircumference}', - style: TextStyle( - color: Colors.black, - fontSize: 40, - fontWeight: FontWeight.w500, + if (widget.chartData.isNotEmpty) + Padding( + padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Row( + children: [ + Text( + '${widget.chartData.last.chestCircumference}', + style: TextStyle( + color: Colors.black, + fontSize: 40, + fontWeight: FontWeight.w500, + ), ), - ), - widget.chartData.last.chestCircumference > widget.chartData[widget.chartData.length - 2].chestCircumference - ? Icon( - Icons.arrow_drop_up, - size: 40, - color: Colors.grey, - ) - : Icon( - Icons.arrow_drop_down, - size: 40, - color: Colors.grey, + if (widget.chartData.length == 1) + Container( + margin: EdgeInsets.symmetric(horizontal: 12), + width: 8, + height: 8, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black12, ), - Text( - '${widget.chartData.last.waistCircumference}', - style: TextStyle( - color: Colors.black, - fontSize: 40, - fontWeight: FontWeight.w500, + ), + if (widget.chartData.length > 1) + widget.chartData.last.chestCircumference > widget.chartData[widget.chartData.length - 2].chestCircumference + ? Icon( + Icons.arrow_drop_up, + size: 40, + color: Colors.grey, + ) + : Icon( + Icons.arrow_drop_down, + size: 40, + color: Colors.grey, + ), + Text( + '${widget.chartData.last.waistCircumference}', + style: TextStyle( + color: Colors.black, + fontSize: 40, + fontWeight: FontWeight.w500, + ), ), - ), - widget.chartData.last.waistCircumference > widget.chartData[widget.chartData.length - 2].waistCircumference - ? Icon( - Icons.arrow_drop_up, - size: 40, - color: Colors.grey, - ) - : Icon( - Icons.arrow_drop_down, - size: 40, - color: Colors.grey, + if (widget.chartData.length == 1) + Container( + margin: EdgeInsets.symmetric(horizontal: 12), + width: 8, + height: 8, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black12, ), - Text( - '${widget.chartData.last.hipCircumference}', - style: TextStyle( - color: Colors.black, - fontSize: 40, - fontWeight: FontWeight.w500, + ), + if (widget.chartData.length > 1) + widget.chartData.last.waistCircumference > widget.chartData[widget.chartData.length - 2].waistCircumference + ? Icon( + Icons.arrow_drop_up, + size: 40, + color: Colors.grey, + ) + : Icon( + Icons.arrow_drop_down, + size: 40, + color: Colors.grey, + ), + Text( + '${widget.chartData.last.hipCircumference}', + style: TextStyle( + color: Colors.black, + fontSize: 40, + fontWeight: FontWeight.w500, + ), ), - ), - widget.chartData.last.hipCircumference > widget.chartData[widget.chartData.length - 2].hipCircumference - ? Icon( - Icons.arrow_drop_up, - size: 40, - color: Colors.grey, - ) - : Icon( - Icons.arrow_drop_down, - size: 40, - color: Colors.grey, + if (widget.chartData.length == 1) + Container( + margin: EdgeInsets.symmetric(horizontal: 12), + width: 8, + height: 8, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black12, ), - ], + ), + if (widget.chartData.length > 1) + widget.chartData.last.hipCircumference > widget.chartData[widget.chartData.length - 2].hipCircumference + ? Icon( + Icons.arrow_drop_up, + size: 40, + color: Colors.grey, + ) + : Icon( + Icons.arrow_drop_down, + size: 40, + color: Colors.grey, + ), + ], + ), ), - ), Stack( alignment: Alignment.bottomRight, children: [ @@ -140,12 +174,18 @@ class _CircumferenceChartWidgetState extends State { FloatingActionButton.small( heroTag: 'addCircumference', onPressed: () { - chest = widget.chartData.last.chestCircumference; - waist = widget.chartData.last.waistCircumference; - hip = widget.chartData.last.hipCircumference; - chestController = FixedExtentScrollController(initialItem: chest - 20); - waistController = FixedExtentScrollController(initialItem: waist - 20); - hipController = FixedExtentScrollController(initialItem: hip - 20); + if (widget.chartData.isNotEmpty) { + chest = widget.chartData.last.chestCircumference; + waist = widget.chartData.last.waistCircumference; + hip = widget.chartData.last.hipCircumference; + chestController = FixedExtentScrollController(initialItem: chest - 20); + waistController = FixedExtentScrollController(initialItem: waist - 20); + hipController = FixedExtentScrollController(initialItem: hip - 20); + } else { + chestController = FixedExtentScrollController(); + waistController = FixedExtentScrollController(); + hipController = FixedExtentScrollController(); + } showModalBottomSheet( useRootNavigator: true, context: context, diff --git a/lib/features/profile/presentation/widgets/weight_chart_widget.dart b/lib/features/profile/presentation/widgets/weight_chart_widget.dart index ce3222c8..a2d68a58 100644 --- a/lib/features/profile/presentation/widgets/weight_chart_widget.dart +++ b/lib/features/profile/presentation/widgets/weight_chart_widget.dart @@ -31,83 +31,97 @@ class _WeightChartWidgetState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Row( - children: [ - Text( - '${widget.chartPoints.last.weight.toStringAsFixed(1)} кг', - style: TextStyle( - color: Colors.black, - fontSize: 40, - fontWeight: FontWeight.w500, + if (widget.chartPoints.isNotEmpty) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Row( + children: [ + Text( + '${widget.chartPoints.last.weight.toStringAsFixed(1)} кг', + style: TextStyle( + color: Colors.black, + fontSize: 40, + fontWeight: FontWeight.w500, + ), ), - ), - widget.chartPoints.last.weight > widget.chartPoints[widget.chartPoints.length - 2].weight - ? Icon( - Icons.arrow_drop_up, - size: 40, - color: Colors.grey.withOpacity(0.4), - ) - : Icon( - Icons.arrow_drop_down, - size: 40, - color: Colors.grey.withOpacity(0.4), + if (widget.chartPoints.length == 1) + Container( + margin: EdgeInsets.symmetric(horizontal: 12), + width: 8, + height: 8, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black12, ), - ], + ), + if (widget.chartPoints.length > 1) widget.chartPoints.last.weight > widget.chartPoints[widget.chartPoints.length - 2].weight + ? Icon( + Icons.arrow_drop_up, + size: 40, + color: Colors.grey.withOpacity(0.4), + ) + : Icon( + Icons.arrow_drop_down, + size: 40, + color: Colors.grey.withOpacity(0.4), + ), + ], + ), ), - ), Stack( alignment: Alignment.bottomRight, children: [ - SfCartesianChart( - margin: EdgeInsets.symmetric(horizontal: 8), - enableAxisAnimation: true, - plotAreaBorderWidth: 0, - trackballBehavior: TrackballBehavior( - enable: true, - activationMode: ActivationMode.singleTap, - tooltipDisplayMode: TrackballDisplayMode.groupAllPoints, - tooltipSettings: InteractiveTooltip(), - lineType: TrackballLineType.vertical, + SfCartesianChart( + margin: EdgeInsets.symmetric(horizontal: 8), + enableAxisAnimation: true, + plotAreaBorderWidth: 0, + trackballBehavior: TrackballBehavior( + enable: true, + activationMode: ActivationMode.singleTap, + tooltipDisplayMode: TrackballDisplayMode.groupAllPoints, + tooltipSettings: InteractiveTooltip(), + lineType: TrackballLineType.vertical, + ), + primaryXAxis: DateTimeCategoryAxis( + tickPosition: TickPosition.inside, + majorTickLines: MajorTickLines( + size: 0, + ), + edgeLabelPlacement: EdgeLabelPlacement.shift, + dateFormat: DateFormat.MMMd('ru'), + labelStyle: TextStyle( + color: Colors.grey, + ), + majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)), + axisLine: AxisLine( + color: Colors.grey.withOpacity(0.3), + width: 0.4, + ), + ), + primaryYAxis: NumericAxis( + isVisible: false, + labelFormat: '{value} кг', + majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey), + axisLine: AxisLine( + width: 1, + ), + majorTickLines: MajorTickLines(size: 0), + ), + series: _getSplineSeries(), + tooltipBehavior: TooltipBehavior(enable: true), ), - primaryXAxis: DateTimeCategoryAxis( - initialVisibleMinimum: widget.chartPoints.first.createdAt, - initialVisibleMaximum: widget.chartPoints.last.createdAt, - tickPosition: TickPosition.inside, - majorTickLines: MajorTickLines( - size: 0, - ), - edgeLabelPlacement: EdgeLabelPlacement.shift, - dateFormat: DateFormat.MMMd('ru'), - labelStyle: TextStyle( - color: Colors.grey, - ), - majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)), - axisLine: AxisLine( - color: Colors.grey.withOpacity(0.3), - width: 0.4, - ), - ), - primaryYAxis: NumericAxis( - isVisible: false, - labelFormat: '{value} кг', - majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey), - axisLine: AxisLine( - width: 1, - ), - majorTickLines: MajorTickLines(size: 0), - ), - series: _getSplineSeries(), - tooltipBehavior: TooltipBehavior(enable: true), - ), FloatingActionButton.small( heroTag: 'addWeight', onPressed: () { - weightKilo = int.parse(widget.chartPoints.last.weight.toString().split('.')[0]); - weightGrams = int.parse(widget.chartPoints.last.weight.toString().split('.')[1][0]); - weightKiloController = FixedExtentScrollController(initialItem: weightKilo - 20); - weightGramsController = FixedExtentScrollController(initialItem: weightGrams); + if (widget.chartPoints.isNotEmpty) { + weightKilo = int.parse(widget.chartPoints.last.weight.toString().split('.')[0]); + weightGrams = int.parse(widget.chartPoints.last.weight.toString().split('.')[1][0]); + weightKiloController = FixedExtentScrollController(initialItem: weightKilo - 20); + weightGramsController = FixedExtentScrollController(initialItem: weightGrams); + } else { + weightKiloController = FixedExtentScrollController(); + weightGramsController = FixedExtentScrollController(); + } showModalBottomSheet( useRootNavigator: true, context: context, diff --git a/lib/main.dart b/lib/main.dart index 948cdf34..355eb3ce 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,8 +12,8 @@ import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart'; import 'package:eatvio_app/locator_service.dart' as di; import 'package:eatvio_app/locator_service.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/models/my_profile_model.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/models/my_profile_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; diff --git a/lib/presentation/auth/auth_screen/auth_screen.dart b/lib/old/auth/auth_screen/auth_screen.dart similarity index 100% rename from lib/presentation/auth/auth_screen/auth_screen.dart rename to lib/old/auth/auth_screen/auth_screen.dart diff --git a/lib/presentation/auth/auth_screen/bloc/auth_bloc.dart b/lib/old/auth/auth_screen/bloc/auth_bloc.dart similarity index 88% rename from lib/presentation/auth/auth_screen/bloc/auth_bloc.dart rename to lib/old/auth/auth_screen/bloc/auth_bloc.dart index 0d8f67ad..cc7fb9d4 100644 --- a/lib/presentation/auth/auth_screen/bloc/auth_bloc.dart +++ b/lib/old/auth/auth_screen/bloc/auth_bloc.dart @@ -1,4 +1,4 @@ -import 'package:eatvio_app/presentation/auth/auth_screen/models/auth_model.dart'; +import 'package:eatvio_app/old/auth/auth_screen/models/auth_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/auth/auth_screen/bloc/auth_event.dart b/lib/old/auth/auth_screen/bloc/auth_event.dart similarity index 100% rename from lib/presentation/auth/auth_screen/bloc/auth_event.dart rename to lib/old/auth/auth_screen/bloc/auth_event.dart diff --git a/lib/presentation/auth/auth_screen/bloc/auth_state.dart b/lib/old/auth/auth_screen/bloc/auth_state.dart similarity index 100% rename from lib/presentation/auth/auth_screen/bloc/auth_state.dart rename to lib/old/auth/auth_screen/bloc/auth_state.dart diff --git a/lib/presentation/auth/auth_screen/models/auth_model.dart b/lib/old/auth/auth_screen/models/auth_model.dart similarity index 100% rename from lib/presentation/auth/auth_screen/models/auth_model.dart rename to lib/old/auth/auth_screen/models/auth_model.dart diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart b/lib/old/diary/diary_edit_screen/bloc/diary_edit_state.dart similarity index 100% rename from lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart rename to lib/old/diary/diary_edit_screen/bloc/diary_edit_state.dart diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/old/diary/diary_edit_screen/diary_edit_screen.dart similarity index 100% rename from lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart rename to lib/old/diary/diary_edit_screen/diary_edit_screen.dart diff --git a/lib/presentation/diary/diary_edit_screen/models/diary_edit_model.dart b/lib/old/diary/diary_edit_screen/models/diary_edit_model.dart similarity index 100% rename from lib/presentation/diary/diary_edit_screen/models/diary_edit_model.dart rename to lib/old/diary/diary_edit_screen/models/diary_edit_model.dart diff --git a/lib/presentation/diets/diet_create_screen/bloc/diet_create_bloc.dart b/lib/old/diets/diet_create_screen/bloc/diet_create_bloc.dart similarity index 99% rename from lib/presentation/diets/diet_create_screen/bloc/diet_create_bloc.dart rename to lib/old/diets/diet_create_screen/bloc/diet_create_bloc.dart index db2f02a9..6f14062d 100644 --- a/lib/presentation/diets/diet_create_screen/bloc/diet_create_bloc.dart +++ b/lib/old/diets/diet_create_screen/bloc/diet_create_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/diets/diet_create_screen/models/diet_create_model.dart'; +import 'package:eatvio_app/old/diets/diet_create_screen/models/diet_create_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/diets/diet_create_screen/bloc/diet_create_event.dart b/lib/old/diets/diet_create_screen/bloc/diet_create_event.dart similarity index 100% rename from lib/presentation/diets/diet_create_screen/bloc/diet_create_event.dart rename to lib/old/diets/diet_create_screen/bloc/diet_create_event.dart diff --git a/lib/presentation/diets/diet_create_screen/bloc/diet_create_state.dart b/lib/old/diets/diet_create_screen/bloc/diet_create_state.dart similarity index 100% rename from lib/presentation/diets/diet_create_screen/bloc/diet_create_state.dart rename to lib/old/diets/diet_create_screen/bloc/diet_create_state.dart diff --git a/lib/presentation/diets/diet_create_screen/diet_create_screen.dart b/lib/old/diets/diet_create_screen/diet_create_screen.dart similarity index 100% rename from lib/presentation/diets/diet_create_screen/diet_create_screen.dart rename to lib/old/diets/diet_create_screen/diet_create_screen.dart diff --git a/lib/presentation/diets/diet_create_screen/models/diet_create_model.dart b/lib/old/diets/diet_create_screen/models/diet_create_model.dart similarity index 100% rename from lib/presentation/diets/diet_create_screen/models/diet_create_model.dart rename to lib/old/diets/diet_create_screen/models/diet_create_model.dart diff --git a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_bloc.dart b/lib/old/diets/diet_edit_screen/bloc/diet_edit_bloc.dart similarity index 97% rename from lib/presentation/diets/diet_edit_screen/bloc/diet_edit_bloc.dart rename to lib/old/diets/diet_edit_screen/bloc/diet_edit_bloc.dart index 5f92e25b..4635fc11 100644 --- a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_bloc.dart +++ b/lib/old/diets/diet_edit_screen/bloc/diet_edit_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/diets/diet_edit_screen/models/diet_edit_model.dart'; +import 'package:eatvio_app/old/diets/diet_edit_screen/models/diet_edit_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_event.dart b/lib/old/diets/diet_edit_screen/bloc/diet_edit_event.dart similarity index 100% rename from lib/presentation/diets/diet_edit_screen/bloc/diet_edit_event.dart rename to lib/old/diets/diet_edit_screen/bloc/diet_edit_event.dart diff --git a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_state.dart b/lib/old/diets/diet_edit_screen/bloc/diet_edit_state.dart similarity index 100% rename from lib/presentation/diets/diet_edit_screen/bloc/diet_edit_state.dart rename to lib/old/diets/diet_edit_screen/bloc/diet_edit_state.dart diff --git a/lib/presentation/diets/diet_edit_screen/diet_edit_screen.dart b/lib/old/diets/diet_edit_screen/diet_edit_screen.dart similarity index 100% rename from lib/presentation/diets/diet_edit_screen/diet_edit_screen.dart rename to lib/old/diets/diet_edit_screen/diet_edit_screen.dart diff --git a/lib/presentation/diets/diet_edit_screen/models/diet_edit_model.dart b/lib/old/diets/diet_edit_screen/models/diet_edit_model.dart similarity index 100% rename from lib/presentation/diets/diet_edit_screen/models/diet_edit_model.dart rename to lib/old/diets/diet_edit_screen/models/diet_edit_model.dart diff --git a/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart b/lib/old/diets/diet_select_screen/bloc/diet_select_bloc.dart similarity index 93% rename from lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart rename to lib/old/diets/diet_select_screen/bloc/diet_select_bloc.dart index 6910f250..26622a74 100644 --- a/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart +++ b/lib/old/diets/diet_select_screen/bloc/diet_select_bloc.dart @@ -1,10 +1,10 @@ -//import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; +//import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; import 'dart:async'; import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/diets/diet_select_screen/models/diet_select_model.dart'; +import 'package:eatvio_app/old/diets/diet_select_screen/models/diet_select_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/diets/diet_select_screen/bloc/diet_select_event.dart b/lib/old/diets/diet_select_screen/bloc/diet_select_event.dart similarity index 100% rename from lib/presentation/diets/diet_select_screen/bloc/diet_select_event.dart rename to lib/old/diets/diet_select_screen/bloc/diet_select_event.dart diff --git a/lib/presentation/diets/diet_select_screen/bloc/diet_select_state.dart b/lib/old/diets/diet_select_screen/bloc/diet_select_state.dart similarity index 100% rename from lib/presentation/diets/diet_select_screen/bloc/diet_select_state.dart rename to lib/old/diets/diet_select_screen/bloc/diet_select_state.dart diff --git a/lib/presentation/diets/diet_select_screen/diet_select_screen.dart b/lib/old/diets/diet_select_screen/diet_select_screen.dart similarity index 100% rename from lib/presentation/diets/diet_select_screen/diet_select_screen.dart rename to lib/old/diets/diet_select_screen/diet_select_screen.dart diff --git a/lib/presentation/diets/diet_select_screen/models/diet_select_model.dart b/lib/old/diets/diet_select_screen/models/diet_select_model.dart similarity index 100% rename from lib/presentation/diets/diet_select_screen/models/diet_select_model.dart rename to lib/old/diets/diet_select_screen/models/diet_select_model.dart diff --git a/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart b/lib/old/diets/diet_show_screen/bloc/diet_show_bloc.dart similarity index 97% rename from lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart rename to lib/old/diets/diet_show_screen/bloc/diet_show_bloc.dart index b680d054..008e566a 100644 --- a/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart +++ b/lib/old/diets/diet_show_screen/bloc/diet_show_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/diets/diet_show_screen/models/diet_show_model.dart'; +import 'package:eatvio_app/old/diets/diet_show_screen/models/diet_show_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/diets/diet_show_screen/bloc/diet_show_event.dart b/lib/old/diets/diet_show_screen/bloc/diet_show_event.dart similarity index 100% rename from lib/presentation/diets/diet_show_screen/bloc/diet_show_event.dart rename to lib/old/diets/diet_show_screen/bloc/diet_show_event.dart diff --git a/lib/presentation/diets/diet_show_screen/bloc/diet_show_state.dart b/lib/old/diets/diet_show_screen/bloc/diet_show_state.dart similarity index 100% rename from lib/presentation/diets/diet_show_screen/bloc/diet_show_state.dart rename to lib/old/diets/diet_show_screen/bloc/diet_show_state.dart diff --git a/lib/presentation/diets/diet_show_screen/diet_show_screen.dart b/lib/old/diets/diet_show_screen/diet_show_screen.dart similarity index 100% rename from lib/presentation/diets/diet_show_screen/diet_show_screen.dart rename to lib/old/diets/diet_show_screen/diet_show_screen.dart diff --git a/lib/presentation/diets/diet_show_screen/models/diet_show_model.dart b/lib/old/diets/diet_show_screen/models/diet_show_model.dart similarity index 100% rename from lib/presentation/diets/diet_show_screen/models/diet_show_model.dart rename to lib/old/diets/diet_show_screen/models/diet_show_model.dart diff --git a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart b/lib/old/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart similarity index 96% rename from lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart rename to lib/old/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart index 0cfd4cc4..5133d85b 100644 --- a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart +++ b/lib/old/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart @@ -4,7 +4,7 @@ import 'package:dio/dio.dart'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; import 'package:eatvio_app/locator_service.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_create_screen/models/blog_post_create_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_event.dart b/lib/old/feed/blog_post_create_screen/bloc/blog_post_create_event.dart similarity index 100% rename from lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_event.dart rename to lib/old/feed/blog_post_create_screen/bloc/blog_post_create_event.dart diff --git a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_state.dart b/lib/old/feed/blog_post_create_screen/bloc/blog_post_create_state.dart similarity index 100% rename from lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_state.dart rename to lib/old/feed/blog_post_create_screen/bloc/blog_post_create_state.dart diff --git a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart b/lib/old/feed/blog_post_create_screen/models/blog_post_create_model.dart similarity index 100% rename from lib/presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart rename to lib/old/feed/blog_post_create_screen/models/blog_post_create_model.dart diff --git a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart b/lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart similarity index 97% rename from lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart rename to lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart index 813a66d0..fd369ec2 100644 --- a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart +++ b/lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/models/blog_post_edit_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_edit_screen/models/blog_post_edit_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_event.dart b/lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_event.dart similarity index 100% rename from lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_event.dart rename to lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_event.dart diff --git a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_state.dart b/lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_state.dart similarity index 100% rename from lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_state.dart rename to lib/old/feed/blog_post_edit_screen/bloc/blog_post_edit_state.dart diff --git a/lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart b/lib/old/feed/blog_post_edit_screen/blog_post_edit_screen.dart similarity index 100% rename from lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart rename to lib/old/feed/blog_post_edit_screen/blog_post_edit_screen.dart diff --git a/lib/presentation/feed/blog_post_edit_screen/models/blog_post_edit_model.dart b/lib/old/feed/blog_post_edit_screen/models/blog_post_edit_model.dart similarity index 100% rename from lib/presentation/feed/blog_post_edit_screen/models/blog_post_edit_model.dart rename to lib/old/feed/blog_post_edit_screen/models/blog_post_edit_model.dart diff --git a/lib/presentation/feed/blog_post_screen/models/blog_post_model.dart b/lib/old/feed/blog_post_screen/models/blog_post_model.dart similarity index 85% rename from lib/presentation/feed/blog_post_screen/models/blog_post_model.dart rename to lib/old/feed/blog_post_screen/models/blog_post_model.dart index 106b3b59..1230d998 100644 --- a/lib/presentation/feed/blog_post_screen/models/blog_post_model.dart +++ b/lib/old/feed/blog_post_screen/models/blog_post_model.dart @@ -1,6 +1,6 @@ // ignore_for_file: must_be_immutable -import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_screen/models/comment_model.dart'; import 'package:equatable/equatable.dart'; class BlogPostModel extends Equatable { diff --git a/lib/presentation/feed/blog_post_screen/models/comment_model.dart b/lib/old/feed/blog_post_screen/models/comment_model.dart similarity index 100% rename from lib/presentation/feed/blog_post_screen/models/comment_model.dart rename to lib/old/feed/blog_post_screen/models/comment_model.dart diff --git a/lib/presentation/feed/blog_post_screen/widgets/comment_widget.dart b/lib/old/feed/blog_post_screen/widgets/comment_widget.dart similarity index 97% rename from lib/presentation/feed/blog_post_screen/widgets/comment_widget.dart rename to lib/old/feed/blog_post_screen/widgets/comment_widget.dart index ed2e075c..421c2c71 100644 --- a/lib/presentation/feed/blog_post_screen/widgets/comment_widget.dart +++ b/lib/old/feed/blog_post_screen/widgets/comment_widget.dart @@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_screen/models/comment_model.dart'; import 'package:flutter/material.dart'; class CommentWidget extends StatelessWidget { diff --git a/lib/presentation/feed/feed_screen/widgets/feed_scroll_item.dart b/lib/old/feed/feed_screen/widgets/feed_scroll_item.dart similarity index 100% rename from lib/presentation/feed/feed_screen/widgets/feed_scroll_item.dart rename to lib/old/feed/feed_screen/widgets/feed_scroll_item.dart diff --git a/lib/presentation/feed/feed_screen/widgets/feed_search_view.dart b/lib/old/feed/feed_screen/widgets/feed_search_view.dart similarity index 100% rename from lib/presentation/feed/feed_screen/widgets/feed_search_view.dart rename to lib/old/feed/feed_screen/widgets/feed_search_view.dart diff --git a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart b/lib/old/glossary/glossary_screen/bloc/glossary_screen_bloc.dart similarity index 97% rename from lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart rename to lib/old/glossary/glossary_screen/bloc/glossary_screen_bloc.dart index c45d5569..f642ee1d 100644 --- a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart +++ b/lib/old/glossary/glossary_screen/bloc/glossary_screen_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/glossary/glossary_screen/models/glossary_screen_model.dart'; +import 'package:eatvio_app/old/glossary/glossary_screen/models/glossary_screen_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_event.dart b/lib/old/glossary/glossary_screen/bloc/glossary_screen_event.dart similarity index 100% rename from lib/presentation/glossary/glossary_screen/bloc/glossary_screen_event.dart rename to lib/old/glossary/glossary_screen/bloc/glossary_screen_event.dart diff --git a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_state.dart b/lib/old/glossary/glossary_screen/bloc/glossary_screen_state.dart similarity index 100% rename from lib/presentation/glossary/glossary_screen/bloc/glossary_screen_state.dart rename to lib/old/glossary/glossary_screen/bloc/glossary_screen_state.dart diff --git a/lib/presentation/glossary/glossary_screen/glossary_screen.dart b/lib/old/glossary/glossary_screen/glossary_screen.dart similarity index 98% rename from lib/presentation/glossary/glossary_screen/glossary_screen.dart rename to lib/old/glossary/glossary_screen/glossary_screen.dart index e8453187..0e56aaaa 100644 --- a/lib/presentation/glossary/glossary_screen/glossary_screen.dart +++ b/lib/old/glossary/glossary_screen/glossary_screen.dart @@ -1,7 +1,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/glossary/glossary_screen/widgets/glossary_scroll_item.dart'; -import 'package:eatvio_app/presentation/glossary/glossary_screen/widgets/glossary_search_widget.dart'; +import 'package:eatvio_app/old/glossary/glossary_screen/widgets/glossary_scroll_item.dart'; +import 'package:eatvio_app/old/glossary/glossary_screen/widgets/glossary_search_widget.dart'; import 'package:eatvio_app/widgets/custom_drop_down.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/glossary/glossary_screen/models/glossary_screen_model.dart b/lib/old/glossary/glossary_screen/models/glossary_screen_model.dart similarity index 100% rename from lib/presentation/glossary/glossary_screen/models/glossary_screen_model.dart rename to lib/old/glossary/glossary_screen/models/glossary_screen_model.dart diff --git a/lib/presentation/glossary/glossary_screen/widgets/glossary_scroll_item.dart b/lib/old/glossary/glossary_screen/widgets/glossary_scroll_item.dart similarity index 100% rename from lib/presentation/glossary/glossary_screen/widgets/glossary_scroll_item.dart rename to lib/old/glossary/glossary_screen/widgets/glossary_scroll_item.dart diff --git a/lib/presentation/glossary/glossary_screen/widgets/glossary_search_widget.dart b/lib/old/glossary/glossary_screen/widgets/glossary_search_widget.dart similarity index 100% rename from lib/presentation/glossary/glossary_screen/widgets/glossary_search_widget.dart rename to lib/old/glossary/glossary_screen/widgets/glossary_search_widget.dart diff --git a/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart b/lib/old/plans/plan_create_screen/bloc/plan_create_bloc.dart similarity index 99% rename from lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart rename to lib/old/plans/plan_create_screen/bloc/plan_create_bloc.dart index 871c2dc1..09eb839b 100644 --- a/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart +++ b/lib/old/plans/plan_create_screen/bloc/plan_create_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/plans/plan_create_screen/models/plan_create_model.dart'; +import 'package:eatvio_app/old/plans/plan_create_screen/models/plan_create_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/plans/plan_create_screen/bloc/plan_create_event.dart b/lib/old/plans/plan_create_screen/bloc/plan_create_event.dart similarity index 100% rename from lib/presentation/plans/plan_create_screen/bloc/plan_create_event.dart rename to lib/old/plans/plan_create_screen/bloc/plan_create_event.dart diff --git a/lib/presentation/plans/plan_create_screen/bloc/plan_create_state.dart b/lib/old/plans/plan_create_screen/bloc/plan_create_state.dart similarity index 100% rename from lib/presentation/plans/plan_create_screen/bloc/plan_create_state.dart rename to lib/old/plans/plan_create_screen/bloc/plan_create_state.dart diff --git a/lib/presentation/plans/plan_create_screen/models/plan_create_model.dart b/lib/old/plans/plan_create_screen/models/plan_create_model.dart similarity index 100% rename from lib/presentation/plans/plan_create_screen/models/plan_create_model.dart rename to lib/old/plans/plan_create_screen/models/plan_create_model.dart diff --git a/lib/presentation/plans/plan_create_screen/plan_create_screen.dart b/lib/old/plans/plan_create_screen/plan_create_screen.dart similarity index 100% rename from lib/presentation/plans/plan_create_screen/plan_create_screen.dart rename to lib/old/plans/plan_create_screen/plan_create_screen.dart diff --git a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart b/lib/old/plans/plan_edit_screen/bloc/plan_edit_bloc.dart similarity index 97% rename from lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart rename to lib/old/plans/plan_edit_screen/bloc/plan_edit_bloc.dart index 656e671c..4c8949c3 100644 --- a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart +++ b/lib/old/plans/plan_edit_screen/bloc/plan_edit_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/plans/plan_edit_screen/models/plan_edit_model.dart'; +import 'package:eatvio_app/old/plans/plan_edit_screen/models/plan_edit_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_event.dart b/lib/old/plans/plan_edit_screen/bloc/plan_edit_event.dart similarity index 100% rename from lib/presentation/plans/plan_edit_screen/bloc/plan_edit_event.dart rename to lib/old/plans/plan_edit_screen/bloc/plan_edit_event.dart diff --git a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_state.dart b/lib/old/plans/plan_edit_screen/bloc/plan_edit_state.dart similarity index 100% rename from lib/presentation/plans/plan_edit_screen/bloc/plan_edit_state.dart rename to lib/old/plans/plan_edit_screen/bloc/plan_edit_state.dart diff --git a/lib/presentation/plans/plan_edit_screen/models/plan_edit_model.dart b/lib/old/plans/plan_edit_screen/models/plan_edit_model.dart similarity index 100% rename from lib/presentation/plans/plan_edit_screen/models/plan_edit_model.dart rename to lib/old/plans/plan_edit_screen/models/plan_edit_model.dart diff --git a/lib/presentation/plans/plan_edit_screen/plan_edit_screen.dart b/lib/old/plans/plan_edit_screen/plan_edit_screen.dart similarity index 100% rename from lib/presentation/plans/plan_edit_screen/plan_edit_screen.dart rename to lib/old/plans/plan_edit_screen/plan_edit_screen.dart diff --git a/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart b/lib/old/plans/plan_select_screen/bloc/plan_select_bloc.dart similarity index 93% rename from lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart rename to lib/old/plans/plan_select_screen/bloc/plan_select_bloc.dart index fa32b77f..d2ffb5be 100644 --- a/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart +++ b/lib/old/plans/plan_select_screen/bloc/plan_select_bloc.dart @@ -1,10 +1,10 @@ -//import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; +//import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; import 'dart:async'; import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/plans/plan_select_screen/models/plan_select_model.dart'; +import 'package:eatvio_app/old/plans/plan_select_screen/models/plan_select_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/plans/plan_select_screen/bloc/plan_select_event.dart b/lib/old/plans/plan_select_screen/bloc/plan_select_event.dart similarity index 100% rename from lib/presentation/plans/plan_select_screen/bloc/plan_select_event.dart rename to lib/old/plans/plan_select_screen/bloc/plan_select_event.dart diff --git a/lib/presentation/plans/plan_select_screen/bloc/plan_select_state.dart b/lib/old/plans/plan_select_screen/bloc/plan_select_state.dart similarity index 100% rename from lib/presentation/plans/plan_select_screen/bloc/plan_select_state.dart rename to lib/old/plans/plan_select_screen/bloc/plan_select_state.dart diff --git a/lib/presentation/plans/plan_select_screen/models/plan_select_model.dart b/lib/old/plans/plan_select_screen/models/plan_select_model.dart similarity index 100% rename from lib/presentation/plans/plan_select_screen/models/plan_select_model.dart rename to lib/old/plans/plan_select_screen/models/plan_select_model.dart diff --git a/lib/presentation/plans/plan_select_screen/plan_select_screen.dart b/lib/old/plans/plan_select_screen/plan_select_screen.dart similarity index 100% rename from lib/presentation/plans/plan_select_screen/plan_select_screen.dart rename to lib/old/plans/plan_select_screen/plan_select_screen.dart diff --git a/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart b/lib/old/plans/plan_show_screen/bloc/plan_show_bloc.dart similarity index 97% rename from lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart rename to lib/old/plans/plan_show_screen/bloc/plan_show_bloc.dart index f09463a9..48b16f9b 100644 --- a/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart +++ b/lib/old/plans/plan_show_screen/bloc/plan_show_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/plans/plan_show_screen/models/plan_show_model.dart'; +import 'package:eatvio_app/old/plans/plan_show_screen/models/plan_show_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/plans/plan_show_screen/bloc/plan_show_event.dart b/lib/old/plans/plan_show_screen/bloc/plan_show_event.dart similarity index 100% rename from lib/presentation/plans/plan_show_screen/bloc/plan_show_event.dart rename to lib/old/plans/plan_show_screen/bloc/plan_show_event.dart diff --git a/lib/presentation/plans/plan_show_screen/bloc/plan_show_state.dart b/lib/old/plans/plan_show_screen/bloc/plan_show_state.dart similarity index 100% rename from lib/presentation/plans/plan_show_screen/bloc/plan_show_state.dart rename to lib/old/plans/plan_show_screen/bloc/plan_show_state.dart diff --git a/lib/presentation/plans/plan_show_screen/models/plan_show_model.dart b/lib/old/plans/plan_show_screen/models/plan_show_model.dart similarity index 100% rename from lib/presentation/plans/plan_show_screen/models/plan_show_model.dart rename to lib/old/plans/plan_show_screen/models/plan_show_model.dart diff --git a/lib/presentation/plans/plan_show_screen/plan_show_screen.dart b/lib/old/plans/plan_show_screen/plan_show_screen.dart similarity index 100% rename from lib/presentation/plans/plan_show_screen/plan_show_screen.dart rename to lib/old/plans/plan_show_screen/plan_show_screen.dart diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart b/lib/old/profile/my_profile_screen/bloc/my_profile_bloc.dart similarity index 98% rename from lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart rename to lib/old/profile/my_profile_screen/bloc/my_profile_bloc.dart index 4678416e..6179d623 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart +++ b/lib/old/profile/my_profile_screen/bloc/my_profile_bloc.dart @@ -1,10 +1,10 @@ -//import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; +//import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; import 'dart:async'; import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/models/my_profile_model.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/models/my_profile_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart b/lib/old/profile/my_profile_screen/bloc/my_profile_event.dart similarity index 100% rename from lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart rename to lib/old/profile/my_profile_screen/bloc/my_profile_event.dart diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart b/lib/old/profile/my_profile_screen/bloc/my_profile_state.dart similarity index 100% rename from lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart rename to lib/old/profile/my_profile_screen/bloc/my_profile_state.dart diff --git a/lib/presentation/profile/my_profile_screen/models/my_profile_model.dart b/lib/old/profile/my_profile_screen/models/my_profile_model.dart similarity index 100% rename from lib/presentation/profile/my_profile_screen/models/my_profile_model.dart rename to lib/old/profile/my_profile_screen/models/my_profile_model.dart diff --git a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart b/lib/old/profile/my_profile_screen/my_profile_screen.dart similarity index 100% rename from lib/presentation/profile/my_profile_screen/my_profile_screen.dart rename to lib/old/profile/my_profile_screen/my_profile_screen.dart diff --git a/lib/presentation/profile/my_profile_screen/my_settings_screen.dart b/lib/old/profile/my_profile_screen/my_settings_screen.dart similarity index 100% rename from lib/presentation/profile/my_profile_screen/my_settings_screen.dart rename to lib/old/profile/my_profile_screen/my_settings_screen.dart diff --git a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart b/lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart similarity index 99% rename from lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart rename to lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart index fa817935..33ee84ff 100644 --- a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart +++ b/lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/recipe/recipe_edit_screen/models/recipe_edit_model.dart'; +import 'package:eatvio_app/old/recipe/recipe_edit_screen/models/recipe_edit_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_event.dart b/lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_event.dart similarity index 100% rename from lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_event.dart rename to lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_event.dart diff --git a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_state.dart b/lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_state.dart similarity index 100% rename from lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_state.dart rename to lib/old/recipe/recipe_edit_screen/bloc/recipe_edit_state.dart diff --git a/lib/presentation/recipe/recipe_edit_screen/models/recipe_edit_model.dart b/lib/old/recipe/recipe_edit_screen/models/recipe_edit_model.dart similarity index 100% rename from lib/presentation/recipe/recipe_edit_screen/models/recipe_edit_model.dart rename to lib/old/recipe/recipe_edit_screen/models/recipe_edit_model.dart diff --git a/lib/presentation/recipe/recipe_edit_screen/recipe_edit_screen.dart b/lib/old/recipe/recipe_edit_screen/recipe_edit_screen.dart similarity index 100% rename from lib/presentation/recipe/recipe_edit_screen/recipe_edit_screen.dart rename to lib/old/recipe/recipe_edit_screen/recipe_edit_screen.dart diff --git a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart b/lib/old/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart similarity index 96% rename from lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart rename to lib/old/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart index 21f14634..70bab591 100644 --- a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart +++ b/lib/old/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart @@ -4,7 +4,7 @@ import 'package:dio/dio.dart'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; import 'package:eatvio_app/locator_service.dart'; -import 'package:eatvio_app/presentation/recipe/recipe_select_screen/models/recipe_select_model.dart'; +import 'package:eatvio_app/old/recipe/recipe_select_screen/models/recipe_select_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_event.dart b/lib/old/recipe/recipe_select_screen/bloc/recipe_select_event.dart similarity index 100% rename from lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_event.dart rename to lib/old/recipe/recipe_select_screen/bloc/recipe_select_event.dart diff --git a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_state.dart b/lib/old/recipe/recipe_select_screen/bloc/recipe_select_state.dart similarity index 100% rename from lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_state.dart rename to lib/old/recipe/recipe_select_screen/bloc/recipe_select_state.dart diff --git a/lib/presentation/recipe/recipe_select_screen/models/recipe_select_model.dart b/lib/old/recipe/recipe_select_screen/models/recipe_select_model.dart similarity index 100% rename from lib/presentation/recipe/recipe_select_screen/models/recipe_select_model.dart rename to lib/old/recipe/recipe_select_screen/models/recipe_select_model.dart diff --git a/lib/presentation/recipe/recipe_select_screen/recipe_select_screen.dart b/lib/old/recipe/recipe_select_screen/recipe_select_screen.dart similarity index 100% rename from lib/presentation/recipe/recipe_select_screen/recipe_select_screen.dart rename to lib/old/recipe/recipe_select_screen/recipe_select_screen.dart diff --git a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart b/lib/old/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart similarity index 97% rename from lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart rename to lib/old/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart index 2ae1d76d..bfd81864 100644 --- a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart +++ b/lib/old/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; -import 'package:eatvio_app/presentation/recipe/recipe_show_screen/models/recipe_show_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_screen/models/comment_model.dart'; +import 'package:eatvio_app/old/recipe/recipe_show_screen/models/recipe_show_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_event.dart b/lib/old/recipe/recipe_show_screen/bloc/recipe_show_event.dart similarity index 100% rename from lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_event.dart rename to lib/old/recipe/recipe_show_screen/bloc/recipe_show_event.dart diff --git a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_state.dart b/lib/old/recipe/recipe_show_screen/bloc/recipe_show_state.dart similarity index 100% rename from lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_state.dart rename to lib/old/recipe/recipe_show_screen/bloc/recipe_show_state.dart diff --git a/lib/presentation/recipe/recipe_show_screen/models/recipe_show_model.dart b/lib/old/recipe/recipe_show_screen/models/recipe_show_model.dart similarity index 100% rename from lib/presentation/recipe/recipe_show_screen/models/recipe_show_model.dart rename to lib/old/recipe/recipe_show_screen/models/recipe_show_model.dart diff --git a/lib/presentation/recipe/recipe_show_screen/recipe_show_screen.dart b/lib/old/recipe/recipe_show_screen/recipe_show_screen.dart similarity index 99% rename from lib/presentation/recipe/recipe_show_screen/recipe_show_screen.dart rename to lib/old/recipe/recipe_show_screen/recipe_show_screen.dart index c42813d4..33f7cfc3 100644 --- a/lib/presentation/recipe/recipe_show_screen/recipe_show_screen.dart +++ b/lib/old/recipe/recipe_show_screen/recipe_show_screen.dart @@ -1,6 +1,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_screen/widgets/comment_widget.dart'; +import 'package:eatvio_app/old/feed/blog_post_screen/widgets/comment_widget.dart'; import 'package:eatvio_app/widgets/custom_edit_text_form_field.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/recipe/recipe_show_screen/widgets/comment_widget.dart b/lib/old/recipe/recipe_show_screen/widgets/comment_widget.dart similarity index 97% rename from lib/presentation/recipe/recipe_show_screen/widgets/comment_widget.dart rename to lib/old/recipe/recipe_show_screen/widgets/comment_widget.dart index ed2e075c..421c2c71 100644 --- a/lib/presentation/recipe/recipe_show_screen/widgets/comment_widget.dart +++ b/lib/old/recipe/recipe_show_screen/widgets/comment_widget.dart @@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; +import 'package:eatvio_app/old/feed/blog_post_screen/models/comment_model.dart'; import 'package:flutter/material.dart'; class CommentWidget extends StatelessWidget { diff --git a/lib/presentation/users/subscribers_screen/bloc/subscribers_bloc.dart b/lib/old/users/subscribers_screen/bloc/subscribers_bloc.dart similarity index 93% rename from lib/presentation/users/subscribers_screen/bloc/subscribers_bloc.dart rename to lib/old/users/subscribers_screen/bloc/subscribers_bloc.dart index f29ace07..d4adda62 100644 --- a/lib/presentation/users/subscribers_screen/bloc/subscribers_bloc.dart +++ b/lib/old/users/subscribers_screen/bloc/subscribers_bloc.dart @@ -1,10 +1,10 @@ -//import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; +//import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; import 'dart:async'; import 'dart:convert'; import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/users/subscribers_screen/models/subscribers_model.dart'; +import 'package:eatvio_app/old/users/subscribers_screen/models/subscribers_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/presentation/users/subscribers_screen/bloc/subscribers_event.dart b/lib/old/users/subscribers_screen/bloc/subscribers_event.dart similarity index 100% rename from lib/presentation/users/subscribers_screen/bloc/subscribers_event.dart rename to lib/old/users/subscribers_screen/bloc/subscribers_event.dart diff --git a/lib/presentation/users/subscribers_screen/bloc/subscribers_state.dart b/lib/old/users/subscribers_screen/bloc/subscribers_state.dart similarity index 100% rename from lib/presentation/users/subscribers_screen/bloc/subscribers_state.dart rename to lib/old/users/subscribers_screen/bloc/subscribers_state.dart diff --git a/lib/presentation/users/subscribers_screen/models/subscribers_model.dart b/lib/old/users/subscribers_screen/models/subscribers_model.dart similarity index 100% rename from lib/presentation/users/subscribers_screen/models/subscribers_model.dart rename to lib/old/users/subscribers_screen/models/subscribers_model.dart diff --git a/lib/presentation/users/subscribers_screen/subscribers_screen.dart b/lib/old/users/subscribers_screen/subscribers_screen.dart similarity index 98% rename from lib/presentation/users/subscribers_screen/subscribers_screen.dart rename to lib/old/users/subscribers_screen/subscribers_screen.dart index bb968f23..51fde5d3 100644 --- a/lib/presentation/users/subscribers_screen/subscribers_screen.dart +++ b/lib/old/users/subscribers_screen/subscribers_screen.dart @@ -1,6 +1,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/feed/feed_screen/widgets/feed_search_view.dart'; +import 'package:eatvio_app/old/feed/feed_screen/widgets/feed_search_view.dart'; import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart'; import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart'; import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart'; diff --git a/lib/widgets/custom_expandable_list.dart b/lib/widgets/custom_expandable_list.dart index 2489c0d7..99709dfb 100644 --- a/lib/widgets/custom_expandable_list.dart +++ b/lib/widgets/custom_expandable_list.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:eatvio_app/core/app_export.dart'; import 'package:eatvio_app/core/token_storage.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart'; import 'package:eatvio_app/widgets/custom_hyper_switch.dart'; import 'package:eatvio_app/widgets/custom_hypo_switch.dart'; import 'package:eatvio_app/widgets/next_step_button.dart'; diff --git a/lib/widgets/custom_hyper_switch.dart b/lib/widgets/custom_hyper_switch.dart index 3d28d053..b67f553a 100644 --- a/lib/widgets/custom_hyper_switch.dart +++ b/lib/widgets/custom_hyper_switch.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart'; import 'package:flutter/material.dart'; class HyperSwitch extends StatefulWidget { diff --git a/lib/widgets/custom_hypo_switch.dart b/lib/widgets/custom_hypo_switch.dart index 9504e5f1..14a926fd 100644 --- a/lib/widgets/custom_hypo_switch.dart +++ b/lib/widgets/custom_hypo_switch.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart'; +import 'package:eatvio_app/old/profile/my_profile_screen/bloc/my_profile_bloc.dart'; import 'package:flutter/material.dart'; class HypoSwitch extends StatefulWidget { diff --git a/test/auth_test.dart b/test/auth_test.dart index e131dc88..49a9f19c 100644 --- a/test/auth_test.dart +++ b/test/auth_test.dart @@ -2,9 +2,9 @@ import 'package:eatvio_app/core/app_export.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; -import 'package:eatvio_app/presentation/auth/auth_screen/bloc/auth_bloc.dart'; -import 'package:eatvio_app/presentation/auth/auth_screen/models/auth_model.dart'; +import 'package:eatvio_app/old/auth/auth_screen/auth_screen.dart'; +import 'package:eatvio_app/old/auth/auth_screen/bloc/auth_bloc.dart'; +import 'package:eatvio_app/old/auth/auth_screen/models/auth_model.dart'; void main() { group('AuthScreen', () {