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

Simplification

This commit is contained in:
M66B 2022-12-09 08:59:13 +01:00
parent 3889d99903
commit 1e886e7241
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivitySignature.java
View File

@ -472,6 +472,6 @@ public class ActivitySignature extends ActivityBase {
int end = args.getInt("end");
String title = args.getString("title");
etText.setSelection(start, end);
StyleHelper.apply(-1, R.id.menu_link, this, null, etText, link, title);
StyleHelper.apply(R.id.menu_link, this, null, etText, link, title);
}
}

2
app/src/main/java/eu/faircode/email/FragmentAnswer.java
View File

@ -561,7 +561,7 @@ public class FragmentAnswer extends FragmentBase {
int end = args.getInt("end");
String title = args.getString("title");
etText.setSelection(start, end);
StyleHelper.apply(-1, R.id.menu_link, getViewLifecycleOwner(), null, etText, link, title);
StyleHelper.apply(R.id.menu_link, getViewLifecycleOwner(), null, etText, link, title);
}
private void onDelete() {

10
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -1921,7 +1921,7 @@ public class FragmentCompose extends FragmentBase {
startSearch();
return true;
} else if (itemId == R.id.menu_clear) {
StyleHelper.apply(-1, R.id.menu_clear, getViewLifecycleOwner(), null, etBody);
StyleHelper.apply(R.id.menu_clear, getViewLifecycleOwner(), null, etBody);
return true;
} else if (itemId == R.id.menu_legend) {
onMenuLegend();
@ -4216,7 +4216,7 @@ public class FragmentCompose extends FragmentBase {
int end = args.getInt("end");
String title = args.getString("title");
etBody.setSelection(start, end);
StyleHelper.apply(-1, R.id.menu_link, getViewLifecycleOwner(), null, etBody, link, title);
StyleHelper.apply(R.id.menu_link, getViewLifecycleOwner(), null, etBody, link, title);
}
private void onActionDiscardConfirmed() {
@ -7155,17 +7155,17 @@ public class FragmentCompose extends FragmentBase {
return true;
case KeyEvent.KEYCODE_B:
if (etBody.hasSelection())
return StyleHelper.apply(-1, R.id.menu_bold, getViewLifecycleOwner(), null, etBody);
return StyleHelper.apply(R.id.menu_bold, getViewLifecycleOwner(), null, etBody);
else
return false;
case KeyEvent.KEYCODE_I:
if (etBody.hasSelection())
return StyleHelper.apply(-1, R.id.menu_italic, getViewLifecycleOwner(), null, etBody);
return StyleHelper.apply(R.id.menu_italic, getViewLifecycleOwner(), null, etBody);
else
return false;
case KeyEvent.KEYCODE_U:
if (etBody.hasSelection())
return StyleHelper.apply(-1, R.id.menu_underline, getViewLifecycleOwner(), null, etBody);
return StyleHelper.apply(R.id.menu_underline, getViewLifecycleOwner(), null, etBody);
else
return false;
}

6
app/src/main/java/eu/faircode/email/StyleHelper.java
View File

@ -123,7 +123,7 @@ public class StyleHelper {
View.OnClickListener styleListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
StyleHelper.apply(-1, v.getId(), owner, v, etBody);
StyleHelper.apply(v.getId(), owner, v, etBody);
}
};
@ -345,6 +345,10 @@ public class StyleHelper {
};
}
static boolean apply(int itemId, LifecycleOwner owner, View anchor, EditText etBody, Object... args) {
return apply(-1, itemId, owner, anchor, etBody, args);
}
static boolean apply(int groupId, int itemId, LifecycleOwner owner, View anchor, EditText etBody, Object... args) {
Log.i("Style action=" + groupId + ":" + itemId);