cleanup code in StatusViewHolders (#1418)

* cleanup code in status ViewHolder

* add check for reblogButton back in
This commit is contained in:
Konrad Pozniak 2019-07-27 21:53:28 +02:00 committed by GitHub
commit 588775ff9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 125 additions and 185 deletions

View file

@ -29,6 +29,7 @@ import com.keylesspalace.tusky.viewdata.StatusViewData;
import java.text.DateFormat;
import java.util.Date;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
@ -66,13 +67,9 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
}
@Override
protected void setCreatedAt(@Nullable Date createdAt) {
if (createdAt != null) {
DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.SHORT);
timestampInfo.setText(dateFormat.format(createdAt));
} else {
timestampInfo.setText("");
}
protected void setCreatedAt(@NonNull Date createdAt) {
DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.SHORT);
timestampInfo.setText(dateFormat.format(createdAt));
}
private void setReblogAndFavCount(int reblogCount, int favCount, StatusActionListener listener) {
@ -138,7 +135,6 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
setApplication(status.getApplication());
View.OnLongClickListener longClickListener = view -> {
TextView textView = (TextView) view;
ClipboardManager clipboard = (ClipboardManager) view.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
@ -224,9 +220,6 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
}
private void setStatusVisibility(Status.Visibility visibility) {
if (visibility == null || this.timestampInfo == null) {
return;
}
int visibilityIcon;
switch (visibility) {
@ -260,7 +253,7 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
size
);
visibilityDrawable.setTint(this.timestampInfo.getCurrentTextColor());
this.timestampInfo.setCompoundDrawables(
this.timestampInfo.setCompoundDrawablesWithIntrinsicBounds(
visibilityDrawable,
null,
null,