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

Added normal importance quick action

This commit is contained in:
M66B 2023-01-07 13:20:36 +01:00
parent 405a55b511
commit 92dfd5f4e3
4 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -307,6 +307,7 @@ public class FragmentMessages extends FragmentBase
private ImageButton ibBatchFlag;
private ImageButton ibBatchFlagColor;
private ImageButton ibLowImportance;
private ImageButton ibNormalImportance;
private ImageButton ibHighImportance;
private ImageButton ibInbox;
private ImageButton ibArchive;
@ -604,6 +605,7 @@ public class FragmentMessages extends FragmentBase
ibBatchFlag = view.findViewById(R.id.ibBatchFlag);
ibBatchFlagColor = view.findViewById(R.id.ibBatchFlagColor);
ibLowImportance = view.findViewById(R.id.ibLowImportance);
ibNormalImportance = view.findViewById(R.id.ibNormalImportance);
ibHighImportance = view.findViewById(R.id.ibHighImportance);
ibInbox = view.findViewById(R.id.ibInbox);
ibArchive = view.findViewById(R.id.ibArchive);
@ -1512,6 +1514,14 @@ public class FragmentMessages extends FragmentBase
}
});
ibNormalImportance.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
boolean more_clear = prefs.getBoolean("more_clear", true);
onActionSetImportanceSelection(EntityMessage.PRIORITIY_NORMAL, more_clear);
}
});
ibHighImportance.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -6272,6 +6282,7 @@ public class FragmentMessages extends FragmentBase
boolean more_flag = prefs.getBoolean("more_flag", false);
boolean more_flag_color = prefs.getBoolean("more_flag_color", false);
boolean more_importance_high = prefs.getBoolean("more_importance_high", false);
boolean more_importance_normal = prefs.getBoolean("more_importance_normal", false);
boolean more_importance_low = prefs.getBoolean("more_importance_low", false);
boolean more_inbox = prefs.getBoolean("more_inbox", true);
boolean more_archive = prefs.getBoolean("more_archive", true);
@ -6320,6 +6331,11 @@ public class FragmentMessages extends FragmentBase
if (importance_high)
count++;
boolean importance_normal = (more_importance_normal && count < MAX_QUICK_ACTIONS &&
!EntityMessage.PRIORITIY_NORMAL.equals(result.importance));
if (importance_normal)
count++;
boolean importance_low = (more_importance_low && count < MAX_QUICK_ACTIONS &&
!EntityMessage.PRIORITIY_LOW.equals(result.importance));
if (importance_low)
@ -6358,6 +6374,7 @@ public class FragmentMessages extends FragmentBase
ibBatchFlag.setVisibility(flag ? View.VISIBLE : View.GONE);
ibBatchFlagColor.setVisibility(flag_color ? View.VISIBLE : View.GONE);
ibLowImportance.setVisibility(importance_low ? View.VISIBLE : View.GONE);
ibNormalImportance.setVisibility(importance_normal ? View.VISIBLE : View.GONE);
ibHighImportance.setVisibility(importance_high ? View.VISIBLE : View.GONE);
ibInbox.setVisibility(inbox ? View.VISIBLE : View.GONE);
ibArchive.setVisibility(archive ? View.VISIBLE : View.GONE);
@ -10935,6 +10952,7 @@ public class FragmentMessages extends FragmentBase
final CheckBox cbFlag = dview.findViewById(R.id.cbFlag);
final CheckBox cbFlagColor = dview.findViewById(R.id.cbFlagColor);
final CheckBox cbImportanceLow = dview.findViewById(R.id.cbImportanceLow);
final CheckBox cbImportanceNormal = dview.findViewById(R.id.cbImportanceNormal);
final CheckBox cbImportanceHigh = dview.findViewById(R.id.cbImportanceHigh);
final CheckBox cbInbox = dview.findViewById(R.id.cbInbox);
final CheckBox cbArchive = dview.findViewById(R.id.cbArchive);
@ -10952,6 +10970,7 @@ public class FragmentMessages extends FragmentBase
cbFlag.setChecked(prefs.getBoolean("more_flag", false));
cbFlagColor.setChecked(prefs.getBoolean("more_flag_color", false));
cbImportanceLow.setChecked(prefs.getBoolean("more_importance_low", false));
cbImportanceNormal.setChecked(prefs.getBoolean("more_importance_normal", false));
cbImportanceHigh.setChecked(prefs.getBoolean("more_importance_high", false));
cbInbox.setChecked(prefs.getBoolean("more_inbox", true));
cbArchive.setChecked(prefs.getBoolean("more_archive", true));
@ -10974,6 +10993,7 @@ public class FragmentMessages extends FragmentBase
editor.putBoolean("more_flag", cbFlag.isChecked());
editor.putBoolean("more_flag_color", cbFlagColor.isChecked());
editor.putBoolean("more_importance_low", cbImportanceLow.isChecked());
editor.putBoolean("more_importance_normal", cbImportanceNormal.isChecked());
editor.putBoolean("more_importance_high", cbImportanceHigh.isChecked());
editor.putBoolean("more_inbox", cbInbox.isChecked());
editor.putBoolean("more_archive", cbArchive.isChecked());

15
app/src/main/res/layout/dialog_quick_actions.xml
View File

@ -122,6 +122,19 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbFlagColor" />
<CheckBox
android:id="@+id/cbImportanceNormal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:drawableEnd="@drawable/twotone_horizontal_rule_24"
android:drawablePadding="6dp"
android:text="@string/title_quick_actions_normal"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbImportanceLow" />
<CheckBox
android:id="@+id/cbImportanceHigh"
android:layout_width="0dp"
@ -133,7 +146,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbImportanceLow" />
app:layout_constraintTop_toBottomOf="@id/cbImportanceNormal" />
<CheckBox
android:id="@+id/cbInbox"

17
app/src/main/res/layout/fragment_messages.xml
View File

@ -653,6 +653,21 @@
app:srcCompat="@drawable/baseline_arrow_downward_24"
app:tint="@color/action_foreground" />
<ImageButton
android:id="@+id/ibNormalImportance"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_importance_normal"
android:padding="6dp"
android:scaleType="fitCenter"
android:tooltipText="@string/title_importance_normal"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@id/ibLowImportance"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/twotone_horizontal_rule_24"
app:tint="@color/action_foreground" />
<ImageButton
android:id="@+id/ibHighImportance"
android:layout_width="48dp"
@ -663,7 +678,7 @@
android:scaleType="fitCenter"
android:tooltipText="@string/title_importance_high"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/ibLowImportance"
app:layout_constraintEnd_toStartOf="@+id/ibNormalImportance"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/baseline_arrow_upward_24"
app:tint="@color/action_foreground" />

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

@ -1300,6 +1300,7 @@
<string name="title_quick_actions">Select actions</string>
<string name="title_quick_actions_hint">Up to %1$d actions will be shown</string>
<string name="title_quick_actions_low">Low importance</string>
<string name="title_quick_actions_normal">Normal importance</string>
<string name="title_quick_actions_high">High importance</string>
<string name="title_quick_actions_snooze">Snooze</string>
<string name="title_quick_actions_clear">Clear selection after action</string>