moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

Changed next button in existing account dialog to match other ones. Commented out the default account checkbox for now, until we decided on this.

Browse Source
This commit is contained in:
Sander Bogaert 2012-04-30 14:57:55 +02:00 committed by Andrew Chen
parent 48d09891cd
commit 244d1319e9
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
res/layout/account_dialog_password.xml
View File

@ -1,46 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:padding="10dp">
android:padding="10dp" >
<TextView android:id="@+id/account_dialog_password_help"
<TextView
android:id="@+id/account_dialog_password_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"/>
android:layout_marginBottom="10dp" />
<EditText
android:id="@+id/account_dialog_password_field"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:password="true"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:nextFocusDown="@+id/next"
/>
android:password="true"
android:singleLine="true" />
<CheckBox android:id="@+id/account_dialog_manual_box"
android:layout_height="wrap_content"
<CheckBox
android:id="@+id/account_dialog_manual_box"
android:layout_width="fill_parent"
android:text="@string/account_setup_basics_manual_setup_action"/>
<CheckBox android:id="@+id/account_dialog_default_box"
android:layout_height="wrap_content"
android:text="@string/account_setup_basics_manual_setup_action" />
<!--<CheckBox
android:id="@+id/account_dialog_default_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:text="@string/account_settings_default"/>
android:text="@string/account_settings_default" />-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<Button android:id="@+id/account_dialog_next"
android:text="@string/next_action"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" >
<Button
android:id="@+id/account_dialog_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:drawableRight="@drawable/button_indicator_next" />
android:layout_centerVertical="false"
android:layout_marginBottom="-4dip"
android:drawableRight="@drawable/button_indicator_next"
android:minWidth="@dimen/button_minWidth"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>

4
src/com/fsck/k9/activity/setup/AccountSetupIndex.java
View File

@ -178,13 +178,13 @@ public class AccountSetupIndex extends K9ListActivity implements OnItemClickList
final EditText passwordField = ((EditText) dialog.findViewById(R.id.account_dialog_password_field));
final CheckBox manualCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_manual_box);
final CheckBox defaultCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_default_box);
//final CheckBox defaultCheck = (CheckBox)dialog.findViewById(R.id.account_dialog_default_box);
mPasswordDialogButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
String email = args.get(BUNDLE_TYPE_SUGGESTION).toString();
String password = passwordField.getText().toString();
bMakeDefault = defaultCheck.isChecked();
//bMakeDefault = defaultCheck.isChecked();
// TODO: replace this with a few listeners on the fields that activate/deactive the button on acceptable values
if( password.isEmpty() ) return;