diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b3bb62560fada9c0aca8d0a3c3860a8baf8ba7f4..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/SecondPage.java b/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
index 8492d308bf7dbf00c2d6ccf47e85831d588e2d03..e1d52e23301c87090ef91c061cf65dfd0dcb30a8 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
@@ -48,8 +48,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);
}
@@ -88,15 +87,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_second_page.xml b/app/src/main/res/layout/activity_second_page.xml
index 4e6338dcfc7a21d933884d35d856800ad8c01519..13e998043b745c8b50aea72f3cb6472aa4b54af4 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 70addf94aebcdcedad5411a530afc011ca73efa8..39fb2afa24dc435e2ee37d3eb26c5221dab68ea0 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 d303a3021c0ec0d5272357c2e37421c1437f25a1..920cdd0d0d87cb79b85de2d799da27a663255d83 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 4c9ca128beab29c5aa20ebe44c6808d7c860fdfc..79163976fca813104701c4866ba22d033023785b 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/questionnaire.xml b/app/src/main/res/layout/questionnaire.xml
index a66ce394b0131f0b5726f59e2497503fb26479d9..f4b1a86fe215ff3903f58d87d011b5d9b7a8b390 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 927097e94b526a5c1378d4ef43584f5c3403b89e..04218024d3d6eed72ad7d52783b2dd554c9e9c3a 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 4bae703920cd7b44fde72615ef4bb729a971f1e0..000f1fd46e04ec334b47a7e50185b348237b6e89 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 3ae959ef7f193c5157a7b3f15dfe4342213ac732..cce3fc82f8f9f894441220e6570b5095d4322ecb 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 ee8d1da30426ffa4dd8e54e56849603dc5a2f8d4..7f622c1b2d20b2190a545e610cb9680eda838694 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>