From eb3722b7f0e2dc717c618da736826761bcebfeca Mon Sep 17 00:00:00 2001
From: Gray Zhang <ghuiii.zhang@gmail.com>
Date: Wed, 9 Jul 2025 19:02:46 +0800
Subject: [PATCH] fix: Update to Android SDK 36 and fix DrawableWrapper
 compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Updated compileSdk and targetSdk from 34 to 36 (Android 15)
- Updated buildToolsVersion to 36.0.0 to match local installation
- Fixed DrawableWrapper import issue in GlideImageGetter
- Removed buildToolsVersion specification and re-added it for compatibility

These changes allow the app to build with the latest Android SDK and fix
compilation errors related to AndroidX API changes.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 app/build.gradle                                          | 6 +++---
 .../me/ghui/v2er/widget/richtext/GlideImageGetter.java    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 917dcc07..eba100b7 100644
--- a/app/build.gradle
+++ b/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'
diff --git a/app/src/main/java/me/ghui/v2er/widget/richtext/GlideImageGetter.java b/app/src/main/java/me/ghui/v2er/widget/richtext/GlideImageGetter.java
index 4dd80b79..07c7217b 100644
--- a/app/src/main/java/me/ghui/v2er/widget/richtext/GlideImageGetter.java
+++ b/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;
         }