Hot fix font mailbox on arabic language
(cherry picked from commit 6fc90babffb7e87e0d30038fca1f2afa59f538c2)
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
import 'package:core/presentation/extensions/string_extension.dart';
|
import 'package:core/presentation/extensions/string_extension.dart';
|
||||||
import 'package:core/presentation/utils/style_utils.dart';
|
import 'package:core/presentation/utils/style_utils.dart';
|
||||||
|
import 'package:core/utils/direction_utils.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class TextOverflowBuilder extends StatelessWidget {
|
class TextOverflowBuilder extends StatelessWidget {
|
||||||
@@ -26,7 +27,9 @@ class TextOverflowBuilder extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Text(
|
return Text(
|
||||||
data.overflow,
|
DirectionUtils.isDirectionRTLByLanguage(context)
|
||||||
|
? data
|
||||||
|
: data.overflow,
|
||||||
style: style,
|
style: style,
|
||||||
textAlign: textAlign,
|
textAlign: textAlign,
|
||||||
softWrap: softWrap,
|
softWrap: softWrap,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import 'package:core/presentation/utils/responsive_utils.dart';
|
|||||||
import 'package:core/presentation/utils/style_utils.dart';
|
import 'package:core/presentation/utils/style_utils.dart';
|
||||||
import 'package:core/presentation/views/text/rich_text_builder.dart';
|
import 'package:core/presentation/views/text/rich_text_builder.dart';
|
||||||
import 'package:core/presentation/views/text/text_overflow_builder.dart';
|
import 'package:core/presentation/views/text/text_overflow_builder.dart';
|
||||||
|
import 'package:core/utils/direction_utils.dart';
|
||||||
import 'package:core/utils/platform_info.dart';
|
import 'package:core/utils/platform_info.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
@@ -78,14 +79,17 @@ mixin BaseEmailItemTile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget buildInformationSender(
|
Widget buildInformationSender(
|
||||||
PresentationEmail email,
|
BuildContext context,
|
||||||
PresentationMailbox? mailbox,
|
PresentationEmail email,
|
||||||
bool isSearchEmailRunning,
|
PresentationMailbox? mailbox,
|
||||||
SearchQuery? query
|
bool isSearchEmailRunning,
|
||||||
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
informationSender(email, mailbox).overflow,
|
DirectionUtils.isDirectionRTLByLanguage(context)
|
||||||
|
? informationSender(email, mailbox)
|
||||||
|
: informationSender(email, mailbox).overflow,
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
TextStyle(
|
TextStyle(
|
||||||
fontSize: 15,
|
fontSize: 15,
|
||||||
@@ -110,13 +114,16 @@ mixin BaseEmailItemTile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget buildEmailTitle(
|
Widget buildEmailTitle(
|
||||||
|
BuildContext context,
|
||||||
PresentationEmail email,
|
PresentationEmail email,
|
||||||
bool isSearchEmailRunning,
|
bool isSearchEmailRunning,
|
||||||
SearchQuery? query
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
email.getEmailTitle().overflow,
|
DirectionUtils.isDirectionRTLByLanguage(context)
|
||||||
|
? email.getEmailTitle()
|
||||||
|
: email.getEmailTitle().overflow,
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
TextStyle(
|
TextStyle(
|
||||||
fontSize: 13,
|
fontSize: 13,
|
||||||
@@ -140,13 +147,16 @@ mixin BaseEmailItemTile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget buildEmailPartialContent(
|
Widget buildEmailPartialContent(
|
||||||
|
BuildContext context,
|
||||||
PresentationEmail email,
|
PresentationEmail email,
|
||||||
bool isSearchEmailRunning,
|
bool isSearchEmailRunning,
|
||||||
SearchQuery? query
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
if (isSearchEnabled(isSearchEmailRunning, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
email.getPartialContent().overflow,
|
DirectionUtils.isDirectionRTLByLanguage(context)
|
||||||
|
? email.getPartialContent()
|
||||||
|
: email.getPartialContent().overflow,
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
const TextStyle(
|
const TextStyle(
|
||||||
fontSize: 13,
|
fontSize: 13,
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
height: 9,
|
height: 9,
|
||||||
fit: BoxFit.fill)),
|
fit: BoxFit.fill)),
|
||||||
Expanded(child: buildInformationSender(
|
Expanded(child: buildInformationSender(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxContain,
|
mailboxContain,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
@@ -107,6 +108,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
@@ -125,6 +127,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
padding: const EdgeInsetsDirectional.only(top: 6),
|
padding: const EdgeInsetsDirectional.only(top: 6),
|
||||||
child: Row(children: [
|
child: Row(children: [
|
||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
|
|||||||
@@ -148,6 +148,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
height: 9,
|
height: 9,
|
||||||
fit: BoxFit.fill)),
|
fit: BoxFit.fill)),
|
||||||
Expanded(child: buildInformationSender(
|
Expanded(child: buildInformationSender(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxContain,
|
mailboxContain,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
@@ -172,6 +173,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
@@ -191,6 +193,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
Row(children: [
|
Row(children: [
|
||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
@@ -243,6 +246,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
height: 9,
|
height: 9,
|
||||||
fit: BoxFit.fill)),
|
fit: BoxFit.fill)),
|
||||||
Expanded(child: buildInformationSender(
|
Expanded(child: buildInformationSender(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxContain,
|
mailboxContain,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
@@ -258,6 +262,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
@@ -277,6 +282,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
Row(children: [
|
Row(children: [
|
||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
@@ -367,6 +373,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
SizedBox(
|
SizedBox(
|
||||||
width: 160,
|
width: 160,
|
||||||
child: buildInformationSender(
|
child: buildInformationSender(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxContain,
|
mailboxContain,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
@@ -517,12 +524,14 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2),
|
constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2),
|
||||||
padding: const EdgeInsetsDirectional.only(end: 12),
|
padding: const EdgeInsetsDirectional.only(end: 12),
|
||||||
child: buildEmailTitle(
|
child: buildEmailTitle(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
)),
|
)),
|
||||||
Expanded(child: Container(
|
Expanded(child: Container(
|
||||||
child: buildEmailPartialContent(
|
child: buildEmailPartialContent(
|
||||||
|
_context,
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
isSearchEmailRunning,
|
isSearchEmailRunning,
|
||||||
_searchQuery
|
_searchQuery
|
||||||
|
|||||||
Reference in New Issue
Block a user