From 2b7965ad611cad3963dd0688bda20e6bf9cb162f Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Tue, 27 Jun 2017 12:10:56 +0200
Subject: [PATCH 1/2] Fix for timeline scrolling

---
 logboek/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 logboek/.gitignore

diff --git a/logboek/.gitignore b/logboek/.gitignore
new file mode 100644
index 0000000..3fe5e07
--- /dev/null
+++ b/logboek/.gitignore
@@ -0,0 +1,2 @@
+logboek.pdf
+

From ab0b1056406249f19f9c89e5d61e32b5f8d6100d Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Tue, 27 Jun 2017 12:11:52 +0200
Subject: [PATCH 2/2] Fix for timeline

---
 .../main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java | 1 -
 .../app/src/main/res/layout/list_item_timeline.xml           | 5 +++--
 .../app/src/main/res/values-nl/strings.xml                   | 2 +-
 .../app/src/main/res/values/strings.xml                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
index 6f05305..7d4dda5 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
@@ -38,7 +38,6 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
 
     @Override
     public int getCount() {
-        Log.d(TAG, "getCount: " + mData.size());
         return mData.size();
     }
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
index 9e1bba4..0d2006f 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
@@ -7,8 +7,9 @@
 
     <ImageView
         android:id="@+id/timeline_image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_width="wrap_content"
+        android:layout_gravity="center"
+        android:layout_height="250dp" />
 
     <TextView
         android:id="@+id/comment_timeline"
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 e38d9a7..57fc504 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -30,5 +30,5 @@
     <string name="image_save_error">Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is.</string>
     <string name="update_profile_pic_error">Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding.</string>
     <string name="upload_profile_pic">Profielfoto aan het uploaden…</string>
-    <string name="niet_slecht">\"Niet slecht.\"s</string>
+    <string name="niet_slecht">"\"Niet slecht.\"s "</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 033a7bb..7f065d9 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -22,7 +22,7 @@
     <string name="profile_picture_description">profile picture</string>
     <string name="change_psw_button">Change Password</string>
     <string name="please_wait">Please Wait</string>
-    <string name="niet_slecht">\"Niet slecht.\"s</string>
+    <string name="niet_slecht">"\"Niet slecht.\"s "</string>
     <string name="upload">Upload</string>
     <string name="save">Save</string>
     <string name="mail_successful">An e-mail was sent. Please follow its instructions.</string>