From 88dec8c87b29bf9df91a3417e4e96827982f1570 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sun, 12 May 2019 20:41:56 +0100
Subject: [PATCH] update
---
.idea/assetWizardSettings.xml | 89 ------
.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes
.idea/misc.xml | 2 +-
.../main/res/layout/activity_first_note.xml | 79 +++++
.../res/layout/activity_second_page_two.xml | 287 ++++++++++++------
app/src/main/res/layout/content_menu.xml | 15 +-
app/src/main/res/layout/questionnaire_two.xml | 4 +-
app/src/main/res/layout/testbot.xml | 109 -------
app/src/main/res/layout/what_is_chatbot.xml | 187 ------------
.../main/res/menu/activity_menu_drawer.xml | 3 -
app/src/main/res/values/strings.xml | 22 +-
11 files changed, 303 insertions(+), 494 deletions(-)
delete mode 100644 .idea/assetWizardSettings.xml
create mode 100644 app/src/main/res/layout/activity_first_note.xml
delete mode 100644 app/src/main/res/layout/testbot.xml
delete mode 100644 app/src/main/res/layout/what_is_chatbot.xml
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 60da80c..0000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="WizardSettings">
- <option name="children">
- <map>
- <entry key="imageWizard">
- <value>
- <PersistentState>
- <option name="children">
- <map>
- <entry key="imageAssetPanel">
- <value>
- <PersistentState>
- <option name="children">
- <map>
- <entry key="actionbar">
- <value>
- <PersistentState>
- <option name="values">
- <map>
- <entry key="assetType" value="IMAGE" />
- <entry key="imageAsset" value="C:\Users\admin\Desktop\ff.jpg" />
- <entry key="outputName" value="pillow" />
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- <entry key="launcher">
- <value>
- <PersistentState>
- <option name="values">
- <map>
- <entry key="foregroundImage" value="C:\Users\admin\Desktop\pillow.png" />
- <entry key="foregroundLayerName" value="pillow" />
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- <entry key="launcherLegacy">
- <value>
- <PersistentState>
- <option name="values">
- <map>
- <entry key="assetType" value="IMAGE" />
- <entry key="imageAsset" value="C:\Users\admin\Desktop\pillow.png" />
- <entry key="outputName" value="pillow" />
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- <entry key="notification">
- <value>
- <PersistentState>
- <option name="values">
- <map>
- <entry key="assetType" value="IMAGE" />
- <entry key="imageAsset" value="C:\Users\admin\Desktop\pillow.png" />
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- </map>
- </option>
- <option name="values">
- <map>
- <entry key="outputIconType" value="LAUNCHER_LEGACY" />
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- </map>
- </option>
- </PersistentState>
- </value>
- </entry>
- <entry key="vectorWizard">
- <value>
- <PersistentState />
- </value>
- </entry>
- </map>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 43bedeaede5b48551698d7fc3af7f007b7da2b0d..222efc9886c2c70db30f335ddfa193f729a11b8b 100644
GIT binary patch
delta 37
ucmbQqGLvP(bk?jjCmhW;&aq<@$m?`TSo`;t@9C>kxALwMub%vhQ6B&=&=9o%
delta 37
ucmbQqGLvP(bk<bk*!$KS=h!g{gsqR6A%D!6M}I&2%!Z2(6DPl7)CT|!?hgF`
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..c0f68ed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/src/main/res/layout/activity_first_note.xml b/app/src/main/res/layout/activity_first_note.xml
new file mode 100644
index 0000000..860ad61
--- /dev/null
+++ b/app/src/main/res/layout/activity_first_note.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".FirstPage">
+
+ <View
+ android:id="@+id/topView"
+ android:layout_width="match_parent"
+ android:layout_height="75dp"
+ android:background="@color/LightSteelBlue"
+ tools:ignore="MissingConstraints"
+ tools:layout_editor_absoluteX="0dp"
+ tools:layout_editor_absoluteY="0dp" />
+
+ <TextView
+ android:id="@+id/welcomeTo"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/notice"
+ android:textAlignment="center"
+ android:textColor="@android:color/black"
+ android:textSize="14sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.168" />
+
+ <TextView
+ android:id="@+id/welcomeTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:text="@string/noticeTitle"
+ android:textAllCaps="false"
+ android:textColor="@android:color/black"
+ android:textSize="30sp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="@+id/topView"
+ app:layout_constraintEnd_toStartOf="@+id/logoPlace"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="@+id/topView"
+ app:layout_constraintTop_toTopOf="@+id/topView"
+ app:layout_constraintVertical_bias="0.444" />
+
+ <ImageView
+ android:id="@+id/logoPlace"
+ android:layout_width="91dp"
+ android:layout_height="81dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="4dp"
+ android:layout_marginTop="8dp"
+ android:contentDescription="@string/desc"
+ app:layout_constraintBottom_toBottomOf="@+id/topView"
+ app:layout_constraintEnd_toEndOf="@+id/topView"
+ app:layout_constraintTop_toTopOf="@+id/topView"
+ app:layout_constraintVertical_bias="0.363"
+ app:srcCompat="@drawable/pill" />
+
+ <Button
+ android:id="@+id/submitButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:text="@string/startButton"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
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 c03b6d1..f36237b 100644
--- a/app/src/main/res/layout/activity_second_page_two.xml
+++ b/app/src/main/res/layout/activity_second_page_two.xml
@@ -12,7 +12,7 @@
android:layout_height="75dp"
android:background="@color/LightSteelBlue"
tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
+ tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="0dp" />
<TextView
@@ -54,16 +54,18 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="424dp"
+ android:layout_height="458dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.454"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/questionnaireUsuallyIntro"
+ app:layout_constraintTop_toBottomOf="@+id/topView"
tools:targetApi="lollipop">
<FrameLayout
@@ -83,12 +85,12 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="587dp"
+ android:layout_height="1361dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
<EditText
- android:id="@+id/beforeAfter"
+ android:id="@+id/firstSet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@@ -100,9 +102,77 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
- android:text="@string/beforeAfter"
+ android:inputType="textMultiLine"
+ android:text="@string/q1desc"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <EditText
+ android:id="@+id/secondSet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="304dp"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine"
+ android:text="@string/q1desc"
+ android:textSize="12sp"
+ android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <EditText
+ android:id="@+id/thirdSet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="456dp"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine"
+ android:text="@string/q3desc"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <EditText
+ android:id="@+id/fourthSet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="676dp"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine"
+ android:text="@string/q4desc"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -112,11 +182,10 @@
android:layout_height="43dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
android:text="@string/nextButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView7" />
+ tools:layout_editor_absoluteY="1284dp" />
<EditText
@@ -133,21 +202,21 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textMultiLine"
- android:text="@string/fallAsleepUsually"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s1"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.428"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/beforeAfter" />
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
<EditText
- android:id="@+id/wakeUpUsually"
+ android:id="@+id/s4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="304dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -155,21 +224,21 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textMultiLine"
- android:text="@string/wakeUpUsually"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s4"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.428"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/relativeLayout2" />
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
<EditText
- android:id="@+id/freshUsually"
+ android:id="@+id/s5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="364dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -177,108 +246,148 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textMultiLine"
- android:text="@string/freshUsually"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s5"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.428"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/relativeLayout3" />
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
- <RelativeLayout
- android:id="@+id/relativeLayout2"
+ <EditText
+ android:id="@+id/s6"
android:layout_width="match_parent"
- android:layout_height="35dp"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="480dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s6"
+ android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/fallAsleepUsually">
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
- <com.example.admin.sleepbetter.SeekBarWithIntervals
- android:id="@+id/fallAsleepBar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentStart="true" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/relativeLayout3"
+ <EditText
+ android:id="@+id/s7"
android:layout_width="match_parent"
- android:layout_height="35dp"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="528dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s7"
+ android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/wakeUpUsually">
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
- <com.example.admin.sleepbetter.SeekBarWithIntervals
- android:id="@+id/easyWakeUpBar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_centerHorizontal="true" />
- </RelativeLayout>
+ <EditText
+ android:id="@+id/s8"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="580dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s8"
+ android:textSize="12sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
- <RelativeLayout
- android:id="@+id/relativeLayout4"
+ <EditText
+ android:id="@+id/s9"
android:layout_width="match_parent"
- android:layout_height="35dp"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="712dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine|textUri"
+ android:text="@string/s9"
+ android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/freshUsually">
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
- <com.example.admin.sleepbetter.SeekBarWithIntervals
- android:id="@+id/freshBar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentStart="true" />
- </RelativeLayout>
+ <EditText
+ android:id="@+id/wakeUpUsually"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine"
+ android:text="@string/s2"
+ android:textSize="12sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:layout_editor_absoluteY="242dp" />
- <ImageView
- android:id="@+id/imageView7"
- android:layout_width="133dp"
- android:layout_height="133dp"
+ <EditText
+ android:id="@+id/freshUsually"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:background="@android:color/transparent"
+ android:clickable="false"
+ android:cursorVisible="false"
+ android:ems="10"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:hint="@string/some_explanation_about_the_input"
+ android:inputType="textMultiLine"
+ android:text="@string/s3"
+ android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/relativeLayout4"
- app:srcCompat="@drawable/day_and_night" />
+ tools:layout_editor_absoluteY="273dp" />
</android.support.constraint.ConstraintLayout>
</FrameLayout>
</ScrollView>
- <EditText
- android:id="@+id/questionnaireUsuallyIntro"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:background="@android:color/transparent"
- android:clickable="false"
- android:cursorVisible="false"
- android:ems="10"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:hint="@string/some_explanation_about_the_input"
- android:inputType=""
- android:singleLine="false"
- android:text="@string/questionnaireHelpSecond"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
-
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_menu.xml b/app/src/main/res/layout/content_menu.xml
index 761c156..690f146 100644
--- a/app/src/main/res/layout/content_menu.xml
+++ b/app/src/main/res/layout/content_menu.xml
@@ -36,24 +36,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
- <Button
- android:id="@+id/WhatChabot"
- android:layout_width="139dp"
- android:layout_height="111dp"
- android:background="@drawable/rounded_button_two"
- android:text="@string/thirdOptionMainMenu"
- android:textColor="@android:color/white"
- app:layout_constraintStart_toEndOf="@+id/imageView3"
- app:layout_constraintTop_toBottomOf="@+id/whatSleep" />
-
<Button
android:id="@+id/WhatExperiments"
android:layout_width="139dp"
android:layout_height="111dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
android:background="@drawable/rounded_button_two"
android:text="@string/secondOptionMainMenu"
android:textColor="@android:color/white"
- app:layout_constraintEnd_toStartOf="@+id/imageView3"
+ app:layout_constraintEnd_toEndOf="@+id/whatSleep"
+ app:layout_constraintStart_toStartOf="@+id/whatSleep"
app:layout_constraintTop_toBottomOf="@+id/whatSleep" />
<EditText
diff --git a/app/src/main/res/layout/questionnaire_two.xml b/app/src/main/res/layout/questionnaire_two.xml
index 1ff0488..3045a02 100644
--- a/app/src/main/res/layout/questionnaire_two.xml
+++ b/app/src/main/res/layout/questionnaire_two.xml
@@ -89,7 +89,7 @@
tools:layout_editor_absoluteY="0dp">
<EditText
- android:id="@+id/beforeAfter"
+ android:id="@+id/firstSet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@@ -140,7 +140,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.428"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/beforeAfter" />
+ app:layout_constraintTop_toBottomOf="@+id/firstSet" />
<EditText
android:id="@+id/wakeUpUsually"
diff --git a/app/src/main/res/layout/testbot.xml b/app/src/main/res/layout/testbot.xml
deleted file mode 100644
index 5d53f85..0000000
--- a/app/src/main/res/layout/testbot.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#FFF"
- android:clickable="true">
- <!--tools:context="MainActivity">-->
-
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true">
-
- <TextView
- android:id="@+id/factorsIntro"
- android:layout_width="361dp"
- android:layout_height="67dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="12dp"
- android:text="@string/chatbotintro"
- android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
-
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
-
- <TextView
- android:id="@+id/factorsTitle"
- android:layout_width="147dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/chatbotTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="30sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.47" />
-
- <ScrollView
- android:id="@+id/scroll"
- android:layout_width="match_parent"
- android:layout_height="378dp"
- android:layout_alignParentStart="true"
- android:layout_marginStart="1dp"
- android:layout_marginTop="32dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/factorsIntro">
-
- <TextView
- android:id="@+id/tv_chat_display"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp" />
- </ScrollView>
-
- <android.support.design.widget.TextInputLayout
- android:id="@+id/user_statement_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:background="@drawable/text_bg"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
-
- <EditText
- android:id="@+id/et_user_statement"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/text_bg"
- android:hint="Your Message:"
- android:imeOptions="actionDone"
- android:inputType="textShortMessage" />
- </android.support.design.widget.TextInputLayout>
-
- </android.support.constraint.ConstraintLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/what_is_chatbot.xml b/app/src/main/res/layout/what_is_chatbot.xml
deleted file mode 100644
index d149f5f..0000000
--- a/app/src/main/res/layout/what_is_chatbot.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".FirstPage">
-
- <ScrollView
- android:id="@+id/ScrollViewQuestionnaire"
- style="@android:style/Widget.Material.ScrollView"
- android:layout_width="match_parent"
- android:layout_height="481dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:fillViewport="true"
- android:scrollbarStyle="insideOverlay"
- android:visibility="visible"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/logoPlace"
- tools:targetApi="lollipop">
-
- <FrameLayout
- android:id="@+id/FrameForScrollView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
- app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
- app:layout_constraintTop_toTopOf="@+id/ScrollViewQuestionnaire">
-
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="556dp"
- tools:layout_editor_absoluteX="8dp"
- tools:layout_editor_absoluteY="0dp">
-
-
- <TextView
- android:id="@+id/textView5"
- android:layout_width="210dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
- android:text="@string/howItWorks"
- android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/imageView5"
- app:layout_constraintTop_toBottomOf="@+id/missionTitle" />
-
- <EditText
- android:id="@+id/missionTitle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="56dp"
- android:clickable="false"
- android:cursorVisible="false"
- android:ems="10"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:inputType="textPersonName"
- android:text="@string/howItWorksTitle"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView6" />
-
- <EditText
- android:id="@+id/sleepHygieneTitle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:clickable="false"
- android:cursorVisible="false"
- android:ems="10"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:inputType="textPersonName"
- android:text="@string/wannachatTitle"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
-
- <Button
- android:id="@+id/back"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="24dp"
- android:text="@string/backButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView5" />
-
- <TextView
- android:id="@+id/textView6"
- android:layout_width="222dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:text="@string/WhatIsChatbot"
- android:textColor="@android:color/black"
- app:layout_constraintEnd_toStartOf="@+id/imageView4"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle" />
-
- <ImageView
- android:id="@+id/imageView4"
- android:layout_width="105dp"
- android:layout_height="105dp"
- android:layout_marginTop="16dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle"
- app:srcCompat="@color/LightSteelBlue" />
-
- <ImageView
- android:id="@+id/imageView5"
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:layout_marginEnd="260dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/missionTitle"
- app:srcCompat="@color/LightSteelBlue" />
- </android.support.constraint.ConstraintLayout>
- </FrameLayout>
- </ScrollView>
-
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/welcomeTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:text="@string/chatbotGuide"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="24sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_menu_drawer.xml b/app/src/main/res/menu/activity_menu_drawer.xml
index d3ad6a2..77f6b16 100644
--- a/app/src/main/res/menu/activity_menu_drawer.xml
+++ b/app/src/main/res/menu/activity_menu_drawer.xml
@@ -20,9 +20,6 @@
<item
android:id="@+id/nav_calendar"
android:title="Calendar" />
- <item
- android:id="@+id/nav_bot"
- android:title="Help" />
</group>
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f3b054..81effb2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,9 +13,6 @@
<string name="participantName">Participant ID...</string>
<string name="linkBitmoji">Linked Bitmoji</string>
- <string name="linkBitmojiTitle">LINK YOUR BITMOJI</string>
- <string name="chooseBitmojiTitle">Please choose one of the Bitmojis bellow as your companion. The bitmoji will reflect your state throughout the experiment changing everyday depending on your answers to the questionnaire. </string>
-
<string name="consentPageTitle">CONSENT FORM</string>
<string name="consentIntro">In order to proceed with the experiment, we will kindly ask you to look over the next paragraphs to understand your involvement into this study. Please initial the box(es) if you agree with the statement(s):
</string>
@@ -28,8 +25,27 @@
<string name="permissionSeven">I understand that information collected about me during my participation in this study will be stored on a password protected computer and that this information will only be used for the purpose of ethically approved research studies.</string>
<string name="permissionEight">Would you agree on being contacted after the study in regards to possible outcomes/ in order to provide insights from your experience of participating in this experiment?</string>
+ <string name="noticeTitle">NOTICE</string>
+ <string name="notice">The next set of questions you will receive aim to assess your sleeping experience before using the SleepBetter app, in order to be able to record your progress. There are 9 questions which should approximately take 1 or 2 minutes max.</string>
+
+
<string name="questionnaireTitle">QUESTIONNAIRE</string>
+
+ <string name="q1desc">This first set of questions refer to a general routine in your daily life. Please choose the most appropriate answer.</string>
+ <string name="s1">How long does it usually take you to fall asleep?</string>
+ <string name="s2">Usually if you wake up one or more times during the night, how long are you awake in total?</string>
+ <string name="s3">If your final wake-up time occurs before you intend to wake up, how much earlier is this?</string>
+ <string name="q2desc">This set of questions efer to your sleep quality in general. Please choose the most appropriate answer.</string>
+ <string name="s4"> If your final wake-up time occurs before you intend to wake up, how much earlier is this?</string>
+ <string name="s5">How would you rate your sleep quality?</string>
+ <string name="q3desc">This set of questions refer to the impact your sleeping pattern usually has on your daily activities and your life in general. Please choose the most appropriate answer.</string>
+ <string name="s6">How do you think sleep impacted your mood, energy, or relationships?</string>
+ <string name="s7">How do you think sleep impacted your concentration, productivity, or ability to stay awake?</string>
+ <string name="s8">How do you think sleep impacted your life in general?</string>
+ <string name="q4desc">This set of questions aim to asses the severity of your sleep problems (if any). Please choose the most appropriate answer.</string>
+ <string name="s9">How long have you had a problem with your sleep?</string>
+
<string name="questionnaireHelp">First, how would you rate the following aspects of your sleep and daily experience? 1 represents the lowest and 5 the highest.</string>
<string name="questionnaireHelpSecond">For the question \"How quickly do you usually fall asleep?\", please bare in mind that 1 means \"as soon as getting into bed\", 2 is \"within 20 minutes\", 3 is \"up to one hour\", 4 is \"1/1.30 hours\" and 5 is \"more than that\". Also, for the \"How easily do you usually wake up?\", notice that 1 means \"waking up with no alarm\", 2 is \"using the alarm only sometimes\", 3 is \"using the alarm but I get up easily\", 4 is \"using the snooze button once\", 5 is \"using the snooze button more than once\".</string>
--
GitLab