From 518ed15c881bc6365e9c1dd3d8673cfd6deef876 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 14 Jul 2023 01:02:20 -0400 Subject: [PATCH] Replace MathUtils.clamp with Kotlin coerceIn --- app/src/main/java/com/github/libretube/helpers/AudioHelper.kt | 3 +-- .../github/libretube/ui/listeners/SeekbarPreviewListener.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt b/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt index 2f171864b..ea4044d0f 100644 --- a/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt +++ b/app/src/main/java/com/github/libretube/helpers/AudioHelper.kt @@ -3,7 +3,6 @@ package com.github.libretube.helpers import android.content.Context import android.media.AudioManager import androidx.core.content.getSystemService -import androidx.core.math.MathUtils import androidx.media.AudioManagerCompat import com.github.libretube.extensions.normalize @@ -16,7 +15,7 @@ class AudioHelper(context: Context) { var volume: Int get() = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) - minimumVolumeIndex set(value) { - val vol = MathUtils.clamp(value, minimumVolumeIndex, maximumVolumeIndex) + val vol = value.coerceIn(minimumVolumeIndex, maximumVolumeIndex) audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, vol, 0) } diff --git a/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt b/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt index 57f5866b1..34c9dd10e 100644 --- a/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt +++ b/app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt @@ -4,7 +4,6 @@ import android.text.format.DateUtils import android.view.View import android.view.ViewGroup.MarginLayoutParams import androidx.core.graphics.drawable.toBitmap -import androidx.core.math.MathUtils import androidx.core.view.updateLayoutParams import androidx.media3.common.util.UnstableApi import androidx.media3.ui.TimeBar @@ -98,7 +97,7 @@ class SeekbarPreviewListener( playerBinding.seekbarPreview.width / 2 // normalize the offset to keep a minimum distance at left and right val maxPadding = parentWidth - MIN_PADDING - playerBinding.seekbarPreview.width - marginStart = MathUtils.clamp(offset.toInt(), MIN_PADDING, maxPadding) + marginStart = offset.toInt().coerceIn(MIN_PADDING, maxPadding) } }