feat(feed, profile): добавлен переход на страинцу автора в посте, рецепте и дете. при нажатии на изображение в рецепте и диеты теперь переход на страницу с подробнее.

2024-08-14 11:34:29 +03:00
parent 1e992e9dd6
commit 919035a455
77 changed files with 3943 additions and 2745 deletions
--- a/lib/features/feed/presentation/bloc/diets_cubit/diets_state.freezed.dart
+++ b/lib/features/feed/presentation/bloc/diets_cubit/diets_state.freezed.dart
@@ -24,6 +24,7 @@ mixin _$DietsState {
    required TResult Function(String errorMessage) error,
  }) =>
      throw _privateConstructorUsedError;
+
  @optionalTypeArgs
  TResult? whenOrNull<TResult extends Object?>(
    TResult? Function()? $default, {
@@ -70,36 +71,28 @@ mixin _$DietsState {

 /// @nodoc
 abstract class $DietsStateCopyWith<$Res> {
-  factory $DietsStateCopyWith(
-          DietsState value, $Res Function(DietsState) then) =
-      _$DietsStateCopyWithImpl<$Res, DietsState>;
+  factory $DietsStateCopyWith(DietsState value, $Res Function(DietsState) then) = _$DietsStateCopyWithImpl<$Res, DietsState>;
 }

 /// @nodoc
-class _$DietsStateCopyWithImpl<$Res, $Val extends DietsState>
-    implements $DietsStateCopyWith<$Res> {
+class _$DietsStateCopyWithImpl<$Res, $Val extends DietsState> implements $DietsStateCopyWith<$Res> {
  _$DietsStateCopyWithImpl(this._value, this._then);

  // ignore: unused_field
  final $Val _value;
+
  // ignore: unused_field
  final $Res Function($Val) _then;
 }

 /// @nodoc
 abstract class _$$DietsStateImplCopyWith<$Res> {
-  factory _$$DietsStateImplCopyWith(
-          _$DietsStateImpl value, $Res Function(_$DietsStateImpl) then) =
-      __$$DietsStateImplCopyWithImpl<$Res>;
+  factory _$$DietsStateImplCopyWith(_$DietsStateImpl value, $Res Function(_$DietsStateImpl) then) = __$$DietsStateImplCopyWithImpl<$Res>;
 }

 /// @nodoc
-class __$$DietsStateImplCopyWithImpl<$Res>
-    extends _$DietsStateCopyWithImpl<$Res, _$DietsStateImpl>
-    implements _$$DietsStateImplCopyWith<$Res> {
-  __$$DietsStateImplCopyWithImpl(
-      _$DietsStateImpl _value, $Res Function(_$DietsStateImpl) _then)
-      : super(_value, _then);
+class __$$DietsStateImplCopyWithImpl<$Res> extends _$DietsStateCopyWithImpl<$Res, _$DietsStateImpl> implements _$$DietsStateImplCopyWith<$Res> {
+  __$$DietsStateImplCopyWithImpl(_$DietsStateImpl _value, $Res Function(_$DietsStateImpl) _then) : super(_value, _then);
 }

 /// @nodoc
@@ -114,8 +107,7 @@ class _$DietsStateImpl implements _DietsState {

  @override
  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$DietsStateImpl);
+    return identical(this, other) || (other.runtimeType == runtimeType && other is _$DietsStateImpl);
  }

  @override
@@ -202,18 +194,14 @@ abstract class _DietsState implements DietsState {

 /// @nodoc
 abstract class _$$DietsStateLoadingImplCopyWith<$Res> {
-  factory _$$DietsStateLoadingImplCopyWith(_$DietsStateLoadingImpl value,
-          $Res Function(_$DietsStateLoadingImpl) then) =
+  factory _$$DietsStateLoadingImplCopyWith(_$DietsStateLoadingImpl value, $Res Function(_$DietsStateLoadingImpl) then) =
      __$$DietsStateLoadingImplCopyWithImpl<$Res>;
 }

 /// @nodoc
-class __$$DietsStateLoadingImplCopyWithImpl<$Res>
-    extends _$DietsStateCopyWithImpl<$Res, _$DietsStateLoadingImpl>
+class __$$DietsStateLoadingImplCopyWithImpl<$Res> extends _$DietsStateCopyWithImpl<$Res, _$DietsStateLoadingImpl>
    implements _$$DietsStateLoadingImplCopyWith<$Res> {
-  __$$DietsStateLoadingImplCopyWithImpl(_$DietsStateLoadingImpl _value,
-      $Res Function(_$DietsStateLoadingImpl) _then)
-      : super(_value, _then);
+  __$$DietsStateLoadingImplCopyWithImpl(_$DietsStateLoadingImpl _value, $Res Function(_$DietsStateLoadingImpl) _then) : super(_value, _then);
 }

 /// @nodoc
@@ -228,8 +216,7 @@ class _$DietsStateLoadingImpl implements DietsStateLoading {

  @override
  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$DietsStateLoadingImpl);
+    return identical(this, other) || (other.runtimeType == runtimeType && other is _$DietsStateLoadingImpl);
  }

  @override
@@ -316,9 +303,9 @@ abstract class DietsStateLoading implements DietsState {

 /// @nodoc
 abstract class _$$DietsStateLoadedImplCopyWith<$Res> {
-  factory _$$DietsStateLoadedImplCopyWith(_$DietsStateLoadedImpl value,
-          $Res Function(_$DietsStateLoadedImpl) then) =
+  factory _$$DietsStateLoadedImplCopyWith(_$DietsStateLoadedImpl value, $Res Function(_$DietsStateLoadedImpl) then) =
      __$$DietsStateLoadedImplCopyWithImpl<$Res>;
+
  @useResult
  $Res call({DietsPagination diets});

@@ -326,12 +313,9 @@ abstract class _$$DietsStateLoadedImplCopyWith<$Res> {
 }

 /// @nodoc
-class __$$DietsStateLoadedImplCopyWithImpl<$Res>
-    extends _$DietsStateCopyWithImpl<$Res, _$DietsStateLoadedImpl>
+class __$$DietsStateLoadedImplCopyWithImpl<$Res> extends _$DietsStateCopyWithImpl<$Res, _$DietsStateLoadedImpl>
    implements _$$DietsStateLoadedImplCopyWith<$Res> {
-  __$$DietsStateLoadedImplCopyWithImpl(_$DietsStateLoadedImpl _value,
-      $Res Function(_$DietsStateLoadedImpl) _then)
-      : super(_value, _then);
+  __$$DietsStateLoadedImplCopyWithImpl(_$DietsStateLoadedImpl _value, $Res Function(_$DietsStateLoadedImpl) _then) : super(_value, _then);

  @pragma('vm:prefer-inline')
  @override
@@ -371,9 +355,7 @@ class _$DietsStateLoadedImpl implements DietsStateLoaded {
  @override
  bool operator ==(Object other) {
    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$DietsStateLoadedImpl &&
-            (identical(other.diets, diets) || other.diets == diets));
+        (other.runtimeType == runtimeType && other is _$DietsStateLoadedImpl && (identical(other.diets, diets) || other.diets == diets));
  }

  @override
@@ -382,9 +364,7 @@ class _$DietsStateLoadedImpl implements DietsStateLoaded {
  @JsonKey(ignore: true)
  @override
  @pragma('vm:prefer-inline')
-  _$$DietsStateLoadedImplCopyWith<_$DietsStateLoadedImpl> get copyWith =>
-      __$$DietsStateLoadedImplCopyWithImpl<_$DietsStateLoadedImpl>(
-          this, _$identity);
+  _$$DietsStateLoadedImplCopyWith<_$DietsStateLoadedImpl> get copyWith => __$$DietsStateLoadedImplCopyWithImpl<_$DietsStateLoadedImpl>(this, _$identity);

  @override
  @optionalTypeArgs
@@ -462,31 +442,25 @@ class _$DietsStateLoadedImpl implements DietsStateLoaded {
 }

 abstract class DietsStateLoaded implements DietsState {
-  const factory DietsStateLoaded({required final DietsPagination diets}) =
-      _$DietsStateLoadedImpl;
+  const factory DietsStateLoaded({required final DietsPagination diets}) = _$DietsStateLoadedImpl;

  DietsPagination get diets;
+
  @JsonKey(ignore: true)
-  _$$DietsStateLoadedImplCopyWith<_$DietsStateLoadedImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$DietsStateLoadedImplCopyWith<_$DietsStateLoadedImpl> get copyWith => throw _privateConstructorUsedError;
 }

 /// @nodoc
 abstract class _$$DietsStateErrorImplCopyWith<$Res> {
-  factory _$$DietsStateErrorImplCopyWith(_$DietsStateErrorImpl value,
-          $Res Function(_$DietsStateErrorImpl) then) =
-      __$$DietsStateErrorImplCopyWithImpl<$Res>;
+  factory _$$DietsStateErrorImplCopyWith(_$DietsStateErrorImpl value, $Res Function(_$DietsStateErrorImpl) then) = __$$DietsStateErrorImplCopyWithImpl<$Res>;
+
  @useResult
  $Res call({String errorMessage});
 }

 /// @nodoc
-class __$$DietsStateErrorImplCopyWithImpl<$Res>
-    extends _$DietsStateCopyWithImpl<$Res, _$DietsStateErrorImpl>
-    implements _$$DietsStateErrorImplCopyWith<$Res> {
-  __$$DietsStateErrorImplCopyWithImpl(
-      _$DietsStateErrorImpl _value, $Res Function(_$DietsStateErrorImpl) _then)
-      : super(_value, _then);
+class __$$DietsStateErrorImplCopyWithImpl<$Res> extends _$DietsStateCopyWithImpl<$Res, _$DietsStateErrorImpl> implements _$$DietsStateErrorImplCopyWith<$Res> {
+  __$$DietsStateErrorImplCopyWithImpl(_$DietsStateErrorImpl _value, $Res Function(_$DietsStateErrorImpl) _then) : super(_value, _then);

  @pragma('vm:prefer-inline')
  @override
@@ -520,8 +494,7 @@ class _$DietsStateErrorImpl implements DietsStateError {
    return identical(this, other) ||
        (other.runtimeType == runtimeType &&
            other is _$DietsStateErrorImpl &&
-            (identical(other.errorMessage, errorMessage) ||
-                other.errorMessage == errorMessage));
+            (identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
  }

  @override
@@ -530,9 +503,7 @@ class _$DietsStateErrorImpl implements DietsStateError {
  @JsonKey(ignore: true)
  @override
  @pragma('vm:prefer-inline')
-  _$$DietsStateErrorImplCopyWith<_$DietsStateErrorImpl> get copyWith =>
-      __$$DietsStateErrorImplCopyWithImpl<_$DietsStateErrorImpl>(
-          this, _$identity);
+  _$$DietsStateErrorImplCopyWith<_$DietsStateErrorImpl> get copyWith => __$$DietsStateErrorImplCopyWithImpl<_$DietsStateErrorImpl>(this, _$identity);

  @override
  @optionalTypeArgs
@@ -610,11 +581,10 @@ class _$DietsStateErrorImpl implements DietsStateError {
 }

 abstract class DietsStateError implements DietsState {
-  const factory DietsStateError({required final String errorMessage}) =
-      _$DietsStateErrorImpl;
+  const factory DietsStateError({required final String errorMessage}) = _$DietsStateErrorImpl;

  String get errorMessage;
+
  @JsonKey(ignore: true)
-  _$$DietsStateErrorImplCopyWith<_$DietsStateErrorImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  _$$DietsStateErrorImplCopyWith<_$DietsStateErrorImpl> get copyWith => throw _privateConstructorUsedError;
 }
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -22,7 +22,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
      borderRadius: BorderRadius.circular(12),
      onTap: () => GoRouter.of(context).pushNamed(
        'blogPostScreen',
-        extra: widget.feedBlogPostModel.id.toString(),
+        extra: widget.feedBlogPostModel,
      ),
      child: Ink(
        decoration: BoxDecoration(
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -1,7 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_export.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -34,22 +32,8 @@ class _DietsWidgetState extends State<DietsWidget> {
              children: [
                ClipRRect(
                  borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
-                  child: GestureDetector(
-                    onTap: () {
-                      context.pushTransparentRoute(
-                        rootNavigator: true,
-                        PhotoViewScreen(
-                          imageUrls: [baseUrl + '/storage/' + widget.datum.image],
-                          index: 0,
-                        ),
-                      );
-                    },
-                    child: Hero(
-                      tag: baseUrl + '/storage/' + widget.datum.image,
-                      child: CachedNetworkImage(
-                        imageUrl: baseUrl + '/storage/' + widget.datum.image,
-                      ),
-                    ),
+                  child: CachedNetworkImage(
+                    imageUrl: baseUrl + '/storage/' + widget.datum.image,
                  ),
                ),
                Positioned(
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -1,7 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_export.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -34,22 +32,8 @@ class _RecipesWidgetState extends State<RecipesWidget> {
              children: [
                ClipRRect(
                  borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
-                  child: GestureDetector(
-                    onTap: () {
-                      context.pushTransparentRoute(
-                        rootNavigator: true,
-                        PhotoViewScreen(
-                          imageUrls: [baseUrl + '/storage/' + widget.recipes.image],
-                          index: 0,
-                        ),
-                      );
-                    },
-                    child: Hero(
-                      tag: baseUrl + '/storage/' + widget.recipes.image,
-                      child: CachedNetworkImage(
-                        imageUrl: baseUrl + '/storage/' + widget.recipes.image,
-                      ),
-                    ),
+                  child: CachedNetworkImage(
+                    imageUrl: baseUrl + '/storage/' + widget.recipes.image,
                  ),
                ),
                Positioned(