+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/astrid/res/layout/welcome_walkthrough_page.xml b/astrid/res/layout/welcome_walkthrough_page.xml
new file mode 100644
index 000000000..bf7f876a6
--- /dev/null
+++ b/astrid/res/layout/welcome_walkthrough_page.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 39c0984d8..c7082ab02 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -185,10 +185,10 @@
share, and delegate with others.
- Login with Facebook
+ Connect with Facebook
- Login with Google
+ Connect with Google
Don\'t use Google or Facebook?
diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml
index aa753a58c..119fd6e7c 100644
--- a/astrid/res/values/strings-intro.xml
+++ b/astrid/res/values/strings-intro.xml
@@ -71,7 +71,7 @@
Login with Username/Password
- Login Later
+ Connect Later
Why not sign in?
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 87b8d3273..9de7dfc18 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -230,6 +230,14 @@
+
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 0a86a410c..6392e8a3a 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -115,6 +115,7 @@ import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.voice.VoiceInputAssistant;
import com.todoroo.astrid.welcome.HelpInfoPopover;
import com.todoroo.astrid.welcome.WelcomeLogin;
+import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
import com.todoroo.astrid.widget.TasksWidget;
/**
@@ -578,8 +579,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
new IntentFilter(AstridApiConstants.BROADCAST_SEND_SYNC_ACTIONS));
setUpBackgroundJobs();
+ //TODO REMOVE THIS GUY
+ //if (true){
if (!Preferences.getBoolean(WelcomeLogin.KEY_SHOWED_WELCOME_LOGIN, false)) {
- Intent showWelcomeLogin = new Intent(this, WelcomeLogin.class);
+ Intent showWelcomeLogin = new Intent(this, WelcomeWalkthrough.class);
showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
startActivity(showWelcomeLogin);
Preferences.setBoolean(WelcomeLogin.KEY_SHOWED_WELCOME_LOGIN, true);
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index a38025905..4098ef01a 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -40,6 +40,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
public final class UpgradeService {
+ public static final int V3_9_2 = 207;
public static final int V3_9_1_1 = 206;
public static final int V3_9_1 = 205;
public static final int V3_9_0_2 = 204;
@@ -170,6 +171,15 @@ public final class UpgradeService {
Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
StringBuilder changeLog = new StringBuilder();
+ if (from >= V3_9_1_1 && from < V3_9_2) {
+ newVersionString(changeLog, "3.9.2 (01/13/12)", new String[] {
+ "Made selecting dates and times easier:",
+ "New tutorial walkthrough for new users",
+ "Stomped on a few bugs",
+ "Feedback welcomed!"
+ });
+ }
+
if (from >= V3_9_1 && from < V3_9_1_1) {
newVersionString(changeLog, "3.9.1.1 (01/06/12)", new String[] {
"Fixed a few bugs:",
diff --git a/astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java b/astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java
index 28d0871ed..881fb87c1 100644
--- a/astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java
+++ b/astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java
@@ -61,7 +61,7 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
setupLoginLater();
}
- private SpannableString getLinkStringWithCustomInterval(String base, String linkComponent,
+ protected SpannableString getLinkStringWithCustomInterval(String base, String linkComponent,
int start, int endOffset, final OnClickListener listener) {
SpannableString link = new SpannableString (String.format("%s %s", //$NON-NLS-1$
base, linkComponent));
@@ -80,7 +80,7 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
return link;
}
- private void setupTermsOfService() {
+ protected void setupTermsOfService() {
TextView tos = (TextView)findViewById(R.id.tos);
tos.setOnClickListener(showTosListener);
@@ -90,12 +90,12 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
tos.setText(link);
}
- private void setupPWLogin() {
+ protected void setupPWLogin() {
Button pwLogin = (Button) findViewById(R.id.pw_login);
pwLogin.setOnClickListener(signUpListener);
}
- private void setupLoginLater() {
+ protected void setupLoginLater() {
TextView loginLater = (TextView)findViewById(R.id.login_later);
loginLater.setOnClickListener(loginLaterListener);
String loginLaterBase = getString(R.string.welcome_login_later);
@@ -117,14 +117,14 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
// --- event handler
- private final OnClickListener showTosListener = new OnClickListener() {
+ protected final OnClickListener showTosListener = new OnClickListener() {
@Override
public void onClick(View v) {
Eula.showEulaBasic(WelcomeLogin.this);
}
};
- private final OnClickListener loginLaterListener = new OnClickListener() {
+ protected final OnClickListener loginLaterListener = new OnClickListener() {
@Override
public void onClick(View arg0) {
String title = getString(R.string.welcome_login_confirm_later_title);
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
new file mode 100644
index 000000000..2acc66bc8
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
@@ -0,0 +1,125 @@
+package com.todoroo.astrid.welcome.tutorial;
+
+
+import android.content.Context;
+import android.os.Parcelable;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.timsu.astrid.R;
+
+public class ViewPagerAdapter extends PagerAdapter
+{
+ private static int[] images = new int[]
+ {
+ R.drawable.welcome_walkthrough_1,
+ R.drawable.welcome_walkthrough_2,
+ R.drawable.welcome_walkthrough_3,
+ R.drawable.welcome_walkthrough_4,
+ R.drawable.welcome_walkthrough_5,
+ R.drawable.welcome_walkthrough_6,
+ R.drawable.welcome_screen
+ };
+ private static String[] title = new String[]
+ {
+ "Welcome to Astrid!",
+ "Make lists",
+ "Share lists",
+ "Divvy up tasks",
+ "Provide details",
+ "Discover",
+ "Login"
+ };
+ private static String[] body = new String[]
+ {
+ "The perfect personal\nto-do list that works great\nwith friends",
+ "Perfect for any list:\nto read, to watch, to buy,\nto visit, to do!",
+ "Share lists\nwith friends, housemates,\nor your sweetheart!",
+ "Never wonder who's\nbringing dessert!",
+ "Tap to add notes,\nset reminders,\nand much more!",
+ "Additional features,\nproductivity tips, and\nsuggestions from friends",
+ "Login"
+ };
+ private static int[] layouts = new int[]
+ {
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_page,
+ R.layout.welcome_walkthrough_login_page,
+
+ };
+ private final Context context;
+ public WelcomeWalkthrough parent;
+
+ public ViewPagerAdapter( Context context )
+ {
+ this.context = context;
+ }
+
+
+ @Override
+ public int getCount()
+ {
+ return layouts.length;
+ }
+
+ @Override
+ public Object instantiateItem( View pager, int position )
+ {
+ LayoutInflater inflater = LayoutInflater.from(context);
+
+ View pageView = inflater.inflate(layouts[position], null, true);
+ pageView.setLayoutParams( new ViewGroup.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT));
+
+ if (position != getCount()-1){
+ ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image);
+ imageView.setImageResource(images[position]);
+ ImageView fabricImage = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_fabric);
+ fabricImage.setScaleType(ImageView.ScaleType.FIT_XY);
+
+ TextView titleView = (TextView) pageView.findViewById(R.id.welcome_walkthrough_title);
+ titleView.setText(title[position]);
+ TextView bodyView = (TextView) pageView.findViewById(R.id.welcome_walkthrough_body);
+ bodyView.setText(body[position]);
+ }
+
+ ((ViewPager)pager).addView( pageView, 0 );
+ parent.pageScrolled(position, pageView);
+ return pageView;
+ }
+
+ @Override
+ public void destroyItem( View pager, int position, Object view )
+ {
+ ((ViewPager)pager).removeView( (View)view );
+ }
+
+ @Override
+ public boolean isViewFromObject( View view, Object object )
+ {
+ return view.equals( object );
+ }
+
+ @Override
+ public void finishUpdate( View view ) {}
+
+ @Override
+ public void restoreState( Parcelable p, ClassLoader c ) {}
+
+ @Override
+ public Parcelable saveState() {
+ return null;
+ }
+
+ @Override
+ public void startUpdate( View view ) {}
+}
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
new file mode 100644
index 000000000..8a3f5a896
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -0,0 +1,178 @@
+
+package com.todoroo.astrid.welcome.tutorial;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextPaint;
+import android.text.style.ClickableSpan;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.astrid.actfm.ActFmLoginActivity;
+import com.todoroo.astrid.activity.Eula;
+import com.todoroo.astrid.welcome.WelcomeLogin;
+import com.viewpagerindicator.CirclePageIndicator;
+import com.viewpagerindicator.PageIndicator;
+
+public class WelcomeWalkthrough extends ActFmLoginActivity {
+ ViewPager mPager;
+ ViewPagerAdapter mAdapter;
+ PageIndicator mIndicator;
+ View currentView;
+ int currentPage;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ super.onCreate(savedInstanceState);
+ //setContentView(R.layout.welcome_walkthrough);
+
+ mAdapter = new ViewPagerAdapter(this);
+ mAdapter.parent = this;
+
+ mPager = (ViewPager)findViewById(R.id.pager);
+ mPager.setAdapter(mAdapter);
+
+ mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
+ mIndicator.setViewPager(mPager);
+ }
+ @Override
+ protected int getContentViewResource() {
+ return R.layout.welcome_walkthrough;
+ }
+
+ @Override
+ protected int getTitleResource() {
+ return 0;
+ }
+ public void pageScrolled(int position, View view){
+ Log.d(null, "Updated ui");
+ currentView = view;
+ currentPage = position;
+ if (position == mAdapter.getCount()-1) {
+ initializeUI();
+ }
+ }
+
+
+
+ @Override
+ protected void initializeUI() {
+ if(mAdapter == null)
+ return;
+ if(currentPage == mAdapter.getCount()-1){
+ super.initializeUI();
+ setupTermsOfService();
+ setupLoginLater();
+ }
+ }
+
+ protected SpannableString getLinkStringWithCustomInterval(String base, String linkComponent,
+ int start, int endOffset, final OnClickListener listener) {
+ SpannableString link = new SpannableString (String.format("%s %s", //$NON-NLS-1$
+ base, linkComponent));
+ ClickableSpan linkSpan = new ClickableSpan() {
+ @Override
+ public void onClick(View widget) {
+ listener.onClick(widget);
+ }
+ @Override
+ public void updateDrawState(TextPaint ds) {
+ ds.setUnderlineText(true);
+ ds.setColor(Color.rgb(255, 255, 255));
+ }
+ };
+ link.setSpan(linkSpan, start, link.length() + endOffset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return link;
+ }
+ protected void setupTermsOfService() {
+ TextView tos = (TextView)currentView.findViewById(R.id.tos);
+ tos.setOnClickListener(showTosListener);
+
+ String tosBase = getString(R.string.welcome_login_tos_base);
+ String tosLink = getString(R.string.welcome_login_tos_link);
+ SpannableString link = getLinkStringWithCustomInterval(tosBase, tosLink, tosBase.length() + 2, -1, showTosListener);
+ tos.setText(link);
+ }
+ protected void setupPWLogin() {
+ Button pwLogin = (Button) findViewById(R.id.pw_login);
+ pwLogin.setOnClickListener(signUpListener);
+ }
+ /*
+ protected void setupWalkthroughLogin() {
+ Button loginButton = (Button)currentView.findViewById(R.id.walkthrough_login);
+ loginButton.setOnClickListener(showWalkthroughLoginListener);
+ }*/
+
+
+ protected void setupLoginLater() {
+ TextView loginLater = (TextView)currentView.findViewById(R.id.login_later);
+ loginLater.setOnClickListener(loginLaterListener);
+ String loginLaterBase = getString(R.string.welcome_login_later);
+ SpannableString loginLaterLink = new SpannableString(String.format("%s", loginLaterBase)); //$NON-NLS-1$
+ ClickableSpan laterSpan = new ClickableSpan() {
+ @Override
+ public void onClick(View widget) {
+ loginLaterListener.onClick(widget);
+ }
+ @Override
+ public void updateDrawState(TextPaint ds) {
+ ds.setUnderlineText(true);
+ ds.setColor(Color.rgb(255, 255, 255));
+ }
+ };
+ loginLaterLink.setSpan(laterSpan, 0, loginLaterBase.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ loginLater.setText(loginLaterLink);
+ }
+
+ protected final OnClickListener showTosListener = new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Eula.showEulaBasic(WelcomeWalkthrough.this);
+ }
+ };
+ private void showWelcomeLoginActivty() {
+ Intent showWelcomeLogin = new Intent(this, WelcomeLogin.class);
+ showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
+ startActivity(showWelcomeLogin);
+ }
+ protected final OnClickListener showWalkthroughLoginListener = new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showWelcomeLoginActivty();
+ }
+ };
+
+ protected final OnClickListener loginLaterListener = new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ String title = getString(R.string.welcome_login_confirm_later_title);
+ String confirmLater = getString(R.string.welcome_login_confirm_later_dialog);
+ DialogUtilities.okCancelCustomDialog(WelcomeWalkthrough.this, title, confirmLater,
+ R.string.welcome_login_confirm_later_ok,
+ R.string.welcome_login_confirm_later_cancel,
+ android.R.drawable.ic_dialog_alert,
+ null, confirmLaterListener);
+ }
+
+ private final DialogInterface.OnClickListener confirmLaterListener = new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ };
+ };
+
+}
+
diff --git a/viewPagerIndicator/.gitignore b/viewPagerIndicator/.gitignore
new file mode 100755
index 000000000..b546b7651
--- /dev/null
+++ b/viewPagerIndicator/.gitignore
@@ -0,0 +1,17 @@
+#Android generated
+bin
+gen
+
+#Eclipse
+.project
+.classpath
+.settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+pom.xml.*
diff --git a/viewPagerIndicator/CHANGELOG.md b/viewPagerIndicator/CHANGELOG.md
new file mode 100755
index 000000000..5fd81d94c
--- /dev/null
+++ b/viewPagerIndicator/CHANGELOG.md
@@ -0,0 +1,88 @@
+Change Log
+==========
+
+Version 2.2.2 *(2011-12-31)*
+----------------------------
+
+ * Fix incorrect `R.java` imports in all of the sample activities.
+
+
+Version 2.2.1 *(2011-12-31)*
+----------------------------
+
+ * New `setTypeface(Typeface)` and `getTypeface()` methods for title indicator.
+ (Thanks Dimitri Fedorov)
+ * Added styled tab indicator sample.
+ * Support for widths other than those that could be measured exactly.
+
+
+Version 2.2.0 *(2011-12-13)*
+----------------------------
+
+ * Default title indicator style is now 'underline'.
+ * Title indicator now allows specifying an `OnCenterItemClickListener` which
+ will give you callbacks when the current item title has been clicked.
+ (Thanks Chris Banes)
+
+
+Version 2.1.0 *(2011-11-30)*
+----------------------------
+
+ * Indicators now have a `notifyDataSetChanged` method which should be called
+ when changes are made to the adapter.
+ * Fix: Avoid `NullPointerException`s when the `ViewPager` is not immediately
+ bound to the indicator.
+
+
+Version 2.0.0 *(2011-11-20)*
+----------------------------
+
+ * New `TabPageIndicator`! Uses the Ice Cream Sandwich-style action bar tabs
+ which fill the width of the view when there are only a few tabs or provide
+ horizontal animated scrolling when there are many.
+ * Update to link against ACLv4r4. This will now be required in all implementing
+ applications.
+ * Allow dragging the title and circle indicators to drag the pager.
+ * Remove orientation example as the DirectionalViewPager library has not been
+ updated to ACLv4r4.
+
+
+Version 1.2.1 *(2011-10-20)*
+----------------------------
+
+Maven 3 is now required when building from the command line.
+
+ * Update to support ADT 14.
+
+
+Version 1.2.0 *(2011-10-04)*
+----------------------------
+
+ * Move to `com.viewpagerindicator` package.
+ * Move maven group and artifact to `com.viewpagerindicator:library`.
+
+
+Version 1.1.0 *(2011-10-02)*
+----------------------------
+
+ * Package changed from `com.jakewharton.android.viewpagerindicator` to
+ `com.jakewharton.android.view`.
+ * Add vertical orientation support to the circle indicator.
+ * Fix: Corrected drawing bug where a single frame would be drawn as if the
+ pager had completed its scroll when in fact it was still scrolling.
+ (Thanks SimonVT!)
+
+
+Version 1.0.1 *(2011-09-15)*
+----------------------------
+
+ * Fade selected title color to normal text color during the swipe to and from
+ the center position.
+ * Fix: Ensure both the indicator and footer line are updated when changing the
+ footer color via the `setFooterColor` method.
+
+
+Version 1.0.0 *(2011-08-07)*
+----------------------------
+
+Initial release.
diff --git a/viewPagerIndicator/README.md b/viewPagerIndicator/README.md
new file mode 100755
index 000000000..b5008debe
--- /dev/null
+++ b/viewPagerIndicator/README.md
@@ -0,0 +1,152 @@
+Android ViewPagerIndicator
+==========================
+
+Port of [Patrik Åkerfeldt][1]'s paging indicators that are compatible with the
+ViewPager from the [Android Compatibility Library][2] and
+[ActionBarSherlock][3].
+
+Try out the sample application [on the Android Market][10].
+
+![ViewPagerIndicator Sample Screenshots][9]
+
+
+
+
+Usage
+=====
+
+*For a working implementation of this project see the `sample/` folder.*
+
+ 1. Include one of the widgets in your view. This should usually be placed
+ adjacent to the `ViewPager` it represents.
+
+
+
+ 2. In your `onCreate` method (or `onCreateView` for a fragment), bind the
+ indicator to the `ViewPager`.
+
+ //Set the pager with an adapter
+ ViewPager pager = (ViewPager)findViewById(R.id.pager);
+ pager.setAdapter(new TestAdapter(getSupportFragmentManager()));
+
+ //Bind the title indicator to the adapter
+ TitlePageIndicator titleIndicator = (TitlePageIndicator)findViewById(R.id.titles);
+ titleIndicator.setViewPager(pager);
+
+ *Note*: If you are using `TitlePageIndicator` your adapter must implement
+ `TitleProvider`.
+
+ 3. *(Optional)* If you use an `OnPageChangeListener` with your view pager
+ you should set it in the indicator rather than on the pager directly.
+
+ //continued from above
+ titleIndicator.setOnPageChangeListener(mPageChangeListener);
+
+
+Theming
+-------
+
+There are three ways to style the look of the indicators.
+
+ 1. **Theme XML**. An attribute for each type of indicator is provided in which
+ you can specify a custom style.
+ 2. **Layout XML**. Through the use of a custom namespace you can include any
+ desired styles.
+ 3. **Object methods**. Both styles have getters and setters for each style
+ attribute which can be changed at any point.
+
+Each indicator has a demo which creates the same look using each of these
+methods.
+
+
+Including In Your Project
+-------------------------
+
+Android-ViewPagerIndicator is presented as an [Android library project][7]. A
+standalone JAR is not possible due to the theming capabilities offered by the
+indicator widgets.
+
+You can include this project by [referencing it as a library project][8] in
+Eclipse or ant.
+
+If you are a Maven user you can easily include the library by specifying it as
+a dependency:
+
+
+ com.viewpagerindicator
+ library
+ 2.2.2
+ apklib
+
+
+You must also include the following repository:
+
+
+ com.jakewharton
+ http://r.jakewharton.com/maven/release
+
+
+
+
+This project depends on the `ViewPager` class which is available in the
+[Android Compatibility Library][2] or [ActionBarSherlock][3]. Details for
+including one of those libraries is available on their respecitve web sites.
+
+
+
+
+Developed By
+============
+
+ * Jake Wharton -
+
+
+Credits
+-------
+
+ * [Patrik Åkerfeldt][1] - Author of [ViewFlow][4], a precursor to the ViewPager,
+ which supports paged views and is the original source of both the title
+ and circle indicators.
+ * [Francisco Figueiredo Jr.][5] - Idea and [first implementation][6] for
+ fragment support via ViewPager.
+
+
+
+
+License
+=======
+
+ Copyright 2011 Patrik Åkerfeldt
+ Copyright 2011 Francisco Figueiredo Jr.
+ Copyright 2011 Jake Wharton
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+
+
+
+ [1]: https://github.com/pakerfeldt
+ [2]: http://developer.android.com/sdk/compatibility-library.html
+ [3]: http://actionbarsherlock.com
+ [4]: https://github.com/pakerfeldt/android-viewflow
+ [5]: https://github.com/franciscojunior
+ [6]: https://gist.github.com/1122947
+ [7]: http://developer.android.com/guide/developing/projects/projects-eclipse.html
+ [8]: http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject
+ [9]: https://raw.github.com/JakeWharton/Android-ViewPagerIndicator/master/sample/screens.png
+ [10]: https://market.android.com/details?id=com.viewpagerindicator.sample
diff --git a/viewPagerIndicator/library/AndroidManifest.xml b/viewPagerIndicator/library/AndroidManifest.xml
new file mode 100755
index 000000000..ff69fbab5
--- /dev/null
+++ b/viewPagerIndicator/library/AndroidManifest.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/build.xml b/viewPagerIndicator/library/build.xml
new file mode 100644
index 000000000..a87b23a47
--- /dev/null
+++ b/viewPagerIndicator/library/build.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/checkstyle.xml b/viewPagerIndicator/library/checkstyle.xml
new file mode 100755
index 000000000..fa055bf11
--- /dev/null
+++ b/viewPagerIndicator/library/checkstyle.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/eclibs/android-support-v4.jar b/viewPagerIndicator/library/eclibs/android-support-v4.jar
new file mode 100755
index 000000000..d006198e6
Binary files /dev/null and b/viewPagerIndicator/library/eclibs/android-support-v4.jar differ
diff --git a/viewPagerIndicator/library/pom.xml b/viewPagerIndicator/library/pom.xml
new file mode 100755
index 000000000..ed6152014
--- /dev/null
+++ b/viewPagerIndicator/library/pom.xml
@@ -0,0 +1,67 @@
+
+
+
+ 4.0.0
+
+ com.viewpagerindicator
+ library
+ Android-ViewPagerIndicator
+ apklib
+
+
+ com.viewpagerindicator
+ parent
+ 2.2.2
+ ../pom.xml
+
+
+
+
+ android
+ android
+ provided
+
+
+
+ android.support
+ compatibility-v4
+ provided
+
+
+
+
+ src
+
+
+
+ com.jayway.maven.plugins.android.generation2
+ maven-android-plugin
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${project.basedir}/checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/proguard.cfg b/viewPagerIndicator/library/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/viewPagerIndicator/library/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+ native ;
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator *;
+}
diff --git a/viewPagerIndicator/library/project.properties b/viewPagerIndicator/library/project.properties
new file mode 100755
index 000000000..96db74214
--- /dev/null
+++ b/viewPagerIndicator/library/project.properties
@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+android.library=true
+# Project target.
+target=android-4
diff --git a/viewPagerIndicator/library/res/color/vpi__dark_theme.xml b/viewPagerIndicator/library/res/color/vpi__dark_theme.xml
new file mode 100755
index 000000000..3e7a08f85
--- /dev/null
+++ b/viewPagerIndicator/library/res/color/vpi__dark_theme.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/res/color/vpi__light_theme.xml b/viewPagerIndicator/library/res/color/vpi__light_theme.xml
new file mode 100755
index 000000000..f955db720
--- /dev/null
+++ b/viewPagerIndicator/library/res/color/vpi__light_theme.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png
new file mode 100755
index 000000000..673e3bf10
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_holo.9.png
new file mode 100755
index 000000000..d57df98b5
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png
new file mode 100755
index 000000000..6278eef47
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png
new file mode 100755
index 000000000..294991d79
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_holo.9.png
new file mode 100755
index 000000000..19532ab10
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png
new file mode 100755
index 000000000..aadc6f87b
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png
new file mode 100755
index 000000000..c9972e74b
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_holo.9.png
new file mode 100755
index 000000000..587337caf
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png
new file mode 100755
index 000000000..155c4fc75
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png
new file mode 100755
index 000000000..f0cecd183
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_holo.9.png
new file mode 100755
index 000000000..a2dbf42b7
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png
new file mode 100755
index 000000000..b1223fe3c
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png
new file mode 100755
index 000000000..03cfb0945
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_holo.9.png
new file mode 100755
index 000000000..e4229f26b
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png
new file mode 100755
index 000000000..e862cb121
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png
new file mode 100755
index 000000000..f3a5cbde8
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png
new file mode 100755
index 000000000..946517378
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png
new file mode 100755
index 000000000..f1eb67323
Binary files /dev/null and b/viewPagerIndicator/library/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png differ
diff --git a/viewPagerIndicator/library/res/drawable/vpi__tab_indicator.xml b/viewPagerIndicator/library/res/drawable/vpi__tab_indicator.xml
new file mode 100755
index 000000000..520d08c25
--- /dev/null
+++ b/viewPagerIndicator/library/res/drawable/vpi__tab_indicator.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/res/layout/vpi__tab.xml b/viewPagerIndicator/library/res/layout/vpi__tab.xml
new file mode 100755
index 000000000..980bec443
--- /dev/null
+++ b/viewPagerIndicator/library/res/layout/vpi__tab.xml
@@ -0,0 +1,13 @@
+
+
+
\ No newline at end of file
diff --git a/viewPagerIndicator/library/res/values/vpi__attrs.xml b/viewPagerIndicator/library/res/values/vpi__attrs.xml
new file mode 100755
index 000000000..9e47b0734
--- /dev/null
+++ b/viewPagerIndicator/library/res/values/vpi__attrs.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/res/values/vpi__colors.xml b/viewPagerIndicator/library/res/values/vpi__colors.xml
new file mode 100755
index 000000000..c0d958fcf
--- /dev/null
+++ b/viewPagerIndicator/library/res/values/vpi__colors.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ #ff000000
+ #fff3f3f3
+ @color/vpi__background_holo_light
+ @color/vpi__background_holo_dark
+ #ff4c4c4c
+ #ffb2b2b2
+ @color/vpi__bright_foreground_holo_light
+ @color/vpi__bright_foreground_holo_dark
+
diff --git a/viewPagerIndicator/library/res/values/vpi__defaults.xml b/viewPagerIndicator/library/res/values/vpi__defaults.xml
new file mode 100755
index 000000000..6a27089a6
--- /dev/null
+++ b/viewPagerIndicator/library/res/values/vpi__defaults.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ true
+ #FFFFFFFF
+ 0
+ 3dp
+ false
+ #FFDDDDDD
+ 1dp
+
+ 4dp
+ #FF6899FF
+ 2dp
+ 2
+ 4dp
+ 20dp
+ 7dp
+ #FFFFFFFF
+ true
+ #BBFFFFFF
+ 15sp
+ 5dp
+ 7dp
+
\ No newline at end of file
diff --git a/viewPagerIndicator/library/res/values/vpi__styles.xml b/viewPagerIndicator/library/res/values/vpi__styles.xml
new file mode 100755
index 000000000..f6fa7b190
--- /dev/null
+++ b/viewPagerIndicator/library/res/values/vpi__styles.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/viewPagerIndicator/library/src/com/viewpagerindicator/CirclePageIndicator.java b/viewPagerIndicator/library/src/com/viewpagerindicator/CirclePageIndicator.java
new file mode 100755
index 000000000..1017f5189
--- /dev/null
+++ b/viewPagerIndicator/library/src/com/viewpagerindicator/CirclePageIndicator.java
@@ -0,0 +1,526 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.view.ViewConfigurationCompat;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+/**
+ * Draws circles (one for each view). The current view position is filled and
+ * others are only stroked.
+ */
+public class CirclePageIndicator extends View implements PageIndicator {
+ public static final int HORIZONTAL = 0;
+ public static final int VERTICAL = 1;
+
+ private float mRadius;
+ private final Paint mPaintStroke;
+ private final Paint mPaintFill;
+ private ViewPager mViewPager;
+ private ViewPager.OnPageChangeListener mListener;
+ private int mCurrentPage;
+ private int mSnapPage;
+ private int mCurrentOffset;
+ private int mScrollState;
+ private int mPageSize;
+ private int mOrientation;
+ private boolean mCentered;
+ private boolean mSnap;
+
+ private static final int INVALID_POINTER = -1;
+
+ private int mTouchSlop;
+ private float mLastMotionX = -1;
+ private int mActivePointerId = INVALID_POINTER;
+ private boolean mIsDragging;
+
+
+ public CirclePageIndicator(Context context) {
+ this(context, null);
+ }
+
+ public CirclePageIndicator(Context context, AttributeSet attrs) {
+ this(context, attrs, R.attr.vpiCirclePageIndicatorStyle);
+ }
+
+ public CirclePageIndicator(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+
+ //Load defaults from resources
+ final Resources res = getResources();
+ final int defaultFillColor = res.getColor(R.color.default_circle_indicator_fill_color);
+ final int defaultOrientation = res.getInteger(R.integer.default_circle_indicator_orientation);
+ final int defaultStrokeColor = res.getColor(R.color.default_circle_indicator_stroke_color);
+ final float defaultStrokeWidth = res.getDimension(R.dimen.default_circle_indicator_stroke_width);
+ final float defaultRadius = res.getDimension(R.dimen.default_circle_indicator_radius);
+ final boolean defaultCentered = res.getBoolean(R.bool.default_circle_indicator_centered);
+ final boolean defaultSnap = res.getBoolean(R.bool.default_circle_indicator_snap);
+
+ //Retrieve styles attributes
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CirclePageIndicator, defStyle, R.style.Widget_CirclePageIndicator);
+
+ mCentered = a.getBoolean(R.styleable.CirclePageIndicator_centered, defaultCentered);
+ mOrientation = a.getInt(R.styleable.CirclePageIndicator_orientation, defaultOrientation);
+ mPaintStroke = new Paint(Paint.ANTI_ALIAS_FLAG);
+ mPaintStroke.setStyle(Style.STROKE);
+ mPaintStroke.setColor(a.getColor(R.styleable.CirclePageIndicator_strokeColor, defaultStrokeColor));
+ mPaintStroke.setStrokeWidth(a.getDimension(R.styleable.CirclePageIndicator_strokeWidth, defaultStrokeWidth));
+ mPaintFill = new Paint(Paint.ANTI_ALIAS_FLAG);
+ mPaintFill.setStyle(Style.FILL);
+ mPaintFill.setColor(a.getColor(R.styleable.CirclePageIndicator_fillColor, defaultFillColor));
+ mRadius = a.getDimension(R.styleable.CirclePageIndicator_radius, defaultRadius);
+ mSnap = a.getBoolean(R.styleable.CirclePageIndicator_snap, defaultSnap);
+
+ a.recycle();
+
+ final ViewConfiguration configuration = ViewConfiguration.get(context);
+ mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration);
+ }
+
+
+ public void setCentered(boolean centered) {
+ mCentered = centered;
+ invalidate();
+ }
+
+ public boolean isCentered() {
+ return mCentered;
+ }
+
+ public void setFillColor(int fillColor) {
+ mPaintFill.setColor(fillColor);
+ invalidate();
+ }
+
+ public int getFillColor() {
+ return mPaintFill.getColor();
+ }
+
+ public void setOrientation(int orientation) {
+ switch (orientation) {
+ case HORIZONTAL:
+ case VERTICAL:
+ mOrientation = orientation;
+ updatePageSize();
+ requestLayout();
+ break;
+
+ default:
+ throw new IllegalArgumentException("Orientation must be either HORIZONTAL or VERTICAL.");
+ }
+ }
+
+ public int getOrientation() {
+ return mOrientation;
+ }
+
+ public void setStrokeColor(int strokeColor) {
+ mPaintStroke.setColor(strokeColor);
+ invalidate();
+ }
+
+ public int getStrokeColor() {
+ return mPaintStroke.getColor();
+ }
+
+ public void setStrokeWidth(float strokeWidth) {
+ mPaintStroke.setStrokeWidth(strokeWidth);
+ invalidate();
+ }
+
+ public float getStrokeWidth() {
+ return mPaintStroke.getStrokeWidth();
+ }
+
+ public void setRadius(float radius) {
+ mRadius = radius;
+ invalidate();
+ }
+
+ public float getRadius() {
+ return mRadius;
+ }
+
+ public void setSnap(boolean snap) {
+ mSnap = snap;
+ invalidate();
+ }
+
+ public boolean isSnap() {
+ return mSnap;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see android.view.View#onDraw(android.graphics.Canvas)
+ */
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+
+ if (mViewPager == null) {
+ return;
+ }
+ final int count = mViewPager.getAdapter().getCount();
+ if (count == 0) {
+ return;
+ }
+
+ int longSize;
+ int longPaddingBefore;
+ int longPaddingAfter;
+ int shortPaddingBefore;
+ if (mOrientation == HORIZONTAL) {
+ longSize = getWidth();
+ longPaddingBefore = getPaddingLeft();
+ longPaddingAfter = getPaddingRight();
+ shortPaddingBefore = getPaddingTop();
+ } else {
+ longSize = getHeight();
+ longPaddingBefore = getPaddingTop();
+ longPaddingAfter = getPaddingBottom();
+ shortPaddingBefore = getPaddingLeft();
+ }
+
+ final float threeRadius = mRadius * 3;
+ final float shortOffset = shortPaddingBefore + mRadius;
+ float longOffset = longPaddingBefore + mRadius;
+ if (mCentered) {
+ longOffset += ((longSize - longPaddingBefore - longPaddingAfter) / 2.0f) - ((count * threeRadius) / 2.0f);
+ }
+
+ float dX;
+ float dY;
+
+ //Draw the filled circle according to the current scroll
+ float cx = (mSnap ? mSnapPage : mCurrentPage) * threeRadius;
+ if (!mSnap && (mPageSize != 0)) {
+ cx += (mCurrentOffset * 1.0f / mPageSize) * threeRadius;
+ }
+ if (mOrientation == HORIZONTAL) {
+ dX = longOffset + cx;
+ dY = shortOffset;
+ } else {
+ dX = shortOffset;
+ dY = longOffset + cx;
+ }
+ canvas.drawCircle(dX, dY, mRadius - getResources().getDimension(R.dimen.default_circle_indicator_stroke_width)/2
+, mPaintFill);
+
+ //Draw stroked circles
+ for (int iLoop = 0; iLoop < count; iLoop++) {
+ float drawLong = longOffset + (iLoop * threeRadius);
+ if (mOrientation == HORIZONTAL) {
+ dX = drawLong;
+ dY = shortOffset;
+ } else {
+ dX = shortOffset;
+ dY = drawLong;
+ }
+ canvas.drawCircle(dX, dY, mRadius, mPaintStroke);
+ }
+
+ }
+
+ public boolean onTouchEvent(android.view.MotionEvent ev) {
+ if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) {
+ return false;
+ }
+
+ final int action = ev.getAction();
+
+ switch (action & MotionEventCompat.ACTION_MASK) {
+ case MotionEvent.ACTION_DOWN:
+ mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
+ mLastMotionX = ev.getX();
+ break;
+
+ case MotionEvent.ACTION_MOVE: {
+ final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
+ final float x = MotionEventCompat.getX(ev, activePointerIndex);
+ final float deltaX = x - mLastMotionX;
+
+ if (!mIsDragging) {
+ if (Math.abs(deltaX) > mTouchSlop) {
+ mIsDragging = true;
+ }
+ }
+
+ if (mIsDragging) {
+ if (!mViewPager.isFakeDragging()) {
+ mViewPager.beginFakeDrag();
+ }
+
+ mLastMotionX = x;
+
+ mViewPager.fakeDragBy(deltaX);
+ }
+
+ break;
+ }
+
+ case MotionEvent.ACTION_CANCEL:
+ case MotionEvent.ACTION_UP:
+ if (!mIsDragging) {
+ final int count = mViewPager.getAdapter().getCount();
+ final int width = getWidth();
+ final float halfWidth = width / 2f;
+ final float sixthWidth = width / 6f;
+
+ if ((mCurrentPage > 0) && (ev.getX() < halfWidth - sixthWidth)) {
+ mViewPager.setCurrentItem(mCurrentPage - 1);
+ return true;
+ } else if ((mCurrentPage < count - 1) && (ev.getX() > halfWidth + sixthWidth)) {
+ mViewPager.setCurrentItem(mCurrentPage + 1);
+ return true;
+ }
+ }
+
+ mIsDragging = false;
+ mActivePointerId = INVALID_POINTER;
+ if (mViewPager.isFakeDragging()) mViewPager.endFakeDrag();
+ break;
+
+ case MotionEventCompat.ACTION_POINTER_DOWN: {
+ final int index = MotionEventCompat.getActionIndex(ev);
+ final float x = MotionEventCompat.getX(ev, index);
+ mLastMotionX = x;
+ mActivePointerId = MotionEventCompat.getPointerId(ev, index);
+ break;
+ }
+
+ case MotionEventCompat.ACTION_POINTER_UP:
+ final int pointerIndex = MotionEventCompat.getActionIndex(ev);
+ final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
+ if (pointerId == mActivePointerId) {
+ final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+ mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
+ }
+ mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId));
+ break;
+ }
+
+ return true;
+ };
+
+ @Override
+ public void setViewPager(ViewPager view) {
+ if (view.getAdapter() == null) {
+ throw new IllegalStateException("ViewPager does not have adapter instance.");
+ }
+ mViewPager = view;
+ mViewPager.setOnPageChangeListener(this);
+ updatePageSize();
+ invalidate();
+ }
+
+ private void updatePageSize() {
+ if (mViewPager != null) {
+ mPageSize = (mOrientation == HORIZONTAL) ? mViewPager.getWidth() : mViewPager.getHeight();
+ }
+ }
+
+ @Override
+ public void setViewPager(ViewPager view, int initialPosition) {
+ setViewPager(view);
+ setCurrentItem(initialPosition);
+ }
+
+ @Override
+ public void setCurrentItem(int item) {
+ if (mViewPager == null) {
+ throw new IllegalStateException("ViewPager has not been bound.");
+ }
+ mViewPager.setCurrentItem(item);
+ mCurrentPage = item;
+ invalidate();
+ }
+
+ @Override
+ public void notifyDataSetChanged() {
+ invalidate();
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ mScrollState = state;
+
+ if (mListener != null) {
+ mListener.onPageScrollStateChanged(state);
+ }
+ }
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ mCurrentPage = position;
+ mCurrentOffset = positionOffsetPixels;
+ updatePageSize();
+ invalidate();
+
+ if (mListener != null) {
+ mListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
+ }
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ if (mSnap || mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+ mCurrentPage = position;
+ mSnapPage = position;
+ invalidate();
+ }
+
+ if (mListener != null) {
+ mListener.onPageSelected(position);
+ }
+ }
+
+ @Override
+ public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
+ mListener = listener;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see android.view.View#onMeasure(int, int)
+ */
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ if (mOrientation == HORIZONTAL) {
+ setMeasuredDimension(measureLong(widthMeasureSpec), measureShort(heightMeasureSpec));
+ } else {
+ setMeasuredDimension(measureShort(widthMeasureSpec), measureLong(heightMeasureSpec));
+ }
+ }
+
+ /**
+ * Determines the width of this view
+ *
+ * @param measureSpec
+ * A measureSpec packed into an int
+ * @return The width of the view, honoring constraints from measureSpec
+ */
+ private int measureLong(int measureSpec) {
+ int result = 0;
+ int specMode = MeasureSpec.getMode(measureSpec);
+ int specSize = MeasureSpec.getSize(measureSpec);
+
+ if ((specMode == MeasureSpec.EXACTLY) || (mViewPager == null)) {
+ //We were told how big to be
+ result = specSize;
+ } else {
+ //Calculate the width according the views count
+ final int count = mViewPager.getAdapter().getCount();
+ result = (int)(getPaddingLeft() + getPaddingRight()
+ + (count * 2 * mRadius) + (count - 1) * mRadius + 1);
+ //Respect AT_MOST value if that was what is called for by measureSpec
+ if (specMode == MeasureSpec.AT_MOST) {
+ result = Math.min(result, specSize);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Determines the height of this view
+ *
+ * @param measureSpec
+ * A measureSpec packed into an int
+ * @return The height of the view, honoring constraints from measureSpec
+ */
+ private int measureShort(int measureSpec) {
+ int result = 0;
+ int specMode = MeasureSpec.getMode(measureSpec);
+ int specSize = MeasureSpec.getSize(measureSpec);
+
+ if (specMode == MeasureSpec.EXACTLY) {
+ //We were told how big to be
+ result = specSize;
+ } else {
+ //Measure the height
+ result = (int)(2 * mRadius + getPaddingTop() + getPaddingBottom() + 1);
+ //Respect AT_MOST value if that was what is called for by measureSpec
+ if (specMode == MeasureSpec.AT_MOST) {
+ result = Math.min(result, specSize);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ SavedState savedState = (SavedState)state;
+ super.onRestoreInstanceState(savedState.getSuperState());
+ mCurrentPage = savedState.currentPage;
+ mSnapPage = savedState.currentPage;
+ requestLayout();
+ }
+
+ @Override
+ public Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+ SavedState savedState = new SavedState(superState);
+ savedState.currentPage = mCurrentPage;
+ return savedState;
+ }
+
+ static class SavedState extends BaseSavedState {
+ int currentPage;
+
+ public SavedState(Parcelable superState) {
+ super(superState);
+ }
+
+ private SavedState(Parcel in) {
+ super(in);
+ currentPage = in.readInt();
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeInt(currentPage);
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
+ }
+}
diff --git a/viewPagerIndicator/library/src/com/viewpagerindicator/PageIndicator.java b/viewPagerIndicator/library/src/com/viewpagerindicator/PageIndicator.java
new file mode 100755
index 000000000..26414d8b8
--- /dev/null
+++ b/viewPagerIndicator/library/src/com/viewpagerindicator/PageIndicator.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.viewpagerindicator;
+
+import android.support.v4.view.ViewPager;
+
+/**
+ * A PageIndicator is responsible to show an visual indicator on the total views
+ * number and the current visible view.
+ */
+public interface PageIndicator extends ViewPager.OnPageChangeListener {
+ /**
+ * Bind the indicator to a ViewPager.
+ *
+ * @param view
+ */
+ public void setViewPager(ViewPager view);
+
+ /**
+ * Bind the indicator to a ViewPager.
+ *
+ * @param view
+ * @param initialPosition
+ */
+ public void setViewPager(ViewPager view, int initialPosition);
+
+ /**
+ * Set the current page of both the ViewPager and indicator.
+ *
+ * This must be used if you need to set the page before
+ * the views are drawn on screen (e.g., default start page).
+ *
+ * @param item
+ */
+ public void setCurrentItem(int item);
+
+ /**
+ * Set a page change listener which will receive forwarded events.
+ *
+ * @param listener
+ */
+ public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener);
+
+ /**
+ * Notify the indicator that the fragment list has changed.
+ */
+ public void notifyDataSetChanged();
+}
diff --git a/viewPagerIndicator/library/src/com/viewpagerindicator/TabPageIndicator.java b/viewPagerIndicator/library/src/com/viewpagerindicator/TabPageIndicator.java
new file mode 100755
index 000000000..9fba053ac
--- /dev/null
+++ b/viewPagerIndicator/library/src/com/viewpagerindicator/TabPageIndicator.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+import android.content.Context;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+/**
+ * This widget implements the dynamic action bar tab behavior that can change
+ * across different configurations or circumstances.
+ */
+public class TabPageIndicator extends HorizontalScrollView implements PageIndicator {
+ Runnable mTabSelector;
+
+ private OnClickListener mTabClickListener = new OnClickListener() {
+ public void onClick(View view) {
+ TabView tabView = (TabView)view;
+ mViewPager.setCurrentItem(tabView.getIndex());
+ }
+ };
+
+ private LinearLayout mTabLayout;
+ private ViewPager mViewPager;
+ private ViewPager.OnPageChangeListener mListener;
+
+ private LayoutInflater mInflater;
+
+ int mMaxTabWidth;
+ private int mSelectedTabIndex;
+
+ public TabPageIndicator(Context context) {
+ this(context, null);
+ }
+
+ public TabPageIndicator(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setHorizontalScrollBarEnabled(false);
+
+ mInflater = LayoutInflater.from(context);
+
+ mTabLayout = new LinearLayout(getContext());
+ addView(mTabLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.FILL_PARENT));
+ }
+
+ @Override
+ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+ final boolean lockedExpanded = widthMode == MeasureSpec.EXACTLY;
+ setFillViewport(lockedExpanded);
+
+ final int childCount = mTabLayout.getChildCount();
+ if (childCount > 1 && (widthMode == MeasureSpec.EXACTLY || widthMode == MeasureSpec.AT_MOST)) {
+ if (childCount > 2) {
+ mMaxTabWidth = (int)(MeasureSpec.getSize(widthMeasureSpec) * 0.4f);
+ } else {
+ mMaxTabWidth = MeasureSpec.getSize(widthMeasureSpec) / 2;
+ }
+ } else {
+ mMaxTabWidth = -1;
+ }
+
+ final int oldWidth = getMeasuredWidth();
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ final int newWidth = getMeasuredWidth();
+
+ if (lockedExpanded && oldWidth != newWidth) {
+ // Recenter the tab display if we're at a new (scrollable) size.
+ setCurrentItem(mSelectedTabIndex);
+ }
+ }
+
+ private void animateToTab(final int position) {
+ final View tabView = mTabLayout.getChildAt(position);
+ if (mTabSelector != null) {
+ removeCallbacks(mTabSelector);
+ }
+ mTabSelector = new Runnable() {
+ public void run() {
+ final int scrollPos = tabView.getLeft() - (getWidth() - tabView.getWidth()) / 2;
+ smoothScrollTo(scrollPos, 0);
+ mTabSelector = null;
+ }
+ };
+ post(mTabSelector);
+ }
+
+ @Override
+ public void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ if (mTabSelector != null) {
+ // Re-post the selector we saved
+ post(mTabSelector);
+ }
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ if (mTabSelector != null) {
+ removeCallbacks(mTabSelector);
+ }
+ }
+
+ private void addTab(String text, int index) {
+ //Workaround for not being able to pass a defStyle on pre-3.0
+ final TabView tabView = (TabView)mInflater.inflate(R.layout.vpi__tab, null);
+ tabView.init(this, text, index);
+ tabView.setFocusable(true);
+ tabView.setOnClickListener(mTabClickListener);
+
+ mTabLayout.addView(tabView, new LinearLayout.LayoutParams(0, LayoutParams.FILL_PARENT, 1));
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int arg0) {
+ if (mListener != null) {
+ mListener.onPageScrollStateChanged(arg0);
+ }
+ }
+
+ @Override
+ public void onPageScrolled(int arg0, float arg1, int arg2) {
+ if (mListener != null) {
+ mListener.onPageScrolled(arg0, arg1, arg2);
+ }
+ }
+
+ @Override
+ public void onPageSelected(int arg0) {
+ setCurrentItem(arg0);
+ if (mListener != null) {
+ mListener.onPageSelected(arg0);
+ }
+ }
+
+ @Override
+ public void setViewPager(ViewPager view) {
+ final PagerAdapter adapter = view.getAdapter();
+ if (adapter == null) {
+ throw new IllegalStateException("ViewPager does not have adapter instance.");
+ }
+ if (!(adapter instanceof TitleProvider)) {
+ throw new IllegalStateException("ViewPager adapter must implement TitleProvider to be used with TitlePageIndicator.");
+ }
+ mViewPager = view;
+ view.setOnPageChangeListener(this);
+ notifyDataSetChanged();
+ }
+
+ public void notifyDataSetChanged() {
+ mTabLayout.removeAllViews();
+ TitleProvider adapter = (TitleProvider)mViewPager.getAdapter();
+ final int count = ((PagerAdapter)adapter).getCount();
+ for (int i = 0; i < count; i++) {
+ addTab(adapter.getTitle(i), i);
+ }
+ if (mSelectedTabIndex > count) {
+ mSelectedTabIndex = count - 1;
+ }
+ setCurrentItem(mSelectedTabIndex);
+ requestLayout();
+ }
+
+ @Override
+ public void setViewPager(ViewPager view, int initialPosition) {
+ setViewPager(view);
+ setCurrentItem(initialPosition);
+ }
+
+ @Override
+ public void setCurrentItem(int item) {
+ if (mViewPager == null) {
+ throw new IllegalStateException("ViewPager has not been bound.");
+ }
+ mSelectedTabIndex = item;
+ final int tabCount = mTabLayout.getChildCount();
+ for (int i = 0; i < tabCount; i++) {
+ final View child = mTabLayout.getChildAt(i);
+ final boolean isSelected = (i == item);
+ child.setSelected(isSelected);
+ if (isSelected) {
+ animateToTab(item);
+ }
+ }
+ }
+
+ @Override
+ public void setOnPageChangeListener(OnPageChangeListener listener) {
+ mListener = listener;
+ }
+
+ public static class TabView extends LinearLayout {
+ private TabPageIndicator mParent;
+ private int mIndex;
+
+ public TabView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public void init(TabPageIndicator parent, String text, int index) {
+ mParent = parent;
+ mIndex = index;
+
+ TextView textView = (TextView)findViewById(android.R.id.text1);
+ textView.setText(text);
+ }
+
+ @Override
+ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ // Re-measure if we went beyond our maximum size.
+ if (mParent.mMaxTabWidth > 0 && getMeasuredWidth() > mParent.mMaxTabWidth) {
+ super.onMeasure(MeasureSpec.makeMeasureSpec(mParent.mMaxTabWidth, MeasureSpec.EXACTLY),
+ heightMeasureSpec);
+ }
+ }
+
+ public int getIndex() {
+ return mIndex;
+ }
+ }
+}
diff --git a/viewPagerIndicator/library/src/com/viewpagerindicator/TitlePageIndicator.java b/viewPagerIndicator/library/src/com/viewpagerindicator/TitlePageIndicator.java
new file mode 100755
index 000000000..b4eb8ad3f
--- /dev/null
+++ b/viewPagerIndicator/library/src/com/viewpagerindicator/TitlePageIndicator.java
@@ -0,0 +1,776 @@
+/*
+ * Copyright (C) 2011 Jake Wharton
+ * Copyright (C) 2011 Patrik Akerfeldt
+ * Copyright (C) 2011 Francisco Figueiredo Jr.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+import java.util.ArrayList;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.graphics.Typeface;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewConfigurationCompat;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+/**
+ * A TitlePageIndicator is a PageIndicator which displays the title of left view
+ * (if exist), the title of the current select view (centered) and the title of
+ * the right view (if exist). When the user scrolls the ViewPager then titles are
+ * also scrolled.
+ */
+public class TitlePageIndicator extends View implements PageIndicator {
+ /**
+ * Percentage indicating what percentage of the screen width away from
+ * center should the underline be fully faded. A value of 0.25 means that
+ * halfway between the center of the screen and an edge.
+ */
+ private static final float SELECTION_FADE_PERCENTAGE = 0.25f;
+
+ /**
+ * Percentage indicating what percentage of the screen width away from
+ * center should the selected text bold turn off. A value of 0.05 means
+ * that 10% between the center and an edge.
+ */
+ private static final float BOLD_FADE_PERCENTAGE = 0.05f;
+
+ /**
+ * Interface for a callback when the center item has been clicked.
+ */
+ public static interface OnCenterItemClickListener {
+ /**
+ * Callback when the center item has been clicked.
+ *
+ * @param position Position of the current center item.
+ */
+ public void onCenterItemClick(int position);
+ }
+
+ public enum IndicatorStyle {
+ None(0), Triangle(1), Underline(2);
+
+ public final int value;
+
+ private IndicatorStyle(int value) {
+ this.value = value;
+ }
+
+ public static IndicatorStyle fromValue(int value) {
+ for (IndicatorStyle style : IndicatorStyle.values()) {
+ if (style.value == value) {
+ return style;
+ }
+ }
+ return null;
+ }
+ }
+
+ private ViewPager mViewPager;
+ private ViewPager.OnPageChangeListener mListener;
+ private TitleProvider mTitleProvider;
+ private int mCurrentPage;
+ private int mCurrentOffset;
+ private int mScrollState;
+ private final Paint mPaintText = new Paint();
+ private boolean mBoldText;
+ private int mColorText;
+ private int mColorSelected;
+ private Path mPath;
+ private final Paint mPaintFooterLine = new Paint();
+ private IndicatorStyle mFooterIndicatorStyle;
+ private final Paint mPaintFooterIndicator = new Paint();
+ private float mFooterIndicatorHeight;
+ private float mFooterIndicatorUnderlinePadding;
+ private float mFooterPadding;
+ private float mTitlePadding;
+ private float mTopPadding;
+ /** Left and right side padding for not active view titles. */
+ private float mClipPadding;
+ private float mFooterLineHeight;
+
+ private static final int INVALID_POINTER = -1;
+
+ private int mTouchSlop;
+ private float mLastMotionX = -1;
+ private int mActivePointerId = INVALID_POINTER;
+ private boolean mIsDragging;
+
+ private OnCenterItemClickListener mCenterItemClickListener;
+
+
+ public TitlePageIndicator(Context context) {
+ this(context, null);
+ }
+
+ public TitlePageIndicator(Context context, AttributeSet attrs) {
+ this(context, attrs, R.attr.vpiTitlePageIndicatorStyle);
+ }
+
+ public TitlePageIndicator(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+
+ //Load defaults from resources
+ final Resources res = getResources();
+ final int defaultFooterColor = res.getColor(R.color.default_title_indicator_footer_color);
+ final float defaultFooterLineHeight = res.getDimension(R.dimen.default_title_indicator_footer_line_height);
+ final int defaultFooterIndicatorStyle = res.getInteger(R.integer.default_title_indicator_footer_indicator_style);
+ final float defaultFooterIndicatorHeight = res.getDimension(R.dimen.default_title_indicator_footer_indicator_height);
+ final float defaultFooterIndicatorUnderlinePadding = res.getDimension(R.dimen.default_title_indicator_footer_indicator_underline_padding);
+ final float defaultFooterPadding = res.getDimension(R.dimen.default_title_indicator_footer_padding);
+ final int defaultSelectedColor = res.getColor(R.color.default_title_indicator_selected_color);
+ final boolean defaultSelectedBold = res.getBoolean(R.bool.default_title_indicator_selected_bold);
+ final int defaultTextColor = res.getColor(R.color.default_title_indicator_text_color);
+ final float defaultTextSize = res.getDimension(R.dimen.default_title_indicator_text_size);
+ final float defaultTitlePadding = res.getDimension(R.dimen.default_title_indicator_title_padding);
+ final float defaultClipPadding = res.getDimension(R.dimen.default_title_indicator_clip_padding);
+ final float defaultTopPadding = res.getDimension(R.dimen.default_title_indicator_top_padding);
+
+ //Retrieve styles attributes
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TitlePageIndicator, defStyle, R.style.Widget_TitlePageIndicator);
+
+ //Retrieve the colors to be used for this view and apply them.
+ mFooterLineHeight = a.getDimension(R.styleable.TitlePageIndicator_footerLineHeight, defaultFooterLineHeight);
+ mFooterIndicatorStyle = IndicatorStyle.fromValue(a.getInteger(R.styleable.TitlePageIndicator_footerIndicatorStyle, defaultFooterIndicatorStyle));
+ mFooterIndicatorHeight = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorHeight, defaultFooterIndicatorHeight);
+ mFooterIndicatorUnderlinePadding = a.getDimension(R.styleable.TitlePageIndicator_footerIndicatorUnderlinePadding, defaultFooterIndicatorUnderlinePadding);
+ mFooterPadding = a.getDimension(R.styleable.TitlePageIndicator_footerPadding, defaultFooterPadding);
+ mTopPadding = a.getDimension(R.styleable.TitlePageIndicator_topPadding, defaultTopPadding);
+ mTitlePadding = a.getDimension(R.styleable.TitlePageIndicator_titlePadding, defaultTitlePadding);
+ mClipPadding = a.getDimension(R.styleable.TitlePageIndicator_clipPadding, defaultClipPadding);
+ mColorSelected = a.getColor(R.styleable.TitlePageIndicator_selectedColor, defaultSelectedColor);
+ mColorText = a.getColor(R.styleable.TitlePageIndicator_textColor, defaultTextColor);
+ mBoldText = a.getBoolean(R.styleable.TitlePageIndicator_selectedBold, defaultSelectedBold);
+
+ final float textSize = a.getDimension(R.styleable.TitlePageIndicator_textSize, defaultTextSize);
+ final int footerColor = a.getColor(R.styleable.TitlePageIndicator_footerColor, defaultFooterColor);
+ mPaintText.setTextSize(textSize);
+ mPaintText.setAntiAlias(true);
+ mPaintFooterLine.setStyle(Paint.Style.FILL_AND_STROKE);
+ mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
+ mPaintFooterLine.setColor(footerColor);
+ mPaintFooterIndicator.setStyle(Paint.Style.FILL_AND_STROKE);
+ mPaintFooterIndicator.setColor(footerColor);
+
+ a.recycle();
+
+ final ViewConfiguration configuration = ViewConfiguration.get(context);
+ mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration);
+ }
+
+
+ public int getFooterColor() {
+ return mPaintFooterLine.getColor();
+ }
+
+ public void setFooterColor(int footerColor) {
+ mPaintFooterLine.setColor(footerColor);
+ mPaintFooterIndicator.setColor(footerColor);
+ invalidate();
+ }
+
+ public float getFooterLineHeight() {
+ return mFooterLineHeight;
+ }
+
+ public void setFooterLineHeight(float footerLineHeight) {
+ mFooterLineHeight = footerLineHeight;
+ mPaintFooterLine.setStrokeWidth(mFooterLineHeight);
+ invalidate();
+ }
+
+ public float getFooterIndicatorHeight() {
+ return mFooterIndicatorHeight;
+ }
+
+ public void setFooterIndicatorHeight(float footerTriangleHeight) {
+ mFooterIndicatorHeight = footerTriangleHeight;
+ invalidate();
+ }
+
+ public float getFooterIndicatorPadding() {
+ return mFooterPadding;
+ }
+
+ public void setFooterIndicatorPadding(float footerIndicatorPadding) {
+ mFooterPadding = footerIndicatorPadding;
+ invalidate();
+ }
+
+ public IndicatorStyle getFooterIndicatorStyle() {
+ return mFooterIndicatorStyle;
+ }
+
+ public void setFooterIndicatorStyle(IndicatorStyle indicatorStyle) {
+ mFooterIndicatorStyle = indicatorStyle;
+ invalidate();
+ }
+
+ public int getSelectedColor() {
+ return mColorSelected;
+ }
+
+ public void setSelectedColor(int selectedColor) {
+ mColorSelected = selectedColor;
+ invalidate();
+ }
+
+ public boolean isSelectedBold() {
+ return mBoldText;
+ }
+
+ public void setSelectedBold(boolean selectedBold) {
+ mBoldText = selectedBold;
+ invalidate();
+ }
+
+ public int getTextColor() {
+ return mColorText;
+ }
+
+ public void setTextColor(int textColor) {
+ mPaintText.setColor(textColor);
+ mColorText = textColor;
+ invalidate();
+ }
+
+ public float getTextSize() {
+ return mPaintText.getTextSize();
+ }
+
+ public void setTextSize(float textSize) {
+ mPaintText.setTextSize(textSize);
+ invalidate();
+ }
+
+ public float getTitlePadding() {
+ return this.mTitlePadding;
+ }
+
+ public void setTitlePadding(float titlePadding) {
+ mTitlePadding = titlePadding;
+ invalidate();
+ }
+
+ public float getTopPadding() {
+ return this.mTopPadding;
+ }
+
+ public void setTopPadding(float topPadding) {
+ mTopPadding = topPadding;
+ invalidate();
+ }
+
+ public float getClipPadding() {
+ return this.mClipPadding;
+ }
+
+ public void setClipPadding(float clipPadding) {
+ mClipPadding = clipPadding;
+ invalidate();
+ }
+
+ public void setTypeface(Typeface typeface) {
+ mPaintText.setTypeface(typeface);
+ invalidate();
+ }
+
+ public Typeface getTypeface() {
+ return mPaintText.getTypeface();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see android.view.View#onDraw(android.graphics.Canvas)
+ */
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+
+ if (mViewPager == null) {
+ return;
+ }
+ final int count = mViewPager.getAdapter().getCount();
+ if (count == 0) {
+ return;
+ }
+
+ //Calculate views bounds
+ ArrayList bounds = calculateAllBounds(mPaintText);
+
+ //Make sure we're on a page that still exists
+ if (mCurrentPage >= bounds.size()) {
+ setCurrentItem(bounds.size()-1);
+ }
+
+ final int countMinusOne = count - 1;
+ final float halfWidth = getWidth() / 2f;
+ final int left = getLeft();
+ final float leftClip = left + mClipPadding;
+ final int width = getWidth();
+ final int height = getHeight();
+ final int right = left + width;
+ final float rightClip = right - mClipPadding;
+
+ int page = mCurrentPage;
+ float offsetPercent;
+ if (mCurrentOffset <= halfWidth) {
+ offsetPercent = 1.0f * mCurrentOffset / width;
+ } else {
+ page += 1;
+ offsetPercent = 1.0f * (width - mCurrentOffset) / width;
+ }
+ final boolean currentSelected = (offsetPercent <= SELECTION_FADE_PERCENTAGE);
+ final boolean currentBold = (offsetPercent <= BOLD_FADE_PERCENTAGE);
+ final float selectedPercent = (SELECTION_FADE_PERCENTAGE - offsetPercent) / SELECTION_FADE_PERCENTAGE;
+
+ //Verify if the current view must be clipped to the screen
+ RectF curPageBound = bounds.get(mCurrentPage);
+ float curPageWidth = curPageBound.right - curPageBound.left;
+ if (curPageBound.left < leftClip) {
+ //Try to clip to the screen (left side)
+ clipViewOnTheLeft(curPageBound, curPageWidth, left);
+ }
+ if (curPageBound.right > rightClip) {
+ //Try to clip to the screen (right side)
+ clipViewOnTheRight(curPageBound, curPageWidth, right);
+ }
+
+ //Left views starting from the current position
+ if (mCurrentPage > 0) {
+ for (int i = mCurrentPage - 1; i >= 0; i--) {
+ RectF bound = bounds.get(i);
+ //Is left side is outside the screen
+ if (bound.left < leftClip) {
+ float w = bound.right - bound.left;
+ //Try to clip to the screen (left side)
+ clipViewOnTheLeft(bound, w, left);
+ //Except if there's an intersection with the right view
+ RectF rightBound = bounds.get(i + 1);
+ //Intersection
+ if (bound.right + mTitlePadding > rightBound.left) {
+ bound.left = rightBound.left - w - mTitlePadding;
+ bound.right = bound.left + w;
+ }
+ }
+ }
+ }
+ //Right views starting from the current position
+ if (mCurrentPage < countMinusOne) {
+ for (int i = mCurrentPage + 1 ; i < count; i++) {
+ RectF bound = bounds.get(i);
+ //If right side is outside the screen
+ if (bound.right > rightClip) {
+ float w = bound.right - bound.left;
+ //Try to clip to the screen (right side)
+ clipViewOnTheRight(bound, w, right);
+ //Except if there's an intersection with the left view
+ RectF leftBound = bounds.get(i - 1);
+ //Intersection
+ if (bound.left - mTitlePadding < leftBound.right) {
+ bound.left = leftBound.right + mTitlePadding;
+ bound.right = bound.left + w;
+ }
+ }
+ }
+ }
+
+ //Now draw views
+ for (int i = 0; i < count; i++) {
+ //Get the title
+ RectF bound = bounds.get(i);
+ //Only if one side is visible
+ if ((bound.left > left && bound.left < right) || (bound.right > left && bound.right < right)) {
+ final boolean currentPage = (i == page);
+ //Only set bold if we are within bounds
+ mPaintText.setFakeBoldText(currentPage && currentBold && mBoldText);
+
+ //Draw text as unselected
+ mPaintText.setColor(mColorText);
+ canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
+
+ //If we are within the selected bounds draw the selected text
+ if (currentPage && currentSelected) {
+ mPaintText.setColor(mColorSelected);
+ mPaintText.setAlpha((int)((mColorSelected >>> 24) * selectedPercent));
+ canvas.drawText(mTitleProvider.getTitle(i), bound.left, bound.bottom + mTopPadding, mPaintText);
+ }
+ }
+ }
+
+ //Draw the footer line
+ mPath = new Path();
+ mPath.moveTo(0, height - mFooterLineHeight / 2f);
+ mPath.lineTo(width, height - mFooterLineHeight / 2f);
+ mPath.close();
+ canvas.drawPath(mPath, mPaintFooterLine);
+
+ switch (mFooterIndicatorStyle) {
+ case Triangle:
+ mPath = new Path();
+ mPath.moveTo(halfWidth, height - mFooterLineHeight - mFooterIndicatorHeight);
+ mPath.lineTo(halfWidth + mFooterIndicatorHeight, height - mFooterLineHeight);
+ mPath.lineTo(halfWidth - mFooterIndicatorHeight, height - mFooterLineHeight);
+ mPath.close();
+ canvas.drawPath(mPath, mPaintFooterIndicator);
+ break;
+
+ case Underline:
+ if (!currentSelected) {
+ break;
+ }
+
+ RectF underlineBounds = bounds.get(page);
+ mPath = new Path();
+ mPath.moveTo(underlineBounds.left - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
+ mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight);
+ mPath.lineTo(underlineBounds.right + mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
+ mPath.lineTo(underlineBounds.left - mFooterIndicatorUnderlinePadding, height - mFooterLineHeight - mFooterIndicatorHeight);
+ mPath.close();
+
+ mPaintFooterIndicator.setAlpha((int)(0xFF * selectedPercent));
+ canvas.drawPath(mPath, mPaintFooterIndicator);
+ mPaintFooterIndicator.setAlpha(0xFF);
+ break;
+ }
+ }
+
+ public boolean onTouchEvent(android.view.MotionEvent ev) {
+ if ((mViewPager == null) || (mViewPager.getAdapter().getCount() == 0)) {
+ return false;
+ }
+
+ final int action = ev.getAction();
+
+ switch (action & MotionEventCompat.ACTION_MASK) {
+ case MotionEvent.ACTION_DOWN:
+ mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
+ mLastMotionX = ev.getX();
+ break;
+
+ case MotionEvent.ACTION_MOVE: {
+ final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
+ final float x = MotionEventCompat.getX(ev, activePointerIndex);
+ final float deltaX = x - mLastMotionX;
+
+ if (!mIsDragging) {
+ if (Math.abs(deltaX) > mTouchSlop) {
+ mIsDragging = true;
+ }
+ }
+
+ if (mIsDragging) {
+ if (!mViewPager.isFakeDragging()) {
+ mViewPager.beginFakeDrag();
+ }
+
+ mLastMotionX = x;
+
+ mViewPager.fakeDragBy(deltaX);
+ }
+
+ break;
+ }
+
+ case MotionEvent.ACTION_CANCEL:
+ case MotionEvent.ACTION_UP:
+ if (!mIsDragging) {
+ final int count = mViewPager.getAdapter().getCount();
+ final int width = getWidth();
+ final float halfWidth = width / 2f;
+ final float sixthWidth = width / 6f;
+ final float leftThird = halfWidth - sixthWidth;
+ final float rightThird = halfWidth + sixthWidth;
+ final float eventX = ev.getX();
+
+ if (eventX < leftThird) {
+ if (mCurrentPage > 0) {
+ mViewPager.setCurrentItem(mCurrentPage - 1);
+ return true;
+ }
+ } else if (eventX > rightThird) {
+ if (mCurrentPage < count - 1) {
+ mViewPager.setCurrentItem(mCurrentPage + 1);
+ return true;
+ }
+ } else {
+ //Middle third
+ if (mCenterItemClickListener != null) {
+ mCenterItemClickListener.onCenterItemClick(mCurrentPage);
+ }
+ }
+ }
+
+ mIsDragging = false;
+ mActivePointerId = INVALID_POINTER;
+ if (mViewPager.isFakeDragging()) mViewPager.endFakeDrag();
+ break;
+
+ case MotionEventCompat.ACTION_POINTER_DOWN: {
+ final int index = MotionEventCompat.getActionIndex(ev);
+ final float x = MotionEventCompat.getX(ev, index);
+ mLastMotionX = x;
+ mActivePointerId = MotionEventCompat.getPointerId(ev, index);
+ break;
+ }
+
+ case MotionEventCompat.ACTION_POINTER_UP:
+ final int pointerIndex = MotionEventCompat.getActionIndex(ev);
+ final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
+ if (pointerId == mActivePointerId) {
+ final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+ mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
+ }
+ mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId));
+ break;
+ }
+
+ return true;
+ };
+
+ /**
+ * Set bounds for the right textView including clip padding.
+ *
+ * @param curViewBound
+ * current bounds.
+ * @param curViewWidth
+ * width of the view.
+ */
+ private void clipViewOnTheRight(RectF curViewBound, float curViewWidth, int right) {
+ curViewBound.right = right - mClipPadding;
+ curViewBound.left = curViewBound.right - curViewWidth;
+ }
+
+ /**
+ * Set bounds for the left textView including clip padding.
+ *
+ * @param curViewBound
+ * current bounds.
+ * @param curViewWidth
+ * width of the view.
+ */
+ private void clipViewOnTheLeft(RectF curViewBound, float curViewWidth, int left) {
+ curViewBound.left = left + mClipPadding;
+ curViewBound.right = mClipPadding + curViewWidth;
+ }
+
+ /**
+ * Calculate views bounds and scroll them according to the current index
+ *
+ * @param paint
+ * @param currentIndex
+ * @return
+ */
+ private ArrayList calculateAllBounds(Paint paint) {
+ ArrayList list = new ArrayList();
+ //For each views (If no values then add a fake one)
+ final int count = mViewPager.getAdapter().getCount();
+ final int width = getWidth();
+ final int halfWidth = width / 2;
+ for (int i = 0; i < count; i++) {
+ RectF bounds = calcBounds(i, paint);
+ float w = (bounds.right - bounds.left);
+ float h = (bounds.bottom - bounds.top);
+ bounds.left = (halfWidth) - (w / 2) - mCurrentOffset + ((i - mCurrentPage) * width);
+ bounds.right = bounds.left + w;
+ bounds.top = 0;
+ bounds.bottom = h;
+ list.add(bounds);
+ }
+
+ return list;
+ }
+
+ /**
+ * Calculate the bounds for a view's title
+ *
+ * @param index
+ * @param paint
+ * @return
+ */
+ private RectF calcBounds(int index, Paint paint) {
+ //Calculate the text bounds
+ RectF bounds = new RectF();
+ bounds.right = paint.measureText(mTitleProvider.getTitle(index));
+ bounds.bottom = paint.descent() - paint.ascent();
+ return bounds;
+ }
+
+ @Override
+ public void setViewPager(ViewPager view) {
+ final PagerAdapter adapter = view.getAdapter();
+ if (adapter == null) {
+ throw new IllegalStateException("ViewPager does not have adapter instance.");
+ }
+ if (!(adapter instanceof TitleProvider)) {
+ throw new IllegalStateException("ViewPager adapter must implement TitleProvider to be used with TitlePageIndicator.");
+ }
+ mViewPager = view;
+ mViewPager.setOnPageChangeListener(this);
+ mTitleProvider = (TitleProvider)adapter;
+ invalidate();
+ }
+
+ @Override
+ public void setViewPager(ViewPager view, int initialPosition) {
+ setViewPager(view);
+ setCurrentItem(initialPosition);
+ }
+
+ @Override
+ public void notifyDataSetChanged() {
+ invalidate();
+ }
+
+ /**
+ * Set a callback listener for the center item click.
+ *
+ * @param listener Callback instance.
+ */
+ public void setOnCenterItemClickListener(OnCenterItemClickListener listener) {
+ mCenterItemClickListener = listener;
+ }
+
+ @Override
+ public void setCurrentItem(int item) {
+ if (mViewPager == null) {
+ throw new IllegalStateException("ViewPager has not been bound.");
+ }
+ mViewPager.setCurrentItem(item);
+ mCurrentPage = item;
+ invalidate();
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ mScrollState = state;
+
+ if (mListener != null) {
+ mListener.onPageScrollStateChanged(state);
+ }
+ }
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ mCurrentPage = position;
+ mCurrentOffset = positionOffsetPixels;
+ invalidate();
+
+ if (mListener != null) {
+ mListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
+ }
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+ mCurrentPage = position;
+ invalidate();
+ }
+
+ if (mListener != null) {
+ mListener.onPageSelected(position);
+ }
+ }
+
+ @Override
+ public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
+ mListener = listener;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ //Measure our width in whatever mode specified
+ final int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+
+ //Determine our height
+ float height = 0;
+ final int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+ if (heightSpecMode == MeasureSpec.EXACTLY) {
+ //We were told how big to be
+ height = MeasureSpec.getSize(heightMeasureSpec);
+ } else {
+ //Calculate the text bounds
+ RectF bounds = new RectF();
+ bounds.bottom = mPaintText.descent()-mPaintText.ascent();
+ height = bounds.bottom - bounds.top + mFooterLineHeight + mFooterPadding + mTopPadding;
+ if (mFooterIndicatorStyle != IndicatorStyle.None) {
+ height += mFooterIndicatorHeight;
+ }
+ }
+ final int measuredHeight = (int)height;
+
+ setMeasuredDimension(measuredWidth, measuredHeight);
+ }
+
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ SavedState savedState = (SavedState)state;
+ super.onRestoreInstanceState(savedState.getSuperState());
+ mCurrentPage = savedState.currentPage;
+ requestLayout();
+ }
+
+ @Override
+ public Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+ SavedState savedState = new SavedState(superState);
+ savedState.currentPage = mCurrentPage;
+ return savedState;
+ }
+
+ static class SavedState extends BaseSavedState {
+ int currentPage;
+
+ public SavedState(Parcelable superState) {
+ super(superState);
+ }
+
+ private SavedState(Parcel in) {
+ super(in);
+ currentPage = in.readInt();
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeInt(currentPage);
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
+ }
+}
diff --git a/viewPagerIndicator/library/src/com/viewpagerindicator/TitleProvider.java b/viewPagerIndicator/library/src/com/viewpagerindicator/TitleProvider.java
new file mode 100755
index 000000000..2a04b65b8
--- /dev/null
+++ b/viewPagerIndicator/library/src/com/viewpagerindicator/TitleProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 Patrik Akerfeldt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.viewpagerindicator;
+
+/**
+ * A TitleProvider provides the title to display according to a view.
+ */
+public interface TitleProvider {
+ /**
+ * Returns the title of the view at position
+ * @param position
+ * @return
+ */
+ public String getTitle(int position);
+}
diff --git a/viewPagerIndicator/pom.xml b/viewPagerIndicator/pom.xml
new file mode 100755
index 000000000..dafae3859
--- /dev/null
+++ b/viewPagerIndicator/pom.xml
@@ -0,0 +1,171 @@
+
+
+
+ 4.0.0
+
+ com.viewpagerindicator
+ parent
+ pom
+ 2.2.2
+
+ Android-ViewPagerIndicator (Parent)
+ Android library for.
+ https://github.com/JakeWharton/Android-ViewPagerIndicator
+ 2011
+
+
+ library
+ sample
+
+
+
+ http://github.com/JakeWharton/Android-ViewPagerIndicator/
+ scm:git:git://github.com/JakeWharton/Android-ViewPagerIndicator.git
+ scm:git:git@github.com:JakeWharton/Android-ViewPagerIndicator.git
+
+
+
+
+ Jake Wharton
+ jakewharton@gmail.com
+ jakewharton
+ http://jakewharton.com
+ -5
+
+ developer
+
+
+
+
+
+
+ Apache License Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+
+ personal-repository
+ JakeWharton.com Maven Repository
+ scp://r.jakewharton.com/home/jakewharton_repository/r.jakewharton.com/maven/release/
+
+
+ personal-repository
+ JakeWharton.com Maven Repository
+ scp://r.jakewharton.com/home/jakewharton_repository/r.jakewharton.com/maven/snapshot/
+
+
+
+
+ Jake Wharton
+ http://jakewharton.com
+
+
+
+ GitHub Issues
+ https://github.com/JakeWharton/Android-ViewPagerIndicator/issues
+
+
+
+ UTF-8
+ UTF-8
+
+ 1.6
+ 1.6_r3
+ 4
+ r6
+
+
+
+
+
+ android
+ android
+ ${android.version}
+
+
+
+ android.support
+ compatibility-v4
+ ${android.support.version}
+
+
+
+
+
+
+ com.jakewharton
+ http://r.jakewharton.com/maven/release
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.8
+
+
+
+ com.jayway.maven.plugins.android.generation2
+ android-maven-plugin
+ 3.0.0-alpha-13
+
+
+ ${android.platform}
+
+ true
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 2.6
+
+ true
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 2.1
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 2.6
+
+
+ org.apache.maven.wagon
+ wagon-ssh
+ 1.0-beta-7
+
+
+
+
+
+