Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hot fix some bug UI #2961

Open
wants to merge 3 commits into
base: refactor
Choose a base branch
from
Open

Hot fix some bug UI #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de56df1
Fix alignment receive time in email view
dab246 Sep 16, 2024
e750db0
Remove space when subject is empty or null
dab246 Jun 27, 2024
9646039
Replace `dart:ui` to `dart:ui_web` when `platformViewRegistry` in `da…
dab246 Sep 16, 2024
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
2 changes: 1 addition & 1 deletion core/lib/presentation/utils/shims/dart_ui_real.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

export 'dart:ui';
export 'dart:ui_web';
2 changes: 1 addition & 1 deletion lib/features/base/isolate/isolate_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

import 'dart:async';
import 'dart:isolate';
import 'dart:ui';

import 'package:core/presentation/utils/shims/dart_ui_real.dart';
import 'package:core/utils/app_logger.dart';

abstract class IsolateManager {
Expand Down
336 changes: 167 additions & 169 deletions lib/features/composer/presentation/widgets/recipient_composer_widget.dart
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions lib/features/email/presentation/widgets/email_subject_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ class EmailSubjectWidget extends StatelessWidget {

@override
Widget build(BuildContext context) {
if (presentationEmail.getEmailTitle().isEmpty) {
return const SizedBox.shrink();
}

return Padding(
padding: EmailSubjectStyles.padding,
child: Text(
Expand Down
66 changes: 35 additions & 31 deletions lib/features/email/presentation/widgets/information_sender_and_receiver_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,38 +58,42 @@ class InformationSenderAndReceiverBuilder extends StatelessWidget {
children: [
if (emailSelected.from?.isNotEmpty == true)
Row(children: [
Flexible(child: Transform(
transform: Matrix4.translationValues(-5.0, 0.0, 0.0),
child: EmailSenderBuilder(
emailAddress: emailSelected.from!.first,
openEmailAddressDetailAction: openEmailAddressDetailAction,
)
)),
if (sMimeStatus != null && sMimeStatus != SMimeSignatureStatus.notSigned)
Tooltip(
key: const Key('smime_signature_status_icon'),
message: sMimeStatus!.getTooltipMessage(context),
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: SvgPicture.asset(
sMimeStatus!.getIcon(imagePaths),
fit: BoxFit.fill,
Expanded(child: Row(
children: [
Flexible(child: Transform(
transform: Matrix4.translationValues(-5.0, 0.0, 0.0),
child: EmailSenderBuilder(
emailAddress: emailSelected.from!.first,
openEmailAddressDetailAction: openEmailAddressDetailAction,
)
)),
if (sMimeStatus != null && sMimeStatus != SMimeSignatureStatus.notSigned)
Tooltip(
key: const Key('smime_signature_status_icon'),
message: sMimeStatus!.getTooltipMessage(context),
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: SvgPicture.asset(
sMimeStatus!.getIcon(imagePaths),
fit: BoxFit.fill,
),
),
),
if (!emailSelected.isSubscribed && emailUnsubscribe != null && !responsiveUtils.isPortraitMobile(context))
TMailButtonWidget.fromText(
text: AppLocalizations.of(context).unsubscribe,
textStyle: const TextStyle(
fontWeight: FontWeight.normal,
fontSize: 14,
color: AppColor.colorTextBody,
decoration: TextDecoration.underline,
),
padding: const EdgeInsetsDirectional.symmetric(vertical: 5, horizontal: 8),
backgroundColor: Colors.transparent,
onTapActionCallback: () => onEmailActionClick?.call(emailSelected, EmailActionType.unsubscribe),
),
),
),
if (!emailSelected.isSubscribed && emailUnsubscribe != null && !responsiveUtils.isPortraitMobile(context))
TMailButtonWidget.fromText(
text: AppLocalizations.of(context).unsubscribe,
textStyle: const TextStyle(
fontWeight: FontWeight.normal,
fontSize: 14,
color: AppColor.colorTextBody,
decoration: TextDecoration.underline,
),
padding: const EdgeInsetsDirectional.symmetric(vertical: 5, horizontal: 8),
backgroundColor: Colors.transparent,
onTapActionCallback: () => onEmailActionClick?.call(emailSelected, EmailActionType.unsubscribe),
),
]
)),
ReceivedTimeBuilder(emailSelected: emailSelected),
]),
if (emailSelected.numberOfAllEmailAddress() > 0)
Expand Down
2 changes: 1 addition & 1 deletion test/features/rule_filter_creator/presentation/rule_filter_creator_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'package:core/data/network/config/dynamic_url_interceptors.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/app_toast.dart';
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/utils/shims/dart_ui_real.dart';
import 'package:core/utils/application_manager.dart';
import 'package:dartz/dartz.dart' hide State;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart' hide State;
import 'package:flutter_test/flutter_test.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
Expand Down
Loading