Tutorial done

32 files changed, 72 insertions, 11 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1403185..7e0f3be 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -71,6 +71,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="org.rssin.android.FirstTimeBoot"
+            android:label="Walkthrough">
+
+        </activity>
     </application>
 
 </manifest>
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;

diff --git a/app/src/main/res/drawable-hdpi/image1.png b/app/src/main/res/drawable-hdpi/image1.png
new file mode 100644
index 0000000..a1811d3
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/image1.png
diff --git a/app/src/main/res/drawable-hdpi/image2.png b/app/src/main/res/drawable-hdpi/image2.png
new file mode 100644
index 0000000..243f396
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/image2.png
diff --git a/app/src/main/res/drawable-hdpi/image3.png b/app/src/main/res/drawable-hdpi/image3.png
new file mode 100644
index 0000000..47547ff
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/image3.png
diff --git a/app/src/main/res/drawable-hdpi/image4.png b/app/src/main/res/drawable-hdpi/image4.png
new file mode 100644
index 0000000..77fe64e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/image4.png
diff --git a/app/src/main/res/drawable-hdpi/image5.png b/app/src/main/res/drawable-hdpi/image5.png
new file mode 100644
index 0000000..0214f5e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/image5.png
diff --git a/app/src/main/res/drawable-mdpi/image1.png b/app/src/main/res/drawable-mdpi/image1.png
new file mode 100644
index 0000000..a1811d3
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/image1.png
diff --git a/app/src/main/res/drawable-mdpi/image2.png b/app/src/main/res/drawable-mdpi/image2.png
new file mode 100644
index 0000000..243f396
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/image2.png
diff --git a/app/src/main/res/drawable-mdpi/image3.png b/app/src/main/res/drawable-mdpi/image3.png
new file mode 100644
index 0000000..47547ff
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/image3.png
diff --git a/app/src/main/res/drawable-mdpi/image4.png b/app/src/main/res/drawable-mdpi/image4.png
new file mode 100644
index 0000000..77fe64e
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/image4.png
diff --git a/app/src/main/res/drawable-mdpi/image5.png b/app/src/main/res/drawable-mdpi/image5.png
new file mode 100644
index 0000000..0214f5e
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/image5.png
diff --git a/app/src/main/res/drawable-xhdpi/image1.png b/app/src/main/res/drawable-xhdpi/image1.png
new file mode 100644
index 0000000..a1811d3
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/image1.png
diff --git a/app/src/main/res/drawable-xhdpi/image2.png b/app/src/main/res/drawable-xhdpi/image2.png
new file mode 100644
index 0000000..243f396
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/image2.png
diff --git a/app/src/main/res/drawable-xhdpi/image3.png b/app/src/main/res/drawable-xhdpi/image3.png
new file mode 100644
index 0000000..47547ff
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/image3.png
diff --git a/app/src/main/res/drawable-xhdpi/image4.png b/app/src/main/res/drawable-xhdpi/image4.png
new file mode 100644
index 0000000..77fe64e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/image4.png
diff --git a/app/src/main/res/drawable-xhdpi/image5.png b/app/src/main/res/drawable-xhdpi/image5.png
new file mode 100644
index 0000000..0214f5e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/image5.png
diff --git a/app/src/main/res/drawable-xxhdpi/image1.png b/app/src/main/res/drawable-xxhdpi/image1.png
new file mode 100644
index 0000000..a1811d3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/image1.png
diff --git a/app/src/main/res/drawable-xxhdpi/image2.png b/app/src/main/res/drawable-xxhdpi/image2.png
new file mode 100644
index 0000000..243f396
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/image2.png
diff --git a/app/src/main/res/drawable-xxhdpi/image3.png b/app/src/main/res/drawable-xxhdpi/image3.png
new file mode 100644
index 0000000..47547ff
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/image3.png
diff --git a/app/src/main/res/drawable-xxhdpi/image4.png b/app/src/main/res/drawable-xxhdpi/image4.png
new file mode 100644
index 0000000..77fe64e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/image4.png
diff --git a/app/src/main/res/drawable-xxhdpi/image5.png b/app/src/main/res/drawable-xxhdpi/image5.png
new file mode 100644
index 0000000..0214f5e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/image5.png
diff --git a/app/src/main/res/drawable-xxxhdpi/image1.png b/app/src/main/res/drawable-xxxhdpi/image1.png
new file mode 100644
index 0000000..a1811d3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/image1.png
diff --git a/app/src/main/res/drawable-xxxhdpi/image2.png b/app/src/main/res/drawable-xxxhdpi/image2.png
new file mode 100644
index 0000000..243f396
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/image2.png
diff --git a/app/src/main/res/drawable-xxxhdpi/image3.png b/app/src/main/res/drawable-xxxhdpi/image3.png
new file mode 100644
index 0000000..47547ff
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/image3.png
diff --git a/app/src/main/res/drawable-xxxhdpi/image4.png b/app/src/main/res/drawable-xxxhdpi/image4.png
new file mode 100644
index 0000000..77fe64e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/image4.png
diff --git a/app/src/main/res/drawable-xxxhdpi/image5.png b/app/src/main/res/drawable-xxxhdpi/image5.png
new file mode 100644
index 0000000..0214f5e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/image5.png
diff --git a/app/src/main/res/drawable/actionbar_color.xml b/app/src/main/res/drawable/actionbar_color.xml
new file mode 100644
index 0000000..49471ce
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_color.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#ff9900"/>
+
+    </shape>
diff --git a/app/src/main/res/layout/walkthrough_single_view.xml b/app/src/main/res/layout/walkthrough_single_view.xml
index e8ef067..7fa3bdd 100644
--- a/app/src/main/res/layout/walkthrough_single_view.xml
+++ b/app/src/main/res/layout/walkthrough_single_view.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/image_view"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" />
\ No newline at end of file
+    android:layout_height="fill_parent">
+
+    <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/image_view"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/text_view"
+        android:textAlignment="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a279c7..fc747fc 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,4 +65,10 @@
     <string name="article_author_unknown">Unknown author</string>
     <string name="article_published_on">Published on:</string>
     <string name="article_published_on_unknown"/>
+    <string name="walkthrough_text_1">Image 1 resource.</string>
+    <string name="walkthrough_text_2">Image 2 resource.</string>
+    <string name="walkthrough_text_3">Image 3 resource.</string>
+    <string name="walkthrough_text_4">Image 4 resource.</string>
+    <string name="walkthrough_text_5">Image 5 resource.</string>
+    <string name="walkthrough_text_button">Skip tutorial</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 766ab99..9036525 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,13 @@
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:actionBarStyle">@style/MyActionBar</item>
     </style>
 
+    <style name="MyActionBar"
+        parent="@android:style/Widget.Holo.Light.ActionBar">
+        <item name="android:background">@drawable/actionbar_color</item>
+    </style>
 </resources>