Skip to content

Commit d1ae88c

Browse files
dbrantdomdomegg
authored andcommitted
Fix crash on API 19 in Achievements screen. (commons-app#2673)
1 parent 09a93d1 commit d1ae88c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
import android.content.Context;
66
import android.content.Intent;
77
import android.graphics.Bitmap;
8-
import android.graphics.drawable.Drawable;
98
import android.net.Uri;
109
import android.os.Bundle;
1110
import androidx.core.content.FileProvider;
12-
import androidx.core.content.res.ResourcesCompat;
1311
import androidx.appcompat.app.AlertDialog;
1412
import androidx.appcompat.widget.Toolbar;
1513
import android.util.DisplayMetrics;
@@ -33,6 +31,7 @@
3331

3432
import javax.inject.Inject;
3533

34+
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
3635
import butterknife.BindView;
3736
import butterknife.ButterKnife;
3837
import butterknife.OnClick;
@@ -132,7 +131,6 @@ protected void onCreate(Bundle savedInstanceState) {
132131
imageView.getLayoutParams();
133132
params.height = (int) (height * BADGE_IMAGE_HEIGHT_RATIO);
134133
params.width = (int) (width * BADGE_IMAGE_WIDTH_RATIO);
135-
imageView.setImageResource(R.drawable.badge);
136134
imageView.requestLayout();
137135

138136
setSupportActionBar(toolbar);
@@ -351,9 +349,8 @@ private void inflateAchievements(Achievements achievements) {
351349
String levelUpInfoString = getString(R.string.level);
352350
levelUpInfoString += " " + Integer.toString(levelInfo.getLevelNumber());
353351
levelNumber.setText(levelUpInfoString);
354-
final ContextThemeWrapper wrapper = new ContextThemeWrapper(this, levelInfo.getLevelStyle());
355-
Drawable drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.badge, wrapper.getTheme());
356-
imageView.setImageDrawable(drawable);
352+
imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge,
353+
new ContextThemeWrapper(this, levelInfo.getLevelStyle()).getTheme()));
357354
badgeText.setText(Integer.toString(levelInfo.getLevelNumber()));
358355
}
359356

0 commit comments

Comments
 (0)