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 01/42] 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
+
-- 
2.49.1


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 02/42] 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>
-- 
2.49.1


From 08849521e1d851fcccc4b8a8da39a87e6e45f73d Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Tue, 27 Jun 2017 12:37:23 +0200
Subject: [PATCH 03/42] Fix comment box clickable + prettify

---
 .../java/nl/myhyvesbookplus/tagram/CameraFragment.java   | 2 ++
 .../app/src/main/res/layout/fragment_camera.xml          | 9 ++++++---
 .../app/src/main/res/values-nl/strings.xml               | 1 +
 .../app/src/main/res/values/strings.xml                  | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 7c523a3..01bfbe9 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -153,6 +153,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         (view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                view.findViewById(R.id.comment_box).setClickable(true);
+                view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE);
                 view.findViewById(R.id.comment_box).bringToFront();
             }
         });
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 27b8601..04637b3 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
@@ -74,13 +74,17 @@
             android:id="@+id/comment_box"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:clickable="false"
             android:layout_margin="10dp"
+            android:padding="5dp"
+            android:background="@android:color/background_light"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Comment:"/>
+                android:text="@string/comment"/>
 
             <EditText
                 android:id="@+id/comment_text"
@@ -89,13 +93,12 @@
                 android:lines="4"
                 android:layout_margin="4dp"
                 android:padding="5dp"
-                android:visibility="visible"
                 android:background="@android:color/darker_gray"/>
             <Button
                 android:id="@+id/comment_submit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Submit"/>
+                android:text="@string/upload"/>
 
         </LinearLayout>
 
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 57fc504..924bdf7 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -31,4 +31,5 @@
     <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="comment">Bijschrift:</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 7f065d9..4b5468c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -30,4 +30,5 @@
     <string name="image_save_error">Saving image to storage failed. Please make sure there is space available on the device.</string>
     <string name="update_profile_pic_error">Updating the profile picture failed. Please check network connection.</string>
     <string name="upload_profile_pic">Uploading profile picture...</string>
+    <string name="comment">Comment:</string>
 </resources>
-- 
2.49.1


From 6851009e4bbf740919fadd05f0d6669a1b4ca962 Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Tue, 27 Jun 2017 13:13:43 +0200
Subject: [PATCH 04/42] Added new files for profile fragment  new file:  
 fragment_profile_header.xml  new file:   fragment_profile_timeline.xml  new
 file:   list_item_timeline_profile.xml

---
 .../res/layout/fragment_profile_header.xml    | 69 +++++++++++++++++++
 .../res/layout/fragment_profile_timeline.xml  | 14 ++++
 .../res/layout/list_item_timeline_profile.xml | 18 +++++
 3 files changed, 101 insertions(+)
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
new file mode 100644
index 0000000..f1f70a9
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
@@ -0,0 +1,69 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="5dp" />
+
+    <TextView
+        android:id="@+id/profile_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="Name:"
+        android:textSize="25sp"
+        android:textStyle="bold" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+
+    <ImageButton
+        android:id="@+id/profile_pic_button"
+        android:layout_width="60dp"
+        android:layout_height="80dp"
+        android:layout_marginStart="110dp"
+        android:background="@android:color/transparent"
+        android:elevation="1dp"
+        app:srcCompat="@android:drawable/ic_menu_camera" />
+
+    <ImageView
+        android:id="@+id/imageView_profile_picture"
+        android:contentDescription="@string/profile_picture_description"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        app:srcCompat="@drawable/avatar_standard"
+        android:layout_marginTop="-70dp"/>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="25dp" />
+
+    <Button
+        android:id="@+id/change_psw_button"
+        android:layout_width="300dp"
+        android:layout_height="50dp"
+        android:background="?attr/colorPrimary"
+        android:text="@string/change_psw_button"
+        android:textColor="@android:color/white"
+        android:textSize="16sp" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="20dp" />
+
+    <Button
+        android:id="@+id/logout_button"
+        android:layout_width="300dp"
+        android:layout_height="50dp"
+        android:background="?attr/colorPrimary"
+        android:onClick="logOutOnClick"
+        android:text="@string/logout_button"
+        android:textColor="@android:color/white"
+        android:textSize="16sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
new file mode 100644
index 0000000..fd06e94
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
+
+    <ListView
+        android:id="@+id/listview_profile"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
new file mode 100644
index 0000000..11dde06
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -0,0 +1,18 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/timeline_image_profile"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center"
+        android:layout_height="250dp" />
+
+    <TextView
+        android:id="@+id/comment_timeline_profile"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Hallo Ik ben een comment!" />
+
+</LinearLayout>
\ No newline at end of file
-- 
2.49.1


From 1d3537cdde8caa2ec50a0de670c455c5fcdecd7b Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Tue, 27 Jun 2017 13:15:55 +0200
Subject: [PATCH 05/42] First attempt at ProfileAdapter. Not in working state.

---
 .../tagram/ProfileAdapter.java                | 78 +++++++++++++++++++
 .../tagram/ProfileFragment.java               | 18 +++++
 2 files changed, 96 insertions(+)
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
new file mode 100644
index 0000000..faa15ea
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
@@ -0,0 +1,78 @@
+package nl.myhyvesbookplus.tagram;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.firebase.ui.storage.images.FirebaseImageLoader;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+
+import java.util.ArrayList;
+
+import nl.myhyvesbookplus.tagram.model.UriPost;
+
+/**
+ * Created by niels on 27-6-17.
+ */
+
+public class ProfileAdapter extends BaseAdapter {
+
+    private static final String TAG = "ProfileAdapter";
+    private LayoutInflater mInflater;
+    private Context mContext;
+    private ArrayList<UriPost> mData;
+    protected TextView comment;
+    protected TextView nietSlechts;
+    protected ImageView photo;
+
+    ProfileAdapter(Context context, ArrayList<UriPost> data) {
+        mContext = context;
+        mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mData = data;
+    }
+
+    @Override
+    public int getCount() {
+        return mData.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mData.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View rowView = mInflater.inflate(R.layout.list_item_timeline_profile, parent, false);
+        View newRowView = findViews(rowView);
+        UriPost post = (UriPost) getItem(position);
+        comment.setText(post.getComment());
+        StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
+        Glide.with(mContext)
+                .using(new FirebaseImageLoader())
+                .load(ref)
+                .into(photo);
+
+        return newRowView;
+    }
+
+    protected View findViews(View rowView) {
+        comment = (TextView) rowView.findViewById(R.id.comment_timeline_profile);
+        nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count_profile);
+        photo = (ImageView) rowView.findViewById(R.id.timeline_image_profile);
+    }
+}
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index eb40f3d..056b8b2 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -15,6 +15,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
@@ -29,6 +30,7 @@ import com.google.firebase.storage.StorageReference;
 import java.io.File;
 import java.io.IOException;
 
+import nl.myhyvesbookplus.tagram.controller.DownloadClass;
 import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader;
 
 import static android.app.Activity.RESULT_OK;
@@ -44,6 +46,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     protected ImageView profilePicture;
     protected FirebaseUser user;
     protected File photoFile = null;
+    private ListView listView;
+    private DownloadClass downloadClass;
 
     ProgressDialog progressDialog;
 
@@ -55,6 +59,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         user = FirebaseAuth.getInstance().getCurrentUser();
+        loadPersonalPosts();
     }
 
     /**
@@ -65,6 +70,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         profilePicture = (ImageView) view.findViewById(R.id.imageView_profile_picture);
         profileName = (TextView) view.findViewById(R.id.profile_name);
         changePwdButton = (Button) view.findViewById(R.id.change_psw_button);
+        listView = (ListView) view.findViewById(R.id.listview);
         bindOnClick();
     }
 
@@ -99,6 +105,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
 
         profilePicture.invalidate();
+        downloadClass = new DownloadClass(getActivity());
+        downloadClass.getPostsFromServer();
 
         return view;
     }
@@ -143,6 +151,12 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
     }
 
+    public void startList() {
+        ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getmList());
+        listView.setAdapter(adapter);
+        listView.addHeaderView(adapter);
+    }
+
     /**
      * Grabs the image just taken by the built-in camera and pushes this image to the user account.
      * @param requestCode The code which corresponds to REQUEST_TAKE_PHOTO. Used as indicator.
@@ -158,6 +172,10 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
     }
 
+    public void loadPersonalPosts() {
+
+    }
+
 
     private File createImageFile() throws IOException {
         // Create an image file name
-- 
2.49.1


From b11cc9500024a034a003e77ea176daa199f0fafc Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Tue, 27 Jun 2017 13:19:25 +0200
Subject: [PATCH 06/42] put back 'niet slecht count profile'

---
 .../res/layout/list_item_timeline_profile.xml | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index 11dde06..2c765fc 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -4,15 +4,30 @@
     android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/timeline_image_profile"
+        android:id="@+id/timeline_image"
         android:layout_width="wrap_content"
         android:layout_gravity="center"
         android:layout_height="250dp" />
 
     <TextView
-        android:id="@+id/comment_timeline_profile"
+        android:id="@+id/comment_timeline"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Hallo Ik ben een comment!" />
 
-</LinearLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/niet_slecht" />
+
+        <TextView
+            android:id="@+id/niet_slecht_count_profile"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="10" />
+    </LinearLayout>
+</LinearLayout>
-- 
2.49.1


From 0c3ed94bb7f63f58b2ca4d253507c4a3551e4b2b Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Tue, 27 Jun 2017 13:21:30 +0200
Subject: [PATCH 07/42] put back profile naming

---
 .../app/src/main/res/layout/list_item_timeline_profile.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index 2c765fc..f8020e8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -4,13 +4,13 @@
     android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/timeline_image"
+        android:id="@+id/timeline_image_profile"
         android:layout_width="wrap_content"
         android:layout_gravity="center"
         android:layout_height="250dp" />
 
     <TextView
-        android:id="@+id/comment_timeline"
+        android:id="@+id/comment_timeline_profile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Hallo Ik ben een comment!" />
-- 
2.49.1


From d3395f3e9bcab767e2899d14a9120ca4796530fe Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Tue, 27 Jun 2017 15:06:20 +0200
Subject: [PATCH 08/42] Add negative filter + rotate half working

---
 .../tagram/CameraFragment.java                |   8 +-
 .../tagram/PicturePreview.java                | 149 ++++++++++++------
 2 files changed, 111 insertions(+), 46 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 01bfbe9..c45adc3 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -134,8 +134,10 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 //                        Bitmap bmp = rotate(BitmapFactory.decodeByteArray(data, 0, data.length, null), 90);
 //                        mPhoto = bmp;
                         mPhoto = BitmapFactory.decodeByteArray(data, 0, data.length, null);
+//                        mPhotoRaw = data;
 
                         PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+//                        PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                         mPicPreview.setId(R.id.pic_preview);
 
                         mCameraLayout.addView(mPicPreview);
@@ -171,7 +173,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
 
                 mPhoto.recycle();
-                mPhoto = null;
+//                mPhoto = null;
 
                 filterButtons.setVisibility(View.GONE);
                 switchButtons(view);
@@ -202,6 +204,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 PicturePreview.filterPrev();
 
                 PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+//                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
@@ -220,6 +223,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 PicturePreview.filterNext();
 
                 PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+//                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
@@ -284,7 +288,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
     public static Bitmap rotate(Bitmap bmp, int degree) {
         Matrix mtx = new Matrix();
-        mtx.setRotate(degree);
+        mtx.postRotate(degree);
 
         return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mtx, true);
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
index 736e1b6..a9364de 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
@@ -2,10 +2,12 @@ package nl.myhyvesbookplus.tagram;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.util.Log;
 import android.view.SurfaceHolder;
@@ -16,60 +18,115 @@ import android.view.SurfaceView;
  */
 
 public class PicturePreview extends SurfaceView implements SurfaceHolder.Callback {
+    private static final String TAG = "PicturePreveiew";
     private static final int FILTER_NONE = 0;
     private static final int FILTER_SEPIA = 1;
     private static final int FILTER_BW = 2;
+    private static final int FILTER_NEG = 3;
 
     private static int currentFilter = FILTER_NONE;
 
+    private BitmapFactory.Options options = new BitmapFactory.Options();
+    private int imageHeight;
+    private int imageWidth;
+
     Bitmap picture;
     Bitmap filterPicture;
+    byte[] data;
 
     public PicturePreview(Context context, Bitmap bmp) {
+//    public PicturePreview(Context context, byte[] data) {
         super(context);
-        picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
-//        picture = Bitmap.createBitmap(bmp);
         setWillNotDraw(false);
+
+//        this.data = data;
+//        options.inJustDecodeBounds = true;
+        picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 4, bmp.getHeight() / 4, false);
+//        picture = BitmapFactory.decodeByteArray(data, 0, data.length, options);
+//        imageHeight = options.outHeight;
+//        imageWidth = options.outWidth;
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
+//        options.inSampleSize = 4; //calculateInSampleSize(options, canvas.getWidth(), canvas.getHeight());
+//        options.inJustDecodeBounds = false;
+//        picture = BitmapFactory.decodeByteArray(data, 0, data.length, options);
+//        picture = Bitmap.createBitmap(bmp);
+//        bmp.recycle();
+
         ColorMatrix cm = new ColorMatrix();
         Paint paint = new Paint();
         ColorMatrixColorFilter filter;
+        Canvas saveCanvas = new Canvas();
 
         switch (currentFilter) {
             case FILTER_NONE:
-                canvas.drawBitmap(picture, 0, 0, null);
-                canvas.rotate(90);
-                filterPicture = picture;
+//                canvas.rotate(90);
+                canvas.drawBitmap(rotate(picture, 90), 0, 0, null);
+                filterPicture = rotate(picture, 90);
                 break;
             case FILTER_SEPIA:
-                canvas.drawBitmap(toSepia(picture), 0, 0, null);
-                canvas.rotate(90);
-                filterPicture = toSepia(picture);
-                break;
-            case FILTER_BW:
-                Canvas bw = new Canvas();
-//                filterPicture = Bitmap.createBitmap(1920, 1440, null);
-                filterPicture = Bitmap.createBitmap(picture.getWidth() / 2, picture.getHeight() / 2, Bitmap.Config.ARGB_8888);
-                cm.setSaturation(0);
+//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
+                filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
+                Log.d(TAG, "onDraw: " + Integer.toString(canvas.getWidth()));
+
+                float[] sepia = {0.393f,0.769f,0.189f,0f,0f,
+                                 0.349f,0.686f,0.168f,0f,0f,
+                                 0.272f,0.534f,0.131f,0f,0f,
+                                 0f, 0f, 0f, 1f, 0f};
+                cm.set(sepia);
+
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
-                bw.setBitmap(filterPicture);
-                bw.drawBitmap(picture, 0, 0, paint);
-                bw.rotate(90);
-                canvas.drawBitmap(picture, 0, 0, paint);
-                canvas.rotate(90);
+                saveCanvas.setBitmap(filterPicture);
+//                saveCanvas.rotate(90);
+//                canvas.rotate(90);
+                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 break;
+            case FILTER_BW:
+//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
+                filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
+
+//                filterPicture = Bitmap.createBitmap(1920, 1440, null);
+                cm.setSaturation(0);
+
+                filter = new ColorMatrixColorFilter(cm);
+                paint.setColorFilter(filter);
+                saveCanvas.setBitmap(filterPicture);
+//                saveCanvas.rotate(90);
+//                canvas.rotate(90);
+                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                break;
+            case FILTER_NEG:
+//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
+                filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
+
+                float[] neg = {-1f,0f,0f,0f,255f,
+                                0f,-1f,0f,0f,255f,
+                                0f,0f,-1f,0f,255f,
+                                0f,0f,0f,1f,0f};
+                cm.set(neg);
+
+                filter = new ColorMatrixColorFilter(cm);
+                paint.setColorFilter(filter);
+                saveCanvas.setBitmap(filterPicture);
+//                saveCanvas.rotate(90);
+//                canvas.rotate(90);
+                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                break;
+
         }
     }
 
     public static void filterPrev() {
         switch (currentFilter) {
             case FILTER_NONE:
-                currentFilter = FILTER_BW;
+                currentFilter = FILTER_NEG;
                 break;
             case FILTER_SEPIA:
                 currentFilter = FILTER_NONE;
@@ -77,6 +134,9 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
             case FILTER_BW:
                 currentFilter = FILTER_SEPIA;
                 break;
+            case FILTER_NEG:
+                currentFilter = FILTER_BW;
+                break;
         }
     }
 
@@ -89,41 +149,42 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
                 currentFilter = FILTER_BW;
                 break;
             case FILTER_BW:
+                currentFilter = FILTER_NEG;
+                break;
+            case FILTER_NEG:
                 currentFilter = FILTER_NONE;
                 break;
         }
     }
 
-    public Bitmap toSepia(Bitmap color) {
-        int red, green, blue, pixel;
-        int height = color.getHeight();
-        int width = color.getWidth();
-        int depth = 20;
+    public static Bitmap rotate(Bitmap bmp, int degree) {
+        Matrix mtx = new Matrix();
+        mtx.postRotate(degree);
 
-        Bitmap sepia = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mtx, true);
+    }
 
