From 9754a7d3c6e7f0bb17d80f2e7332f5d491a246fb Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 14:15:52 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# .idea/caches/build_file_checksums.ser
# app/src/main/res/layout/activity_first_page_consent.xml
---
app/src/main/res/layout/activity_second_page.xml | 2 +-
app/src/main/res/layout/activity_second_page_four.xml | 6 +++---
app/src/main/res/layout/activity_second_page_three.xml | 10 +++++-----
app/src/main/res/layout/activity_second_page_two.xml | 6 +++---
app/src/main/res/layout/questionnaire.xml | 2 +-
app/src/main/res/layout/questionnaire_four.xml | 6 +++---
app/src/main/res/layout/questionnaire_three.xml | 10 +++++-----
app/src/main/res/layout/questionnaire_two.xml | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/app/src/main/res/layout/activity_second_page.xml b/app/src/main/res/layout/activity_second_page.xml
index 10c863e..bd1c4ec 100644
--- a/app/src/main/res/layout/activity_second_page.xml
+++ b/app/src/main/res/layout/activity_second_page.xml
@@ -110,7 +110,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/timesWakingUp"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_second_page_four.xml b/app/src/main/res/layout/activity_second_page_four.xml
index 333f30e..799b39a 100644
--- a/app/src/main/res/layout/activity_second_page_four.xml
+++ b/app/src/main/res/layout/activity_second_page_four.xml
@@ -153,7 +153,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/concentrateUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -178,7 +178,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType=""
+ android:inputType="textMultiLine"
android:text="@string/coordinateUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -203,7 +203,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/apetiteUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_second_page_three.xml b/app/src/main/res/layout/activity_second_page_three.xml
index 4c1ac77..3dbdbc4 100644
--- a/app/src/main/res/layout/activity_second_page_three.xml
+++ b/app/src/main/res/layout/activity_second_page_three.xml
@@ -132,7 +132,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/sadUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -156,7 +156,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/sleepyUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -181,7 +181,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/tiredUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -206,7 +206,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/stressUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -231,7 +231,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/irritableUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_second_page_two.xml b/app/src/main/res/layout/activity_second_page_two.xml
index fc58f53..d0d74d8 100644
--- a/app/src/main/res/layout/activity_second_page_two.xml
+++ b/app/src/main/res/layout/activity_second_page_two.xml
@@ -133,7 +133,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/fallAsleepUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -155,7 +155,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/wakeUpUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -177,7 +177,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/freshUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/questionnaire.xml b/app/src/main/res/layout/questionnaire.xml
index 32d72b0..a61f5fa 100644
--- a/app/src/main/res/layout/questionnaire.xml
+++ b/app/src/main/res/layout/questionnaire.xml
@@ -155,7 +155,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offtimesWakingUp"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/questionnaire_four.xml b/app/src/main/res/layout/questionnaire_four.xml
index ef2464b..56a599c 100644
--- a/app/src/main/res/layout/questionnaire_four.xml
+++ b/app/src/main/res/layout/questionnaire_four.xml
@@ -154,7 +154,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offconcentrateUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -179,7 +179,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType=""
+ android:inputType="textMultiLine"
android:text="@string/offcoordinateUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -204,7 +204,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offapetiteUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/questionnaire_three.xml b/app/src/main/res/layout/questionnaire_three.xml
index b512206..5bc99f7 100644
--- a/app/src/main/res/layout/questionnaire_three.xml
+++ b/app/src/main/res/layout/questionnaire_three.xml
@@ -134,7 +134,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offsadUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -158,7 +158,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offsleepyUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -183,7 +183,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offtiredUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -208,7 +208,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offstressUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -233,7 +233,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offirritableUsually"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/questionnaire_two.xml b/app/src/main/res/layout/questionnaire_two.xml
index 44f35f9..85b77cf 100644
--- a/app/src/main/res/layout/questionnaire_two.xml
+++ b/app/src/main/res/layout/questionnaire_two.xml
@@ -134,7 +134,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offfallAsleepUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -156,7 +156,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offwakeUpUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -178,7 +178,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offfreshUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
--
GitLab