diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java index 74057f24d..0d818f793 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java @@ -11,13 +11,6 @@ import android.graphics.Outline; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.core.util.Pair; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewOutlineProvider; @@ -27,6 +20,15 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; +import androidx.core.util.Pair; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.recyclerview.widget.RecyclerView; + import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; import org.fdroid.fdroid.Preferences; @@ -444,15 +446,13 @@ public abstract class AppListItemController extends RecyclerView.ViewHolder { Intent intent = new Intent(activity, AppDetailsActivity.class); intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName); - if (Build.VERSION.SDK_INT >= 21) { - String transitionAppIcon = activity.getString(R.string.transition_app_item_icon); - Pair iconTransitionPair = Pair.create((View) icon, transitionAppIcon); - Bundle bundle = ActivityOptionsCompat - .makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); - activity.startActivity(intent, bundle); - } else { - activity.startActivity(intent); - } + String transitionAppIcon = activity.getString(R.string.transition_app_item_icon); + Pair iconTransitionPair = Pair.create((View) icon, transitionAppIcon); + // unchecked since the right type is passed as 2nd varargs arg: Pair + @SuppressWarnings("unchecked") + Bundle bundle = ActivityOptionsCompat + .makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); + ContextCompat.startActivity(activity, intent, bundle); } }; diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java index 7df851d07..15209347a 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java @@ -2,17 +2,19 @@ package org.fdroid.fdroid.views.categories; import android.app.Activity; import android.content.Intent; -import android.os.Build; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; import androidx.core.util.Pair; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; @@ -117,16 +119,12 @@ public class AppCardController extends RecyclerView.ViewHolder Intent intent = new Intent(activity, AppDetailsActivity.class); intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName); - if (Build.VERSION.SDK_INT >= 21) { - Pair iconTransitionPair = Pair.create((View) icon, - activity.getString(R.string.transition_app_item_icon)); + Pair iconTransitionPair = Pair.create((View) icon, + activity.getString(R.string.transition_app_item_icon)); - // unchecked since the right type is passed as 2nd varargs arg: Pair - @SuppressWarnings("unchecked") - Bundle b = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); - activity.startActivity(intent, b); - } else { - activity.startActivity(intent); - } + // unchecked since the right type is passed as 2nd varargs arg: Pair + @SuppressWarnings("unchecked") + Bundle b = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); + ContextCompat.startActivity(activity, intent, b); } }