From b1faed586d446b98bd49bfc60837c0bb176fe7a0 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Tue, 19 Sep 2023 16:32:37 -0400 Subject: [PATCH] Replace MathUtils.clamp with Kotlin coerceIn --- .../schabi/newpipe/local/feed/FeedFragment.kt | 3 +-- .../gesture/MainPlayerGestureListener.kt | 3 +-- .../gesture/PopupPlayerGestureListener.kt | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt index 4f153dcf8..83882d35f 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt @@ -38,7 +38,6 @@ import android.view.ViewGroup import android.widget.Button import androidx.appcompat.app.AlertDialog import androidx.core.content.edit -import androidx.core.math.MathUtils import androidx.core.os.bundleOf import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider @@ -589,7 +588,7 @@ class FeedFragment : BaseStateFragment() { // state until the user scrolls them out of the visible area which causes a update/bind-call groupAdapter.notifyItemRangeChanged( 0, - MathUtils.clamp(highlightCount, lastNewItemsCount, groupAdapter.itemCount) + highlightCount.coerceIn(lastNewItemsCount, groupAdapter.itemCount) ) if (highlightCount > 0) { diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt index 0d28f2f58..8acd70413 100644 --- a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt +++ b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt @@ -7,7 +7,6 @@ import android.view.View.OnTouchListener import android.widget.ProgressBar import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources -import androidx.core.math.MathUtils import androidx.core.view.isVisible import org.schabi.newpipe.MainActivity import org.schabi.newpipe.R @@ -113,7 +112,7 @@ class MainPlayerGestureListener( // Update progress bar val oldBrightness = layoutParams.screenBrightness - bar.progress = (bar.max * MathUtils.clamp(oldBrightness, 0f, 1f)).toInt() + bar.progress = (bar.max * oldBrightness.coerceIn(0f, 1f)).toInt() bar.incrementProgressBy(distanceY.toInt()) // Update brightness diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt index a540c0ab0..23edcaeb8 100644 --- a/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt +++ b/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt @@ -4,7 +4,7 @@ import android.util.Log import android.view.MotionEvent import android.view.View import android.view.ViewConfiguration -import androidx.core.math.MathUtils +import androidx.core.view.isVisible import org.schabi.newpipe.MainActivity import org.schabi.newpipe.ktx.AnimationType import org.schabi.newpipe.ktx.animate @@ -235,14 +235,16 @@ class PopupPlayerGestureListener( isMoving = true val diffX = (movingEvent.rawX - initialEvent.rawX) - val posX = MathUtils.clamp( - initialPopupX + diffX, - 0f, (playerUi.screenWidth - playerUi.popupLayoutParams.width).toFloat() + val posX = (initialPopupX + diffX).coerceIn( + 0f, + (playerUi.screenWidth - playerUi.popupLayoutParams.width).toFloat() + .coerceAtLeast(0f) ) val diffY = (movingEvent.rawY - initialEvent.rawY) - val posY = MathUtils.clamp( - initialPopupY + diffY, - 0f, (playerUi.screenHeight - playerUi.popupLayoutParams.height).toFloat() + val posY = (initialPopupY + diffY).coerceIn( + 0f, + (playerUi.screenHeight - playerUi.popupLayoutParams.height).toFloat() + .coerceAtLeast(0f) ) playerUi.popupLayoutParams.x = posX.toInt() @@ -251,8 +253,7 @@ class PopupPlayerGestureListener( // -- Determine if the ClosingOverlayView (red X) has to be shown or hidden -- val showClosingOverlayView: Boolean = playerUi.isInsideClosingRadius(movingEvent) // Check if an view is in expected state and if not animate it into the correct state - val expectedVisibility = if (showClosingOverlayView) View.VISIBLE else View.GONE - if (binding.closingOverlay.visibility != expectedVisibility) { + if (binding.closingOverlay.isVisible != showClosingOverlayView) { binding.closingOverlay.animate(showClosingOverlayView, 200) }