Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-13 12:33:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2020-03-22 18:00:54 +01:00
parent abc074f46a
commit b87fae86ec
2 changed files with 62 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
));
public class ViewHolder extends RecyclerView.ViewHolder implements
View.OnKeyListener,
View.OnClickListener,
View.OnLongClickListener,
View.OnTouchListener,
@@ -661,7 +660,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
header.setTouchDelegate(new TouchDelegate(rect, touch));
}
});
header.setOnKeyListener(this);
ibAvatar.setOnClickListener(this);
ibAuth.setOnClickListener(this);
@@ -735,7 +733,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void unwire() {
final View touch = (viewType == ViewType.THREAD ? ibExpander : header);
touch.setOnClickListener(null);
header.setOnKeyListener(null);
ibAvatar.setOnClickListener(null);
ibAuth.setOnClickListener(null);
@@ -2755,16 +2752,39 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
@Override
public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
if (keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
(keyCode == KeyEvent.KEYCODE_ENTER ||
keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
keyCode == KeyEvent.KEYCODE_BUTTON_A)) {
onClick(view);
return true;
} else
return false;
public boolean onKeyPressed(KeyEvent event) {
TupleMessageEx message = getMessage();
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_ENTER:
case KeyEvent.KEYCODE_DPAD_CENTER:
case KeyEvent.KEYCODE_BUTTON_A:
onClick(view);
return true;
case KeyEvent.KEYCODE_A:
return false;
case KeyEvent.KEYCODE_D:
return false;
case KeyEvent.KEYCODE_S:
if (message == null || selectionTracker == null)
return false;
if (selectionTracker.isSelected(message.id))
selectionTracker.deselect(message.id);
else
selectionTracker.select(message.id);
return true;
case KeyEvent.KEYCODE_T:
if (tvBody != null && tvBody.getVisibility() == View.VISIBLE) {
tvBody.requestFocus();
return true;
}
if (wvBody != null && wvBody.getVisibility() == View.VISIBLE) {
wvBody.requestFocus();
return true;
}
return false;
default:
return false;
}
}
private void onViewContact(TupleMessageEx message) {
@@ -4956,13 +4976,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
holder.clearExpanded(message);
}
public void focusBody(@NonNull ViewHolder holder, int position) {
if (holder.tvBody != null && holder.tvBody.getVisibility() == View.VISIBLE)
holder.tvBody.requestFocus();
if (holder.wvBody != null && holder.wvBody.getVisibility() == View.VISIBLE)
holder.wvBody.requestFocus();
}
public void onItemSelected(@NonNull ViewHolder holder, boolean selected) {
if (accessibility && holder.view != null)
try {