# HG changeset patch # User Da Risk # Date 1259356887 -3600 # Node ID 97ae7bcc219ab3fcfdb5c5a53fdec94efcb949ff # Parent 0de3d7f3fa815781fbaf4134523b08de0ea7c56f Add menu for new Login activity diff -r 0de3d7f3fa81 -r 97ae7bcc219a src/com/beem/project/beem/ui/Login2.java --- a/src/com/beem/project/beem/ui/Login2.java Thu Nov 26 23:11:06 2009 +0100 +++ b/src/com/beem/project/beem/ui/Login2.java Fri Nov 27 22:21:27 2009 +0100 @@ -1,10 +1,15 @@ package com.beem.project.beem.ui; import android.app.Activity; +import android.app.AlertDialog; import android.content.Intent; +import android.content.DialogInterface; import android.os.Bundle; import android.util.Log; import com.beem.project.beem.R; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; /** * This class is the main Activity for the Beem project. @@ -50,4 +55,48 @@ } } + /** + * {@inheritDoc} + */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.login, menu); + return true; + } + + /** + * {@inheritDoc} + */ + @Override + public final boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.login_menu_settings: + startActivity(new Intent(Login2.this, Settings.class)); + return true; + case R.id.login_menu_about: + createAboutDialog(); + return true; + default: + return false; + } + } + + /** + * Create an about "BEEM" dialog. + */ + private void createAboutDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.login_about_title).setMessage(R.string.login_about_msg).setCancelable(false); + builder.setNeutralButton(R.string.login_about_button, new DialogInterface.OnClickListener() { + + public void onClick(DialogInterface dialog, int whichButton) { + dialog.cancel(); + } + }); + AlertDialog aboutDialog = builder.create(); + aboutDialog.show(); + } + } diff -r 0de3d7f3fa81 -r 97ae7bcc219a src/com/beem/project/beem/ui/LoginAnim.java --- a/src/com/beem/project/beem/ui/LoginAnim.java Thu Nov 26 23:11:06 2009 +0100 +++ b/src/com/beem/project/beem/ui/LoginAnim.java Fri Nov 27 22:21:27 2009 +0100 @@ -14,6 +14,7 @@ import android.view.animation.Animation; import android.widget.ImageView; import android.widget.TextView; +import android.widget.ProgressBar; import android.view.animation.AnimationUtils; import com.beem.project.beem.R; import android.util.Log;