From 7eb1cad36902845bdf4292d6ac504164a1f18e10 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sat, 11 Aug 2018 21:44:13 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# .idea/caches/build_file_checksums.ser
---
.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes
.../com/example/admin/sleepbetter/MainMenu.java | 2 +-
.../example/admin/sleepbetter/SecondPage.java | 12 +-----------
.../res/layout/activity_first_page_bitmoji.xml | 4 ++--
.../main/res/layout/activity_second_page.xml | 5 +++--
.../res/layout/activity_second_page_four.xml | 4 ++--
.../res/layout/activity_second_page_three.xml | 4 ++--
.../res/layout/activity_second_page_two.xml | 2 +-
app/src/main/res/layout/activity_third_page.xml | 2 +-
app/src/main/res/layout/questionnaire.xml | 5 +++--
app/src/main/res/layout/questionnaire_four.xml | 4 ++--
app/src/main/res/layout/questionnaire_three.xml | 4 ++--
app/src/main/res/layout/questionnaire_two.xml | 2 +-
app/src/main/res/values/strings.xml | 2 +-
14 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6231d7004841f28159d1426d13a5d6f002286fd8..d2996312e6c4051cc88cf3b37c2dd75a300e8dba 100644
GIT binary patch
delta 14
WcmbQqGLvP(Oy>4$A2-gaWdr~&4hDb#
delta 14
VcmbQqGLvP(OlEgeyNz>d8382;1nd9+
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 3110ae0..0e0cee8 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 0eaace0..e512432 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 ac42210..3980918 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 484a104..509040a 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 7c2ba12..333f30e 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 94a0af9..4c1ac77 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 5165dff..fc58f53 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 635e1c3..e597b9e 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 0a59526..0c0e12d 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 80f48d6..ef2464b 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 9043da0..b512206 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 64f2404..44f35f9 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 68b81a8..e505ef0 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>
--
GitLab