From 8b07ffcd2b68e30a6a0ccd58a75ee1602c29ae0d Mon Sep 17 00:00:00 2001 From: andrew <andrewgallasch@gmail.com> Date: Wed, 13 Sep 2023 14:28:52 +0930 Subject: [PATCH 1/2] Fix unresolved theme attributes exception --- .../session/libsession/avatars/ResourceContactPhoto.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java index f78089e25e2..efc2babc3a2 100644 --- a/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java @@ -8,6 +8,7 @@ import android.widget.ImageView; import androidx.annotation.DrawableRes; +import androidx.appcompat.content.res.AppCompatResources; import com.amulyakhare.textdrawable.TextDrawable; import com.makeramen.roundedimageview.RoundedDrawable; @@ -31,7 +32,7 @@ public Drawable asDrawable(Context context, int color) { @Override public Drawable asDrawable(Context context, int color, boolean inverted) { Drawable background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color); - RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(context.getResources().getDrawable(resourceId)); + RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId); foreground.setScaleType(ImageView.ScaleType.CENTER_CROP); @@ -39,8 +40,10 @@ public Drawable asDrawable(Context context, int color, boolean inverted) { foreground.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); } - Drawable gradient = context.getResources().getDrawable(ThemeUtil.isDarkTheme(context) ? R.drawable.avatar_gradient_dark - : R.drawable.avatar_gradient_light); + Drawable gradient = AppCompatResources.getDrawable( + context, + ThemeUtil.isDarkTheme(context) ? R.drawable.avatar_gradient_dark : R.drawable.avatar_gradient_light + ); return new ExpandingLayerDrawable(new Drawable[] {background, foreground, gradient}); } From 4e6fe1fc9da2d36cad4beff76eaac3354d122e21 Mon Sep 17 00:00:00 2001 From: Andrew <andrewgallasch@gmail.com> Date: Mon, 25 Mar 2024 13:28:01 +1030 Subject: [PATCH 2/2] Fix missing parenthesis --- .../org/session/libsession/avatars/ResourceContactPhoto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java index efc2babc3a2..2920b4b1ce4 100644 --- a/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java @@ -32,7 +32,7 @@ public Drawable asDrawable(Context context, int color) { @Override public Drawable asDrawable(Context context, int color, boolean inverted) { Drawable background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color); - RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId); + RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId)); foreground.setScaleType(ImageView.ScaleType.CENTER_CROP);