diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index c12a5dff3..f90a7a9ee 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.android.application' * This lets us upload a new build at most every 10 seconds for the * next 680 years. */ -def autoVersion = (int)(((new Date().getTime()/1000) - 1451606400) / 10) +def autoVersion = (int) (((new Date().getTime() / 1000) - 1451606400) / 10) def buildType android { @@ -106,6 +106,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" @@ -113,9 +114,6 @@ dependencies { // Android TV UI libraries. implementation "com.android.support:leanback-v17:$androidSupportVersion" - // 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.71828' diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 05aa8637a..467ceccf1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -112,11 +112,7 @@ public final class EmulationActivity extends AppCompatActivity { launcher.putExtra(EXTRA_SELECTED_GAME, path); launcher.putExtra(EXTRA_SELECTED_TITLE, title); - 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); } private void showRunningNotification() { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/dialogs/GameDetailsDialog.java b/src/android/app/src/main/java/org/citra/citra_emu/dialogs/GameDetailsDialog.java deleted file mode 100644 index d086e40bf..000000000 --- a/src/android/app/src/main/java/org/citra/citra_emu/dialogs/GameDetailsDialog.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.citra.citra_emu.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.citra.citra_emu.R; -import org.citra.citra_emu.activities.EmulationActivity; - -import de.hdodenhof.circleimageview.CircleImageView; - -public final class GameDetailsDialog extends DialogFragment { - private static final String ARG_GAME_TITLE = "game_title"; - private static final String ARG_GAME_DESCRIPTION = "game_description"; - private static final String ARG_GAME_COUNTRY = "game_country"; - private static final String ARG_GAME_DATE = "game_date"; - private static final String ARG_GAME_PATH = "game_path"; - private static final String ARG_GAME_SCREENSHOT_PATH = "game_screenshot_path"; - - // TODO Add all of this to the Loader in GameActivity.java - public static GameDetailsDialog newInstance(String title, String description, int country, - String company, String path, String screenshotPath) { - GameDetailsDialog fragment = new GameDetailsDialog(); - - Bundle arguments = new Bundle(); - arguments.putString(ARG_GAME_TITLE, title); - arguments.putString(ARG_GAME_DESCRIPTION, description); - arguments.putInt(ARG_GAME_COUNTRY, country); - arguments.putString(ARG_GAME_DATE, company); - arguments.putString(ARG_GAME_PATH, path); - arguments.putString(ARG_GAME_SCREENSHOT_PATH, screenshotPath); - fragment.setArguments(arguments); - - return fragment; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - 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_company); - - TextView textCountry = contents.findViewById(R.id.text_country); - TextView textDate = contents.findViewById(R.id.text_date); - - FloatingActionButton buttonLaunch = contents.findViewById(R.id.button_launch); - - int countryIndex = getArguments().getInt(ARG_GAME_COUNTRY); - String country = getResources().getStringArray(R.array.countryNames)[countryIndex]; - - textTitle.setText(getArguments().getString(ARG_GAME_TITLE)); - textDescription.setText(getArguments().getString(ARG_GAME_DESCRIPTION)); - textCountry.setText(country); - textDate.setText(getArguments().getString(ARG_GAME_DATE)); - - buttonLaunch.setOnClickListener(view -> - { - // Start the emulation activity and send the path of the clicked ROM to it. - EmulationActivity.launch(getActivity(), getArguments().getString(ARG_GAME_PATH), getArguments().getString(ARG_GAME_TITLE)); - }); - - // Fill in the view contents. - Picasso.get() - .load(getArguments().getString(ARG_GAME_SCREENSHOT_PATH)) - .fit() - .centerCrop() - .noFade() - .noPlaceholder() - .into(imageGameScreen); - - circleBanner.setImageResource(R.drawable.no_banner); - - builder.setView(contents); - return builder.create(); - } -} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java new file mode 100644 index 000000000..886846ec5 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java @@ -0,0 +1,5 @@ +package org.citra.citra_emu.utils; + +public interface Action1 { + void call(T t); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java index 851f1e1d6..6ddecac68 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java @@ -7,8 +7,6 @@ import android.content.Intent; import org.citra.citra_emu.utils.DirectoryInitialization; import org.citra.citra_emu.utils.DirectoryInitialization.DirectoryInitializationState; -import rx.functions.Action1; - public class DirectoryStateReceiver extends BroadcastReceiver { Action1 callback; diff --git a/src/android/app/src/main/res/layout/dialog_game_details.xml b/src/android/app/src/main/res/layout/dialog_game_details.xml deleted file mode 100644 index efd17e74c..000000000 --- a/src/android/app/src/main/res/layout/dialog_game_details.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -