From 0d4baf85b49baa5297227e665a9b2d626cb3339f Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 11:05:55 +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
---
.idea/misc.xml | 2 +-
app/src/main/res/layout/what_is_chatbot.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..c0f68ed 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/src/main/res/layout/what_is_chatbot.xml b/app/src/main/res/layout/what_is_chatbot.xml
index f001e61..df65071 100644
--- a/app/src/main/res/layout/what_is_chatbot.xml
+++ b/app/src/main/res/layout/what_is_chatbot.xml
@@ -41,7 +41,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="526dp"
+ android:layout_height="556dp"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp">
@@ -102,11 +102,11 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="56dp"
+ android:layout_marginTop="24dp"
android:text="@string/backButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView5" />
+ app:layout_constraintTop_toBottomOf="@+id/textView5" />
<TextView
android:id="@+id/textView6"
--
GitLab