sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
90 Commits 23 Branches 4 Tags
17d977bb17377919a81781c2789faddf9f0b6202
Commit Graph
90 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sem van der Hoeven 17d977bb17 fixed loading 2020-12-17 13:41:20 +01:00
Sem van der Hoeven b52c5556d2 finished loading 2020-12-17 11:50:31 +01:00
Sem van der Hoeven 70342c6506 merge with recyclerview 2020-12-17 11:21:38 +01:00
Sem van der Hoeven 311a794a69 removed loader from route list manager 2020-12-17 11:18:23 +01:00
RemoMeijer dbc10014f9 Merge branch 'develop' into RecyclerView 2020-12-17 11:16:36 +01:00
RemoMeijer 1f835a94b0 Updated managers so they can load 2020-12-17 11:16:03 +01:00
Sem van der Hoeven 12c8d6a62d [ADD] loaders and fileio read 2020-12-17 11:14:43 +01:00
Sem van der Hoeven 9e8e9f4cdd changed loader stuff 2020-12-17 11:00:14 +01:00
Sem van der Hoeven 1d48ada0ab changed loader stuff 2020-12-17 10:59:07 +01:00
Sem van der Hoeven 6a07ce77f0 remove room stuff 2020-12-17 10:32:28 +01:00
Sem van der Hoeven 5edf50c808 Merge branch 'Fragment' into develop 2020-12-17 10:07:36 +01:00
Sem van der Hoeven db7d944a41 [ADD] log 2020-12-17 10:04:43 +01:00
Sem van der Hoeven 3f132f48a7 [ADD] start of api calls 2020-12-16 12:11:48 +01:00
Sem van der Hoeven 17f624cc30 [ADD] longitude latitude doubles in location 2020-12-16 11:54:35 +01:00
Robin Koedood 4f68398f33 [ADD] route detail landscape mode 2020-12-16 11:38:24 +01:00
Robin Koedood 4229acf87c [ADD] Route Detail Contraints 2020-12-16 11:20:52 +01:00
Sem van der Hoeven 521c9fd188 Merge branch 'RecyclerView' into develop 2020-12-16 11:20:41 +01:00
Sem van der Hoeven 1fd245f4f0 [ADD] all methods from daos to repos 2020-12-16 11:04:06 +01:00
Sem van der Hoeven 8d210a9707 [ADD] image url to location 2020-12-16 10:58:44 +01:00
RemoMeijer ee1ae23e0f Merge branch 'develop' into RecyclerView 2020-12-16 10:56:36 +01:00
Sem van der Hoeven 49f78efdd3 [ADD] update and insert coupon 2020-12-16 10:56:03 +01:00
Sem van der Hoeven 512ad3980f [FIX] mapview stuff 2020-12-16 10:48:11 +01:00
RemoMeijer e2f76c94f7 Merge branch 'develop' into RecyclerView 
# Conflicts: resolved
#	app/src/main/res/layout/fragment_location.xml
#	app/src/main/res/layout/fragment_location_detail.xml
 2020-12-16 10:43:46 +01:00
Sem van der Hoeven 2479563474 Merge branch 'data' into develop 2020-12-14 15:10:09 +01:00
Sem van der Hoeven ea59b97f0f merge fragment 2020-12-14 15:09:59 +01:00
Sem van der Hoeven 0b9bba63a3 added all daos 2020-12-14 15:07:53 +01:00
sebas 75b7ff47cd [Added] small changes to route detail, location detail 2020-12-14 14:51:43 +01:00
sebas a2d1ecfc71 [Added] layout created for routedetailfragment 2020-12-14 14:38:47 +01:00
Sem van der Hoeven 890a5264d6 added initmapview 2020-12-14 14:37:50 +01:00
Sem van der Hoeven 2792a62069 merge conflicts 2020-12-14 14:36:52 +01:00
Sem van der Hoeven b3be078361 added mapview and osm map 2020-12-14 14:35:53 +01:00
RemoMeijer 148e84483a Added mapView 2020-12-14 14:35:24 +01:00
RemoMeijer bf1c5d0ac4 Added fragment_location layout and location_item layout 2020-12-14 14:20:54 +01:00
Bipin 0092b2e839 fixie wixie 2020-12-14 14:08:40 +01:00
Bipin 9854f5f6ab finalize main activity (for now) 2020-12-14 14:07:08 +01:00
sebas 7c200bf780 [Added] Created route_item layout and filled it, also filled fragment_route 2020-12-14 14:01:41 +01:00
RemoMeijer b174778dbf Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment 2020-12-14 14:00:55 +01:00
RemoMeijer d33237791b Added location detail, location_item 2020-12-14 14:00:15 +01:00
Robin Koedood c6a9b175cc [ADD] coupon landscape mode 2020-12-14 13:59:13 +01:00
Robin Koedood d4d3e8d19f [ADD] forgot one string 2020-12-14 13:58:01 +01:00
Robin Koedood 8aa316fc97 [ADD] String values 2020-12-14 13:55:13 +01:00
Robin Koedood ed6d80b399 [ADD] Imagebutton 2020-12-14 13:50:46 +01:00
Bipin dc69d9a2ad Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment 2020-12-14 13:41:36 +01:00
Bipin 83796481e8 back button image added 2020-12-14 13:41:23 +01:00
Robin Koedood 14d9cf686f Merge remote-tracking branch 'origin/Fragment' into Fragment 2020-12-14 13:40:53 +01:00
Robin Koedood 49ec448e56 [FIXED] offset 2020-12-14 13:40:48 +01:00
Bart 996b061b65 Merge branch 'bottomNavigation' into develop 2020-12-14 13:36:18 +01:00
Bipin 64f76f46c0 Added top bar 2020-12-14 13:35:16 +01:00
Sem van der Hoeven 8fdb88f71a data dao 2020-12-14 13:16:03 +01:00
Bipin 8c25197967 Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment 2020-12-14 13:13:55 +01:00