diff --git a/app/build.gradle b/app/build.gradle index 7b69b5b72..5fcbe468d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 namespace 'org.schabi.newpipe' defaultConfig { @@ -211,7 +211,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.fragment:fragment-ktx:1.4.1' implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}" diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index a25d0fae4..4c82e7ea7 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -33,7 +33,6 @@ import android.os.Looper; import android.provider.Settings; import android.util.DisplayMetrics; import android.util.Log; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -54,6 +53,7 @@ import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; +import androidx.core.util.TypedValueCompat; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; @@ -111,12 +111,12 @@ import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.PermissionHelper; -import org.schabi.newpipe.util.image.PicassoHelper; +import org.schabi.newpipe.util.PlayButtonHelper; import org.schabi.newpipe.util.StreamTypeUtil; import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.external_communication.KoreUtils; import org.schabi.newpipe.util.external_communication.ShareUtils; -import org.schabi.newpipe.util.PlayButtonHelper; +import org.schabi.newpipe.util.image.PicassoHelper; import java.util.ArrayList; import java.util.Iterator; @@ -990,8 +990,8 @@ public final class VideoDetailFragment final int height = DeviceUtils.getWindowHeight(activity.getWindowManager()); final int viewPagerVisibleHeight = height - pagerHitRect.top; // see TabLayout.DEFAULT_HEIGHT, which is equal to 48dp - final float tabLayoutHeight = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics()); + final float tabLayoutHeight = TypedValueCompat.dpToPx(48, + getResources().getDisplayMetrics()); if (viewPagerVisibleHeight > tabLayoutHeight * 2) { // no translation at all when viewPagerVisibleHeight > tabLayout.height * 3 diff --git a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java index e9678c2b0..4a8b5f04b 100644 --- a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java +++ b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java @@ -12,7 +12,6 @@ import android.hardware.input.InputManager; import android.os.BatteryManager; import android.os.Build; import android.provider.Settings; -import android.util.TypedValue; import android.view.InputDevice; import android.view.KeyEvent; import android.view.WindowInsets; @@ -22,6 +21,7 @@ import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; +import androidx.core.util.TypedValueCompat; import androidx.preference.PreferenceManager; import org.schabi.newpipe.App; @@ -266,18 +266,12 @@ public final class DeviceUtils { public static int dpToPx(@Dimension(unit = Dimension.DP) final int dp, @NonNull final Context context) { - return (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, - dp, - context.getResources().getDisplayMetrics()); + return (int) TypedValueCompat.dpToPx(dp, context.getResources().getDisplayMetrics()); } public static int spToPx(@Dimension(unit = Dimension.SP) final int sp, @NonNull final Context context) { - return (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_SP, - sp, - context.getResources().getDisplayMetrics()); + return (int) TypedValueCompat.spToPx(sp, context.getResources().getDisplayMetrics()); } public static boolean isLandscape(final Context context) {