Small behavior improvement

pull/206/head
M66B 4 years ago
parent 61c004d510
commit 616dfc9751

@ -212,13 +212,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
} }
private void bindTo(final TupleFolderEx folder) { private void bindTo(final TupleFolderEx folder) {
boolean disabled = isDisabled(folder);
view.setActivated(folder.tbc != null || folder.rename != null || folder.tbd != null); view.setActivated(folder.tbc != null || folder.rename != null || folder.tbd != null);
view.setAlpha( view.setEnabled(!disabled);
folder.hide || view.setAlpha(folder.hide || disabled ? Helper.LOW_LIGHT : 1.0f);
!folder.selectable ||
(folder.read_only && listener != null) ||
disabledIds.contains(folder.id)
? Helper.LOW_LIGHT : 1.0f);
if (textSize != 0) if (textSize != 0)
tvName.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize); tvName.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
@ -411,25 +409,26 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
} else if (id == R.id.ibSync) { } else if (id == R.id.ibSync) {
onLastSync(folder); onLastSync(folder);
} else { } else {
if (listener == null) { if (isDisabled(folder))
if (!folder.selectable)
return; return;
if (listener == null) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast( lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES) new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account) .putExtra("account", folder.account)
.putExtra("folder", folder.id) .putExtra("folder", folder.id)
.putExtra("type", folder.type)); .putExtra("type", folder.type));
} else { } else
if (folder.read_only)
return;
if (disabledIds.contains(folder.id))
return;
listener.onFolderSelected(folder); listener.onFolderSelected(folder);
} }
} }
} }
private boolean isDisabled(EntityFolder folder) {
return (!folder.selectable ||
(folder.read_only && listener != null) ||
disabledIds.contains(folder.id));
} }
private void onCollapse(TupleFolderEx folder, int pos) { private void onCollapse(TupleFolderEx folder, int pos) {

Loading…
Cancel
Save