diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index 2f75fd27b3..426e504533 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -19,12 +19,15 @@ package eu.faircode.email; Copyright 2018-2021 by Marcel Bokhorst (M66B) */ +import static android.app.Activity.RESULT_OK; + import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.graphics.Paint; import android.media.RingtoneManager; import android.net.Uri; import android.os.Build; @@ -50,8 +53,6 @@ import androidx.constraintlayout.widget.Group; import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceManager; -import static android.app.Activity.RESULT_OK; - public class FragmentOptionsNotifications extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { private Button btnManage; private Button btnManageDefault; @@ -59,6 +60,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private Button btnManageService; private ImageView ivChannelService; private ImageButton ibWhy; + private FixedTextView tvNotifySeparate; private SwitchCompat swNewestFirst; private SwitchCompat swBackground; @@ -136,6 +138,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared btnManageService = view.findViewById(R.id.btnManageService); ivChannelService = view.findViewById(R.id.ivChannelService); ibWhy = view.findViewById(R.id.ibWhy); + tvNotifySeparate = view.findViewById(R.id.tvNotifySeparate); swNewestFirst = view.findViewById(R.id.swNewestFirst); swBackground = view.findViewById(R.id.swBackground); @@ -236,6 +239,14 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared } }); + tvNotifySeparate.setPaintFlags(tvNotifySeparate.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); + tvNotifySeparate.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Helper.viewFAQ(view.getContext(), 145); + } + }); + swNewestFirst.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml index 793ef5c914..332f4e8b19 100644 --- a/app/src/main/res/layout/fragment_options_notifications.xml +++ b/app/src/main/res/layout/fragment_options_notifications.xml @@ -165,6 +165,20 @@ app:layout_constraintTop_toBottomOf="@+id/tvManageServiceHint" app:srcCompat="@drawable/twotone_info_24" /> + + Tap on the channel name to set the channel properties To set the default sound, etc To disable the \'monitoring\' notification + How do I configure notifications for accounts, folders and senders? For wearables that can show the full text (up to 5,000 characters) This delays showing of notifications until the message text has been downloaded Notifications are only sent to a wearable after the message text has been downloaded @@ -992,7 +993,7 @@ Save raw message file To forward messages, the raw (original) messages need to be downloaded from the server. This requires an internet connection. - This can prevented by enabling always downloading raw message files in the connection settings + This can be prevented by enabling always downloading raw message files in the connection settings Raw messages downloaded: %1$s Select buttons