summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2018-08-31 19:29:49 -0700
committerGitHub <noreply@github.com>2018-08-31 19:29:49 -0700
commit4a34dba00137ec9d9456e2f500ffd88731112909 (patch)
tree1e7430cc9552794b960cef88e98ea403e7125954 /Source/Android
parent3405c7d420cb909e00a3140ab2e31b911afe176c (diff)
parent374b0bf2dc7b8b5b665f392747c69cd06b92cecf (diff)
Merge pull request #7387 from zackhow/covers-nostretch
Android: Fix cover stretching and show more games per row
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PicassoUtils.java13
-rw-r--r--Source/Android/app/src/main/res/layout/card_game.xml2
-rw-r--r--Source/Android/app/src/main/res/values-w1000dp/integers.xml2
-rw-r--r--Source/Android/app/src/main/res/values-w500dp/integers.xml2
-rw-r--r--Source/Android/app/src/main/res/values-w750dp/integers.xml2
-rw-r--r--Source/Android/app/src/main/res/values/integers.xml2
6 files changed, 15 insertions, 8 deletions
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 353d6b7efd..5623670602 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
@@ -21,9 +21,10 @@ public class PicassoUtils
{
Picasso.with(imageView.getContext())
.load(cover)
- .fit()
.noFade()
.noPlaceholder()
+ .fit()
+ .centerInside()
.config(Bitmap.Config.ARGB_8888)
.error(R.drawable.no_banner)
.into(imageView);
@@ -32,9 +33,10 @@ public class PicassoUtils
{
Picasso.with(imageView.getContext())
.load(cover)
- .fit()
.noFade()
.noPlaceholder()
+ .fit()
+ .centerInside()
.config(Bitmap.Config.ARGB_8888)
.error(R.drawable.no_banner)
.into(imageView);
@@ -47,9 +49,10 @@ public class PicassoUtils
{
Picasso.with(imageView.getContext())
.load(CoverHelper.buildGameTDBUrl(gameFile, CoverHelper.getRegion(gameFile)))
- .fit()
.noFade()
.noPlaceholder()
+ .fit()
+ .centerInside()
.config(Bitmap.Config.ARGB_8888)
.error(R.drawable.no_banner)
.into(imageView, new Callback()
@@ -68,6 +71,8 @@ public class PicassoUtils
.load(CoverHelper.buildGameTDBUrl(gameFile, "US"))
.fit()
.noFade()
+ .fit()
+ .centerInside()
.noPlaceholder()
.config(Bitmap.Config.ARGB_8888)
.error(R.drawable.no_banner)
@@ -88,6 +93,8 @@ public class PicassoUtils
.load(CoverHelper.buildGameTDBUrl(gameFile, "EN"))
.fit()
.noFade()
+ .fit()
+ .centerInside()
.noPlaceholder()
.config(Bitmap.Config.ARGB_8888)
.error(R.drawable.no_banner)
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
index 488fda5232..e3db4abf76 100644
--- a/Source/Android/app/src/main/res/layout/card_game.xml
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
tools:layout_width="160dp"
- android:layout_height="368dp"
+ android:layout_height="270dp"
android:transitionName="card_game"
android:focusable="true"
android:clickable="true"
diff --git a/Source/Android/app/src/main/res/values-w1000dp/integers.xml b/Source/Android/app/src/main/res/values-w1000dp/integers.xml
index 4dbc25806e..2609297d5b 100644
--- a/Source/Android/app/src/main/res/values-w1000dp/integers.xml
+++ b/Source/Android/app/src/main/res/values-w1000dp/integers.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <integer name="game_grid_columns">6</integer>
+ <integer name="game_grid_columns">8</integer>
</resources> \ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-w500dp/integers.xml b/Source/Android/app/src/main/res/values-w500dp/integers.xml
index f049d8b44e..5cd4e24f38 100644
--- a/Source/Android/app/src/main/res/values-w500dp/integers.xml
+++ b/Source/Android/app/src/main/res/values-w500dp/integers.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <integer name="game_grid_columns">3</integer>
+ <integer name="game_grid_columns">4</integer>
</resources> \ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-w750dp/integers.xml b/Source/Android/app/src/main/res/values-w750dp/integers.xml
index 5cd4e24f38..4dbc25806e 100644
--- a/Source/Android/app/src/main/res/values-w750dp/integers.xml
+++ b/Source/Android/app/src/main/res/values-w750dp/integers.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <integer name="game_grid_columns">4</integer>
+ <integer name="game_grid_columns">6</integer>
</resources> \ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/integers.xml b/Source/Android/app/src/main/res/values/integers.xml
index dfec4d8361..b83774443b 100644
--- a/Source/Android/app/src/main/res/values/integers.xml
+++ b/Source/Android/app/src/main/res/values/integers.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <integer name="game_grid_columns">2</integer>
+ <integer name="game_grid_columns">3</integer>
<!-- Default GameCube landscape layout -->
<integer name="BUTTON_A_X">865</integer>