summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2019-06-16 11:14:30 +0200
committerJosJuice <josjuice@gmail.com>2019-11-23 17:48:43 +0100
commit84e616337d7bee085546f7b7f1d037eea6d5312e (patch)
tree6b88d8379bedec35a744d9af21c1000de72ff4d0 /Source/Android
parent100e7e2b3d40a2329c8cd9cc1394d12fe955b2ba (diff)
GameDetailsDialog: Remove the screenshot ImageView
It takes up a lot of space on the screen, and the functionality for saving these screenshots isn't in Dolphin anymore as far as I can tell.
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java10
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java7
-rw-r--r--Source/Android/app/src/main/res/layout/dialog_game_details.xml19
3 files changed, 2 insertions, 34 deletions
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 42b0224088..f991e685f3 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
@@ -42,7 +42,6 @@ public final class GameDetailsDialog extends DialogFragment
ViewGroup contents = (ViewGroup) getActivity().getLayoutInflater()
.inflate(R.layout.dialog_game_details, null);
- final ImageView imageGameScreen = contents.findViewById(R.id.image_game_screen);
ImageView banner = contents.findViewById(R.id.banner);
TextView textTitle = contents.findViewById(R.id.text_game_title);
@@ -71,15 +70,6 @@ public final class GameDetailsDialog extends DialogFragment
EmulationActivity.launch(getActivity(), gameFile);
});
- // Fill in the view contents.
- Picasso.get()
- .load(getArguments().getString(gameFile.getScreenshotPath()))
- .fit()
- .centerCrop()
- .noFade()
- .noPlaceholder()
- .into(imageGameScreen);
-
PicassoUtils.loadGameBanner(banner, gameFile);
builder.setView(contents);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java
index 70be6cd080..dea006f24e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java
@@ -54,11 +54,4 @@ public class GameFile
{
return getPath().substring(0, getPath().lastIndexOf(".")) + ".cover.png";
}
-
- public String getScreenshotPath()
- {
- String gameId = getGameId();
- return "file://" + Environment.getExternalStorageDirectory().getPath() +
- "/dolphin-emu/ScreenShots/" + gameId + "/" + gameId + "-1.png";
- }
}
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
index 2e8b4a7df7..86db18e487 100644
--- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingStart="24dp"
android:paddingEnd="24dp"
@@ -10,7 +10,7 @@
<RelativeLayout
android:layout_width="480dp"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content">
<ImageView
android:id="@+id/banner"
@@ -21,25 +21,11 @@
android:layout_marginBottom="16dp"
tools:src="@drawable/placeholder_banner"/>
- <ImageView
- android:id="@+id/image_game_screen"
- android:layout_width="match_parent"
- android:layout_height="320dp"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:transitionName="image_game_screen"
- tools:scaleType="centerCrop"
- tools:src="@drawable/placeholder_screenshot"/>
-
<TextView
android:id="@+id/text_game_title"
style="@android:style/TextAppearance.Material.Headline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/image_game_screen"
android:layout_marginTop="24dp"
android:ellipsize="end"
tools:text="Rhythm Heaven Fever"/>
@@ -111,7 +97,6 @@
android:id="@+id/button_launch"
android:layout_width="56dp"
android:layout_height="56dp"
- android:layout_alignBottom="@+id/image_game_screen"
android:layout_alignEnd="@+id/text_game_title"
android:layout_marginBottom="-28dp"
android:src="@drawable/ic_play"