Skip to content
Permalink
Browse files

Merge pull request #7522 from mahdihijazi/updates

Android: Bunch of cleanups & Updates
  • Loading branch information...
leoetlino committed Jan 16, 2019
2 parents c737370 + 9a45c62 commit 2c2910c129b205fc2941c4f278b247d678953061
@@ -80,6 +80,7 @@ ext {

dependencies {
implementation "com.android.support:support-v13:$androidSupportVersion"
implementation "com.android.support:exifinterface:$androidSupportVersion"
implementation "com.android.support:cardview-v7:$androidSupportVersion"
implementation "com.android.support:recyclerview-v7:$androidSupportVersion"
implementation "com.android.support:design:$androidSupportVersion"
@@ -91,14 +92,9 @@ dependencies {
// For REST calls
implementation 'com.android.volley:volley:1.1.0'

// For showing the banner as a circle a-la Material Design Guidelines
implementation 'de.hdodenhof:circleimageview:2.1.0'

// For loading huge screenshots from the disk.
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.squareup.picasso:picasso:2.71828'

// Allows FRP-style asynchronous operations in Android.
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'com.nononsenseapps:filepicker:4.1.0'
}

@@ -183,11 +183,7 @@ public static void launch(FragmentActivity activity, GameFile gameFile)
launcher.putExtra(EXTRA_SELECTED_GAMES, scanForSecondDisc(gameFile));
launcher.putExtra(EXTRA_SELECTED_TITLE, gameFile.getTitle());
launcher.putExtra(EXTRA_PLATFORM, gameFile.getPlatform());
Bundle options = new Bundle();

// I believe this warning is a bug. Activities are FragmentActivity from the support lib
//noinspection RestrictedApi
activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME, options);
activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME);
}

@Override

This file was deleted.

@@ -0,0 +1,6 @@
package org.dolphinemu.dolphinemu.utils;

public interface Action1<T>
{
void call(T t);
}
@@ -6,8 +6,6 @@

import org.dolphinemu.dolphinemu.utils.DirectoryInitialization.DirectoryInitializationState;

import rx.functions.Action1;

public class DirectoryStateReceiver extends BroadcastReceiver
{
Action1<DirectoryInitializationState> callback;
@@ -19,7 +19,7 @@ public static void loadGameBanner(ImageView imageView, GameFile gameFile)
File cover = new File(gameFile.getCustomCoverPath());
if (cover.exists())
{
Picasso.with(imageView.getContext())
Picasso.get()
.load(cover)
.noFade()
.noPlaceholder()
@@ -31,7 +31,7 @@ public static void loadGameBanner(ImageView imageView, GameFile gameFile)
}
else if ((cover = new File(gameFile.getCoverPath())).exists())
{
Picasso.with(imageView.getContext())
Picasso.get()
.load(cover)
.noFade()
.noPlaceholder()
@@ -47,7 +47,7 @@ else if ((cover = new File(gameFile.getCoverPath())).exists())
*/
else
{
Picasso.with(imageView.getContext())
Picasso.get()
.load(CoverHelper.buildGameTDBUrl(gameFile, CoverHelper.getRegion(gameFile)))
.noFade()
.noPlaceholder()
@@ -65,9 +65,9 @@ public void onSuccess()
}

@Override
public void onError() // Second pass using US region
public void onError(Exception ex) // Second pass using US region
{
Picasso.with(imageView.getContext())
Picasso.get()
.load(CoverHelper.buildGameTDBUrl(gameFile, "US"))
.fit()
.noFade()
@@ -87,9 +87,9 @@ public void onSuccess()
}

@Override
public void onError() // Third and last pass using EN region
public void onError(Exception ex) // Third and last pass using EN region
{
Picasso.with(imageView.getContext())
Picasso.get()
.load(CoverHelper.buildGameTDBUrl(gameFile, "EN"))
.fit()
.noFade()
@@ -110,7 +110,7 @@ public void onSuccess()
}

@Override
public void onError()
public void onError(Exception ex)
{
}
});

This file was deleted.

@@ -11,5 +11,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useDeprecatedNdk=true
# org.gradle.parallel=true

0 comments on commit 2c2910c

Please sign in to comment.
You can’t perform that action at this time.