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

Launch AppDetails2 instead of AppDetails in most places.

Browse Source
This commit is contained in:
Peter Serwylo 2016-12-01 13:16:43 +11:00
parent 55824a491b
commit 26b9e09f2f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -401,7 +401,6 @@
android:label="@string/app_details" android:label="@string/app_details"
android:exported="true" android:exported="true"
android:parentActivityName=".FDroid" android:parentActivityName=".FDroid"
android:theme="@style/AppThemeLight.NoActionBar"
android:configChanges="layoutDirection|locale" > android:configChanges="layoutDirection|locale" >
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"

2
app/src/main/java/org/fdroid/fdroid/FDroid.java
View File

@ -242,7 +242,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
if (!TextUtils.isEmpty(packageName)) { if (!TextUtils.isEmpty(packageName)) {
Utils.debugLog(TAG, "FDroid launched via app link for '" + packageName + "'"); Utils.debugLog(TAG, "FDroid launched via app link for '" + packageName + "'");
Intent intentToInvoke = new Intent(this, AppDetails.class); Intent intentToInvoke = new Intent(this, AppDetails2.class);
intentToInvoke.putExtra(AppDetails.EXTRA_APPID, packageName); intentToInvoke.putExtra(AppDetails.EXTRA_APPID, packageName);
startActivity(intentToInvoke); startActivity(intentToInvoke);
finish(); finish();

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

@ -17,6 +17,7 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
import org.fdroid.fdroid.AppDetails; import org.fdroid.fdroid.AppDetails;
import org.fdroid.fdroid.AppDetails2;
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.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;
@ -123,7 +124,7 @@ public class AppListItemController extends RecyclerView.ViewHolder {
return; return;
} }
Intent intent = new Intent(activity, AppDetails.class); Intent intent = new Intent(activity, AppDetails2.class);
intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName); intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
if (Build.VERSION.SDK_INT >= 21) { if (Build.VERSION.SDK_INT >= 21) {
Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon)); Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));

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

@ -22,6 +22,7 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
import org.fdroid.fdroid.AppDetails; import org.fdroid.fdroid.AppDetails;
import org.fdroid.fdroid.AppDetails2;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -119,7 +120,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
} }
/** /**
* When the user clicks/touches an app card, we launch the {@link AppDetails} activity in response. * When the user clicks/touches an app card, we launch the {@link AppDetails2} activity in response.
*/ */
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -127,7 +128,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
return; return;
} }
Intent intent = new Intent(activity, AppDetails.class); Intent intent = new Intent(activity, AppDetails2.class);
intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName); intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
if (Build.VERSION.SDK_INT >= 21) { if (Build.VERSION.SDK_INT >= 21) {
Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon)); Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));