mirror of https://github.com/M66B/FairEmail.git
Allow raw html signature
This commit is contained in:
parent
ff546c79a6
commit
40554d75d5
|
@ -31,6 +31,8 @@ import android.text.SpannableStringBuilder;
|
||||||
import android.text.Spanned;
|
import android.text.Spanned;
|
||||||
import android.text.style.ImageSpan;
|
import android.text.style.ImageSpan;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
@ -50,12 +52,17 @@ public class ActivitySignature extends ActivityBase {
|
||||||
private BottomNavigationView style_bar;
|
private BottomNavigationView style_bar;
|
||||||
private BottomNavigationView bottom_navigation;
|
private BottomNavigationView bottom_navigation;
|
||||||
|
|
||||||
|
private boolean raw = false;
|
||||||
|
|
||||||
private static final int REQUEST_IMAGE = 1;
|
private static final int REQUEST_IMAGE = 1;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
if (savedInstanceState != null)
|
||||||
|
raw = savedInstanceState.getBoolean("fair:raw");
|
||||||
|
|
||||||
getSupportActionBar().setSubtitle(getString(R.string.title_edit_signature));
|
getSupportActionBar().setSubtitle(getString(R.string.title_edit_signature));
|
||||||
setContentView(R.layout.activity_signature);
|
setContentView(R.layout.activity_signature);
|
||||||
|
|
||||||
|
@ -110,6 +117,33 @@ public class ActivitySignature extends ActivityBase {
|
||||||
load();
|
load();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onSaveInstanceState(Bundle outState) {
|
||||||
|
outState.putBoolean("fair:raw", raw);
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
MenuInflater inflater = getMenuInflater();
|
||||||
|
inflater.inflate(R.menu.menu_signature, menu);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case R.id.menu_edit_html:
|
||||||
|
item.setChecked(!item.isChecked());
|
||||||
|
raw = item.isChecked();
|
||||||
|
load();
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
|
@ -130,6 +164,8 @@ public class ActivitySignature extends ActivityBase {
|
||||||
String html = getIntent().getStringExtra("html");
|
String html = getIntent().getStringExtra("html");
|
||||||
if (html == null)
|
if (html == null)
|
||||||
etText.setText(null);
|
etText.setText(null);
|
||||||
|
else if (raw)
|
||||||
|
etText.setText(html);
|
||||||
else
|
else
|
||||||
etText.setText(HtmlHelper.fromHtml(html, new Html.ImageGetter() {
|
etText.setText(HtmlHelper.fromHtml(html, new Html.ImageGetter() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -148,7 +184,7 @@ public class ActivitySignature extends ActivityBase {
|
||||||
|
|
||||||
private void save() {
|
private void save() {
|
||||||
etText.clearComposingText();
|
etText.clearComposingText();
|
||||||
String html = HtmlHelper.toHtml(etText.getText());
|
String html = (raw ? etText.getText().toString() : HtmlHelper.toHtml(etText.getText()));
|
||||||
Intent result = new Intent();
|
Intent result = new Intent();
|
||||||
result.putExtra("html", html);
|
result.putExtra("html", html);
|
||||||
setResult(RESULT_OK, result);
|
setResult(RESULT_OK, result);
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_edit_html"
|
||||||
|
android:checkable="true"
|
||||||
|
android:title="@string/title_edit_html"
|
||||||
|
app:showAsAction="never" />
|
||||||
|
</menu>
|
Loading…
Reference in New Issue