diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9ac1aeae76e8c858e4a0659a2a1fb509645060cf..ae3b25bb6a5a562386526b6690916ce05b7f7cfa 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc2d646ceed792bbfa449bc73a840cd6f95..c0f68eddd7c4423a9fa05d6a53e9d1eb7e9c8c14 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/build.gradle b/app/build.gradle
index 15dfe94fdbabb2b09b0b6e50519fcec32d03e29a..1a654f4061e1f6f7f48c3923205ade8a58583575 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
+ compileSdkVersion 28
buildToolsVersion '27.0.3'
defaultConfig {
- applicationId "com.example.admin.sleepbetter"
+ applicationId "com.uos.admin.sleepbetter"
minSdkVersion 18
- targetSdkVersion 27
- versionCode 1
+ targetSdkVersion 28
+ versionCode 4
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@@ -28,17 +28,16 @@ dependencies {
implementation 'com.ibm.watson.developer_cloud:java-sdk:3.7.2'
implementation 'com.github.kittinunf.fuel:fuel-android:1.9.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'com.android.support:appcompat-v7:27.1.1'
+ implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
- implementation 'com.android.support:support-v4:27.1.1'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support:support-core-utils:27.1.1'
+ implementation 'com.android.support:support-v4:28.0.0-alpha1'
+ implementation 'com.android.support:design:28.0.0-alpha1'
+ implementation 'com.android.support:support-core-utils:28.0.0-alpha1'
implementation 'com.jjoe64:graphview:4.2.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support:appcompat-v7:27.1.1'
+ implementation 'com.android.support:design:28.0.0-alpha1'
implementation 'android.arch.persistence.room:runtime:1.0.0'
annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..8f8917e94f835cd9df75cda3ee0ec382918c5ee3
Binary files /dev/null and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 0000000000000000000000000000000000000000..13fa4ea4accc106e81343aa621c40184035c60ce
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/admin/sleepbetter/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uos/admin/sleepbetter/ExampleInstrumentedTest.java
similarity index 94%
rename from app/src/androidTest/java/com/example/admin/sleepbetter/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/uos/admin/sleepbetter/ExampleInstrumentedTest.java
index de4fe50b42d0975fb46ceeabe9e0835f9fdb4f16..05461b4e7a5ff6cd37900c27bf191da3d63ae5bf 100644
--- a/app/src/androidTest/java/com/example/admin/sleepbetter/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/uos/admin/sleepbetter/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 995ee6569e3afc0fe60abbf2879ee08ea769636a..2a11ccfdef66c11dc872979280c8fe750f60b1ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.admin.sleepbetter">
+ package="com.uos.admin.sleepbetter">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -9,7 +9,6 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.NEW_OUTGOING_CALL" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<application
diff --git a/app/src/main/java/com/example/admin/sleepbetter/B_MainMenu.java b/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/B_MainMenu.java
rename to app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
index 513c676aa0054b9e566d1f4568dc5e2de20342d3..a813a7e23fd6ad2ace8ce82c9526c8cb01da8b82 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/B_MainMenu.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.AlarmManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/B_WhatExperiments.java b/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
similarity index 95%
rename from app/src/main/java/com/example/admin/sleepbetter/B_WhatExperiments.java
rename to app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
index 71816ca0b494788f2abff9f330eff8a21e92fdf5..3adca6ab8389368bc879f12116b280dbb57ce1eb 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/B_WhatExperiments.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/CalendarPage.java b/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/CalendarPage.java
rename to app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
index 35e7c4cb10aa0ee462e44cd5a0c7334894f45aee..9151639de3e5af90680a233c838508135657ee15 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/CalendarPage.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentTransaction;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/DaoAccess.java b/app/src/main/java/com/uos/admin/sleepbetter/DaoAccess.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/DaoAccess.java
rename to app/src/main/java/com/uos/admin/sleepbetter/DaoAccess.java
index f5066258c5edae71a5ae793e1640419155198b47..056adc21cdb39f24cdf4ceab61c3b02c1208a79a 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/DaoAccess.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/DaoAccess.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Data.java b/app/src/main/java/com/uos/admin/sleepbetter/Data.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Data.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Data.java
index 98c49a1bd959d2f566754b6a187a224070f301eb..cbece7771e3f85c2b7200600d31420270b9b0ae7 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Data.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Data.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Demographics.java b/app/src/main/java/com/uos/admin/sleepbetter/Demographics.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/Demographics.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Demographics.java
index b4273e4e325c8becaa7beab2657ddec801db91d1..9129f0ed21da44ee4c899436278a50dcd500374f 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Demographics.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Demographics.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/DialogAdaptorStudent.java b/app/src/main/java/com/uos/admin/sleepbetter/DialogAdaptorStudent.java
similarity index 97%
rename from app/src/main/java/com/example/admin/sleepbetter/DialogAdaptorStudent.java
rename to app/src/main/java/com/uos/admin/sleepbetter/DialogAdaptorStudent.java
index 4e29d80a07a81d3fa5bc925c95c85f2d8c89b701..d1ea2418ab0146fa27a099807761a905e366ae29 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/DialogAdaptorStudent.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/DialogAdaptorStudent.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.annotation.TargetApi;
import android.app.Activity;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Dialogpojo.java b/app/src/main/java/com/uos/admin/sleepbetter/Dialogpojo.java
similarity index 93%
rename from app/src/main/java/com/example/admin/sleepbetter/Dialogpojo.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Dialogpojo.java
index 43d8b697bb3242717124afc7f411de770257e689..02c3a7451f9c8e86107e8017e66437bc2650f2c1 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Dialogpojo.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Dialogpojo.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
public class Dialogpojo {
private String experiments;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Factors.java b/app/src/main/java/com/uos/admin/sleepbetter/Factors.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Factors.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Factors.java
index fa1f2b900821c2aff87b4315fbe6101b547f8866..58b2115b9e3fca8bd2d068188c4fa282298fbf91 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Factors.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Factors.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java b/app/src/main/java/com/uos/admin/sleepbetter/FirstPage.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
rename to app/src/main/java/com/uos/admin/sleepbetter/FirstPage.java
index 5b3b379a0406f258011ea50a1196f4e197175ef0..22263c7c708ae6fe32b42dd26c6acda8b84b6224 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/FirstPage.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/FirstPageConsent.java b/app/src/main/java/com/uos/admin/sleepbetter/FirstPageConsent.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/FirstPageConsent.java
rename to app/src/main/java/com/uos/admin/sleepbetter/FirstPageConsent.java
index d4665c43717a24bdd377ffeb2612d14fc9e941b7..405fb00a3418e925711536b39ee018c8c0350eff 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/FirstPageConsent.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/FirstPageConsent.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/GoalDiary.java b/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/GoalDiary.java
rename to app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
index 4be9a3715750b07f8f0417cda3bc1e87640f7f59..d097be7a70b96c359e040f8da3c9a6f6382a88a6 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/GoalDiary.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.arch.persistence.room.Room;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/HomeCollection.java b/app/src/main/java/com/uos/admin/sleepbetter/HomeCollection.java
similarity index 92%
rename from app/src/main/java/com/example/admin/sleepbetter/HomeCollection.java
rename to app/src/main/java/com/uos/admin/sleepbetter/HomeCollection.java
index fcad6dfb981b8fe8307493f40dfbd12e625aefcd..4a5c2bf710e6a100637429b7f19707a8ac7beafc 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/HomeCollection.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/HomeCollection.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/HwAdapter.java b/app/src/main/java/com/uos/admin/sleepbetter/HwAdapter.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/HwAdapter.java
rename to app/src/main/java/com/uos/admin/sleepbetter/HwAdapter.java
index 4b89fa38c50542403169f766a1cf9ac584cf5ef4..a5fc67b692b186ba1938a5cab0bcd1e880ef8744 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/HwAdapter.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/HwAdapter.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Activity;
import android.app.Dialog;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java b/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
rename to app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
index 019d08ebc5376d2f81fb3ac3734c8bd664afb4b6..fb62b0fd77a689d290eb3eb176acb34b9531a0cf 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.AlarmManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Notice.java b/app/src/main/java/com/uos/admin/sleepbetter/Notice.java
similarity index 94%
rename from app/src/main/java/com/example/admin/sleepbetter/Notice.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Notice.java
index c6c477c93adf24f8d40244151564871594454780..0e34f2fba7c87eb79ba03df6de3b3ee74a362eb4 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Notice.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Notice.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/QFinal.java b/app/src/main/java/com/uos/admin/sleepbetter/QFinal.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/QFinal.java
rename to app/src/main/java/com/uos/admin/sleepbetter/QFinal.java
index fd02ec19b119db635b34d81d7ae55b57ea5a5c9f..f5af8b41ab64fecd4fdfd5316a0512aaac03e8ea 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/QFinal.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/QFinal.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.arch.persistence.room.Room;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/QInitial.java b/app/src/main/java/com/uos/admin/sleepbetter/QInitial.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/QInitial.java
rename to app/src/main/java/com/uos/admin/sleepbetter/QInitial.java
index 04214cb8eb345d1c6dd754d1e03cfef0b80ac38d..90bd21cda71690cd801bab728b884aff427118b1 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/QInitial.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/QInitial.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Report.java b/app/src/main/java/com/uos/admin/sleepbetter/Report.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Report.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Report.java
index 78f03aa9c2defea3ac37796f376140b15d699b89..0099475d77f08a9f1fc6a859205876132385dd66 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Report.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Report.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Context;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update.java b/app/src/main/java/com/uos/admin/sleepbetter/Update.java
similarity index 92%
rename from app/src/main/java/com/example/admin/sleepbetter/Update.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update.java
index 5b594744b84d31717677f3669e399a6882bb4494..af032ff4577a2d6975ec2e5d621ef3305151ad5f 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_6hours.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_6hours.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_6hours.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_6hours.java
index ca01f1e56c80d64364b3a63d2e1bc78493d1a76f..f1fbfd3e4e9afb2f2a985d6544550ad71c2ab520 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_6hours.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_6hours.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_Empty.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_Empty.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_Empty.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_Empty.java
index 2b563b671cd88f7939b1c6a2c7b014b7a2f229f2..da31068cd3386754fd0868ae3de46681d9c0c694 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_Empty.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_Empty.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_limit.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_limit.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_limit.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_limit.java
index f95360069e1227aa5bbb6550271a124b751c8201..3020be7c2cf7adcef4c63175874f54dba0ea99de 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Caffeine_limit.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Caffeine_limit.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_Bright.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Bright.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Light_Bright.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Bright.java
index e5c5e45a32fd018058067b9a70d5a6692c8b87ea..3282b558427fb9600b2e49c9890270f4e7d0bfd5 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_Bright.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Bright.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_Glasses.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Glasses.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Light_Glasses.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Glasses.java
index 9f8957c847cbc7bcfb59334336234a0d74abec91..37eb17e988a2061bfcb04fb77080e6cc696a409b 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_Glasses.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_Glasses.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_TurnOffBright.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_TurnOffBright.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Light_TurnOffBright.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Light_TurnOffBright.java
index b204563d71f4402e211b9e60a4f0c03d77a644b3..eaf670d1a61b1d3b405a804032b3136d808b2138 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Light_TurnOffBright.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Light_TurnOffBright.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_7hours.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_7hours.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_7hours.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_7hours.java
index 63307ac24968f00977f01e13566f614a4c5ae7a8..701497ba98eaf428ba8ac2243ff5c91c043b7a3d 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_7hours.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_7hours.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Midnight.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Midnight.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Midnight.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Midnight.java
index c678ae88ca237ce371137f71dfe144d3d88fbe27..494bda36b8bcf1e95c3fe4ae8b4f1020de55fd5c 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Midnight.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Midnight.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Relax.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Relax.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Relax.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Relax.java
index d21dc35c0fad8a10387b6d42541e9fafc295f9f5..cb685357290faf1aa6e400b3b9cb0945fcf76cd6 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_Relax.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_Relax.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_SameTime.java b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_SameTime.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_SameTime.java
rename to app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_SameTime.java
index c6da64598331b58f4faa4ab3fa90c0d7ae6f9920..8dee11420b017ad29ef4802ed3a47c649bf8d6ef 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Update_Schedule_SameTime.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update_Schedule_SameTime.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/UserDatabase.java b/app/src/main/java/com/uos/admin/sleepbetter/UserDatabase.java
similarity index 89%
rename from app/src/main/java/com/example/admin/sleepbetter/UserDatabase.java
rename to app/src/main/java/com/uos/admin/sleepbetter/UserDatabase.java
index c56391a5e9743cc9150f05d8385465050e2a50c8..abd5f66da2dc51226425f7ead986aa29044bcd70 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/UserDatabase.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/UserDatabase.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.arch.persistence.room.Database;
import android.arch.persistence.room.RoomDatabase;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/UserDiary.java b/app/src/main/java/com/uos/admin/sleepbetter/UserDiary.java
similarity index 96%
rename from app/src/main/java/com/example/admin/sleepbetter/UserDiary.java
rename to app/src/main/java/com/uos/admin/sleepbetter/UserDiary.java
index 35e03843eea9e8986b9dae80fa9f90d223c2734f..cb523ab9a0617e9ddee5ef161d5527c576d0c399 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/UserDiary.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/UserDiary.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/UserExperiment.java b/app/src/main/java/com/uos/admin/sleepbetter/UserExperiment.java
similarity index 99%
rename from app/src/main/java/com/example/admin/sleepbetter/UserExperiment.java
rename to app/src/main/java/com/uos/admin/sleepbetter/UserExperiment.java
index bdc21ed98c05ed7fbd33f24088f70bb914978e12..d4d800efafb72d88de6493058adfb5b511433800 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/UserExperiment.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/UserExperiment.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/UserQuestionnaire.java b/app/src/main/java/com/uos/admin/sleepbetter/UserQuestionnaire.java
similarity index 98%
rename from app/src/main/java/com/example/admin/sleepbetter/UserQuestionnaire.java
rename to app/src/main/java/com/uos/admin/sleepbetter/UserQuestionnaire.java
index 5548e96c4aebf69b1dabf8b3a9eada7562aec96a..8d2bd15035707ef183556a24d16be9771e5f8855 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/UserQuestionnaire.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/UserQuestionnaire.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/WhatExperiments.java b/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
similarity index 96%
rename from app/src/main/java/com/example/admin/sleepbetter/WhatExperiments.java
rename to app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
index a7f77750d3bd612bb3f02364118f0be0b06cb884..c621f5d8c6264f069de7de5d0db487c98491ad07 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/WhatExperiments.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/admin/sleepbetter/WhatIsSleep.java b/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
similarity index 97%
rename from app/src/main/java/com/example/admin/sleepbetter/WhatIsSleep.java
rename to app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
index 41f37c33f82b6a768b4e2e5167f2be55dd11aaaa..fbdd753060e7d78262b4c5ff0226f65b52827a00 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/WhatIsSleep.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
diff --git a/app/src/main/res/layout/act_b_what_experiments.xml b/app/src/main/res/layout/act_b_what_experiments.xml
index 84b77db3f664995591d67a4611dc846006a6d34c..75e1420ef40f3dc07ca47c1decf3a482fa460129 100644
--- a/app/src/main/res/layout/act_b_what_experiments.xml
+++ b/app/src/main/res/layout/act_b_what_experiments.xml
@@ -10,7 +10,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="481dp"
+ android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -43,7 +43,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="575dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -69,12 +69,16 @@
<TextView
android:id="@+id/textView6"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:maxLines="30"
+ android:layout_height="100dp"
+ android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/experimentsB"
android:textAlignment="textStart"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle" />
@@ -82,10 +86,12 @@
android:id="@+id/back"
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="8dp"
android:text="@string/backButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9" />
@@ -94,24 +100,25 @@
android:id="@+id/imageView23"
android:layout_width="133dp"
android:layout_height="133dp"
- android:layout_marginEnd="108dp"
- android:layout_marginStart="108dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/textView6"
+ app:layout_constraintStart_toStartOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/textView6"
app:srcCompat="@drawable/phone" />
<TextView
android:id="@+id/textView9"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="180dp"
android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/experiments2"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView23" />
diff --git a/app/src/main/res/layout/act_calendar.xml b/app/src/main/res/layout/act_calendar.xml
index 5e89f41ab1db9948594e4c6e5bc423157c0f3610..50b2ffdc412c43ee0462ee82eee3ff5284040e6c 100644
--- a/app/src/main/res/layout/act_calendar.xml
+++ b/app/src/main/res/layout/act_calendar.xml
@@ -51,10 +51,13 @@
<TextView
android:id="@+id/factorsIntro"
- android:layout_width="362dp"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="130dp"
+ android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:text="@string/calendarIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
@@ -63,11 +66,12 @@
app:layout_constraintTop_toBottomOf="@+id/topView" />
<RelativeLayout
- android:layout_width="366dp"
- android:layout_height="418dp"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/factorsIntro"
diff --git a/app/src/main/res/layout/act_consent.xml b/app/src/main/res/layout/act_consent.xml
index 4f5debf4d84ab96931d65b97081bb5a77046d896..96ec8a9adc158fa1a084c44525b3b7ffeedaf5f2 100644
--- a/app/src/main/res/layout/act_consent.xml
+++ b/app/src/main/res/layout/act_consent.xml
@@ -52,12 +52,14 @@
<TextView
android:id="@+id/factorsIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="80dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="5"
android:text="@string/consentIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topView" />
@@ -66,11 +68,10 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="404dp"
+ android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -98,7 +99,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="755dp"
+ android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="0dp"
@@ -108,117 +109,117 @@
<Button
android:id="@+id/submit"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="120dp"
+ android:layout_marginBottom="16dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:text="@string/submitUpdate"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p8" />
<TextView
android:id="@+id/p8"
- android:layout_width="255dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="29dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/permissionEight"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/group"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p7" />
<TextView
android:id="@+id/p7"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_marginEnd="2dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/permissionSeven"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p6" />
<TextView
android:id="@+id/p6"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/permissionSix"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p5" />
<TextView
android:id="@+id/p5"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/permissionFive"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p4" />
<TextView
android:id="@+id/p4"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/permissionFour"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox8"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p3" />
<TextView
android:id="@+id/p3"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/permissionThree"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p2" />
<TextView
android:id="@+id/p2"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/permissionTwo"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/p1" />
<TextView
android:id="@+id/p1"
- android:layout_width="306dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:text="@string/permissionOne"
android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toStartOf="@+id/checkBox3"
+ app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -226,89 +227,88 @@
android:id="@+id/checkBox2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="27dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p2"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p2"
- app:layout_constraintTop_toBottomOf="@+id/checkBox3" />
+ app:layout_constraintTop_toTopOf="@+id/p2" />
<CheckBox
android:id="@+id/checkBox8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="21dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p4"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p4"
- app:layout_constraintTop_toBottomOf="@+id/checkBox7" />
+ app:layout_constraintTop_toTopOf="@+id/p4" />
<CheckBox
android:id="@+id/checkBox7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="35dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p3"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p3"
- app:layout_constraintTop_toBottomOf="@+id/checkBox2" />
+ app:layout_constraintTop_toTopOf="@+id/p3" />
<CheckBox
android:id="@+id/checkBox6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="25dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p5"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p5"
- app:layout_constraintTop_toBottomOf="@+id/checkBox8" />
+ app:layout_constraintTop_toTopOf="@+id/p5" />
<CheckBox
android:id="@+id/checkBox5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="28dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p6"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p6"
- app:layout_constraintTop_toBottomOf="@+id/checkBox6" />
+ app:layout_constraintTop_toTopOf="@+id/p6" />
<CheckBox
android:id="@+id/checkBox4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
- android:layout_marginTop="46dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p7"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p7"
- app:layout_constraintTop_toBottomOf="@+id/checkBox5" />
+ app:layout_constraintTop_toTopOf="@+id/p7" />
<CheckBox
android:id="@+id/checkBox3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="9dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
android:layout_marginTop="16dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p1"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p1"
app:layout_constraintTop_toTopOf="parent" />
<RadioGroup
android:id="@+id/group"
- android:layout_width="62dp"
+ android:layout_width="60dp"
android:layout_height="50dp"
+ android:layout_marginBottom="8dp"
android:layout_marginEnd="5dp"
- android:layout_marginStart="10dp"
- android:layout_marginTop="26dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/p8"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/p8"
- app:layout_constraintTop_toBottomOf="@+id/p7">
+ app:layout_constraintTop_toTopOf="@+id/p8">
<RadioButton
android:id="@+id/yes"
diff --git a/app/src/main/res/layout/act_data.xml b/app/src/main/res/layout/act_data.xml
index 32a5fbdcc5377c0bb77dce7b6f875557d93a09f6..f0a793bec6c66ea445fb9d53910a2495b7fa9262 100644
--- a/app/src/main/res/layout/act_data.xml
+++ b/app/src/main/res/layout/act_data.xml
@@ -48,10 +48,12 @@
<TextView
android:id="@+id/dataIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="120dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:text="@string/dataIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +64,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="345dp"
+ android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="5dp"
@@ -93,7 +95,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="1200dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="24dp"
tools:layout_editor_absoluteY="8dp">
@@ -113,9 +115,11 @@
android:id="@+id/specificMood"
android:layout_width="match_parent"
android:layout_height="144dp"
+ android:layout_marginBottom="24dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -247,9 +251,8 @@
android:text="@string/chooseTitle"
android:textColor="@android:color/black"
android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/shortMood"
+ app:layout_constraintStart_toStartOf="@+id/shortMood"
app:layout_constraintTop_toBottomOf="@+id/shortMood" />
<TextView
@@ -263,8 +266,8 @@
android:textColor="@android:color/holo_red_dark"
android:textSize="12sp"
android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/progress"
+ app:layout_constraintStart_toStartOf="@+id/progress"
app:layout_constraintTop_toBottomOf="@+id/progress" />
<TextView
@@ -274,38 +277,39 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="6dp"
+ android:maxLines="30"
android:text="@string/thingsToChange"
android:textColor="@android:color/black"
android:textSize="12sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:autoSizeTextType="uniform"
+ app:layout_constraintEnd_toEndOf="@+id/textView12"
+ app:layout_constraintStart_toStartOf="@+id/textView12"
app:layout_constraintTop_toBottomOf="@+id/textView12" />
<ImageView
android:id="@+id/imageView28"
android:layout_width="109dp"
android:layout_height="106dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="80dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/overallMood"
+ app:layout_constraintStart_toStartOf="@+id/overallMood"
app:layout_constraintTop_toBottomOf="@+id/overallMood" />
<TextView
android:id="@+id/experimentName"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_height="20dp"
android:layout_marginStart="8dp"
+ android:maxLines="5"
+ app:autoSizeTextType="uniform"
android:layout_marginTop="8dp"
android:text="@string/svdExperiment"
android:textColor="@android:color/holo_blue_dark"
android:textSize="12sp"
android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/infoRatings"
+ app:layout_constraintStart_toStartOf="@+id/singleVD"
app:layout_constraintTop_toBottomOf="@+id/singleVD" />
<TextView
@@ -318,65 +322,71 @@
android:text="@string/svdyourOverall"
android:textColor="@android:color/holo_red_dark"
android:textSize="12sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/infoRatings"
+ app:layout_constraintStart_toStartOf="@+id/singleVD"
app:layout_constraintTop_toBottomOf="@+id/experimentName" />
<TextView
android:id="@+id/howLong"
- android:layout_width="81dp"
+ android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginBottom="12dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:maxLines="30"
android:text="@string/svdHowLong"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintBottom_toTopOf="@+id/imageView28"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.117"
+ app:layout_constraintEnd_toStartOf="@+id/overallMood"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/quality"
- android:layout_width="67dp"
+ android:layout_width="0dp"
android:layout_height="47dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginBottom="24dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:maxLines="30"
android:text="@string/svdQuality"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintBottom_toTopOf="@+id/imageView28"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.791"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toEndOf="@+id/overallMood" />
<TextView
android:id="@+id/impactMood"
- android:layout_width="96dp"
- android:layout_height="64dp"
+ android:layout_width="0dp"
+ android:layout_height="84dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/svdImpactMood"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.966"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/imageView28"
app:layout_constraintTop_toBottomOf="@+id/quality" />
<TextView
android:id="@+id/awake"
- android:layout_width="94dp"
+ android:layout_width="0dp"
android:layout_height="58dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/svdAwake"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toStartOf="@+id/imageView28"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
@@ -384,14 +394,16 @@
<TextView
android:id="@+id/earlier"
- android:layout_width="95dp"
+ android:layout_width="0dp"
android:layout_height="71dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:maxLines="30"
android:text="@string/svdEarlier"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toStartOf="@+id/imageView28"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
@@ -399,14 +411,16 @@
<TextView
android:id="@+id/impactActivities"
- android:layout_width="97dp"
- android:layout_height="76dp"
+ android:layout_width="0dp"
+ android:layout_height="96dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/svdImpactActivities"
android:textColor="@android:color/black"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/imageView28"
@@ -416,14 +430,16 @@
android:id="@+id/impactGeneral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="48dp"
+ android:layout_marginTop="56dp"
+ android:maxLines="30"
android:text="@string/svdImpactGeneral"
android:textColor="@android:color/black"
android:textSize="12sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:autoSizeTextType="uniform"
+ app:layout_constraintEnd_toEndOf="@+id/imageView28"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="@+id/imageView28"
app:layout_constraintTop_toBottomOf="@+id/imageView28" />
<Button
diff --git a/app/src/main/res/layout/act_demograpics.xml b/app/src/main/res/layout/act_demograpics.xml
index b834a3b9da855f3c79cace9ac0add729d414d7cc..fa89af04e8ab2732fb57d3d163faae9af1ebb9e6 100644
--- a/app/src/main/res/layout/act_demograpics.xml
+++ b/app/src/main/res/layout/act_demograpics.xml
@@ -54,7 +54,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="458dp"
+ android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -85,14 +85,14 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="1584dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
<EditText
android:id="@+id/firstSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="160dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:clickable="false"
@@ -102,9 +102,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/surveyDesc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -113,10 +115,12 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
+ android:layout_marginBottom="24dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/submitUpdate"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/q7Group" />
@@ -278,7 +282,7 @@
<RadioGroup
android:id="@+id/q1Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="98dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -312,7 +316,7 @@
<RadioGroup
android:id="@+id/q2Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -359,7 +363,7 @@
<RadioGroup
android:id="@+id/q3Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -407,8 +411,8 @@
<RadioGroup
android:id="@+id/q4Group"
- android:layout_width="327dp"
- android:layout_height="128dp"
+ android:layout_width="match_parent"
+ android:layout_height="148dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -455,7 +459,7 @@
<RadioGroup
android:id="@+id/q5Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -503,7 +507,7 @@
<RadioGroup
android:id="@+id/q6Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="158dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -564,7 +568,7 @@
<RadioGroup
android:id="@+id/q7Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/act_diary.xml b/app/src/main/res/layout/act_diary.xml
index efd047ef7a59f289809a05b5340373a20017450b..cdf27c8fcc26b19cf816f88c73ad148b206628c1 100644
--- a/app/src/main/res/layout/act_diary.xml
+++ b/app/src/main/res/layout/act_diary.xml
@@ -58,8 +58,8 @@
<EditText
android:id="@+id/pleaseInput"
- android:layout_width="354dp"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="80dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
@@ -74,6 +74,8 @@
android:text="@string/goalDiaryIntro"
android:textSize="16sp"
android:textStyle="italic"
+ android:maxLines="5"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
@@ -84,21 +86,21 @@
android:layout_height="33dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:background="@drawable/text_input_border"
android:hint="@string/goalDiaryInput"
android:inputType=""
android:textSize="14sp"
android:textStyle="italic"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.042"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/pleaseInput"
+ app:layout_constraintHorizontal_bias="0.063"
+ app:layout_constraintStart_toStartOf="@+id/pleaseInput"
app:layout_constraintTop_toBottomOf="@+id/pleaseInput" />
<EditText
android:id="@+id/editText"
- android:layout_width="352dp"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="42dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:clickable="false"
@@ -114,9 +116,11 @@
<ScrollView
android:layout_width="match_parent"
- android:layout_height="198dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -166,10 +170,10 @@
android:layout_height="86dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="28dp"
- app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="8dp"
+ app:layout_constraintEnd_toEndOf="@+id/pleaseInput"
app:layout_constraintHorizontal_bias="0.501"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/pleaseInput"
app:layout_constraintTop_toBottomOf="@+id/yourGoal" />
<Button
@@ -180,8 +184,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/submitUpdate"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.458"
+ app:layout_constraintEnd_toEndOf="@+id/pleaseInput"
app:layout_constraintStart_toEndOf="@+id/yourGoal"
app:layout_constraintTop_toBottomOf="@+id/pleaseInput" />
diff --git a/app/src/main/res/layout/act_experiments.xml b/app/src/main/res/layout/act_experiments.xml
index ff8fa916181c9489fe17d6633bc85ed9fc8f55c3..3ab3f92353e8e1dfa2e775107a6db145134cd21e 100644
--- a/app/src/main/res/layout/act_experiments.xml
+++ b/app/src/main/res/layout/act_experiments.xml
@@ -52,6 +52,8 @@
<TextView
android:id="@+id/factorsIntro"
android:layout_width="match_parent"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -66,7 +68,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="382dp"
+ android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -99,7 +101,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="559dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="40dp"
tools:layout_editor_absoluteY="0dp">
@@ -107,7 +109,7 @@
<RadioGroup
android:id="@+id/experimentsGroup"
android:layout_width="match_parent"
- android:layout_height="447dp"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
@@ -249,9 +251,12 @@
android:id="@+id/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
android:layout_marginEnd="120dp"
android:layout_marginStart="120dp"
+ android:layout_marginTop="8dp"
android:text="@string/submitUpdate"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/experimentsGroup" />
diff --git a/app/src/main/res/layout/act_main_menu.xml b/app/src/main/res/layout/act_main_menu.xml
index 8aacd236e4b1f8f89c6f26dd467e0bc88ef6968c..7d921cc7312fe086fab5dba3400d66ec5fef9a2f 100644
--- a/app/src/main/res/layout/act_main_menu.xml
+++ b/app/src/main/res/layout/act_main_menu.xml
@@ -25,22 +25,21 @@
<Button
android:id="@+id/whatSleep"
android:layout_width="139dp"
- android:layout_height="111dp"
+ android:layout_height="71dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:background="@drawable/rounded_button_one"
android:text="@string/firstOptionMainMenu"
android:textColor="@android:color/white"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/textView"
+ app:layout_constraintStart_toStartOf="@+id/textView"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
<Button
android:id="@+id/WhatExperiments"
android:layout_width="139dp"
- android:layout_height="111dp"
+ android:layout_height="71dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/rounded_button_two"
@@ -92,14 +91,13 @@
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/introUp"
android:textColor="@android:color/holo_red_dark"
android:textSize="20sp"
android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/imageView3"
+ app:layout_constraintStart_toStartOf="@+id/imageView3"
app:layout_constraintTop_toBottomOf="@+id/imageView3" />
<TextView
@@ -107,26 +105,25 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
android:text="@string/introUpsub"
android:textColor="@android:color/holo_blue_dark"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/imageView3"
+ app:layout_constraintStart_toStartOf="@+id/imageView3"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/youHave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="102dp"
- android:layout_marginStart="102dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="13dp"
android:text="You have 2 days left of the current experiment."
android:textColor="#000000"
android:textSize="8sp"
android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/textView"
+ app:layout_constraintStart_toStartOf="@+id/textView"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
<ImageView
@@ -135,9 +132,8 @@
android:layout_height="92dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/textView"
+ app:layout_constraintStart_toStartOf="@+id/textView"
app:layout_constraintTop_toBottomOf="@+id/WhatExperiments"
app:srcCompat="@drawable/sleep" />
@@ -161,8 +157,8 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/upText"
+ app:layout_constraintStart_toStartOf="@+id/upText"
app:layout_constraintTop_toBottomOf="@+id/upText"
app:srcCompat="@drawable/pill" />
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/act_notice.xml b/app/src/main/res/layout/act_notice.xml
index 860ad61189d013c51ee11867761ae3d1fb8b2f4e..54b69aad74642bedaaba55551eafcb6df1301119 100644
--- a/app/src/main/res/layout/act_notice.xml
+++ b/app/src/main/res/layout/act_notice.xml
@@ -18,17 +18,18 @@
<TextView
android:id="@+id/welcomeTo"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="100dp"
+ android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/notice"
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="14sp"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:autoSizeTextType="uniform"
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" />
+ app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
<TextView
android:id="@+id/welcomeTitle"
diff --git a/app/src/main/res/layout/act_ques_final.xml b/app/src/main/res/layout/act_ques_final.xml
index 19fdadb4cb4848a4d1daf4171f510d72bf289817..fc50265f2aba9070649420270adcc2b79923b539 100644
--- a/app/src/main/res/layout/act_ques_final.xml
+++ b/app/src/main/res/layout/act_ques_final.xml
@@ -55,7 +55,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="458dp"
+ android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -86,14 +86,14 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="1595dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
<EditText
android:id="@+id/firstSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -104,9 +104,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q1desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -114,7 +116,7 @@
<EditText
android:id="@+id/secondSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -125,9 +127,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q2desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -136,7 +140,7 @@
<EditText
android:id="@+id/thirdSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -147,9 +151,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q3desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -159,10 +165,12 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
+ android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/submitUpdate"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/q8Group" />
@@ -172,6 +180,8 @@
android:id="@+id/fallAsleepUsually"
android:layout_width="match_parent"
android:layout_height="14dp"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -323,7 +333,7 @@
<RadioGroup
android:id="@+id/q1Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -370,7 +380,7 @@
<RadioGroup
android:id="@+id/q2Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -417,8 +427,8 @@
<RadioGroup
android:id="@+id/q3Group"
- android:layout_width="327dp"
- android:layout_height="128dp"
+ android:layout_width="match_parent"
+ android:layout_height="148dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -464,7 +474,7 @@
<RadioGroup
android:id="@+id/q5Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -511,7 +521,7 @@
<RadioGroup
android:id="@+id/q6Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -558,7 +568,7 @@
<RadioGroup
android:id="@+id/q7Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -605,7 +615,7 @@
<RadioGroup
android:id="@+id/q8Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/act_ques_initial.xml b/app/src/main/res/layout/act_ques_initial.xml
index 32e45ac992c65ef0a4a730a53caf9eab8ff4d52a..b9e1a41f411ee8441cad49f147b860918c5ccc45 100644
--- a/app/src/main/res/layout/act_ques_initial.xml
+++ b/app/src/main/res/layout/act_ques_initial.xml
@@ -54,7 +54,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="458dp"
+ android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -85,14 +85,14 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="1895dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
<EditText
android:id="@+id/firstSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -103,9 +103,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q1desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -113,7 +115,7 @@
<EditText
android:id="@+id/secondSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -124,9 +126,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q2desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -135,7 +139,7 @@
<EditText
android:id="@+id/thirdSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -146,9 +150,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q3desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -157,7 +163,7 @@
<EditText
android:id="@+id/fourthSet"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -168,9 +174,11 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine"
+ android:maxLines="30"
android:text="@string/q4desc"
android:textSize="12sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -180,10 +188,12 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
+ android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/q9Group" />
@@ -389,7 +399,7 @@
<RadioGroup
android:id="@+id/q1Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -436,7 +446,7 @@
<RadioGroup
android:id="@+id/q2Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -483,8 +493,8 @@
<RadioGroup
android:id="@+id/q3Group"
- android:layout_width="327dp"
- android:layout_height="128dp"
+ android:layout_width="match_parent"
+ android:layout_height="148dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
@@ -530,7 +540,7 @@
<RadioGroup
android:id="@+id/q4Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -577,7 +587,7 @@
<RadioGroup
android:id="@+id/q5Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -624,7 +634,7 @@
<RadioGroup
android:id="@+id/q6Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -671,12 +681,13 @@
<RadioGroup
android:id="@+id/q7Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s7">
@@ -718,7 +729,7 @@
<RadioGroup
android:id="@+id/q8Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -766,7 +777,7 @@
<RadioGroup
android:id="@+id/q9Group"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
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 5dac7265017c923e6a96a46e77fd52a2b92d6b74..61afd9f4ccbb67db9efcf0210afa200c8ad172de 100644
--- a/app/src/main/res/layout/act_update_caffeine_empty.xml
+++ b/app/src/main/res/layout/act_update_caffeine_empty.xml
@@ -69,7 +69,9 @@
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/stomachIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -112,7 +116,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="552dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -281,16 +285,19 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
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 7efdac559efc7ad5176344d1c0d5f5636c620d71..1464b009cf7456b3b968e2560aa6a67d5187c504 100644
--- a/app/src/main/res/layout/act_update_caffeine_limit.xml
+++ b/app/src/main/res/layout/act_update_caffeine_limit.xml
@@ -68,8 +68,10 @@
<TextView
android:id="@+id/lightIntro"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/limitIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +117,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="968dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -245,17 +249,19 @@
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="8dp"
+ android:layout_marginTop="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/energyGroup" />
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -302,7 +308,7 @@
<RadioGroup
android:id="@+id/coffeeGroup"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -328,14 +334,14 @@
<RadioGroup
android:id="@+id/sodaGroup"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tvQuestion2" >
+ app:layout_constraintTop_toBottomOf="@+id/tvQuestion2">
<RadioButton
android:id="@+id/radioButton58"
@@ -354,14 +360,14 @@
<RadioGroup
android:id="@+id/energyGroup"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/appGroup" >
+ app:layout_constraintTop_toBottomOf="@+id/appGroup">
<RadioButton
android:id="@+id/radioButton60"
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 ca6d58993b9df8fd8125bdf834637a6f6b299fcd..2d859d7f8216f49eca223ce213b6d455a4a9219d 100644
--- a/app/src/main/res/layout/act_update_caffeine_six.xml
+++ b/app/src/main/res/layout/act_update_caffeine_six.xml
@@ -68,8 +68,10 @@
<TextView
android:id="@+id/lightIntro"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/sixIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +117,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="771dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -161,7 +165,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -271,16 +275,19 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
<TimePicker
android:id="@+id/lastDrink"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -292,7 +299,7 @@
<TimePicker
android:id="@+id/whenSleep"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
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 bb89c0a2e54c6bc5c11af979549160dac02dcd27..1bb353f42f2dd083742613a42c69fbaa1344ddbd 100644
--- a/app/src/main/res/layout/act_update_light_bright.xml
+++ b/app/src/main/res/layout/act_update_light_bright.xml
@@ -68,8 +68,10 @@
<TextView
android:id="@+id/lightIntro"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/brightExposureIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +117,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="660dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -200,7 +204,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -382,9 +386,12 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sunlightGroup" />
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 0955d0b443b5f697af8c0df644ce1399f66ea75b..38a51abe1edc0a8b0defaa027ecb1a2c0817a185 100644
--- a/app/src/main/res/layout/act_update_light_glasses.xml
+++ b/app/src/main/res/layout/act_update_light_glasses.xml
@@ -69,7 +69,9 @@
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/glassesIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,14 +117,14 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="569dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="36dp"
tools:layout_editor_absoluteY="0dp">
<RadioGroup
android:id="@+id/glassesGroup"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="43dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -170,7 +174,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -331,9 +335,12 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/glassesGroup" />
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 47f6de6538a66f387e67fcf91f621a8732d6b0d2..0667ef9d59ef89c532e7c94b01cd56baf2d42595 100644
--- a/app/src/main/res/layout/act_update_light_turnoffs.xml
+++ b/app/src/main/res/layout/act_update_light_turnoffs.xml
@@ -69,7 +69,7 @@
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/turnOffIntro"
@@ -82,13 +82,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +115,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="614dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -191,7 +193,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -332,9 +334,12 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
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 e2063f7c08c5416a2ef3f0ec9e008ab05212fe19..572356beecde9439406d4889d9fdd2dcfbed8c51 100644
--- a/app/src/main/res/layout/act_update_schedule_midnight.xml
+++ b/app/src/main/res/layout/act_update_schedule_midnight.xml
@@ -69,7 +69,9 @@
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ app:autoSizeTextType="uniform"
+ android:maxLines="30"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/sevenIntro"
@@ -82,13 +84,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +117,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="586dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -140,7 +144,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -263,9 +267,12 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
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 178f922645db5ff2b360f22f4174268abb89acef..400fc82b846fcc4d47540e974108646e35bdf846 100644
--- a/app/src/main/res/layout/act_update_schedule_relax.xml
+++ b/app/src/main/res/layout/act_update_schedule_relax.xml
@@ -69,7 +69,7 @@
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/relaxIntro"
@@ -83,12 +83,14 @@
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_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"
@@ -113,7 +115,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="632dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -191,7 +193,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -357,9 +359,12 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activityGroup" />
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 b2dae00342a94d15cc71b2932ca0bfee2bf5f4d7..67fe2fe63b086e0d097134bab068cc643b71e657 100644
--- a/app/src/main/res/layout/act_update_schedule_sametime.xml
+++ b/app/src/main/res/layout/act_update_schedule_sametime.xml
@@ -69,7 +69,7 @@
<TextView
android:id="@+id/sametimeIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/sametimeIntro"
@@ -82,13 +82,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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"
@@ -113,7 +115,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="737dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -161,7 +163,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -270,16 +272,19 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
<TimePicker
android:id="@+id/lastDrink"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -291,7 +296,7 @@
<TimePicker
android:id="@+id/whenSleep"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
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 89a03c3f7d74fd171119f909bfaf20fa36226bf9..f570d8eeb978cbf2268727cc86154c50afc6db4d 100644
--- a/app/src/main/res/layout/act_update_schedule_seven.xml
+++ b/app/src/main/res/layout/act_update_schedule_seven.xml
@@ -69,7 +69,7 @@
<TextView
android:id="@+id/sevenIntro"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="70dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:text="@string/sevenIntro"
@@ -82,13 +82,15 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="425dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="8dp"
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.0"
app:layout_constraintStart_toStartOf="parent"
@@ -113,7 +115,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/fr"
android:layout_width="match_parent"
- android:layout_height="748dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -161,7 +163,7 @@
<RadioGroup
android:id="@+id/radioGroup2"
- android:layout_width="327dp"
+ android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -270,16 +272,19 @@
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:text="@string/nextButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/whenSleep" />
<TimePicker
android:id="@+id/lastDrink"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -291,7 +296,7 @@
<TimePicker
android:id="@+id/whenSleep"
- android:layout_width="297dp"
+ android:layout_width="match_parent"
android:layout_height="146dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/act_welcome.xml b/app/src/main/res/layout/act_welcome.xml
index 03b2c7f0db65bdce55839f409eddc01b76e309fb..401906e588756d3e23edf342b072190384e2ef5d 100644
--- a/app/src/main/res/layout/act_welcome.xml
+++ b/app/src/main/res/layout/act_welcome.xml
@@ -34,17 +34,17 @@
<TextView
android:id="@+id/welcomeTo"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="150dp"
+ android:maxLines="20"
android:text="@string/appIntro"
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="14sp"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:autoSizeTextType="uniform"
app:layout_constraintHorizontal_bias="0.508"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.231" />
+ app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
<TextView
android:id="@+id/welcomeTitle"
@@ -94,16 +94,15 @@
<CheckBox
android:id="@+id/consentCheckbox"
- android:layout_width="wrap_content"
+ android:layout_width="35dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="72dp"
+ android:layout_marginTop="20dp"
android:text=" "
android:textSize="12sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.315"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/yourName"
+ app:layout_constraintStart_toStartOf="@+id/yourName"
app:layout_constraintTop_toBottomOf="@+id/welcomeTo" />
<EditText
@@ -126,13 +125,11 @@
android:id="@+id/consentForm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="116dp"
- android:layout_marginStart="5dp"
- android:layout_marginTop="76dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="20dp"
android:text="@string/permission"
android:textColor="@android:color/black"
android:textSize="18sp"
- app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/consentCheckbox"
app:layout_constraintTop_toBottomOf="@+id/welcomeTo" />
diff --git a/app/src/main/res/layout/act_what_experiments.xml b/app/src/main/res/layout/act_what_experiments.xml
index f8fd64a576acf818a72e8979069d4b2c06c726b9..6bd2b2d0cf71d1820d20fcd64ad6e9992cfba239 100644
--- a/app/src/main/res/layout/act_what_experiments.xml
+++ b/app/src/main/res/layout/act_what_experiments.xml
@@ -10,7 +10,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="481dp"
+ android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -43,7 +43,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="1475dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -106,11 +106,13 @@
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="380dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:maxLines="30"
android:text="@string/features"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -119,12 +121,16 @@
<TextView
android:id="@+id/textView6"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="120dp"
+ android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="5"
+ app:autoSizeTextType="uniform"
android:text="@string/experiments"
android:textAlignment="textStart"
android:textColor="@android:color/black"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle" />
@@ -132,9 +138,12 @@
android:id="@+id/back"
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:text="@string/backButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5" />
@@ -142,12 +151,14 @@
<TextView
android:id="@+id/textView7"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="140dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/loggingExp"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tuningTitle" />
@@ -156,11 +167,10 @@
android:id="@+id/imageView23"
android:layout_width="133dp"
android:layout_height="133dp"
- android:layout_marginEnd="108dp"
- android:layout_marginStart="108dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintEnd_toEndOf="@+id/textView6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6"
app:srcCompat="@drawable/phone" />
@@ -190,12 +200,14 @@
<TextView
android:id="@+id/textView9"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="180dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/experiments2"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView23" />
@@ -216,12 +228,14 @@
<TextView
android:id="@+id/welcomeTitle"
- android:layout_width="258dp"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="60dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="5"
+ app:autoSizeTextType="uniform"
android:text="@string/whatExeriments"
android:textAllCaps="false"
android:textColor="@android:color/black"
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 e92a3b201e527cc594d22e680169fb201d100f21..ac8f68d6752a6bc5409f65fdfadaf5b7a257824c 100644
--- a/app/src/main/res/layout/act_what_is_sleep.xml
+++ b/app/src/main/res/layout/act_what_is_sleep.xml
@@ -30,17 +30,21 @@
<TextView
android:id="@+id/welcomeTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="40dp"
android:layout_marginBottom="8dp"
+ android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="5"
android:text="@string/whatISTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="22sp"
android:textStyle="bold"
+ app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="@+id/topView"
+ app:layout_constraintEnd_toStartOf="@+id/logoPlace"
app:layout_constraintStart_toStartOf="@+id/topView"
app:layout_constraintTop_toTopOf="@+id/topView" />
@@ -48,7 +52,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="481dp"
+ android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
@@ -79,7 +83,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="786dp"
+ android:layout_height="wrap_content"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -140,13 +144,15 @@
<TextView
android:id="@+id/textView5"
- android:layout_width="224dp"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="230dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:maxLines="30"
android:text="@string/ourMissionn"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/imageView5"
@@ -154,14 +160,16 @@
<TextView
android:id="@+id/textView6"
- android:layout_width="222dp"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="230dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/sleepDescription"
android:textAlignment="textStart"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toStartOf="@+id/imageView4"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -192,9 +200,12 @@
android:id="@+id/back"
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:text="@string/backButton"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5" />
@@ -202,12 +213,14 @@
<TextView
android:id="@+id/textView7"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="90dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:maxLines="30"
android:text="@string/tuning"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tuningTitle" />
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 385aef43843f191a905d7f224dad241566e5b0d4..fd7a058433df8e82194e88d4192fb6fcb9a20908 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -4,6 +4,5 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
- <item name="coordinatorLayoutStyle">@style/Widget.Design.CoordinatorLayout</item>
</style>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2e056d019c58186d141e6e3d37f5e62917a1c31b..e10167e9fe03fe4ec010ddce96ead051963cd5dd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,7 +11,6 @@
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
- <item name="coordinatorLayoutStyle">@style/Widget.Design.CoordinatorLayout</item>
</style>
diff --git a/app/src/test/java/com/example/admin/sleepbetter/ExampleUnitTest.java b/app/src/test/java/com/uos/admin/sleepbetter/ExampleUnitTest.java
similarity index 90%
rename from app/src/test/java/com/example/admin/sleepbetter/ExampleUnitTest.java
rename to app/src/test/java/com/uos/admin/sleepbetter/ExampleUnitTest.java
index 53fc2c2363b0dcdae0f11d4e71c692a43939c70c..36f7ad83ace219a5fb2e383b1031da9421e7cfd7 100644
--- a/app/src/test/java/com/example/admin/sleepbetter/ExampleUnitTest.java
+++ b/app/src/test/java/com/uos/admin/sleepbetter/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.example.admin.sleepbetter;
+package com.uos.admin.sleepbetter;
import org.junit.Test;
diff --git a/appv3/release/app-release.apk b/appv3/release/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..0e6a49805cb35e7c2e0e86b4be7e7e2718bd8c91
Binary files /dev/null and b/appv3/release/app-release.apk differ
diff --git a/appv3/release/output.json b/appv3/release/output.json
new file mode 100644
index 0000000000000000000000000000000000000000..470eaac1bcd0ec179fd4132ae5984adb4f59e9b3
--- /dev/null
+++ b/appv3/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/appv4/release/output.json b/appv4/release/output.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab527088c90c1d43f05efd5ecaf7dd16b03ddbd5
--- /dev/null
+++ b/appv4/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/appv4/release/sleepBetter.apk b/appv4/release/sleepBetter.apk
new file mode 100644
index 0000000000000000000000000000000000000000..aaa7cbd4b4824f51471055f2f467176301c5c613
Binary files /dev/null and b/appv4/release/sleepBetter.apk differ
diff --git a/keyapk/sleepBetterKey.jks b/keyapk/sleepBetterKey.jks
new file mode 100644
index 0000000000000000000000000000000000000000..d4a5a6c4f51d25ec061e03ad68c406ae885b412d
Binary files /dev/null and b/keyapk/sleepBetterKey.jks differ