-        int[] pixels = new int[width * height];
-        color.getPixels(pixels, 0, width, 0, 0, width, height);
-        for (int i = 0; i < pixels.length; i++) {
-            pixel = pixels[i];
+    public static int calculateInSampleSize(
+            BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
 
-            red = (pixel >> 16) & 0xFF;
-            green = (pixel >> 8) & 0xFF;
-            blue = pixel & 0xFF;
+        if (height > reqHeight || width > reqWidth) {
 
-            red = green = blue = (red + green + blue) / 3;
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
 
-            red += (depth * 2);
-            green += depth;
-
-            if (red > 255)
-                red = 255;
-            if (green > 255)
-                green = 255;
-            pixels[i] = (0xFF << 24) | (red << 16) | (green << 8) | blue;
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight
+                    && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
         }
-        sepia.setPixels(pixels, 0, width, 0, 0, width, height);
-        return sepia;
+
+        return inSampleSize;
     }
 
     public Bitmap getPicture() {
-- 
2.49.1


From 16c3b727fc2c6f9a30e380d382b7eaa3cea1b784 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Tue, 27 Jun 2017 16:12:42 +0200
Subject: [PATCH 09/42] Working profile page with Adapter. Need Marijn to fix
 the downloadclass to show user-only content instead of entire timeline.

---
 .../myhyvesbookplus/tagram/MainActivity.java  |  5 +-
 .../tagram/ProfileAdapter.java                |  7 +-
 .../tagram/ProfileFragment.java               | 24 ++++--
 .../tagram/controller/DownloadClass.java      |  4 +-
 .../src/main/res/layout/fragment_profile.xml  | 81 -------------------
 .../res/layout/fragment_profile_header.xml    |  7 ++
 6 files changed, 36 insertions(+), 92 deletions(-)
 delete mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
index aa8ec14..8772d76 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
@@ -122,8 +122,11 @@ public class MainActivity extends AppCompatActivity implements
     public void PostDownloaded() {
         FragmentManager fragmentManager = getFragmentManager();
         Fragment frag = fragmentManager.findFragmentById(R.id.content);
+        Log.d(TAG, "PostDownloaded: " + R.id.content);
 
-        if (frag instanceof TimelineFragment) {
+        if (frag instanceof ProfileFragment) {
+            ((ProfileFragment) frag).startList();
+        } else if (frag instanceof  TimelineFragment) {
             ((TimelineFragment) frag).startList();
         }
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
index faa15ea..357876a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
@@ -30,9 +30,9 @@ public class ProfileAdapter extends BaseAdapter {
     private LayoutInflater mInflater;
     private Context mContext;
     private ArrayList<UriPost> mData;
-    protected TextView comment;
-    protected TextView nietSlechts;
-    protected ImageView photo;
+    private TextView comment;
+    private TextView nietSlechts;
+    private ImageView photo;
 
     ProfileAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
@@ -74,5 +74,6 @@ public class ProfileAdapter extends BaseAdapter {
         comment = (TextView) rowView.findViewById(R.id.comment_timeline_profile);
         nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count_profile);
         photo = (ImageView) rowView.findViewById(R.id.timeline_image_profile);
+        return rowView;
     }
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 056b8b2..73c0388 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -9,6 +9,7 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -70,7 +71,6 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         profilePicture = (ImageView) view.findViewById(R.id.imageView_profile_picture);
         profileName = (TextView) view.findViewById(R.id.profile_name);
         changePwdButton = (Button) view.findViewById(R.id.change_psw_button);
-        listView = (ListView) view.findViewById(R.id.listview);
         bindOnClick();
     }
 
@@ -87,8 +87,14 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_profile, container, false);
-        findViews(view);
+        View viewTimeline = inflater.inflate(R.layout.fragment_profile_timeline, container, false);
+
+
+
+        listView = (ListView) viewTimeline.findViewById(R.id.listview_profile);
+        View viewHeader = inflater.inflate(R.layout.fragment_profile_header, listView, false);
+        findViews(viewHeader);
+        listView.addHeaderView(viewHeader);
 
         if (user != null) {
             if(user.getPhotoUrl() != null) {
@@ -105,10 +111,11 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
 
         profilePicture.invalidate();
+
         downloadClass = new DownloadClass(getActivity());
         downloadClass.getPostsFromServer();
 
-        return view;
+        return viewTimeline;
     }
 
     /**
@@ -153,8 +160,13 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
 
     public void startList() {
         ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getmList());
-        listView.setAdapter(adapter);
-        listView.addHeaderView(adapter);
+        if (listView != null) {
+            listView.setAdapter(adapter);
+        } else {
+            Log.d("Jemoeder", "startList: Halloooooooo");
+        }
+            
+//        listView.addHeaderView(adapter);
     }
 
     /**
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index a32a97c..d589360 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -40,8 +40,10 @@ public class DownloadClass {
         mDataRef.child("posts").addListenerForSingleValueEvent(new ValueEventListener() {
             @Override
             public void onDataChange(DataSnapshot dataSnapshot) {
+
                 for (DataSnapshot data : dataSnapshot.getChildren()) {
-                    mList.add(data.getValue(UriPost.class));
+
+                        mList.add(data.getValue(UriPost.class));
                 }
                 Collections.reverse(mList);
                 mListener.PostDownloaded();
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
deleted file mode 100644
index 8e04ad4..0000000
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="nl.myhyvesbookplus.tagram.ProfileFragment">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="5dp" />
-
-            <TextView
-                android:id="@+id/profile_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Name:"
-                android:textSize="25sp"
-                android:textStyle="bold" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp" />
-
-            <ImageButton
-                android:id="@+id/profile_pic_button"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginStart="110dp"
-                android:background="@android:color/transparent"
-                android:elevation="1dp"
-                app:srcCompat="@android:drawable/ic_menu_camera" />
-
-            <ImageView
-                android:id="@+id/imageView_profile_picture"
-                android:contentDescription="@string/profile_picture_description"
-                android:layout_width="match_parent"
-                android:layout_height="300dp"
-                app:srcCompat="@drawable/avatar_standard"
-                android:layout_marginTop="-70dp"/>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="25dp" />
-
-            <Button
-                android:id="@+id/change_psw_button"
-                android:layout_width="300dp"
-                android:layout_height="50dp"
-                android:background="?attr/colorPrimary"
-                android:text="@string/change_psw_button"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="20dp" />
-
-            <Button
-                android:id="@+id/logout_button"
-                android:layout_width="300dp"
-                android:layout_height="50dp"
-                android:background="?attr/colorPrimary"
-                android:onClick="logOutOnClick"
-                android:text="@string/logout_button"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-    </ScrollView>
-</FrameLayout>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
index f1f70a9..562849d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_header.xml
@@ -65,5 +65,12 @@
         android:text="@string/logout_button"
         android:textColor="@android:color/white"
         android:textSize="16sp" />
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+
 
 </LinearLayout>
\ No newline at end of file
-- 
2.49.1


From 2db1254750747376fb87775b85e40cd1b5a05910 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Wed, 28 Jun 2017 10:25:54 +0200
Subject: [PATCH 10/42] Image preview working

---
 .../tagram/CameraFragment.java                | 24 +-------
 .../myhyvesbookplus/tagram/CameraPreview.java |  8 +--
 .../tagram/PicturePreview.java                | 59 ++-----------------
 3 files changed, 9 insertions(+), 82 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index c45adc3..900666d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
 import android.net.Uri;
@@ -46,7 +45,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
     private Camera mCamera;
     private CameraPreview mPreview;
-    private byte[] mPhotoRaw;
     private Bitmap mPhoto;
     private int facing = Camera.CameraInfo.CAMERA_FACING_BACK;
 
@@ -99,7 +97,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         final RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons);
         final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
         final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
-//        final RelativeLayout mImageTaken = (RelativeLayout) view.findViewById(R.id.picture_view);
 
         mCameraLayout.addView(mPreview);
 
@@ -131,13 +128,9 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mCamera.takePicture(null, null, new PictureCallback() {
                     @Override
                     public void onPictureTaken(byte[] data, Camera camera) {
-//                        Bitmap bmp = rotate(BitmapFactory.decodeByteArray(data, 0, data.length, null), 90);
-//                        mPhoto = bmp;
                         mPhoto = BitmapFactory.decodeByteArray(data, 0, data.length, null);
-//                        mPhotoRaw = data;
 
                         PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
-//                        PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                         mPicPreview.setId(R.id.pic_preview);
 
                         mCameraLayout.addView(mPicPreview);
@@ -145,7 +138,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                         filterButtons.setVisibility(View.VISIBLE);
                         filterButtons.bringToFront();
 
-//                        mPicPreview.invalidate();
                         switchButtons(view);
                     }
                 });
@@ -158,6 +150,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.comment_box).setClickable(true);
                 view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE);
                 view.findViewById(R.id.comment_box).bringToFront();
+                ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide();
             }
         });
 
@@ -173,7 +166,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
 
                 mPhoto.recycle();
-//                mPhoto = null;
 
                 filterButtons.setVisibility(View.GONE);
                 switchButtons(view);
@@ -204,7 +196,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 PicturePreview.filterPrev();
 
                 PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
-//                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
@@ -223,7 +214,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 PicturePreview.filterNext();
 
                 PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
-//                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhotoRaw);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
@@ -279,20 +269,13 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     public void onDestroyView() {
         super.onDestroyView();
 
-        int padding = 16;  // 6 dps
+        int padding = 16;
         float scale = getResources().getDisplayMetrics().density;
         int dp = (int) (padding * scale + 0.5f);
         ((AppCompatActivity)getActivity()).getSupportActionBar().show();
         getActivity().findViewById(R.id.content).setPadding(dp,dp,dp,dp);
     }
 
-    public static Bitmap rotate(Bitmap bmp, int degree) {
-        Matrix mtx = new Matrix();
-        mtx.postRotate(degree);
-
-        return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mtx, true);
-    }
-
     public static Camera getCameraInstance(int facing) {
         Camera c = null;
         try {
@@ -313,18 +296,15 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     public void switchButtons(View view) {
         RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons);
         FloatingActionButton upload = (FloatingActionButton) view.findViewById(R.id.upload_button);
-//        FloatingActionButton save = (FloatingActionButton) view.findViewById(R.id.save_button);
 
         if (((Integer)upload.getVisibility()).equals(View.VISIBLE)) {
             upload.hide();
-//            save.hide();
 
             view.findViewById(R.id.picture_button).setVisibility(View.VISIBLE);
             view.findViewById(R.id.switch_camera_button).setVisibility(View.VISIBLE);
         } else {
             pictureButtons.bringToFront();
             upload.show();
-//            save.show();
 
             view.findViewById(R.id.picture_button).setVisibility(View.GONE);
             view.findViewById(R.id.switch_camera_button).setVisibility(View.GONE);
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraPreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraPreview.java
index 0f07ad2..3e99389 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraPreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraPreview.java
@@ -34,21 +34,14 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
         if (mHolder.getSurface() == null){
-            // preview surface does not exist
             return;
         }
 
-        // stop preview before making changes
         try {
             mCamera.stopPreview();
         } catch (Exception e){
-            // ignore: tried to stop a non-existent preview
         }
 
-        // set preview size and make any resize, rotate or
-        // reformatting changes here
-
-        // start preview with new settings
         try {
             mCamera.setPreviewDisplay(mHolder);
             mCamera.startPreview();
@@ -60,6 +53,7 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.d(TAG, "surfaceDestroyed: CAMERA DESTROYED");
         mCamera.stopPreview();
         mCamera.release();
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
index a9364de..47a2a46 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
@@ -26,36 +26,20 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
     private static int currentFilter = FILTER_NONE;
 
-    private BitmapFactory.Options options = new BitmapFactory.Options();
-    private int imageHeight;
-    private int imageWidth;
-
     Bitmap picture;
     Bitmap filterPicture;
-    byte[] data;
 
     public PicturePreview(Context context, Bitmap bmp) {
-//    public PicturePreview(Context context, byte[] data) {
         super(context);
         setWillNotDraw(false);
 
-//        this.data = data;
-//        options.inJustDecodeBounds = true;
-        picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 4, bmp.getHeight() / 4, false);
-//        picture = BitmapFactory.decodeByteArray(data, 0, data.length, options);
-//        imageHeight = options.outHeight;
-//        imageWidth = options.outWidth;
+        picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
+        Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight());
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-//        options.inSampleSize = 4; //calculateInSampleSize(options, canvas.getWidth(), canvas.getHeight());
-//        options.inJustDecodeBounds = false;
-//        picture = BitmapFactory.decodeByteArray(data, 0, data.length, options);
-//        picture = Bitmap.createBitmap(bmp);
-//        bmp.recycle();
-
         ColorMatrix cm = new ColorMatrix();
         Paint paint = new Paint();
         ColorMatrixColorFilter filter;
@@ -63,12 +47,10 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
         switch (currentFilter) {
             case FILTER_NONE:
-//                canvas.rotate(90);
                 canvas.drawBitmap(rotate(picture, 90), 0, 0, null);
                 filterPicture = rotate(picture, 90);
                 break;
             case FILTER_SEPIA:
-//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
                 Log.d(TAG, "onDraw: " + Integer.toString(canvas.getWidth()));
 
@@ -80,29 +62,21 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
-                saveCanvas.setBitmap(filterPicture);
-//                saveCanvas.rotate(90);
-//                canvas.rotate(90);
                 saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 break;
             case FILTER_BW:
-//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
 
-//                filterPicture = Bitmap.createBitmap(1920, 1440, null);
                 cm.setSaturation(0);
 
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
                 saveCanvas.setBitmap(filterPicture);
-//                saveCanvas.rotate(90);
-//                canvas.rotate(90);
                 saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 break;
             case FILTER_NEG:
-//                filterPicture = Bitmap.createBitmap(picture.getWidth() / 4, picture.getHeight() / 4, Bitmap.Config.ARGB_8888);
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
 
                 float[] neg = {-1f,0f,0f,0f,255f,
@@ -114,8 +88,6 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
                 saveCanvas.setBitmap(filterPicture);
-//                saveCanvas.rotate(90);
-//                canvas.rotate(90);
                 saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
                 break;
@@ -164,30 +136,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
         return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mtx, true);
     }
 
-    public static int calculateInSampleSize(
-            BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-
-            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-            // height and width larger than the requested height and width.
-            while ((halfHeight / inSampleSize) >= reqHeight
-                    && (halfWidth / inSampleSize) >= reqWidth) {
-                inSampleSize *= 2;
-            }
-        }
-
-        return inSampleSize;
-    }
-
     public Bitmap getPicture() {
+        picture.recycle();
         return filterPicture;
     }
 
@@ -201,5 +151,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.d(TAG, "surfaceDestroyed: PICTURE DESTROYED");
+        picture.recycle();
+        filterPicture.recycle();
     }
 }
-- 
2.49.1


From 3aab4631433c15d9a0e558cc19d836cc176ee60f Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Wed, 28 Jun 2017 11:13:39 +0200
Subject: [PATCH 11/42] Added error message-shows and
 mail_successful/mail_failed to the error messages.

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

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 73c0388..16378c1 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -146,7 +146,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
             try {
                 photoFile = createImageFile();
             } catch (IOException ex) {
-                Toast.makeText(getActivity(), getString(R.string.image_save_error), Toast.LENGTH_LONG);
+                Toast.makeText(getActivity(), getString(R.string.image_save_error), Toast.LENGTH_LONG).show();
             }
             if (photoFile != null) {
                 Uri photoURI = FileProvider.getUriForFile(getActivity(),
@@ -213,8 +213,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
                         @Override
                         public void onComplete(@NonNull Task<Void> task) {
                             Toast.makeText(getActivity(), task.isSuccessful()
-                                            ? "An e-mail was sent, please follow its instructions."
-                                            : "An error occurred, please check internet connection.",
+                                            ? getString(R.string.mail_successful)
+                                            : getString(R.string.mail_failed),
                                     Toast.LENGTH_SHORT).show();
                         }
                     });
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 57fc504..ff4209c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -31,4 +31,5 @@
     <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="mail_success">An e-mail was sent, please follow its instructions.</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 7f065d9..39d347b 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -29,5 +29,5 @@
     <string name="mail_failed">An error occurred. Please check internet connection.</string>
     <string name="image_save_error">Saving image to storage failed. Please make sure there is space available on the device.</string>
     <string name="update_profile_pic_error">Updating the profile picture failed. Please check network connection.</string>
-    <string name="upload_profile_pic">Uploading profile picture...</string>
+    <string name="upload_profile_pic">Uploading profile picture…</string>
 </resources>
-- 
2.49.1


From f0719c51f961156fa45ec10b61f86f26262473c6 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Wed, 28 Jun 2017 12:01:05 +0200
Subject: [PATCH 12/42] Add cancel button, fix button switching, change icons
 to vector

---
 .../tagram/CameraFragment.java                |  58 ++++++++----
 .../res/drawable/ic_arrow_back_black_24dp.png | Bin 199 -> 0 bytes
 .../res/drawable/ic_arrow_back_black_24dp.xml |  11 +++
 .../drawable/ic_arrow_forward_black_24dp.png  | Bin 222 -> 0 bytes
 .../drawable/ic_arrow_forward_black_24dp.xml  |  11 +++
 .../res/drawable/ic_camera_black_24dp.xml     |  11 +++
 .../drawable/ic_switch_camera_black_24dp.xml  |  11 +++
 .../src/main/res/layout/fragment_camera.xml   |  84 +++++++++---------
 .../app/src/main/res/values-nl/strings.xml    |   1 +
 .../app/src/main/res/values/strings.xml       |   1 +
 10 files changed, 130 insertions(+), 58 deletions(-)
 delete mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
 delete mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 900666d..ca0bb4a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
+import android.media.Image;
 import android.net.Uri;
 import android.os.Bundle;
 import android.app.Fragment;
@@ -17,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 
 import nl.myhyvesbookplus.tagram.controller.PostUploader;
@@ -89,12 +91,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         final View view = inflater.inflate(R.layout.fragment_camera, container, false);
 
         mCamera = getCameraInstance(facing);
-        Camera.Parameters params = mCamera.getParameters();
-        params.setRotation(0);
-        mCamera.setParameters(params);
 
         mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
-        final RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons);
         final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
         final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
 
@@ -103,7 +101,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         // Draw buttons over preview
         view.findViewById(R.id.picture_button).bringToFront();
         view.findViewById(R.id.switch_camera_button).bringToFront();
-        pictureButtons.bringToFront();
         filterButtons.bringToFront();
 
         (view.findViewById(R.id.switch_camera_button)).setOnClickListener(new View.OnClickListener() {
@@ -150,6 +147,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.comment_box).setClickable(true);
                 view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE);
                 view.findViewById(R.id.comment_box).bringToFront();
+                view.findViewById(R.id.filter_buttons).setVisibility(View.GONE);
                 ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide();
             }
         });
@@ -173,9 +171,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mCameraLayout.removeView(mPreview);
 
                 mCamera = getCameraInstance(facing);
-                Camera.Parameters params = mCamera.getParameters();
-                params.setRotation(90);
-                mCamera.setParameters(params);
 
                 mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
                 mCameraLayout.addView(mPreview);
@@ -184,7 +179,30 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.switch_camera_button).bringToFront();
 
                 mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
+            }
+        });
 
+        (view.findViewById(R.id.comment_cancel)).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((EditText) view.findViewById(R.id.comment_text)).setText("");
+
+                mPhoto.recycle();
+
+                filterButtons.setVisibility(View.GONE);
+                switchButtons(view);
+
+                mCameraLayout.removeView(mPreview);
+
+                mCamera = getCameraInstance(facing);
+
+                mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
+                mCameraLayout.addView(mPreview);
+
+                view.findViewById(R.id.picture_button).bringToFront();
+                view.findViewById(R.id.switch_camera_button).bringToFront();
+
+                mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
             }
         });
 
@@ -200,7 +218,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
                 mCameraLayout.addView(mPicPreview);
 
-                view.findViewById(R.id.picture_taken_buttons).bringToFront();
+                view.findViewById(R.id.upload_button).bringToFront();
                 filterButtons.setVisibility(View.VISIBLE);
                 filterButtons.bringToFront();
             }
@@ -218,7 +236,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
                 mCameraLayout.addView(mPicPreview);
 
-                view.findViewById(R.id.picture_taken_buttons).bringToFront();
+                view.findViewById(R.id.upload_button).bringToFront();
                 filterButtons.setVisibility(View.VISIBLE);
                 filterButtons.bringToFront();
             }
@@ -294,20 +312,26 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     }
 
     public void switchButtons(View view) {
-        RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons);
         FloatingActionButton upload = (FloatingActionButton) view.findViewById(R.id.upload_button);
+        ImageButton picButton = (ImageButton) view.findViewById(R.id.picture_button);
+        ImageButton switchButton = (ImageButton) view.findViewById(R.id.switch_camera_button);
 
-        if (((Integer)upload.getVisibility()).equals(View.VISIBLE)) {
+        if (((Integer)picButton.getVisibility()).equals(View.GONE)) {
+            Log.d(TAG, "switchButtons: GONE");
             upload.hide();
 
-            view.findViewById(R.id.picture_button).setVisibility(View.VISIBLE);
-            view.findViewById(R.id.switch_camera_button).setVisibility(View.VISIBLE);
+            picButton.setVisibility(View.VISIBLE);
+            switchButton.setVisibility(View.VISIBLE);
+
+            picButton.bringToFront();
+            switchButton.bringToFront();
         } else {
-            pictureButtons.bringToFront();
+            Log.d(TAG, "switchButtons: VISIBLE");
+            upload.bringToFront();
             upload.show();
 
-            view.findViewById(R.id.picture_button).setVisibility(View.GONE);
-            view.findViewById(R.id.switch_camera_button).setVisibility(View.GONE);
+            picButton.setVisibility(View.GONE);
+            switchButton.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png
deleted file mode 100644
index 7726760865bee01ff1f2b06fb58cbab901d0b6e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg`aE46Ln;{G-f|aZHWWCPz|7%k
zY`FdD)1ukGm;I}p-`23jG*#*zNJB%RT2%d9$(z46axRVM-1uv%z>4_Go4>CAw!nYB
zUG1+gFE1~LGVJ;P`upzs=XE{)<u9gr{sqGA>J<|`Cnz{Jv2Y5hc)%DX+0(`1=f~S_
j`;+@u4rsxF`x_XKKUCeUxL{cZkjvod>gTe~DWM4fCOJ*w

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
new file mode 100644
index 0000000..ccd28b4
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#AAAAAA" android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:fillAlpha="0.5"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png
deleted file mode 100644
index 8b5a68183db0af5ae96767121f57a6a5f4290587..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgmU_B4hEy=Vz2(SvFhHdB;daKH
zNwqO=cz5sOQOQqHa4mlH`yJc4`6h3dFf%Yb@P1Wzuy3*ZbG12c_Un_L1L@~Kj<g(>
znKyHTq&TOLipK;6$0imSqouWK>FO^H{i-EZPRrFeK5$IE{(?Wpc>mF7v-AI5{qucB
z{=T2j?*A(SlJC!$->>-`zQKR4edwz{D}$c<PqnIFHU0D7I(`O*0(Q}_YAeMz6_^4Y
O%;4$j=d#Wzp$Py}lV7y}

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
new file mode 100644
index 0000000..71b0a99
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#AAAAAA" android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:fillAlpha="0.5"
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml
new file mode 100644
index 0000000..8dd7426
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#AAAAAA" android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:fillAlpha="0.5"
+        android:pathData="M9.4,10.5l4.77,-8.26C13.47,2.09 12.75,2 12,2c-2.4,0 -4.6,0.85 -6.32,2.25l3.66,6.35 0.06,-0.1zM21.54,9c-0.92,-2.92 -3.15,-5.26 -6,-6.34L11.88,9h9.66zM21.8,10h-7.49l0.29,0.5 4.76,8.25C21,16.97 22,14.61 22,12c0,-0.69 -0.07,-1.35 -0.2,-2zM8.54,12l-3.9,-6.75C3.01,7.03 2,9.39 2,12c0,0.69 0.07,1.35 0.2,2h7.49l-1.15,-2zM2.46,15c0.92,2.92 3.15,5.26 6,6.34L12.12,15L2.46,15zM13.73,15l-3.9,6.76c0.7,0.15 1.42,0.24 2.17,0.24 2.4,0 4.6,-0.85 6.32,-2.25l-3.66,-6.35 -0.93,1.6z"/>
+</vector>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml
new file mode 100644
index 0000000..3b6736d
--- /dev/null
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#AAAAAA" android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:fillAlpha="0.5"
+        android:pathData="M20,4h-3.17L15,2L9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,15.5L15,13L9,13v2.5L5.5,12 9,8.5L9,11h6L15,8.5l3.5,3.5 -3.5,3.5z"/>
+</vector>
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 04637b3..9815205 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
@@ -18,20 +18,23 @@
             android:layout_centerHorizontal="true"
             android:background="@android:color/transparent"
             android:layout_margin="10dp"
-            android:padding="10dp"
+            android:padding="15dp"
             android:scaleType="center"
-            android:scaleX="2"
-            android:scaleY="2"
-            app:srcCompat="@android:drawable/ic_menu_camera" />
+            android:scaleX="2.5"
+            android:scaleY="2.5"
+            android:src="@drawable/ic_camera_black_24dp"/>
 
         <ImageButton
             android:id="@+id/switch_camera_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:padding="10dp"
             android:layout_margin="9dp"
+            android:scaleX="1.5"
+            android:scaleY="1.5"
             android:background="@android:color/transparent"
-            app:srcCompat="@android:drawable/ic_menu_revert" />
+            android:src="@drawable/ic_switch_camera_black_24dp"/>
 
         <ProgressBar
             android:id="@+id/load_bar"
@@ -54,8 +57,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
-                android:scaleX="0.5"
-                android:scaleY="0.5"
+                android:scaleX="2"
+                android:scaleY="2"
+                android:padding="10dp"
+                android:layout_margin="10dp"
                 android:layout_alignParentLeft="true"
                 android:src="@drawable/ic_arrow_back_black_24dp"/>
 
@@ -64,8 +69,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
-                android:scaleX="0.5"
-                android:scaleY="0.5"
+                android:scaleX="2"
+                android:scaleY="2"
+                android:padding="10dp"
+                android:layout_margin="10dp"
                 android:layout_alignParentRight="true"
                 android:src="@drawable/ic_arrow_forward_black_24dp"/>
         </RelativeLayout>
@@ -94,45 +101,40 @@
                 android:layout_margin="4dp"
                 android:padding="5dp"
                 android:background="@android:color/darker_gray"/>
-            <Button
-                android:id="@+id/comment_submit"
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/upload"/>
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/comment_submit"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/upload"/>
+
+                <Button
+                    android:id="@+id/comment_cancel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/cancel"/>
+            </LinearLayout>
 
         </LinearLayout>
 
-        <RelativeLayout
-            android:id="@+id/picture_taken_buttons"
-            android:layout_width="match_parent"
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/upload_button"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="30dp"
-            android:layout_marginBottom="20dp">
-
-            <android.support.design.widget.FloatingActionButton
-                android:id="@+id/upload_button"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:scaleType="center"
-                app:fabSize="normal"
-                android:src="@android:drawable/ic_menu_upload"/>
-
-            <!--<android.support.design.widget.FloatingActionButton
-                android:id="@+id/save_button"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:scaleType="center"
-                app:fabSize="normal"
-                android:src="@android:drawable/ic_menu_save"/>-->
-        </RelativeLayout>
+            android:layout_centerHorizontal="true"
+            android:scaleType="center"
+            android:layout_margin="15dp"
+            app:fabSize="normal"
+            android:src="@android:drawable/ic_menu_upload"/>
 
     </RelativeLayout>
 
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 924bdf7..31aafb6 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -32,4 +32,5 @@
     <string name="upload_profile_pic">Profielfoto aan het uploaden…</string>
     <string name="niet_slecht">"\"Niet slecht.\"s "</string>
     <string name="comment">Bijschrift:</string>
+    <string name="cancel">Annuleer</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 4b5468c..0fe6426 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -31,4 +31,5 @@
     <string name="update_profile_pic_error">Updating the profile picture failed. Please check network connection.</string>
     <string name="upload_profile_pic">Uploading profile picture...</string>
     <string name="comment">Comment:</string>
+    <string name="cancel">Cancel</string>
 </resources>
-- 
2.49.1


From bfd018ad4af4d5e26cac86e26f747caef7ed71e3 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Wed, 28 Jun 2017 12:46:57 +0200
Subject: [PATCH 13/42] Option to get own posts.

---
 .../tagram/controller/DownloadClass.java           | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index a32a97c..49697b4 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -3,6 +3,7 @@ package nl.myhyvesbookplus.tagram.controller;
 import android.content.Context;
 import android.util.Log;
 
+import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
@@ -36,7 +37,6 @@ public class DownloadClass {
     }
 
     public void getPostsFromServer() {
-        Log.d(TAG, "getPostsFromServer: Begin of function");
         mDataRef.child("posts").addListenerForSingleValueEvent(new ValueEventListener() {
             @Override
             public void onDataChange(DataSnapshot dataSnapshot) {
@@ -58,6 +58,18 @@ public class DownloadClass {
         return mList;
     }
 
+    public ArrayList<UriPost> getOwnPosts() {
+        String currentUid = FirebaseAuth.getInstance().getCurrentUser().getUid();
+        ArrayList<UriPost> posts = new ArrayList<UriPost>();
+
+        for (UriPost post : mList) {
+            if (post.getPoster().equals(currentUid)) {
+                posts.add(post);
+            }
+        }
+        return posts;
+    }
+
     public interface PostDownloadListener {
         void PostDownloaded();
     }
-- 
2.49.1


From 017b5890c2473ee19f92a5ef1cf78acffce555c5 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Wed, 28 Jun 2017 13:11:30 +0200
Subject: [PATCH 14/42] Neated up the code.

---
 .../app/src/main/AndroidManifest.xml          |  5 ++--
 .../tagram/ProfileFragment.java               | 30 ++++++-------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
index 63bdf6e..2284c0c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
@@ -3,9 +3,8 @@
     package="nl.myhyvesbookplus.tagram">
 
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18"/>
-
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 16378c1..4f33ef2 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -60,8 +60,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         user = FirebaseAuth.getInstance().getCurrentUser();
-        loadPersonalPosts();
-    }
+     }
 
     /**
      * Assigns all views and buttons.
@@ -160,14 +159,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
 
     public void startList() {
         ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getmList());
-        if (listView != null) {
             listView.setAdapter(adapter);
-        } else {
-            Log.d("Jemoeder", "startList: Halloooooooo");
-        }
-            
-//        listView.addHeaderView(adapter);
-    }
+     }
 
     /**
      * Grabs the image just taken by the built-in camera and pushes this image to the user account.
@@ -180,25 +173,20 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         if (requestCode == REQUEST_TAKE_PHOTO && resultCode == RESULT_OK) {
             progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.upload_profile_pic), false, false);
             ProfilePictureUploader profilePictureUploader = new ProfilePictureUploader(getActivity());
-            profilePictureUploader.uploadProfilePicture(photoFile.getAbsoluteFile());
+            profilePictureUploader.uploadProfilePicture(photoFile);
         }
     }
 
-    public void loadPersonalPosts() {
-
-    }
-
-
     private File createImageFile() throws IOException {
         // Create an image file name
         String imageFileName = "JPEG_" + user.getUid();
         File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
-        return File.createTempFile(
-                imageFileName,  /* prefix */
-                ".jpg",         /* suffix */
-                storageDir      /* directory */
-        );
-    }
+            return File.createTempFile(
+                    imageFileName,  /* prefix */
+                    ".jpg",         /* suffix */
+                    storageDir      /* directory */
+            );
+        }
 
 
 
