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

Moved background service option to advanced

This commit is contained in:
M66B 2022-06-08 07:25:23 +02:00
parent b9d85c327c
commit 17ba33158e
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
private final static String[] RESET_OPTIONS = new String[]{
"notify_newest_first",
"background_service",
"notify_trash", "notify_junk", "notify_block_sender", "notify_archive", "notify_move",
"notify_reply", "notify_reply_direct",
"notify_flag", "notify_seen", "notify_hide", "notify_snooze",
@ -126,7 +125,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
"wearable_preview",
"notify_messaging",
"biometrics_notify",
"alert_once"
"background_service", "alert_once"
};
@Override

52
app/src/main/res/layout/fragment_options_notifications.xml
View File

@ -212,30 +212,6 @@
app:layout_constraintTop_toBottomOf="@id/tvNotifySeparate"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swBackground"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_notifications_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swNewestFirst"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvBackgroundHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_notifications_background_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swBackground" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNotifyActions"
android:layout_width="0dp"
@ -247,7 +223,7 @@
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBackgroundHint" />
app:layout_constraintTop_toBottomOf="@id/swNewestFirst" />
<CheckBox
android:id="@+id/cbNotifyActionTrash"
@ -791,6 +767,30 @@
app:layout_constraintTop_toBottomOf="@id/ibCar"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swBackground"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_notifications_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swBiometricsNotify"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvBackgroundHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_notifications_background_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swBackground" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swAlertOnce"
android:layout_width="0dp"
@ -799,7 +799,7 @@
android:text="@string/title_advanced_alert_once"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swBiometricsNotify"
app:layout_constraintTop_toBottomOf="@id/tvBackgroundHint"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView

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

@ -607,8 +607,6 @@
<string name="title_advanced_notifications_default">Default channel</string>
<string name="title_advanced_notifications_service">Monitoring channel</string>
<string name="title_advanced_notifications_newest_first">Show newest notifications first</string>
<string name="title_advanced_notifications_background">Use background service to synchronize messages</string>
<string name="title_advanced_notifications_background_hint">A background service can be stopped by Android at any time, but doesn\'t require a status bar notification</string>
<string name="title_advanced_badge">Show launcher icon with number of new messages</string>
<string name="title_advanced_unseen_ignored">Let the number of new messages match the number of notifications</string>
@ -640,6 +638,8 @@
<string name="title_advanced_light">Use notification light</string>
<string name="title_advanced_sound">Select notification sound</string>
<string name="title_advanced_notify_screen_on">Briefly turn on the screen for new message notifications</string>
<string name="title_advanced_notifications_background">Use background service to synchronize messages</string>
<string name="title_advanced_notifications_background_hint">A background service can be stopped by Android at any time, but doesn\'t require a status bar notification</string>
<string name="title_advanced_alert_once" translatable="false">MIUI notification sound workaround</string>
<string name="title_advanced_caption_pgp" translatable="false">PGP</string>