Refactor colorization to support dark theme.

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-06-30 09:16:05 -07:00
parent eacfca37f2
commit ce2f66ad17
32 changed files with 840 additions and 235 deletions

View File

@@ -10,6 +10,8 @@ import android.view.View;
import android.widget.ImageView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.color.ThemeType;
import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -37,12 +39,14 @@ public class AvatarImageView extends ImageView {
}
public void setAvatar(@Nullable Recipients recipients, boolean quickContactEnabled) {
ThemeType themeType = ThemeType.getCurrent(getContext());
if (recipients != null) {
int backgroundColor = recipients.getColor().or(ContactColors.UNKNOWN_COLOR);
setImageDrawable(recipients.getContactPhoto().asDrawable(getContext(), backgroundColor, inverted));
MaterialColor backgroundColor = recipients.getColor(getContext());
setImageDrawable(recipients.getContactPhoto().asDrawable(getContext(), backgroundColor.toConversationColor(themeType), inverted));
setAvatarClickHandler(recipients, quickContactEnabled);
} else {
setImageDrawable(ContactPhotoFactory.getDefaultContactPhoto(null).asDrawable(getContext(), ContactColors.UNKNOWN_COLOR, inverted));
setImageDrawable(ContactPhotoFactory.getDefaultContactPhoto(null).asDrawable(getContext(), ContactColors.UNKNOWN_COLOR.toConversationColor(themeType), inverted));
setOnClickListener(null);
}
}