diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6231d7004841f28159d1426d13a5d6f002286fd8..d2996312e6c4051cc88cf3b37c2dd75a300e8dba 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
index 3110ae0d3c48e7a95ffc9cc5ea62b57b654c8941..0e0cee87c214696b4eceaa6c7f5dc503a35c65a6 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
@@ -428,7 +428,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
break;
}
- setSpecialAlarmManager(0, 1, "Oups:", "Checking questionnaire");
+ setSpecialAlarmManager(21, 45, "Oups:", "Checking questionnaire");
}
public static class Broadcast1 extends BroadcastReceiver {
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 0eaace081a25be8d778090d5a2433b452d97c2a3..e51243238ad511a61d81d5aa0d818066a4958656 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
@@ -49,8 +49,7 @@ public class SecondPage extends AppCompatActivity {
List<String> seekbarIntervals = getIntervals("upToFour");
getSeekbarWithIntervals("times").setIntervals(seekbarIntervals);
- List<String> listOne = getIntervals("upToFive");
- getSeekbarWithIntervals("nightTerrors").setIntervals(listOne);
+ getSeekbarWithIntervals("nightTerrors").setIntervals(seekbarIntervals);
}
@@ -89,15 +88,6 @@ public class SecondPage extends AppCompatActivity {
add("4/4+");
add("-1");
}};
- } else if (command.equals("upToFive")) {
- return new ArrayList<String>() {{
- add("1");
- add("2");
- add("3");
- add("4");
- add("5");
- add("-1");
- }};
}
return null;
}
diff --git a/app/src/main/res/layout/activity_first_page_bitmoji.xml b/app/src/main/res/layout/activity_first_page_bitmoji.xml
index ac42210c83ba49f294976ed78ab9ec29de5d0a64..3980918f9fbe42442dab73be43d2d22dd7803b9b 100644
--- a/app/src/main/res/layout/activity_first_page_bitmoji.xml
+++ b/app/src/main/res/layout/activity_first_page_bitmoji.xml
@@ -106,8 +106,8 @@
<TextView
android:id="@+id/welcomeTo"
- android:layout_width="336dp"
- android:layout_height="38dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginBottom="292dp"
android:layout_marginTop="8dp"
android:text="@string/chooseBitmojiTitle"
diff --git a/app/src/main/res/layout/activity_second_page.xml b/app/src/main/res/layout/activity_second_page.xml
index 484a104d033ae8c8a61484cf32ce3f5815664d81..509040a4af6f63c4663b22bba6287ca76cf62e4f 100644
--- a/app/src/main/res/layout/activity_second_page.xml
+++ b/app/src/main/res/layout/activity_second_page.xml
@@ -145,6 +145,7 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textPersonName"
+ android:singleLine="false"
android:text="@string/nightTerrorUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -215,8 +216,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/activity_second_page_four.xml b/app/src/main/res/layout/activity_second_page_four.xml
index 7c2ba120096e3284cce55044bd664592edb1447a..333f30e067c0a54bc938c61b7c479542b9a94762 100644
--- a/app/src/main/res/layout/activity_second_page_four.xml
+++ b/app/src/main/res/layout/activity_second_page_four.xml
@@ -301,8 +301,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/activity_second_page_three.xml b/app/src/main/res/layout/activity_second_page_three.xml
index 94a0af99f57a8f51441858aa114e0c1c2ef64964..4c1ac777b6c0ba2392947de30668d1db1c63a50d 100644
--- a/app/src/main/res/layout/activity_second_page_three.xml
+++ b/app/src/main/res/layout/activity_second_page_three.xml
@@ -352,8 +352,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/activity_second_page_two.xml b/app/src/main/res/layout/activity_second_page_two.xml
index 5165dff3a84d525b33c82ef96c0cd37fafffbfb4..fc58f53df314fe5ee53b983efc5041fff77dc5bf 100644
--- a/app/src/main/res/layout/activity_second_page_two.xml
+++ b/app/src/main/res/layout/activity_second_page_two.xml
@@ -259,7 +259,7 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/activity_third_page.xml b/app/src/main/res/layout/activity_third_page.xml
index 635e1c38343a82e9253b62f5b95a14219ce1460c..e597b9e2f2d2a8880ddb416d14d5580ffe6050fb 100644
--- a/app/src/main/res/layout/activity_third_page.xml
+++ b/app/src/main/res/layout/activity_third_page.xml
@@ -17,7 +17,7 @@
<TextView
android:id="@+id/welcomeTo"
- android:layout_width="283dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="18sp"
diff --git a/app/src/main/res/layout/questionnaire.xml b/app/src/main/res/layout/questionnaire.xml
index 0a59526bdbf5e25d6c4a6705b361655ab1b4ae5e..0c0e12d77f6a562b7573dc08ee8b87e74345f391 100644
--- a/app/src/main/res/layout/questionnaire.xml
+++ b/app/src/main/res/layout/questionnaire.xml
@@ -189,6 +189,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
+ android:singleLine="false"
android:inputType="textPersonName"
android:text="@string/offnightTerrorUsually"
android:textSize="12sp"
@@ -216,8 +217,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/questionnaire_four.xml b/app/src/main/res/layout/questionnaire_four.xml
index 80f48d6cdcca092d4bee17218fe238898b14ba75..ef2464be9f13a83767e4957a7d2cfc075c3e0e0e 100644
--- a/app/src/main/res/layout/questionnaire_four.xml
+++ b/app/src/main/res/layout/questionnaire_four.xml
@@ -303,8 +303,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/questionnaire_three.xml b/app/src/main/res/layout/questionnaire_three.xml
index 9043da0c30e7b2673858f1097ace7cf640a11bbc..b51220660ee56fca4869ac0e611be8dd55e792e8 100644
--- a/app/src/main/res/layout/questionnaire_three.xml
+++ b/app/src/main/res/layout/questionnaire_three.xml
@@ -354,8 +354,8 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
- android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/questionnaire_two.xml b/app/src/main/res/layout/questionnaire_two.xml
index 64f2404263120a3fa8d115c506f62d2fe947c06e..44f35f97330950361783883ce0d21c4bfa525832 100644
--- a/app/src/main/res/layout/questionnaire_two.xml
+++ b/app/src/main/res/layout/questionnaire_two.xml
@@ -260,7 +260,7 @@
<EditText
android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="368dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68b81a858a085d9fd0fdf79c3483fca8aef107f9..e505ef0fa4680152ac9b647b7d26830b572a905a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -231,7 +231,7 @@
<string name="brightExposureIntro">Your current experiment is: INCREASE BRIGHT LIGHT EXPOSURE DURING THE DAY. Below you are asked to complete the questions on whether you followed the experiment.</string>
<string name="morningQuestion">Did you get sunlight exposure in the morning?</string>
<string name="outQuestion">Did you stay at least half an hour in the sun today?</string>
- <string name="sunlightQuestion">Did you keep your room so that it captures sunlight?</string>
+ <string name="sunlightQuestion">Did your room capture the sunlight today?</string>
<string name="stopTVIntro">Your current experiment is: STOP WATCHING THE TV/THE COMPUTER WITHIN 2 HOURS OF GOING TO SLEEP. Below you are asked to complete the questions on whether you followed the experiment.</string>