From 3aac4fc96db33e97a4e2e5ffebd5f45bedde948f Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Tue, 20 Jun 2017 13:01:51 +0200
Subject: [PATCH] login-, picture-button to fragment_profile.xml button's are
 next to each other

---
 .../src/main/res/layout/fragment_camera.xml   |  5 ----
 .../src/main/res/layout/fragment_profile.xml  | 24 +++++++++++++++----
 .../app/src/main/res/values-nl/strings.xml    |  2 ++
 .../app/src/main/res/values/strings.xml       |  2 ++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
index 49fd204..392188c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
@@ -14,11 +14,6 @@
             android:layout_height="wrap_content"
             android:text="@string/hello_camera" />
 
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="logOutOnClick"
-            android:text="LogOut" />
     </LinearLayout>
     <!-- TODO: Update blank fragment layout -->
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
index 5394adc..2185f1e 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
@@ -4,10 +4,26 @@
     android:layout_height="match_parent"
     tools:context="nl.myhyvesbookplus.tagram.ProfileFragment">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/logout_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".50"
+            android:onClick="logOutOnClick"
+            android:text="@string/logout_button" />
+
+        <Button
+            android:id="@+id/profile_pic_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".50"
+            android:text="@string/profile_picture_button" />
+
+    </LinearLayout>
 
 </FrameLayout>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
index 27c7f75..be66c75 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -13,4 +13,6 @@
     <string name="username">Gebruikersnaam</string>
     <string name="confirm_password_hint">bevestig wachtwoord</string>
     <string name="logo_text">MyHyvesBookPlusTagram logo</string>
+    <string name="logout_button">Uitloggen</string>
+    <string name="profile_picture_button">Profiel Foto</string>
 </resources>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
index 0fa0555..2761112 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="hello_camera">Hello Camera</string>
     <string name="logo_text">MyHyvesBookPlusTagram logo</string>
+    <string name="logout_button">LogOut</string>
+    <string name="profile_picture_button">Profile Picture</string>
 </resources>