Switch to enum and theme type for MaterialColor.

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-07-01 12:22:42 -07:00
parent 9bf7562d49
commit 4ea40b30a2
28 changed files with 393 additions and 629 deletions

View File

@@ -16,7 +16,6 @@
*/
package org.thoughtcrime.securesms.recipients;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -157,8 +156,8 @@ public class Recipients implements Iterable<Recipient>, RecipientModifiedListene
else return ContactPhotoFactory.getDefaultGroupPhoto();
}
public synchronized @NonNull MaterialColor getColor(Context context) {
if (!isSingleRecipient() || isGroupRecipient()) return ContactColors.getGroupColor(context);
public synchronized @NonNull MaterialColor getColor() {
if (!isSingleRecipient() || isGroupRecipient()) return MaterialColor.GROUP;
else if (isEmpty()) return ContactColors.UNKNOWN_COLOR;
else return recipients.get(0).getColor();
}