I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved edit identity UI

Browse Source
This commit is contained in:
str4d
2014-03-08 22:37:56 +00:00
parent f8a228391a
commit 88bda7ef0b
4 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
res/layout/fragment_edit_identity.xml
View File

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<ImageView
android:id="@+id/identity_picture"
@@ -10,48 +12,30 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/public_name"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/public_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/identity_picture"
android:layout_toRightOf="@+id/identity_picture"
android:ems="10"
android:hint="@string/public_name"
android:inputType="text" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/description"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/identity_picture"
android:ems="10"
android:hint="@string/description"
android:inputType="text" />
<LinearLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:layout_below="@+id/description"
android:textColor="@color/error_color" />
<Button
android:id="@+id/submit_identity"
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>
</LinearLayout>
</RelativeLayout>

11
res/menu/edit_identity.xml Normal file
View File

@@ -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_save_identity"
android:icon="@drawable/ic_content_save"
android:title="@string/save_identity"
i2pandroid:showAsAction="ifRoom"/>
</menu>

5
res/values/strings.xml
View File

@@ -61,7 +61,8 @@
<string name="password_changed">Password changed successfully</string>
<string name="pref_title_identities">Identities</string>
<string name="public_name">Public name:</string>
<string name="description">Description:</string>
<string name="public_name">Public name</string>
<string name="description">Description</string>
<string name="save_identity">Save identity</string>
<string name="identity_saved">Identity saved</string>
</resources>

81
src/i2p/bote/config/EditIdentityFragment.java
View File

@@ -18,10 +18,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;
@@ -59,7 +61,9 @@ public class EditIdentityFragment extends Fragment {
private String mKey;
private FragmentManager mFM;
Button mSubmit;
MenuItem mSave;
EditText mNameField;
EditText mDescField;
TextView mError;
public static EditIdentityFragment newInstance(String key) {
@@ -73,6 +77,7 @@ public class EditIdentityFragment extends Fragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
mFM = getFragmentManager();
IdentityWaiterFrag f = (IdentityWaiterFrag) mFM.findFragmentByTag(IDENTITY_WAITER_TAG);
@@ -92,15 +97,14 @@ public class EditIdentityFragment extends Fragment {
mKey = getArguments().getString(IDENTITY_KEY);
final EditText nameField = (EditText) view.findViewById(R.id.public_name);
final EditText descField = (EditText) view.findViewById(R.id.description);
mSubmit = (Button) view.findViewById(R.id.submit_identity);
mNameField = (EditText) view.findViewById(R.id.public_name);
mDescField = (EditText) view.findViewById(R.id.description);
mError = (TextView) view.findViewById(R.id.error);
try {
EmailIdentity identity = BoteHelper.getIdentity(mKey);
nameField.setText(identity.getPublicName());
descField.setText(identity.getDescription());
mNameField.setText(identity.getPublicName());
mDescField.setText(identity.getDescription());
} catch (PasswordException e) {
// TODO Handle
e.printStackTrace();
@@ -111,38 +115,49 @@ public class EditIdentityFragment extends Fragment {
// TODO Handle
e.printStackTrace();
}
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.edit_identity, menu);
mSave = menu.findItem(R.id.action_save_identity);
IdentityWaiterFrag f = (IdentityWaiterFrag) mFM.findFragmentByTag(IDENTITY_WAITER_TAG);
if (f != null)
mSubmit.setEnabled(false);
mSave.setVisible(false);
}
mSubmit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String publicName = nameField.getText().toString();
String description = descField.getText().toString();
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_save_identity:
String publicName = mNameField.getText().toString();
String description = mDescField.getText().toString();
InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(nameField.getWindowToken(), 0);
InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mNameField.getWindowToken(), 0);
mSubmit.setEnabled(false);
mError.setText("");
mSave.setVisible(false);
mError.setText("");
IdentityWaiterFrag f = IdentityWaiterFrag.newInstance(
false,
-1,
mKey,
publicName,
description,
null,
false);
f.setTask(new IdentityWaiter());
f.setTargetFragment(EditIdentityFragment.this, IDENTITY_WAITER);
mFM.beginTransaction()
.replace(R.id.identity_waiter_frag, f, IDENTITY_WAITER_TAG)
.commit();
}
});
IdentityWaiterFrag f = IdentityWaiterFrag.newInstance(
false,
-1,
mKey,
publicName,
description,
null,
false);
f.setTask(new IdentityWaiter());
f.setTargetFragment(EditIdentityFragment.this, IDENTITY_WAITER);
mFM.beginTransaction()
.replace(R.id.identity_waiter_frag, f, IDENTITY_WAITER_TAG)
.commit();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
@@ -151,7 +166,7 @@ public class EditIdentityFragment 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"));
}
}