Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	app/src/main/res/layout/questionnaire_four.xml

app/src/main/java/com/example/admin/sleepbetter/FirstPage.java

@@ -145,12 +145,11 @@ public class FirstPage extends AppCompatActivity {
         Boolean isFirstRun = getSharedPreferences("PREFERENCE", MODE_PRIVATE)
                 .getBoolean("isFirstRun", true);
 
+
+
         if (!isFirstRun && consent.isChecked() && bitmoji.isChecked() && !nameBox.getText().toString().equals("") && !participantID.getText().toString().equals("")) {
             //show start activity
 
-            getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
-                    .putBoolean("isFirstRun", false).apply();
-
             startActivity(new Intent(this, MainMenu.class));
 
         }

app/src/main/java/com/example/admin/sleepbetter/SecondPage.java

@@ -30,6 +30,10 @@ public class SecondPage extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_second_page);
 
+        getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
+                .putBoolean("isFirstRun", false).apply();
+
+
         SharedPreferences preferences = getSharedPreferences("bmsleep", MODE_PRIVATE);
         ImageView imageView = findViewById(R.id.imageView6);
         imageView.setImageResource(preferences.getInt("slectedbitmoji", 0));