Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ContextCompat.startActivity().

Browse Source
This commit is contained in:
Isira Seneviratne 2020-07-15 20:47:28 +05:30
parent 2f0994d16f
commit 07f3e778d3
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
View File

@ -11,13 +11,6 @@ import android.graphics.Outline;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; 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.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewOutlineProvider; import android.view.ViewOutlineProvider;
@ -27,6 +20,15 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; 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;
import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
@ -444,15 +446,13 @@ public abstract class AppListItemController extends RecyclerView.ViewHolder {
Intent intent = new Intent(activity, AppDetailsActivity.class); Intent intent = new Intent(activity, AppDetailsActivity.class);
intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName); intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName);
if (Build.VERSION.SDK_INT >= 21) { String transitionAppIcon = activity.getString(R.string.transition_app_item_icon);
String transitionAppIcon = activity.getString(R.string.transition_app_item_icon); Pair<View, String> iconTransitionPair = Pair.create((View) icon, transitionAppIcon);
Pair<View, String> iconTransitionPair = Pair.create((View) icon, transitionAppIcon); // unchecked since the right type is passed as 2nd varargs arg: Pair<View, String>
Bundle bundle = ActivityOptionsCompat @SuppressWarnings("unchecked")
.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); Bundle bundle = ActivityOptionsCompat
activity.startActivity(intent, bundle); .makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle();
} else { ContextCompat.startActivity(activity, intent, bundle);
activity.startActivity(intent);
}
} }
}; };

26
app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
View File

@ -2,17 +2,19 @@ package org.fdroid.fdroid.views.categories;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.app.ActivityOptionsCompat; import androidx.core.app.ActivityOptionsCompat;
import androidx.core.content.ContextCompat;
import androidx.core.util.Pair; import androidx.core.util.Pair;
import androidx.recyclerview.widget.RecyclerView; 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.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.App;
@ -117,16 +119,12 @@ public class AppCardController extends RecyclerView.ViewHolder
Intent intent = new Intent(activity, AppDetailsActivity.class); Intent intent = new Intent(activity, AppDetailsActivity.class);
intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName); intent.putExtra(AppDetailsActivity.EXTRA_APPID, currentApp.packageName);
if (Build.VERSION.SDK_INT >= 21) { Pair<View, String> iconTransitionPair = Pair.create((View) icon,
Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));
activity.getString(R.string.transition_app_item_icon));
// unchecked since the right type is passed as 2nd varargs arg: Pair<View, String> // unchecked since the right type is passed as 2nd varargs arg: Pair<View, String>
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Bundle b = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle(); Bundle b = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle();
activity.startActivity(intent, b); ContextCompat.startActivity(activity, intent, b);
} else {
activity.startActivity(intent);
}
} }
} }