From ff442d502d78b272e3e8aff81eb7d67d14201c8c Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sun, 12 Aug 2018 12:28:17 +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_bitmoji.xml
#	app/src/main/res/layout/activity_third_page.xml
---
 .idea/caches/build_file_checksums.ser  | Bin 537 -> 537 bytes
 app/src/main/res/layout/goal_diary.xml |   2 +-
 app/src/main/res/values/strings.xml    |   1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 76759966f8709c5a17373fcd7fc09fd71173615f..92c567170a52276cee7d4052058e2c82ec759cd5 100644
GIT binary patch
delta 14
WcmbQqGLvP(Oy-A{w>QqIWdr~$Xa*+$

delta 14
WcmbQqGLvP(Oy;xur*526%Lo81q6Sj{

diff --git a/app/src/main/res/layout/goal_diary.xml b/app/src/main/res/layout/goal_diary.xml
index d264357..1d0def2 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 e505ef0..0666692 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>
-- 
GitLab