try target 34

duzhaokun123 · Dec 24, 2023 · df32faa · df32faa
1 parent 5ac764d
commit df32faa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/android-stub/build.gradle.kts b/android-stub/build.gradle.kts
@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 31
-        targetSdk = 33
+        targetSdk = 34
 
         consumerProguardFiles("consumer-rules.pro")
     }

diff --git a/app/src/main/java/io/github/duzhaokun123/yamf/xposed/ui/window/AppWindow.kt b/app/src/main/java/io/github/duzhaokun123/yamf/xposed/ui/window/AppWindow.kt
@@ -433,6 +433,8 @@ class AppWindow(val context: Context, private val densityDpi: Int, private val f
         }
         override fun onActivityRequestedOrientationChanged(taskId: Int, requestedOrientation: Int) {}
         override fun onTaskRemovalStarted(taskInfo: ActivityManager.RunningTaskInfo?) {}
+//        override fun onTaskProfileLocked(taskInfo: ActivityManager.RunningTaskInfo?, userId: Int) {}
+
         override fun onTaskProfileLocked(taskInfo: ActivityManager.RunningTaskInfo?) {}
         override fun onTaskSnapshotChanged(taskId: Int, snapshot: TaskSnapshot?) {}
         override fun onBackPressedOnTaskRoot(taskInfo: ActivityManager.RunningTaskInfo?) {}
@@ -630,12 +632,14 @@ class AppWindow(val context: Context, private val densityDpi: Int, private val f
             return true
         }
 
+
         override fun onScroll(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             distanceX: Float,
             distanceY: Float
         ): Boolean {
+            e1 ?: return false
             val params = binding.root.layoutParams as WindowManager.LayoutParams
             params.x = (startX + (e2.rawX - e1.rawX)).toInt()
             params.y = (startY + (e2.rawY - e1.rawY)).toInt()
@@ -648,11 +652,12 @@ class AppWindow(val context: Context, private val densityDpi: Int, private val f
         }
 
         override fun onFling(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
         ): Boolean {
+            e1 ?: return false
             if (e1.source == InputDevice.SOURCE_MOUSE) return false
             val params = binding.root.layoutParams as WindowManager.LayoutParams
             runCatching {