diff --git a/ExaltedDice/res/menu/dice_roller_menu.xml b/ExaltedDice/res/menu/dice_roller_menu.xml new file mode 100644 index 0000000..d124dd5 --- /dev/null +++ b/ExaltedDice/res/menu/dice_roller_menu.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/ExaltedDice/res/menu/game_list_context_menu.xml b/ExaltedDice/res/menu/game_list_context_menu.xml new file mode 100644 index 0000000..745404b --- /dev/null +++ b/ExaltedDice/res/menu/game_list_context_menu.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/ExaltedDice/res/menu/game_list_menu.xml b/ExaltedDice/res/menu/game_list_menu.xml new file mode 100644 index 0000000..bfb6fb9 --- /dev/null +++ b/ExaltedDice/res/menu/game_list_menu.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java index d037bb0..6715a92 100755 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java @@ -17,6 +17,7 @@ import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -37,10 +38,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic public static final String KEY_GAME_ID = "game_id"; private static final String TAG = "ExaltedDice"; - private static final int MENU_QUIT = Menu.FIRST; - private static final int MENU_CLEAR = Menu.FIRST + 1; private static final int DELETE = 0; - private static final int SETTINGS = Menu.FIRST + 2; private String[] mDiceValues; private ListView mListView; @@ -224,9 +222,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * @author WWPowers 3-27-2010 */ public boolean onCreateOptionsMenu(Menu menu) { - menu.add(1, MENU_CLEAR, 0, R.string.clear_history).setIcon(android.R.drawable.ic_menu_close_clear_cancel); - menu.add(1, SETTINGS, 0, R.string.settings).setIcon(android.R.drawable.ic_menu_preferences);; - menu.add(1, MENU_QUIT, 0, R.string.quit).setIcon(android.R.drawable.ic_menu_revert); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.dice_roller_menu, menu); return true; } @@ -288,13 +285,10 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic Intent intent = new Intent(this, GameListActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); return true; - case MENU_QUIT: - quitDialog(); - return true; - case MENU_CLEAR: + case R.id.menu_clear: mDb.clearHistory(mGameId); return true; - case SETTINGS: + case R.id.menu_settings: startActivity(new Intent(this, Settings.class).putExtras(getIntent().getExtras())); return true; default: diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/GameListActivity.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/GameListActivity.java index 3312c9a..191b1e7 100644 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/GameListActivity.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/GameListActivity.java @@ -12,6 +12,7 @@ import android.os.Bundle; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -28,7 +29,6 @@ import android.widget.ListView; */ public class GameListActivity extends Activity implements OnClickListener, DatabaseListener, OnItemClickListener { - private static final int DELETE = 0; private ListView mList; private Database mDb; @@ -45,7 +45,7 @@ public class GameListActivity extends Activity implements OnClickListener, Datab public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo(); switch(item.getItemId()){ - case DELETE: + case R.id.menu_delete: mDb.deleteGame(info.id+1); break; } @@ -73,14 +73,22 @@ public class GameListActivity extends Activity implements OnClickListener, Datab */ @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - /* - * TODO - * rename game - */ - menu.add(0, DELETE, Menu.FIRST, R.string.delete); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.game_list_context_menu, menu); super.onCreateContextMenu(menu, v, menuInfo); } + /** + * (non-Javadoc) + * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) + */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.game_list_menu, menu); + return true; + } + @Override public void onDatabaseInsertComplete() { // TODO Auto-generated method stub @@ -111,6 +119,21 @@ public class GameListActivity extends Activity implements OnClickListener, Datab .putExtra(ExaltedDice.KEY_GAME_MODE, mDb.getGameOptions(id+1).getAsString(Database.KEY_MODE))); } + /** + * (non-Javadoc) + * @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem) + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch(item.getItemId()){ + case R.id.menu_settings: + startActivity(new Intent(this, Settings.class)); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + /** * (non-Javadoc) * @see android.app.Activity#onPause()