From a9d634086cf5c351918449ef48a4d880e7fdbdff Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 17 Aug 2013 13:25:40 -0400
Subject: [PATCH] [Android] Change the Game List items to be formatted
 similarly to how the folder browser is. Also ensure the 'no banner' icon
 scales down to the same size as the other banners.

---
 Source/Android/res/layout/gamelist_layout.xml | 85 +++++++++++--------
 .../dolphinemu/GameListAdapter.java           |  2 +-
 .../dolphinemu/dolphinemu/GameListItem.java   |  6 ++
 3 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/Source/Android/res/layout/gamelist_layout.xml b/Source/Android/res/layout/gamelist_layout.xml
index 16596c3cec..f27b5968a6 100644
--- a/Source/Android/res/layout/gamelist_layout.xml
+++ b/Source/Android/res/layout/gamelist_layout.xml
@@ -1,43 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:padding="3dp" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+    <ImageView
+        android:id="@+id/GameItemIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="6dip" />
 
-        <ImageView
-            android:id="@+id/GameItemIcon"
-            android:layout_width="96dp"
-            android:layout_height="match_parent" />
+        
+    <TextView
+        android:id="@+id/GameItemSubText"
+        android:layout_width="fill_parent"
+        android:layout_height="26dip" 
+        
+        android:layout_toRightOf="@id/GameItemIcon"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        
+        android:singleLine="true"
+        android:ellipsize="marquee"/>
+    
+    <TextView
+        android:id="@+id/GameItemTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        
+        android:layout_toRightOf="@id/GameItemIcon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_above="@id/GameItemSubText"
+        android:layout_alignWithParentIfMissing="true"
+                
+        android:gravity="center_vertical"
+        android:textStyle="bold" />
+    
+    <ImageView
+        android:src="@android:drawable/divider_horizontal_dark"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingBottom="2dp"
+        android:paddingTop="2dp" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/GameItemTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dip"
-                android:layout_marginTop="5dip"
-                android:singleLine="true"
-                android:text="@+id/TextView01"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/GameItemSubText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:text="@+id/TextView02" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
+</RelativeLayout>
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
index d7170bb474..0571c9d213 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
@@ -36,7 +36,7 @@ public final class GameListAdapter extends ArrayAdapter<GameListItem>
         if (v == null)
         {
             LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            v = vi.inflate(id, null);
+            v = vi.inflate(id, parent, false);
         }
 
         final GameListItem item = items.get(position);
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
index 92ad986e91..10f44f69e4 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -31,8 +31,14 @@ public final class GameListItem implements Comparable<GameListItem>
         	{
         		try
         		{
+					// Open the no banner icon.
 					InputStream noBannerPath = ctx.getAssets().open("NoBanner.png");
+					
+					// Decode the bitmap.
 					image = BitmapFactory.decodeStream(noBannerPath);
+					
+					// Scale the bitmap to match other banners.
+					image = Bitmap.createScaledBitmap(image, 96, 32, false);
 				}
         		catch (IOException e)
 				{