mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added text search remark

This commit is contained in:
M66B 2021-08-07 12:22:41 +02:00
parent 5db96d8242
commit 7c224b4119
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
View File

@ -102,6 +102,7 @@ public class FragmentDialogSearch extends FragmentDialogBase {
final CheckBox cbSubject = dview.findViewById(R.id.cbSubject);
final CheckBox cbKeywords = dview.findViewById(R.id.cbKeywords);
final CheckBox cbMessage = dview.findViewById(R.id.cbMessage);
final TextView tvSearchTextUnsupported = dview.findViewById(R.id.tvSearchTextUnsupported);
final CheckBox cbNotes = dview.findViewById(R.id.cbNotes);
final CheckBox cbHeaders = dview.findViewById(R.id.cbHeaders);
final CheckBox cbHtml = dview.findViewById(R.id.cbHtml);
@ -354,6 +355,8 @@ public class FragmentDialogSearch extends FragmentDialogBase {
cbSubject.setChecked(last_search_subject);
cbKeywords.setChecked(last_search_keywords);
cbMessage.setChecked(last_search_message);
tvSearchTextUnsupported.setText(getString(R.string.title_search_text_unsupported,
"full text search not supported"));
cbNotes.setChecked(last_search_notes);
tvAfter.setText(null);
tvBefore.setText(null);

16
app/src/main/res/layout/dialog_search.xml
View File

@ -319,6 +319,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbMessage" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSearchTextUnsupported"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_search_text_unsupported"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSearchTextHint" />
<CheckBox
android:id="@+id/cbNotes"
android:layout_width="0dp"
@ -329,7 +341,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSearchTextHint" />
app:layout_constraintTop_toBottomOf="@id/tvSearchTextUnsupported" />
<CheckBox
android:id="@+id/cbHeaders"
@ -528,7 +540,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="
cbSearchIndex,tvSearchIndexHint,cbSenders,cbRecipients,cbSubject,cbKeywords,cbMessage,tvSearchTextHint,cbNotes,
cbSearchIndex,tvSearchIndexHint,cbSenders,cbRecipients,cbSubject,cbKeywords,cbMessage,tvSearchTextHint,tvSearchTextUnsupported,cbNotes,
tvAnd,cbUnseen,cbFlagged,cbHidden,cbEncrypted,cbAttachments,
btnAfter,btnBefore,tvBefore,tvAfter" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values/strings.xml
View File

@ -1250,6 +1250,7 @@
The options below are to continue searching the email server.
</string>
<string name="title_search_text_hint">Searching for text in messages, when there are a large number of messages, might not work on some servers</string>
<string name="title_search_text_unsupported">\'%s\' means that the mail server doesn\'t support searching in message texts</string>
<string name="title_search_size_hint">Searching for messages by size, when there are a large number of messages, might not work on some servers</string>
<string name="title_search_more">More options</string>
<string name="title_search_use_index">Use search index</string>