bug fixes and ui updates

README.md

@@ -46,13 +46,17 @@ other users.
 
 <img src="screenshots/register.png" alt="" width="400" />
 
+### Home Screen
+
+<img src="screenshots/home.png" alt="" width="400" />
+
 ### Profile Screen
 
 <img src="screenshots/profile.png" alt="" width="400" />
 
-### Settings Screen
+### Notification Screen
 
-<img src="screenshots/settings.png" alt="" width="400" />
+<img src="screenshots/notification.png" alt="" width="400" />
 
 ## Connect With Me
 

lib/apis/models/entities/post.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:social_media_app/apis/models/entities/post_like.dart';
 import 'package:social_media_app/apis/models/entities/post_media_file.dart';
 import 'package:social_media_app/apis/models/entities/user.dart';
 
@@ -8,12 +9,14 @@ part 'post.g.dart';
 @JsonSerializable()
 class Post extends Equatable {
   const Post({
-    required this.id,
+    this.id,
     this.caption,
     this.mediaFiles,
     required this.owner,
     required this.likes,
+    required this.likesCount,
     required this.comments,
+    required this.commentsCount,
     required this.postStatus,
     required this.createdAt,
   });
@@ -23,7 +26,7 @@ class Post extends Equatable {
   Map<String, dynamic> toJson() => _$PostToJson(this);
 
   @JsonKey(name: '_id')
-  final String id;
+  final String? id;
 
   @JsonKey(name: 'caption')
   final String? caption;
@@ -35,10 +38,16 @@ class Post extends Equatable {
   final User owner;
 
   @JsonKey(name: 'likes')
-  final List<dynamic> likes;
+  final List<PostLike> likes;
+
+  @JsonKey(name: 'likesCount')
+  final int likesCount;
 
   @JsonKey(name: 'comments')
-  final List<dynamic> comments;
+  final List<String> comments;
+
+  @JsonKey(name: 'commentsCount')
+  final int commentsCount;
 
   @JsonKey(name: 'postStatus')
   final String postStatus;
@@ -53,7 +62,9 @@ class Post extends Equatable {
         mediaFiles,
         owner,
         likes,
+        likesCount,
         comments,
+        commentsCount,
         postStatus,
         createdAt,
       ];

lib/apis/models/entities/post_like.dart

@@ -0,0 +1,34 @@
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'post_like.g.dart';
+
+@JsonSerializable()
+class PostLike extends Equatable {
+  const PostLike({
+    this.id,
+    this.likedBy,
+    this.likedAt,
+  });
+
+  factory PostLike.fromJson(Map<String, dynamic> json) =>
+      _$PostLikeFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PostLikeToJson(this);
+
+  @JsonKey(name: '_id')
+  final String? id;
+
+  @JsonKey(name: 'likedBy')
+  final String? likedBy;
+
+  @JsonKey(name: 'likedAt')
+  final DateTime? likedAt;
+
+  @override
+  List<Object?> get props => <Object?>[
+        id,
+        likedBy,
+        likedAt,
+      ];
+}

lib/apis/models/entities/post_like_details.dart

@@ -0,0 +1,35 @@
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:social_media_app/apis/models/entities/user.dart';
+
+part 'post_like_details.g.dart';
+
+@JsonSerializable()
+class PostLikeDetails extends Equatable {
+  const PostLikeDetails({
+    this.id,
+    this.likedBy,
+    this.likedAt,
+  });
+
+  factory PostLikeDetails.fromJson(Map<String, dynamic> json) =>
+      _$PostLikeDetailsFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PostLikeDetailsToJson(this);
+
+  @JsonKey(name: '_id')
+  final String? id;
+
+  @JsonKey(name: 'likedBy')
+  final User? likedBy;
+
+  @JsonKey(name: 'likedAt')
+  final DateTime? likedAt;
+
+  @override
+  List<Object?> get props => <Object?>[
+        id,
+        likedBy,
+        likedAt,
+      ];
+}

lib/apis/models/entities/profile.dart

@@ -27,6 +27,8 @@ class Profile extends Equatable {
     required this.posts,
     required this.followers,
     required this.following,
+    required this.followersCount,
+    required this.followingsCount,
     required this.role,
     required this.accountType,
     required this.accountStatus,
@@ -100,6 +102,12 @@ class Profile extends Equatable {
   @JsonKey(name: 'following')
   final List<dynamic> following;
 
+  @JsonKey(name: 'followersCount')
+  final int followersCount;
+
+  @JsonKey(name: 'followingsCount')
+  final int followingsCount;
+
   @JsonKey(name: 'role')
   final String role;
 
@@ -156,6 +164,8 @@ class Profile extends Equatable {
         posts,
         followers,
         following,
+        followingsCount,
+        followersCount,
         role,
         accountType,
         accountStatus,