fix build

jordond · Feb 12, 2025 · 65bea6d · 65bea6d
1 parent f531004
commit 65bea6d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/demo/src/main/java/dev/transformerkt/demo/ui/HomeScreen.kt b/demo/src/main/java/dev/transformerkt/demo/ui/HomeScreen.kt
@@ -22,7 +22,6 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
-import com.ramcosta.composedestinations.navigation.popUpTo
 import com.ramcosta.composedestinations.spec.Direction
 import dev.transformerkt.demo.ui.destinations.ConcatScreenDestination
 import dev.transformerkt.demo.ui.destinations.EffectsScreenDestination
@@ -68,7 +67,7 @@ fun HomeScreen(
 }
 
 private fun DestinationsNavigator.nav(direction: Direction) {
-    navigate(direction = direction, onlyIfResumed = true) {
+    navigate(direction = direction) {
         popUpTo(HomeScreenDestination) {
             inclusive = true
         }

diff --git a/transformerkt/src/main/java/dev/transformerkt/ktx/effects/BitmapOverlay.kt b/transformerkt/src/main/java/dev/transformerkt/ktx/effects/BitmapOverlay.kt
@@ -9,7 +9,6 @@ import androidx.annotation.DrawableRes
 import androidx.media3.effect.BitmapOverlay
 import androidx.media3.effect.OverlayEffect
 import androidx.media3.effect.OverlaySettings
-import com.google.common.collect.ImmutableList
 import dev.transformerkt.dsl.effects.EffectsBuilder
 
 @CheckResult
@@ -20,7 +19,7 @@ public fun bitmapOverlayEffect(
     val overlay =
         if (settings == null) BitmapOverlay.createStaticBitmapOverlay(bitmap)
         else BitmapOverlay.createStaticBitmapOverlay(bitmap, settings)
-    return OverlayEffect(ImmutableList.of(overlay))
+    return OverlayEffect(listOf(overlay))
 }
 
 @CheckResult
@@ -30,7 +29,7 @@ public fun bitmapOverlayEffect(
     settings: OverlaySettings,
 ): OverlayEffect {
     val overlay = BitmapOverlay.createStaticBitmapOverlay(context, uri, settings)
-    return OverlayEffect(ImmutableList.of(overlay))
+    return OverlayEffect(listOf(overlay))
 }
 
 @CheckResult

diff --git a/transformerkt/src/main/java/dev/transformerkt/ktx/effects/DrawableOverlay.kt b/transformerkt/src/main/java/dev/transformerkt/ktx/effects/DrawableOverlay.kt
@@ -5,7 +5,6 @@ import androidx.annotation.CheckResult
 import androidx.media3.effect.DrawableOverlay
 import androidx.media3.effect.OverlayEffect
 import androidx.media3.effect.OverlaySettings
-import com.google.common.collect.ImmutableList
 import dev.transformerkt.dsl.effects.EffectsBuilder
 
 @CheckResult
@@ -14,7 +13,7 @@ public fun drawableOverlayEffect(
     settings: OverlaySettings,
 ): OverlayEffect {
     val overlay = DrawableOverlay.createStaticDrawableOverlay(drawable, settings)
-    return OverlayEffect(ImmutableList.of(overlay))
+    return OverlayEffect(listOf(overlay))
 }
 
 public fun EffectsBuilder.drawableOverlay(

diff --git a/transformerkt/src/main/java/dev/transformerkt/ktx/effects/TextOverlay.kt b/transformerkt/src/main/java/dev/transformerkt/ktx/effects/TextOverlay.kt
@@ -7,7 +7,6 @@ import androidx.core.text.toSpannable
 import androidx.media3.effect.OverlayEffect
 import androidx.media3.effect.OverlaySettings
 import androidx.media3.effect.TextOverlay
-import com.google.common.collect.ImmutableList
 import dev.transformerkt.dsl.effects.EffectsBuilder
 
 @CheckResult
@@ -19,7 +18,7 @@ public fun textOverlayEffect(
         if (settings == null) TextOverlay.createStaticTextOverlay(text)
         else TextOverlay.createStaticTextOverlay(text, settings)
 
-    return OverlayEffect(ImmutableList.of(overlay))
+    return OverlayEffect(listOf(overlay))
 }
 
 public fun EffectsBuilder.textOverlay(