From 14819318e3937a399406863da2bf66a7d2aa6cd9 Mon Sep 17 00:00:00 2001 From: Arne Jans Date: Sat, 25 Sep 2010 06:47:17 +0800 Subject: [PATCH] Added timezone-selection to user-signup --- astrid/gen/.gitignore | 0 .../producteev/ProducteevLoginActivity.java | 8 +- .../producteev/api/ProducteevInvoker.java | 3 +- .../res/layout/producteev_login_activity.xml | 135 +++----- astrid/res/values/strings-producteev.xml | 3 + astrid/res/values/timezones-producteev.xml | 316 ++++++++++++++++++ 6 files changed, 380 insertions(+), 85 deletions(-) delete mode 100644 astrid/gen/.gitignore create mode 100644 astrid/res/values/timezones-producteev.xml diff --git a/astrid/gen/.gitignore b/astrid/gen/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java index dcc489d03..4913e07b6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java @@ -29,6 +29,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.EditText; +import android.widget.Spinner; import android.widget.TextView; import com.flurry.android.FlurryAgent; @@ -111,6 +112,7 @@ public class ProducteevLoginActivity extends Activity { Editable password = passwordEditText.getText(); Editable firstName = ((EditText)findViewById(R.id.firstName)).getText(); Editable lastName = ((EditText)findViewById(R.id.lastName)).getText(); + String timezone = ((Spinner)findViewById(R.id.timezoneList)).getSelectedItem().toString(); if(email.length() == 0 || password.length() == 0 || firstName.length() == 0 || lastName.length() == 0) { @@ -119,7 +121,7 @@ public class ProducteevLoginActivity extends Activity { return; } performSignup(email.toString(), password.toString(), - firstName.toString(), lastName.toString()); + firstName.toString(), lastName.toString(), timezone); } } }); @@ -167,7 +169,7 @@ public class ProducteevLoginActivity extends Activity { } private void performSignup(final String email, final String password, - final String firstName, final String lastName) { + final String firstName, final String lastName, final String timezone) { final ProgressDialog dialog = DialogUtilities.progressDialog(this, getString(R.string.DLG_wait)); final TextView errors = (TextView) findViewById(R.id.error); @@ -178,7 +180,7 @@ public class ProducteevLoginActivity extends Activity { ProducteevInvoker invoker = ProducteevSyncProvider.getInvoker(); final StringBuilder errorMessage = new StringBuilder(); try { - invoker.usersSignUp(email, firstName, lastName, password, null); + invoker.usersSignUp(email, firstName, lastName, password, timezone, null); invoker.authenticate(email, password); Preferences.setString(R.string.producteev_PPr_email, email); diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java index 349ca292a..3377afd41 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java @@ -86,12 +86,13 @@ public class ProducteevInvoker { * Sign up as the given user */ public JSONObject usersSignUp(String email, String firstName, String lastName, String - password, Long fbUid) throws IOException, ApiServiceException { + password, String timezone, Long fbUid) throws IOException, ApiServiceException { return invokeGet("users/signup.json", "email", email, "firstname", firstName, "lastname", lastName, "password", password, + "timezone", timezone, "fbuid", fbUid); } diff --git a/astrid/res/layout/producteev_login_activity.xml b/astrid/res/layout/producteev_login_activity.xml index ebf13ea1e..efe102f2e 100644 --- a/astrid/res/layout/producteev_login_activity.xml +++ b/astrid/res/layout/producteev_login_activity.xml @@ -1,77 +1,55 @@ - - - - - - - - + + + + + + + + - - - + android:inputType="textEmailAddress" /> + + + + - - - - - - - - + android:orientation="vertical" android:paddingTop="20dip" + android:visibility="gone"> + + + + + + + + + +