Merge branch 'master' of http://github.com/camilstaps/RSSin

2 files changed, 11 insertions, 6 deletions

diff --git a/app/src/main/java/org/rssin/android/FirstTimeBootActivity.java b/app/src/main/java/org/rssin/android/FirstTimeBootActivity.java
index 8f53a28..e35b7e6 100644
--- a/app/src/main/java/org/rssin/android/FirstTimeBootActivity.java
+++ b/app/src/main/java/org/rssin/android/FirstTimeBootActivity.java
@@ -81,27 +81,27 @@ public class FirstTimeBootActivity extends Activity {
 
             switch (position) {
                 case 0:
-                    imageView.setImageResource(R.drawable.image1);
+                    imageView.setImageResource(R.drawable.tutorial_screenshot_page1);
                     textView.setText(getString(R.string.walkthrough_text_1));
                     break;
 
                 case 1:
-                   imageView.setImageResource(R.drawable.image2);
+                   imageView.setImageResource(R.drawable.tutorial_screenshot_page2);
                     textView.setText(getString(R.string.walkthrough_text_2));
                     break;
 
                 case 2:
-                   imageView.setImageResource(R.drawable.image3);
+                   imageView.setImageResource(R.drawable.tutorial_screenshot_page3);
                     textView.setText(getString(R.string.walkthrough_text_3));
                     break;
 
                 case 3:
-                   imageView.setImageResource(R.drawable.image4);
+                   imageView.setImageResource(R.drawable.tutorial_screenshot_page4);
                     textView.setText(getString(R.string.walkthrough_text_4));
                     break;
 
                 case 4:
-                   imageView.setImageResource(R.drawable.image5);
+                   imageView.setImageResource(R.drawable.tutorial_screenshot_page5);
                     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 6b1d78f..65657a0 100644
--- a/app/src/main/java/org/rssin/android/HomeScreenActivity.java
+++ b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
@@ -20,6 +20,7 @@ package org.rssin.android;
 

 import android.content.Intent;

 import android.os.Bundle;

+import android.preference.PreferenceManager;

 import android.support.v4.app.Fragment;

 import android.support.v4.app.FragmentManager;

 import android.support.v4.widget.DrawerLayout;

@@ -49,9 +50,13 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD
         super.onCreate(savedInstanceState);

         setContentView(R.layout.activity_home_screen);

 

+        boolean relaunch = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("hidetutorial", false);

+

+        if(!relaunch) {

             Intent intent = new Intent(this, FirstTimeBootActivity.class);

             startActivity(intent);

-

+            PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("hidetutorial", true).apply();

+        }

 

         mNavigationDrawerFragment = (NavigationDrawerFragment)

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