chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Fixes icons on statuses and notifications not being the right colour on the light theme.

Browse source 
Maybe could be a more elegant solution than drawable duplication but for now fine.
This commit is contained in:
Vavassor 2017-03-07 23:52:17 -05:00
commit e46731454d
15 changed files with 55 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/NotificationsAdapter.java
View file

@ -91,7 +91,7 @@ class NotificationsAdapter extends RecyclerView.Adapter implements AdapterItemRe
case MENTION: {
StatusViewHolder holder = (StatusViewHolder) viewHolder;
Status status = notification.getStatus();
holder.setupWithStatus(status, statusListener, position);
holder.setupWithStatus(status, statusListener);
break;
}
case FAVOURITE:

16
app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
View file

@ -16,7 +16,6 @@
package com.keylesspalace.tusky;
import android.content.Context;
import android.media.Image;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableStringBuilder;
@ -31,11 +30,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.ToggleButton;
import com.android.volley.toolbox.ImageLoader;
import com.android.volley.toolbox.NetworkImageView;
import com.squareup.picasso.Picasso;
import com.varunest.sparkbutton.SparkButton;
import com.varunest.sparkbutton.SparkButtonBuilder;
import com.varunest.sparkbutton.SparkEventListener;
import java.util.Date;
@ -198,11 +194,15 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
reblogButton.setEnabled(enabled);
if (enabled) {
reblogButton.setInactiveImage(R.drawable.reblog_inactive);
int inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_inactive_drawable, R.drawable.reblog_inactive_dark);
reblogButton.setInactiveImage(inactiveId);
reblogButton.setActiveImage(R.drawable.reblog_active);
} else {
reblogButton.setInactiveImage(R.drawable.reblog_disabled);
reblogButton.setActiveImage(R.drawable.reblog_disabled);
int disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_disabled_drawable, R.drawable.reblog_disabled_dark);
reblogButton.setInactiveImage(disabledId);
reblogButton.setActiveImage(disabledId);
}
}
@ -338,7 +338,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
container.setOnClickListener(viewThreadListener);
}
void setupWithStatus(Status status, StatusActionListener listener, int position) {
void setupWithStatus(Status status, StatusActionListener listener) {
setDisplayName(status.getDisplayName());
setUsername(status.getUsername());
setCreatedAt(status.getCreatedAt());

2
app/src/main/java/com/keylesspalace/tusky/ThreadAdapter.java
View file

@ -45,7 +45,7 @@ class ThreadAdapter extends RecyclerView.Adapter implements AdapterItemRemover {
public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
StatusViewHolder holder = (StatusViewHolder) viewHolder;
Status status = statuses.get(position);
holder.setupWithStatus(status, statusActionListener, position);
holder.setupWithStatus(status, statusActionListener);
}
@Override

2
app/src/main/java/com/keylesspalace/tusky/TimelineAdapter.java
View file

@ -64,7 +64,7 @@ class TimelineAdapter extends RecyclerView.Adapter implements AdapterItemRemover
if (position < statuses.size()) {
StatusViewHolder holder = (StatusViewHolder) viewHolder;
Status status = statuses.get(position);
holder.setupWithStatus(status, statusListener, position);
holder.setupWithStatus(status, statusListener);
} else {
FooterViewHolder holder = (FooterViewHolder) viewHolder;
holder.setState(footerState);