Merge pull request #8747 from Isira-Seneviratne/Range_limit

Use range-limiting methods in more places.

Author: Stypox

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

@@ -40,6 +40,7 @@ import androidx.annotation.Nullable
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.edit
+import androidx.core.math.MathUtils
 import androidx.core.os.bundleOf
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.isVisible
@@ -603,7 +604,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         // state until the user scrolls them out of the visible area which causes a update/bind-call
         groupAdapter.notifyItemRangeChanged(
             0,
-            minOf(groupAdapter.itemCount, maxOf(highlightCount, lastNewItemsCount))
+            MathUtils.clamp(highlightCount, lastNewItemsCount, groupAdapter.itemCount)
         )
 
         if (highlightCount > 0) {

app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt

@@ -7,6 +7,7 @@ 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
@@ -18,8 +19,6 @@ import org.schabi.newpipe.player.helper.PlayerHelper
 import org.schabi.newpipe.player.ui.MainPlayerUi
 import org.schabi.newpipe.util.ThemeHelper.getAndroidDimenPx
 import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
 
 /**
  * GestureListener for the player
@@ -114,7 +113,7 @@ class MainPlayerGestureListener(
 
         // Update progress bar
         val oldBrightness = layoutParams.screenBrightness
-        bar.progress = (bar.max * max(0f, min(1f, oldBrightness))).toInt()
+        bar.progress = (bar.max * MathUtils.clamp(oldBrightness, 0f, 1f)).toInt()
         bar.incrementProgressBy(distanceY.toInt())
 
         // Update brightness

app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java

@@ -291,7 +291,7 @@ public void changePopupSize(final int width) {
         }
 
         final float minimumWidth = context.getResources().getDimension(R.dimen.popup_minimum_width);
-        final int actualWidth = Math.min((int) Math.max(width, minimumWidth), screenWidth);
+        final int actualWidth = MathUtils.clamp(width, (int) minimumWidth, screenWidth);
         final int actualHeight = (int) getMinimumVideoHeight(width);
         if (DEBUG) {
             Log.d(TAG, "updatePopupSize() updated values:"

app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt

@@ -100,13 +100,11 @@ object ReleaseVersionUtil {
      * @return Epoch second of expiry date time
      */
     fun coerceUpdateCheckExpiry(expiryString: String?): Long {
-        val now = ZonedDateTime.now()
-        return expiryString?.let {
-            var expiry =
-                ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(expiryString))
-            expiry = maxOf(expiry, now.plusHours(6))
-            expiry = minOf(expiry, now.plusHours(72))
-            expiry.toEpochSecond()
-        } ?: now.plusHours(6).toEpochSecond()
+        val nowPlus6Hours = ZonedDateTime.now().plusHours(6)
+        val expiry = expiryString?.let {
+            ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(it))
+                .coerceIn(nowPlus6Hours, nowPlus6Hours.plusHours(66))
+        } ?: nowPlus6Hours
+        return expiry.toEpochSecond()
     }
 }