From 6db7c565b72f425b048352082f6bdf3f579b7f45 Mon Sep 17 00:00:00 2001 From: Michel Heily Date: Fri, 10 Apr 2020 17:24:57 +0300 Subject: [PATCH] Android: Fix build Former-commit-id: 719e9ea62eafb45c238f551591567005f603190d --- platform/android/app/build.gradle | 4 ++-- .../java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java | 1 - .../mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/android/app/build.gradle b/platform/android/app/build.gradle index fddba6e..f074fd7 100644 --- a/platform/android/app/build.gradle +++ b/platform/android/app/build.gradle @@ -25,8 +25,8 @@ cargo { prebuiltToolchains = true verbose = true profile = 'release' - module = "../../bindings/rustboyadvance-jni" - targetDirectory = '../../target' + module = "../../../bindings/rustboyadvance-jni" + targetDirectory = '../../../target' libname = "rustboyadvance_jni" targets = ['x86', 'arm64'] apiLevel = 21 diff --git a/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java index 7871c7c..c1bdb1f 100644 --- a/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java +++ b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java @@ -363,7 +363,6 @@ public class EmulatorActivity extends AppCompatActivity implements View.OnClickL findViewById(R.id.bDpadDown).setOnTouchListener(this); findViewById(R.id.bDpadLeft).setOnTouchListener(this); findViewById(R.id.bDpadRight).setOnTouchListener(this); - findViewById(R.id.dpad_layout).setOnTouchListener(this); turboButton = findViewById(R.id.tbTurbo); turboButton.setOnClickListener(this); diff --git a/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java index 448bcef..cee895f 100644 --- a/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java +++ b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java @@ -49,7 +49,7 @@ public class RomListItemAdapter extends ArrayAdapter { if (screenshot != null) { screenshotImageView.setImageBitmap(screenshot); } else { - screenshotImageView.setImageBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.icon)); + screenshotImageView.setImageBitmap(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher)); }