Commit Graph

Select branches

Hide Pull Requests

ButtonFix

CosmeticFixes

Fragment

Locaitegezeik

LocationCreation

RecyclerView

Tests

bottomNavigation

couponPopup

data

develop

directions-api

display-route

follow-route

fuckcolours

geofence

helpPopup

imperial-system

languages

main

routeFragmentDetail

route_detail

saveDataMA8

#1

#2

#3

#4

#5

v1.0

v1.1

v1.2

v2.0

Mono Color

• 40e3ca3d51 Merge branch 'languages' into develop Bart 2021-01-06 10:49:35 +01:00
• 6dd2f5de40 default strings.xml is now English, added more string resources Bart 2021-01-06 10:48:23 +01:00
• f6af7ae80b added route singleton Sem van der Hoeven 2021-01-06 10:48:03 +01:00
• d4cfa17fda Tried to add pictures in location detail RemoMeijer 2021-01-06 10:45:00 +01:00
• abc58d3606 following route stuff Sem van der Hoeven 2021-01-06 10:41:56 +01:00
• 399652c2ce Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests Bipin 2021-01-06 10:41:10 +01:00
• d9a6e1eff0 GeometryStart Bipin 2021-01-06 10:41:07 +01:00
• 1877a693d0 added boolean to singleton Sem van der Hoeven 2021-01-06 10:40:20 +01:00
• 80764591ad comment display-route Sem van der Hoeven 2021-01-06 10:36:37 +01:00
• 738a733b72 Location adapter also now implements images into to location items sebas 2021-01-06 10:20:55 +01:00
• 00d306631b Finished language functionality Bart 2021-01-05 17:19:09 +01:00
• 20c09c3458 [TRIED] MainActivity Test Robin Koedood 2021-01-05 16:52:48 +01:00
• 587380fd89 added updating location when you're close to it Sem van der Hoeven 2021-01-05 16:39:12 +01:00
• f7a2a79d00 Language can be changed, doesn't refresh automatically yet Bart 2021-01-05 16:20:43 +01:00
• faa79b5553 Added all pictures RemoMeijer 2021-01-05 16:18:46 +01:00
• e71c195573 [ADD] DirectionResultTest Robin Koedood 2021-01-05 16:11:19 +01:00
• 1834aec01b Updated buttons RemoMeijer 2021-01-05 16:10:06 +01:00
• d4d452e723 Merge remote-tracking branch 'origin/Tests' into Tests Robin Koedood 2021-01-05 16:04:32 +01:00
• f381a29274 [ADD] DirectionsStep test Robin Koedood 2021-01-05 16:04:25 +01:00
• 062739ac7b added navigation to location from map Sem van der Hoeven 2021-01-05 16:02:48 +01:00
• 360198e784 65+ stand remember position and changes the theme. sebas 2021-01-05 15:50:29 +01:00
• 16bd30f785 added locations to map Sem van der Hoeven 2021-01-05 13:43:10 +01:00
• fe5a5b6dfd Added functionality to the dropdown in settings. Language preference is stored in the sharedPreferences Bart 2021-01-05 13:38:21 +01:00
• 7e0b888974 Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests Bipin 2021-01-05 13:36:43 +01:00
• 804bdddbef Remove detail Bipin 2021-01-05 13:36:14 +01:00
• e1636c6bec Merge remote-tracking branch 'origin/Tests' into Tests Robin Koedood 2021-01-05 13:32:50 +01:00
• 77a6226c1d [ADD] Comments Robin Koedood 2021-01-05 13:32:44 +01:00
• 2e5f57aa23 Added coupon arrow RemoMeijer 2021-01-05 13:32:28 +01:00
• c6b33f2663 fixie Bipin 2021-01-05 13:29:33 +01:00
• ba83d69c9f Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests Bipin 2021-01-05 13:27:46 +01:00
• 08902472a3 Added Settings and Statistics, started detail Bipin 2021-01-05 13:27:25 +01:00
• fbf8cbe1c5 Small fix RemoMeijer 2021-01-05 13:23:48 +01:00
• e36e853875 [ADD] Route Fragment test Robin Koedood 2021-01-05 13:19:27 +01:00
• aae67f53ec Statistics button works RemoMeijer 2021-01-05 13:18:25 +01:00
• 356ee55375 Merge remote-tracking branch 'origin/RecyclerView' into Tests Robin Koedood 2021-01-05 13:16:30 +01:00
• bc8b83e4f6 Updated strings and values to @string/ RemoMeijer 2021-01-05 13:15:25 +01:00
• 65d2f31e3f stuff Sem van der Hoeven 2021-01-05 13:03:42 +01:00
• 40331f3135 removed test route Sem van der Hoeven 2021-01-05 12:59:35 +01:00
• f5f077db0f location stuff Sem van der Hoeven 2021-01-05 12:13:42 +01:00
• 3b363b3f33 [ADD] Location Detail Fragment Test Robin Koedood 2021-01-05 12:07:15 +01:00
• 89902a5962 Merge remote-tracking branch 'origin/RecyclerView' into Tests Robin Koedood 2021-01-05 12:03:36 +01:00
• d53f63a6d7 Updated values RemoMeijer 2021-01-05 12:02:20 +01:00
• a0d35caeb5 [ADD] Coupon test Robin Koedood 2021-01-05 11:44:25 +01:00
• e8af38981f added visualizing route Sem van der Hoeven 2021-01-05 11:25:13 +01:00
• d3cab8c70d [ADD] Location Tests + ID at every XML file Robin Koedood 2021-01-05 10:58:33 +01:00
• d63b150275 Improved fragments RemoMeijer 2021-01-05 10:47:35 +01:00
• f236067706 Added English string.xml Bart 2021-01-05 10:45:32 +01:00
• a75b81033f Fixed locationList RemoMeijer 2021-01-05 10:09:24 +01:00
• bcd9eb6378 merge Sem van der Hoeven 2021-01-04 15:49:42 +01:00
• a12493972a Merge branch 'directions-api' into develop Sem van der Hoeven 2021-01-04 15:47:31 +01:00
• 678b179e04 added backbutton couponPopup RemoMeijer 2021-01-04 15:46:18 +01:00
• 9b93ddaec5 stuff directions-api Sem van der Hoeven 2021-01-04 15:44:47 +01:00
• 1b770020ed Added List button on Home RemoMeijer 2021-01-04 15:37:09 +01:00
• 29b3623ab5 Merge remote-tracking branch 'origin/Tests' into Tests Robin Koedood 2021-01-04 15:27:58 +01:00
• da45a0a40e [TRIED] Test FileIO class Robin Koedood 2021-01-04 15:27:52 +01:00
• 5e218f3b99 added getting directions for whole route Sem van der Hoeven 2021-01-04 15:20:24 +01:00
• e761dd80e5 Adjusted frame layout in main fragment so that topbar now longer displays over the top part of fragments, but instead above it. sebas 2021-01-04 14:46:15 +01:00
• 79e24621e2 Statistics now shows amount of coupons sebas 2021-01-04 14:38:39 +01:00
• 1549fc7a59 Coupon layout updated RemoMeijer 2021-01-04 14:35:50 +01:00
• edcfd2ff0a Added popups for coupons Bart 2021-01-04 14:31:16 +01:00
• 96f32ccdbc added deserialization of the api response Sem van der Hoeven 2021-01-04 13:50:50 +01:00
• 547d676a68 Coupon onClick unfinished code Bart 2021-01-04 13:44:09 +01:00
• d96a54863c coupons working RemoMeijer 2021-01-04 13:04:02 +01:00
• 7b9ca656aa Improved RouteTest, made LocationTest Bipin 2021-01-04 11:49:14 +01:00
• d433565fef added parsing of directions response Sem van der Hoeven 2021-01-04 11:42:34 +01:00
• 2118336815 Switching fragment from statistics to coupon works RemoMeijer 2021-01-04 11:40:06 +01:00
• 36eb28ce07 Merge remote-tracking branch 'origin/Tests' into Tests Robin Koedood 2021-01-04 11:39:08 +01:00
• eea66fd153 [ADD] Data and Coupon Tests Robin Koedood 2021-01-04 11:38:54 +01:00
• ff32eefab0 Added coupon item RemoMeijer 2021-01-04 11:27:49 +01:00
• e2bccb6e76 Changed couponfragment layout sebas 2021-01-04 11:23:16 +01:00
• c355f64d38 Added couponadapter RemoMeijer 2021-01-04 11:08:49 +01:00
• 91c0435e55 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView sebas 2021-01-04 11:06:38 +01:00
• 9ca3b12d71 Added code to CouponFragment sebas 2021-01-04 11:06:04 +01:00
• 08d9543e3b RouteTest made Bipin 2021-01-04 11:01:23 +01:00
• 70a9878b06 Merge branch 'statisticsFragment' into RecyclerView Bart 2021-01-04 11:00:00 +01:00
• 294814dea8 StatisticFragment navigation to CouponFragment Bart 2021-01-04 10:59:43 +01:00
• 6b197c4742 Location implements parcable RemoMeijer 2020-12-17 14:57:04 +01:00
• a3d8bdfd77 Merge branch 'develop' into RecyclerView RemoMeijer 2020-12-17 14:56:15 +01:00
• 6f10444126 Route displays name RemoMeijer 2020-12-17 14:48:15 +01:00
• 1ca13e3a6b [ADD]Locations from JSON now in app. Markers good color. No action bar. Robin Koedood 2020-12-17 14:45:58 +01:00
• 1f7cd49a90 Route works and is clickable RemoMeijer 2020-12-17 14:35:05 +01:00
• 9c4eb98fb4 Added real locations to JSON Bipin 2020-12-17 14:24:06 +01:00
• 610b23b056 added custom overlay Sem van der Hoeven 2020-12-17 14:22:20 +01:00
• aba26f3211 Merge branch 'develop' into RecyclerView RemoMeijer 2020-12-17 13:55:01 +01:00
• 95a2e4e849 made list managers load on mainactivity oncreate Sem van der Hoeven 2020-12-17 13:53:00 +01:00
• 74fb4440ed made listmanagers enums Sem van der Hoeven 2020-12-17 13:51:45 +01:00
• 6c923d27b2 Connected locationFragment with recyclerview and added functionality Bart 2020-12-17 13:46:41 +01:00
• 17d977bb17 fixed loading Sem van der Hoeven 2020-12-17 13:41:20 +01:00
• b52c5556d2 finished loading Sem van der Hoeven 2020-12-17 11:50:31 +01:00
• 70342c6506 merge with recyclerview Sem van der Hoeven 2020-12-17 11:21:38 +01:00
• 311a794a69 removed loader from route list manager Sem van der Hoeven 2020-12-17 11:18:23 +01:00
• dbc10014f9 Merge branch 'develop' into RecyclerView RemoMeijer 2020-12-17 11:16:36 +01:00
• 1f835a94b0 Updated managers so they can load RemoMeijer 2020-12-17 11:16:03 +01:00
• 12c8d6a62d [ADD] loaders and fileio read Sem van der Hoeven 2020-12-17 11:14:43 +01:00
• 9e8e9f4cdd changed loader stuff Sem van der Hoeven 2020-12-17 11:00:14 +01:00
• 1d48ada0ab changed loader stuff Sem van der Hoeven 2020-12-17 10:59:07 +01:00
• 6a07ce77f0 remove room stuff Sem van der Hoeven 2020-12-17 10:32:28 +01:00
• 5edf50c808 Merge branch 'Fragment' into develop LocationCreation Sem van der Hoeven 2020-12-17 10:07:36 +01:00
• db7d944a41 [ADD] log Sem van der Hoeven 2020-12-17 10:04:43 +01:00
• 3f132f48a7 [ADD] start of api calls Sem van der Hoeven 2020-12-16 12:11:48 +01:00