From f8a228391a2ef1b9b9610c56a3ea745a04bb78d4 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 8 Mar 2014 20:54:04 +0000
Subject: [PATCH] Improved set password UI

---
 res/drawable-hdpi/ic_content_save.png        | Bin 0 -> 1429 bytes
 res/drawable-mdpi/ic_content_save.png        | Bin 0 -> 1392 bytes
 res/drawable-xhdpi/ic_content_save.png       | Bin 0 -> 1610 bytes
 res/layout/fragment_set_password.xml         |  41 ++--------
 res/menu/set_password.xml                    |  11 +++
 res/values/strings.xml                       |   6 +-
 src/i2p/bote/config/SetPasswordFragment.java |  79 +++++++++++--------
 7 files changed, 68 insertions(+), 69 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_content_save.png
 create mode 100644 res/drawable-mdpi/ic_content_save.png
 create mode 100644 res/drawable-xhdpi/ic_content_save.png
 create mode 100644 res/menu/set_password.xml

diff --git a/res/drawable-hdpi/ic_content_save.png b/res/drawable-hdpi/ic_content_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..306d55a9cbb0a02909f6a3b0d910700a5aa9d5b6
GIT binary patch
literal 1429
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|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsViy#Ms!t#K7Ft$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OVZUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1?
zG!Lpb1-DzwaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zZoj_7f`NgF-P6S}
zq~g|_nfBg?9VCtw3;hr4(sPZOGe@RG@Tg-rdtpJ*<&!u06*`)mXTOWmsAD?l|3JZ_
zqj|MLQ&WlHkxRGCde3v`E6QxU{zT7n@%Kagx0dWYUA(jU-gl{ozxPdkDp6o07uFz}
zz?xzcbM&X_hEwxT=C>b|-C=g&J6i-3ZvgxB2WPi5$Zp`X`}x~KfQylJ!=e4$YBL=_
zu*m)RZFGY*z9x_HO>_BVrdbOP&E2wi*^V?ZnavGh4=g(MSy`^^xLbDn^8=GL99N}2
zEDe04`eNCB>kDs+VpSEAwBEYDDL-haxkx@%V@gNe){6@|j;?vu$aVWo+%)0H;H`Og
zB&?R2eU{BBF<B(3qV+&>&Ywvq+72XNTIw>Tg7x{|AnucaPmLb>6#v~~ksLl*%%M9=
z>WqZM9yaAkA{XXepSLimF2d?rYwqpd3oqF<UiZbYA7AKI=2WD=nCS%D`U8T~4;*@M
z_Hv08%k4Qwl4d)_CGgGW(|@zz&rjW@uQH#Q{1)Hizhb#!!<sD|ZYD9B=Pj3J{GZw(
zpr3I0f{2%EgMRL};Ldv6R<(m-+XcU>GEWuS{=klxk@ei1WGOwD)WeQZOs8UkW>he(
z^ikA$rT0c@o8A&X6QwrY)b+Q07OwKUE64IoW%@$DXGu~Qc3lbgEA7`}RQ)&m$i)Jw
vxkk;8mc8zO)19Y%fNKNO8iu()1QQq(o>kqw__+TCsG#(8^>bP0l+XkKHLMKS

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_content_save.png b/res/drawable-mdpi/ic_content_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad076955394575364de27bf01b41b4824b002586
GIT binary patch
literal 1392
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$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|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsViy#Ms!t#K6ha$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1PFwUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZns$C
zG!Lpb1-Dxqaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zzIe$Lm|qwldAc};
zRNQ(qeXkd@qe$!K!o^7<j;yLbg0)uc?d@7Lb*_GbzMbQNQ-|0CbaYsvy`vqsTsh^m
zL11@-hMS0D(jEEpt(y&acAq?_GV2ge&DkgC-pt(j{G87m10LhGIX8W}qoW&UU)ayZ
zrul)(M&is)hGUMLF*mqwu&`d>EK6c}a?qrpVaJYU!}AHUI*slhnDTO2PQ0pi2zNTe
zV)3M%nM<ol_`=!3<OKPgt3nf>F!KLUS?A|`Yz507-3L3kBo=kdyl;@WVxhU`d3Dz}
zjW@$W995De-pr~{@csErl>bXp46k75g>>x$-7l*bJ=`RsaBO$5jllI9X-1=)8Z)k3
zQvK_GrZ%MO(I3rqCLVJax14?<!=tgf-)_pW88>IxMZVCE*yh=II%alQd(@<3?15KQ
zwjY0R>C&3+1m%P7D_KsQdVg^1(gvpI8^k6gR$A(qs;9mUkNj_W`?N={QKY@a)4va{
zcb+%icH>0pn&TlA+PgT9uak?<`eM7_w?o;(H~R7_zc{aXy3c-dz;`oC#hJg`7P8M$
za|rv-ca3ND0!_^hwaK~vH+Xyux4oD*_i^~Pde)wZJ+e&uT5QfeoyDQ?x$HMval*Yz
zPmKQcvIpICIlw5t%x?RIjUobC>z{2pS$gMR_P2VLKO6=Ok9bRt-d-#02r2_TUHx3v
IIVCg!0Bv#o8UO$Q

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_content_save.png b/res/drawable-xhdpi/ic_content_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..272060253d0f904061c87ad0bea14d2ad5387abd
GIT binary patch
literal 1610
zcmaJ<c~BE)9Q|^DfLw#tQ7r9twbs!jyGs&iQWJ7Z&>#&NKrBi~77|0UF<DH4(t2Bq
zPDN)_RA^|eM;(xfw6vndqo9^nW3jekL9G`RIUGgnP_-Kb>L1c?X7@Yhz4yD`hP2e#
z5n-`m0DuT}vO-JklE4=dO#QzyFX^DRNu)B1OegY5m)?N`sgcOTA+=RsfNOER(X-?%
zJ_`WGRI@IN%+kyi8VD;#AHZ<jRy)N8U{;dbt~Xe463W91%r+6++t3I@W}^ts<ZDok
zU5=Z~$;A#ly*O28D7F{`MmR|f&2kGV0V_`GA-A>A<`lX`@Sv`cItQK+7#f6-77_d+
zsVq$zBqtm=#OI)F1Db$A2|NzQLj^nm3yMcE6v5&VG?9&=LVltU#h{@DQ_&p8e4$pM
z8j3~TM6ih@?Lq``xm+9<mqR!T5KJHtAZR=iAJ3)`Y^TRY>fLOcbIP!S0(Tl5W;<yn
zY*0W^pGOptBACkbMG02>h^);y)F!H7h+A(*Fb*0hX&9){{6Exc9YH%uE&gA=uM~Fb
zJa!z>;!dK-VW0+=KP3>#E|fcPJxMrp1W`EL#WWK^5>69ghveye4hCuT2D2^jGRV+q
zgle0U)Y}ZWS|Nfd4UXAt6souiZUQe}&X=Jo3{zqP9wt!oWOAvBk0tVC*f3W?7>ca8
zjU47016&@Li}Fz3sN8@Vtad800(Y2~;zpH&utI}H3(ceFA{|w4h--XRE-&hkjmkx+
zWRSpUUmErB6Xl=4am2XPWyJcpjq<yLGIq1(q6`4~QME#<bGO~wiCM-=$DekcZ>gLZ
z!!WbxQfbiSnJ1=ghSxHK8f7y|EkD4Uf4r7idtrH4D3irvO7kRWNJ56RNs^p={lMAw
z?!Q0ko6y{{aLciZ@`?se)U(?1mY#F}JUZs#5{Vfp%C{D<0CNS126PDs0W^E$uC+F)
zwYr;5f|51bIVDHK+Sdp#F0u_UyT1$Wi#fuGvskx#qtXuVYv03`&ht)q-oBzkaxnYK
z@eHJ|vHnTu)a(V?zSu->koeq`q~Ma(m#S)R;~Q>!$PR}1!?34IgS<b-UC0r2b2qmF
z-jm%&A2e4z_OA<;+%I`J@XbWoPtn;Nu%ni<J|zkCJJ-cj42(T;{xoCRDhnt}aQ}Lz
z9?obRw^&};M9#~)r4~#F$13|a-YL5V!taIlo9b8(m~`LkTgG%&N-pP$>!Lfq{=!dl
zH$-~B?72B<=86072iFFPgts0Sx-L(e2Fxofu5k{2T(mq`QnBmy#nwxYy7sbe#jfFp
zDDTpG-xa5?-+CZ6_tUf+{l|B=2y#tbi%<DtHd<FE(!9-oRfkz-zilbQY5wDl@<Ta$
zIn}+7z2%+HW!33G2M>gb4xM4_PxVxXukanN|I;${wQ%wEWe0utC)b_LKSTGgYtkiO
z`J?7MsF5R|Z|#km`#baD#NsY4NGZ)^(Y_7Oc_?B=R%I^FX$AZJPfoc&-Sq4-76h1*
z+Ah$xgU3!?W$_n$Mw=^*V(&c>ah2w;Df}%4%y2&K7csw=m2TU9av{UJ@7ZjhBp2+5
zmV6++dYITWBZAg+<?8&Nw0ow$Pu^)$%@4sBZ8VN+71uW~B^~coFsl5eWiUu^+O`$#
zx$AT9evsC)Gje5j=gob-@;K$Qtdk}DH|U->=M0!`Zd&AxYXz!bUb0Vg&C_wYAZ5&r
Tv6Z~~M}S&tWvZe^mb>a-%$HcT

literal 0
HcmV?d00001

diff --git a/res/layout/fragment_set_password.xml b/res/layout/fragment_set_password.xml
index fdaaf63..ac5389d 100644
--- a/res/layout/fragment_set_password.xml
+++ b/res/layout/fragment_set_password.xml
@@ -7,64 +7,37 @@
     android:paddingRight="10dp"
     android:paddingTop="10dp" >
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/old_password"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
     <EditText
         android:id="@+id/password_old"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
+        android:hint="@string/old_password"
         android:inputType="textPassword" >
 
         <requestFocus />
     </EditText>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/new_password"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
     <EditText
         android:id="@+id/password_new"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
+        android:hint="@string/new_password"
         android:inputType="textPassword" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/confirm_new_password"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
     <EditText
         android:id="@+id/password_confirm"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
+        android:hint="@string/confirm_new_password"
         android:inputType="textPassword" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/error"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/submit_password"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="OK" />
-
-        <TextView
-            android:id="@+id/error"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/error_color" />
-    </LinearLayout>
+        android:textColor="@color/error_color" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/set_password.xml b/res/menu/set_password.xml
new file mode 100644
index 0000000..c6e9c6f
--- /dev/null
+++ b/res/menu/set_password.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:i2pandroid="http://schemas.android.com/apk/res-auto" >
+
+    <item
+        android:id="@+id/action_set_password"
+        android:icon="@drawable/ic_content_save"
+        android:title="@string/pref_title_change_password"
+        i2pandroid:showAsAction="ifRoom"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c945aa5..ad41744 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,9 +55,9 @@
     <string name="pref_title_i2cp_port">I2CP port</string>
 
     <string name="pref_title_change_password">Change password</string>
-    <string name="old_password">Old password:</string>
-    <string name="new_password">New password:</string>
-    <string name="confirm_new_password">Confirm new password:</string>
+    <string name="old_password">Old password</string>
+    <string name="new_password">New password</string>
+    <string name="confirm_new_password">Confirm new password</string>
     <string name="password_changed">Password changed successfully</string>
 
     <string name="pref_title_identities">Identities</string>
diff --git a/src/i2p/bote/config/SetPasswordFragment.java b/src/i2p/bote/config/SetPasswordFragment.java
index 2ed43ff..25eaec7 100644
--- a/src/i2p/bote/config/SetPasswordFragment.java
+++ b/src/i2p/bote/config/SetPasswordFragment.java
@@ -12,10 +12,12 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 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.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -50,12 +52,16 @@ public class SetPasswordFragment extends Fragment {
     static final String PASSWORD_WAITER_TAG = "passwordWaiterTask";
 
     private FragmentManager mFM;
-    Button mSubmit;
+    MenuItem mSave;
+    EditText mOldField;
+    EditText mNewField;
+    EditText mConfirmField;
     TextView mError;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
 
         mFM = getFragmentManager();
         PasswordWaiterFrag f = (PasswordWaiterFrag) mFM.findFragmentByTag(PASSWORD_WAITER_TAG);
@@ -73,39 +79,48 @@ public class SetPasswordFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        final EditText oldField = (EditText) view.findViewById(R.id.password_old);
-        final EditText newField = (EditText) view.findViewById(R.id.password_new);
-        final EditText confirmField = (EditText) view.findViewById(R.id.password_confirm);
-        mSubmit = (Button) view.findViewById(R.id.submit_password);
+        mOldField = (EditText) view.findViewById(R.id.password_old);
+        mNewField = (EditText) view.findViewById(R.id.password_new);
+        mConfirmField = (EditText) view.findViewById(R.id.password_confirm);
         mError = (TextView) view.findViewById(R.id.error);
+    }
 
-        // If task is running, disable the submit button.
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.set_password, menu);
+        mSave = menu.findItem(R.id.action_set_password);
+
+        // If task is running, disable the save button.
         PasswordWaiterFrag f = (PasswordWaiterFrag) mFM.findFragmentByTag(PASSWORD_WAITER_TAG);
-        if (f != null) {
-            mSubmit.setEnabled(false);
+        if (f != null)
+            mSave.setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.action_set_password:
+            String oldPassword = mOldField.getText().toString();
+            String newPassword = mNewField.getText().toString();
+            String confirmNewPassword = mConfirmField.getText().toString();
+
+            InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(mNewField.getWindowToken(), 0);
+
+            mSave.setVisible(false);
+            mError.setText("");
+
+            PasswordWaiterFrag f = PasswordWaiterFrag.newInstance(oldPassword, newPassword, confirmNewPassword);
+            f.setTask(new PasswordWaiter());
+            f.setTargetFragment(SetPasswordFragment.this, PASSWORD_WAITER);
+            mFM.beginTransaction()
+                .replace(R.id.password_waiter_frag, f, PASSWORD_WAITER_TAG)
+                .commit();
+            return true;
+
+        default:
+            return super.onOptionsItemSelected(item);
         }
-
-        mSubmit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String oldPassword = oldField.getText().toString();
-                String newPassword = newField.getText().toString();
-                String confirmNewPassword = confirmField.getText().toString();
-
-                InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(newField.getWindowToken(), 0);
-
-                mSubmit.setEnabled(false);
-                mError.setText("");
-
-                PasswordWaiterFrag f = PasswordWaiterFrag.newInstance(oldPassword, newPassword, confirmNewPassword);
-                f.setTask(new PasswordWaiter());
-                f.setTargetFragment(SetPasswordFragment.this, PASSWORD_WAITER);
-                mFM.beginTransaction()
-                    .replace(R.id.password_waiter_frag, f, PASSWORD_WAITER_TAG)
-                    .commit();
-            }
-        });
     }
 
     @Override
@@ -114,7 +129,7 @@ public class SetPasswordFragment extends Fragment {
             if (resultCode == Activity.RESULT_OK) {
                 mCallbacks.onTaskFinished();
             } else if (resultCode == Activity.RESULT_CANCELED) {
-                mSubmit.setEnabled(true);
+                mSave.setVisible(true);
                 mError.setText(data.getStringExtra("error"));
             }
         }