Commit Graph

810 Commits

Author SHA1 Message Date
Matthieu 0ac44ac561 remove useless override 2020-04-03 09:35:42 +02:00
Matthieu 0d6a5b6c86 Refactor into superclass 2020-04-03 09:11:57 +02:00
Matthieu aedd697759 other merge-induced problems 2020-04-03 07:43:11 +02:00
Matthieu 5d975bb0aa remove files that shouldn't have been added back in from merge 2020-04-03 07:39:28 +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 8873b5692f github is being weird 2020-04-02 22:28:39 +02:00
Matthieu 1a684b7a47 Add comments, clean up 2020-04-02 22:16:03 +02:00
Matthieu 5f349e1cfd Update tests 2020-04-02 20:22:48 +02:00
Matthieu ba8980652c Infinite loading, make glide aware of the recyclerview 2020-04-02 19:57:07 +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
Matthieu 4259b92d05 Add cirrus 2020-03-21 19:46:45 +01:00
Matthieu 0a3cd85d83 Add loading indications, refactor fragments into common parent class 2020-03-21 18:12:00 +01:00
Ulysse Widmer c20e1cee4b fixed some tests 2020-03-20 19:34:34 +09:00
Ulysse Widmer 3bff3f5581 added string value 2020-03-20 16:29:02 +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
Ulysse Widmer 0b681d9b6b Merge branch 'master' into feature/upload-pictures 2020-03-18 01:19:04 +09:00
Ulysse Widmer 2a1b9209e1 upload picture implemented
still need to link it with create a post and DataBase
2020-03-18 01:09:39 +09: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 0df8cb9c7a Add parent activity to profile 2020-03-08 13:16:55 +01:00
Matthieu b944201b3c Remove duplicate config in build.gradle 2020-03-08 12:55:48 +01:00
Matthieu 1d13b5e621 Move settings to activity, remove upper bar 2020-03-08 12:54:18 +01:00
Ulysse Widmer a6bdaf4044 put navigation drawer layout items last or it doesn't appear 2020-03-08 19:40:39 +09:00
Ulysse Widmer edbf3aafa7 resolved conflicts before merge 2020-03-08 19:17:26 +09: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
Matthieu 6fd40417be Move button 2020-03-07 19:08:15 +01:00
Wv5twkFEKh54vo4tta9yu7dHa3 f0d5f918e2
Merge branch 'master' into oath 2020-03-07 19:02:45 +01:00
Matthieu 34f19810bc Simplify failedregistration calls 2020-03-07 18:31:58 +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
Matthieu 33f0711b1f Finish authentication 2020-03-06 18:24:20 +01:00
Matthieu 6d45cde9f7 Move into setContent function 2020-03-06 11:52:29 +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 5a11c72456 try to fix travis tests by moving button 2020-03-06 09:15:54 +01:00
Matthieu b214238457 Remove extraneous spaces 2020-03-06 09:00:18 +01:00
Matthieu d0ca08391b Add button to main activity to start a login process 2020-03-06 08:49:26 +01:00
Matthieu 0892ff536f Fix dependencies for custom tab 2020-03-06 08:37:59 +01:00
Matthieu 033c4843a2 Move default case to layout xml 2020-03-06 00:28:54 +01:00
Matthieu 463e3fce32 Remove changes from other PR 2020-03-06 00:24:43 +01:00
Matthieu 30339763ef undo formatting change in Application 2020-03-06 00:19:36 +01:00
Matthieu 1b6978ab59 undo formatting changes 2020-03-06 00:18:27 +01:00
Matthieu 3a56a354c5 Formatting in manifest 2020-03-06 00:16:47 +01:00
Matthieu 25c2a211a6 Remove PostActivity 2020-03-06 00:15:42 +01:00
Matthieu 03ec30ef28 Remove useless network requests, change names 2020-03-06 00:11:12 +01:00
Matthieu e1d8015374 Add constraints to button 2020-03-06 00:05:22 +01:00
mjaillot 88193dd588 Merge 2020-03-05 23:16:48 +01:00
mjaillot e662351b56 Saved test using button on MainActivity 2020-03-05 23:15:22 +01:00
mjaillot 9bcf715a88 Tests for the profile page's textViews 2020-03-05 23:10:33 +01:00
Andrea Clement c42bdca444 hooked build gradle from master 2020-03-05 23:05:28 +01:00
Joachim Dunant 2f9b458dd7 Merge 2020-03-05 22:54:28 +01:00
Andrea Clement 421134b3b1 removed example unit test 2020-03-05 22:51:04 +01:00
Joachim Dunant f87998c0ca Refactored MainActivity for the initialization of fragments from the drawer 2020-03-05 22:49:16 +01:00
Andrea Clement be964b4673 put default url for testing purposes 2020-03-05 22:47:14 +01:00
Andrea Clement d2a6a94bb3 can connect to pixelfed instance but no handled 2020-03-05 22:46:40 +01:00
Sanimys 10ee546ab9
Merge branch 'master' into settingsUI 2020-03-05 22:06:49 +01:00
mjaillot 5f3abfa4dc Added glide dependency 2020-03-05 21:59:40 +01:00
Joachim Dunant 0ec320792a Cleaned code in fragments, Manifest, gradle build and MainActivity 2020-03-05 21:48:25 +01:00
mjaillot 02db1aa116 Merge 2020-03-05 21:27:20 +01:00
Joachim Dunant e7e3d19475 First implementation of settings UI & Main menu drawer 2020-03-05 21:07:10 +01:00
mjaillot 523d50a3a6 Convert avatar's URL to ImageView 2020-03-05 20:37:28 +01:00
Andrea Clement 15a29b9c29 fixed build broker fields 2020-03-05 20:37:21 +01:00
Andrea Clement 5a6de98dc6 added function to obtain token 2020-03-05 20:36:49 +01:00
Andrea Clement 153e87b27b start of connection flow 2020-03-05 20:36:23 +01:00
Andrea Clement a989409433 add new API object for authentification 2020-03-05 20:34:48 +01:00
Matthieu 14197355c1 Add application registration endpoint to API 2020-03-05 19:08:57 +01:00
Andrea Clement 55d1d778b0 initial login files ; login flow class 2020-03-05 19:02:22 +01:00
Andrea Clement 28be144b91 deleted reference to login template 2020-03-05 19:00:15 +01:00
Andrea Clement 85e1db49ca deleted login template 2020-03-05 18:59:46 +01:00
mjaillot e6939891fb Created profile test file 2020-03-05 18:38:54 +01:00
mjaillot 72f95f70b9 Merge 2020-03-05 18:38:10 +01:00
mjaillot 7084937c81 Created profile test file 2020-03-05 18:32:04 +01:00
Andrew Dobis 7799ba4956 WIP on post 2020-03-05 18:29:10 +01:00
Andrew Dobis 8a026d0bd4 renamed pdf 2020-03-05 18:29:10 +01:00
Matthieu 6809bb1d25 Add elements of the API 2020-03-05 18:26:03 +01:00
Matthieu b3e4525e85 implement a lot of the API, a lot of the plumbing that is required 2020-03-05 18:23:23 +01:00
Andrea Clement 47be94ba02 fixed merged features 2020-03-05 17:00:49 +01:00
Andrea Clement c976d1214c corrected build 2020-03-05 16:46:56 +01:00
Andrea Clement 746b670403 inital login activity 2020-03-05 16:46:18 +01:00
mjaillot 3f508b3a27 First draft of the profile page 2020-03-04 19:32:41 +01:00
Wv5twkFEKh54vo4tta9yu7dHa3 aa788f9720
Implement most of the API (#23)
Add Kotlin representations (data classes) of the Types of the Mastodon API. 
Create helper function to make API from the interface.
Test the deserialization.
2020-03-04 18:04:55 +01:00
Andrea Clement 6f56ca350c inital login activity 2020-03-03 21:17:53 +01:00
Matthieu f81cc9b595 specify debug version for jacoco 2020-02-29 14:09:20 +01:00
Matthieu c9d2842401 Correct version in build.gradle 2020-02-28 17:59: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