-- 
2.49.1


From cab6728a549de115e205c53dfbb8b7df28fd0425 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Wed, 28 Jun 2017 13:12:48 +0200
Subject: [PATCH 15/42] Improve timeline layout

---
 .../tagram/TimeLineAdapter.java               |  7 +++-
 .../main/res/layout/list_item_timeline.xml    | 35 ++++++++++++++++---
 .../app/src/main/res/values-nl/strings.xml    |  2 +-
 .../app/src/main/res/values/strings.xml       |  2 +-
 4 files changed, 38 insertions(+), 8 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 7d4dda5..ff4b341 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
@@ -7,12 +7,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
 
@@ -55,10 +58,11 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     public View getView(int position, View convertView, ViewGroup parent) {
         View rowView = mInflater.inflate(R.layout.list_item_timeline, parent, false);
 
+//        TextView userName = (TextView) rowView.findViewById(R.id.username_timeline);
         TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline);
         TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
         ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
-        ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button);
+        Button nietSlechtButton = (Button) rowView.findViewById(R.id.niet_slecht_button);
 
         nietSlechtButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -69,6 +73,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
 
         UriPost post = (UriPost) getItem(position);
 
+//        userName.setText();
         nietSlechts.setText(Integer.toString(post.getNietSlechts()));
         comment.setText(post.getComment());
 
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 0d2006f..d5e5f63 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
@@ -5,6 +5,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dp" />
+
+    <!--
+    <TextView
+        android:id="@+id/username_timeline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"/>
+    -->
+
     <ImageView
         android:id="@+id/timeline_image"
         android:layout_width="wrap_content"
@@ -13,28 +25,41 @@
 
     <TextView
         android:id="@+id/comment_timeline"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
         android:text="Hallo Ik ben een comment!" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp">
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
-        <ImageButton
+        <Button
             android:id="@+id/niet_slecht_button"
-            android:layout_width="200dp"
-            android:layout_height="match_parent" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/niet_slecht"/>
 
+        <!--
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/niet_slecht" />
+            -->
 
         <TextView
             android:id="@+id/niet_slecht_count"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="20dp"
+            android:padding="10dp"
             android:text="10" />
     </LinearLayout>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
 </LinearLayout>
\ No newline at end of file
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 31aafb6..627e49d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -30,7 +30,7 @@
     <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.</string>
     <string name="comment">Bijschrift:</string>
     <string name="cancel">Annuleer</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 0fe6426..866070f 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.</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>
-- 
2.49.1


From 93434a981fbeeacdc3c2ebf00097d2b85af1c593 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Wed, 28 Jun 2017 15:28:40 +0200
Subject: [PATCH 16/42] Layout profile changes + half of a reloader

---
 .../tagram/TimelineFragment.java              |  2 +-
 .../app/src/main/res/layout/activity_main.xml |  2 +-
 .../src/main/res/layout/fragment_timeline.xml | 14 ++++++++---
 .../res/layout/list_item_timeline_profile.xml | 24 +++++++++++++++----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index b2ca6d4..3139be0 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -23,7 +23,7 @@ public class TimelineFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_timeline, container, false);
-        listView = (ListView) view.findViewById(R.id.listview);
+        listView = (ListView) view.findViewById(R.id.list);
 
         downloadClass = new DownloadClass(getActivity());
         downloadClass.getPostsFromServer();
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml
index e2fe541..61c2050 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:padding="16dp">
+        android:padding="0dp">
     </FrameLayout>
 
     <android.support.design.widget.BottomNavigationView
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
index bfc4bea..fe7a080 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
@@ -5,11 +5,19 @@
     android:orientation="vertical"
     tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
 
-    <ListView
-        android:id="@+id/listview"
+    <android.support.v4.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/swiperefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    </ListView>
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        </ListView>
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index f8020e8..965ec97 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -3,6 +3,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dp" />
+
     <ImageView
         android:id="@+id/timeline_image_profile"
         android:layout_width="wrap_content"
@@ -13,21 +17,31 @@
         android:id="@+id/comment_timeline_profile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
         android:text="Hallo Ik ben een comment!" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp">
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
-        <TextView
+        <Button
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/niet_slecht" />
-
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:text="@string/niet_slecht"/>
         <TextView
             android:id="@+id/niet_slecht_count_profile"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="20dp"
+            android:padding="10dp"
             android:text="10" />
     </LinearLayout>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dp" />
 </LinearLayout>
-- 
2.49.1


From 0560e6a0fb97af7d7d797b3eca1e98e6051d9b8c Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Wed, 28 Jun 2017 16:03:16 +0200
Subject: [PATCH 17/42] Fix front facing camera

---
 .../tagram/CameraFragment.java                |  6 ++--
 .../tagram/PicturePreview.java                | 31 +++++++++++++------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index ca0bb4a..3bdc1b5 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -127,7 +127,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                     public void onPictureTaken(byte[] data, Camera camera) {
                         mPhoto = BitmapFactory.decodeByteArray(data, 0, data.length, null);
 
-                        PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+                        PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing);
                         mPicPreview.setId(R.id.pic_preview);
 
                         mCameraLayout.addView(mPicPreview);
@@ -213,7 +213,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
                 PicturePreview.filterPrev();
 
-                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
@@ -231,7 +231,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
                 PicturePreview.filterNext();
 
-                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto);
+                PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing);
                 mPicPreview.setId(R.id.pic_preview);
 
                 mCameraLayout.addView(mPicPreview);
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
index 47a2a46..33749e6 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
@@ -9,6 +9,7 @@ import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.hardware.Camera;
 import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -26,14 +27,24 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
     private static int currentFilter = FILTER_NONE;
 
+    int facing;
+    int rotate;
     Bitmap picture;
     Bitmap filterPicture;
 
-    public PicturePreview(Context context, Bitmap bmp) {
+    public PicturePreview(Context context, Bitmap bmp, int facing) {
         super(context);
         setWillNotDraw(false);
 
-        picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
+        this.facing = facing;
+
+        if (((Integer)facing).equals(Camera.CameraInfo.CAMERA_FACING_FRONT)) {
+            picture = Bitmap.createBitmap(bmp);
+            rotate = 270;
+        } else {
+            picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
+            rotate = 90;
+        }
         Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight());
     }
 
@@ -47,8 +58,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
         switch (currentFilter) {
             case FILTER_NONE:
-                canvas.drawBitmap(rotate(picture, 90), 0, 0, null);
-                filterPicture = rotate(picture, 90);
+                canvas.drawBitmap(rotate(picture, rotate), 0, 0, null);
+                filterPicture = rotate(picture, rotate);
                 break;
             case FILTER_SEPIA:
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
@@ -62,8 +73,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
-                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
-                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 break;
             case FILTER_BW:
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
@@ -73,8 +84,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
                 saveCanvas.setBitmap(filterPicture);
-                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
-                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 break;
             case FILTER_NEG:
                 filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
@@ -88,8 +99,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
                 saveCanvas.setBitmap(filterPicture);
-                saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
-                canvas.drawBitmap(rotate(picture, 90), 0, 0, paint);
+                saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
+                canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 break;
 
         }
-- 
2.49.1


From 52d15a80ca026d757b6e3c3637ae3d4be13f97b7 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Wed, 28 Jun 2017 17:44:27 +0200
Subject: [PATCH 18/42] Working refresh, working user-specific posts in
 profile.

---
 .../tagram/CameraFragment.java                |  5 ++-
 .../myhyvesbookplus/tagram/MainActivity.java  |  1 -
 .../tagram/ProfileFragment.java               | 18 ++++-----
 .../tagram/TimeLineAdapter.java               |  4 +-
 .../tagram/TimelineFragment.java              | 39 ++++++++++++++++++-
 .../tagram/controller/DownloadClass.java      |  8 +++-
 .../res/layout/fragment_profile_timeline.xml  |  3 +-
 .../src/main/res/layout/fragment_timeline.xml | 16 ++++++--
 .../main/res/layout/list_item_timeline.xml    |  2 -
 .../app/src/main/res/values-nl/strings.xml    |  2 +-
 10 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index ca0bb4a..8c5af6f 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -161,7 +161,10 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mComment.setText("");
 
                 PostUploader upload = new PostUploader(getActivity());
