From 93ed4adb025928c913fb3c01f1c3b0567330b9e3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 29 Aug 2013 12:16:29 -0400 Subject: [PATCH] [Android] Use the same layout for the game list and the folder browser. Since the UI layouts are exactly the same. --- ...er.xml => gamelist_folderbrowser_list.xml} | 14 +++--- Source/Android/res/layout/gamelist_layout.xml | 43 ------------------- .../folderbrowser/FolderBrowser.java | 2 +- .../folderbrowser/FolderBrowserAdapter.java | 22 +++++----- .../dolphinemu/gamelist/GameListAdapter.java | 6 +-- .../dolphinemu/gamelist/GameListFragment.java | 2 +- 6 files changed, 23 insertions(+), 66 deletions(-) rename Source/Android/res/layout/{folderbrowser.xml => gamelist_folderbrowser_list.xml} (77%) delete mode 100644 Source/Android/res/layout/gamelist_layout.xml diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/gamelist_folderbrowser_list.xml similarity index 77% rename from Source/Android/res/layout/folderbrowser.xml rename to Source/Android/res/layout/gamelist_folderbrowser_list.xml index 4a1b1f97c9..e386000c79 100644 --- a/Source/Android/res/layout/folderbrowser.xml +++ b/Source/Android/res/layout/gamelist_folderbrowser_list.xml @@ -2,10 +2,10 @@ + android:padding="3dp"> - - - - - - - - - - diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java index 4733cc18da..306802a6de 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java @@ -94,7 +94,7 @@ public final class FolderBrowser extends Fragment 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 index 750f17141a..cae56338bd 100644 --- 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 final class FolderBrowserAdapter extends ArrayAdapter 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 index 1bc88e1255..365a8200c5 100644 --- 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 final class GameListAdapter extends ArrayAdapter 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 index a8b3362dfa..9dc6fcba8d 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java @@ -98,7 +98,7 @@ public final class GameListFragment extends Fragment } 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())