refactor(all): refactor

2024-07-09 17:50:32 +03:00
parent f79b9f03ae
commit e180ff16b6
37 changed files with 1706 additions and 1123 deletions
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -179,7 +179,6 @@ class _ChatScreenState extends State<ChatScreen> {
                      keyboardType: TextInputType.multiline,
                      style: TextStyle(
                        fontSize: 16,
-                        fontFamily: 'Mulish',
                        fontWeight: FontWeight.w400,
                        color: Colors.black,
                      ),
@@ -188,7 +187,6 @@ class _ChatScreenState extends State<ChatScreen> {
                        hintText: 'Сообщение',
                        hintStyle: TextStyle(
                          fontSize: 16,
-                          fontFamily: 'Mulish',
                          fontWeight: FontWeight.w400,
                          color: Color(0xFFAEAEB2),
                        ),
--- a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
@@ -42,18 +42,24 @@ class ChatSelectScreen extends StatelessWidget {
            body: NestedScrollView(
              headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
                return [
-                  SliverAppBar(
-                    automaticallyImplyLeading: false,
-                    stretchTriggerOffset: 1,
-                    forceMaterialTransparency: true,
-                    floating: true,
-                    snap: true,
-                    title: CustomSearchView(
-                      controller: state.searchController,
-                      fillColor: Color(0xFFF0F2F5),
-                      hintText: "Поиск",
-                      hintStyle: TextStyle(
-                        color: Color(0xFF7B8794),
+                  SliverPadding(
+                    padding: const EdgeInsets.only(top: 8),
+                    sliver: SliverAppBar(
+                      automaticallyImplyLeading: false,
+                      stretchTriggerOffset: 1,
+                      forceMaterialTransparency: true,
+                      floating: true,
+                      snap: true,
+                      title: Padding(
+                        padding: const EdgeInsets.only(top: 8),
+                        child: CustomSearchView(
+                          controller: state.searchController,
+                          fillColor: Color(0xFFF0F2F5),
+                          hintText: "Поиск",
+                          hintStyle: TextStyle(
+                            color: Color(0xFF7B8794),
+                          ),
+                        ),
                      ),
                    ),
                  ),
--- a/lib/features/feed/models/feed_blog_post_settings_model.dart
+++ b/lib/features/feed/models/feed_blog_post_settings_model.dart
@@ -0,0 +1,15 @@
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'feed_blog_post_settings_model.freezed.dart';
+part 'feed_blog_post_settings_model.g.dart';
+
+@freezed
+class FeedBlogPostSettingsModel with _$FeedBlogPostSettingsModel {
+  const factory FeedBlogPostSettingsModel({
+    @JsonKey(name: 'data')
+    required List<FeedBlogPostModel> feedBlogPostList,
+  }) = _FeedBlogPostSettingsModel;
+
+  factory FeedBlogPostSettingsModel.fromJson(Map<String, Object?> json) => _$FeedBlogPostSettingsModelFromJson(json);
+}
--- a/lib/features/feed/models/feed_blog_post_settings_model.freezed.dart
+++ b/lib/features/feed/models/feed_blog_post_settings_model.freezed.dart
@@ -0,0 +1,175 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'feed_blog_post_settings_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+FeedBlogPostSettingsModel _$FeedBlogPostSettingsModelFromJson(
+    Map<String, dynamic> json) {
+  return _FeedBlogPostSettingsModel.fromJson(json);
+}
+
+/// @nodoc
+mixin _$FeedBlogPostSettingsModel {
+  @JsonKey(name: 'data')
+  List<FeedBlogPostModel> get feedBlogPostList =>
+      throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $FeedBlogPostSettingsModelCopyWith<FeedBlogPostSettingsModel> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $FeedBlogPostSettingsModelCopyWith<$Res> {
+  factory $FeedBlogPostSettingsModelCopyWith(FeedBlogPostSettingsModel value,
+          $Res Function(FeedBlogPostSettingsModel) then) =
+      _$FeedBlogPostSettingsModelCopyWithImpl<$Res, FeedBlogPostSettingsModel>;
+  @useResult
+  $Res call({@JsonKey(name: 'data') List<FeedBlogPostModel> feedBlogPostList});
+}
+
+/// @nodoc
+class _$FeedBlogPostSettingsModelCopyWithImpl<$Res,
+        $Val extends FeedBlogPostSettingsModel>
+    implements $FeedBlogPostSettingsModelCopyWith<$Res> {
+  _$FeedBlogPostSettingsModelCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? feedBlogPostList = null,
+  }) {
+    return _then(_value.copyWith(
+      feedBlogPostList: null == feedBlogPostList
+          ? _value.feedBlogPostList
+          : feedBlogPostList // ignore: cast_nullable_to_non_nullable
+              as List<FeedBlogPostModel>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$FeedBlogPostSettingsModelImplCopyWith<$Res>
+    implements $FeedBlogPostSettingsModelCopyWith<$Res> {
+  factory _$$FeedBlogPostSettingsModelImplCopyWith(
+          _$FeedBlogPostSettingsModelImpl value,
+          $Res Function(_$FeedBlogPostSettingsModelImpl) then) =
+      __$$FeedBlogPostSettingsModelImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({@JsonKey(name: 'data') List<FeedBlogPostModel> feedBlogPostList});
+}
+
+/// @nodoc
+class __$$FeedBlogPostSettingsModelImplCopyWithImpl<$Res>
+    extends _$FeedBlogPostSettingsModelCopyWithImpl<$Res,
+        _$FeedBlogPostSettingsModelImpl>
+    implements _$$FeedBlogPostSettingsModelImplCopyWith<$Res> {
+  __$$FeedBlogPostSettingsModelImplCopyWithImpl(
+      _$FeedBlogPostSettingsModelImpl _value,
+      $Res Function(_$FeedBlogPostSettingsModelImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? feedBlogPostList = null,
+  }) {
+    return _then(_$FeedBlogPostSettingsModelImpl(
+      feedBlogPostList: null == feedBlogPostList
+          ? _value._feedBlogPostList
+          : feedBlogPostList // ignore: cast_nullable_to_non_nullable
+              as List<FeedBlogPostModel>,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$FeedBlogPostSettingsModelImpl implements _FeedBlogPostSettingsModel {
+  const _$FeedBlogPostSettingsModelImpl(
+      {@JsonKey(name: 'data')
+      required final List<FeedBlogPostModel> feedBlogPostList})
+      : _feedBlogPostList = feedBlogPostList;
+
+  factory _$FeedBlogPostSettingsModelImpl.fromJson(Map<String, dynamic> json) =>
+      _$$FeedBlogPostSettingsModelImplFromJson(json);
+
+  final List<FeedBlogPostModel> _feedBlogPostList;
+  @override
+  @JsonKey(name: 'data')
+  List<FeedBlogPostModel> get feedBlogPostList {
+    if (_feedBlogPostList is EqualUnmodifiableListView)
+      return _feedBlogPostList;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_feedBlogPostList);
+  }
+
+  @override
+  String toString() {
+    return 'FeedBlogPostSettingsModel(feedBlogPostList: $feedBlogPostList)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$FeedBlogPostSettingsModelImpl &&
+            const DeepCollectionEquality()
+                .equals(other._feedBlogPostList, _feedBlogPostList));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(_feedBlogPostList));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$FeedBlogPostSettingsModelImplCopyWith<_$FeedBlogPostSettingsModelImpl>
+      get copyWith => __$$FeedBlogPostSettingsModelImplCopyWithImpl<
+          _$FeedBlogPostSettingsModelImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$FeedBlogPostSettingsModelImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _FeedBlogPostSettingsModel implements FeedBlogPostSettingsModel {
+  const factory _FeedBlogPostSettingsModel(
+          {@JsonKey(name: 'data')
+          required final List<FeedBlogPostModel> feedBlogPostList}) =
+      _$FeedBlogPostSettingsModelImpl;
+
+  factory _FeedBlogPostSettingsModel.fromJson(Map<String, dynamic> json) =
+      _$FeedBlogPostSettingsModelImpl.fromJson;
+
+  @override
+  @JsonKey(name: 'data')
+  List<FeedBlogPostModel> get feedBlogPostList;
+  @override
+  @JsonKey(ignore: true)
+  _$$FeedBlogPostSettingsModelImplCopyWith<_$FeedBlogPostSettingsModelImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
--- a/lib/features/feed/models/feed_blog_post_settings_model.g.dart
+++ b/lib/features/feed/models/feed_blog_post_settings_model.g.dart
@@ -0,0 +1,21 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'feed_blog_post_settings_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$FeedBlogPostSettingsModelImpl _$$FeedBlogPostSettingsModelImplFromJson(
+        Map<String, dynamic> json) =>
+    _$FeedBlogPostSettingsModelImpl(
+      feedBlogPostList: (json['data'] as List<dynamic>)
+          .map((e) => FeedBlogPostModel.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$$FeedBlogPostSettingsModelImplToJson(
+        _$FeedBlogPostSettingsModelImpl instance) =>
+    <String, dynamic>{
+      'data': instance.feedBlogPostList,
+    };
--- a/lib/features/feed/repositories/feed_repository.dart
+++ b/lib/features/feed/repositories/feed_repository.dart
@@ -8,7 +8,7 @@ class FeedRepository {

  Future<List<FeedBlogPostModel>> getFeedBlogPostList() async {
    try {
-      return (await feedService.getBlocPostList()).entries.map((entry) => entry.value).toList();
+      return (await feedService.getBlocPostList()).feedBlogPostList;
    } catch (e) {
      rethrow;
    }
--- a/lib/features/feed/services/feed_service.dart
+++ b/lib/features/feed/services/feed_service.dart
@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:retrofit/retrofit.dart';

 part 'feed_service.g.dart';
@@ -8,6 +8,6 @@ part 'feed_service.g.dart';
 abstract class FeedService {
  factory FeedService(Dio dio, {String baseUrl}) = _FeedService;

-  @GET('/feed/index')
-  Future<Map<String, FeedBlogPostModel>> getBlocPostList();
+  @GET('/blogPosts/index')
+  Future<FeedBlogPostSettingsModel> getBlocPostList();
 }
--- a/lib/features/feed/services/feed_service.g.dart
+++ b/lib/features/feed/services/feed_service.g.dart
@@ -19,20 +19,20 @@ class _FeedService implements FeedService {
  String? baseUrl;

  @override
-  Future<Map<String, FeedBlogPostModel>> getBlocPostList() async {
+  Future<FeedBlogPostSettingsModel> getBlocPostList() async {
    final _extra = <String, dynamic>{};
    final queryParameters = <String, dynamic>{};
    final _headers = <String, dynamic>{};
    const Map<String, dynamic>? _data = null;
    final _result = await _dio.fetch<Map<String, dynamic>>(
-        _setStreamType<Map<String, FeedBlogPostModel>>(Options(
+        _setStreamType<FeedBlogPostSettingsModel>(Options(
      method: 'GET',
      headers: _headers,
      extra: _extra,
    )
            .compose(
              _dio.options,
-              '/feed/index',
+              '/blogPosts/index',
              queryParameters: queryParameters,
              data: _data,
            )
@@ -41,8 +41,7 @@ class _FeedService implements FeedService {
              _dio.options.baseUrl,
              baseUrl,
            ))));
-    var _value = _result.data!.map((k, dynamic v) =>
-        MapEntry(k, FeedBlogPostModel.fromJson(v as Map<String, dynamic>)));
+    final _value = FeedBlogPostSettingsModel.fromJson(_result.data!);
    return _value;
  }