diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1790b45..6207aa4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,6 +26,9 @@ + diff --git a/res/drawable-hdpi/ic_content_new_email.png b/res/drawable-hdpi/ic_content_new_email.png new file mode 100644 index 0000000..3816f53 Binary files /dev/null and b/res/drawable-hdpi/ic_content_new_email.png differ diff --git a/res/drawable-mdpi/ic_content_new_email.png b/res/drawable-mdpi/ic_content_new_email.png new file mode 100644 index 0000000..2675a74 Binary files /dev/null and b/res/drawable-mdpi/ic_content_new_email.png differ diff --git a/res/drawable-xhdpi/ic_content_new_email.png b/res/drawable-xhdpi/ic_content_new_email.png new file mode 100644 index 0000000..404b95a Binary files /dev/null and b/res/drawable-xhdpi/ic_content_new_email.png differ diff --git a/res/layout/fragment_new_email.xml b/res/layout/fragment_new_email.xml new file mode 100644 index 0000000..f668af6 --- /dev/null +++ b/res/layout/fragment_new_email.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/menu/email_list.xml b/res/menu/email_list.xml new file mode 100644 index 0000000..e3ed578 --- /dev/null +++ b/res/menu/email_list.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/res/menu/main.xml b/res/menu/main.xml index c002028..3c656f8 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -1,9 +1,10 @@ - + + android:title="@string/action_settings" + i2pandroid:showAsAction="never"/> - + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index ece4081..c945aa5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,6 +2,8 @@ I2P-Bote + New email + Send email Settings Open nav @@ -26,6 +28,10 @@ Sent: Received: + To + Subject + Compose email + General General settings and default identity settings Auto-check mail diff --git a/src/i2p/bote/EmailListActivity.java b/src/i2p/bote/EmailListActivity.java index 044dd50..bdc3982 100644 --- a/src/i2p/bote/EmailListActivity.java +++ b/src/i2p/bote/EmailListActivity.java @@ -148,7 +148,7 @@ public class EmailListActivity extends ActionBarActivity implements public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu getMenuInflater().inflate(R.menu.main, menu); - return true; + return super.onCreateOptionsMenu(menu); } @Override diff --git a/src/i2p/bote/EmailListFragment.java b/src/i2p/bote/EmailListFragment.java index 5ca58b6..6479003 100644 --- a/src/i2p/bote/EmailListFragment.java +++ b/src/i2p/bote/EmailListFragment.java @@ -18,12 +18,16 @@ import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.app.ListFragment; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; @@ -71,6 +75,12 @@ public class EmailListFragment extends ListFragment implements } } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -184,6 +194,24 @@ public class EmailListFragment extends ListFragment implements getLoaderManager().initLoader(EMAIL_LIST_LOADER, null, this); } + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.email_list, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_new_email: + Intent nei = new Intent(getActivity(), NewEmailActivity.class); + startActivity(nei); + return true; + + default: + return super.onOptionsItemSelected(item); + } + } + @Override public void onListItemClick(ListView parent, View view, int pos, long id) { super.onListItemClick(parent, view, pos, id); diff --git a/src/i2p/bote/NewEmailActivity.java b/src/i2p/bote/NewEmailActivity.java new file mode 100644 index 0000000..1d22eac --- /dev/null +++ b/src/i2p/bote/NewEmailActivity.java @@ -0,0 +1,20 @@ +package i2p.bote; + +import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; + +public class NewEmailActivity extends ActionBarActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Enable ActionBar app icon to behave as action to go back + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + if (savedInstanceState == null) { + NewEmailFragment f = new NewEmailFragment(); + getSupportFragmentManager().beginTransaction() + .add(android.R.id.content, f).commit(); + } + } +} diff --git a/src/i2p/bote/NewEmailFragment.java b/src/i2p/bote/NewEmailFragment.java new file mode 100644 index 0000000..d9e64ca --- /dev/null +++ b/src/i2p/bote/NewEmailFragment.java @@ -0,0 +1,131 @@ +package i2p.bote; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.Collection; + +import i2p.bote.email.EmailIdentity; +import i2p.bote.fileencryption.PasswordException; +import android.content.Context; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.Spinner; +import android.widget.TextView; + +public class NewEmailFragment extends Fragment { + Spinner mSpinner; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_new_email, container, false); + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + mSpinner = (Spinner) view.findViewById(R.id.sender_spinner); + IdentityAdapter adapter = new IdentityAdapter(getActivity()); + mSpinner.setAdapter(adapter); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.new_email, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_send_email: + // TODO Handle + return true; + + default: + return super.onOptionsItemSelected(item); + } + } + + private class IdentityAdapter extends ArrayAdapter { + public IdentityAdapter(Context context) { + super(context, android.R.layout.simple_spinner_item); + setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + + try { + Collection identities = I2PBote.getInstance().getIdentities().getAll(); + for (EmailIdentity identity : identities) { + add(identity); + if (identity.isDefault()) + mSpinner.setSelection(getPosition(identity)); + } + } catch (PasswordException e) { + // TODO Handle + e.printStackTrace(); + } catch (IOException e) { + // TODO Handle + e.printStackTrace(); + } catch (GeneralSecurityException e) { + // TODO Handle + e.printStackTrace(); + } + } + + @Override + public EmailIdentity getItem(int position) { + if (position > 0) + return super.getItem(position - 1); + else + return null; + } + + @Override + public int getPosition(EmailIdentity item) { + if (item != null) + return super.getPosition(item) + 1; + else + return 0; + } + + @Override + public int getCount() { + return super.getCount() + 1; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + View v = super.getView(position, convertView, parent); + setViewText(v, position); + return v; + } + + @Override + public View getDropDownView (int position, View convertView, ViewGroup parent) { + View v = super.getDropDownView(position, convertView, parent); + setViewText(v, position); + return v; + } + + private void setViewText(View v, int position) { + TextView text = (TextView) v.findViewById(android.R.id.text1); + EmailIdentity identity = getItem(position); + if (identity == null) + text.setText("Anonymous"); + else + text.setText(identity.getPublicName()); + } + } +}