From 1da69811b8a15a31d7db9573dbe57a2dba6cf6e8 Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Sat, 27 Oct 2018 16:05:09 +0200 Subject: Android: Update Picasso lib to latest version --- .../dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java | 2 +- .../org/dolphinemu/dolphinemu/utils/PicassoUtils.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java index 633f334c20..be254a4b7c 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java @@ -67,7 +67,7 @@ public final class GameDetailsDialog extends DialogFragment }); // Fill in the view contents. - Picasso.with(imageGameScreen.getContext()) + Picasso.get() .load(getArguments().getString(gameFile.getScreenshotPath())) .fit() .centerCrop() diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java index 5623670602..cc272e72f9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java @@ -19,7 +19,7 @@ public class PicassoUtils File cover = new File(gameFile.getCustomCoverPath()); if (cover.exists()) { - Picasso.with(imageView.getContext()) + Picasso.get() .load(cover) .noFade() .noPlaceholder() @@ -31,7 +31,7 @@ public class PicassoUtils } else if ((cover = new File(gameFile.getCoverPath())).exists()) { - Picasso.with(imageView.getContext()) + Picasso.get() .load(cover) .noFade() .noPlaceholder() @@ -47,7 +47,7 @@ public class PicassoUtils */ else { - Picasso.with(imageView.getContext()) + Picasso.get() .load(CoverHelper.buildGameTDBUrl(gameFile, CoverHelper.getRegion(gameFile))) .noFade() .noPlaceholder() @@ -65,9 +65,9 @@ public class PicassoUtils } @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 class PicassoUtils } @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 class PicassoUtils } @Override - public void onError() + public void onError(Exception ex) { } }); -- cgit v1.2.3 From 5e1a3f11a522a9363659578e3d4d120a7a984df4 Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Sat, 27 Oct 2018 16:15:12 +0200 Subject: Android: Remove rxjava lib No need to keep rxjava lib around for one simple use case --- .../app/src/main/java/org/dolphinemu/dolphinemu/utils/Action1.java | 6 ++++++ .../org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Action1.java (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Action1.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Action1.java new file mode 100644 index 0000000000..9e0d3c7b7c --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Action1.java @@ -0,0 +1,6 @@ +package org.dolphinemu.dolphinemu.utils; + +public interface Action1 +{ + void call(T t); +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java index fe51b41c3f..14ee85e402 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryStateReceiver.java @@ -6,8 +6,6 @@ import android.content.Intent; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization.DirectoryInitializationState; -import rx.functions.Action1; - public class DirectoryStateReceiver extends BroadcastReceiver { Action1 callback; -- cgit v1.2.3 From 593b69728d7e7813a3e3bbd1bfea2f2f56f3a38e Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Sat, 27 Oct 2018 16:37:34 +0200 Subject: Android: Remove dead code and related lib --- .../dolphinemu/dialogs/GameDetailsDialog.java | 83 ---------------------- 1 file changed, 83 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java deleted file mode 100644 index be254a4b7c..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.dolphinemu.dolphinemu.dialogs; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.DialogFragment; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.squareup.picasso.Picasso; - -import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.activities.EmulationActivity; -import org.dolphinemu.dolphinemu.model.GameFile; -import org.dolphinemu.dolphinemu.services.GameFileCacheService; - -import de.hdodenhof.circleimageview.CircleImageView; - -public final class GameDetailsDialog extends DialogFragment -{ - private static final String ARG_GAME_PATH = "game_path"; - - public static GameDetailsDialog newInstance(String gamePath) - { - GameDetailsDialog fragment = new GameDetailsDialog(); - - Bundle arguments = new Bundle(); - arguments.putString(ARG_GAME_PATH, gamePath); - fragment.setArguments(arguments); - - return fragment; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) - { - GameFile gameFile = GameFileCacheService.addOrGet(getArguments().getString(ARG_GAME_PATH)); - - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - ViewGroup contents = (ViewGroup) getActivity().getLayoutInflater() - .inflate(R.layout.dialog_game_details, null); - - final ImageView imageGameScreen = contents.findViewById(R.id.image_game_screen); - CircleImageView circleBanner = contents.findViewById(R.id.circle_banner); - - TextView textTitle = contents.findViewById(R.id.text_game_title); - TextView textDescription = contents.findViewById(R.id.text_description); - - TextView textCountry = contents.findViewById(R.id.text_country); - TextView textCompany = contents.findViewById(R.id.text_company); - - FloatingActionButton buttonLaunch = contents.findViewById(R.id.button_launch); - - String country = getResources().getStringArray(R.array.countryNames)[gameFile.getCountry()]; - - textTitle.setText(gameFile.getTitle()); - textDescription.setText(gameFile.getDescription()); - textCountry.setText(country); - textCompany.setText(gameFile.getCompany()); - - buttonLaunch.setOnClickListener(view -> - { - // Start the emulation activity and send the path of the clicked ROM to it. - EmulationActivity.launch(getActivity(), gameFile); - }); - - // Fill in the view contents. - Picasso.get() - .load(getArguments().getString(gameFile.getScreenshotPath())) - .fit() - .centerCrop() - .noFade() - .noPlaceholder() - .into(imageGameScreen); - - circleBanner.setImageResource(R.drawable.no_banner); - - builder.setView(contents); - return builder.create(); - } -} -- cgit v1.2.3 From 9a45c6289685c77a73995af8372ee1eb2b07c896 Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Mon, 29 Oct 2018 21:52:29 +0100 Subject: Android: Remove the use of restericted API and give AS a break --- .../org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 1c9ac12953..bf3f1589a6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -173,11 +173,7 @@ public final class EmulationActivity extends AppCompatActivity launcher.putExtra(EXTRA_SELECTED_GAME, gameFile.getPath()); 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 -- cgit v1.2.3