-                upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
+                if (R.id.pic_preview == 0) {
+                    upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
+
+                }
 
                 mPhoto.recycle();
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
index 8772d76..a6a67e2 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
@@ -122,7 +122,6 @@ public class MainActivity extends AppCompatActivity implements
     public void PostDownloaded() {
         FragmentManager fragmentManager = getFragmentManager();
         Fragment frag = fragmentManager.findFragmentById(R.id.content);
-        Log.d(TAG, "PostDownloaded: " + R.id.content);
 
         if (frag instanceof ProfileFragment) {
             ((ProfileFragment) frag).startList();
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 4f33ef2..0316efa 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -9,7 +9,6 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,7 +48,6 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     protected File photoFile = null;
     private ListView listView;
     private DownloadClass downloadClass;
-
     ProgressDialog progressDialog;
 
     /// Required empty public constructor ///
@@ -87,14 +85,13 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View viewTimeline = inflater.inflate(R.layout.fragment_profile_timeline, container, false);
-
-
-
-        listView = (ListView) viewTimeline.findViewById(R.id.listview_profile);
+        listView = (ListView) viewTimeline.findViewById(R.id.list);
         View viewHeader = inflater.inflate(R.layout.fragment_profile_header, listView, false);
         findViews(viewHeader);
         listView.addHeaderView(viewHeader);
 
+        profilePicture.invalidate();
+
         if (user != null) {
             if(user.getPhotoUrl() != null) {
                 httpsReference = FirebaseStorage.getInstance().getReferenceFromUrl(user.getPhotoUrl().toString());
@@ -109,11 +106,10 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
             Glide.with(this).using(new FirebaseImageLoader()).load(httpsReference).into(profilePicture);
         }
 
-        profilePicture.invalidate();
 
-        downloadClass = new DownloadClass(getActivity());
+
+        downloadClass = new DownloadClass(getActivity(), "profile");
         downloadClass.getPostsFromServer();
-
         return viewTimeline;
     }
 
@@ -158,8 +154,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     }
 
     public void startList() {
-        ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getmList());
-            listView.setAdapter(adapter);
+        ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getOwnPosts());
+        listView.setAdapter(adapter);
      }
 
     /**
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 ff4b341..3d6cbb4 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
@@ -58,7 +58,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     public View getView(int position, View convertView, ViewGroup parent) {
         View rowView = mInflater.inflate(R.layout.list_item_timeline, parent, false);
 
-//        TextView userName = (TextView) rowView.findViewById(R.id.username_timeline);
+        TextView userName = (TextView) rowView.findViewById(R.id.username_timeline);
         TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline);
         TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
         ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
@@ -73,7 +73,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
 
         UriPost post = (UriPost) getItem(position);
 
-//        userName.setText();
+        userName.setText(post.getPoster());
         nietSlechts.setText(Integer.toString(post.getNietSlechts()));
         comment.setText(post.getComment());
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index b2ca6d4..db99e77 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -2,11 +2,16 @@ package nl.myhyvesbookplus.tagram;
 
 import android.app.Fragment;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.ListView;
 
+
+
 import nl.myhyvesbookplus.tagram.controller.DownloadClass;
 
 
@@ -23,11 +28,41 @@ public class TimelineFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_timeline, container, false);
-        listView = (ListView) view.findViewById(R.id.listview);
+        listView = (ListView) view.findViewById(R.id.list);
+        final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) view.findViewById(R.id.swipe);
 
-        downloadClass = new DownloadClass(getActivity());
+        swipeView.setEnabled(false);
+        downloadClass = new DownloadClass(getActivity(), "timeline");
         downloadClass.getPostsFromServer();
 
+        swipeView.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                downloadClass = new DownloadClass(getActivity(), "timeline");
+                downloadClass.getPostsFromServer();
+                swipeView.setRefreshing(true);
+                ( new Handler()).postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeView.setRefreshing(false);
+                    }
+                }, 3000);
+            }
+        });
+
+        listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView absListView, int i) {
+            }
+
+            @Override
+            public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                if (firstVisibleItem == 0)
+                    swipeView.setEnabled(true);
+                else
+                    swipeView.setEnabled(false);
+            }
+        });
         return view;
     }
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index 64bf26c..cd5e0e0 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -24,8 +24,9 @@ public class DownloadClass {
     private DatabaseReference mDataRef;
     private ArrayList<UriPost> mList;
     private PostDownloadListener mListener;
+    private String fragmentName;
 
-    public DownloadClass(Context context) {
+    public DownloadClass(Context context, String fragmentName) {
         if (context instanceof DownloadClass.PostDownloadListener) {
             mListener = (PostDownloadListener) context;
         } else {
@@ -34,6 +35,7 @@ public class DownloadClass {
         }
         mDataRef = FirebaseDatabase.getInstance().getReference();
         mList = new ArrayList<>();
+        this.fragmentName = fragmentName;
     }
 
     public void getPostsFromServer() {
@@ -46,6 +48,7 @@ public class DownloadClass {
                         mList.add(data.getValue(UriPost.class));
                 }
                 Collections.reverse(mList);
+
                 mListener.PostDownloaded();
             }
 
@@ -62,13 +65,14 @@ public class DownloadClass {
 
     public ArrayList<UriPost> getOwnPosts() {
         String currentUid = FirebaseAuth.getInstance().getCurrentUser().getUid();
-        ArrayList<UriPost> posts = new ArrayList<UriPost>();
+        ArrayList<UriPost> posts = new ArrayList<>();
 
         for (UriPost post : mList) {
             if (post.getPoster().equals(currentUid)) {
                 posts.add(post);
             }
         }
+
         return posts;
     }
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
index fd06e94..523ff58 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
@@ -6,9 +6,8 @@
     tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
 
     <ListView
-        android:id="@+id/listview_profile"
+        android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     </ListView>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
index bfc4bea..9aa7a7d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
@@ -5,11 +5,21 @@
     android:orientation="vertical"
     tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
 
-    <ListView
-        android:id="@+id/listview"
+    <android.support.v4.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/swipe"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        >
 
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
     </ListView>
 
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+
+
 </LinearLayout>
\ No newline at end of file
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 d5e5f63..cce0278 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
@@ -9,13 +9,11 @@
         android:layout_width="match_parent"
         android:layout_height="15dp" />
 
-    <!--
     <TextView
         android:id="@+id/username_timeline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"/>
-    -->
 
     <ImageView
         android:id="@+id/timeline_image"
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 f193b85..4e7f662 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -23,7 +23,7 @@
     <string name="login_error">Voer alstublieft email en wachtwoord in</string>
     <string name="mail_failed">Er is een fout opgetreden. Controleer internetverbinding.</string>
     <string name="mail_successful">Er is een e-mail verzonden. Volg a.u.b. de instructies.</string>
-    <string name="password_match_error">Wachtwoorden komen niet overeen</string>
+    <string name="password_match_error">Wachtwoorden komoen niet overeen</string>
     <string name="register_error">Vul alstublieft alle velden in</string>
     <string name="save">Opslaan</string>
     <string name="upload">Uploaden</string>
-- 
2.49.1


From ab79fa7d7c32ff29bd851bcf7374e6959639de0b Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Wed, 28 Jun 2017 17:58:32 +0200
Subject: [PATCH 19/42] Changed some appearances of the personal posts.

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

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 8c5af6f..ca0bb4a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -161,10 +161,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mComment.setText("");
 
                 PostUploader upload = new PostUploader(getActivity());
-                if (R.id.pic_preview == 0) {
-                    upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
-
-                }
+                upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
 
                 mPhoto.recycle();
 
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 cce0278..e4d92b8 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
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="Hallo Ik ben een comment!" />
+        android:text="@string/comment_placeholder" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index f8020e8..202f34e 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -10,24 +10,28 @@
         android:layout_height="250dp" />
 
     <TextView
+        android:gravity="center"
         android:id="@+id/comment_timeline_profile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Hallo Ik ben een comment!" />
+        android:text="@string/comment_placeholder" />
 
     <LinearLayout
+        android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="40dp">
 
         <TextView
+            android:gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/niet_slecht" />
 
         <TextView
+            android:gravity="center"
             android:id="@+id/niet_slecht_count_profile"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="10" />
+            android:text="   10" />
     </LinearLayout>
 </LinearLayout>
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 4e7f662..f02108c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -34,4 +34,5 @@
     <string name="niet_slecht">Niet Slecht.</string>
     <string name="comment">Bijschrift:</string>
     <string name="cancel">Annuleer</string>
+    <string name="comment_placeholder">Hallo Ik ben een comment!</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 8909894..afa90b1 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -32,4 +32,6 @@
     <string name="upload_profile_pic">Uploading profile picture…</string>
     <string name="comment">Comment:</string>
     <string name="cancel">Cancel</string>
+    <string name="comment_placeholder">Hello, I am a comment!</string>
+    <string name="mail_success">Er is een e-mail verzonden. Volg a.u.b. de instructies.</string>
 </resources>
-- 
2.49.1


From 1fdd21440be2492c57eb4fb7a8c91d27b35f11ca Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Wed, 28 Jun 2017 19:46:38 +0200
Subject: [PATCH 20/42] Potentially fixed Felix' bug in the camera. Also made
 some changes for better readability of my own code.

---
 .../tagram/CameraFragment.java                | 21 +++++-----
 .../tagram/ProfileFragment.java               | 39 +++++++++++--------
 .../tagram/TimelineFragment.java              |  4 +-
 .../tagram/controller/DownloadClass.java      |  4 +-
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 3bdc1b5..818fa47 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -149,6 +149,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.comment_box).bringToFront();
                 view.findViewById(R.id.filter_buttons).setVisibility(View.GONE);
                 ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide();
+                hideKeyboard();
             }
         });
 
@@ -179,6 +180,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.switch_camera_button).bringToFront();
 
                 mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
+                hideKeyboard();
             }
         });
 
@@ -203,6 +205,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 view.findViewById(R.id.switch_camera_button).bringToFront();
 
                 mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
+                hideKeyboard();
             }
         });
 
@@ -242,21 +245,15 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
-        (view.findViewById(R.id.comment_text)).setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (!hasFocus) {
-                    hideKeyboard(v);
-                }
-            }
-        });
-
         return view;
     }
 
-    public void hideKeyboard(View view) {
-        InputMethodManager inputMethodManager =(InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    /**
+     * Hides keyboard after submit, upload or cancel button gets pressed.
+     */
+    public void hideKeyboard() {
+        ((InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE))
+                .toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
     }
 
     // TODO: Rename method, update argument and hook method into UI event
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 0316efa..b6cfce8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -45,9 +45,12 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     protected TextView profileName;
     protected ImageView profilePicture;
     protected FirebaseUser user;
-    protected File photoFile = null;
+    protected File photoFile;
     private ListView listView;
     private DownloadClass downloadClass;
+    private View headerInflater;
+    private View timeLineInflater;
+
     ProgressDialog progressDialog;
 
     /// Required empty public constructor ///
@@ -58,19 +61,25 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         user = FirebaseAuth.getInstance().getCurrentUser();
+        photoFile = null;
      }
 
     /**
-     * Assigns all views and buttons.
+     * Assigns all views and buttons for the header.
      */
-    protected void findViews(View view) {
-        profilePicButton = (ImageButton) view.findViewById(R.id.profile_pic_button);
-        profilePicture = (ImageView) view.findViewById(R.id.imageView_profile_picture);
-        profileName = (TextView) view.findViewById(R.id.profile_name);
-        changePwdButton = (Button) view.findViewById(R.id.change_psw_button);
+    protected void findHeaderViews() {
+        profilePicButton = (ImageButton) headerInflater.findViewById(R.id.profile_pic_button);
+        profilePicture = (ImageView) headerInflater.findViewById(R.id.imageView_profile_picture);
+        profileName = (TextView) headerInflater.findViewById(R.id.profile_name);
+        changePwdButton = (Button) headerInflater.findViewById(R.id.change_psw_button);
         bindOnClick();
     }
 
+    protected void findTimelineViews() {
+        listView = (ListView) timeLineInflater.findViewById(R.id.list);
+        listView.addHeaderView(headerInflater);
+    }
+
     /**
      * Bind the buttons to their listeners.
      */
@@ -84,11 +93,11 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View viewTimeline = inflater.inflate(R.layout.fragment_profile_timeline, container, false);
-        listView = (ListView) viewTimeline.findViewById(R.id.list);
-        View viewHeader = inflater.inflate(R.layout.fragment_profile_header, listView, false);
-        findViews(viewHeader);
-        listView.addHeaderView(viewHeader);
+
+        timeLineInflater = inflater.inflate(R.layout.fragment_profile_timeline, container, false);
+        headerInflater = inflater.inflate(R.layout.fragment_profile_header, listView, false);
+        findHeaderViews();
+        findTimelineViews();
 
         profilePicture.invalidate();
 
@@ -106,11 +115,9 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
             Glide.with(this).using(new FirebaseImageLoader()).load(httpsReference).into(profilePicture);
         }
 
-
-
-        downloadClass = new DownloadClass(getActivity(), "profile");
+        downloadClass = new DownloadClass(getActivity());
         downloadClass.getPostsFromServer();
-        return viewTimeline;
+        return timeLineInflater;
     }
 
     /**
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index db99e77..7d41818 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -32,13 +32,13 @@ public class TimelineFragment extends Fragment {
         final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) view.findViewById(R.id.swipe);
 
         swipeView.setEnabled(false);
-        downloadClass = new DownloadClass(getActivity(), "timeline");
+        downloadClass = new DownloadClass(getActivity());
         downloadClass.getPostsFromServer();
 
         swipeView.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                downloadClass = new DownloadClass(getActivity(), "timeline");
+                downloadClass = new DownloadClass(getActivity());
                 downloadClass.getPostsFromServer();
                 swipeView.setRefreshing(true);
                 ( new Handler()).postDelayed(new Runnable() {
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index cd5e0e0..819b772 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -24,9 +24,8 @@ public class DownloadClass {
     private DatabaseReference mDataRef;
     private ArrayList<UriPost> mList;
     private PostDownloadListener mListener;
-    private String fragmentName;
 
-    public DownloadClass(Context context, String fragmentName) {
+    public DownloadClass(Context context) {
         if (context instanceof DownloadClass.PostDownloadListener) {
             mListener = (PostDownloadListener) context;
         } else {
@@ -35,7 +34,6 @@ public class DownloadClass {
         }
         mDataRef = FirebaseDatabase.getInstance().getReference();
         mList = new ArrayList<>();
-        this.fragmentName = fragmentName;
     }
 
     public void getPostsFromServer() {
-- 
2.49.1


From 26a7239caa4cc89209ce65916e01740a9933b802 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 00:35:55 +0200
Subject: [PATCH 21/42] Much cleaner code. Known bugs seem to be fixed. Added
 extra progressDialog for posts downloading.

---
 .../tagram/CameraFragment.java                | 117 +++++-------------
 .../myhyvesbookplus/tagram/LoginActivity.java |   4 +-
 .../myhyvesbookplus/tagram/MainActivity.java  |  14 +--
 .../tagram/ProfileAdapter.java                |   2 +-
 .../tagram/ProfileFragment.java               |  55 +++++---
 .../tagram/TimelineFragment.java              |  51 +++++---
 .../app/src/main/res/values-nl/strings.xml    |   8 +-
 .../app/src/main/res/values/strings.xml       |   8 +-
 8 files changed, 120 insertions(+), 139 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 818fa47..ab95c27 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -24,27 +24,8 @@ import android.widget.RelativeLayout;
 import nl.myhyvesbookplus.tagram.controller.PostUploader;
 import nl.myhyvesbookplus.tagram.model.BitmapPost;
 
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link CameraFragment.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link CameraFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
 public class CameraFragment extends Fragment implements PostUploader.PostUploadListener{
-    // TODO: Rename parameter arguments, choose names that match
     private static final String TAG = "CameraFragment";
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    private OnFragmentInteractionListener mListener;
-
     private Camera mCamera;
     private CameraPreview mPreview;
     private Bitmap mPhoto;
@@ -54,33 +35,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         // Required empty public constructor
     }
 
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment CameraFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static CameraFragment newInstance(String param1, String param2) {
-        CameraFragment fragment = new CameraFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -98,11 +52,12 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
 
         mCameraLayout.addView(mPreview);
 
-        // Draw buttons over preview
+        // Draw initial buttons over preview
         view.findViewById(R.id.picture_button).bringToFront();
         view.findViewById(R.id.switch_camera_button).bringToFront();
         filterButtons.bringToFront();
 
+        /* Upon pressing the switch camera facing button: */
         (view.findViewById(R.id.switch_camera_button)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -119,6 +74,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+         /* Upon pressing the take photo button: */
         (view.findViewById(R.id.picture_button)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -141,6 +97,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+        /* Upon pressing the upload button: */
         (view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -153,6 +110,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+        /* Upon pressing the enter button on the virtual keyboard: */
         (view.findViewById(R.id.comment_submit)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -184,6 +142,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+        /* Upon pressing the cancel button: */
         (view.findViewById(R.id.comment_cancel)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -209,6 +168,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+        /* Upon pressing the left arrow filter change button: */
         (view.findViewById(R.id.filter_left)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -227,6 +187,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
             }
         });
 
+        /* Upon pressing the right arrow filter change button: */
         (view.findViewById(R.id.filter_right)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -256,30 +217,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 .toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
     }
 
-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnFragmentInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
+    //TODO Niet helemaal zeker wat dit doet.
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -291,6 +229,11 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         getActivity().findViewById(R.id.content).setPadding(dp,dp,dp,dp);
     }
 
+    /**
+     * Start the camera.
+     * @param facing The direction in which the camera should be initialized (back by default).
+     * @return the result of the opened camera, if successful.
+     */
     public static Camera getCameraInstance(int facing) {
         Camera c = null;
         try {
@@ -301,13 +244,27 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         return c;
     }
 
+
+    /**
+     * Switch between front facing camera and the back camera.
+     */
     public void switchFacing() {
         if (facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
             facing = Camera.CameraInfo.CAMERA_FACING_BACK;
         else
             facing = Camera.CameraInfo.CAMERA_FACING_FRONT;
+// TODO
+//       facing =
+//          facing == Camera.CameraInfo.CAMERA_FACING_FRONT ?
+//          Camera.CameraInfo.CAMERA_FACING_BACK :
+//          Camera.CameraInfo.CAMERA_FACING_FRONT;
     }
 
+    /**
+     * Change which buttons are visible during the different stages on the camera fragment.
+     *
+     * @param view The current view upon which the buttons need to be placed or removed.
+     */
     public void switchButtons(View view) {
         FloatingActionButton upload = (FloatingActionButton) view.findViewById(R.id.upload_button);
         ImageButton picButton = (ImageButton) view.findViewById(R.id.picture_button);
@@ -332,6 +289,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         }
     }
 
+
+    //TODO: Kan dit weg? super aanroepen enzo.
     @Override
     public void onPause() {
         super.onPause();
@@ -346,20 +305,4 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     public void PostUploadComplete(Boolean success) {
 
     }
-
-    /**
-     * This interface must be implemented by activities that contain this
-     * fragment to allow an interaction in this fragment to be communicated
-     * to the activity and potentially other fragments contained in that
-     * activity.
-     * <p>
-     * See the Android Training lesson <a href=
-     * "http://developer.android.com/training/basics/fragments/communicating.html"
-     * >Communicating with Other Fragments</a> for more information.
-     */
-    public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
-
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
index 46befe8..438db9f 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
@@ -181,7 +181,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
      * @param passwordString the entered password
      */
     protected void logIn(String emailString, String passwordString) {
-        progressDialog = ProgressDialog.show(LoginActivity.this, getString(R.string.please_wait), "Logging in", true, false);
+        progressDialog = ProgressDialog.show(LoginActivity.this, getString(R.string.please_wait), getString(R.string.logging_in), true, false);
 
         mAuth.signInWithEmailAndPassword(emailString, passwordString)
                 .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
@@ -211,7 +211,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
      * @param password the entered password
      */
     protected void registerUser(String email, String password) {
-        this.progressDialog = ProgressDialog.show(LoginActivity.this, getString(R.string.please_wait), "Registering", true, false);
+        this.progressDialog = ProgressDialog.show(LoginActivity.this, getString(R.string.please_wait), getString(R.string.registering), true, false);
         mAuth.createUserWithEmailAndPassword(email, password)
                 .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
                     @Override
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
index a6a67e2..28b3a6d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
@@ -20,9 +20,10 @@ import nl.myhyvesbookplus.tagram.controller.PostUploader;
 import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader;
 
 public class MainActivity extends AppCompatActivity implements
-        CameraFragment.OnFragmentInteractionListener,
         ProfilePictureUploader.ProfilePictureUpdatedListener,
-        DownloadClass.PostDownloadListener, PostUploader.PostUploadListener {
+        DownloadClass.PostDownloadListener,
+        PostUploader.PostUploadListener {
+
     final static private String TAG = "MainScreen";
 
     FirebaseAuth mAuth;
@@ -89,11 +90,6 @@ public class MainActivity extends AppCompatActivity implements
         finish();
     }
 
-    @Override
-    public void onFragmentInteraction(Uri uri) {
-
-    }
-
     public void logOutOnClick(View view) {
         FirebaseAuth.getInstance().signOut();
         goToLogin();
@@ -107,7 +103,6 @@ public class MainActivity extends AppCompatActivity implements
 
     @Override
     public void ProfilePictureUpdated(Boolean success) {
-        Log.d(TAG, "ProfilePictureUpdated: Ja ik luister naar je!");
         FragmentManager man = getFragmentManager();
         ProfileFragment frag = (ProfileFragment) man.findFragmentById(R.id.content);
         FragmentTransaction transaction = man.beginTransaction();
@@ -123,9 +118,12 @@ public class MainActivity extends AppCompatActivity implements
         FragmentManager fragmentManager = getFragmentManager();
         Fragment frag = fragmentManager.findFragmentById(R.id.content);
 
+
+
         if (frag instanceof ProfileFragment) {
             ((ProfileFragment) frag).startList();
         } else if (frag instanceof  TimelineFragment) {
+            ((TimelineFragment) frag).progressDialog.dismiss();
             ((TimelineFragment) frag).startList();
         }
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
index 357876a..3bff416 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
@@ -70,7 +70,7 @@ public class ProfileAdapter extends BaseAdapter {
         return newRowView;
     }
 
-    protected View findViews(View rowView) {
+    private View findViews(View rowView) {
         comment = (TextView) rowView.findViewById(R.id.comment_timeline_profile);
         nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count_profile);
         photo = (ImageView) rowView.findViewById(R.id.timeline_image_profile);
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index b6cfce8..6f1c334 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -37,8 +37,9 @@ import static android.app.Activity.RESULT_OK;
 
 public class ProfileFragment extends Fragment implements View.OnClickListener {
     static final int REQUEST_TAKE_PHOTO = 1;
+    ProgressDialog progressDialog;
 
-    /// Views, buttons and other protected declarations ///
+    /* Views, buttons and other protected and private inits */
     protected Button changePwdButton;
     protected ImageButton profilePicButton;
     protected StorageReference httpsReference;
@@ -46,17 +47,19 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     protected ImageView profilePicture;
     protected FirebaseUser user;
     protected File photoFile;
+
     private ListView listView;
     private DownloadClass downloadClass;
     private View headerInflater;
     private View timeLineInflater;
 
-    ProgressDialog progressDialog;
-
-    /// Required empty public constructor ///
-
+    /* Required empty public constructor */
     public ProfileFragment() {}
 
+    /**
+     * Overridden onCreate which initializes a user and sets the default photoFile to null.
+     * @param savedInstanceState The standard return of the onCreate method.
+     */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -75,6 +78,9 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         bindOnClick();
     }
 
+    /**
+     * Assign the ListView and add the header to it.
+     */
     protected void findTimelineViews() {
         listView = (ListView) timeLineInflater.findViewById(R.id.list);
         listView.addHeaderView(headerInflater);
@@ -88,8 +94,15 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         changePwdButton.setOnClickListener(this);
     }
 
-    /// Page setup ///
-
+    /**
+     * Overridden onCreateView which serves as a fragment content creator.
+     * Checks for user data to be displayed.
+     *
+     * @param inflater The inflater used for the fragment.
+     * @param container The container which holds this fragment.
+     * @param savedInstanceState The state which was provided by onCreate.
+     * @return the timeLineInflater View which is required for the ListView to be updated.
+     */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -123,11 +136,11 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     /**
      * Called when a view has been clicked.
      *
-     * @param v The view that was clicked.
+     * @param view The view that was clicked.
      */
     @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
+    public void onClick(View view) {
+        switch (view.getId()) {
             case R.id.profile_pic_button:
                 profilePicOnClick();
                 break;
@@ -142,13 +155,13 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
      */
     private void profilePicOnClick() {
         Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        /* Ensure that there's a camera activity to handle the intent */
+
         if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
-            /* Create the File where the photo should go */
             try {
                 photoFile = createImageFile();
             } catch (IOException ex) {
-                Toast.makeText(getActivity(), getString(R.string.image_save_error), Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), getString(R.string.image_save_error),
+                                Toast.LENGTH_LONG).show();
             }
             if (photoFile != null) {
                 Uri photoURI = FileProvider.getUriForFile(getActivity(),
@@ -160,6 +173,9 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
     }
 
+    /**
+     * Start display of the list; uses an adapter and listener in the main activity.
+     */
     public void startList() {
         ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getOwnPosts());
         listView.setAdapter(adapter);
@@ -167,6 +183,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
 
     /**
      * Grabs the image just taken by the built-in camera and pushes this image to the user account.
+     *
      * @param requestCode The code which corresponds to REQUEST_TAKE_PHOTO. Used as indicator.
      * @param resultCode Code should be RESULT_OK to allow camera to proceed.
      * @param data The image data from the camera.
@@ -180,8 +197,13 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
     }
 
+    /**
+     * Create the file which the camera requires to save a proper quality picture to.
+     *
+     * @return The new file.
+     * @throws IOException when insufficient permission or storage available.
+     */
     private File createImageFile() throws IOException {
-        // Create an image file name
         String imageFileName = "JPEG_" + user.getUid();
         File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
             return File.createTempFile(
@@ -191,9 +213,6 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
             );
         }
 
-
-
-    // TODO Make this function into its own class for modularity.
     /**
      * Performs password reset action.
      */
@@ -209,8 +228,6 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
                                     Toast.LENGTH_SHORT).show();
                         }
                     });
-        } else {
-            // TODO Add code here for when there is no currently active user.
         }
     }
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index 7d41818..c25cc55 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -1,6 +1,7 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.app.Fragment;
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -9,27 +10,48 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.ListView;
-
-
+import android.widget.Toast;
 
 import nl.myhyvesbookplus.tagram.controller.DownloadClass;
 
 
 public class TimelineFragment extends Fragment {
 
+    /* Some protected and private inits */
     private ListView listView;
     private DownloadClass downloadClass;
+    ProgressDialog progressDialog;
 
-    public TimelineFragment() {
-        // Required empty public constructor
+    /* Required empty public constructor */
+    public TimelineFragment() {}
+
+    /**
+     * Overridden onCreate which also starts a progress dialog for the posts being downloaded.
+     * @param savedInstanceState The standard return of the onCreate method.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
     }
 
+    /**
+     * Overridden onCreateView method which creates the ListView and contains a possible refresh
+     * functionality (swipe down page for result).
+     *
+     * https://www.survivingwithandroid.com/2014/05/android-swiperefreshlayout-tutorial-2.html
+     * Above reference was largely copied from.
+     * @param inflater The inflater used for the fragment.
+     * @param container The container which holds this fragment.
+     * @param savedInstanceState The state which was provided by onCreate.
+     * @return  the timeLineInflater View which is required for the ListView to be updated.
+     */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_timeline, container, false);
-        listView = (ListView) view.findViewById(R.id.list);
-        final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) view.findViewById(R.id.swipe);
+        View timeLineInflater = inflater.inflate(R.layout.fragment_timeline, container, false);
+        listView = (ListView) timeLineInflater.findViewById(R.id.list);
+        final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) timeLineInflater.findViewById(R.id.swipe);
 
         swipeView.setEnabled(false);
         downloadClass = new DownloadClass(getActivity());
@@ -38,15 +60,16 @@ public class TimelineFragment extends Fragment {
         swipeView.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                downloadClass = new DownloadClass(getActivity());
                 downloadClass.getPostsFromServer();
+                Toast.makeText(getActivity(), R.string.refreshing,
+                        Toast.LENGTH_LONG).show();
                 swipeView.setRefreshing(true);
                 ( new Handler()).postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         swipeView.setRefreshing(false);
                     }
-                }, 3000);
+                }, 1000);
             }
         });
 
