oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

Fix vector drawable problems < Android 5.0

Browse source 
Fixes #7056
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-10-08 17:42:45 -07:00
parent 9fa4ba126b
commit 12020a3f86
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
View file

@ -5,6 +5,7 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.content.res.AppCompatResources;
import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.TextDrawable;
@ -48,7 +49,8 @@ public class GeneratedContactPhoto implements ContactPhoto {
@Override @Override
public Drawable asCallCard(Context context) { public Drawable asCallCard(Context context) {
return ContextCompat.getDrawable(context, R.drawable.ic_person_large); return AppCompatResources.getDrawable(context, R.drawable.ic_person_large);
} }
@Override @Override

5
src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
View file

@ -2,12 +2,11 @@ package org.thoughtcrime.securesms.contacts.avatars;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.v4.graphics.ColorUtils; import android.support.v7.content.res.AppCompatResources;
import android.widget.ImageView; import android.widget.ImageView;
import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.TextDrawable;
@ -48,7 +47,7 @@ public class ResourceContactPhoto implements ContactPhoto {
@Override @Override
public Drawable asCallCard(Context context) { public Drawable asCallCard(Context context) {
return context.getResources().getDrawable(callCardResourceId); return AppCompatResources.getDrawable(context, callCardResourceId);
} }
@Override @Override