From 3f00e0959272fd087ec4fdcfeb38ce74224ffdd1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 26 Jun 2017 18:54:45 +0200 Subject: [PATCH 01/47] fix for permissions. --- app/MyHyvesBookPlusStagram/app/build.gradle | 2 +- .../main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java | 1 + .../app/src/main/res/values-nl/strings.xml | 1 - app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/MyHyvesBookPlusStagram/app/build.gradle b/app/MyHyvesBookPlusStagram/app/build.gradle index 85f6d09..83344be 100644 --- a/app/MyHyvesBookPlusStagram/app/build.gradle +++ b/app/MyHyvesBookPlusStagram/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "nl.myhyvesbookplus.tagram" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 21 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" 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 c5fde32..6f05305 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 @@ -101,4 +101,5 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl public void onItemClick(AdapterView parent, View view, int position, long id) { Log.d(TAG, "onItemClick: rowNumber! "+ position); } + } 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 79c3196..5bb29b8 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml @@ -30,6 +30,5 @@ Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is. Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding. Profielfoto aan het uploaden... - Wacht a.u.b. \"Niet slecht.\"s \ No newline at end of file diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml index 9709ac7..c2c4abc 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml @@ -2,6 +2,6 @@ #fbbf2d #ffa70f - #4bAfe5 - + + #4CAF50 -- 2.49.1 From 41bacb3b4fac0c12f11842f7a46504de71c35db3 Mon Sep 17 00:00:00 2001 From: Niels Zwemmer Date: Mon, 26 Jun 2017 23:38:14 +0200 Subject: [PATCH 02/47] Added today's counsil minutes. --- notulen/notulen_3_2662017.tex | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 notulen/notulen_3_2662017.tex diff --git a/notulen/notulen_3_2662017.tex b/notulen/notulen_3_2662017.tex new file mode 100644 index 0000000..95be50b --- /dev/null +++ b/notulen/notulen_3_2662017.tex @@ -0,0 +1,110 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% 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} +\newcommand\tab[1][1cm]{\hspace*{#1}} +\newcommand\tabb[1][1.4cm]{\hspace*{#1}} +\usepackage[dutch]{babel} +\usepackage{booktabs} +%------------------------------------------------------------------------------- +% GEGEVENS VOOR IN DE TITEL, HEADER EN FOOTER +%------------------------------------------------------------------------------- + + + +% Vul de naam van de opdracht in. +\assignment{Notulen: The Return Of The MyHyvesBook+} +% Vul het soort opdracht in. +\assignmenttype{Samenvatting} +% Vul de titel van de eindopdracht in. +\title{Entry 3: Afrondende fase} + +% Vul de volledige namen van alle auteurs in. +\authors{Marijn Jansen; Felix Atsma; Paul Lagerweij; Niels Zwemmer} +% Vul de corresponderende UvAnetID's in. +\uvanetids{11166932; 11035064; 11306084; 11025980} + +% Vul altijd de naam in van diegene die het nakijkt, tutor of docent. +\tutor{Robin Klusman} +% Vul eventueel ook de naam van de docent of vakcoordinator toe. +\docent{drs. A. van Inge} +% Vul hier de naam van de PAV-groep in. +\group{C1 (C++)} +% Vul de naam van de cursus in. +\course{Multimedia} +% Te vinden op onder andere Datanose. +\courseid{5062MULT6Y} + +% Dit is de datum die op het document komt te staan. Standaard is dat vandaag. +\date{\today} + +%------------------------------------------------------------------------------- +% VOORPAGINA EN EVENTUEEL INHOUDSOPGAVE EN ABSTRACT +%------------------------------------------------------------------------------- + +\begin{document} +\maketitle + +\noindent +\textbf{Data Vergadering}\\\\ +Datum:\tab 26-6-2017 +\\ +Tijd:\tabb 11:00-12:00 +\\ +\\ +\noindent +Aanwezig (fysiek):\tabb\space\space\space Marijn, Felix, Niels\\ +Aanwezig (telefonisch):\tab Paul\\ +Afwezig:\tabb\tabb\space\space\space\space-\\\\ +\noindent +\textbf{Onderwerpen besproken} + +\begin{itemize} +\item Implementatiekeuzes: Besluit genomen de profielfoto beter te maken door file te uploaden i.p.v. thumbnail-bitmap. +\item Evaluatie: Hoe staan we ervoor? De app krijgt nu vorm. Eerste poging tot alles mergen zal morgen zijn. +\item Evaluatie: Teksten van de poster en flyers zijn nu grotendeels bedacht. Marijn en Felix zullen gezamelijk de layout verder verzorgen. +\end{itemize} +\pagebreak + +\noindent +\textbf{Positieve punten naar voren gekomen}\\\\ +Onze app krijgt nu vorm in de zin dat er steeds meer functionaliteit op elkaar afgestemd wordt en samenwerkt. De losse modules implementeren zoals wij hadden bedacht is een geslaagd idee. Niels heeft zijn lastige bug nu opgelost waardoor hogere resolutie foto's kunnen worden opgeslagen. Felix is bijna klaar met de filters. Marijn zal aan het einde van de middag de verschillende upload-classes en de download-class klaar hebben. Paul werkt als groepswerker op alle fronten mee aan de code. +\\\\ + +\noindent +\textbf{Kort} +\begin{itemize} +\item Wederom goede vooruitgang, zowel poster als programma. +\item File uploaden is nu geslaagd en profielfoto is niet meer lelijk. +\item We liggen op schema; back-end bijna af. +\end{itemize} + +\noindent +\textbf{Negatieve punten naar voren gekomen}\\\\ +De bugs oplossen heeft meer tijd gekost dan gehoopt. Daardoor leken we wat van het schema af te zullen wijken. Gelukkig bleek dit mee te vallen. Echter zal er toch nog even hard doorgewerkt moeten worden de laatste paar dagen.\\ +Er bestaat nog steeds veel onduidelijkheid over het individuele verslag en de overige PAV onderdelen. Communicatie bij het vak laat wederom te wensen over. Niels zal een e-mail sturen naar Toto en hopelijk kan er morgen gesproken worden met Youri over een aantal zaken. +\\\\ + +\noindent +\textbf{Kort} +\begin{itemize} +\item Bugs oplossen heeft meer tijd gekost dan gehoopt. +\item Veel onduidelijkheid over het individuele verslag. +\item Communicatie laat te wensen over. +\item Er is nog wat werk aan de winkel, niet alles werkt nog naar behoren. +\end{itemize} + + \vfill \hfill \textit{“Ik sis 't mar gewoan: ik ha in hekel oan moandeitemoarn.”} + +%------------------------------------------------------------------------------- +% INHOUD +%------------------------------------------------------------------------------- + +\end{document} -- 2.49.1 From 84353046a5a6b812a93af34faf2517e660220215 Mon Sep 17 00:00:00 2001 From: Niels Zwemmer Date: Tue, 27 Jun 2017 11:11:29 +0200 Subject: [PATCH 03/47] Fixed implement runtime error for Felix. Made some minor changes to both strings.xml and ProfilePictureUploader (error when old picture not present). --- .../main/java/nl/myhyvesbookplus/tagram/MainActivity.java | 7 ++++++- .../tagram/controller/ProfilePictureUploader.java | 4 +++- .../app/src/main/res/values-nl/strings.xml | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) 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 9d4e938..7c98ae4 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 @@ -21,7 +21,7 @@ import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader; public class MainActivity extends AppCompatActivity implements CameraFragment.OnFragmentInteractionListener, ProfilePictureUploader.ProfilePictureUpdatedListener, - DownloadClass.PostDownloadListener { + DownloadClass.PostDownloadListener, PostUploader.PostUploadListener { final static private String TAG = "MainScreen"; FirebaseAuth mAuth; @@ -130,4 +130,9 @@ public class MainActivity extends AppCompatActivity implements frag.startList(); } + + @Override + public void PostUploadComplete(Boolean success) { + + } } diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java index 3264976..65e1de9 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java @@ -75,7 +75,9 @@ public class ProfilePictureUploader extends UploadClass { public void onComplete(@NonNull Task task) { Log.d(TAG, "onComplete: Updated profile picture"); mListener.ProfilePictureUpdated(true); - removeOldPicture(); + if (oldPicture != null) { + removeOldPicture(); + } } }); } 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 79c3196..e38d9a7 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml @@ -29,7 +29,6 @@ Uploaden Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is. Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding. - Profielfoto aan het uploaden... - Wacht a.u.b. + Profielfoto aan het uploaden… \"Niet slecht.\"s \ No newline at end of file -- 2.49.1 From 0b943e3a1ad8ac318c2f4ea47851c5c8cbe6e138 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 27 Jun 2017 11:17:31 +0200 Subject: [PATCH 04/47] Fixed a crash when switching fast to profile after loading the app. --- .../nl/myhyvesbookplus/tagram/MainActivity.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) 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 9d4e938..b10ecbd 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 @@ -1,5 +1,6 @@ package nl.myhyvesbookplus.tagram; +import android.app.Fragment; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Intent; @@ -15,7 +16,6 @@ import android.view.View; import com.google.firebase.auth.FirebaseAuth; import nl.myhyvesbookplus.tagram.controller.DownloadClass; -import nl.myhyvesbookplus.tagram.controller.PostUploader; import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader; public class MainActivity extends AppCompatActivity implements @@ -104,11 +104,6 @@ public class MainActivity extends AppCompatActivity implements this.finish(); } -// public void testCreatePost(View view) { -// DownloadClass downloadClass = new DownloadClass(); -// downloadClass.getPosts(); -// } - @Override public void ProfilePictureUpdated(Boolean success) { Log.d(TAG, "ProfilePictureUpdated: Ja ik luister naar je!"); @@ -125,9 +120,10 @@ public class MainActivity extends AppCompatActivity implements @Override public void PostDownloaded() { FragmentManager fragmentManager = getFragmentManager(); - fragmentManager.findFragmentById(R.id.content); - TimelineFragment frag = (TimelineFragment) fragmentManager.findFragmentById(R.id.content); - frag.startList(); + Fragment frag = fragmentManager.findFragmentById(R.id.content); + if (frag instanceof TimelineFragment) { + ((TimelineFragment) frag).startList(); + } } } -- 2.49.1 From 9322840d10e9febfb55aa2f285b052724c59c562 Mon Sep 17 00:00:00 2001 From: Niels Zwemmer Date: Tue, 27 Jun 2017 11:29:48 +0200 Subject: [PATCH 05/47] Minor changes to picture. --- .../main/java/nl/myhyvesbookplus/tagram/PicturePreview.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 80c2dee..736e1b6 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 @@ -27,7 +27,7 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac public PicturePreview(Context context, Bitmap bmp) { super(context); - picture = Bitmap.createScaledBitmap(bmp, 1920, 1440, false); + picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false); // picture = Bitmap.createBitmap(bmp); setWillNotDraw(false); } @@ -52,8 +52,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac break; case FILTER_BW: Canvas bw = new Canvas(); - filterPicture = Bitmap.createBitmap(1920, 1440, null); -// filterPicture = Bitmap.createBitmap(picture.getWidth(), picture.getHeight(), null); +// filterPicture = Bitmap.createBitmap(1920, 1440, null); + filterPicture = Bitmap.createBitmap(picture.getWidth() / 2, picture.getHeight() / 2, Bitmap.Config.ARGB_8888); cm.setSaturation(0); filter = new ColorMatrixColorFilter(cm); paint.setColorFilter(filter); -- 2.49.1 From 2b7965ad611cad3963dd0688bda20e6bf9cb162f Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 27 Jun 2017 12:10:56 +0200 Subject: [PATCH 06/47] 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 Date: Tue, 27 Jun 2017 12:11:52 +0200 Subject: [PATCH 07/47] 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 @@ + android:layout_width="wrap_content" + android:layout_gravity="center" + android:layout_height="250dp" /> Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is. Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding. Profielfoto aan het uploaden… - \"Niet slecht.\"s + "\"Niet slecht.\"s " \ 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 @@ profile picture Change Password Please Wait - \"Niet slecht.\"s + "\"Niet slecht.\"s " Upload Save An e-mail was sent. Please follow its instructions. -- 2.49.1 From 08849521e1d851fcccc4b8a8da39a87e6e45f73d Mon Sep 17 00:00:00 2001 From: Felix Atsma Date: Tue, 27 Jun 2017 12:37:23 +0200 Subject: [PATCH 08/47] 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"> + android:text="@string/comment"/>