TF-933 Fill color text for query search advanced
This commit is contained in:
@@ -55,8 +55,8 @@ mixin BaseEmailItemTile {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isSearchEnabled(SearchStatus state, SearchQuery? query) =>
|
bool isSearchEnabled(SearchStatus state, bool advancedSearchActivated, SearchQuery? query) =>
|
||||||
state == SearchStatus.ACTIVE && query != null && query.value.isNotEmpty;
|
(state == SearchStatus.ACTIVE || advancedSearchActivated) && query?.value.isNotEmpty == true;
|
||||||
|
|
||||||
FontWeight buildFontForReadEmail(PresentationEmail email) =>
|
FontWeight buildFontForReadEmail(PresentationEmail email) =>
|
||||||
!email.hasRead ? FontWeight.w600 : FontWeight.normal;
|
!email.hasRead ? FontWeight.w600 : FontWeight.normal;
|
||||||
@@ -80,9 +80,10 @@ mixin BaseEmailItemTile {
|
|||||||
PresentationEmail email,
|
PresentationEmail email,
|
||||||
PresentationMailbox? mailbox,
|
PresentationMailbox? mailbox,
|
||||||
SearchStatus state,
|
SearchStatus state,
|
||||||
|
bool advancedSearchActivated,
|
||||||
SearchQuery? query
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(state, query)) {
|
if (isSearchEnabled(state, advancedSearchActivated, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
informationSender(email, mailbox),
|
informationSender(email, mailbox),
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
@@ -114,9 +115,10 @@ mixin BaseEmailItemTile {
|
|||||||
Widget buildEmailTitle(
|
Widget buildEmailTitle(
|
||||||
PresentationEmail email,
|
PresentationEmail email,
|
||||||
SearchStatus state,
|
SearchStatus state,
|
||||||
|
bool advancedSearchActivated,
|
||||||
SearchQuery? query
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(state, query)) {
|
if (isSearchEnabled(state, advancedSearchActivated, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
email.getEmailTitle(),
|
email.getEmailTitle(),
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
@@ -147,9 +149,10 @@ mixin BaseEmailItemTile {
|
|||||||
Widget buildEmailPartialContent(
|
Widget buildEmailPartialContent(
|
||||||
PresentationEmail email,
|
PresentationEmail email,
|
||||||
SearchStatus state,
|
SearchStatus state,
|
||||||
|
bool advancedSearchActivated,
|
||||||
SearchQuery? query
|
SearchQuery? query
|
||||||
) {
|
) {
|
||||||
if (isSearchEnabled(state, query)) {
|
if (isSearchEnabled(state, advancedSearchActivated, query)) {
|
||||||
return RichTextBuilder(
|
return RichTextBuilder(
|
||||||
email.getPartialContent(),
|
email.getPartialContent(),
|
||||||
query?.value ?? '',
|
query?.value ?? '',
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxCurrent,
|
mailboxCurrent,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
if (_presentationEmail.hasAttachment == true)
|
if (_presentationEmail.hasAttachment == true)
|
||||||
Padding(
|
Padding(
|
||||||
@@ -103,6 +104,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
buildMailboxContain(
|
buildMailboxContain(
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
@@ -121,6 +123,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
])
|
])
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxCurrent,
|
mailboxCurrent,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
if (_presentationEmail.hasAttachment == true)
|
if (_presentationEmail.hasAttachment == true)
|
||||||
Padding(
|
Padding(
|
||||||
@@ -157,6 +158,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
buildMailboxContain(
|
buildMailboxContain(
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
@@ -174,6 +176,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
@@ -229,6 +232,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxCurrent,
|
mailboxCurrent,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
if (isHoverItem)
|
if (isHoverItem)
|
||||||
const SizedBox(width: 120)
|
const SizedBox(width: 120)
|
||||||
@@ -242,6 +246,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailTitle(
|
Expanded(child: buildEmailTitle(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
buildMailboxContain(
|
buildMailboxContain(
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
@@ -259,6 +264,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
Expanded(child: buildEmailPartialContent(
|
Expanded(child: buildEmailPartialContent(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
@@ -347,6 +353,7 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
mailboxCurrent,
|
mailboxCurrent,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
const SizedBox(width: 24),
|
const SizedBox(width: 24),
|
||||||
Expanded(child: _buildSubjectAndContent()),
|
Expanded(child: _buildSubjectAndContent()),
|
||||||
@@ -502,11 +509,13 @@ class EmailTileBuilder with BaseEmailItemTile {
|
|||||||
child: buildEmailTitle(
|
child: buildEmailTitle(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery)),
|
_searchQuery)),
|
||||||
Expanded(child: Container(
|
Expanded(child: Container(
|
||||||
child: buildEmailPartialContent(
|
child: buildEmailPartialContent(
|
||||||
_presentationEmail,
|
_presentationEmail,
|
||||||
_searchStatus,
|
_searchStatus,
|
||||||
|
advancedSearchActivated,
|
||||||
_searchQuery))
|
_searchQuery))
|
||||||
),
|
),
|
||||||
]);
|
]);
|
||||||
|
|||||||
Reference in New Issue
Block a user