msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added notification channel on/off indicators

Browse Source
pull/187/head
M66B 4 years ago
parent d01369288d
commit 31c8117b34
5 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File

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

@ -19,6 +19,9 @@ package eu.faircode.email;
Copyright 2018-2020 by Marcel Bokhorst (M66B)
*/
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;
@ -36,6 +39,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@ -51,7 +55,9 @@ import static android.app.Activity.RESULT_OK;
public class FragmentOptionsNotifications extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
private Button btnManage;
private Button btnManageDefault;
private ImageView ivChannelDefault;
private Button btnManageService;
private ImageView ivChannelService;
private SwitchCompat swBackground;
private CheckBox cbNotifyActionTrash;
@ -112,7 +118,9 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
btnManage = view.findViewById(R.id.btnManage);
btnManageDefault = view.findViewById(R.id.btnManageDefault);
ivChannelDefault = view.findViewById(R.id.ivChannelDefault);
btnManageService = view.findViewById(R.id.btnManageService);
ivChannelService = view.findViewById(R.id.ivChannelService);
swBackground = view.findViewById(R.id.swBackground);
cbNotifyActionTrash = view.findViewById(R.id.cbNotifyActionTrash);
@ -181,6 +189,8 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
}
});
ivChannelDefault.setVisibility(View.GONE);
final Intent channelService = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
.putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName())
.putExtra(Settings.EXTRA_CHANNEL_ID, "service");
@ -193,6 +203,8 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
}
});
ivChannelService.setVisibility(View.GONE);
swBackground.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -409,6 +421,27 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
return view;
}
@Override
public void onResume() {
super.onResume();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager nm = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
NotificationChannel notification = nm.getNotificationChannel("notification");
if (notification != null) {
ivChannelDefault.setImageLevel(notification.getImportance() == NotificationManager.IMPORTANCE_NONE ? 0 : 1);
ivChannelDefault.setVisibility(View.VISIBLE);
}
NotificationChannel service = nm.getNotificationChannel("service");
if (service != null) {
ivChannelService.setImageLevel(service.getImportance() == NotificationManager.IMPORTANCE_NONE ? 0 : 1);
ivChannelService.setVisibility(View.VISIBLE);
}
}
}
@Override
public void onDestroyView() {
PreferenceManager.getDefaultSharedPreferences(getContext()).unregisterOnSharedPreferenceChangeListener(this);

9
app/src/main/res/drawable/off_on.xml
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/twotone_toggle_off_24"
android:maxLevel="0" />
<item
android:drawable="@drawable/twotone_toggle_on_24"
android:maxLevel="1" />
</level-list>

15
app/src/main/res/drawable/twotone_toggle_off_24.xml
Unescape View File

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M17,8H7c-2.21,0 -4,1.79 -4,4s1.79,4 4,4h10c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4zM7,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"
android:strokeAlpha="0.3"
android:fillAlpha="0.3"/>
<path
android:fillColor="@android:color/white"
android:pathData="M17,6L7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6h10c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6zM17,16L7,16c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h10c2.21,0 4,1.79 4,4s-1.79,4 -4,4zM7,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector>

15
app/src/main/res/drawable/twotone_toggle_on_24.xml
Unescape View File

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M17,8L7,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4h10c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4zM17,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"
android:strokeAlpha="0.3"
android:fillAlpha="0.3"/>
<path
android:fillColor="@android:color/white"
android:pathData="M17,6L7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6h10c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6zM17,16L7,16c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h10c2.21,0 4,1.79 4,4s-1.79,4 -4,4zM17,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector>

20
app/src/main/res/layout/fragment_options_notifications.xml
Unescape View File

@ -61,6 +61,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvManageHint" />
<ImageView
android:id="@+id/ivChannelDefault"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="@+id/btnManageDefault"
app:layout_constraintStart_toEndOf="@+id/btnManageDefault"
app:layout_constraintTop_toTopOf="@+id/btnManageDefault"
app:srcCompat="@drawable/off_on" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvManageDefaultHint"
android:layout_width="0dp"
@ -83,6 +93,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvManageDefaultHint" />
<ImageView
android:id="@+id/ivChannelService"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="@+id/btnManageService"
app:layout_constraintStart_toEndOf="@+id/btnManageService"
app:layout_constraintTop_toTopOf="@+id/btnManageService"
app:srcCompat="@drawable/off_on" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvManageServiceHint"
android:layout_width="0dp"

Write Preview
Loading…
Cancel
Save