- Fixed problem showing walk through

- Fixed problem saving walk through state when activity is killed

- Added coloring of the System navigation bar and status bar for lollipop devices.

Author: itzikBraun

.idea/.name

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="TutorialView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>

.idea/compiler.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TutorialView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,10 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,6 +26,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -85,5 +88,4 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="tutorial_view" exported="" />
   </component>
-</module>
-
+</module>

.idea/dictionaries/braunster.xml

@@ -52,6 +52,10 @@ protected void onCreate(Bundle savedInstanceState) {
         tutorialView.setTutorialTextTypeFace("fonts/roboto_light.ttf");
         tutorialView.setHasStatusBar(true);
         tutorialView.setTutorialText("This is some general text that is not that long but also not so short.");
+
+        // Only show the walk through when the activity is first created.
+        if (savedInstanceState == null)
+            startWalkThrough();
     }
 
     @Override
@@ -139,4 +143,48 @@ public void onClick(View v) {
         // This will allow the nice wrapping of the view by the tutorial activity.
         overridePendingTransition(R.anim.dummy, R.anim.dummy);
     }
+
+    private void startWalkThrough(){
+
+        // Running a walk through as the activity is opened, Tutorial
+        // building should be wrapped in a runnable that is posted so
+        // all views will have their positions on the screen.
+        getWindow().getDecorView().post(new Runnable() {
+            @Override
+            public void run() {
+
+                Tutorial t1 = getBasicBuilderForTest(findViewById(R.id.view_bottom_left))
+                        .setTutorialInfoTextPosition(Tutorial.InfoPosition.ABOVE)
+                        .setTutorialGotItPosition(Tutorial.GotItPosition.BOTTOM)
+                        .build();
+
+                Tutorial t2 = getBasicBuilderForTest(findViewById(R.id.view_top_right))
+                        .setTutorialInfoTextPosition(Tutorial.InfoPosition.LEFT_OF)
+                        .build();
+
+                Tutorial t3 = getBasicBuilderForTest(findViewById(R.id.view_almost_top_right))
+                        .setTutorialInfoTextPosition(Tutorial.InfoPosition.RIGHT_OF)
+                        .build();
+
+                Tutorial t4 = getBasicBuilderForTest(findViewById(R.id.view_top_left))
+                        .setTutorialInfoTextPosition(Tutorial.InfoPosition.BELOW)
+                        .build();
+
+                Tutorial t5 = getBasicBuilderForTest(findViewById(R.id.view_center))
+                        .setTutorialInfoTextPosition(Tutorial.InfoPosition.BELOW)
+                        .setTutorialGotItPosition(Tutorial.GotItPosition.BOTTOM)
+                        .build();
+
+
+                TutorialIntentBuilder builder = new TutorialIntentBuilder(MainActivity.this);
+
+                builder.setWalkThroughList(t1, t2, t3, t4, t5);
+                startActivity(builder.getIntent());
+
+                // Override the default animation of the entering activity.
+                // This will allow the nice wrapping of the view by the tutorial activity.
+                overridePendingTransition(R.anim.dummy, R.anim.dummy);
+            }
+        });
+    }
 }

.idea/encodings.xml

@@ -1,12 +1,17 @@
 package com.braunster.tutorialview;
 
 import android.app.Activity;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 
+import com.braunster.tutorialview.object.Tutorial;
 import com.braunster.tutorialview.object.TutorialIntentBuilder;
 import com.braunster.tutorialview.view.TutorialLayout;
 import com.braunster.tutorialview.view.TutorialView;
 
+import java.util.ArrayList;
+
 /**
  * Created by braunster on 02/12/14.
  */
