diff --git a/astrid/.classpath b/astrid/.classpath index 225598cab..bc93784a6 100644 --- a/astrid/.classpath +++ b/astrid/.classpath @@ -29,5 +29,6 @@ + diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index e13742870..b3b2bddd4 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionName="3.9.2" + android:versionCode="207"> @@ -649,6 +649,9 @@ + diff --git a/astrid/build.xml b/astrid/build.xml index 1549c435e..3cdedd7e3 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -142,7 +142,7 @@ replace="\1 true;" /> - + diff --git a/astrid/common-src/com/localytics/android/DatapointHelper.java b/astrid/common-src/com/localytics/android/DatapointHelper.java index 5d42528d0..5b1600d95 100755 --- a/astrid/common-src/com/localytics/android/DatapointHelper.java +++ b/astrid/common-src/com/localytics/android/DatapointHelper.java @@ -8,15 +8,6 @@ package com.localytics.android; -import android.Manifest.permission; -import android.content.Context; -import android.content.pm.PackageManager; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.os.Build; -import android.telephony.TelephonyManager; -import android.util.Log; - import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -27,6 +18,15 @@ import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import android.Manifest.permission; +import android.content.Context; +import android.content.pm.PackageManager; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.os.Build; +import android.telephony.TelephonyManager; +import android.util.Log; + /** * Provides a number of static functions to aid in the collection and formatting of datapoints. *

diff --git a/astrid/common-src/com/localytics/android/JsonObjects.java b/astrid/common-src/com/localytics/android/JsonObjects.java index 69d9bb15f..0df5ac190 100644 --- a/astrid/common-src/com/localytics/android/JsonObjects.java +++ b/astrid/common-src/com/localytics/android/JsonObjects.java @@ -1,9 +1,9 @@ package com.localytics.android; -import android.Manifest.permission; - import org.json.JSONArray; +import android.Manifest.permission; + /** * Set of constants for building JSON objects that get sent to the Localytics web service. */ diff --git a/astrid/common-src/com/localytics/android/LocalyticsProvider.java b/astrid/common-src/com/localytics/android/LocalyticsProvider.java index d25e30a93..a757bd4de 100644 --- a/astrid/common-src/com/localytics/android/LocalyticsProvider.java +++ b/astrid/common-src/com/localytics/android/LocalyticsProvider.java @@ -1,5 +1,13 @@ package com.localytics.android; +import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import android.content.ContentValues; import android.content.Context; import android.database.Cursor; @@ -10,14 +18,6 @@ import android.database.sqlite.SQLiteQueryBuilder; import android.provider.BaseColumns; import android.util.Log; -import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * Implements the storage mechanism for the Localytics library. The interface and implementation are similar to a ContentProvider * but modified to be better suited to a library. The interface is table-oriented, rather than Uri-oriented. diff --git a/astrid/common-src/com/localytics/android/LocalyticsSession.java b/astrid/common-src/com/localytics/android/LocalyticsSession.java index 248562947..face66b40 100755 --- a/astrid/common-src/com/localytics/android/LocalyticsSession.java +++ b/astrid/common-src/com/localytics/android/LocalyticsSession.java @@ -8,23 +8,6 @@ package com.localytics.android; -import android.Manifest.permission; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.CursorJoiner; -import android.os.Build; -import android.os.Build.VERSION; -import android.os.Handler; -import android.os.HandlerThread; -import android.os.Looper; -import android.os.Message; -import android.os.SystemClock; -import android.telephony.TelephonyManager; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.util.Log; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -51,6 +34,23 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import android.Manifest.permission; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.CursorJoiner; +import android.os.Build; +import android.os.Build.VERSION; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; +import android.os.Message; +import android.os.SystemClock; +import android.telephony.TelephonyManager; +import android.text.TextUtils; +import android.text.format.DateUtils; +import android.util.Log; + import com.localytics.android.JsonObjects.BlobHeader; import com.localytics.android.LocalyticsProvider.ApiKeysDbColumns; import com.localytics.android.LocalyticsProvider.AttributesDbColumns; diff --git a/astrid/libs/android-support-v4.jar b/astrid/libs/android-support-v4.jar new file mode 100755 index 000000000..d006198e6 Binary files /dev/null and b/astrid/libs/android-support-v4.jar differ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java index 0897a5b53..f1cc30489 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java @@ -136,22 +136,14 @@ public class ActFmLoginActivity extends Activity implements AuthListener { ContextManager.setContext(this); setContentView(getContentViewResource()); - setTitle(getTitleResource()); + if(getTitleResource() != 0) + setTitle(getTitleResource()); rand = new Random(DateUtilities.now()); noSync = getIntent().getBooleanExtra(EXTRA_DO_NOT_SYNC, false); showToast = getIntent().getBooleanExtra(SHOW_TOAST, true); - - facebook = new Facebook(APP_ID); - facebookRunner = new AsyncFacebookRunner(facebook); - - errors = (TextView) findViewById(R.id.error); - LoginButton loginButton = (LoginButton) findViewById(R.id.fb_login); - loginButton.init(this, facebook, this, new String[] { "email", - "offline_access", "publish_stream" }); - initializeUI(); getWindow().setFormat(PixelFormat.RGBA_8888); @@ -195,6 +187,14 @@ public class ActFmLoginActivity extends Activity implements AuthListener { } protected void initializeUI() { + facebook = new Facebook(APP_ID); + facebookRunner = new AsyncFacebookRunner(facebook); + + errors = (TextView) findViewById(R.id.error); + LoginButton loginButton = (LoginButton) findViewById(R.id.fb_login); + loginButton.init(this, facebook, this, new String[] { "email", + "offline_access", "publish_stream" }); + findViewById(R.id.gg_login).setOnClickListener(googleListener); Button pwLogin = (Button) findViewById(R.id.pw_login); pwLogin.setOnClickListener(signUpListener); diff --git a/astrid/project.properties b/astrid/project.properties index a2116be0d..0b260dcab 100644 --- a/astrid/project.properties +++ b/astrid/project.properties @@ -15,3 +15,4 @@ android.library.reference.2=../greendroid/GreenDroid/ # Project target. target=android-14 apk-configurations= +android.library.reference.4=../viewPagerIndicator/library diff --git a/astrid/res/drawable/welcome_walkthrough_1.png b/astrid/res/drawable/welcome_walkthrough_1.png new file mode 100644 index 000000000..9146e746e Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_1.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_2.png b/astrid/res/drawable/welcome_walkthrough_2.png new file mode 100644 index 000000000..d742479bd Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_2.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_3.png b/astrid/res/drawable/welcome_walkthrough_3.png new file mode 100644 index 000000000..5aa6fdf10 Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_3.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_4.png b/astrid/res/drawable/welcome_walkthrough_4.png new file mode 100644 index 000000000..d6ccdff33 Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_4.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_5.png b/astrid/res/drawable/welcome_walkthrough_5.png new file mode 100644 index 000000000..756fb4d30 Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_5.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_6.png b/astrid/res/drawable/welcome_walkthrough_6.png new file mode 100644 index 000000000..d5c4dd903 Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_6.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_fabric.png b/astrid/res/drawable/welcome_walkthrough_fabric.png new file mode 100644 index 000000000..67f9c3941 Binary files /dev/null and b/astrid/res/drawable/welcome_walkthrough_fabric.png differ diff --git a/astrid/res/layout/welcome_walkthrough.xml b/astrid/res/layout/welcome_walkthrough.xml new file mode 100755 index 000000000..48265dd26 --- /dev/null +++ b/astrid/res/layout/welcome_walkthrough.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml new file mode 100644 index 000000000..3b0ff4323 --- /dev/null +++ b/astrid/res/layout/welcome_walkthrough_login_page.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + +