diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 5bd2d6b9ba07633a56db7f2058616446b2ef2900..92c567170a52276cee7d4052058e2c82ec759cd5 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/res/layout/activity_first_page_consent.xml b/app/src/main/res/layout/activity_first_page_consent.xml index dc7663adf7e1a958507c7a81dd987c18970ec7ee..e5c7ac7d41229a83007727dbf34fc795c0751392 100644 --- a/app/src/main/res/layout/activity_first_page_consent.xml +++ b/app/src/main/res/layout/activity_first_page_consent.xml @@ -66,7 +66,7 @@ android:id="@+id/ScrollViewQuestionnaire" style="@android:style/Widget.Material.ScrollView" android:layout_width="match_parent" - android:layout_height="409dp" + android:layout_height="404dp" android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:layout_marginStart="8dp" diff --git a/app/src/main/res/layout/goal_diary.xml b/app/src/main/res/layout/goal_diary.xml index d2643575d405f6417fdd94de14af9e760341ea56..1d0def20be7533a0741a4a41c659153214cb959a 100644 --- a/app/src/main/res/layout/goal_diary.xml +++ b/app/src/main/res/layout/goal_diary.xml @@ -31,7 +31,7 @@ android:layout_marginEnd="8dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp" - android:text="@string/goalDiaryTitle" + android:text="@string/goalDiaryTitlee" android:textAllCaps="false" android:textColor="@android:color/black" android:textSize="30sp" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f622c1b2d20b2190a545e610cb9680eda838694..7f3b05434cd01d11ba40744db48fe01410acfdbc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -79,6 +79,7 @@ <string name="goalDiaryTitle">CURRENT STATE</string> + <string name="goalDiaryTitlee">GOAL DIARY</string> <!--<string name="greatText">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood:</string>--> <string name="greatText1">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood. I can see you are ok at the moment. That is great! We will work together to keep it like this and even improve your state.</string> <string name="greatText2">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood. I see that you feel blue. We will work together to make you feel better and you will see, it is not hard at all.</string>