TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use theme-defined weights instead of ThemeType.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-07-01 08:13:09 -07:00
parent ce2f66ad17
commit 9bf7562d49
11 changed files with 63 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
View File

@@ -2,25 +2,17 @@ package org.thoughtcrime.securesms.contacts.avatars;
import android.content.Context;
import android.support.annotation.NonNull;
import android.util.SparseIntArray;
import com.amulyakhare.textdrawable.util.ColorGenerator;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.color.MaterialColors;
import org.thoughtcrime.securesms.color.ThemeType;
import org.whispersystems.libaxolotl.util.guava.Optional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
public class ContactColors {
public static final MaterialColor UNKNOWN_COLOR = MaterialColors.GREY;
public static MaterialColor generateFor(@NonNull String name) {
return MaterialColors.CONVERSATION_PALETTE.get(Math.abs(name.hashCode()) % MaterialColors.CONVERSATION_PALETTE.size());
}
@@ -31,17 +23,17 @@ public class ContactColors {
return new MaterialColor(new HashMap<String, Integer>()) {
@Override
public int toConversationColor(ThemeType themeType) {
return UNKNOWN_COLOR.toConversationColor(themeType);
public int toConversationColor(@NonNull Context context) {
return UNKNOWN_COLOR.toConversationColor(context);
}
@Override
public int toActionBarColor(ThemeType themeType) {
public int toActionBarColor(@NonNull Context context) {
return actionBarColor;
}
@Override
public int toStatusBarColor(ThemeType themeType) {
public int toStatusBarColor(@NonNull Context context) {
return statusBarColor;
}
@@ -50,12 +42,5 @@ public class ContactColors {
return "group_color";
}
};
}
// public static Optional<Integer> getStatusTinted(int color) {
// int statusTinted = MATERIAL_500_TO_700.get(color, -1);
// return statusTinted == -1 ? Optional.<Integer>absent() : Optional.of(statusTinted);
// }
}