chore(deps): upgrade dependencies

ThibaultBee · Dec 12, 2024 · 0aef739 · 0aef739
1 parent 7947dce
commit 0aef739
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,20 +1,20 @@
 [versions]
-agp = "8.7.2"
+agp = "8.7.3"
 concurrentFutures = "1.2.0"
 datastorePreference = "1.1.1"
 guava = "33.3.1-android"
 videoApiClient = "1.5.7"
 androidxActivity = "1.9.3"
 androidxAppcompat = "1.7.0"
-androidxCamera = "1.4.0-alpha10"
+androidxCamera = "1.4.0-alpha11"
 androidxConstraintlayout = "2.2.0"
 androidxCore = "1.15.0"
-androidxDatabinding = "8.7.2"
+androidxDatabinding = "8.7.3"
 androidxEspresso = "3.6.1"
 androidxJunit = "1.2.1"
 androidxLifecycle = "2.8.7"
 androidxLifecycleExtensions = "2.2.0"
-androidxNavigation = "2.8.3"
+androidxNavigation = "2.8.4"
 androidxPreference = "1.2.1"
 androidxTest = "1.6.1"
 dokka = "1.9.20"

diff --git a/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/PreviewView.kt b/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/PreviewView.kt
@@ -29,7 +29,8 @@ import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.camera.viewfinder.CameraViewfinder
-import androidx.camera.viewfinder.surface.ViewfinderSurfaceRequest
+import androidx.camera.viewfinder.core.ScaleType
+import androidx.camera.viewfinder.core.ViewfinderSurfaceRequest
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import io.github.thibaultbee.streampack.core.internal.utils.OrientationUtils
@@ -365,50 +366,50 @@ class PreviewView @JvmOverloads constructor(
             }
         }
 
-        private fun getPosition(scaleType: CameraViewfinder.ScaleType): Position {
+        private fun getPosition(scaleType: ScaleType): Position {
             return when (scaleType) {
-                CameraViewfinder.ScaleType.FILL_START -> Position.START
-                CameraViewfinder.ScaleType.FILL_CENTER -> Position.CENTER
-                CameraViewfinder.ScaleType.FILL_END -> Position.END
-                CameraViewfinder.ScaleType.FIT_START -> Position.START
-                CameraViewfinder.ScaleType.FIT_CENTER -> Position.CENTER
-                CameraViewfinder.ScaleType.FIT_END -> Position.END
+                ScaleType.FILL_START -> Position.START
+                ScaleType.FILL_CENTER -> Position.CENTER
+                ScaleType.FILL_END -> Position.END
+                ScaleType.FIT_START -> Position.START
+                ScaleType.FIT_CENTER -> Position.CENTER
+                ScaleType.FIT_END -> Position.END
             }
         }
 
-        private fun getScaleMode(scaleType: CameraViewfinder.ScaleType): ScaleMode {
+        private fun getScaleMode(scaleType: ScaleType): ScaleMode {
             return when (scaleType) {
-                CameraViewfinder.ScaleType.FILL_START -> ScaleMode.FILL
-                CameraViewfinder.ScaleType.FILL_CENTER -> ScaleMode.FILL
-                CameraViewfinder.ScaleType.FILL_END -> ScaleMode.FILL
-                CameraViewfinder.ScaleType.FIT_START -> ScaleMode.FIT
-                CameraViewfinder.ScaleType.FIT_CENTER -> ScaleMode.FIT
-                CameraViewfinder.ScaleType.FIT_END -> ScaleMode.FIT
+                ScaleType.FILL_START -> ScaleMode.FILL
+                ScaleType.FILL_CENTER -> ScaleMode.FILL
+                ScaleType.FILL_END -> ScaleMode.FILL
+                ScaleType.FIT_START -> ScaleMode.FIT
+                ScaleType.FIT_CENTER -> ScaleMode.FIT
+                ScaleType.FIT_END -> ScaleMode.FIT
             }
         }
 
         private fun getScaleType(
             scaleMode: ScaleMode, position: Position
-        ): CameraViewfinder.ScaleType {
+        ): ScaleType {
             when (position) {
                 Position.START -> {
                     return when (scaleMode) {
-                        ScaleMode.FILL -> CameraViewfinder.ScaleType.FILL_START
-                        ScaleMode.FIT -> CameraViewfinder.ScaleType.FIT_START
+                        ScaleMode.FILL -> ScaleType.FILL_START
+                        ScaleMode.FIT -> ScaleType.FIT_START
                     }
                 }
 
                 Position.CENTER -> {
                     return when (scaleMode) {
-                        ScaleMode.FILL -> CameraViewfinder.ScaleType.FILL_CENTER
-                        ScaleMode.FIT -> CameraViewfinder.ScaleType.FIT_CENTER
+                        ScaleMode.FILL -> ScaleType.FILL_CENTER
+                        ScaleMode.FIT -> ScaleType.FIT_CENTER
                     }
                 }
 
                 Position.END -> {
                     return when (scaleMode) {
-                        ScaleMode.FILL -> CameraViewfinder.ScaleType.FILL_END
-                        ScaleMode.FIT -> CameraViewfinder.ScaleType.FIT_END
+                        ScaleMode.FILL -> ScaleType.FILL_END
+                        ScaleMode.FIT -> ScaleType.FIT_END
                     }
                 }
             }

diff --git a/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/StreamerExtensions.kt b/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/StreamerExtensions.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import android.hardware.camera2.CameraCharacteristics
 import android.util.Size
 import android.view.Surface
-import androidx.camera.impl.utils.futures.FutureCallback
-import androidx.camera.impl.utils.futures.Futures
 import androidx.camera.viewfinder.CameraViewfinder
 import androidx.camera.viewfinder.CameraViewfinderExt.requestSurface
-import androidx.camera.viewfinder.surface.ViewfinderSurfaceRequest
-import androidx.camera.viewfinder.surface.populateFromCharacteristics
+import androidx.camera.viewfinder.core.ViewfinderSurfaceRequest
+import androidx.camera.viewfinder.core.impl.utils.futures.FutureCallback
+import androidx.camera.viewfinder.core.impl.utils.futures.Futures
+import androidx.camera.viewfinder.core.populateFromCharacteristics
 import androidx.core.content.ContextCompat
 import io.github.thibaultbee.streampack.core.streamers.interfaces.ICameraCallbackStreamer
 import io.github.thibaultbee.streampack.core.streamers.interfaces.ICameraCoroutineStreamer