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

Added optional headers button

Browse Source
pull/199/head
M66B 5 years ago
parent 512dcc0446
commit 01c6018f55
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File

18
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -434,6 +434,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibUndo; private ImageButton ibUndo;
private ImageButton ibRule; private ImageButton ibRule;
private ImageButton ibUnsubscribe; private ImageButton ibUnsubscribe;
private ImageButton ibHeaders;
private ImageButton ibPrint; private ImageButton ibPrint;
private ImageButton ibPin; private ImageButton ibPin;
private ImageButton ibShare; private ImageButton ibShare;
@ -665,6 +666,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo = vsBody.findViewById(R.id.ibUndo); ibUndo = vsBody.findViewById(R.id.ibUndo);
ibRule = vsBody.findViewById(R.id.ibRule); ibRule = vsBody.findViewById(R.id.ibRule);
ibUnsubscribe = vsBody.findViewById(R.id.ibUnsubscribe); ibUnsubscribe = vsBody.findViewById(R.id.ibUnsubscribe);
ibHeaders = vsBody.findViewById(R.id.ibHeaders);
ibPrint = vsBody.findViewById(R.id.ibPrint); ibPrint = vsBody.findViewById(R.id.ibPrint);
ibPin = vsBody.findViewById(R.id.ibPin); ibPin = vsBody.findViewById(R.id.ibPin);
ibShare = vsBody.findViewById(R.id.ibShare); ibShare = vsBody.findViewById(R.id.ibShare);
@ -773,6 +775,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo.setOnClickListener(this); ibUndo.setOnClickListener(this);
ibRule.setOnClickListener(this); ibRule.setOnClickListener(this);
ibUnsubscribe.setOnClickListener(this); ibUnsubscribe.setOnClickListener(this);
ibHeaders.setOnClickListener(this);
ibPrint.setOnClickListener(this); ibPrint.setOnClickListener(this);
ibPin.setOnClickListener(this); ibPin.setOnClickListener(this);
ibShare.setOnClickListener(this); ibShare.setOnClickListener(this);
@ -891,6 +894,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo.setOnClickListener(null); ibUndo.setOnClickListener(null);
ibRule.setOnClickListener(null); ibRule.setOnClickListener(null);
ibUnsubscribe.setOnClickListener(null); ibUnsubscribe.setOnClickListener(null);
ibHeaders.setOnClickListener(null);
ibPrint.setOnClickListener(null); ibPrint.setOnClickListener(null);
ibPin.setOnClickListener(null); ibPin.setOnClickListener(null);
ibShare.setOnClickListener(null); ibShare.setOnClickListener(null);
@ -1366,6 +1370,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo.setVisibility(View.GONE); ibUndo.setVisibility(View.GONE);
ibRule.setVisibility(View.GONE); ibRule.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(View.GONE); ibUnsubscribe.setVisibility(View.GONE);
ibHeaders.setVisibility(View.GONE);
ibPrint.setVisibility(View.GONE); ibPrint.setVisibility(View.GONE);
ibPin.setVisibility(View.GONE); ibPin.setVisibility(View.GONE);
ibShare.setVisibility(View.GONE); ibShare.setVisibility(View.GONE);
@ -1574,6 +1579,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo.setVisibility(View.GONE); ibUndo.setVisibility(View.GONE);
ibRule.setVisibility(View.GONE); ibRule.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(View.GONE); ibUnsubscribe.setVisibility(View.GONE);
ibHeaders.setVisibility(View.GONE);
ibPrint.setVisibility(View.GONE); ibPrint.setVisibility(View.GONE);
ibPin.setVisibility(View.GONE); ibPin.setVisibility(View.GONE);
ibShare.setVisibility(View.GONE); ibShare.setVisibility(View.GONE);
@ -1743,9 +1749,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
int froms = (message.from == null ? 0 : message.from.length); int froms = (message.from == null ? 0 : message.from.length);
int tos = (message.to == null ? 0 : message.to.length); int tos = (message.to == null ? 0 : message.to.length);
final boolean delete = (inTrash || !hasTrash || inJunk || outbox || boolean delete = (inTrash || !hasTrash || inJunk || outbox ||
message.uid == null || message.accountProtocol == EntityAccount.TYPE_POP); message.uid == null || message.accountProtocol == EntityAccount.TYPE_POP);
boolean headers = (message.uid != null ||
(message.accountProtocol == EntityAccount.TYPE_POP && message.headers != null));
boolean full = properties.getValue("full", message.id); boolean full = properties.getValue("full", message.id);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@ -1767,6 +1776,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean button_share = prefs.getBoolean("button_share", false); boolean button_share = prefs.getBoolean("button_share", false);
boolean button_pin = prefs.getBoolean("button_pin", false); boolean button_pin = prefs.getBoolean("button_pin", false);
boolean button_print = prefs.getBoolean("button_print", false); boolean button_print = prefs.getBoolean("button_print", false);
boolean button_headers = prefs.getBoolean("button_headers", false);
boolean button_unsubscribe = prefs.getBoolean("button_unsubscribe", true); boolean button_unsubscribe = prefs.getBoolean("button_unsubscribe", true);
boolean button_rule = prefs.getBoolean("button_rule", false); boolean button_rule = prefs.getBoolean("button_rule", false);
boolean button_extra = prefs.getBoolean("button_extra", false); boolean button_extra = prefs.getBoolean("button_extra", false);
@ -1780,6 +1790,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibUndo.setVisibility(outbox ? View.VISIBLE : View.GONE); ibUndo.setVisibility(outbox ? View.VISIBLE : View.GONE);
ibRule.setVisibility(tools && button_rule && !outbox && !message.folderReadOnly ? View.VISIBLE : View.GONE); ibRule.setVisibility(tools && button_rule && !outbox && !message.folderReadOnly ? View.VISIBLE : View.GONE);
ibUnsubscribe.setVisibility(tools && button_unsubscribe && message.unsubscribe != null ? View.VISIBLE : View.GONE); ibUnsubscribe.setVisibility(tools && button_unsubscribe && message.unsubscribe != null ? View.VISIBLE : View.GONE);
ibHeaders.setVisibility(tools && button_headers && headers ? View.VISIBLE : View.GONE);
ibPrint.setVisibility(tools && button_print && hasWebView && message.content && Helper.canPrint(context) ? View.VISIBLE : View.GONE); ibPrint.setVisibility(tools && button_print && hasWebView && message.content && Helper.canPrint(context) ? View.VISIBLE : View.GONE);
ibPin.setVisibility(tools && button_pin && pin ? View.VISIBLE : View.GONE); ibPin.setVisibility(tools && button_pin && pin ? View.VISIBLE : View.GONE);
ibShare.setVisibility(tools && button_share && message.content ? View.VISIBLE : View.GONE); ibShare.setVisibility(tools && button_share && message.content ? View.VISIBLE : View.GONE);
@ -3155,6 +3166,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onMenuCreateRule(message); onMenuCreateRule(message);
} else if (id == R.id.ibUnsubscribe) { } else if (id == R.id.ibUnsubscribe) {
onActionUnsubscribe(message); onActionUnsubscribe(message);
} else if (id == R.id.ibHeaders) {
onMenuShowHeaders(message);
} else if (id == R.id.ibPrint) { } else if (id == R.id.ibPrint) {
onMenuPrint(message); onMenuPrint(message);
} else if (id == R.id.ibPin) { } else if (id == R.id.ibPin) {
@ -7100,6 +7113,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
final CheckBox cbShare = dview.findViewById(R.id.cbShare); final CheckBox cbShare = dview.findViewById(R.id.cbShare);
final CheckBox cbPin = dview.findViewById(R.id.cbPin); final CheckBox cbPin = dview.findViewById(R.id.cbPin);
final CheckBox cbPrint = dview.findViewById(R.id.cbPrint); final CheckBox cbPrint = dview.findViewById(R.id.cbPrint);
final CheckBox cbHeaders = dview.findViewById(R.id.cbHeaders);
final CheckBox cbUnsubscribe = dview.findViewById(R.id.cbUnsubscribe); final CheckBox cbUnsubscribe = dview.findViewById(R.id.cbUnsubscribe);
final CheckBox cbRule = dview.findViewById(R.id.cbRule); final CheckBox cbRule = dview.findViewById(R.id.cbRule);
@ -7120,6 +7134,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
cbShare.setChecked(prefs.getBoolean("button_share", false)); cbShare.setChecked(prefs.getBoolean("button_share", false));
cbPin.setChecked(prefs.getBoolean("button_pin", false)); cbPin.setChecked(prefs.getBoolean("button_pin", false));
cbPrint.setChecked(prefs.getBoolean("button_print", false)); cbPrint.setChecked(prefs.getBoolean("button_print", false));
cbHeaders.setChecked(prefs.getBoolean("button_headers", false));
cbUnsubscribe.setChecked(prefs.getBoolean("button_unsubscribe", true)); cbUnsubscribe.setChecked(prefs.getBoolean("button_unsubscribe", true));
cbRule.setChecked(prefs.getBoolean("button_rule", false)); cbRule.setChecked(prefs.getBoolean("button_rule", false));
@ -7144,6 +7159,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
editor.putBoolean("button_share", cbShare.isChecked()); editor.putBoolean("button_share", cbShare.isChecked());
editor.putBoolean("button_pin", cbPin.isChecked()); editor.putBoolean("button_pin", cbPin.isChecked());
editor.putBoolean("button_print", cbPrint.isChecked()); editor.putBoolean("button_print", cbPrint.isChecked());
editor.putBoolean("button_headers", cbHeaders.isChecked());
editor.putBoolean("button_unsubscribe", cbUnsubscribe.isChecked()); editor.putBoolean("button_unsubscribe", cbUnsubscribe.isChecked());
editor.putBoolean("button_rule", cbRule.isChecked()); editor.putBoolean("button_rule", cbRule.isChecked());
editor.apply(); editor.apply();

12
app/src/main/res/layout/dialog_buttons.xml
Unescape View File

@ -181,6 +181,16 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPin" /> app:layout_constraintTop_toBottomOf="@id/cbPin" />
<CheckBox
android:id="@+id/cbHeaders"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_show_headers"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPrint" />
<CheckBox <CheckBox
android:id="@+id/cbUnsubscribe" android:id="@+id/cbUnsubscribe"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -189,7 +199,7 @@
android:text="@string/title_unsubscribe" android:text="@string/title_unsubscribe"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPrint" /> app:layout_constraintTop_toBottomOf="@id/cbHeaders" />
<CheckBox <CheckBox
android:id="@+id/cbRule" android:id="@+id/cbRule"

18
app/src/main/res/layout/include_message_navigation.xml
Unescape View File

@ -20,9 +20,9 @@
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:indeterminate="true" android:indeterminate="true"
app:show_delay="750"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparator" /> app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:show_delay="750" />
<ImageButton <ImageButton
android:id="@+id/ibTools" android:id="@+id/ibTools"
@ -42,7 +42,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="3dp" android:layout_marginEnd="3dp"
app:constraint_referenced_ids="ibMore,ibInbox,ibJunk,ibTrash,ibArchive,ibMove,ibCopy,ibKeywords,ibLabels,ibNotes,ibAnswer,ibSeen,ibHide,ibSearch,ibSearchText,ibEvent,ibShare,ibPin,ibPrint,ibUnsubscribe,ibRule,ibUndo" app:constraint_referenced_ids="ibMore,ibInbox,ibJunk,ibTrash,ibArchive,ibMove,ibCopy,ibKeywords,ibLabels,ibNotes,ibAnswer,ibSeen,ibHide,ibSearch,ibSearchText,ibEvent,ibShare,ibPin,ibPrint,ibHeaders,ibUnsubscribe,ibRule,ibUndo"
app:flow_horizontalBias="0" app:flow_horizontalBias="0"
app:flow_horizontalGap="3dp" app:flow_horizontalGap="3dp"
app:flow_horizontalStyle="packed" app:flow_horizontalStyle="packed"
@ -273,6 +273,18 @@
app:srcCompat="@drawable/twotone_print_24" app:srcCompat="@drawable/twotone_print_24"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageButton
android:id="@+id/ibHeaders"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_show_headers"
android:padding="6dp"
android:scaleType="fitCenter"
android:tooltipText="@string/title_show_headers"
app:srcCompat="@drawable/baseline_code_24"
tools:ignore="MissingConstraints" />
<ImageButton <ImageButton
android:id="@+id/ibUnsubscribe" android:id="@+id/ibUnsubscribe"
android:layout_width="36dp" android:layout_width="36dp"

Write Preview
Loading…
Cancel
Save