Target sdk 34

mediathekview · Jul 21, 2023 · beb5228 · beb5228
1 parent 7397c94
commit beb5228
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,13 +6,13 @@ apply plugin: 'koin'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 
 android {
-	compileSdkVersion 33
-	buildToolsVersion '33.0.2'
+	compileSdkVersion 34
+	buildToolsVersion '34.0.0'
 
 	defaultConfig {
 		applicationId "de.christinecoenen.code.zapp"
 		minSdkVersion 26
-		targetSdkVersion 33
+		targetSdkVersion 34
 		versionCode 67
 		versionName "8.3.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
 	<uses-feature
 		android:name="android.hardware.touchscreen"

diff --git a/app/src/main/java/de/christinecoenen/code/zapp/utils/video/SwipeablePlayerView.kt b/app/src/main/java/de/christinecoenen/code/zapp/utils/video/SwipeablePlayerView.kt
@@ -192,12 +192,18 @@ class SwipeablePlayerView @JvmOverloads constructor(
 			return super.onDown(e)
 		}
 
+		// removing this leads to a compilation error with sdk 33
+		@Suppress("NOTHING_TO_OVERRIDE")
 		override fun onScroll(
-			e1: MotionEvent,
+			e1: MotionEvent?,
 			e2: MotionEvent,
 			distanceX: Float,
 			distanceY: Float
 		): Boolean {
+			if (e1 == null) {
+				return false
+			}
+
 			if (!canUseWipeControls || e1.y <= forbiddenAreaSizeTop) {
 				return super.onScroll(e1, e2, distanceX, distanceY)
 			}