Merge branch 'master' of https://github.com/SecUSo/privacy-friendly-r…

…ock-paper-scissors-boardgame

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.secuso.privacyfriendlyrockpaperscissorsboardgame"
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

app/src/main/java/org/secuso/privacyfriendlyrockpaperscissorsboardgame/activities/BaseActivity.java

@@ -19,6 +19,9 @@
 import android.view.View;
 
 import org.secuso.privacyfriendlyrockpaperscissorsboardgame.R;
+import org.secuso.privacyfriendlyrockpaperscissorsboardgame.tutorial.TutorialActivity;
+
+import static org.secuso.privacyfriendlyrockpaperscissorsboardgame.tutorial.TutorialActivity.ACTION_SHOW_ANYWAYS;
 
 /**
  * Created by Chris on 04.07.2016.
@@ -149,6 +152,11 @@ private void callDrawerItem(final int itemId) {
                 intent = new Intent(this, HelpActivity.class);
                 createBackStack(intent);
                 break;
+            case R.id.nav_tutorial:
+                intent = new Intent(this, TutorialActivity.class);
+                intent.setAction(ACTION_SHOW_ANYWAYS);
+                createBackStack(intent);
+                break;
             case R.id.nav_settings:
                 intent = new Intent(this, SettingsActivity.class);
                 intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, SettingsActivity.GeneralPreferenceFragment.class.getName());

app/src/main/java/org/secuso/privacyfriendlyrockpaperscissorsboardgame/activities/HomeActivity.java

@@ -40,33 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         int index = mSharedPreferences.getInt("lastChosenPage", 0);
-        boolean welcomeScreenShown = mSharedPreferences.getBoolean("welcomeScreen",false);
-        if(!welcomeScreenShown){
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.sWelcomeTitle);
-            builder.setMessage(R.string.sWelcome);
-            builder.setPositiveButton(R.string.sDialogHandOverOkButton, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialogInterface, int i) {
-                    mSharedPreferences.edit().putBoolean("welcomeScreen",true).apply();
-                }
-            });
-            builder.setIcon(R.mipmap.ic_drawer);
-            builder.setNegativeButton(R.string.sHelp, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialogInterface, int i) {
-                    goToNavigationItem(R.id.nav_help);
-                }
-            });
-            Dialog dialog=builder.create();
-            dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-                @Override
-                public void onCancel(DialogInterface dialogInterface) {
-                    mSharedPreferences.edit().putBoolean("welcomeScreen",true).apply();
-                }
-            });
-            dialog.show();
-        }
+
         mViewPager.setCurrentItem(index);
         mArrowLeft = (ImageView) findViewById(R.id.arrow_left);
         mArrowRight = (ImageView) findViewById(R.id.arrow_right);

app/src/main/java/org/secuso/privacyfriendlyrockpaperscissorsboardgame/tutorial/TutorialActivity.java

@@ -73,7 +73,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Making notification bar transparent
         if(Build.VERSION.SDK_INT >=21)
-
         {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
         }

app/src/main/res/menu/activity_main_drawer.xml

@@ -7,6 +7,10 @@
             android:id="@+id/nav_home"
             android:icon="@drawable/ic_home_black_24px"
             android:title="@string/sHome" />
+        <item
+            android:id="@+id/nav_tutorial"
+            android:icon="@drawable/ic_tutorial"
+            android:title="@string/tutorial" />
     </group>
     <group
         android:id="@+id/nav_group_add"

app/src/main/res/values/strings.xml

@@ -122,4 +122,5 @@
     <string name="main_button_welcomedialog">Show Welcome</string>
     <string name="next">Next</string>
     <string name="skip">Skip</string>
+    <string name="tutorial">Tutorial</string>
 </resources>