From 44c7032bdb46fe89e504f8091e5df1ae3f41559c Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 11 May 2023 12:22:22 +0200 Subject: [PATCH] Added option to resize pasted images --- .../java/eu/faircode/email/FragmentCompose.java | 10 +++++++++- .../eu/faircode/email/FragmentOptionsSend.java | 13 ++++++++++++- app/src/main/res/layout/fragment_options_send.xml | 14 +++++++++++++- app/src/main/res/values/strings.xml | 1 + 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 77c8114314..674feb9a42 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -625,7 +625,15 @@ public class FragmentCompose extends FragmentBase { @Override public void onInputContent(Uri uri, String type) { Log.i("Received input uri=" + uri); - onAddAttachment(Arrays.asList(uri), type == null ? null : new String[]{type}, true, 0, false, false); + boolean resize_paste = prefs.getBoolean("resize_paste", true); + int resize = prefs.getInt("resize", FragmentCompose.REDUCED_IMAGE_SIZE); + onAddAttachment( + Arrays.asList(uri), + type == null ? null : new String[]{type}, + true, + resize_paste ? resize : 0, + false, + false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index 8bef45f02e..07db2eede7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -95,6 +95,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc private SwitchCompat swQuoteReply; private SwitchCompat swQuoteLimit; private SwitchCompat swResizeReply; + private SwitchCompat swResizePaste; private Spinner spSignatureLocation; private SwitchCompat swSignatureNew; private SwitchCompat swSignatureReply; @@ -127,7 +128,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc "sound_sent", "compose_color", "compose_font", "compose_monospaced", "prefix_once", "prefix_count", "alt_re", "alt_fwd", - "separate_reply", "extended_reply", "write_below", "quote_reply", "quote_limit", "resize_reply", + "separate_reply", "extended_reply", "write_below", "quote_reply", "quote_limit", + "resize_reply", "resize_paste", "signature_location", "signature_new", "signature_reply", "signature_reply_once", "signature_forward", "attach_new", "auto_link", "plain_only", "plain_only_reply", "format_flowed", "usenet_signature", "remove_signatures", @@ -179,6 +181,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc swQuoteReply = view.findViewById(R.id.swQuoteReply); swQuoteLimit = view.findViewById(R.id.swQuoteLimit); swResizeReply = view.findViewById(R.id.swResizeReply); + swResizePaste = view.findViewById(R.id.swResizePaste); spSignatureLocation = view.findViewById(R.id.spSignatureLocation); swSignatureNew = view.findViewById(R.id.swSignatureNew); swSignatureReply = view.findViewById(R.id.swSignatureReply); @@ -516,6 +519,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc } }); + swResizePaste.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("resize_paste", checked).apply(); + } + }); + spSignatureLocation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView adapterView, View view, int position, long id) { @@ -795,6 +805,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true)); swQuoteLimit.setChecked(prefs.getBoolean("quote_limit", true)); swResizeReply.setChecked(prefs.getBoolean("resize_reply", true)); + swResizePaste.setChecked(prefs.getBoolean("resize_paste", true)); int signature_location = prefs.getInt("signature_location", 1); spSignatureLocation.setSelection(signature_location); diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml index 1a7cad957a..96544d4710 100644 --- a/app/src/main/res/layout/fragment_options_send.xml +++ b/app/src/main/res/layout/fragment_options_send.xml @@ -644,6 +644,18 @@ app:layout_constraintTop_toBottomOf="@id/swQuoteLimit" app:switchPadding="12dp" /> + + + app:layout_constraintTop_toBottomOf="@id/swResizePaste" /> Quote replied text Limit the number of nested quotes Resize images in replied text + Resize pasted images Signature position Use signature for new messages Use signature when replying