From f1429faf3fc299c442caeb260c43bdc12df7c850 Mon Sep 17 00:00:00 2001
From: Kima <kimavideos97@gmail.com>
Date: Tue, 12 Mar 2024 21:01:20 +0100
Subject: [PATCH] fix and added messages screen to new location

---
 refilc_kreta_api/lib/models/message.dart      |  2 +-
 .../lib/pages/home/home_page.dart             | 17 +++++++++----
 .../lib/pages/messages/messages_page.dart     | 25 +++++++++++++------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/refilc_kreta_api/lib/models/message.dart b/refilc_kreta_api/lib/models/message.dart
index 41807f5..963f4c1 100644
--- a/refilc_kreta_api/lib/models/message.dart
+++ b/refilc_kreta_api/lib/models/message.dart
@@ -198,7 +198,7 @@ class SendRecipientType {
 
   factory SendRecipientType.fromJson(Map json) {
     return SendRecipientType(
-      id: json['azonosito'] != '' ? int.parse(json['azonosito']) : 0,
+      id: json['azonosito'] != '' ? json['azonosito'] : 0,
       code: json['kod'],
       description: json['leiras'],
       name: json['nev'],
diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart
index ec28d96..18cd739 100644
--- a/refilc_mobile_ui/lib/pages/home/home_page.dart
+++ b/refilc_mobile_ui/lib/pages/home/home_page.dart
@@ -1,6 +1,7 @@
 // ignore_for_file: dead_code
 import 'dart:math';
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:refilc/api/providers/live_card_provider.dart';
 import 'package:refilc/theme/colors/colors.dart';
@@ -8,7 +9,7 @@ import 'package:refilc/ui/date_widget.dart';
 import 'package:refilc/utils/format.dart';
 import 'package:i18n_extension/i18n_extension.dart';
 import 'package:intl/intl.dart';
-import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
+import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
 import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:animated_list_plus/animated_list_plus.dart';
 import 'package:refilc/api/providers/update_provider.dart';
@@ -247,11 +248,17 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
                             ),
                             actions: [
                               Padding(
-                                padding: const EdgeInsets.symmetric(
-                                    horizontal: 8.0, vertical: 5.0),
+                                padding: const EdgeInsets.only(
+                                    left: 8.0, right: 8.0, bottom: 0.0),
                                 child: IconButton(
                                   splashRadius: 24.0,
                                   onPressed: () async {
+                                    Navigator.of(context, rootNavigator: true)
+                                        .push(
+                                      CupertinoPageRoute(
+                                          builder: (context) =>
+                                              const MessagesPage()),
+                                    );
                                     // Navigator.of(context, rootNavigator: true)
                                     //     .push(PageRouteBuilder(
                                     //   pageBuilder: (context, animation, secondaryAnimation) =>
@@ -264,11 +271,11 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
                                     //       [DeviceOrientation.portraitUp]);
                                     //   setSystemChrome(context);
                                     // });
-                                    SoonAlert.show(context: context);
+                                    // SoonAlert.show(context: context);
                                     // await showSendMessageSheet(context);
                                   },
                                   icon: Icon(
-                                    FeatherIcons.messageCircle,
+                                    FeatherIcons.messageSquare,
                                     color: AppColors.of(context).text,
                                   ),
                                 ),
diff --git a/refilc_mobile_ui/lib/pages/messages/messages_page.dart b/refilc_mobile_ui/lib/pages/messages/messages_page.dart
index 87c9b80..57bdf87 100644
--- a/refilc_mobile_ui/lib/pages/messages/messages_page.dart
+++ b/refilc_mobile_ui/lib/pages/messages/messages_page.dart
@@ -116,13 +116,24 @@ class MessagesPageState extends State<MessagesPage>
               automaticallyImplyLeading: false,
               shadowColor: Theme.of(context).shadowColor,
               title: Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: Text(
-                  "Messages".i18n,
-                  style: TextStyle(
-                      color: AppColors.of(context).text,
-                      fontSize: 32.0,
-                      fontWeight: FontWeight.bold),
+                padding: const EdgeInsets.only(left: 0.0),
+                child: Row(
+                  children: [
+                    BackButton(
+                      style: ButtonStyle(
+                        splashFactory: NoSplash.splashFactory,
+                        padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
+                            EdgeInsets.zero),
+                      ),
+                    ),
+                    Text(
+                      "Messages".i18n,
+                      style: TextStyle(
+                          color: AppColors.of(context).text,
+                          fontSize: 32.0,
+                          fontWeight: FontWeight.bold),
+                    ),
+                  ],
                 ),
               ),
               bottom: FilterBar(