Commit Graph

348 Commits

Author SHA1 Message Date
Robin Koedood
f552afb49e [ADD] ROUTE TEST NIEUWE METHODE 2021-01-06 21:01:20 +01:00
Sem van der Hoeven
2c7db11917 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:59:57 +01:00
Sem van der Hoeven
f062b1915c fix? 2021-01-06 20:59:48 +01:00
RemoMeijer
bbab7b2bb1 improved icons 2021-01-06 20:59:27 +01:00
RemoMeijer
bbdf9a7d29 Replaced images with icons 2021-01-06 20:51:16 +01:00
Sem van der Hoeven
23beac0cf0 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:48:55 +01:00
Sem van der Hoeven
f3e636f586 added route calculating time 2021-01-06 20:48:45 +01:00
Bart
5f11d58300 Updated default language dropdown position (en -> nl) 2021-01-06 20:46:21 +01:00
sebas
12a4737567 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
# Conflicts:
#	app/src/main/assets/routes.json
2021-01-06 20:43:34 +01:00
sebas
bd58927573 Finished the final translation 2021-01-06 20:42:03 +01:00
Sem van der Hoeven
023647d418 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:37:43 +01:00
Bipin
5cc559d7ef HelpPopup goed genoeg 2021-01-06 20:26:48 +01:00
Sem van der Hoeven
bf55bcef3d Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:20:19 +01:00
Sem van der Hoeven
76832f5a54 centercrop 2021-01-06 20:20:07 +01:00
Bipin
7da259a179 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:17:01 +01:00
Bipin
115c064f11 Scrollable help 2021-01-06 20:16:48 +01:00
RemoMeijer
9a05e486c1 Removed landscape mode, since it wont be used 2021-01-06 20:12:25 +01:00
Bart
22d760bbda Updated language, removed chinese from language dropdown 2021-01-06 20:10:27 +01:00
RemoMeijer
7f9783aeb1 Text on 65+ mode not in total distance anymore 2021-01-06 20:09:11 +01:00
RemoMeijer
91db76c6d5 Start route button not in nav bar anymore 2021-01-06 20:06:46 +01:00
RemoMeijer
cb2800977e fixed route 2021-01-06 20:00:18 +01:00
RemoMeijer
352e6ef5a7 fixed nl route 2021-01-06 19:55:30 +01:00
Bart
195377fada Fixed coupons
Locating wrong json
2021-01-06 19:52:42 +01:00
RemoMeijer
da0a919ca1 Updated the routes coordinates 2021-01-06 19:52:06 +01:00
Robin Koedood
17c39ab63e Merge remote-tracking branch 'origin/develop' into develop 2021-01-06 19:51:49 +01:00
Robin Koedood
aa6114e257 [FIXED] tests things 2021-01-06 19:51:42 +01:00
Sem van der Hoeven
13cc7be1d2 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:49:19 +01:00
Sem van der Hoeven
611427b0d2 more coupons 2021-01-06 19:49:12 +01:00
RemoMeijer
e3fc976f5f Updated the nl locations coordinates 2021-01-06 19:46:05 +01:00
Robin Koedood
f01f4fbdfa [FIXED] CouponFragment test with string resource 2021-01-06 19:43:21 +01:00
Sem van der Hoeven
16bb984deb Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:42:07 +01:00
Sem van der Hoeven
9828595e8b proper context 2021-01-06 19:42:04 +01:00
RemoMeijer
5062a9fa67 Updated coordinates again 2021-01-06 19:40:38 +01:00
Bart
033052f480 Merge branch 'languages' into develop 2021-01-06 19:35:04 +01:00
Sem van der Hoeven
564eb597c6 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:34:29 +01:00
Sem van der Hoeven
6fed07ca41 update routes with locations and imageurls 2021-01-06 19:34:22 +01:00
Bart
8a453f298a Fixed file locating problem 2021-01-06 19:34:03 +01:00
sebas
615401c0d3 Commented settingsFragment 2021-01-06 19:31:01 +01:00
RemoMeijer
a4413ca42c Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:29:03 +01:00
RemoMeijer
c3d317baea Added even more comments 2021-01-06 19:29:00 +01:00
Sem van der Hoeven
4d00735f24 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:25:15 +01:00
Sem van der Hoeven
c2bf1d762a added findbyname in locationlistmanager 2021-01-06 19:25:10 +01:00
RemoMeijer
5f3fcf2889 Added comments 2021-01-06 19:25:04 +01:00
RemoMeijer
4021f9903d Removed custOverlay, Added comments 2021-01-06 19:24:51 +01:00
Robin Koedood
e9a889fe6d Merge remote-tracking branch 'origin/develop' into develop 2021-01-06 19:19:58 +01:00
Robin Koedood
5f927a5550 [FIXED] Test works again 2021-01-06 19:19:54 +01:00
RemoMeijer
ae2aab7275 Added comments 2021-01-06 19:18:23 +01:00
Robin Koedood
0d94d17b2f [REMOVED] Color blind 2021-01-06 19:17:21 +01:00
Bart
56a14c2482 Fixed the bottomNavigation refresh when a route is started 2021-01-06 18:31:55 +01:00
Bart
7089524be6 Added support for different language routes and coupons 2021-01-06 17:41:57 +01:00