@@ -57,15 +80,15 @@ public class TimelineFragment extends Fragment {
 
             @Override
             public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                if (firstVisibleItem == 0)
-                    swipeView.setEnabled(true);
-                else
-                    swipeView.setEnabled(false);
+                swipeView.setEnabled(firstVisibleItem == 0);
             }
         });
-        return view;
+        return timeLineInflater;
     }
 
+    /**
+     * Start display of the list; uses an adapter and listener in the main activity.
+     */
     public void startList() {
         TimeLineAdapter adapter = new TimeLineAdapter(getActivity(), downloadClass.getmList());
         listView.setAdapter(adapter);
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 f02108c..f14844b 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -11,15 +11,12 @@
     <string name="title_home">Tijdlijn</string>
     <string name="title_notifications">Profiel</string>
     <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">Wijzig Profiel Foto</string>
     <string name="profile_picture_description">profiel foto</string>
     <string name="change_psw_button">Wachtwoord wijzigen</string>
     <string name="please_wait">Momentje</string>
-    <string name="hello_blank_fragment">Hallo leeg fragment</string>
-    <string name="hello_camera">Hallo Camera fragment</string>
     <string name="login_error">Voer alstublieft email en wachtwoord in</string>
     <string name="mail_failed">Er is een fout opgetreden. Controleer internetverbinding.</string>
     <string name="mail_successful">Er is een e-mail verzonden. Volg a.u.b. de instructies.</string>
@@ -30,9 +27,12 @@
     <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="mail_success">An e-mail was sent, please follow its instructions.</string>
     <string name="niet_slecht">Niet Slecht.</string>
     <string name="comment">Bijschrift:</string>
     <string name="cancel">Annuleer</string>
     <string name="comment_placeholder">Hallo Ik ben een comment!</string>
+    <string name="refreshing">Verversen…</string>
+    <string name="downloading_posts">Posts worden gedownload…</string>
+    <string name="logging_in">Aan het inloggen</string>
+    <string name="registering">Aan het registreren</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 afa90b1..3e4425c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="confirm_password">Confirm Password</string>
-    <string name="confirm_password_hint">confirm password</string>
     <string name="login_button">Login</string>
     <string name="register">Register</string>
     <string name="back_to_login">back to Login</string>
@@ -14,8 +13,6 @@
     <string name="login_error">Please fill in email and password</string>
     <string name="password_match_error">Passwords do not match</string>
     <string name="register_error">Please fill in all the fields</string>
-    <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">Change Profile Picture</string>
@@ -33,5 +30,8 @@
     <string name="comment">Comment:</string>
     <string name="cancel">Cancel</string>
     <string name="comment_placeholder">Hello, I am a comment!</string>
-    <string name="mail_success">Er is een e-mail verzonden. Volg a.u.b. de instructies.</string>
+    <string name="refreshing">Refreshing…</string>
+    <string name="downloading_posts">Downloading posts…</string>
+    <string name="registering">Registering</string>
+    <string name="logging_in">Logging in</string>
 </resources>
-- 
2.49.1


From 4eed601b7d4e43bdd174c6515dc06f2bd8d7cad8 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 12:50:29 +0200
Subject: [PATCH 22/42] WIP: for Felix

---
 .../tagram/CameraFragment.java                | 15 ++++-----
 .../myhyvesbookplus/tagram/MainActivity.java  |  2 +-
 .../tagram/ProfileFragment.java               |  2 ++
 .../tagram/TimelineFragment.java              | 13 +++++++-
 .../src/main/res/layout/fragment_timeline.xml | 31 +++++++++++++------
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index ab95c27..575b956 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -39,11 +39,11 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        ((AppCompatActivity)getActivity()).getSupportActionBar().hide();
-        getActivity().findViewById(R.id.content).setPadding(0,0,0,0);
-
         final View view = inflater.inflate(R.layout.fragment_camera, container, false);
 
+        // Hide the action bar
+        ((AppCompatActivity)getActivity()).getSupportActionBar().hide();
+
         mCamera = getCameraInstance(facing);
 
         mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
@@ -217,16 +217,13 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 .toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
     }
 
-    //TODO Niet helemaal zeker wat dit doet.
+    /**
+     * Restores the action bar when exiting the fragment.
+     */
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-
-        int padding = 16;
-        float scale = getResources().getDisplayMetrics().density;
-        int dp = (int) (padding * scale + 0.5f);
         ((AppCompatActivity)getActivity()).getSupportActionBar().show();
-        getActivity().findViewById(R.id.content).setPadding(dp,dp,dp,dp);
     }
 
     /**
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
index 28b3a6d..993d195 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
@@ -123,7 +123,7 @@ public class MainActivity extends AppCompatActivity implements
         if (frag instanceof ProfileFragment) {
             ((ProfileFragment) frag).startList();
         } else if (frag instanceof  TimelineFragment) {
-            ((TimelineFragment) frag).progressDialog.dismiss();
+//            ((TimelineFragment) frag).progressDialog.dismiss();
             ((TimelineFragment) frag).startList();
         }
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 6f1c334..0b88e92 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -16,6 +16,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
@@ -38,6 +39,7 @@ import static android.app.Activity.RESULT_OK;
 public class ProfileFragment extends Fragment implements View.OnClickListener {
     static final int REQUEST_TAKE_PHOTO = 1;
     ProgressDialog progressDialog;
+    ProgressBar progressBar;
 
     /* Views, buttons and other protected and private inits */
     protected Button changePwdButton;
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index c25cc55..f545bd4 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -5,11 +5,13 @@ import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import nl.myhyvesbookplus.tagram.controller.DownloadClass;
@@ -21,6 +23,7 @@ public class TimelineFragment extends Fragment {
     private ListView listView;
     private DownloadClass downloadClass;
     ProgressDialog progressDialog;
+    ProgressBar progressBar;
 
     /* Required empty public constructor */
     public TimelineFragment() {}
@@ -32,7 +35,7 @@ public class TimelineFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
+//        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
     }
 
     /**
@@ -50,6 +53,13 @@ public class TimelineFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View timeLineInflater = inflater.inflate(R.layout.fragment_timeline, container, false);
+
+//        progressBar = new ProgressBar(getActivity());
+        Log.d("TIMELINEFRAGMENT", "onCreateView: PROGRESSBAR");
+        progressBar = (ProgressBar) timeLineInflater.findViewById(R.id.progressbar_timeline);
+        progressBar.setVisibility(View.VISIBLE);
+        progressBar.bringToFront();
+
         listView = (ListView) timeLineInflater.findViewById(R.id.list);
         final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) timeLineInflater.findViewById(R.id.swipe);
 
@@ -83,6 +93,7 @@ public class TimelineFragment extends Fragment {
                 swipeView.setEnabled(firstVisibleItem == 0);
             }
         });
+        progressBar.setVisibility(View.GONE);
         return timeLineInflater;
     }
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
index 4c91e9e..68e3085 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
@@ -5,19 +5,32 @@
     android:orientation="vertical"
     tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
 
-    <android.support.v4.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/swipe"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
 
-        <ListView
-            android:id="@+id/list"
+        <ProgressBar
+            android:id="@+id/progressbar_timeline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"
+            android:visibility="gone"/>
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/swipe"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-    </ListView>
-    </android.support.v4.widget.SwipeRefreshLayout>
+
+            <ListView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+            </ListView>
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+    </RelativeLayout>
 
 
 
-- 
2.49.1


From 5ae1d1f9646c68aa940426f54da9bf17c28e1ea7 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Thu, 29 Jun 2017 13:19:12 +0200
Subject: [PATCH 23/42] Added NietSlechts!

---
 .../tagram/TimeLineAdapter.java               | 31 +++++++++++++------
 .../tagram/controller/DownloadClass.java      |  4 ++-
 .../myhyvesbookplus/tagram/model/UriPost.java |  9 ++++++
 .../main/res/layout/list_item_timeline.xml    | 14 ++++++---
 4 files changed, 43 insertions(+), 15 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 7d4dda5..197765a 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
@@ -1,6 +1,7 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,6 +14,9 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
 
@@ -52,26 +56,34 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, ViewGroup parent) {
         View rowView = mInflater.inflate(R.layout.list_item_timeline, parent, false);
 
         TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline);
-        TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
+        final TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
+        TextView dateTime = (TextView) rowView.findViewById(R.id.timeline_date);
         ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
-        ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button);
+        final ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button);
+
+        final UriPost post = (UriPost) getItem(position);
+
+        nietSlechts.setText(Integer.toString(post.getNietSlechts()));
+        comment.setText(post.getComment());
 
         nietSlechtButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                Log.d(TAG, "onClick: " + position);
+                FirebaseDatabase.getInstance().getReference().child("posts").child(post.getDatabaseEntryName()).child("nietSlechts").setValue(post.getNietSlechts() + 1)
+                        .addOnCompleteListener(new OnCompleteListener<Void>() {
+                            @Override
+                            public void onComplete(@NonNull Task<Void> task) {
+                                nietSlechts.setText(Integer.toString(post.getNietSlechts() + 1));
+                            }
+                        });
             }
         });
 
-        UriPost post = (UriPost) getItem(position);
-
-        nietSlechts.setText(Integer.toString(post.getNietSlechts()));
-        comment.setText(post.getComment());
-
         StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
         Glide.with(mContext)
                 .using(new FirebaseImageLoader())
@@ -82,7 +94,6 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
         return rowView;
     }
 
-
     /**
      * Callback method to be invoked when an item in this AdapterView has
      * been clicked.
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index 49697b4..3624cda 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -41,7 +41,9 @@ public class DownloadClass {
             @Override
             public void onDataChange(DataSnapshot dataSnapshot) {
                 for (DataSnapshot data : dataSnapshot.getChildren()) {
-                    mList.add(data.getValue(UriPost.class));
+                    UriPost tempPost = data.getValue(UriPost.class);
+                    tempPost.setDatabaseEntryName(data.getKey());
+                    mList.add(tempPost);
                 }
                 Collections.reverse(mList);
                 mListener.PostDownloaded();
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java
index 25358be..dc7ae7c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java
@@ -9,6 +9,7 @@ import java.util.Date;
  */
 public class UriPost extends Post {
     private String uri;
+    private String databaseEntryName;
 
     public UriPost() {
         // Default constructor required for calls to DataSnapshot.getValue(UriPost.class)
@@ -33,4 +34,12 @@ public class UriPost extends Post {
     public void setUri(String uri) {
         this.uri = uri;
     }
+
+    public String getDatabaseEntryName() {
+        return databaseEntryName;
+    }
+
+    public void setDatabaseEntryName(String databaseEntryName) {
+        this.databaseEntryName = databaseEntryName;
+    }
 }
\ No newline at end of file
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 0d2006f..e3f6fa4 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
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/timeline_image"
         android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:layout_height="250dp" />
+        android:layout_height="250dp"
+        android:layout_gravity="center" />
 
     <TextView
         android:id="@+id/comment_timeline"
@@ -17,6 +16,11 @@
         android:layout_height="wrap_content"
         android:text="Hallo Ik ben een comment!" />
 
+    <TextView
+        android:id="@+id/timeline_date"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="date/time" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp">
@@ -29,12 +33,14 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
             android:text="@string/niet_slecht" />
 
         <TextView
             android:id="@+id/niet_slecht_count"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
             android:text="10" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
-- 
2.49.1


From af47900288ec32f84bae5fa86d96cec293212e7b Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Thu, 29 Jun 2017 13:21:58 +0200
Subject: [PATCH 24/42] Better name for niet slechts.

---
 .../app/src/main/res/values-nl/strings.xml                      | 2 +-
 app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 57fc504..a100eee 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 7f065d9..07a5a19 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>
-- 
2.49.1


From 71d412beac63fcd1364abd48d1fe9de564a72325 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Thu, 29 Jun 2017 13:28:19 +0200
Subject: [PATCH 25/42] Date works

---
 .../java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 197765a..d412883 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
@@ -16,6 +16,7 @@ import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
@@ -33,11 +34,13 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     private LayoutInflater mInflater;
     private Context mContext;
     private ArrayList<UriPost> mData;
+    private DatabaseReference mRef;
 
     TimeLineAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mData = data;
+        mRef = FirebaseDatabase.getInstance().getReference();
     }
 
     @Override
@@ -74,7 +77,8 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
             @Override
             public void onClick(View v) {
                 Log.d(TAG, "onClick: " + position);
-                FirebaseDatabase.getInstance().getReference().child("posts").child(post.getDatabaseEntryName()).child("nietSlechts").setValue(post.getNietSlechts() + 1)
+                mRef.child("posts").child(post.getDatabaseEntryName())
+                        .child("nietSlechts").setValue(post.getNietSlechts() + 1)
                         .addOnCompleteListener(new OnCompleteListener<Void>() {
                             @Override
                             public void onComplete(@NonNull Task<Void> task) {
@@ -84,6 +88,8 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
             }
         });
 
+        dateTime.setText(post.getDate().toString());
+
         StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
         Glide.with(mContext)
                 .using(new FirebaseImageLoader())
-- 
2.49.1


From 7936350ede3f54593066bcff6ca9a0e83531249d Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Thu, 29 Jun 2017 13:35:49 +0200
Subject: [PATCH 26/42] Fix!

---
 .../java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java     | 6 ------
 1 file changed, 6 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 8146347..8282574 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
@@ -8,22 +8,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
-<<<<<<< HEAD
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
-=======
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
->>>>>>> origin/master
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
 
-- 
2.49.1


From bd4149ccb19edf3eb4e002a1807d9b9a59d437be Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 13:41:23 +0200
Subject: [PATCH 27/42] Added rotate restriction. Merge-prep with Felix.

---
 app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
index 2284c0c..23c8670 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
 
 
         <activity
+            android:screenOrientation="portrait"
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
@@ -34,7 +35,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".LoginActivity">
+        <activity
+            android:screenOrientation="portrait"
+            android:name=".LoginActivity">
 
         </activity>
     </application>
-- 
2.49.1


From c38cc026fc5756ccb5996337ab96eb1457718a1e Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Thu, 29 Jun 2017 13:42:44 +0200
Subject: [PATCH 28/42] Add progress bar for timeline

---
 .../nl/myhyvesbookplus/tagram/ProfileFragment.java  |  4 ++--
 .../nl/myhyvesbookplus/tagram/TimelineFragment.java | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 0b88e92..465a08a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -16,7 +16,6 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
@@ -39,7 +38,6 @@ import static android.app.Activity.RESULT_OK;
 public class ProfileFragment extends Fragment implements View.OnClickListener {
     static final int REQUEST_TAKE_PHOTO = 1;
     ProgressDialog progressDialog;
-    ProgressBar progressBar;
 
     /* Views, buttons and other protected and private inits */
     protected Button changePwdButton;
@@ -233,3 +231,5 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
         }
     }
 }
