sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
364 Commits 23 Branches 4 Tags
391c0729e4a9bf6e13d0c049aad3e4204f95c509
Commit Graph
351 Commits
Author SHA1 Message Date
RemoMeijer ff32eefab0 Added coupon item 2021-01-04 11:27:49 +01:00
sebas e2bccb6e76 Changed couponfragment layout 2021-01-04 11:23:16 +01:00
RemoMeijer c355f64d38 Added couponadapter 2021-01-04 11:08:49 +01:00
sebas 91c0435e55 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView 2021-01-04 11:06:38 +01:00
sebas 9ca3b12d71 Added code to CouponFragment 2021-01-04 11:06:04 +01:00
Bipin 08d9543e3b RouteTest made 2021-01-04 11:01:23 +01:00
Bart 294814dea8 StatisticFragment navigation to CouponFragment 2021-01-04 10:59:43 +01:00
RemoMeijer 6b197c4742 Location implements parcable 2020-12-17 14:57:04 +01:00
RemoMeijer a3d8bdfd77 Merge branch 'develop' into RecyclerView 
# Conflicts:
#	app/src/main/java/com/a1/nextlocation/data/Location.java
 2020-12-17 14:56:15 +01:00
RemoMeijer 6f10444126 Route displays name 2020-12-17 14:48:15 +01:00
Robin Koedood 1ca13e3a6b [ADD]Locations from JSON now in app. Markers good color. No action bar. 2020-12-17 14:45:58 +01:00
RemoMeijer 1f7cd49a90 Route works and is clickable 2020-12-17 14:35:05 +01:00
Bipin 9c4eb98fb4 Added real locations to JSON 2020-12-17 14:24:06 +01:00
Sem van der Hoeven 610b23b056 added custom overlay 2020-12-17 14:22:20 +01:00
RemoMeijer aba26f3211 Merge branch 'develop' into RecyclerView 2020-12-17 13:55:01 +01:00
Sem van der Hoeven 95a2e4e849 made list managers load on mainactivity oncreate 2020-12-17 13:53:00 +01:00
Sem van der Hoeven 74fb4440ed made listmanagers enums 2020-12-17 13:51:45 +01:00
Bart 6c923d27b2 Connected locationFragment with recyclerview and added functionality 2020-12-17 13:46:41 +01:00
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
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