Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/features/composer/presentation/composer_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:desktop_drop/desktop_drop.dart';
import 'package:dio/dio.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:file_picker/file_picker.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -835,7 +835,10 @@ class ComposerController extends BaseController
MessageDialogActionManager().showConfirmDialogAction(
context,
appLocalizations.message_dialog_send_email_exceeds_maximum_size(
filesize(mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0),
fileSize(
mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0,
round: 0,
),
),
appLocalizations.got_it,
title: appLocalizations.sending_failed,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/views/button/tmail_button_widget.dart';
import 'package:filesize/filesize.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:tmail_ui_user/features/composer/presentation/styles/attachment_header_composer_widget_style.dart';
import 'package:tmail_ui_user/features/upload/presentation/extensions/list_upload_file_state_extension.dart';
import 'package:tmail_ui_user/features/upload/presentation/model/upload_file_state.dart';
Expand Down Expand Up @@ -70,7 +70,7 @@ class AttachmentHeaderComposerWidget extends StatelessWidget {
),
padding: AttachmentHeaderComposerWidgetStyle.sizeLabelPadding,
child: Text(
filesize(listFileUploaded.totalSize),
fileSize(listFileUploaded.totalSize),
style: AttachmentHeaderComposerWidgetStyle.sizeLabelTextSize,
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/views/button/tmail_button_widget.dart';
import 'package:core/presentation/views/list/sliver_grid_delegate_fixed_height.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/features/composer/presentation/styles/attachment_item_composer_widget_style.dart';
Expand Down Expand Up @@ -78,7 +78,7 @@ class _MobileAttachmentComposerWidgetState extends State<MobileAttachmentCompose
return AttachmentItemComposerWidget(
fileIcon: file.getIcon(_imagePaths),
fileName: file.fileName,
fileSize: filesize(file.fileSize),
fileSize: fileSize(file.fileSize),
uploadStatus: file.uploadStatus,
percentUploading: file.percentUploading,
uploadTaskId: file.uploadTaskId,
Expand Down Expand Up @@ -141,7 +141,7 @@ class _MobileAttachmentComposerWidgetState extends State<MobileAttachmentCompose
return AttachmentItemComposerWidget(
fileIcon: file.getIcon(_imagePaths),
fileName: file.fileName,
fileSize: filesize(file.fileSize),
fileSize: fileSize(file.fileSize),
uploadStatus: file.uploadStatus,
percentUploading: file.percentUploading,
uploadTaskId: file.uploadTaskId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

import 'package:core/presentation/resources/image_paths.dart';
import 'package:filesize/filesize.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:tmail_ui_user/features/composer/presentation/styles/web/attachment_composer_widget_style.dart';
import 'package:tmail_ui_user/features/composer/presentation/widgets/attachment_item_composer_widget.dart';
import 'package:tmail_ui_user/features/composer/presentation/widgets/attachment_header_composer_widget.dart';
Expand Down Expand Up @@ -78,7 +78,7 @@ class _AttachmentComposerWidgetState extends State<AttachmentComposerWidget> {
.map((file) => AttachmentItemComposerWidget(
fileIcon: file.getIcon(_imagePaths),
fileName: file.fileName,
fileSize: filesize(file.fileSize),
fileSize: fileSize(file.fileSize),
uploadStatus: file.uploadStatus,
percentUploading: file.percentUploading,
uploadTaskId: file.uploadTaskId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'package:dartz/dartz.dart';
import 'package:dio/dio.dart';
import 'package:email_recovery/email_recovery/email_recovery_action.dart';
import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
Expand Down Expand Up @@ -477,7 +477,7 @@ class EmailDataSourceImpl extends EmailDataSource {
final previewAttachment = PreviewAttachment(
iconBase64Data: iconBase64Data,
name: attachment.name.escapeLtGtHtmlString(),
size: filesize(attachment.size?.value),
size: fileSize(attachment.size?.value),
link: attachment.hyperLink,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import 'package:dartz/dartz.dart';
import 'package:dio/dio.dart';
import 'package:email_recovery/email_recovery/email_recovery_action.dart';
import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
Expand Down Expand Up @@ -317,7 +317,7 @@ class EmailLocalStorageDataSourceImpl extends EmailDataSource {
final previewAttachment = PreviewAttachment(
iconBase64Data: iconBase64Data,
name: attachment.name.escapeLtGtHtmlString(),
size: filesize(attachment.size?.value),
size: fileSize(attachment.size?.value),
link: attachment.hyperLink,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:core/presentation/utils/html_transformer/transform_configuration
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/file_utils.dart';
import 'package:core/utils/print_utils.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:model/email/attachment.dart';
import 'package:tmail_ui_user/features/composer/presentation/model/draft_email_print.dart';
import 'package:tmail_ui_user/features/email/data/datasource/print_file_datasource.dart';
Expand Down Expand Up @@ -43,7 +43,7 @@ class PrintFileDataSourceImpl extends PrintFileDataSource {
final printAttachment = PrintAttachment(
iconBase64Data: iconBase64Data,
name: attachment.name.escapeLtGtHtmlString(),
size: filesize(attachment.size?.value)
size: fileSize(attachment.size?.value)
);
listPrintAttachment.add(printAttachment);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:core/presentation/utils/theme_utils.dart';
import 'package:core/presentation/views/button/tmail_button_widget.dart';
import 'package:core/presentation/views/container/tmail_container_widget.dart';
import 'package:core/presentation/views/text/middle_ellipsis_text.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
Expand Down Expand Up @@ -78,7 +78,7 @@ class AttachmentItemWidget extends StatelessWidget {
Padding(
padding: const EdgeInsetsDirectional.only(start: 8, end: 3),
child: Text(
filesize(attachment.size?.value),
fileSize(attachment.size?.value),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: ThemeUtils.textStyleM3LabelSmall,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:core/presentation/utils/theme_utils.dart';
import 'package:core/presentation/views/dialog/confirm_dialog_button.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/material.dart';
import 'package:model/email/attachment.dart';
import 'package:model/extensions/list_attachment_extension.dart';
Expand Down Expand Up @@ -54,7 +54,7 @@ class EmailAttachmentsWidget extends StatelessWidget {
final attachmentHeader = AttachmentsInfo(
imagePaths: imagePaths,
numberOfAttachments: attachments.length,
totalSizeInfo: filesize(attachments.totalSize, 1),
totalSizeInfo: fileSize(attachments.totalSize, round: 1),
responsiveUtils: responsiveUtils,
onTapShowAllAttachmentFile: onTapShowAllAttachmentFile,
onTapDownloadAllButton: showDownloadAllAttachmentsButton
Expand Down
14 changes: 10 additions & 4 deletions lib/features/quotas/domain/extensions/quota_extensions.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'package:core/presentation/extensions/color_extension.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/material.dart';
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
import 'package:jmap_dart_client/jmap/quotas/quota.dart';
Expand All @@ -10,15 +10,21 @@ extension QuotasExtensions on Quota {

UnsignedInt? get presentationHardLimit => hardLimit ?? limit;

String get usedStorageAsString => used != null ? filesize(used!.value) : '';
String get usedStorageAsString =>
used != null ? fileSize(used!.value, divider: 1000) : '';

String get hardLimitStorageAsString => presentationHardLimit != null ? filesize(presentationHardLimit!.value) : '';
String get hardLimitStorageAsString => presentationHardLimit != null
? fileSize(presentationHardLimit!.value, divider: 1000)
: '';

String get quotaAvailableStorageAsString {
if (used != null &&
presentationHardLimit != null &&
presentationHardLimit!.value > used!.value) {
return filesize(presentationHardLimit!.value - used!.value);
return fileSize(
presentationHardLimit!.value - used!.value,
divider: 1000,
);
}
return '0 B';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:core/presentation/state/success.dart';
import 'package:core/utils/app_logger.dart';
import 'package:dartz/dartz.dart';
import 'package:dio/dio.dart';
import 'package:filesize/filesize.dart';
import 'package:super_file_size/super_file_size.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
Expand Down Expand Up @@ -369,7 +369,10 @@ class UploadController extends BaseController {
}

void _showConfirmDialogWhenExceededMaxSizeAttachmentsPerEmail({required BuildContext context}) {
final maxSizeAttachmentsPerEmail = filesize(_mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0);
final maxSizeAttachmentsPerEmail = fileSize(
_mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0,
round: 0,
);
MessageDialogActionManager().showConfirmDialogAction(
context,
AppLocalizations.of(context).message_dialog_upload_attachments_exceeds_maximum_size(maxSizeAttachmentsPerEmail),
Expand Down
16 changes: 8 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -584,14 +584,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "10.2.0"
filesize:
dependency: "direct main"
description:
name: filesize
sha256: f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af
url: "https://pub.dev"
source: hosted
version: "2.0.1"
firebase_core:
dependency: "direct main"
description:
Expand Down Expand Up @@ -2063,6 +2055,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.0"
super_file_size:
dependency: "direct main"
description:
name: super_file_size
sha256: "809e1823f7eae4b869e147a7d3899d6a071ba39ab37af7cb95d2234ba1c58747"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
super_tag_editor:
dependency: "direct main"
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ dependencies:

collection: 1.19.0

filesize: 2.0.1
super_file_size: 1.0.0

uuid: 3.0.7

Expand Down
Loading