[Android] Use the same layout for the game list and the folder browse…

…r. Since the UI layouts are exactly the same.
dolphin-emu · Aug 29, 2013 · 93ed4ad · 93ed4ad
1 parent 64b83a1
commit 93ed4ad
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 66 deletions.
diff --git a/Source/Android/res/layout/folderbrowser.xml → ...es/layout/gamelist_folderbrowser_list.xml b/Source/Android/res/layout/folderbrowser.xml → ...es/layout/gamelist_folderbrowser_list.xml
@@ -2,10 +2,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:padding="3dip">
+    android:padding="3dp">
 
     <ImageView
-        android:id="@+id/ImageIcon"
+        android:id="@+id/ListItemIcon"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
 
@@ -14,26 +14,26 @@
         android:layout_marginRight="6dip"/>
 
     <TextView
-        android:id="@+id/FolderSubTitle"
+        android:id="@+id/ListItemSubTitle"
         android:layout_width="fill_parent"
         android:layout_height="26dip" 
 
-        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_toRightOf="@id/ListItemIcon"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
 
         android:singleLine="true"
         android:ellipsize="marquee"/>
 
     <TextView
-        android:id="@+id/FolderTitle"
+        android:id="@+id/ListItemTitle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
 
-        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_toRightOf="@id/ListItemIcon"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_above="@id/FolderSubTitle"
+        android:layout_above="@id/ListItemSubTitle"
         android:layout_alignWithParentIfMissing="true"
 
         android:gravity="center_vertical"

diff --git a/Source/Android/res/layout/gamelist_layout.xml b/Source/Android/res/layout/gamelist_layout.xml
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
@@ -94,7 +94,7 @@ else if (entry.isFile() && hasExtension)
 		if (!currDir.getPath().equalsIgnoreCase("/"))
 			dir.add(0, new FolderBrowserItem("..", getString(R.string.parent_directory), currDir.getParent()));
 
-		adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, dir);
+		adapter = new FolderBrowserAdapter(m_activity, R.layout.gamelist_folderbrowser_list, dir);
 		mDrawerList = (ListView) rootView.findViewById(R.id.gamelist);
 		mDrawerList.setAdapter(adapter);
 		mDrawerList.setOnItemClickListener(mMenuItemClickListener);

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
@@ -57,37 +57,37 @@ public View getView(int position, View convertView, ViewGroup parent)
 		final FolderBrowserItem item = items.get(position);
 		if (item != null)
 		{
-			ImageView iconView = (ImageView) v.findViewById(R.id.ImageIcon);
-			TextView mainText = (TextView) v.findViewById(R.id.FolderTitle);
-			TextView subtitleText = (TextView) v.findViewById(R.id.FolderSubTitle);
+			ImageView icon    = (ImageView) v.findViewById(R.id.ListItemIcon);
+			TextView title    = (TextView) v.findViewById(R.id.ListItemTitle);
+			TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle);
 
-			if(mainText != null)
+			if(title != null)
 			{
-				mainText.setText(item.getName());
+				title.setText(item.getName());
 			}
 
-			if(subtitleText != null)
+			if(subtitle != null)
 			{
 				// Remove the subtitle for all folders, except for the parent directory folder.
 				if (item.isDirectory() && !item.getSubtitle().equals(c.getResources().getString(R.string.parent_directory)))
 				{
-					subtitleText.setVisibility(View.GONE);
+					subtitle.setVisibility(View.GONE);
 				}
 				else
 				{
-					subtitleText.setText(item.getSubtitle());
+					subtitle.setText(item.getSubtitle());
 				}
 			}
 
-			if (iconView != null)
+			if (icon != null)
 			{
 				if (item.isDirectory())
 				{
-					iconView.setImageResource(R.drawable.ic_menu_folder);
+					icon.setImageResource(R.drawable.ic_menu_folder);
 				}
 				else
 				{
-					iconView.setImageResource(R.drawable.ic_menu_file);
+					icon.setImageResource(R.drawable.ic_menu_file);
 				}
 			}
 		}

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
@@ -56,9 +56,9 @@ public View getView(int position, View convertView, ViewGroup parent)
 		final GameListItem item = items.get(position);
 		if (item != null)
 		{
-			TextView title    = (TextView) v.findViewById(R.id.GameItemTitle);
-			TextView subtitle = (TextView) v.findViewById(R.id.GameItemSubText);
-			ImageView icon    = (ImageView) v.findViewById(R.id.GameItemIcon);
+			TextView title    = (TextView) v.findViewById(R.id.ListItemTitle);
+			TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle);
+			ImageView icon    = (ImageView) v.findViewById(R.id.ListItemIcon);
 
 			if (title != null)
 				title.setText(item.getName());

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
@@ -98,7 +98,7 @@ private void Fill()
 		}
 		Collections.sort(fls);
 
-		mGameAdapter = new GameListAdapter(mMe, R.layout.gamelist_layout, fls);
+		mGameAdapter = new GameListAdapter(mMe, R.layout.gamelist_folderbrowser_list, fls);
 		mMainList.setAdapter(mGameAdapter);
 
 		if (fls.isEmpty())