48 Commits

Author SHA1 Message Date
Wv5twkFEKh54vo4tta9yu7dHa3
7318ff5083
tweak UI, add mascot and info link to LoginActivity (#106)
* tweak UI, add mascot and info link to LoginActivity

* Fix test, add other test
2020-04-16 12:46:40 +02:00
Andrew Dobis
f8d6c67079
Commenting & seeing comments on a post ( issues: #37 #77 ) (#87)
Comment and like buttons added + a few UI tweaks 

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* layout changes

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* rebase on other branch

* moved the feed to the home page

* Add tests

* delete test for now

* Adapt test to changes (no more profile from drawer)

* Add unit test for api

* Add test for profile, refactor to allow testing, add exception to security policy to allow tests

* Adapt test to new situation

* Fix typo due to change

* refactor somewhat

* added a feed test

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* refactoring

* refactoring

* removed wrong annotation in unit test

* WIP posts

* WIP posts

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* layout changes

* moved a test file

* refactoring

* refactoring

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* rebase on other branch

* moved the feed to the home page

* added a feed test

* added a working feed test

* fixed broken test

* merged with master

* added a max height for images and made profile pictures round

* Added a default image for the post

* created a PostActivity to look a single posts

* fixed buggy postActivity

* Complete overhall of the feed UI

* removed test that didn't please Travis

* removed legacy test

* changed feedAdapter init location (outside of network callback)

* changed the feed from public timeline to home timeline

* Refactored myProfile page

* Converted profile picture to round image

* restored feed test

* I can like a post, but unlike is still a WIP

* Liking kind of works now and added tests

* fixed an error, now we can unlike as well

* fixed travis constraint error

* Display user's posts on profile page

* moved test to Mock server tests

* fixed test

* last resort debugging

* Changed fixed size of profile posts

* last resort debugging

* last resort debugging

* last resort debugging

* made post_activity profilepic round

* Total refactor of profile posts

* still have a weird bug with the comments: input is always null (WIP)

* still trying to fix coments

* removed annoying side margins in the home feed

* trying to fix comments

* fixed null comment

* converted all posts back to statuses and got rid of post

* Refactored recycler view

* Merged with my-profile

* Posts displayed on profile page

* Added links to profile activity where needed

* fixed comment posting

* finished implementing comments, but api is buggy so none are visible

* removed useless space in profile page

* fixed ci config bug

* trying to trigger ci hook (github was down last time)

* updated tests with master tests

* added tests for the comments

* added tests for the comments

* added first() matcher to fix comment test

* still trying to fix comment tests' null progress bar

* getting rid of that null progress bar

* added comment test

* fixed merge error

* added like button test

* added more post tests

* took pr coments into account

* added back an old test

* added mockServer response for comment test and fixed comment null pointer bug

* changed notification UI to better separate notifications

* added mockserver response for likes and corrected like toggling error

* added a test for posting comments

* fixed typo in test

* a gift for code climate

* refactored stuff

* fixed broken imports

* comment refactored as xml

Co-authored-by: Matthieu <61561059+Wv5twkFEKh54vo4tta9yu7dHa3@users.noreply.github.com>
Co-authored-by: mjaillot <marie.jaillot@epfl.ch>
2020-04-11 12:55:06 +02:00
Ulysse Widmer
a14310bbfc
refactor MocKServer for test and some lint warnings (#102) 2020-04-10 12:25:54 +02:00
mjaillot
1b6753d119
User profile #79 (#90)
* Refactored myProfile page

* Total refactor of profile posts

* Merged with my-profile

* Posts displayed on profile page

* Added links to profile activity where needed

* Removed MyProfileTest with swipes

* Tests ProfileActivity from Notifications

* Add test, fix progressbar being null
2020-04-09 22:36:59 +02:00
Matthieu
aedd697759 other merge-induced problems 2020-04-03 07:43:11 +02:00
Wv5twkFEKh54vo4tta9yu7dHa3
17c74dd430
Merge branch 'master' into scroll_load 2020-04-03 07:33:22 +02:00
Matthieu
cad875a065 github is being weird 2020-04-03 07:23:08 +02:00
Matthieu
8f19a7f8c3 try to make database stop being annoying 2020-04-02 22:41:31 +02:00
Matthieu
5f349e1cfd Update tests 2020-04-02 20:22:48 +02:00
Wv5twkFEKh54vo4tta9yu7dHa3
61cdb1118b
WIP: Loading (#76)
* Add loading indications, refactor fragments into common parent class

* Add cirrus

* actually add cirrus

* Add timeouts

* Fix test rules

* Add gitlab ci file to tes

* move tests to MockedServer to not have infinite waits by Espresso

* Update README for gitlab badge
2020-04-01 19:38:21 +02:00
Matthieu
fcec1029fc move tests to MockedServer to not have infinite waits by Espresso 2020-03-31 14:43:16 +02:00
Wv5twkFEKh54vo4tta9yu7dHa3
ece6716e2d
Merge branch 'master' into loading 2020-03-31 13:07:35 +02:00
Ulysse Widmer
095525f701 minor refactor and updt some versions in gradle 2020-03-31 11:11:02 +02:00
Ulysse Widmer
c572d60213 check coverage without test 2020-03-30 20:46:38 +02:00
Ulysse Widmer
5e2c6c3724 fix multiple post on feed detection 2020-03-30 20:01:28 +02:00
Ulysse Widmer
827db70972 modified concerned tests to replace swipe calls 2020-03-30 19:31:36 +02:00
Ulysse Widmer
35d11512c1 swipe tests that try all the horizontal swipe motions 2020-03-30 17:37:23 +02:00
Matthieu
589c78519b Fix test rules 2020-03-26 14:51:39 +01:00
Matthieu
58488af570 Add timeouts 2020-03-26 14:47:38 +01:00
Matthieu
90379eb30c Add timeouts 2020-03-26 14:26:50 +01:00
Matthieu
dc20fb31ee test? 2020-03-24 23:46:18 +01:00
Ulysse Widmer
c20e1cee4b fixed some tests 2020-03-20 19:34:34 +09:00
Ulysse Widmer
ac9a9943ac Merge branch 'master' into feature/upload-pictures 2020-03-20 16:23:38 +09:00
Ulysse Widmer
e17a279994 add tests 2020-03-20 15:27:52 +09:00
Wv5twkFEKh54vo4tta9yu7dHa3
260062a72b
Notifications tab (#57)
* Add notification fragment to notification tab

* First functional-ish version of notifications

* Fix test failing due to profile requesting multiple times (?)

* Test notifications list

* Move resource that was in the wrong place for some reason

* Improve fallback image, add new drawable for it, add a margin

* Only show image thumbnail when there is one

* Go to post activity on click

* Add pull to refresh

* Refactor somewhat

* Test other notification too

* Test opening post

* add icons for various things (heart, follow, share, image fallback)
2020-03-18 20:56:42 +01:00
Wv5twkFEKh54vo4tta9yu7dHa3
d0195bfe1b
Fix build and switch to Home timeline (#59)
* Switch to Home timeline

* Fix broken tests

* DRY-ed up the tests, remove extraneous activity
2020-03-17 15:14:19 +01:00
Andrew Dobis
7b5049bba9
As a user I want to be able to see posts in a feed (#28)
* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* rebased from master

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* rebased from master

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* fixed merging errors

* fixed another merge problem

* trying my best to merge

* removed drawable definition in activity_post.xml

* implements swipe motion

add a new class to implement swipe motion
add the swipe right from home page to display settings
passed the homepage in a fragment

* transform profile activity into fragment

transformed profile activity and layout into fragment
linked it with a swipe motion

* Implement swipeable tabs

* Ask for login on first start, add API endpoints, change profile to show the user's profile

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* layout changes

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* rebase on other branch

* moved the feed to the home page

* Add tests

* delete test for now

* Adapt test to changes (no more profile from drawer)

* Add unit test for api

* Add test for profile, refactor to allow testing, add exception to security policy to allow tests

* Adapt test to new situation

* Fix typo due to change

* refactor somewhat

* added a feed test

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* WIP posts

* trying to add images

* WIP posts

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* moved a test file

* refactoring

* refactoring

* refactoring

* refactoring

* removed wrong annotation in unit test

* WIP posts

* WIP posts

* WIP posts

* WIP posts

* trying to add images

* trying to add images

* trying to add images

* trying to add images

* Got posts working and linked them to the profile

* Got posts working and linked them to the profile

* added tests for Post

* layout changes

* layout changes

* moved a test file

* refactoring

* refactoring

* refactoring

* refactoring

* removed wrong annotation in unit test

* removed an import that was breaking the build

* removed an import that was breaking the build

* removed tests that broke from merge, will override with master

* removed tests that broke from merge, will override with master

* added UI test for the post activity

* fixed merging errors

* trying my best to merge

* removed drawable definition in activity_post.xml

* Started converting Post to a fragment

* got a working feed

* WI

* removed non-valid test

* rebase on other branch

* moved the feed to the home page

* added a feed test

* added a working feed test

* fixed broken test

* merged with master

* added a max height for images and made profile pictures round

* Added a default image for the post

* created a PostActivity to look a single posts

* fixed buggy postActivity

* Complete overhall of the feed UI

* removed test that didn't please Travis

* removed legacy test

* changed feedAdapter init location (outside of network callback)

Co-authored-by: Matthieu <61561059+Wv5twkFEKh54vo4tta9yu7dHa3@users.noreply.github.com>
Co-authored-by: Ulysse Widmer <ulysse.widmer@epfl.ch>
2020-03-16 09:38:35 +01:00
mjaillot
8802bf9905
My profile (#46)
* Layout of my-profile page

* implements swipe motion

add a new class to implement swipe motion
add the swipe right from home page to display settings
passed the homepage in a fragment

* transform profile activity into fragment

transformed profile activity and layout into fragment
linked it with a swipe motion

* Implement swipeable tabs

* Ask for login on first start, add API endpoints, change profile to show the user's profile

* Added constraint view

* Layout of my-profile page

* Added constraint view

* Rebase myProfile with login-flow

* Add tests

* delete test for now

* Adapt test to changes (no more profile from drawer)

* Add unit test for api

* Add test for profile, refactor to allow testing, add exception to security policy to allow tests

* Adapt test to new situation

* Fix typo due to change

* refactor somewhat

* Added myProfile fragment to main activity + edit link

* Layout of my-profile page

* Added constraint view

* Layout of my-profile page

* Added constraint view

* Rebase myProfile with login-flow

* Added myProfile fragment to main activity + edit link

* Working tests for MyProfile

Co-authored-by: Ulysse Widmer <ulysse.widmer@epfl.ch>
2020-03-13 12:17:17 +01:00
Wv5twkFEKh54vo4tta9yu7dHa3
20c5ff4ee0
First use login flow (#44)
* transform profile activity into fragment

* Implement swipeable tabs

* Ask for login on first start, add API endpoints, change profile to show the user's profile

* Add tests

* delete test for now

* Adapt test to changes (no more profile from drawer)

* Add unit test for api

* Add test for profile, refactor to allow testing, add exception to security policy to allow tests

* Adapt test to new situation

* Fix typo due to change

* refactor somewhat

* remove unused function

* remove test dependent on network

* update test

* remove test

Co-authored-by: Ulysse Widmer <ulysse.widmer@epfl.ch>
2020-03-13 11:48:45 +01:00
Sanimys
2d7020fd21
Added a database working in LRU (#43)
Co-authored-by: Joachim Dunant <joachim.dunant@epfl.ch>
2020-03-12 23:27:40 +01:00
Ulysse Widmer
de314dc9de
Implements swipe motion & fragmentalize (#41)
* implements swipe motion

add a new class to implement swipe motion
add the swipe right from home page to display settings
passed the homepage in a fragment

* transform profile activity into fragment

transformed profile activity and layout into fragment
linked it with a swipe motion

* refactor settings drawer tests

* added more tests and refactored some files

* added animations to the sliding of the swipe motion
2020-03-12 22:23:25 +01:00
Joachim Dunant
191a499a04 Added tests for the settings UI 2020-03-12 17:36:57 +01:00
Joachim Dunant
26427d5377 Added tests for settings 2020-03-08 20:41:01 +01:00
Matthieu
79f45d6ca8 Remove duplicate test 2020-03-07 23:51:26 +01:00
Matthieu
f36b45ba15 Specify integration library for glide 2020-03-07 19:45:27 +01:00
Matthieu
ae4cba818e Less dependent on a server 2020-03-07 19:36:07 +01:00
Wv5twkFEKh54vo4tta9yu7dHa3
f0d5f918e2
Merge branch 'master' into oath 2020-03-07 19:02:45 +01:00
Matthieu
b79ebca03a Some more tests, move values into xml 2020-03-07 18:13:26 +01:00
Matthieu
1405d69861 Add tests for login, fix coverage not being counted 2020-03-07 11:00:24 +01:00
Ulysse Widmer
f8c6974a79 fixed le test 2020-03-06 19:25:17 +09:00
Ulysse Widmer
faf5a0838b fixing some more cancer 2020-03-06 19:19:14 +09:00
Matthieu
dbe936faa4 Make test be useful 2020-03-06 10:04:31 +01:00
Matthieu
03ec30ef28 Remove useless network requests, change names 2020-03-06 00:11:12 +01:00
mjaillot
88193dd588 Merge 2020-03-05 23:16:48 +01:00
mjaillot
9bcf715a88 Tests for the profile page's textViews 2020-03-05 23:10:33 +01:00
mjaillot
e6939891fb Created profile test file 2020-03-05 18:38:54 +01:00
Matthieu
a63c7ccb97 Switch to Kotlin 2020-02-28 17:08:54 +01:00
Ulysse Widmer
b10a800b36 init project files 2020-02-28 00:36:26 +01:00