Tutorial done

2 files changed, 28 insertions, 7 deletions

diff --git a/app/src/main/java/org/rssin/android/FirstTimeBoot.java b/app/src/main/java/org/rssin/android/FirstTimeBoot.java
index 7374fff..dfae4fd 100644
--- a/app/src/main/java/org/rssin/android/FirstTimeBoot.java
+++ b/app/src/main/java/org/rssin/android/FirstTimeBoot.java
@@ -10,7 +10,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -18,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.rssin.neurons.Feedback;
 import org.rssin.rssin.R;
 
 public class FirstTimeBoot extends Activity {
@@ -25,18 +25,28 @@ public class FirstTimeBoot extends Activity {
     private static final int MAX_VIEWS = 5;
 
     ViewPager mViewPager;
+    TextView button;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.walkthrough_activity);
+        button = (TextView) findViewById(R.id.screen_navigation_button);
+        button.setText(getString(R.string.walkthrough_text_button));
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
         mViewPager = (ViewPager) findViewById(R.id.view_pager);
         mViewPager.setAdapter(new WalkthroughPagerAdapter());
         mViewPager.setOnPageChangeListener(new WalkthroughPageChangeListener());
     }
 
 
+
     class WalkthroughPagerAdapter extends PagerAdapter {
 
         @Override
@@ -51,30 +61,35 @@ public class FirstTimeBoot extends Activity {
 
         @Override
         public Object instantiateItem(View container, int position) {
-            Log.e("walkthrough", "instantiateItem(" + position + ");");
             LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             View imageViewContainer = inflater.inflate(R.layout.walkthrough_single_view, null);
             ImageView imageView = (ImageView) imageViewContainer.findViewById(R.id.image_view);
+            TextView textView = (TextView) imageViewContainer.findViewById(R.id.text_view);
 
             switch (position) {
                 case 0:
-                    //imageView.setImageResource(R.drawable.image1);
+                    imageView.setImageResource(R.drawable.image1);
+                    textView.setText(getString(R.string.walkthrough_text_1));
                     break;
 
                 case 1:
-                   // imageView.setImageResource(R.drawable.image2);
+                   imageView.setImageResource(R.drawable.image2);
+                    textView.setText(getString(R.string.walkthrough_text_2));
                     break;
 
                 case 2:
-                   // imageView.setImageResource(R.drawable.image3);
+                   imageView.setImageResource(R.drawable.image3);
+                    textView.setText(getString(R.string.walkthrough_text_3));
                     break;
 
                 case 3:
-                   // imageView.setImageResource(R.drawable.image4);
+                   imageView.setImageResource(R.drawable.image4);
+                    textView.setText(getString(R.string.walkthrough_text_4));
                     break;
 
                 case 4:
-                   // imageView.setImageResource(R.drawable.image5);
+                   imageView.setImageResource(R.drawable.image5);
+                    textView.setText(getString(R.string.walkthrough_text_5));
                     break;
             }
 
diff --git a/app/src/main/java/org/rssin/android/HomeScreenActivity.java b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
index 378ac18..90bd4e4 100755
--- a/app/src/main/java/org/rssin/android/HomeScreenActivity.java
+++ b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
@@ -1,5 +1,6 @@
 package org.rssin.android;

 

+import android.content.Intent;

 import android.support.v7.app.ActionBarActivity;

 import android.support.v7.app.ActionBar;

 import android.support.v4.app.Fragment;

@@ -28,6 +29,10 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD
         super.onCreate(savedInstanceState);

         setContentView(R.layout.activity_home_screen);

 

+            Intent intent = new Intent(this, FirstTimeBoot.class);

+            startActivity(intent);

+

+

         mNavigationDrawerFragment = (NavigationDrawerFragment)

                 getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);

 

@@ -42,6 +47,7 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD
                 .replace(R.id.container, currentFragment = initialFragment)

                 .commit();

         mTitle = "All feeds";

+

     }

 

     private Fragment currentFragment;