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

Added action copy, small improvements

Browse Source
pull/177/head
M66B 5 years ago
parent 65670c496a
commit 3751bc3332
2 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -101,7 +101,6 @@ import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow; import android.widget.PopupWindow;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -1974,41 +1973,81 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
throw new IllegalStateException("Result=" + result); throw new IllegalStateException("Result=" + result);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
clearActions();
boolean has = false; boolean has = false;
ConversationActions cactions = args.getParcelable("actions"); ConversationActions cactions = args.getParcelable("actions");
if (cactions != null) { if (cactions != null) {
LinearLayout.LayoutParams lparam = new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
List<ConversationAction> actions = cactions.getConversationActions(); List<ConversationAction> actions = cactions.getConversationActions();
for (final ConversationAction action : actions) { for (final ConversationAction action : actions) {
final CharSequence text;
final CharSequence title;
final RemoteAction raction = action.getAction(); final RemoteAction raction = action.getAction();
final CharSequence title = (raction == null
? context.getString(R.string.title_conversation_action_reply, action.getTextReply()) switch (action.getType()) {
: raction.getTitle()); case ConversationAction.TYPE_TEXT_REPLY:
text = action.getTextReply();
title = context.getString(R.string.title_conversation_action_reply, text);
break;
case "copy":
Bundle extras = action.getExtras().getParcelable("entities-extras");
if (extras == null)
continue;
text = extras.getString("text");
title = context.getString(R.string.title_conversation_action_copy, text);
break;
default:
if (raction == null) {
Log.e("Unknown action type=" + action.getType());
continue;
}
text = null;
title = raction.getTitle();
if (TextUtils.isEmpty(title)) {
Log.e("Empty action type=" + action.getType());
continue;
}
}
Button button = new Button(context, null, android.R.attr.buttonStyleSmall); Button button = new Button(context, null, android.R.attr.buttonStyleSmall);
button.setId(View.generateViewId()); button.setId(View.generateViewId());
button.setLayoutParams(lparam);
button.setText(title); button.setText(title);
button.setOnClickListener(new View.OnClickListener() { button.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
try { try {
if (raction == null) { switch (action.getType()) {
Intent reply = new Intent(context, ActivityCompose.class) case ConversationAction.TYPE_TEXT_REPLY:
.putExtra("action", "reply") onReply();
.putExtra("reference", message.id) break;
.putExtra("text", action.getTextReply()); case "copy":
context.startActivity(reply); onCopy();
} else break;
raction.getActionIntent().send(); default:
raction.getActionIntent().send();
}
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }
} }
private void onReply() {
Intent reply = new Intent(context, ActivityCompose.class)
.putExtra("action", "reply")
.putExtra("reference", message.id)
.putExtra("text", action.getTextReply());
context.startActivity(reply);
}
private void onCopy() {
ClipboardManager clipboard =
(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
if (clipboard != null) {
ClipData clip = ClipData.newPlainText(title, text);
clipboard.setPrimaryClip(clip);
ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
}
}
}); });
((ConstraintLayout) flow.getParent()).addView(button); ((ConstraintLayout) flow.getParent()).addView(button);
flow.addView(button); flow.addView(button);
has = true; has = true;

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

@ -1143,6 +1143,7 @@
<string name="title_conversation_actions">Actions</string> <string name="title_conversation_actions">Actions</string>
<string name="title_conversation_action_reply">Reply with: \'%1$s\'</string> <string name="title_conversation_action_reply">Reply with: \'%1$s\'</string>
<string name="title_conversation_action_copy">Copy: \'%1$s\'</string>
<string name="title_icalendar_accept">Accept</string> <string name="title_icalendar_accept">Accept</string>
<string name="title_icalendar_decline">Decline</string> <string name="title_icalendar_decline">Decline</string>

Write Preview
Loading…
Cancel
Save