Different layout if the message sender is the current user.

Author: Mayank-9018

assets/changelog.json

@@ -1,9 +1,9 @@
 {
-    "version": "1.2.0",
+    "version": "1.2.2",
     "changes": [
         {
-            "title": "🔑 Password reset now available.",
-            "body": "Users can now reset their password from the login screen."
+            "title": "🐛 Bug fixes:",
+            "body": "Logout from email verification screen, Login/Signup progress indicator,  Different layout for user message."
         }
     ]
 }

lib/components/message_widget.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:monochat/components/user_image.dart';
+import 'package:monochat/models/current_user_dao.dart';
 import 'package:provider/provider.dart';
 import 'package:intl/intl.dart';
 import 'package:monochat/models/user_dao.dart';
@@ -26,11 +27,60 @@ class MessageWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     Future<Map<String, dynamic>> userDataFuture =
         Provider.of<UserDao>(context, listen: false).getUserData(uid);
+    if (uid == Provider.of<CurrentUserDao>(context, listen: false).userId()) {
+      return currentUserMessage(context, userDataFuture);
+    } else {
+      return otherUserMessage(context, userDataFuture);
+    }
+  }
+
+  Widget currentUserMessage(context, userDataFuture) {
+    return Column(crossAxisAlignment: CrossAxisAlignment.end, children: [
+      Row(
+        mainAxisAlignment: MainAxisAlignment.end,
+        children: [
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 250),
+            child: Container(
+              decoration: BoxDecoration(
+                color: Theme.of(context).cardColor,
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15),
+                ),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Text(message),
+              ),
+            ),
+          ),
+          const SizedBox(
+            width: 5,
+          ),
+          FutureBuilder<Map<String, dynamic>>(
+              future: userDataFuture,
+              builder: (con, snapshot) {
+                return UserImage(uid);
+              }),
+        ],
+      ),
+      Padding(
+          padding: const EdgeInsets.only(right: 55),
+          child: Text(
+              DateFormat(date.isSameDate(DateTime.now())
+                      ? 'h:mm a'
+                      : 'LLL d • h:mm a')
+                  .format(date)
+                  .toString(),
+              style: const TextStyle(color: Colors.grey, fontSize: 12))),
+    ]);
+  }
+
+  Widget otherUserMessage(context, userDataFuture) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
-          crossAxisAlignment: CrossAxisAlignment.end,
           children: [
             FutureBuilder<Map<String, dynamic>>(
                 future: userDataFuture,

lib/screens/changelog_screen.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -44,7 +43,7 @@ class ChangelogScreen extends StatelessWidget {
                         style: Theme.of(context).textTheme.headline5,
                       ),
                       const SizedBox(
-                        height: 10,
+                        height: 20,
                       ),
                       Expanded(
                           child: ListView.builder(

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.1
+version: 1.2.2
 
 environment:
   sdk: ">=2.15.0 <3.0.0"