+
+
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index f545bd4..b4d56d8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -1,11 +1,9 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.app.Fragment;
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,20 +20,17 @@ public class TimelineFragment extends Fragment {
     /* Some protected and private inits */
     private ListView listView;
     private DownloadClass downloadClass;
-    ProgressDialog progressDialog;
-    ProgressBar progressBar;
+    private ProgressBar progressBar;
 
     /* Required empty public constructor */
     public TimelineFragment() {}
 
     /**
-     * Overridden onCreate which also starts a progress dialog for the posts being downloaded.
      * @param savedInstanceState The standard return of the onCreate method.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
     }
 
     /**
@@ -53,12 +48,8 @@ public class TimelineFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View timeLineInflater = inflater.inflate(R.layout.fragment_timeline, container, false);
-
-//        progressBar = new ProgressBar(getActivity());
-        Log.d("TIMELINEFRAGMENT", "onCreateView: PROGRESSBAR");
         progressBar = (ProgressBar) timeLineInflater.findViewById(R.id.progressbar_timeline);
         progressBar.setVisibility(View.VISIBLE);
-        progressBar.bringToFront();
 
         listView = (ListView) timeLineInflater.findViewById(R.id.list);
         final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) timeLineInflater.findViewById(R.id.swipe);
@@ -93,7 +84,6 @@ public class TimelineFragment extends Fragment {
                 swipeView.setEnabled(firstVisibleItem == 0);
             }
         });
-        progressBar.setVisibility(View.GONE);
         return timeLineInflater;
     }
 
@@ -103,5 +93,6 @@ public class TimelineFragment extends Fragment {
     public void startList() {
         TimeLineAdapter adapter = new TimeLineAdapter(getActivity(), downloadClass.getmList());
         listView.setAdapter(adapter);
+        progressBar.setVisibility(View.GONE);
     }
 }
-- 
2.49.1


From 9d016b8c6509882e7aca2d509813e8ed4b6efd44 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 14:01:27 +0200
Subject: [PATCH 29/42] Added a progressBar to the profilepage aswell.

---
 .../tagram/ProfileFragment.java               |  5 +++++
 .../res/layout/fragment_profile_timeline.xml  | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 465a08a..43493f4 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -16,6 +16,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.bumptech.glide.Glide;
@@ -52,6 +53,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     private DownloadClass downloadClass;
     private View headerInflater;
     private View timeLineInflater;
+    private ProgressBar progressBar;
 
     /* Required empty public constructor */
     public ProfileFragment() {}
@@ -109,6 +111,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
 
         timeLineInflater = inflater.inflate(R.layout.fragment_profile_timeline, container, false);
         headerInflater = inflater.inflate(R.layout.fragment_profile_header, listView, false);
+        progressBar = (ProgressBar) timeLineInflater.findViewById(R.id.progressbar_timeline);
+        progressBar.setVisibility(View.VISIBLE);
         findHeaderViews();
         findTimelineViews();
 
@@ -179,6 +183,7 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     public void startList() {
         ProfileAdapter adapter = new ProfileAdapter(getActivity(), downloadClass.getOwnPosts());
         listView.setAdapter(adapter);
+        progressBar.setVisibility(View.GONE);
      }
 
     /**
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
index 523ff58..ea8dc3c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
@@ -5,9 +5,24 @@
     android:orientation="vertical"
     tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
 
-    <ListView
-        android:id="@+id/list"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </ListView>
+
+        <ProgressBar
+            android:id="@+id/progressbar_timeline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"
+            android:visibility="gone"/>
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        </ListView>
+
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
-- 
2.49.1


From d8c04c78eacdd9d9f63335edb0334c568cabddc9 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Thu, 29 Jun 2017 14:32:03 +0200
Subject: [PATCH 30/42] Fix keyboard hiding crash + prettify findviewbyid's in
 camerafragment

---
 .../tagram/CameraFragment.java                | 58 ++++++++-----------
 .../src/main/res/layout/fragment_camera.xml   |  8 ---
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 575b956..58511ba 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -1,13 +1,10 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
-import android.media.Image;
-import android.net.Uri;
 import android.os.Bundle;
 import android.app.Fragment;
 import android.support.design.widget.FloatingActionButton;
@@ -19,6 +16,7 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import nl.myhyvesbookplus.tagram.controller.PostUploader;
@@ -31,9 +29,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
     private Bitmap mPhoto;
     private int facing = Camera.CameraInfo.CAMERA_FACING_BACK;
 
-    public CameraFragment() {
-        // Required empty public constructor
-    }
+    /* Required empty public constructor */
+    public CameraFragment() { }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -41,24 +38,28 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         // Inflate the layout for this fragment
         final View view = inflater.inflate(R.layout.fragment_camera, container, false);
 
+        final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
+        final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
+        final LinearLayout commentBox = (LinearLayout) view.findViewById(R.id.comment_box);
+        final ImageButton pictureButton = (ImageButton) view.findViewById(R.id.picture_button);
+        final ImageButton switchButton = (ImageButton) view.findViewById(R.id.switch_camera_button);
+
         // Hide the action bar
         ((AppCompatActivity)getActivity()).getSupportActionBar().hide();
 
         mCamera = getCameraInstance(facing);
 
         mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
-        final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
-        final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
 
         mCameraLayout.addView(mPreview);
 
         // Draw initial buttons over preview
-        view.findViewById(R.id.picture_button).bringToFront();
-        view.findViewById(R.id.switch_camera_button).bringToFront();
+        pictureButton.bringToFront();
+        switchButton.bringToFront();
         filterButtons.bringToFront();
 
         /* Upon pressing the switch camera facing button: */
-        (view.findViewById(R.id.switch_camera_button)).setOnClickListener(new View.OnClickListener() {
+        switchButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 switchFacing();
@@ -69,13 +70,13 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
                 mCameraLayout.addView(mPreview);
 
-                view.findViewById(R.id.picture_button).bringToFront();
-                view.findViewById(R.id.switch_camera_button).bringToFront();
+                pictureButton.bringToFront();
+                switchButton.bringToFront();
             }
         });
 
          /* Upon pressing the take photo button: */
-        (view.findViewById(R.id.picture_button)).setOnClickListener(new View.OnClickListener() {
+        pictureButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 mCamera.takePicture(null, null, new PictureCallback() {
@@ -101,12 +102,11 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         (view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                view.findViewById(R.id.comment_box).setClickable(true);
-                view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE);
-                view.findViewById(R.id.comment_box).bringToFront();
-                view.findViewById(R.id.filter_buttons).setVisibility(View.GONE);
+                commentBox.setClickable(true);
+                commentBox.setVisibility(View.VISIBLE);
+                commentBox.bringToFront();
+                filterButtons.setVisibility(View.GONE);
                 ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide();
-                hideKeyboard();
             }
         });
 
@@ -134,8 +134,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
                 mCameraLayout.addView(mPreview);
 
-                view.findViewById(R.id.picture_button).bringToFront();
-                view.findViewById(R.id.switch_camera_button).bringToFront();
+                pictureButton.bringToFront();
+                switchButton.bringToFront();
 
                 mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
                 hideKeyboard();
@@ -160,8 +160,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
                 mCameraLayout.addView(mPreview);
 
-                view.findViewById(R.id.picture_button).bringToFront();
-                view.findViewById(R.id.switch_camera_button).bringToFront();
+                pictureButton.bringToFront();
+                switchButton.bringToFront();
 
                 mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
                 hideKeyboard();
@@ -286,18 +286,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
         }
     }
 
-
-    //TODO: Kan dit weg? super aanroepen enzo.
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
     @Override
     public void PostUploadComplete(Boolean success) {
 
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 9815205..9470c2a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
@@ -36,14 +36,6 @@
             android:background="@android:color/transparent"
             android:src="@drawable/ic_switch_camera_black_24dp"/>
 
-        <ProgressBar
-            android:id="@+id/load_bar"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:layout_centerInParent="true"/>
-
         <RelativeLayout
             android:id="@+id/filter_buttons"
             android:layout_width="match_parent"
-- 
2.49.1


From 0a7c49b3a3bff365239c8887b793c7ffff726e4d Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Thu, 29 Jun 2017 15:18:12 +0200
Subject: [PATCH 31/42] added animation

---
 .../tagram/ProfileAdapter.java                | 154 +++++++++++++++++-
 .../tagram/TimeLineAdapter.java               | 154 +++++++++++++++++-
 .../res/layout/fragment_profile_timeline.xml  |  11 +-
 .../src/main/res/layout/fragment_timeline.xml |  10 +-
 4 files changed, 322 insertions(+), 7 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
index 357876a..0535f55 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
@@ -1,15 +1,22 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.content.Context;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 
 import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
@@ -33,6 +40,7 @@ public class ProfileAdapter extends BaseAdapter {
     private TextView comment;
     private TextView nietSlechts;
     private ImageView photo;
+    private Animator mCurrentAnimator;
 
     ProfileAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
@@ -61,12 +69,19 @@ public class ProfileAdapter extends BaseAdapter {
         View newRowView = findViews(rowView);
         UriPost post = (UriPost) getItem(position);
         comment.setText(post.getComment());
-        StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
+        final StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
         Glide.with(mContext)
                 .using(new FirebaseImageLoader())
                 .load(ref)
                 .into(photo);
 
+        photo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                zoomImageFromThumb(photo, ref);
+            }
+        });
+
         return newRowView;
     }
 
@@ -76,4 +91,141 @@ public class ProfileAdapter extends BaseAdapter {
         photo = (ImageView) rowView.findViewById(R.id.timeline_image_profile);
         return rowView;
     }
+
+    /**
+     * https://developer.android.com/training/animation/zoom.html
+     * "Zooms" in a thumbnail view by assigning the high resolution image to a hidden "zoomed-in"
+     * image view and animating its bounds to fit the entire activity content area.
+     *
+     * @param thumbView  The thumbnail view to zoom in.
+     * @param imageRef The high-resolution version of the image represented by the thumbnail.
+     */
+    private void zoomImageFromThumb(final View thumbView, StorageReference imageRef) {
+        // If there's an animation in progress, cancel it immediately and proceed with this one.
+        if (mCurrentAnimator != null) {
+            mCurrentAnimator.cancel();
+        }
+
+        // Load the high-resolution "zoomed-in" image.
+        final ImageView hiddenView = (ImageView) ((MainActivity) mContext).findViewById(R.id.expanded_image_profile);
+
+        Glide.with(mContext)
+                .using(new FirebaseImageLoader())
+                .load(imageRef)
+                .into(hiddenView);
+
+        // Calculate the starting and ending bounds for the zoomed-in image. This step
+        // involves lots of math. Yay, math.
+        final Rect startBounds = new Rect();
+        final Rect finalBounds = new Rect();
+        final Point globalOffset = new Point();
+
+        // The start bounds are the global visible rectangle of the thumbnail, and the
+        // final bounds are the global visible rectangle of the container view. Also
+        // set the container view's offset as the origin for the bounds, since that's
+        // the origin for the positioning animation properties (X, Y).
+        thumbView.getGlobalVisibleRect(startBounds);
+        ((MainActivity) mContext).findViewById(R.id.relative_layout_timeline_profile).getGlobalVisibleRect(finalBounds, globalOffset);
+        startBounds.offset(-globalOffset.x, -globalOffset.y);
+        finalBounds.offset(-globalOffset.x, -globalOffset.y);
+
+        // Adjust the start bounds to be the same aspect ratio as the final bounds using the
+        // "center crop" technique. This prevents undesirable stretching during the animation.
+        // Also calculate the start scaling factor (the end scaling factor is always 1.0).
+        float startScale;
+        if ((float) finalBounds.width() / finalBounds.height()
+                > (float) startBounds.width() / startBounds.height()) {
+            // Extend start bounds horizontally
+            startScale = (float) startBounds.height() / finalBounds.height();
+            float startWidth = startScale * finalBounds.width();
+            float deltaWidth = (startWidth - startBounds.width()) / 2;
+            startBounds.left -= deltaWidth;
+            startBounds.right += deltaWidth;
+        } else {
+            // Extend start bounds vertically
+            startScale = (float) startBounds.width() / finalBounds.width();
+            float startHeight = startScale * finalBounds.height();
+            float deltaHeight = (startHeight - startBounds.height()) / 2;
+            startBounds.top -= deltaHeight;
+            startBounds.bottom += deltaHeight;
+        }
+
+        // Hide the thumbnail and show the zoomed-in view. When the animation begins,
+        // it will position the zoomed-in view in the place of the thumbnail.
+        thumbView.setAlpha(0f);
+        hiddenView.setVisibility(View.VISIBLE);
+
+        // Set the pivot point for SCALE_X and SCALE_Y transformations to the top-left corner of
+        // the zoomed-in view (the default is the center of the view).
+        hiddenView.setPivotX(0f);
+        hiddenView.setPivotY(0f);
+
+        // Construct and run the parallel animation of the four translation and scale properties
+        // (X, Y, SCALE_X, and SCALE_Y).
+        AnimatorSet set = new AnimatorSet();
+        set
+                .play(ObjectAnimator.ofFloat(hiddenView, View.X, startBounds.left,
+                        finalBounds.left))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.Y, startBounds.top,
+                        finalBounds.top))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.SCALE_X, startScale, 1f))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.SCALE_Y, startScale, 1f));
+        set.setDuration(200);
+        set.setInterpolator(new DecelerateInterpolator());
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mCurrentAnimator = null;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mCurrentAnimator = null;
+            }
+        });
+        set.start();
+        mCurrentAnimator = set;
+
+        // Upon clicking the zoomed-in image, it should zoom back down to the original bounds
+        // and show the thumbnail instead of the expanded image.
+        final float startScaleFinal = startScale;
+        hiddenView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mCurrentAnimator != null) {
+                    mCurrentAnimator.cancel();
+                }
+
+                // Animate the four positioning/sizing properties in parallel, back to their
+                // original values.
+                AnimatorSet set = new AnimatorSet();
+                set
+                        .play(ObjectAnimator.ofFloat(hiddenView, View.X, startBounds.left))
+                        .with(ObjectAnimator.ofFloat(hiddenView, View.Y, startBounds.top))
+                        .with(ObjectAnimator
+                                .ofFloat(hiddenView, View.SCALE_X, startScaleFinal))
+                        .with(ObjectAnimator
+                                .ofFloat(hiddenView, View.SCALE_Y, startScaleFinal));
+                set.setDuration(200);
+                set.setInterpolator(new DecelerateInterpolator());
+                set.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        thumbView.setAlpha(1f);
+                        hiddenView.setVisibility(View.GONE);
+                        mCurrentAnimator = null;
+                    }
+
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
+                        thumbView.setAlpha(1f);
+                        hiddenView.setVisibility(View.GONE);
+                        mCurrentAnimator = null;
+                    }
+                });
+                set.start();
+                mCurrentAnimator = set;
+            }
+        });
+    }
 }
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 8282574..fb8c7ef 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
@@ -1,16 +1,23 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.content.Context;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 
 import com.bumptech.glide.Glide;
 import com.firebase.ui.storage.images.FirebaseImageLoader;
@@ -35,6 +42,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     private Context mContext;
     private ArrayList<UriPost> mData;
     private DatabaseReference mRef;
+    private Animator mCurrentAnimator;
 
     TimeLineAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
@@ -66,7 +74,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
         TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline);
         final TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
         TextView dateTime = (TextView) rowView.findViewById(R.id.timeline_date);
-        ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
+        final ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
         final ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button);
 
         final UriPost post = (UriPost) getItem(position);
@@ -91,12 +99,18 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
 
         dateTime.setText(post.getDate().toString());
 
-        StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
+        final StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri());
         Glide.with(mContext)
                 .using(new FirebaseImageLoader())
                 .load(ref)
                 .into(photo);
 
+        photo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                zoomImageFromThumb(photo, ref);
+            }
+        });
 
         return rowView;
     }
@@ -119,4 +133,140 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
         Log.d(TAG, "onItemClick: rowNumber! "+ position);
     }
 
