From 48bf0c3dfce1033b3b385fdae7cffe2c1cf05c7f Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 8 Mar 2014 12:52:41 +0000 Subject: [PATCH] Start of new email activity --- AndroidManifest.xml | 3 + res/drawable-hdpi/ic_content_new_email.png | Bin 0 -> 1554 bytes res/drawable-mdpi/ic_content_new_email.png | Bin 0 -> 1400 bytes res/drawable-xhdpi/ic_content_new_email.png | Bin 0 -> 1757 bytes res/layout/fragment_new_email.xml | 43 +++++++ res/menu/email_list.xml | 11 ++ res/menu/main.xml | 9 +- res/values/strings.xml | 6 + src/i2p/bote/EmailListActivity.java | 2 +- src/i2p/bote/EmailListFragment.java | 28 +++++ src/i2p/bote/NewEmailActivity.java | 20 +++ src/i2p/bote/NewEmailFragment.java | 131 ++++++++++++++++++++ 12 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 res/drawable-hdpi/ic_content_new_email.png create mode 100644 res/drawable-mdpi/ic_content_new_email.png create mode 100644 res/drawable-xhdpi/ic_content_new_email.png create mode 100644 res/layout/fragment_new_email.xml create mode 100644 res/menu/email_list.xml create mode 100644 src/i2p/bote/NewEmailActivity.java create mode 100644 src/i2p/bote/NewEmailFragment.java 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 0000000000000000000000000000000000000000..3816f53057582c774ab20e87baa21ad966c47ff7 GIT binary patch literal 1554 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViyz`(-7#MsQ#$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1= zG!Lpb1-DyFaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zo+r8a4+8^Ji>HfY zNX4x;v-W0-I7+mae}8vorpK18hP}5`*c?3+HUDJ&VUt$ec+#J z1O$(CaCEjR_9}>padvS16nI~>vwQl<_pR{>5#P*a-+XgUc4lLHv+lQh>Gy7yKf7xk zulcm}6UQDtdA|dkOJrQ@?AU4(E<5qqX*7C%I2n?_!PBrywb7_zvKq7K2XPY}&MUtA ztuN#yRsYCj;cL|MR${#{H!ML$r$BdFvCzZ=)egKqjpyAmFZT%rajt6$w7bxi9h@q# z!{?G#1^2wB_s3rMF{vL&I;K?EDF4hT%1m^^?7wXOJEoLO6ufZ$>9#}#A@LnG$4v|7 zpMKGrDLM6gbb`d0hRm)#OzRK27Vyux-P|Gf<8;6S_XDK`>~j(Y4NraOJ0SL*iSr#B z^EKCd6SX;A%DDfS?cnxn{=esVSQMkb@JgvJ7EWgSqsrc?_TLsHb-z|qn%dGBzS-hT zrKYQ1L;Qp2xJGr+4&h4vd5x7H6yG2Ct|g#aBpk!G`GKXyxu;XSA1q@ERGQTLdCg0$ z^#?9X9#A&>x-BlW`^bC~{*RNi7yq_ibt~&e#&e@8 zu{kN}+l)oz9|+Cw^{#pOpk1xb*YC)_r|}ub4lsYvFNxjg7^JiEVdpftU#q`d-Da$C z{@(PCUabdfyet16R9%|B;K=KFZ+W)ds;;^*PmY=YV9XIa#m4+w=Nya|{i{}7*(UyZ zx9je(g-(|w?iSwS++r8?rD^f*x1n!u@t-*MZQ}aOuq5BR@w{^ygkQYbsC$4xy64!; TJ=2(HfJ$jkS3j3^P6l3^w)^1&PVosU-?Y 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 O{BS}8BY3r3QN}+n8>GMh literal 0 HcmV?d00001 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()); + } + } +}