mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00
Code Issues Releases Wiki Activity

Added inbox sub folder hint

Browse source
This commit is contained in:
M66B 2020-05-21 13:17:42 +02:00
parent 01c841f63d
commit 3b1e1b5ccd
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentFolder.java
View file

@ -74,6 +74,7 @@ public class FragmentFolder extends FragmentBase {
private CheckBox cbAutoDelete;
private Button btnSave;
private ContentLoadingProgressBar pbSave;
private TextView tvInboxRootHint;
private ContentLoadingProgressBar pbWait;
private Group grpParent;
private Group grpPoll;
@ -130,6 +131,7 @@ public class FragmentFolder extends FragmentBase {
cbAutoDelete = view.findViewById(R.id.cbAutoDelete);
btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave);
tvInboxRootHint = view.findViewById(R.id.tvInboxRootHint);
pbWait = view.findViewById(R.id.pbWait);
grpParent = view.findViewById(R.id.grpParent);
grpPoll = view.findViewById(R.id.grpPoll);
@ -209,6 +211,7 @@ public class FragmentFolder extends FragmentBase {
grpAutoDelete.setVisibility(View.GONE);
btnSave.setEnabled(false);
pbSave.setVisibility(View.GONE);
tvInboxRootHint.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
return view;
@ -269,6 +272,8 @@ public class FragmentFolder extends FragmentBase {
cbAutoDelete.setChecked(folder != null && folder.auto_delete);
grpAutoDelete.setVisibility(View.VISIBLE);
}
tvInboxRootHint.setVisibility(folder == null && parent == null ? View.VISIBLE : View.GONE);
}
// Consider previous save as cancelled

14
app/src/main/res/layout/fragment_folder.xml
View file

@ -300,7 +300,7 @@
android:text="@string/title_auto_delete_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toStartOf="@+id/btnInfo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbAutoDelete" />
@ -325,6 +325,18 @@
app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnSave" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvInboxRootHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_inbox_root_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSave" />
<eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"

4
app/src/main/res/values/strings.xml
View file

@ -675,6 +675,10 @@
<string name="title_auto_trash">Automatically move old messages to trash</string>
<string name="title_auto_delete">Automatically permanently delete old messages</string>
<string name="title_auto_delete_hint">Old messages are messages that are no longer kept on the device</string>
<string name="title_inbox_root_hint">
Some providers require new folders to be created below the inbox.
In this case, you can long press the inbox in the folder list and select \'Create sub folder\'.
</string>
<string name="title_folder_name_missing">Folder name missing</string>
<string name="title_folder_exists">Folder %1$s exists</string>
<string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>