- Fixed error showing tutorial from previous commit.

- Updated the version number and name

Author: itzikBraun

.idea/dictionaries/braunster.xml

@@ -92,12 +92,14 @@ dependencies {
 
 You can also copy past it to your project and before adding it to your dependencies you need to add it to *settings.gradle* so the system will understand it's a module like this:
 ```
-// Notice that in your settings file there would be more names so dont delete them, This are your other modules.
+// Notice that in your settings file there would be more names so don't delete them, This are your other modules.
 include':tutorial_view'
 ```
 
 ###TODO:
 * Return result when `TutorialActivity` finishes so you could know when it was done and if was skipped.
+* add the roboto font family to the app assets so it will work on lower versions
+* Make a sample app and publish it on Google Play
 
 ###Author
 [Itzik Braun - Google+](https://plus.google.com/+ItzikBraunster)

.idea/misc.xml

@@ -84,7 +84,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="tutorial_view" exported="" />
   </component>

README.md

@@ -1,16 +1,23 @@
 apply plugin: 'com.android.application'
 
+def versionMajor = 0
+def versionMinor = 8
+def versionPatch = 1
+def versionBuild = 0 // bump for dogfood builds, public betas, etc.
+
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "com.braunster.tutorialviewapp"
         minSdkVersion 15
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 22
+
+        versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
     }
+
     buildTypes {
         release {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

app/app.iml

@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
+import android.widget.TextView;
 
 import com.braunster.tutorialview.object.Tutorial;
 import com.braunster.tutorialview.object.TutorialBuilder;
@@ -30,6 +31,11 @@ protected void onCreate(Bundle savedInstanceState) {
 //        getWindow().requestFeature(Window.FEATURE_NO_TITLE);
 
         setContentView(R.layout.activity_main);
+
+        // Setting the version name.
+        ((TextView) findViewById(R.id.txt_version)).setText(String.format("Version: %s", BuildConfig.VERSION_NAME));
+
+
         tutorialView = (TutorialView) findViewById(R.id.tutorial_view);
 
         findViewById(R.id.view_bottom_left).setOnClickListener(this);
@@ -41,6 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (getActionBar() != null)
             getActionBar().setBackgroundDrawable(new ColorDrawable(Color.DKGRAY));
 
+
         //Using the tutorial view
         // This is used for the tutorial view that should be in your root view.
         // This may lead to problems when used inside LinearLayout and maybe other view.

app/build.gradle

@@ -84,4 +84,16 @@
         android:layout_marginTop="50dp"
         android:id="@+id/view_top_right"/>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:layout_margin="5dp"
+        android:padding="5dp"
+        android:id="@+id/txt_version"
+        android:gravity="center"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:text="V"/>
+
 </RelativeLayout>

app/src/main/java/com/braunster/tutorialviewapp/MainActivity.java

@@ -1,15 +1,23 @@
 apply plugin: 'com.android.library'
 
+def versionMajor = 0
+def versionMinor = 8
+def versionPatch = 1
+def versionBuild = 0 // bump for dogfood builds, public betas, etc.
+
+
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 21
-        versionCode 1
-        versionName "0.7.1"
+        targetSdkVersion 22
+
+        versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
     }
+
     buildTypes {
         release {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

app/src/main/res/layout/activity_main.xml

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.braunster.tutorialview.object.Debug;
 import com.braunster.tutorialview.object.Tutorial;
 import com.braunster.tutorialview.object.TutorialIntentBuilder;
 import com.braunster.tutorialview.view.TutorialLayout;
@@ -18,7 +19,7 @@
 public class TutorialActivity extends Activity {
 
     public static final String TAG = TutorialActivity.class.getSimpleName();
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = Debug.TutorialActivity;
 
     private TutorialLayout mTutorialLayout;
 
@@ -28,10 +29,14 @@ public class TutorialActivity extends Activity {
 
     private static final String CURRENT_TUTORIAL = "current_tutorial";
 
+    private Bundle savedInstanceState;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        this.savedInstanceState = savedInstanceState;
+
         setContentView(R.layout.activity_tutorial_layout);
 
         mTutorialLayout = (TutorialLayout) findViewById(R.id.tutorial_layout);
@@ -45,6 +50,25 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mTutorial = TutorialIntentBuilder.getTutorial(getIntent());
 
+        // Finish the activity when the tutorial is closed.
+        mTutorialLayout.setTutorialClosedListener(new TutorialView.TutorialClosedListener() {
+            @Override
+            public void onClosed() {
+                finish();
+            }
+        });
+
+        updateSystemUIColors();
+    }
+
+    /**
+     * Need to wait until the window get focused before doing the animation.
+     * Also it is good to post it.
+     * */
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        
         if (TutorialIntentBuilder.isWalkThrough(getIntent()))
         {
             ArrayList<Tutorial> tutorials = TutorialIntentBuilder.getWalkThroughData(getIntent());
@@ -77,26 +101,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mTutorialLayout.setTutorial(mTutorial, false);
         }
 
-
-        // Finish the activity when the tutorial is closed.
-        mTutorialLayout.setTutorialClosedListener(new TutorialView.TutorialClosedListener() {
-            @Override
-            public void onClosed() {
-                finish();
-            }
-        });
-
-        updateSystemUIColors();
-    }
-
-    /**
-     * Need to wait until the window get focused before doing the animation.
-     * Also it is good to post it.
-     * */
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-
         if (hasFocus && !mTutorialLayout.isShowing())
             mTutorialLayout.post(new Runnable() {
                 @Override

tutorial_view/build.gradle

@@ -0,0 +1,10 @@
+package com.braunster.tutorialview.object;
+
+/**
+ * Created by braunster on 03.05.15.
+ */
+public class Debug {
+
+    public static final boolean TutorialActivity = false;
+    public static final boolean TutorialIntentBuilder = false;
+}

tutorial_view/src/main/java/com/braunster/tutorialview/TutorialActivity.java

@@ -18,7 +18,7 @@
 public class TutorialIntentBuilder {
 
     public static final String TAG = TutorialIntentBuilder.class.getSimpleName();
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = Debug.TutorialIntentBuilder;
 
     private static final String TUTORIAL_OBJ = "tutorial_obj";
 
@@ -30,7 +30,7 @@ public class TutorialIntentBuilder {
 
     private static final String CHANGE_SYSTEM_UI_COLOR = "change_system_ui_colors";
 
-    private Intent intent;
+    private final Intent intent;
 
     public TutorialIntentBuilder(Context context){
         intent = new Intent(context, TutorialActivity.class );
@@ -193,9 +193,7 @@ public static Tutorial getTutorial(Intent intent){
     public static ArrayList<Tutorial> getWalkThroughData(Intent intent){
         if (intent.getExtras().containsKey(WALK_THROUGH_DATA))
         {
-            ArrayList<Tutorial> tutorials = intent.getExtras().getParcelableArrayList(WALK_THROUGH_DATA);
-
-            return tutorials;
+            return intent.getExtras().getParcelableArrayList(WALK_THROUGH_DATA);
         }
 
         return new ArrayList<>();

tutorial_view/src/main/java/com/braunster/tutorialview/object/Debug.java

@@ -523,7 +523,7 @@ protected void drawInnerCircles(Canvas canvas){
     /**
      * OnClickListener for hiding the tutorial when clicked.
      * */
-    private OnClickListener closeTutorialClickListener = new OnClickListener() {
+    private final OnClickListener closeTutorialClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
             closeTutorial();
@@ -533,7 +533,7 @@ public void onClick(View v) {
     /**
      * OnClickListener for skipping the walk through tutorial.
      * */
-    private OnClickListener skipWalkThroughClickListener = new OnClickListener() {
+    private final OnClickListener skipWalkThroughClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
             ((WalkThroughInterface) getParent()).skip();
@@ -782,9 +782,9 @@ && getParent() instanceof WalkThroughInterface
     }
 
     /**
-     * Posted on the tutorial info view to do ajustment and animation to the view.
+     * Posted on the tutorial info view to do adjustment and animation to the view.
      * */
-    private Runnable tutorialInfoViewPost = new Runnable() {
+    private final Runnable tutorialInfoViewPost = new Runnable() {
 
         RelativeLayout.LayoutParams skipButtonParams = null;
         RelativeLayout.LayoutParams titleParams = null;

tutorial_view/src/main/java/com/braunster/tutorialview/object/TutorialIntentBuilder.java

@@ -15,15 +15,15 @@
  */
 public class RippleTutorialView extends AbstractTutorialView {
 
-    public static final String TAG = RippleTutorialView.class.getSimpleName();
-    public static final boolean DEBUG = false;
+    private static final String TAG = RippleTutorialView.class.getSimpleName();
+    private static final boolean DEBUG = false;
 
     private int mAnimatedRadius = -1;
 
     private int mAnimationRadiusMax = -1;
 
-    private static PorterDuffXfermode sXfermodeClear = new PorterDuffXfermode(PorterDuff.Mode.CLEAR);
-    private static PorterDuffXfermode sXfermodeNormal = new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER);
+    private static final PorterDuffXfermode sXfermodeClear = new PorterDuffXfermode(PorterDuff.Mode.CLEAR);
+    private static final PorterDuffXfermode sXfermodeNormal = new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER);
 
     public RippleTutorialView(Context context) {
         super(context);
@@ -76,6 +76,8 @@ protected boolean shouldDraw() {
         return super.shouldDraw() && showing && mAnimatedRadius != -1;
     }
 
+    // To remove a warning regrading using maxHeight as an x parameter.
+    @SuppressWarnings("all")
     @Override
     public  void beforeFirstDraw(){
         if (DEBUG) Log.d(TAG, "FirstDraw, Width: " + getMeasuredWidth() + ", Height: " + getMeasuredHeight());

tutorial_view/src/main/java/com/braunster/tutorialview/view/AbstractTutorialView.java

@@ -85,7 +85,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>