kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 16:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4228 from TacoTheDank/coerceIn

Browse Source 
Replace MathUtils.clamp with Kotlin coerceIn
This commit is contained in:
Bnyro 2023-07-14 10:27:02 +02:00 committed by GitHub
commit 5b55bc47a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/helpers/AudioHelper.kt
View File

@ -3,7 +3,6 @@ package com.github.libretube.helpers
import android.content.Context import android.content.Context
import android.media.AudioManager import android.media.AudioManager
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.core.math.MathUtils
import androidx.media.AudioManagerCompat import androidx.media.AudioManagerCompat
import com.github.libretube.extensions.normalize import com.github.libretube.extensions.normalize
@ -16,7 +15,7 @@ class AudioHelper(context: Context) {
var volume: Int var volume: Int
get() = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) - minimumVolumeIndex get() = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) - minimumVolumeIndex
set(value) { set(value) {
val vol = MathUtils.clamp(value, minimumVolumeIndex, maximumVolumeIndex) val vol = value.coerceIn(minimumVolumeIndex, maximumVolumeIndex)
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, vol, 0) audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, vol, 0)
} }

3
app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt
View File

@ -4,7 +4,6 @@ import android.text.format.DateUtils
import android.view.View import android.view.View
import android.view.ViewGroup.MarginLayoutParams import android.view.ViewGroup.MarginLayoutParams
import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toBitmap
import androidx.core.math.MathUtils
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.UnstableApi
import androidx.media3.ui.TimeBar import androidx.media3.ui.TimeBar
@ -98,7 +97,7 @@ class SeekbarPreviewListener(
playerBinding.seekbarPreview.width / 2 playerBinding.seekbarPreview.width / 2
// normalize the offset to keep a minimum distance at left and right // normalize the offset to keep a minimum distance at left and right
val maxPadding = parentWidth - MIN_PADDING - playerBinding.seekbarPreview.width val maxPadding = parentWidth - MIN_PADDING - playerBinding.seekbarPreview.width
marginStart = MathUtils.clamp(offset.toInt(), MIN_PADDING, maxPadding) marginStart = offset.toInt().coerceIn(MIN_PADDING, maxPadding)
} }
} }