@@ -17,6 +22,12 @@ public class TutorialActivity extends Activity {
 
     private TutorialLayout mTutorialLayout;
 
+    private Tutorial mTutorial;
+
+    private int mCurrentTutorialPos = 0;
+
+    private static final String CURRENT_TUTORIAL = "current_tutorial";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,13 +41,52 @@ protected void onCreate(Bundle savedInstanceState) {
             throw new NullPointerException("You must provide extras to the activity to set up the tutorial view.");
         }
 
+        mTutorialLayout.setHasStatusBar(TutorialIntentBuilder.hasStatusBar(getIntent()));
+
+        mTutorial = TutorialIntentBuilder.getTutorial(getIntent());
+
+        if (TutorialIntentBuilder.isWalkThrough(getIntent()))
+        {
+            ArrayList<Tutorial> tutorials = TutorialIntentBuilder.getWalkThroughData(getIntent());
+
+            // If the activity is re created we should start
+            // from the last tutorial that was visible
+            if (savedInstanceState != null)
+            {
+                mCurrentTutorialPos = savedInstanceState.getInt(CURRENT_TUTORIAL);
+
+                if (DEBUG) Log.d(TAG, String.format("mCurrentTutorialPos: %s, Tutorial list size: %s",
+                        mCurrentTutorialPos, tutorials.size()));
+
+                // Removing tutorials that was already shown.
+                int i = 0;
+                while (i < mCurrentTutorialPos)
+                {
+                    i++;
+                    tutorials.remove(0);
+                }
+
+                // Setting the current tutorial to be the new first tutorial
+                mTutorial = tutorials.get(0);
+            }
+
+            mTutorialLayout.setWalkThroughData(tutorials);
+        }
+        else
+        {
+            mTutorialLayout.setTutorial(mTutorial, false);
+        }
+
+
         // Finish the activity when the tutorial is closed.
         mTutorialLayout.setTutorialClosedListener(new TutorialView.TutorialClosedListener() {
             @Override
             public void onClosed() {
                 finish();
             }
         });
+
+        updateSystemUIColors();
     }
 
     /**
@@ -52,22 +102,26 @@ public void onWindowFocusChanged(boolean hasFocus) {
                 @Override
                 public void run() {
                     {
-                        TutorialIntentBuilder.updateTutorialViewFromIntent(mTutorialLayout, getIntent());
-
                         TutorialIntentBuilder.showTutorial(mTutorialLayout, getIntent());
 
                         // If the tutorial is a walk through we would need to set a WalkThroughListener.
                         if (mTutorialLayout.isWalkThrough())
                         {
                             mTutorialLayout.setWalkThroughListener(new TutorialLayout.WalkThroughListener() {
                                 @Override
-                                public void onNextTutorialShown() {
+                                public void onNextTutorialShown(Tutorial tutorial) {
+
+                                    // Keeping track of the position in the tutorial list.
+                                    // Used for a situation that the activity was killed and we need
+                                    // to re-create it from the last visible tutorial.
+                                    mCurrentTutorialPos++;
 
+                                    mTutorial = tutorial;
+                                    updateSystemUIColors();
                                 }
 
                                 @Override
                                 public void onWalkTroughSkipped() {
-//                                    Toast.makeText(TutorialActivity.this, "Walk through was skipped.", Toast.LENGTH_LONG).show();
                                     finish();
                                 }
 
@@ -82,6 +136,13 @@ public void onWalkThroughDone() {
             });
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(CURRENT_TUTORIAL, mCurrentTutorialPos);
+    }
+
     /**
      * Back press will close the tutorial which will trigger the
      * {@link com.braunster.tutorialview.view.TutorialView.TutorialClosedListener#onClosed() onClosed()} method
@@ -102,4 +163,23 @@ public void onBackPressed() {
         else mTutorialLayout.closeTutorial();
     }
 
+    private void updateSystemUIColors(){
+
+        if (isFinishing())
+            return;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+            if (isDestroyed())
+                return;
+
+        // coloring the status bar and navigation bar from lollipop.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+        {
+            if (TutorialIntentBuilder.changesSystemUiColors(getIntent()) && mTutorial != null)
+            {
+                getWindow().setStatusBarColor(mTutorial.getTutorialBackgroundColor());
+                getWindow().setNavigationBarColor(mTutorial.getTutorialBackgroundColor());
+            }
+        }
+    }
 }