From e9cd20f4e90def77f4e725b6a72aaafdd8a831dc Mon Sep 17 00:00:00 2001
From: George Muresan <gcm1u16@soton.ac.uk>
Date: Sat, 24 Aug 2019 14:53:56 +0100
Subject: [PATCH] changes
---
.../{bed-1545998_1280.png => bed2.png} | Bin
app/src/main/res/layout/act_data.xml | 3 +-
app/src/main/res/layout/act_diary.xml | 5 +-
.../res/layout/act_update_caffeine_empty.xml | 42 +++++++------
.../res/layout/act_update_caffeine_limit.xml | 44 +++++++++-----
.../res/layout/act_update_caffeine_six.xml | 39 ++++++++-----
.../res/layout/act_update_light_bright.xml | 48 +++++++++------
.../res/layout/act_update_light_glasses.xml | 37 +++++++-----
.../res/layout/act_update_light_turnoffs.xml | 37 ++++++++----
.../layout/act_update_schedule_midnight.xml | 35 +++++++----
.../res/layout/act_update_schedule_relax.xml | 55 +++++++++++-------
.../layout/act_update_schedule_sametime.xml | 36 +++++++-----
.../res/layout/act_update_schedule_seven.xml | 36 +++++++-----
.../main/res/layout/act_what_experiments.xml | 16 +----
app/src/main/res/layout/act_what_is_sleep.xml | 4 +-
15 files changed, 269 insertions(+), 168 deletions(-)
rename app/src/main/res/drawable-v24/{bed-1545998_1280.png => bed2.png} (100%)
diff --git a/app/src/main/res/drawable-v24/bed-1545998_1280.png b/app/src/main/res/drawable-v24/bed2.png
similarity index 100%
rename from app/src/main/res/drawable-v24/bed-1545998_1280.png
rename to app/src/main/res/drawable-v24/bed2.png
diff --git a/app/src/main/res/layout/act_data.xml b/app/src/main/res/layout/act_data.xml
index bd18d80..e9f8952 100644
--- a/app/src/main/res/layout/act_data.xml
+++ b/app/src/main/res/layout/act_data.xml
@@ -260,7 +260,8 @@
android:layout_marginTop="80dp"
app:layout_constraintEnd_toEndOf="@+id/overallMood"
app:layout_constraintStart_toStartOf="@+id/overallMood"
- app:layout_constraintTop_toBottomOf="@+id/overallMood" />
+ app:layout_constraintTop_toBottomOf="@+id/overallMood"
+ app:srcCompat="@drawable/you" />
<TextView
android:id="@+id/experimentName"
diff --git a/app/src/main/res/layout/act_diary.xml b/app/src/main/res/layout/act_diary.xml
index 506b3c5..bf79e8b 100644
--- a/app/src/main/res/layout/act_diary.xml
+++ b/app/src/main/res/layout/act_diary.xml
@@ -126,13 +126,14 @@
android:id="@+id/imageView29"
android:layout_width="99dp"
android:layout_height="86dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="@+id/pleaseInput"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintStart_toStartOf="@+id/pleaseInput"
- app:layout_constraintTop_toBottomOf="@+id/yourGoal" />
+ app:layout_constraintTop_toBottomOf="@+id/yourGoal"
+ app:srcCompat="@drawable/diary2" />
<Button
android:id="@+id/button"
diff --git a/app/src/main/res/layout/act_update_caffeine_empty.xml b/app/src/main/res/layout/act_update_caffeine_empty.xml
index 1bf1721..be848a8 100644
--- a/app/src/main/res/layout/act_update_caffeine_empty.xml
+++ b/app/src/main/res/layout/act_update_caffeine_empty.xml
@@ -66,11 +66,11 @@
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -79,7 +79,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="750dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -88,9 +88,9 @@
android:id="@+id/relaxedGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -116,9 +116,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="20dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -137,9 +137,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -157,8 +157,8 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -176,9 +176,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -197,9 +197,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -218,9 +218,9 @@
android:id="@+id/activityGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup">
@@ -248,23 +248,21 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView3" />
<RadioGroup
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -305,6 +303,16 @@
android:text="@string/op5.6" />
</RadioGroup>
+ <ImageView
+ android:id="@+id/imageView3"
+ android:layout_width="266dp"
+ android:layout_height="176dp"
+ android:layout_marginTop="24dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/activityGroup"
+ app:srcCompat="@drawable/hunger" />
+
</android.support.constraint.ConstraintLayout>
</FrameLayout>
diff --git a/app/src/main/res/layout/act_update_caffeine_limit.xml b/app/src/main/res/layout/act_update_caffeine_limit.xml
index 80c301b..d051bef 100644
--- a/app/src/main/res/layout/act_update_caffeine_limit.xml
+++ b/app/src/main/res/layout/act_update_caffeine_limit.xml
@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="800dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -89,9 +89,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -110,9 +110,9 @@
android:id="@+id/tvQuestion2"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -131,9 +131,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -151,8 +151,8 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -170,9 +170,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -191,9 +191,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -212,23 +212,21 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/energyGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView6" />
<RadioGroup
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -273,9 +271,9 @@
android:id="@+id/coffeeGroup"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -299,9 +297,9 @@
android:id="@+id/sodaGroup"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvQuestion2">
@@ -325,9 +323,9 @@
android:id="@+id/energyGroup"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup">
@@ -347,6 +345,20 @@
android:text="@string/energy1" />
</RadioGroup>
+ <ImageView
+ android:id="@+id/imageView6"
+ android:layout_width="255dp"
+ android:layout_height="96dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/energyGroup"
+ app:layout_constraintVertical_bias="0.184"
+ app:srcCompat="@drawable/soda" />
+
</android.support.constraint.ConstraintLayout>
</FrameLayout>
diff --git a/app/src/main/res/layout/act_update_caffeine_six.xml b/app/src/main/res/layout/act_update_caffeine_six.xml
index f72b9da..606ba27 100644
--- a/app/src/main/res/layout/act_update_caffeine_six.xml
+++ b/app/src/main/res/layout/act_update_caffeine_six.xml
@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="950dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -89,9 +89,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -110,9 +110,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -130,9 +130,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -177,9 +177,9 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="47dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -196,9 +196,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -217,9 +217,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="41dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -238,23 +238,21 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView7" />
<TimePicker
android:id="@+id/lastDrink"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -264,14 +262,27 @@
android:id="@+id/whenSleep"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup" />
+ <ImageView
+ android:id="@+id/imageView7"
+ android:layout_width="249dp"
+ android:layout_height="131dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.492"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/whenSleep"
+ app:srcCompat="@drawable/bed1" />
+
</android.support.constraint.ConstraintLayout>
</FrameLayout>
diff --git a/app/src/main/res/layout/act_update_light_bright.xml b/app/src/main/res/layout/act_update_light_bright.xml
index bc5a12e..e36a939 100644
--- a/app/src/main/res/layout/act_update_light_bright.xml
+++ b/app/src/main/res/layout/act_update_light_bright.xml
@@ -66,12 +66,12 @@
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_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="800dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -89,9 +89,9 @@
android:id="@+id/sunlightGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sunlightQuestion">
@@ -119,9 +119,9 @@
android:id="@+id/glassesGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/glassesQuestion">
@@ -149,9 +149,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="46dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -169,9 +169,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -216,9 +216,9 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -235,9 +235,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="24dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -256,9 +256,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -277,9 +277,9 @@
android:id="@+id/glassesQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -298,9 +298,9 @@
android:id="@+id/sunlightQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -319,9 +319,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -349,15 +349,25 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/sunlightGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView8" />
+
+ <ImageView
+ android:id="@+id/imageView8"
+ android:layout_width="244dp"
+ android:layout_height="150dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/sunlightGroup"
+ app:srcCompat="@drawable/sun" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_update_light_glasses.xml b/app/src/main/res/layout/act_update_light_glasses.xml
index fd67446..174638f 100644
--- a/app/src/main/res/layout/act_update_light_glasses.xml
+++ b/app/src/main/res/layout/act_update_light_glasses.xml
@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="750dp"
tools:layout_editor_absoluteX="36dp"
tools:layout_editor_absoluteY="0dp">
@@ -89,9 +89,9 @@
android:id="@+id/glassesGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/glassesQuestion">
@@ -119,9 +119,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -139,9 +139,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -186,9 +186,9 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -205,9 +205,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -226,9 +226,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -247,9 +247,9 @@
android:id="@+id/glassesQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -268,9 +268,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -298,15 +298,26 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/glassesGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView9" />
+
+ <ImageView
+ android:id="@+id/imageView9"
+ android:layout_width="274dp"
+ android:layout_height="146dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.493"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/glassesGroup"
+ app:srcCompat="@drawable/emoji" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_update_light_turnoffs.xml b/app/src/main/res/layout/act_update_light_turnoffs.xml
index 45694f2..cbe2d08 100644
--- a/app/src/main/res/layout/act_update_light_turnoffs.xml
+++ b/app/src/main/res/layout/act_update_light_turnoffs.xml
@@ -78,7 +78,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="750dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -87,9 +87,9 @@
android:id="@+id/relaxedGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -117,9 +117,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -138,9 +138,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -158,9 +158,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -205,9 +205,9 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -225,9 +225,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -246,9 +246,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -267,9 +267,9 @@
android:id="@+id/activityGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup">
@@ -297,15 +297,28 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
android:text="@string/nextButton"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView10" />
+
+ <ImageView
+ android:id="@+id/imageView10"
+ android:layout_width="348dp"
+ android:layout_height="152dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/activityGroup"
+ app:srcCompat="@drawable/tablet" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_update_schedule_midnight.xml b/app/src/main/res/layout/act_update_schedule_midnight.xml
index f10f52a..0e1eaec 100644
--- a/app/src/main/res/layout/act_update_schedule_midnight.xml
+++ b/app/src/main/res/layout/act_update_schedule_midnight.xml
@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="750dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -89,9 +89,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="47dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -109,9 +109,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -156,9 +156,9 @@
android:id="@+id/whenSleep"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -168,9 +168,9 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="46dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -188,9 +188,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -209,9 +209,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -230,15 +230,26 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView11" />
+
+ <ImageView
+ android:id="@+id/imageView11"
+ android:layout_width="308dp"
+ android:layout_height="130dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.487"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/whenSleep"
+ app:srcCompat="@drawable/owl" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_update_schedule_relax.xml b/app/src/main/res/layout/act_update_schedule_relax.xml
index 4d72664..a814971 100644
--- a/app/src/main/res/layout/act_update_schedule_relax.xml
+++ b/app/src/main/res/layout/act_update_schedule_relax.xml
@@ -44,12 +44,12 @@
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
- android:layout_width="match_parent"
- android:layout_height="425dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
+ android:layout_width="394dp"
+ android:layout_height="559dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -64,12 +64,12 @@
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_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -78,7 +78,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="800dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -87,9 +87,9 @@
android:id="@+id/relaxedGroup"
android:layout_width="match_parent"
android:layout_height="43dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/turnOffQuestion">
@@ -117,9 +117,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -138,9 +138,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -158,9 +158,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -205,8 +205,8 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -223,9 +223,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -244,9 +244,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -265,9 +265,9 @@
android:id="@+id/activityGroup"
android:layout_width="match_parent"
android:layout_height="108dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup">
@@ -322,15 +322,28 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView12" />
+
+ <ImageView
+ android:id="@+id/imageView12"
+ android:layout_width="351dp"
+ android:layout_height="171dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
+ app:layout_constraintTop_toBottomOf="@+id/activityGroup"
+ app:layout_constraintVertical_bias="0.0"
+ app:srcCompat="@drawable/sport" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_update_schedule_sametime.xml b/app/src/main/res/layout/act_update_schedule_sametime.xml
index cd8a305..7f91a48 100644
--- a/app/src/main/res/layout/act_update_schedule_sametime.xml
+++ b/app/src/main/res/layout/act_update_schedule_sametime.xml
@@ -78,7 +78,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="900dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -87,9 +87,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -108,9 +108,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -128,9 +128,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -175,8 +175,8 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -193,9 +193,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -214,9 +214,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -235,23 +235,21 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView13" />
<TimePicker
android:id="@+id/lastDrink"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -261,14 +259,26 @@
android:id="@+id/whenSleep"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup" />
+ <ImageView
+ android:id="@+id/imageView13"
+ android:layout_width="321dp"
+ android:layout_height="132dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/whenSleep"
+ app:srcCompat="@drawable/alarm1" />
+
</android.support.constraint.ConstraintLayout>
</FrameLayout>
diff --git a/app/src/main/res/layout/act_update_schedule_seven.xml b/app/src/main/res/layout/act_update_schedule_seven.xml
index ad77b22..a2a5329 100644
--- a/app/src/main/res/layout/act_update_schedule_seven.xml
+++ b/app/src/main/res/layout/act_update_schedule_seven.xml
@@ -78,7 +78,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="900dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -87,9 +87,9 @@
android:id="@+id/appGroup"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -108,9 +108,9 @@
android:id="@+id/loggngTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -128,9 +128,9 @@
android:id="@+id/radioGroup2"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/questionDay">
@@ -175,8 +175,8 @@
android:id="@+id/dayReview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -193,9 +193,9 @@
android:id="@+id/questionDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -214,9 +214,9 @@
android:id="@+id/turnOffQuestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:ems="10"
@@ -235,23 +235,21 @@
android:id="@+id/submitUpdate"
android:layout_width="wrap_content"
android:layout_height="44dp"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/nextButton"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
+ app:layout_constraintTop_toBottomOf="@+id/imageView16" />
<TimePicker
android:id="@+id/lastDrink"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -261,14 +259,26 @@
android:id="@+id/whenSleep"
android:layout_width="match_parent"
android:layout_height="146dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:timePickerMode="spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appGroup" />
+ <ImageView
+ android:id="@+id/imageView16"
+ android:layout_width="244dp"
+ android:layout_height="150dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/whenSleep"
+ app:srcCompat="@drawable/bed2" />
+
</android.support.constraint.ConstraintLayout>
</FrameLayout>
diff --git a/app/src/main/res/layout/act_what_experiments.xml b/app/src/main/res/layout/act_what_experiments.xml
index 6d4d9a5..4a23234 100644
--- a/app/src/main/res/layout/act_what_experiments.xml
+++ b/app/src/main/res/layout/act_what_experiments.xml
@@ -172,7 +172,7 @@
app:layout_constraintEnd_toEndOf="@+id/textView6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6"
- app:srcCompat="@drawable/data" />
+ app:srcCompat="@drawable/camouflage" />
<ImageView
android:id="@+id/imageView24"
@@ -181,20 +181,10 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
- app:layout_constraintEnd_toStartOf="@+id/imageView25"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:srcCompat="@drawable/data" />
-
- <ImageView
- android:id="@+id/imageView25"
- android:layout_width="133dp"
- android:layout_height="133dp"
- android:layout_marginTop="8dp"
- android:layout_marginEnd="36dp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:srcCompat="@drawable/data" />
+ app:srcCompat="@drawable/checklist" />
<TextView
android:id="@+id/textView9"
diff --git a/app/src/main/res/layout/act_what_is_sleep.xml b/app/src/main/res/layout/act_what_is_sleep.xml
index bd93489..7d566d6 100644
--- a/app/src/main/res/layout/act_what_is_sleep.xml
+++ b/app/src/main/res/layout/act_what_is_sleep.xml
@@ -163,7 +163,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle"
- app:srcCompat="@drawable/data" />
+ app:srcCompat="@drawable/owl" />
<ImageView
android:id="@+id/imageView5"
@@ -172,7 +172,7 @@
app:layout_constraintEnd_toStartOf="@+id/textView5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/missionTitle"
- app:srcCompat="@drawable/data" />
+ app:srcCompat="@drawable/targett" />
<Button
android:id="@+id/back"
--
GitLab