diff --git a/.gitignore b/.gitignore
index 433d269..29932c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ target/
#Maven release files
*.releaseBackup
*.versionsBackup
+robodemo-lib/project.properties
+robodemo-sample/project.properties
diff --git a/README.md b/README.md
index c62702c..6fabd59 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@ RoboDemo
========
RoboDemo is a ShowCase library for Android to demonstrate to users how a given Activity works.
-
-A sample is available in the [download area](https://github.com/stephanenicolas/RoboDemo/downloads) of the repository.
+Additionally use RoboDemo to walk a user through a first time introduction to the app or show them how to use a new feature.
Screenshots
-----------
@@ -29,18 +28,18 @@ There are some cases where applications require more complex interactions from u
or new interactions not covered by Android UI Guidelines.
RoboDemo eases creating showcases / explaining / demonstrating of such activities to users.
-It will display an overlay activity to illustrate the `Activity` under showcase. The explanations consist of a serie of
+It will display an overlay to illustrate the `Activity` under showcase. The explanations consist of a series of
points to click on and their associated labels. The `Activity` under showcase is dimmed and the showcase highlights
transparent areas to point views or positions users have to click.
-Creation of `DemoActivity` is straightforward, have a look at the sample to put in place RoboDemo in your own app :
+Creation of `DemoFragment` is straightforward, have a look at the sample to put RoboDemo in your own app :
-1. create a `DemoActivity`, using a custom `DrawAdapter`
+1. create a `DemoFragment`, use a custom xml layout
2. in the `Activity` undershowcase, pass views or coordinates and their associated labels.
-RoboDemo has been designed to be convinient.
+RoboDemo can also walk a user through your own app. Great for first time use or explaining a feature that is not used often. Look in the sample to see how to switch from a showcase to a walkthrough.
-To learn more, visit [RoboDemo Starter Guide](https://github.com/stephanenicolas/RoboDemo/wiki/RoboDemo-Starter-Guide) and [browse RoboDemo Javadocs online](http://stephanenicolas.github.com/RoboDemo/apidocs/index.html).
+To learn more, visit [RoboDemo Fragment Starter Guide](https://github.com/ericharlow/RoboDemo/wiki/RoboDemo-FragmentStarterGuide) and [browse RoboDemo Javadocs online](http://stephanenicolas.github.com/RoboDemo/apidocs/index.html).
Customization
-------------
@@ -52,18 +51,7 @@ RoboDemo can be customized in different ways :
* using custom drawable and text locations
* and some more for sure...
-To learn more, visit [RoboDemo Starter Guide](https://github.com/stephanenicolas/RoboDemo/wiki/RoboDemo-Starter-Guide) and [browse RoboDemo Javadocs online](http://stephanenicolas.github.com/RoboDemo/apidocs/index.html).
-
-
-Know limitations
-----------------
-
-The base class for DemoActivity is based on `android.app.Activity`. Unfortunately, this can't cover all inheritance cases for projects
-based on ActionBarSherlock or RoboGuice or a custom Activity base class per project.
-
-In that case, we recommend using all classes from the library as well but rewrite your own `DemoActivity` changing only its super class.
-
-In the case you use ActionBarSherlock, check the code comments, they will give you hints to support ActionBarSherlock themes.
+To learn more, visit [RoboDemo Fragment Starter Guide](https://github.com/ericharlow/RoboDemo/wiki/RoboDemo-FragmentStarterGuide) and [browse RoboDemo Javadocs online](http://stephanenicolas.github.com/RoboDemo/apidocs/index.html).
Modules
-------
diff --git a/robodemo-lib-1.0.0.jar b/robodemo-lib-1.0.0.jar
deleted file mode 100644
index 1a883cb..0000000
Binary files a/robodemo-lib-1.0.0.jar and /dev/null differ
diff --git a/robodemo-lib-2.2.0.jar b/robodemo-lib-2.2.0.jar
new file mode 100644
index 0000000..c214e5f
Binary files /dev/null and b/robodemo-lib-2.2.0.jar differ
diff --git a/robodemo-lib/AndroidManifest.xml b/robodemo-lib/AndroidManifest.xml
index 8c0d0b4..fa0cf5c 100644
--- a/robodemo-lib/AndroidManifest.xml
+++ b/robodemo-lib/AndroidManifest.xml
@@ -4,7 +4,7 @@
android:versionName="1.0" >
diff --git a/robodemo-lib/project.properties b/robodemo-lib/project.properties
index dfa4dd0..484dab0 100644
--- a/robodemo-lib/project.properties
+++ b/robodemo-lib/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-16
+target=android-17
android.library=true
diff --git a/robodemo-lib/res/drawable-hdpi/ic_lockscreen_handle_pressed.png b/robodemo-lib/res/drawable-hdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 58a5f16..0000000
Binary files a/robodemo-lib/res/drawable-hdpi/ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/robodemo-lib/res/drawable-mdpi/ic_lockscreen_handle_pressed.png b/robodemo-lib/res/drawable-mdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 0187a02..0000000
Binary files a/robodemo-lib/res/drawable-mdpi/ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/robodemo-lib/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png b/robodemo-lib/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 2d28009..0000000
Binary files a/robodemo-lib/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/robodemo-lib/res/drawable/ic_lockscreen_handle.xml b/robodemo-lib/res/drawable/ic_lockscreen_handle.xml
new file mode 100644
index 0000000..dde788f
--- /dev/null
+++ b/robodemo-lib/res/drawable/ic_lockscreen_handle.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/robodemo-lib/res/layout/fragment_demo.xml b/robodemo-lib/res/layout/fragment_demo.xml
new file mode 100644
index 0000000..19bb18b
--- /dev/null
+++ b/robodemo-lib/res/layout/fragment_demo.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/robodemo-lib/res/values-hdpi/dimens.xml b/robodemo-lib/res/values-hdpi/dimens.xml
new file mode 100644
index 0000000..bfa156c
--- /dev/null
+++ b/robodemo-lib/res/values-hdpi/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ @dimen/width_hdpi
+ @dimen/height_hdpi
+
diff --git a/robodemo-lib/res/values-mdpi/dimens.xml b/robodemo-lib/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000..dad031f
--- /dev/null
+++ b/robodemo-lib/res/values-mdpi/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ @dimen/width_mdpi
+ @dimen/height_mdpi
+
diff --git a/robodemo-lib/res/values-xhdpi/dimens.xml b/robodemo-lib/res/values-xhdpi/dimens.xml
new file mode 100644
index 0000000..e00f48c
--- /dev/null
+++ b/robodemo-lib/res/values-xhdpi/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ @dimen/width_xhdpi
+ @dimen/height_xhdpi
+
diff --git a/robodemo-lib/res/values/attrs.xml b/robodemo-lib/res/values/attrs.xml
new file mode 100644
index 0000000..1b12001
--- /dev/null
+++ b/robodemo-lib/res/values/attrs.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/robodemo-lib/res/values/dimens.xml b/robodemo-lib/res/values/dimens.xml
new file mode 100644
index 0000000..c40ffc3
--- /dev/null
+++ b/robodemo-lib/res/values/dimens.xml
@@ -0,0 +1,11 @@
+
+
+ 108dp
+ 108dp
+
+ 108dp
+ 108dp
+
+ 162dp
+ 162dp
+
diff --git a/robodemo-lib/src/com/octo/android/robodemo/DefaultDrawViewAdapter.java b/robodemo-lib/src/com/octo/android/robodemo/DefaultDrawViewAdapter.java
index dca6253..61baf1a 100644
--- a/robodemo-lib/src/com/octo/android/robodemo/DefaultDrawViewAdapter.java
+++ b/robodemo-lib/src/com/octo/android/robodemo/DefaultDrawViewAdapter.java
@@ -1,17 +1,21 @@
package com.octo.android.robodemo;
+import java.util.ArrayList;
import java.util.List;
+import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.text.Layout;
import android.text.Layout.Alignment;
import android.text.StaticLayout;
import android.text.TextPaint;
+import android.text.style.DrawableMarginSpan;
import android.util.TypedValue;
import android.view.Display;
import android.view.WindowManager;
@@ -39,20 +43,17 @@ public class DefaultDrawViewAdapter implements DrawViewAdapter {
private Context context;
public DefaultDrawViewAdapter( Context context, List< LabeledPoint > listPoints ) {
- this.context = context;
- this.drawable = context.getResources().getDrawable( R.drawable.ic_lockscreen_handle_pressed );
- this.textPaint = initializeDefaultTextPaint();
- this.listPoints = listPoints;
-
- initialize();
-
+ this(context,
+ initializeDefaultDrawable(context),
+ initializeDefaultTextPaint(context),
+ listPoints);
}
public DefaultDrawViewAdapter( Context context, Drawable drawable, TextPaint textPaint, List< LabeledPoint > listPoints ) {
this.context = context;
this.drawable = drawable;
this.textPaint = textPaint;
- this.listPoints = listPoints;
+ this.listPoints = listPoints != null ? listPoints : new ArrayList< LabeledPoint >(0);
initialize();
@@ -62,16 +63,21 @@ public Context getContext() {
return context;
}
- private TextPaint initializeDefaultTextPaint() {
+ private static TextPaint initializeDefaultTextPaint(Context context) {
TextPaint textPaint = new TextPaint();
- textPaint.setColor( getContext().getResources().getColor( android.R.color.white ) );
+ textPaint.setColor( context.getResources().getColor( android.R.color.white ) );
textPaint.setShadowLayer( 2.0f, 0, 2.0f, android.R.color.black );
// http://stackoverflow.com/questions/3061930/how-to-set-unit-for-paint-settextsize
- textPaint.setTextSize( TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, DEFAULT_FONT_SIZE, getContext().getResources().getDisplayMetrics() ) );
+ textPaint.setTextSize( TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, DEFAULT_FONT_SIZE, context.getResources().getDisplayMetrics() ) );
return textPaint;
}
+
+ private static Drawable initializeDefaultDrawable(Context context) {
+ return context.getResources().getDrawable( R.drawable.ic_lockscreen_handle );
+ }
- @SuppressWarnings("deprecation")
+ @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
+ @SuppressWarnings("deprecation")
private void initialize() {
WindowManager wm = (WindowManager) context.getSystemService( Context.WINDOW_SERVICE );
Display display = wm.getDefaultDisplay();
@@ -94,21 +100,43 @@ private void initialize() {
@Override
public int getPointsCount() {
- return listPoints.size();
+ return listPoints == null ? 0 : listPoints.size();
}
@Override
- public Drawable getDrawableAt( int position ) {
- Point point = listPoints.get( position );
+ public Drawable getDrawableAt( int position ) {
+ LabeledPoint point = getListPoint(position);
int width = drawable.getIntrinsicWidth();
int height = drawable.getIntrinsicHeight();
- drawable.setBounds( point.x - width / 2, point.y - height / 2, point.x + width / 2, point.y + height / 2 );
- return drawable;
+ //experimental
+ Drawable localCopy = drawable;
+ if (point.doUsePreferredSize()) {
+ width = point.getPreferredWidth();
+ height = point.getPreferredHeight();
+ if (drawable instanceof GradientDrawable) {
+ localCopy = drawable.getConstantState().newDrawable().mutate();
+ ((GradientDrawable) localCopy).setSize(width, height);
+ }
+ }
+
+ localCopy.setBounds( point.x - width / 2, point.y - height / 2, point.x + width / 2, point.y + height / 2 );
+ return localCopy;
+ }
+
+ public void setListPoints(List< LabeledPoint > listPoints) {
+ this.listPoints = listPoints;
}
+ private LabeledPoint getListPoint(int position) {
+ if (position < 0 || listPoints == null || position >= listPoints.size()) {
+ return new LabeledPoint();
+ }
+ return listPoints.get( position );
+ }
+
@Override
public Layout getTextLayoutAt( int position ) {
- String text = listPoints.get( position ).getText();
+ String text = getListPoint(position).getText();
Rect bounds = new Rect();
textPaint.getTextBounds( text, 0, text.length(), bounds );
@@ -121,11 +149,16 @@ public Layout getTextLayoutAt( int position ) {
public Point getTextPointAt( int position ) {
Drawable drawable = getDrawableAt( position );
Layout textLayout = getTextLayoutAt( position );
- Point point = listPoints.get( position );
- final int marginX = drawable.getIntrinsicWidth() / 4 + margin;
- final int marginY = drawable.getIntrinsicHeight() / 4 + margin;
+ Point point = getListPoint(position);
+ final int marginX = drawable.getIntrinsicWidth() / 3 + margin;
+ final int marginY = drawable.getIntrinsicHeight() / 3 + margin;
int textX = point.x > screenWidth / 2 ? point.x - marginX - textLayout.getWidth() : point.x + marginX;
int textY = point.y > screenHeight / 2 ? point.y - marginY - textLayout.getHeight() : point.y + marginY;
return new Point( textX, textY );
}
+
+ @Override
+ public String getTextAt(int position) {
+ return getListPoint(position).getText();
+ }
}
\ No newline at end of file
diff --git a/robodemo-lib/src/com/octo/android/robodemo/DemoFragment.java b/robodemo-lib/src/com/octo/android/robodemo/DemoFragment.java
new file mode 100644
index 0000000..ff7aa90
--- /dev/null
+++ b/robodemo-lib/src/com/octo/android/robodemo/DemoFragment.java
@@ -0,0 +1,298 @@
+package com.octo.android.robodemo;
+
+import java.util.ArrayList;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnKeyListener;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
+import android.widget.CheckBox;
+
+/**
+ * This Fragment demonstrates the usage of a given Activity.
+ * The default view is semi-transparent and will be displayed on top of the activity being demonstrated.
+ * It displays a list of {@link LabeledPoint} inside a {@link DrawView}.
+ *
+ * To start this Fragment, proceed as follow :
+ *
+ *