+    /**
+     * https://developer.android.com/training/animation/zoom.html
+     * "Zooms" in a thumbnail view by assigning the high resolution image to a hidden "zoomed-in"
+     * image view and animating its bounds to fit the entire activity content area.
+     *
+     * @param thumbView  The thumbnail view to zoom in.
+     * @param imageRef The high-resolution version of the image represented by the thumbnail.
+     */
+    private void zoomImageFromThumb(final View thumbView, StorageReference imageRef) {
+        // If there's an animation in progress, cancel it immediately and proceed with this one.
+        if (mCurrentAnimator != null) {
+            mCurrentAnimator.cancel();
+        }
+
+        // Load the high-resolution "zoomed-in" image.
+        final ImageView hiddenView = (ImageView) ((MainActivity) mContext).findViewById(R.id.expanded_image);
+
+        Glide.with(mContext)
+                .using(new FirebaseImageLoader())
+                .load(imageRef)
+                .into(hiddenView);
+
+        // Calculate the starting and ending bounds for the zoomed-in image. This step
+        // involves lots of math. Yay, math.
+        final Rect startBounds = new Rect();
+        final Rect finalBounds = new Rect();
+        final Point globalOffset = new Point();
+
+        // The start bounds are the global visible rectangle of the thumbnail, and the
+        // final bounds are the global visible rectangle of the container view. Also
+        // set the container view's offset as the origin for the bounds, since that's
+        // the origin for the positioning animation properties (X, Y).
+        thumbView.getGlobalVisibleRect(startBounds);
+        ((MainActivity) mContext).findViewById(R.id.relative_layout_timeline).getGlobalVisibleRect(finalBounds, globalOffset);
+        startBounds.offset(-globalOffset.x, -globalOffset.y);
+        finalBounds.offset(-globalOffset.x, -globalOffset.y);
+
+        // Adjust the start bounds to be the same aspect ratio as the final bounds using the
+        // "center crop" technique. This prevents undesirable stretching during the animation.
+        // Also calculate the start scaling factor (the end scaling factor is always 1.0).
+        float startScale;
+        if ((float) finalBounds.width() / finalBounds.height()
+                > (float) startBounds.width() / startBounds.height()) {
+            // Extend start bounds horizontally
+            startScale = (float) startBounds.height() / finalBounds.height();
+            float startWidth = startScale * finalBounds.width();
+            float deltaWidth = (startWidth - startBounds.width()) / 2;
+            startBounds.left -= deltaWidth;
+            startBounds.right += deltaWidth;
+        } else {
+            // Extend start bounds vertically
+            startScale = (float) startBounds.width() / finalBounds.width();
+            float startHeight = startScale * finalBounds.height();
+            float deltaHeight = (startHeight - startBounds.height()) / 2;
+            startBounds.top -= deltaHeight;
+            startBounds.bottom += deltaHeight;
+        }
+
+        // Hide the thumbnail and show the zoomed-in view. When the animation begins,
+        // it will position the zoomed-in view in the place of the thumbnail.
+        thumbView.setAlpha(0f);
+        hiddenView.setVisibility(View.VISIBLE);
+
+        // Set the pivot point for SCALE_X and SCALE_Y transformations to the top-left corner of
+        // the zoomed-in view (the default is the center of the view).
+        hiddenView.setPivotX(0f);
+        hiddenView.setPivotY(0f);
+
+        // Construct and run the parallel animation of the four translation and scale properties
+        // (X, Y, SCALE_X, and SCALE_Y).
+        AnimatorSet set = new AnimatorSet();
+        set
+                .play(ObjectAnimator.ofFloat(hiddenView, View.X, startBounds.left,
+                        finalBounds.left))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.Y, startBounds.top,
+                        finalBounds.top))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.SCALE_X, startScale, 1f))
+                .with(ObjectAnimator.ofFloat(hiddenView, View.SCALE_Y, startScale, 1f));
+        set.setDuration(200);
+        set.setInterpolator(new DecelerateInterpolator());
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mCurrentAnimator = null;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mCurrentAnimator = null;
+            }
+        });
+        set.start();
+        mCurrentAnimator = set;
+
+        // Upon clicking the zoomed-in image, it should zoom back down to the original bounds
+        // and show the thumbnail instead of the expanded image.
+        final float startScaleFinal = startScale;
+        hiddenView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mCurrentAnimator != null) {
+                    mCurrentAnimator.cancel();
+                }
+
+                // Animate the four positioning/sizing properties in parallel, back to their
+                // original values.
+                AnimatorSet set = new AnimatorSet();
+                set
+                        .play(ObjectAnimator.ofFloat(hiddenView, View.X, startBounds.left))
+                        .with(ObjectAnimator.ofFloat(hiddenView, View.Y, startBounds.top))
+                        .with(ObjectAnimator
+                                .ofFloat(hiddenView, View.SCALE_X, startScaleFinal))
+                        .with(ObjectAnimator
+                                .ofFloat(hiddenView, View.SCALE_Y, startScaleFinal));
+                set.setDuration(200);
+                set.setInterpolator(new DecelerateInterpolator());
+                set.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        thumbView.setAlpha(1f);
+                        hiddenView.setVisibility(View.GONE);
+                        mCurrentAnimator = null;
+                    }
+
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
+                        thumbView.setAlpha(1f);
+                        hiddenView.setVisibility(View.GONE);
+                        mCurrentAnimator = null;
+                    }
+                });
+                set.start();
+                mCurrentAnimator = set;
+            }
+        });
+    }
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
index fd06e94..56a00ad 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile_timeline.xml
@@ -1,4 +1,5 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/relative_layout_timeline_profile"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +12,10 @@
         android:layout_height="match_parent">
     </ListView>
 
-</LinearLayout>
\ No newline at end of file
+    <ImageView
+        android:id="@+id/expanded_image_profile"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
index fe7a080..effb17f 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
@@ -1,4 +1,5 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/relative_layout_timeline"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -19,5 +20,10 @@
 
     </android.support.v4.widget.SwipeRefreshLayout>
 
+    <ImageView
+        android:id="@+id/expanded_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
-- 
2.49.1


From 6258c2a91af0c76a0c3a01730adcdd7f26621fbc Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 15:20:40 +0200
Subject: [PATCH 32/42] Fixed the refresh combined with the progressBar.

---
 .../java/nl/myhyvesbookplus/tagram/TimelineFragment.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index b4d56d8..8259b44 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -1,6 +1,7 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.app.Fragment;
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -26,11 +27,13 @@ public class TimelineFragment extends Fragment {
     public TimelineFragment() {}
 
     /**
+     * Overridden onCreate which also starts a progress dialog for the posts being downloaded.
      * @param savedInstanceState The standard return of the onCreate method.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+//        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
     }
 
     /**
@@ -48,12 +51,12 @@ public class TimelineFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View timeLineInflater = inflater.inflate(R.layout.fragment_timeline, container, false);
-        progressBar = (ProgressBar) timeLineInflater.findViewById(R.id.progressbar_timeline);
-        progressBar.setVisibility(View.VISIBLE);
-
         listView = (ListView) timeLineInflater.findViewById(R.id.list);
         final SwipeRefreshLayout swipeView = (SwipeRefreshLayout) timeLineInflater.findViewById(R.id.swipe);
 
+        progressBar = (ProgressBar) timeLineInflater.findViewById(R.id.progressbar_timeline);
+        progressBar.setVisibility(View.VISIBLE);
+
         swipeView.setEnabled(false);
         downloadClass = new DownloadClass(getActivity());
         downloadClass.getPostsFromServer();
-- 
2.49.1


From 5a6abe85f16ce63e8e43acaeaa313fe0569c9076 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Thu, 29 Jun 2017 15:41:16 +0200
Subject: [PATCH 33/42] Timeline layout now with imagebutton

---
 .../app/src/main/res/drawable/niet_slecht.png | Bin 0 -> 45314 bytes
 .../main/res/layout/list_item_timeline.xml    |  32 ++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/niet_slecht.png

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/niet_slecht.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/niet_slecht.png
new file mode 100644
index 0000000000000000000000000000000000000000..73d711774978e9ffb1eb172438bbb9aabd74385e
GIT binary patch
literal 45314
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
EKMGE8E&u=k

literal 0
HcmV?d00001

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 e4d92b8..dfacaab 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
@@ -21,39 +21,43 @@
         android:layout_gravity="center"
         android:layout_height="250dp" />
 
+    <TextView
+        android:id="@+id/timeline_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingBottom="5dp"
+        android:textColor="#AAAAAA"
+        android:text="date/time" />
+
     <TextView
         android:id="@+id/comment_timeline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="@string/comment_placeholder" />
+        android:text="Hallo Ik ben een comment!" />
 
     <LinearLayout
+        android:padding="5dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="horizontal">
 
-        <Button
+        <ImageButton
             android:id="@+id/niet_slecht_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/niet_slecht"/>
-
-        <!--
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/niet_slecht" />
-            -->
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:scaleType="centerInside"
+            android:background="@android:color/transparent"
+            android:src="@drawable/niet_slecht"/>
 
         <TextView
             android:id="@+id/niet_slecht_count"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:textSize="20dp"
-            android:padding="10dp"
+            android:textSize="20sp"
             android:text="10" />
     </LinearLayout>
 
-- 
2.49.1


From 32f39a35dbe93b30d98b9a0565986eaa6cc3ed9e Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 15:51:00 +0200
Subject: [PATCH 34/42] Profile timeline button remade.

---
 .../res/layout/list_item_timeline_profile.xml  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index 04382db..65623ef 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -27,19 +27,21 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:text="@string/niet_slecht"/>
+        <ImageButton
+            android:id="@+id/niet_slecht_button"
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:scaleType="centerInside"
+            android:background="@android:color/transparent"
+            android:src="@drawable/niet_slecht"/>
+
         <TextView
-            android:gravity="center"
             android:id="@+id/niet_slecht_count_profile"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="   10"
+            android:gravity="center"
             android:textSize="20sp"
-            android:padding="10dp"/>
+            android:text="10" />
     </LinearLayout>
 
     <Space
-- 
2.49.1


From a4108e9e193cf0816c00521c1c3c109d2f48126d Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Thu, 29 Jun 2017 16:01:04 +0200
Subject: [PATCH 35/42] Fixed double things in timeline :)

---
 .../nl/myhyvesbookplus/tagram/controller/DownloadClass.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
index 50cbf40..6711581 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java
@@ -33,10 +33,11 @@ public class DownloadClass {
                     + " must implement PostDownloadListener");
         }
         mDataRef = FirebaseDatabase.getInstance().getReference();
-        mList = new ArrayList<>();
     }
 
     public void getPostsFromServer() {
+        mList = new ArrayList<>();
+
         mDataRef.child("posts").addListenerForSingleValueEvent(new ValueEventListener() {
             @Override
             public void onDataChange(DataSnapshot dataSnapshot) {
-- 
2.49.1


From 1f4fa4c76888a9447602fe2369ca629aceb6ebdb Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 16:21:18 +0200
Subject: [PATCH 36/42] Fixed sepia filter uploading black pictures.

---
 .../src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
index 33749e6..7a26880 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
@@ -73,6 +73,7 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
+                saveCanvas.setBitmap(filterPicture);
                 saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 break;
-- 
2.49.1


From 250ee529fee2890ef2f3a0b36a8c63d051e9c75b Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Thu, 29 Jun 2017 16:46:16 +0200
Subject: [PATCH 37/42] Added comments for the files. Needs reviewing from
 Paul.

---
 .../tagram/CameraFragment.java                | 12 +++--------
 .../tagram/ProfileAdapter.java                | 20 +++++++++++++------
 .../tagram/ProfileFragment.java               |  5 +++++
 .../tagram/TimeLineAdapter.java               | 11 ++++++++--
 .../tagram/TimelineFragment.java              |  1 -
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 58511ba..b7296c8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -246,15 +246,9 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
      * Switch between front facing camera and the back camera.
      */
     public void switchFacing() {
-        if (facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
-            facing = Camera.CameraInfo.CAMERA_FACING_BACK;
-        else
-            facing = Camera.CameraInfo.CAMERA_FACING_FRONT;
-// TODO
-//       facing =
-//          facing == Camera.CameraInfo.CAMERA_FACING_FRONT ?
-//          Camera.CameraInfo.CAMERA_FACING_BACK :
-//          Camera.CameraInfo.CAMERA_FACING_FRONT;
+       facing = facing == Camera.CameraInfo.CAMERA_FACING_FRONT ?
+       Camera.CameraInfo.CAMERA_FACING_BACK :
+       Camera.CameraInfo.CAMERA_FACING_FRONT;
     }
 
     /**
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
index e73a816..b365e14 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileAdapter.java
@@ -8,10 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.TextView;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -28,12 +25,10 @@ import java.util.ArrayList;
 import nl.myhyvesbookplus.tagram.model.UriPost;
 
 /**
- * Created by niels on 27-6-17.
+ * Class which creates views for the profile-page timeline. This is done with a ListView.
  */
 
 public class ProfileAdapter extends BaseAdapter {
-
-    private static final String TAG = "ProfileAdapter";
     private LayoutInflater mInflater;
     private Context mContext;
     private ArrayList<UriPost> mData;
@@ -42,6 +37,7 @@ public class ProfileAdapter extends BaseAdapter {
     private ImageView photo;
     private Animator mCurrentAnimator;
 
+    /* ProfileAdapter constructor */
     ProfileAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -63,6 +59,13 @@ public class ProfileAdapter extends BaseAdapter {
         return position;
     }
 
+    /**
+     *  Initiate a new view to be part of the ListView.
+     * @param position The position at which the view should start.
+     * @param convertView The viewconverter.
+     * @param parent The parent of the view.
+     * @return
+     */
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         View rowView = mInflater.inflate(R.layout.list_item_timeline_profile, parent, false);
@@ -85,6 +88,11 @@ public class ProfileAdapter extends BaseAdapter {
         return newRowView;
     }
 
+    /**
+     * Find all views from within the row.
+     * @param rowView The row from which views must be found.
+     * @return The rowView which contains the necessary views.
+     */
     private View findViews(View rowView) {
         comment = (TextView) rowView.findViewById(R.id.comment_timeline_profile);
         nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count_profile);
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 43493f4..a9a45cd 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -36,6 +36,11 @@ import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader;
 
 import static android.app.Activity.RESULT_OK;
 
+/**
+ * Profilefragment which holds the personal info of the user.
+ * Makes use of ProfileAdapter in order to load in the items for ListView.
+ */
+
 public class ProfileFragment extends Fragment implements View.OnClickListener {
     static final int REQUEST_TAKE_PHOTO = 1;
     ProgressDialog progressDialog;
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 ed92a63..96c3dc1 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
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import nl.myhyvesbookplus.tagram.model.UriPost;
 
 /**
- * Created by marijnjansen on 26/06/2017.
+ * Class which creates views for the home-page timeline. This is done with a ListView.
  */
 
 public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemClickListener {
@@ -44,6 +44,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     private DatabaseReference mRef;
     private Animator mCurrentAnimator;
 
+    /* TimeLineAdapter constructor */
     TimeLineAdapter(Context context, ArrayList<UriPost> data) {
         mContext = context;
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -66,11 +67,17 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
         return position;
     }
 
+    /**
+     *  Initiate a new view to be part of the ListView.
+     * @param position The position at which the view should start.
+     * @param convertView The viewconverter.
+     * @param parent The parent of the view.
+     * @return
+     */
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
         View rowView = mInflater.inflate(R.layout.list_item_timeline, parent, false);
 
-        TextView userName = (TextView) rowView.findViewById(R.id.username_timeline);
         TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline);
         final TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count);
         TextView dateTime = (TextView) rowView.findViewById(R.id.timeline_date);
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index 8259b44..32633f0 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -1,7 +1,6 @@
 package nl.myhyvesbookplus.tagram;
 
 import android.app.Fragment;
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
-- 
2.49.1


From 979f1aab9a05d2795bbc3c7e38896cda192fcc7b Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Thu, 29 Jun 2017 16:46:34 +0200
Subject: [PATCH 38/42] Add comments

---
 .../tagram/PicturePreview.java                | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
index 33749e6..4176f88 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
@@ -15,11 +15,10 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
 /**
- * Created by felix on 23/06/2017.
+ * Draws the picture taken and applies filters, which can be switched.
  */
-
 public class PicturePreview extends SurfaceView implements SurfaceHolder.Callback {
-    private static final String TAG = "PicturePreveiew";
+    private static final String TAG = "PicturePreview";
     private static final int FILTER_NONE = 0;
     private static final int FILTER_SEPIA = 1;
     private static final int FILTER_BW = 2;
@@ -27,11 +26,17 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
     private static int currentFilter = FILTER_NONE;
 
-    int facing;
-    int rotate;
-    Bitmap picture;
-    Bitmap filterPicture;
+    private int facing;
+    private int rotate;
+    private Bitmap picture;
+    private Bitmap filterPicture;
 
+    /**
+     * Constructor: changes image based on current direction the camera is facing.
+     * @param context
+     * @param bmp Image to be previewed.
+     * @param facing Direction camera is facing.
+     */
     public PicturePreview(Context context, Bitmap bmp, int facing) {
         super(context);
         setWillNotDraw(false);
@@ -45,9 +50,12 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
             picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
             rotate = 90;
         }
-        Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight());
     }
 
+    /**
+     * Checks the current filter and draws and saves the image with altered colours.
+     * @param canvas
+     */
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
@@ -73,6 +81,7 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
 
                 filter = new ColorMatrixColorFilter(cm);
                 paint.setColorFilter(filter);
+                saveCanvas.setBitmap(filterPicture);
                 saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
                 break;
@@ -106,6 +115,9 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
         }
     }
 
+    /**
+     * Switches filter to the left.
+     */
     public static void filterPrev() {
         switch (currentFilter) {
             case FILTER_NONE:
@@ -123,6 +135,9 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
         }
     }
 
+    /**
+     * Switches filter to the right.
+     */
     public static void filterNext() {
         switch (currentFilter) {
             case FILTER_NONE:
@@ -140,6 +155,12 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
         }
     }
 
+    /**
+     * Rotates an image by a specified amount of degrees by matrix.
+     * @param bmp Image to be rotated.
+     * @param degree Amount of degrees to rotate
+     * @return Rotated image.
+     */
     public static Bitmap rotate(Bitmap bmp, int degree) {
         Matrix mtx = new Matrix();
         mtx.postRotate(degree);
@@ -160,9 +181,12 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
     }
 
+    /**
+     * Recycles pictures to free memory.
+     * @param holder
+     */
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
-        Log.d(TAG, "surfaceDestroyed: PICTURE DESTROYED");
         picture.recycle();
         filterPicture.recycle();
     }
-- 
2.49.1


From d0bd10a854af5cdac89d02f7f89bbd5fa5fb81fb Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Fri, 30 Jun 2017 10:04:05 +0200
Subject: [PATCH 39/42] Added personal log file.

---
 Idividuele_Documenten/niels_zwemmer.md        | 102 ++++++++++++++++++
 .../tagram/TimelineFragment.java              |  10 --
 2 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 Idividuele_Documenten/niels_zwemmer.md

