Skip to content

Fix: Update to Android SDK 36 and resolve build issues #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graycreate merged 1 commit into from
Jul 9, 2025
Merged

Fix: Update to Android SDK 36 and resolve build issues #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdk 34
buildToolsVersion "34.0.0"
compileSdk 36
buildToolsVersion "36.0.0"
buildFeatures {
buildConfig true
}
defaultConfig {
applicationId "me.ghui.v2er"
minSdkVersion 27
targetSdkVersion 34
targetSdkVersion 36
versionCode rootProject.ext.app.versionCode
versionName rootProject.ext.app.versionName
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/me/ghui/v2er/widget/richtext/GlideImageGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.graphics.drawable.DrawableWrapperCompat;
import androidx.appcompat.graphics.drawable.DrawableWrapper;
import android.text.Html;
import android.widget.TextView;

Expand Down Expand Up @@ -77,19 +77,19 @@ public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) {

private class WrapperTarget extends SimpleTarget<Drawable> {
private int mMaxWidth;
private DrawableWrapperCompat wrapperDrawable;
private DrawableWrapper wrapperDrawable;

@SuppressLint("RestrictedApi")
public WrapperTarget(int maxWidth) {
//这里只缩小不放大
super(maxWidth, TexureUtil.fitMaxHeight());
this.mMaxWidth = maxWidth;
wrapperDrawable = new DrawableWrapperCompat(null);
wrapperDrawable = new DrawableWrapper(null);
wrapperDrawable.setCallback(GlideImageGetter.this);
updateWrapperedDrawable(mLoadingDrawable);
}

public DrawableWrapperCompat getWrapperDrawable() {
public DrawableWrapper getWrapperDrawable() {
return wrapperDrawable;
}

Expand Down
Loading