TF-933 Fill color text for query search advanced

This commit is contained in:
dab246
2022-09-16 13:51:06 +07:00
committed by Dat H. Pham
parent 17ececa2a0
commit 6d7edd1518
3 changed files with 20 additions and 5 deletions
@@ -55,8 +55,8 @@ mixin BaseEmailItemTile {
}
}
bool isSearchEnabled(SearchStatus state, SearchQuery? query) =>
state == SearchStatus.ACTIVE && query != null && query.value.isNotEmpty;
bool isSearchEnabled(SearchStatus state, bool advancedSearchActivated, SearchQuery? query) =>
(state == SearchStatus.ACTIVE || advancedSearchActivated) && query?.value.isNotEmpty == true;
FontWeight buildFontForReadEmail(PresentationEmail email) =>
!email.hasRead ? FontWeight.w600 : FontWeight.normal;
@@ -80,9 +80,10 @@ mixin BaseEmailItemTile {
PresentationEmail email,
PresentationMailbox? mailbox,
SearchStatus state,
bool advancedSearchActivated,
SearchQuery? query
) {
if (isSearchEnabled(state, query)) {
if (isSearchEnabled(state, advancedSearchActivated, query)) {
return RichTextBuilder(
informationSender(email, mailbox),
query?.value ?? '',
@@ -114,9 +115,10 @@ mixin BaseEmailItemTile {
Widget buildEmailTitle(
PresentationEmail email,
SearchStatus state,
bool advancedSearchActivated,
SearchQuery? query
) {
if (isSearchEnabled(state, query)) {
if (isSearchEnabled(state, advancedSearchActivated, query)) {
return RichTextBuilder(
email.getEmailTitle(),
query?.value ?? '',
@@ -147,9 +149,10 @@ mixin BaseEmailItemTile {
Widget buildEmailPartialContent(
PresentationEmail email,
SearchStatus state,
bool advancedSearchActivated,
SearchQuery? query
) {
if (isSearchEnabled(state, query)) {
if (isSearchEnabled(state, advancedSearchActivated, query)) {
return RichTextBuilder(
email.getPartialContent(),
query?.value ?? '',
@@ -80,6 +80,7 @@ class EmailTileBuilder with BaseEmailItemTile {
_presentationEmail,
mailboxCurrent,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
if (_presentationEmail.hasAttachment == true)
Padding(
@@ -103,6 +104,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailTitle(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
buildMailboxContain(
_searchStatus,
@@ -121,6 +123,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailPartialContent(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
])
),
@@ -136,6 +136,7 @@ class EmailTileBuilder with BaseEmailItemTile {
_presentationEmail,
mailboxCurrent,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
if (_presentationEmail.hasAttachment == true)
Padding(
@@ -157,6 +158,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailTitle(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
buildMailboxContain(
_searchStatus,
@@ -174,6 +176,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailPartialContent(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
]),
]),
@@ -229,6 +232,7 @@ class EmailTileBuilder with BaseEmailItemTile {
_presentationEmail,
mailboxCurrent,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
if (isHoverItem)
const SizedBox(width: 120)
@@ -242,6 +246,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailTitle(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
buildMailboxContain(
_searchStatus,
@@ -259,6 +264,7 @@ class EmailTileBuilder with BaseEmailItemTile {
Expanded(child: buildEmailPartialContent(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
]),
]),
@@ -347,6 +353,7 @@ class EmailTileBuilder with BaseEmailItemTile {
_presentationEmail,
mailboxCurrent,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
const SizedBox(width: 24),
Expanded(child: _buildSubjectAndContent()),
@@ -502,11 +509,13 @@ class EmailTileBuilder with BaseEmailItemTile {
child: buildEmailTitle(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery)),
Expanded(child: Container(
child: buildEmailPartialContent(
_presentationEmail,
_searchStatus,
advancedSearchActivated,
_searchQuery))
),
]);