Merge pull request #54 from v2er-app/fix/sdk36-build-issues

Author: graycreate

app/build.gradle

@@ -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'

app/src/main/java/me/ghui/v2er/widget/richtext/GlideImageGetter.java

@@ -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;
 
@@ -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;
         }