From ccb17036ce614f3a828e981a6d04ca40d94ceef8 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 15:06:53 +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_four.xml | 6 +++---
app/src/main/res/layout/questionnaire_four.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
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 799b39a..b4469b0 100644
--- a/app/src/main/res/layout/activity_second_page_four.xml
+++ b/app/src/main/res/layout/activity_second_page_four.xml
@@ -107,13 +107,13 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
- android:layout_marginBottom="14dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="2dp"
android:text="@string/submitUpdate"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/yourName2" />
<EditText
diff --git a/app/src/main/res/layout/questionnaire_four.xml b/app/src/main/res/layout/questionnaire_four.xml
index 56a599c..34981b3 100644
--- a/app/src/main/res/layout/questionnaire_four.xml
+++ b/app/src/main/res/layout/questionnaire_four.xml
@@ -108,13 +108,13 @@
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="2dp"
android:text="@string/submitUpdate"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/yourName2" />
<EditText
--
GitLab