diff --git a/Idividuele_Documenten/niels_zwemmer.md b/Idividuele_Documenten/niels_zwemmer.md
new file mode 100644
index 0000000..7aca284
--- /dev/null
+++ b/Idividuele_Documenten/niels_zwemmer.md
@@ -0,0 +1,102 @@
+The Return of the MyHyvesBook+ : MyHyvesBookPlusTagram
+=======================================
+### _Vak 'Multimedia' van Bsc Informatica leerjaar 1_
+Niels Zwemmer | 11025980 | UvA | Persoonlijk logboek | Begeleider Youri Voet
+
+## Introductie
+De volgende logboek-entries zijn die van mij persoonlijk per dag genoteerd. Ik heb gekozen voor markdown omdat dit een eenvoudig te updaten document is, zonder de noodzaak tot recompilen en dan her-uploaden van het PDF bestand zoals het geval is bij LaTeX. Zodra dit logboek klaar is, zal ik proberen ook een LaTeX versie erbij te doen. Onderstaand logboek wordt verwerkt in het uiteindelijke individuele rapport. (LaTeX).
+
+## Logboek per dag
+
+**19-6-2017**  
+De dag verliep anders dan verwacht door een onverwachte opdracht die de TA's ons oplegde. Deze bestond uit een pitch van een paar minuten die ons plan en project duidelijk moesten maken. Dit plan werd goedgekeurd door Youri. Voor de pitches stond de tijd van 13:00 tot 14:00 ingeplanned. Door deze pitch is onze vergadering verplaatst naar morgen van 11:00 tot 12:00 (zie hieronder).
+Naast de pitch heb ik vandaag ook nog gewerkt aan het projectplan en deze afgemaakt voor het inleveren op Blackboard. Hierbij is de planning dan het enige nog ontbrekende onderdeel. Deze zal tijdens de vergadering morgen worden afgerond.  
+Wij hebben daarnaast gewerkt aan onze code, met hulp van zowel Marijn als de referenties hieronder.  
+Eenmaal weer thuis aangekomen, heb ik de laatste hand gelegd aan het projectplan en deze klaargemaakt voor het inleveren.
+
+_Referenties_  
+* [Firebase-documentatie](https://firebase.google.com/docs/guides/)
+* [Android-documentatie](https://developer.android.com/guide/index.html)
+
+**20-6-2017**  
+Allereerst zijn de laatste oefenopgaven nagekeken. Daarna zijn Felix en Marijn direct begonnen aan hun onderdelen implementeren waarna Paul en ik zich bij hen voegden.  
+Paul is begonnen aan de profielpagina en ik heb hem daarmee geholpen. Daarnaast heb ik de notulen voor de vergadering gemaakt die vandaag van 11:00 tot 12:00 plaatsvond. Tijdens deze vergadering zijn vooral een aantal ontwerpkeuzes besproken, zoals het vernieuwde logo, hoe ziet de planning eruit, wat hebben we tot nu toe al werkend en hoe kunnen we dit aan elkaar gelijk houden qua ontwerp.  
+Tot slot heb ik een LaTeX-template gemaakt voor de logboeken van ieder persoon, zodat productiviteit zo veel mogelijk ongehinderd kan blijven door het achteraf moeten stroomlijnen van dit soort zaken.  
+
+_Note: Dit template had ik reeds gemaakt voor mijn keuze over te stappen op markdown. Ik houd nu voor mijzelf een markdown-bestand aan maar hou daarnaast per dag een algemeen logboek bij wat de overige leden kunnen gebruiken om hun persoonlijke logboek te updaten. Dit LaTeX bestand staat op gitlab en is ter beschikking gesteld voor alle TA's._
+
+Thuis heb ik gewerkt aan mijn Firebase-kennis en heb ik het projectplan ingeleverd na de laatste wijzigingen doorgevoerd te hebben. Ook heb ik zelf even een blik geworpen op het wachtwoord-wijzig systeem. Dit leek mij niet al te moeilijk voor een beginner en dus zou ik hier morgen zelf mee aan de slag gaan.
+
+**21-6-2017**  
+De dag begon om 11:00 met een bijeenkomst van Marijn, Paul en mijzelf. Felix kon niet aanwezig zijn vandaag maar heeft dat gecompenseerd door veel thuis gewerkt te hebben aan de opdracht. Paul en ik hebben de profielpagina nagenoeg afgemaakt en we wachten nu tot Marijn en Felix hun eerste deel hebben geïmplementeerd zodat wij verder kunnen. Dit zijn de onderdelen foto uploaden en wachtwoord wijzigen.  
+Om 13:00 ging Marijn naar zijn Minor Programmeren groep om daar TA te zijn. Paul en ik hebben tussen 13:00 en 15:00 gewerkt aan de interface opleuken van de profielpagina naast de functionaliteiten die eerder al waren verwerkt.
+Om 15:00 ging iedereen naar huis, met uitzondering van Marijn die pas om 16:00 klaar was.
+
+Wederom heb ik thuis verder gewerkt, waar ik deze keer ideëen voor de poster en flyers heb bekeken en genoteerd. Daarnaast heb ik het logboek bijgewerkt en de wachtwoord-wijzig methode geïmplementeerd. Dit beviel goed en zorgde voor een beter begrip van Fragments, Activities en Firebase.
+
+_Referenties_  
+* [Fragments](https://developer.android.com/guide/components/fragments.html)
+* [Activities](https://developer.android.com/guide/components/activities/index.html)
+
+**22-6-2017**  
+Vandaag hebben wij om 10 uur afgesproken om alvast een eerste versie van onze poster te maken. We zijn over het algemeen al tevreden over dat resultaat maar de definitieve versie zal minder tekst en meer, grotere plaatjes moeten bevatten.
+Nadat de poster klaar was, hebben wij geprogrammeerd tot 15:00; de tijd waarop de PAV bijeenkomst begon.
+Marijn was vanaf 13:00 weer te vinden in het Minor Programmeren lokaal. We hebben allemaal wat progressie geboekt. Paul heeft Felix ondersteunt met zijn camera implementatie waardoor Felix nu bijna toe is aan de filterimplementatie.
+Marijn is bezig geweest aan de poster ontwerpen onder het toeziend oog van Felix als hoofd-design en ik heb een eerste implementatie gedaan voor het updaten van de profielfoto. Na de PAV-bijeenkomst is iedereen in de stromende regen naar huis gegaan. Ik heb daarbij in de trein naar huis gewerkt aan het logboek en heb de eerste versie van de profielfoto-wijziging op gitlab gezet. Marijn zal nu de upload-class moeten afmaken zodat ik deze kan gebruiken voor de profielfoto.
+
+Voor deze eerste versie heb ik wederom alleen gebruik gemaakt van de reeds genoemde documentaties. Echter heb ik voor de "timeline" interface die wij willen implementeren, een mogelijk goede bron gevonden. Deze zal terug te vinden zijn in de referentielijst hieronder. Of wij deze bron uiteindelijk gaan gebruiken staat nog niet vast, maar voor de logboek-documentatie leek het mij een goed idee om deze bron alvast op te nemen voor toekomstige referentie.
+
+_Referenties_  
+* [Android-documentatie](https://developer.android.com/guide/index.html)
+* [Timeline-bron](http://www.androidhive.info/2014/06/android-facebook-like-custom-listview-feed-using-volley/)
+* [Camera](https://developer.android.com/training/camera/photobasics.html)
+* [Upload to Firebase](https://firebase.google.com/docs/storage/android/upload-files)
+
+
+**23-6-2017**  
+De dag begon deze keer met een korte programmeersessie tussen Marijn en mij. Felix was iets later aanwezig. Marijn heeft mij geholpen met een aantal laatste functionaliteiten toevoegen voor het uploaden van een foto naar de Firebase storage. Felix heeft zich vooral bezig gehouden met het implementeren van de filters. Hij heeft zijn camera-deel waarbij zowel een upload -als opslagfunctie is ingebouwd nu bijna af.
+Paul kon vandaag niet aanwezig zijn. Hij heeft zich echter van huis uit bezig gehouden met zijn gedeelte van de profielpagina en heeft een aantal wijzigingen met mij besproken. We hebben een vergadering gehouden van 11:30 tot ongeveer 12:30. Uit deze vergadering zijn een aantal dingen gebleken. Zo hebben wij bijvoorbeeld geconstateerd dat een bitmap niet de beste methode is om de profielfoto op te slaan, omdat deze een slechte kwaliteit biedt.
+Marijn was vandaag niet nodig bij de Minor Programmeren. Hierdoor waren wij de gehele dag gezamelijk bezig aan de opdracht wat ervoor zorgde dat er een grote productiviteit was.
+Op de terugweg naar huis heb ik de notulen van de vergadering van vandaag verwerkt. Thuis aangekomen heb ik tot laat op de avond gewerkt aan het omschrijven van de profielfoto functionaliteit van een bitmap naar een foto-bestand. Dit kon echter niet vervolledigd worden en hier zal dan ook in het weekend of maandag met andere leden naar gekeken moeten worden. Voor het omschrijven van deze functionaliteit heb ik dezelfde bronnen gebruikt als gisteren, waar men iets verder door moet scrollen om op de juiste onderdelen uit te komen.
+
+_Referenties_  
+* [Camera](https://developer.android.com/training/camera/photobasics.html)
+* [Upload to Firebase](https://firebase.google.com/docs/storage/android/upload-files)
+
+**24-6-2017 (zaterdag)**  
+Een ieder is van huis uit bezig geweest met zijn eigen onderdelen t.b.v. Trello.  
+Communicatieverkeer was er nauwelijks omdat iedereen nu goed gefocused kon zijn op zijn eigen werk.
+Ik ben vandaag zelf wat verder gaan inlezen in de documentatie maar heb voor nu de implementatie en upload naar Firebase even links laten liggen, zodat dit knelpunt morgen met de overige groepsleden kan worden aangepakt.
+
+**25-6-2017 (zondag)**  
+Vandaag ben ik begonnen met het maken van dit markdown-bestand aan de hand van de reeds aangemaakte LaTeX-template. Daarnaast ben ik begonnen aan de finetuning van de poster en flyer inhoud. Ik heb met Marijn samen overlegt over de stickers en hij gaat ze vandaag bestellen. Als het goed is komen deze aan voordat de presentaties zijn de 30e, dus daar gaan we dan ook vanuit. Voor het opstellen van de poster en de flyers gebruiken wij het programma InDesign van Adobe. Maandag zullen wij gezamelijk onze onderdelen van de poster bij elkaar voegen zodat wij als het goed is een mooi resultaat zullen hebben. Dit komt goed uit in combinatie met onze geplande vergadering. Hier zal een en ander ook besproken worden over onze knelpunten en zal de voortgang opnieuw worden geëvalueerd.
+
+Ik heb in de avond vooral gewerkt aan de algemene poster -en flyertekst samen met Paul. Ik had met hem overleg via Skype.
+
+**26-7-2017**  
+Vandaag was een zeer productieve dag. Om 10 uur hebben wij de werkzaamheden weer opgepakt en heb ik opnieuw
+gekeken naar de uploadfunctionaliteit van de profielfoto. Deze keer is het mij wel gelukt het voor elkaar te krijgen; het bleek om een simpele toevoeging van metadata te gaan wat ik was vergeten te implementeren.
+Naast deze simpele toevoeging heb ik ook een stukje extra veiligheid weten in te bouwen, namelijk het gebruiken van een FileProvider voor de URI van de afbeelding. Dit zorgt ervoor dat de app ook kan blijven draaien op een Android 7.x + toestel, wat anders een
+FileUriExposedException op zou gooien. (In combinatie met API level > 23).
+Vandaag stond bij ons op de planning een gesprek te voeren met onze begeleider. Echter kwamen wij iets te laat met het aanvragen van dit gesprek; Youri kon vandaag namelijk niet aanwezig zijn. Deze meeting zal dus worden verplaatst naar morgen.
+
+Ik heb naast de implementatie van de uploadfunctie wat ondersteunende taken verricht bij zowel Marijn als Felix. Paul is thuis aan het werk gegaan aan het project omdat hij niet aanwezig kon zijn vandaag.
+Ook hadden wij vanaf 11:00 t/m 12:00 een vergadering gehad en hier is uit gekomen dat we eigenlijk nog aardig op schema liggen. Bij iedereen beginnen de individuele onderdelen langzaam tot een goed einde gebracht te worden en dus verwachten wij binnekort een goede versie samen te kunnen brengen. Het enige wat nu nog resteert is bugtesting en een paar laatste layout tweaks.
+
+Voor de ietwat meer volledige versie van onze vergadering, kunnen de notulen van vandaag worden geraadpleegd. Deze zijn wederom te vinden op gitlab.
+
+_Referenties_
+* [FileProvider](https://developer.android.com/reference/android/support/v4/content/FileProvider.html)
+
+**27-6-2017**  
+Vandaag begonnen wij om 10:00. Ik was echter iets later, net als Paul. Felix en Marijn waren al bezig toen wij aankwamen.
+Ik ben eerst begonnen met bugtesten van de code van Felix. Deze had nog een aantal memory-problemen en ook was Felix nog niet toegekomen aan de correcte rotatie.
+Nu Felix weer aan het werk kon, heb ik samen met Paul gekeken naar de ListView voor de profielpagina. Hier worden dan de posts van de gebruiker zelf weergegeven. Dit was in het begin nog wat lastig, maar gelukkig had Marijn al een implementatie van de ListView gemaakt in de Timeline-class. Hier konden Paul en ik een voorbeeld aan nemen en dat heeft uiteindelijk geresulteert in een goed werkende personal-timeline.
+
+Naast de implementaties die geslaagd waren vandaag, hebben wij ook van 13:00 tot 13:30 een vergadering gehad met Youri vandaag. Wij hebben uitgelegd hoe ver wij waren en hebben hem onze voorlopige app laten zien. Hij was tevreden over het mogelijke eindresultaat waar wij naartoe leven en over de manier waarop wij hebben samengewerkt en onze voortgang hebben gedocumenteerd.
+
+Voor het implementeren van ListViews aan de hand van Adapters, zijn onderstaande bronnen gebruikt.
+
+_Referenties_
+* [ListView](https://developer.android.com/reference/android/support/v4/content/FileProvider.html)
+* [Adapter](https://developer.android.com/reference/android/widget/Adapter.html)
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
index 32633f0..04e2529 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
@@ -25,16 +25,6 @@ public class TimelineFragment extends Fragment {
     /* Required empty public constructor */
     public TimelineFragment() {}
 
-    /**
-     * Overridden onCreate which also starts a progress dialog for the posts being downloaded.
-     * @param savedInstanceState The standard return of the onCreate method.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-//        progressDialog = ProgressDialog.show(getActivity(), getString(R.string.please_wait), getString(R.string.downloading_posts), false, false);
-    }
-
     /**
      * Overridden onCreateView method which creates the ListView and contains a possible refresh
      * functionality (swipe down page for result).
-- 
2.49.1


From f8265ac3aa30853a725c0a4ffc3b4a55af4b662f Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Fri, 30 Jun 2017 10:05:27 +0200
Subject: [PATCH 40/42] Wrong dirname... whoops.

---
 .../niels_zwemmer.md                                              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {Idividuele_Documenten => Individuele_Documenten}/niels_zwemmer.md (100%)

diff --git a/Idividuele_Documenten/niels_zwemmer.md b/Individuele_Documenten/niels_zwemmer.md
similarity index 100%
rename from Idividuele_Documenten/niels_zwemmer.md
rename to Individuele_Documenten/niels_zwemmer.md
-- 
2.49.1


From 8ea692c5a87c14c0215f14bc808ed7cf3461ac31 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Fri, 30 Jun 2017 10:07:14 +0200
Subject: [PATCH 41/42] Logboek

---
 logboek/logboek_marijn.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 logboek/logboek_marijn.md

diff --git a/logboek/logboek_marijn.md b/logboek/logboek_marijn.md
new file mode 100644
index 0000000..63636dc
--- /dev/null
+++ b/logboek/logboek_marijn.md
@@ -0,0 +1,23 @@
+# Logboek Marijn
+## Week 1 
+### Maandag 
+Vandaag heb gewerkt aan aan de Firebase implementatie, de login en registratie pagina's werken. Ook heb ik een begin gemaakt aan de Fragments.
+### Dinsdag
+Login verbeterd, er worden checks uitgevoerd en er komt een dialog die de gebruiker laat weten dat er op de achtergrond iets gebeurt.
+### Woensdag
+Vandaag hebben we aan profielpagina gewerkt.
+### Donderdag
+Fixed onClick methods.
+### Vrijdag
+Klasses gemaakt voor posts, deze zijn abstract gemaakt. Profielfoto's werken sinds vandaag.
+## Week 2
+### Maandag 
+Profielfotoupload listners gemaakt.
+### Dinsdag
+Timeline gemaakt.
+### Woensdag
+Poster en flyer in elkaar gezet.
+### Donderdag
+Laatste dingen aan de app gedaan.
+### Vrijdag
+Posterpresentatie
\ No newline at end of file
-- 
2.49.1


From 5f5269ceb853da4580344532b9e620d6bdbcfd68 Mon Sep 17 00:00:00 2001
From: Felix Atsma <felixatsma@gmail.com>
Date: Fri, 30 Jun 2017 10:10:26 +0200
Subject: [PATCH 42/42] Add logboek

---
 logboek/logboek_felix_atsma.tex | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 logboek/logboek_felix_atsma.tex

diff --git a/logboek/logboek_felix_atsma.tex b/logboek/logboek_felix_atsma.tex
new file mode 100644
index 0000000..3c5f300
--- /dev/null
+++ b/logboek/logboek_felix_atsma.tex
@@ -0,0 +1,98 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% LATEX-TEMPLATE GENERIEK
+% Voor readme en meest recente versie, zie
+% https://gitlab-fnwi.uva.nl/informatica/LaTeX-template.git
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%-------------------------------------------------------------------------------
+%	PACKAGES EN DOCUMENT CONFIGURATIE
+%-------------------------------------------------------------------------------
+
+\documentclass{uva-inf-article}
+\usepackage[dutch]{babel}
+\usepackage{booktabs}
+%-------------------------------------------------------------------------------
+%	GEGEVENS VOOR IN DE TITEL, HEADER EN FOOTER
+%-------------------------------------------------------------------------------
+
+% Vul de naam van de opdracht in.
+\assignment{MyHyvesBookPlusTagram}
+% Vul het soort opdracht in.
+\assignmenttype{Samenvatting}
+% Vul de titel van de eindopdracht in.
+\title{Logboek}
+
+% Vul de volledige namen van alle auteurs in.
+\authors{Felix Atsma}
+% Vul de corresponderende UvAnetID's in.
+\uvanetids{11035064}
+
+% Vul altijd de naam in van diegene die het nakijkt, tutor of docent.
+\tutor{Youri Voet}
+% Vul indien nodig de naam van de begeleider in.
+\mentor{}
+% Vul eventueel ook de naam van de docent of vakcoordinator toe.
+\docent{}
+% Vul hier de naam van de PAV-groep  in.
+\group{The Return Of MyHyvesBook+}
+% Vul de naam van de cursus in.
+\course{Multimedia}
+% Te vinden op onder andere Datanose.
+\courseid{}
+\date{\today}
+
+% Dit is de datum die op het document komt te staan. Standaard is dat vandaag.
+
+%-------------------------------------------------------------------------------
+%	VOORPAGINA EN EVENTUEEL INHOUDSOPGAVE EN ABSTRACT
+%-------------------------------------------------------------------------------
+
+\begin{document}
+\maketitle
+
+%-------------------------------------------------------------------------------
+%	INHOUD
+%-------------------------------------------------------------------------------
+\section{Algemeen}
+\subsection{19-6-2017}
+Deze dag begon met het maken van een kleine presentatie van het projectplan
+voor de TA, Youri. Het plan werdt goedgekeurd. Daarna zijn we aan de slag
+gegaan met programmeren tot ongeveer 3 uur. Ik ben begonnen aan het maken van 
+een preview voor de camera en heb daar thuis verder aan gewerkt.
+\subsection{20-6-2017}
+Na de opdrachten om 9 uur laten nakijken ben ik verder gegaan met de camera
+view, hiermee was ik de hele dag bezig. 's Avonds was ik klaar met een simpele
+preview, nog zonder de functionaliteit van foto's maken.
+\subsection{21-6-2017}
+Deze dag was ik niet aanwezig op het Science Park, dit komt doordat ik de
+nacht ervoor laat door heb gewerkt, en ik had werk. Ondanks dit heb ik thuis
+doorgewerkt. Het wisselen van voor- en achtercamera is afgemaakt, daarnaast is
+er gewerkt aan bugfixes.
+\subsection{22-6-2017}
+Op deze dag heb ik het nemen van foto's geïmplementeerd en gewerkt aan de
+layout van de camera view. Thuis heb ik ook nog het uploaden van foto's
+werkend gekregen.
+Naast het programmeren hebben ik en Marijn een eerste versie van de poster
+gemaakt voor PAV.
+\subsection{23-6-2017}
+Ik heb me vooral bezig gehouden met het implementeren van de filters.
+\subsection{24/25-6-2017}
+Tijdens het weekend gewerkt aan wisselen tussen filters en het uploaden van de
+gefilterde foto's.
+\subsection{26-6-2017}
+Gewerkt aan een comment functie, en er voor gezorgd dat de camera het hele
+beeld opvult.
+\subsection{27-6-2017}
+Deze dag veel gewerkt aan problemen oplossen, met name het roteren van het
+genomen plaatje, daarnaast een probleem met de comment box opgelost. Ook heb
+ik nog snel nog een filter toegevoegd.
+\subsection{28-6-2017}
+Wederom weer problemen opgelost, nu de layout van posts op de timeline
+aangepast en een bug met de front facing camera gefixt.
+\subsection{29-6-2017}
+Deze dag hebben we de laatste puntjes gezet, met de timeline layout
+verbeteren, een crash verhelpen en comments aan de code toevoegen.
+\subsection{30-6-2017}
+Lorem Ipsum Dolor sit amet.
+
+\end{document}
-- 
2.49.1