Merge pull request #38 from onyx-lyon1/email_fixes

Email fixes
onyx-lyon1 · Jan 23, 2024 · 1721116 · 1721116
2 parents 069846c + 329ef86
commit 1721116
Show file tree

Hide file tree

Showing 21 changed files with 801 additions and 472 deletions.
diff --git a/apps/onyx/lib/l10n/app_ar.arb b/apps/onyx/lib/l10n/app_ar.arb
@@ -3,6 +3,7 @@
     "onyx": "الجزع",
     "initialization": "التهيئة",
     "yes": "نعم",
+    "no": "لا",
     "onyxSubTitle": "ل ليون 1",
     "authentication": "المصادقة",
     "privacy": "سرية",
@@ -82,7 +83,7 @@
     "to": "الى",
     "me": "موي",
     "mailSendPageErrorTitle": "يرجى ملء جميع الحقول بشكل صحيح",
-    "objects": "أشياء",
+    "subject": "موضوع",
     "reply": "إجابة",
     "mailServerConnection": "اتصال بخادم البريد",
     "mailServerConnectionError": "خطأ في تحميل البريد الإلكتروني",
@@ -206,5 +207,6 @@
     "unableToOpenLink": "من المستحيل فتح الرابط",
     "chooseLanguage": "اختر اللغة",
     "auto": "تلقائي",
-    "realyQuit": "حقيقة تريد الاستقالة؟"
+    "realyQuit": "حقيقة تريد الاستقالة؟",
+    "response": "استجابة"
 }
diff --git a/apps/onyx/lib/l10n/app_en.arb b/apps/onyx/lib/l10n/app_en.arb
@@ -12,6 +12,10 @@
     "@yes": {
         "description": "Yes"
     },
+    "no": "No",
+    "@no": {
+        "description": "No"
+    },
     "onyxSubTitle": "For Lyon 1",
     "@onyxSubTitle": {
         "description": "The subtitle under the name Onyx"
@@ -340,9 +344,9 @@
     "@mailSendPageErrorTitle": {
         "description": "Please fill all the fields correctly"
     },
-    "objects": "Objects",
-    "@objects": {
-        "description": "Objects"
+    "subject": "subject",
+    "@subject": {
+        "description": "subject"
     },
     "reply": "Reply",
     "@reply": {
@@ -982,5 +986,9 @@
     "realyQuit": "Do you really want to quit?",
     "@realyQuit": {
         "description": "Do you really want to quit?"
+    },
+    "response": "Response",
+    "@response": {
+        "description": "Response"
     }
 }
diff --git a/apps/onyx/lib/l10n/app_fr.arb b/apps/onyx/lib/l10n/app_fr.arb
@@ -3,6 +3,7 @@
     "onyx": "Onyx",
     "initialization": "Initialisation",
     "yes": "Oui",
+    "no": "Non",
     "onyxSubTitle": "Pour Lyon 1",
     "authentication": "Authentification",
     "privacy": "Confidentialité",
@@ -82,7 +83,7 @@
     "to": "À",
     "me": "Moi",
     "mailSendPageErrorTitle": "Veuillez remplir correctement tous les champs",
-    "objects": "Objets",
+    "subject": "Objets",
     "reply": "Réponse",
     "mailServerConnection": "Connexion au serveur de mail",
     "mailServerConnectionError": "Erreur de chargement des mails",
@@ -206,5 +207,6 @@
     "unableToOpenLink": "Impossible d''ouvrir le lien",
     "chooseLanguage": "Choisir la langue",
     "auto": "Automatique",
-    "realyQuit": "Voulez-vous vraiment quitter ?"
+    "realyQuit": "Voulez-vous vraiment quitter ?",
+    "response": "Réponse"
 }
diff --git a/apps/onyx/lib/l10n/app_ru.arb b/apps/onyx/lib/l10n/app_ru.arb
@@ -3,6 +3,7 @@
   "onyx": "Оникс",
   "initialization": "Инициализация",
   "yes": "Да",
+  "no": "Нет",
   "onyxSubTitle": "Для Лиона 1",
   "authentication": "Аутентификация",
   "privacy": "Конфиденциальность",
@@ -82,7 +83,7 @@
   "to": "Кому",
   "me": "Мне",
   "mailSendPageErrorTitle": "Пожалуйста, заполните все поля правильно",
-  "objects": "Объекты",
+  "subject": "Тема",
   "reply": "Ответить",
   "mailServerConnection": "Подключение к почтовому серверу",
   "mailServerConnectionError": "Ошибка подключения к почтовому серверу",
@@ -207,5 +208,6 @@
   "chooseLanguage": "Выберите язык",
   "auto": "Автоматически",
   "unflagedEmail": "Неотмеченное письмо: {subject}",
-  "realyQuit": "Вы действительно хотите бросить курить?"
+  "realyQuit": "Вы действительно хотите бросить курить?",
+  "response": "Ответ"
 }
