From 70dccd94c091c8cede88309370e3b2388f19e3d7 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 15:52:48 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# app/src/main/res/layout/questionnaire_four.xml
---
.../main/java/com/example/admin/sleepbetter/FirstPage.java | 5 ++---
.../main/java/com/example/admin/sleepbetter/SecondPage.java | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
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 0535297..8b3baa5 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 e512432..01299f3 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));
--
GitLab