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 font mailbox on Arabic language #2029

Merged
merged 1 commit into from
Jul 12, 2023
Merged

[HOT] Fix font mailbox on Arabic language #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion core/lib/presentation/views/text/text_overflow_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

import 'package:core/presentation/extensions/string_extension.dart';
import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/utils/direction_utils.dart';
import 'package:flutter/material.dart';

class TextOverflowBuilder extends StatelessWidget {
Expand All @@ -26,7 +27,9 @@ class TextOverflowBuilder extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Text(
data.overflow,
DirectionUtils.isDirectionRTLByLanguage(context)
? data
: data.overflow,
style: style,
textAlign: textAlign,
softWrap: softWrap,
Expand Down
24 changes: 17 additions & 7 deletions lib/features/thread/presentation/mixin/base_email_item_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:core/presentation/utils/responsive_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/text_overflow_builder.dart';
import 'package:core/utils/direction_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
Expand Down Expand Up @@ -78,14 +79,17 @@ mixin BaseEmailItemTile {
}

Widget buildInformationSender(
PresentationEmail email,
PresentationMailbox? mailbox,
bool isSearchEmailRunning,
SearchQuery? query
BuildContext context,
PresentationEmail email,
PresentationMailbox? mailbox,
bool isSearchEmailRunning,
SearchQuery? query
) {
if (isSearchEnabled(isSearchEmailRunning, query)) {
return RichTextBuilder(
informationSender(email, mailbox).overflow,
DirectionUtils.isDirectionRTLByLanguage(context)
? informationSender(email, mailbox)
: informationSender(email, mailbox).overflow,
query?.value ?? '',
TextStyle(
fontSize: 15,
Expand All @@ -110,13 +114,16 @@ mixin BaseEmailItemTile {
}

Widget buildEmailTitle(
BuildContext context,
PresentationEmail email,
bool isSearchEmailRunning,
SearchQuery? query
) {
if (isSearchEnabled(isSearchEmailRunning, query)) {
return RichTextBuilder(
email.getEmailTitle().overflow,
DirectionUtils.isDirectionRTLByLanguage(context)
? email.getEmailTitle()
: email.getEmailTitle().overflow,
query?.value ?? '',
TextStyle(
fontSize: 13,
Expand All @@ -140,13 +147,16 @@ mixin BaseEmailItemTile {
}

Widget buildEmailPartialContent(
BuildContext context,
PresentationEmail email,
bool isSearchEmailRunning,
SearchQuery? query
) {
if (isSearchEnabled(isSearchEmailRunning, query)) {
return RichTextBuilder(
email.getPartialContent().overflow,
DirectionUtils.isDirectionRTLByLanguage(context)
? email.getPartialContent()
: email.getPartialContent().overflow,
query?.value ?? '',
const TextStyle(
fontSize: 13,
Expand Down
3 changes: 3 additions & 0 deletions lib/features/thread/presentation/widgets/email_tile_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class EmailTileBuilder with BaseEmailItemTile {
height: 9,
fit: BoxFit.fill)),
Expanded(child: buildInformationSender(
_context,
_presentationEmail,
mailboxContain,
isSearchEmailRunning,
Expand All @@ -107,6 +108,7 @@ class EmailTileBuilder with BaseEmailItemTile {
mainAxisSize: MainAxisSize.min,
children: [
Expanded(child: buildEmailTitle(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery)),
Expand All @@ -125,6 +127,7 @@ class EmailTileBuilder with BaseEmailItemTile {
padding: const EdgeInsetsDirectional.only(top: 6),
child: Row(children: [
Expanded(child: buildEmailPartialContent(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery)),
Expand Down
9 changes: 9 additions & 0 deletions lib/features/thread/presentation/widgets/email_tile_web_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ class EmailTileBuilder with BaseEmailItemTile {
height: 9,
fit: BoxFit.fill)),
Expanded(child: buildInformationSender(
_context,
_presentationEmail,
mailboxContain,
isSearchEmailRunning,
Expand All @@ -172,6 +173,7 @@ class EmailTileBuilder with BaseEmailItemTile {
mainAxisSize: MainAxisSize.min,
children: [
Expanded(child: buildEmailTitle(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
Expand All @@ -191,6 +193,7 @@ class EmailTileBuilder with BaseEmailItemTile {
const SizedBox(height: 8),
Row(children: [
Expanded(child: buildEmailPartialContent(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
Expand Down Expand Up @@ -243,6 +246,7 @@ class EmailTileBuilder with BaseEmailItemTile {
height: 9,
fit: BoxFit.fill)),
Expanded(child: buildInformationSender(
_context,
_presentationEmail,
mailboxContain,
isSearchEmailRunning,
Expand All @@ -258,6 +262,7 @@ class EmailTileBuilder with BaseEmailItemTile {
mainAxisSize: MainAxisSize.min,
children: [
Expanded(child: buildEmailTitle(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
Expand All @@ -277,6 +282,7 @@ class EmailTileBuilder with BaseEmailItemTile {
const SizedBox(height: 8),
Row(children: [
Expanded(child: buildEmailPartialContent(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
Expand Down Expand Up @@ -367,6 +373,7 @@ class EmailTileBuilder with BaseEmailItemTile {
SizedBox(
width: 160,
child: buildInformationSender(
_context,
_presentationEmail,
mailboxContain,
isSearchEmailRunning,
Expand Down Expand Up @@ -517,12 +524,14 @@ class EmailTileBuilder with BaseEmailItemTile {
constraints: BoxConstraints(maxWidth: constraints.maxWidth / 2),
padding: const EdgeInsetsDirectional.only(end: 12),
child: buildEmailTitle(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
)),
Expanded(child: Container(
child: buildEmailPartialContent(
_context,
_presentationEmail,
isSearchEmailRunning,
_searchQuery
Expand Down
Loading