From 75ea33fd337c492c6923a19999b4bf80a7dc5f26 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sun, 30 Jul 2023 14:50:58 +0200
Subject: [PATCH] feat: target sdk 34 (#405)

---
 app/phone/build.gradle.kts                                  | 6 +++---
 .../java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt   | 6 ++++--
 core/build.gradle.kts                                       | 4 ++--
 data/build.gradle.kts                                       | 4 ++--
 player/core/build.gradle.kts                                | 4 ++--
 player/video/build.gradle.kts                               | 4 ++--
 preferences/build.gradle.kts                                | 4 ++--
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts
index f0adf3df..71067408 100644
--- a/app/phone/build.gradle.kts
+++ b/app/phone/build.gradle.kts
@@ -11,13 +11,13 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         applicationId = "dev.jdtech.jellyfin"
         minSdk = 27
-        targetSdk = 33
+        targetSdk = 34
 
         val appVersionCode: Int by rootProject.extra
         val appVersionName: String by rootProject.extra
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
index 05981bc7..8c11ba3a 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
@@ -167,11 +167,12 @@ class PlayerGestureHelper(
         object : GestureDetector.SimpleOnGestureListener() {
             @SuppressLint("SetTextI18n")
             override fun onScroll(
-                firstEvent: MotionEvent,
+                firstEvent: MotionEvent?,
                 currentEvent: MotionEvent,
                 distanceX: Float,
                 distanceY: Float,
             ): Boolean {
+                if (firstEvent == null) return false
                 // Excludes area where app gestures conflicting with system gestures
                 if (inExclusionArea(firstEvent)) return false
                 // Disables seek gestures if view is locked
@@ -209,11 +210,12 @@ class PlayerGestureHelper(
         object : GestureDetector.SimpleOnGestureListener() {
             @SuppressLint("SetTextI18n")
             override fun onScroll(
-                firstEvent: MotionEvent,
+                firstEvent: MotionEvent?,
                 currentEvent: MotionEvent,
                 distanceX: Float,
                 distanceY: Float,
             ): Boolean {
+                if (firstEvent == null) return false
                 // Excludes area where app gestures conflicting with system gestures
                 if (inExclusionArea(firstEvent)) return false
                 // Disables volume gestures when player is locked
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3cae57a3..103f6c2d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -10,8 +10,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin.core"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdk = 27
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 831c0018..c7043fb7 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin.data"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdk = 27
diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts
index a58c4ebd..e01a9bc0 100644
--- a/player/core/build.gradle.kts
+++ b/player/core/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin.player.core"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdk = 27
diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts
index 55765049..99562c0f 100644
--- a/player/video/build.gradle.kts
+++ b/player/video/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin.player.video"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdk = 27
diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts
index 3d109fd9..c07610b7 100644
--- a/preferences/build.gradle.kts
+++ b/preferences/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.jellyfin.preferences"
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdk = 27