diff --git a/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java b/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java index 05352973ceea76d7397b0642f187f3ea3edb4228..8b3baa5117c5b81173fa3a8abb95b50a78d9d7d2 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java +++ b/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)); } diff --git a/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java b/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java index e51243238ad511a61d81d5aa0d818066a4958656..01299f3386a0d435966e18a0a1e3dd133094a400 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java +++ b/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));