Show last sync date / nav menu

pull/207/head
M66B 3 years ago
parent 99dd73fddd
commit 73957ec262

@ -46,6 +46,7 @@ import java.text.DateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@ -76,6 +77,7 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
private NumberFormat NF = NumberFormat.getNumberInstance(); private NumberFormat NF = NumberFormat.getNumberInstance();
private DateFormat TF; private DateFormat TF;
private DateFormat DF;
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private View view; private View view;
@ -166,8 +168,19 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE); tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE);
if (account.folderName == null) { if (account.folderName == null) {
tvItemExtra.setText(account.last_connected == null ? null : TF.format(account.last_connected)); if (account.last_connected != null && expanded) {
tvItemExtra.setVisibility(account.last_connected != null && expanded ? View.VISIBLE : View.GONE); Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
if (account.last_connected < cal.getTimeInMillis())
tvItemExtra.setText(DF.format(account.last_connected));
else
tvItemExtra.setText(TF.format(account.last_connected));
tvItemExtra.setVisibility(View.VISIBLE);
} else
tvItemExtra.setVisibility(View.GONE);
} else { } else {
tvItemExtra.setText(NF.format(account.messages)); tvItemExtra.setText(NF.format(account.messages));
tvItemExtra.setVisibility(nav_count && expanded ? View.VISIBLE : View.GONE); tvItemExtra.setVisibility(nav_count && expanded ? View.VISIBLE : View.GONE);
@ -286,6 +299,9 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
this.colorWarning = ColorUtils.setAlphaComponent(Helper.resolveColor(context, R.attr.colorWarning), 128); this.colorWarning = ColorUtils.setAlphaComponent(Helper.resolveColor(context, R.attr.colorWarning), 128);
this.TF = Helper.getTimeInstance(context, SimpleDateFormat.SHORT); this.TF = Helper.getTimeInstance(context, SimpleDateFormat.SHORT);
this.DF = new SimpleDateFormat(
android.text.format.DateFormat.getBestDateTimePattern(Locale.getDefault(), "dd-MM"),
Locale.getDefault());
setHasStableIds(false); setHasStableIds(false);
} }

Loading…
Cancel
Save