diff --git a/apps/onyx/lib/screens/mails/mails_export.dart b/apps/onyx/lib/screens/mails/mails_export.dart
@@ -4,6 +4,7 @@ export 'pages/email_details_page.dart';
 export 'pages/email_send_page.dart';
 export 'pages/emails_page.dart';
 export 'states/email_cubit.dart';
+export 'states/email_send_cubit.dart';
 export 'widgets/details/email_content_widget.dart';
 export 'widgets/email_attachment_widget.dart';
 export 'widgets/email_bottom_nav_bar_icon.dart';
@@ -13,3 +14,4 @@ export 'widgets/email_widget.dart';
 export 'widgets/save_or_open_dialog_widget.dart';
 export 'widgets/send/email_send_attachment_widget.dart';
 export 'widgets/send/email_send_autocomplete_widget.dart';
+export 'widgets/send/email_send_bottom_bar_widget.dart';
diff --git a/apps/onyx/lib/screens/mails/pages/email_details_page.dart b/apps/onyx/lib/screens/mails/pages/email_details_page.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -96,63 +95,61 @@ class MailDetailsPage extends StatelessWidget {
                   SizedBox(
                     height: 1.h,
                   ),
+                  if (mail.attachments.isNotEmpty)
+                    Container(
+                      color: Theme.of(context).cardTheme.color,
+                      padding: EdgeInsets.all(1.h),
+                      height: 7.h,
+                      child: ListView.builder(
+                        scrollDirection: Axis.horizontal,
+                        itemCount: mail.attachments.length,
+                        itemBuilder: (context, index) {
+                          return Padding(
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 8.0),
+                            child: MailAttachmentWidget(
+                              fileName: mail.attachments[index],
+                              onTap: () async {
+                                //save data in a file and open it
+                                if (mail.attachmentsFiles
+                                    .where((element) => element.path
+                                        .contains(mail.attachments[1]))
+                                    .isEmpty) {
+                                  mail.attachmentsFiles.insert(
+                                      index,
+                                      await AttachmentLogic
+                                          .getAttachmentLocalPath(
+                                              email: mail,
+                                              mailClient: context
+                                                  .read<EmailCubit>()
+                                                  .mailClient!,
+                                              emailNumber: state.emailNumber,
+                                              fileName: mail.attachments[index],
+                                              folder: state.currentMailBox!,
+                                              appLocalizations:
+                                                  AppLocalizations.of(context)
+                                              ));
+                                }
+                                // ignore: use_build_context_synchronously
+                                showDialog(
+                                    context: context,
+                                    builder: (_) => SaveOrOpenDialogWidget(
+                                          filePath:
+                                              mail.attachmentsFiles[index].path,
+                                        ));
+                              },
+                            ),
+                          );
+                        },
+                      ),
+                    ),
                   Container(
                     color: Theme.of(context).cardTheme.color,
                     height: (mail.attachments.isNotEmpty) ? 57.h : 70.h,
                     width: 100.w,
                     padding: EdgeInsets.all(1.h),
                     child: MailContentWidget(mail: mail),
                   ),
-                  (mail.attachments.isNotEmpty)
-                      ? Container(
-                          color: Theme.of(context).cardTheme.color,
-                          padding: EdgeInsets.all(0.5.h),
-                          height: 12.h,
-                          width: 100.w,
-                          child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: mail.attachments.length,
-                            itemBuilder: (context, index) {
-                              return MailAttachmentWidget(
-                                fileName: mail.attachments[index],
-                                onTap: () async {
-                                  //save data in a file and open it
-                                  if (mail.attachmentsFiles
-                                      .where((element) => element.path
-                                          .contains(mail.attachments[index]))
-                                      .isEmpty) {
-                                    mail.attachmentsFiles.addAll(List.generate(
-                                        index -
-                                            mail.attachmentsFiles.length +
-                                            1,
-                                        (index) => File("")));
-                                    mail.attachmentsFiles[index] =
-                                        await AttachmentLogic
-                                            .getAttachmentLocalPath(
-                                      email: mail,
-                                      mailClient: context
-                                          .read<EmailCubit>()
-                                          .mailClient!,
-                                      emailNumber: state.emailNumber,
-                                      fileName: mail.attachments[index],
-                                      folder: state.currentMailBox!,
-                                      appLocalizations:
-                                          AppLocalizations.of(context),
-                                    );
-                                  }
-                                  // ignore: use_build_context_synchronously
-                                  showDialog(
-                                      context: context,
-                                      builder: (_) => SaveOrOpenDialogWidget(
-                                            filePath: mail
-                                                .attachmentsFiles[index].path,
-                                          ));
-                                },
-                              );
-                            },
-                          ),
-                        )
-                      : Container(),
                 ],
               ),
             ),