From 9b01b43eb8f8c509a54508ed607626f933faf818 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 15:39:38 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# .idea/caches/build_file_checksums.ser
# app/src/main/res/layout/activity_first_page_consent.xml
---
.../main/java/com/example/admin/sleepbetter/FirstPage.java | 6 ++++--
1 file changed, 4 insertions(+), 2 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 b362e99..0535297 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
@@ -147,12 +147,14 @@ public class FirstPage extends AppCompatActivity {
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));
}
- getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
- .putBoolean("isFirstRun", false).apply();
}
--
GitLab