sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143
+5451 -25
297 Commits
Author SHA1 Message Date
SemvdH 056c679442 Merge pull request #2 from SemvdH/imperial-system 
merge imperial into dev
 2021-01-06 23:20:26 +01:00
SemvdH 01e7cb5fdf Merge branch 'develop' into imperial-system 2021-01-06 23:20:13 +01:00
Bart c98acaf7c0 Added support for imperial units 2021-01-06 22:27:59 +01:00
Sem van der Hoeven c68bbd4062 ctrl alt L 2021-01-06 21:19:06 +01:00
Sem van der Hoeven c778ab2de8 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 21:04:28 +01:00
Sem van der Hoeven 7d833c8ec5 fix 2.0 2021-01-06 21:04:21 +01:00
RemoMeijer b3f0497fba Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 21:04:06 +01:00
RemoMeijer 9da1078998 updated distance calculations 2021-01-06 21:04:03 +01:00
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
Robin Koedood f868302d30 [UPDATED] CouponFragment test with string values 2021-01-06 17:41:37 +01:00
Robin Koedood 08b0ca191b [UPDATED] Name of button 2021-01-06 17:39:16 +01:00
Robin Koedood ebde0c5815 [UPDATED] DataTest 2021-01-06 17:34:32 +01:00
Sem van der Hoeven aeb676e594 Merge branch 'helpPopup' into develop 2021-01-06 17:21:44 +01:00
Sem van der Hoeven cfeb2bc64e merge languages 2021-01-06 17:20:38 +01:00
Sem van der Hoeven 3df8d36e89 Merge branch 'route_detail' into develop 2021-01-06 17:18:02 +01:00
Sem van der Hoeven 93ededb3d1 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 17:16:33 +01:00
Sem van der Hoeven 91670fb6f3 rename staticdata to data 2021-01-06 17:16:19 +01:00
Robin Koedood b2c320dd14 [UPDATED] Route Test 2021-01-06 17:12:52 +01:00
Sem van der Hoeven ce264d78bc rename 2021-01-06 17:09:11 +01:00
Robin Koedood f8acc35c5b Merge remote-tracking branch 'origin/follow-route' into follow-route 2021-01-06 17:07:47 +01:00
Robin Koedood e5e0916555 [ADD] Static Data Test 2021-01-06 17:07:26 +01:00
Sem van der Hoeven c738deab23 commentssssssssssssssssssssss 2021-01-06 17:06:27 +01:00
Sem van der Hoeven 223e77cdc8 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 16:57:08 +01:00
Sem van der Hoeven 7c9dc07c3d added keeping zoom level 2021-01-06 16:56:57 +01:00
Robin Koedood 187f45b770 Merge remote-tracking branch 'origin/follow-route' into follow-route 2021-01-06 16:56:21 +01:00
Robin Koedood 04487b77a7 [ADD] RouteHandler Test 2021-01-06 16:56:16 +01:00
RemoMeijer c921a76dc4 Added route picture, text and total distance in routeDetail 2021-01-06 16:54:15 +01:00
Bart 5844445555 Updated English location.json 2021-01-06 16:53:17 +01:00
RemoMeijer d67d78b385 Added total distance in route detail 2021-01-06 16:27:28 +01:00
Bart 0ea7ee6c31 locations.json is now English 2021-01-06 16:21:01 +01:00
Bipin d6a6724ba0 HelpPopup klaar. Tekst veranderd naar wit en extra zin toegevoegd over locaties ingedrukt houden. Layout is veranderd naar constraintlayout 2021-01-06 16:20:10 +01:00
Sem van der Hoeven fb2f7e8a66 added updating time when you start a route but are already following another one 2021-01-06 16:20:03 +01:00
Sem van der Hoeven c412f36e6c moved sections into own methods 2021-01-06 16:09:00 +01:00
Bipin 7dc5ce098c Layout fix 2021-01-06 16:07:45 +01:00
Bart 98a1ad799c Location loader now loads the correct location.json according to the selected language 2021-01-06 16:03:59 +01:00
RemoMeijer 2d9dfe9c0e updated coords 2021-01-06 15:53:02 +01:00
RemoMeijer b31ba7023e Updated coordinates 2021-01-06 15:50:43 +01:00
Sem van der Hoeven 7ba87b71b0 added time 2021-01-06 15:44:14 +01:00
Sem van der Hoeven edfc125427 added icon 2021-01-06 15:37:10 +01:00
Bart f5a2eabf61 Added popup functionality 2021-01-06 15:35:16 +01:00
Sem van der Hoeven 6d3a092298 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 15:32:35 +01:00
Sem van der Hoeven 15608bed2b added icon to drawable 2021-01-06 15:32:25 +01:00
RemoMeijer deb4bd5a19 Distance Calculation works, added distance test 2021-01-06 15:26:07 +01:00
Sem van der Hoeven 05c8951f2c Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 15:25:36 +01:00
Sem van der Hoeven a27ebfc0c3 added stopping route if last location has been reached 2021-01-06 14:40:30 +01:00
Bart dabe3cfb99 moved Refreshable to package Fragment 2021-01-06 14:35:54 +01:00
Sem van der Hoeven f806015963 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 14:33:38 +01:00
Sem van der Hoeven fcec6e1ecd stuffff 2021-01-06 14:33:25 +01:00
Bart 7284b66c13 Merge branch 'languages' into follow-route 2021-01-06 14:26:39 +01:00
Sem van der Hoeven 6266705c3e fix clusterfuck? 2021-01-06 14:18:37 +01:00
Sem van der Hoeven e90582b539 stuff merge iewl 2021-01-06 14:12:59 +01:00
Sem van der Hoeven 68f2855a66 added locations back 2021-01-06 14:07:19 +01:00
Bart d018b83490 added strings 2021-01-06 14:04:37 +01:00
Sem van der Hoeven 1aee93cd0c mergeeee 2021-01-06 13:59:59 +01:00
Sem van der Hoeven 216f48cc0f fixed distance 2021-01-06 13:57:00 +01:00
Robin Koedood 8a758f1d8d [ADD] Start Route button from other branch 2021-01-06 13:55:20 +01:00
Sem van der Hoeven bd623a3f1d stuff 2021-01-06 13:54:30 +01:00
Sem van der Hoeven 1760f510c6 comment location 2021-01-06 13:46:08 +01:00
Sem van der Hoeven ba9569b5a8 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 13:45:53 +01:00
Robin Koedood ca8d291262 [CHANGED] String values 2021-01-06 13:44:17 +01:00
Sem van der Hoeven 98eeba4de1 comments 2021-01-06 13:42:26 +01:00
Robin Koedood f0ef9512a0 Merge remote-tracking branch 'origin/RecyclerView' into Tests 2021-01-06 13:32:22 +01:00
sebas f0f87af42b Merge branch 'follow-route' into RecyclerView 
# Conflicts:
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
 2021-01-06 13:23:58 +01:00
sebas 192f1a4c64 Route detail fragment now fills in the right name and text 2021-01-06 13:22:37 +01:00
RemoMeijer 391792a5e2 Merge branch 'RecyclerView' into follow-route 
# Conflicts:
#	app/src/main/assets/locations.json
#	app/src/main/assets/routes.json
#	app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
#	app/src/main/res/values/strings.xml
 2021-01-06 13:20:52 +01:00
Bart 1cf973da9b bottom navigation sets locale on startup and language change. Fixed a bug where the selected fragment changes when rotated. 2021-01-06 12:21:31 +01:00
Robin Koedood 21c479076d Merge remote-tracking branch 'origin/follow-route' into Tests 2021-01-06 12:10:05 +01:00
Robin Koedood 0ed16ee069 [CHANGED] String values 2021-01-06 12:08:25 +01:00
Sem van der Hoeven 1f53890a4b added comments 2021-01-06 12:08:18 +01:00
RemoMeijer 09ced99654 Added route 2021-01-06 11:59:45 +01:00
sebas 86bc0f0c19 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView 
# Conflicts:
#	app/src/main/assets/locations.json
 2021-01-06 11:56:14 +01:00
sebas deb599db25 Font now changes according to last change when starting application, added scrollView to location detail, location detail now takes location name and description and added 2 discriptions to location.json 2021-01-06 11:54:39 +01:00
RemoMeijer 9be5ba27ab Added descriptions on all locations 2021-01-06 11:47:14 +01:00
Sem van der Hoeven 926a984c71 stop icon 2021-01-06 11:33:35 +01:00
Sem van der Hoeven f5da1c8a83 added displaying all locations upon stopping the route 2021-01-06 11:33:15 +01:00
Robin Koedood 525d4b776d Merge remote-tracking branch 'origin/develop' into Tests 2021-01-06 11:14:19 +01:00
sebas 0e63bff0f1 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView 
# Conflicts:
#	app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
 2021-01-06 11:13:16 +01:00
sebas 5e76ced998 Location detail now displays images 2021-01-06 11:12:33 +01:00
Robin Koedood da2a9e43bc Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-06 10:50:18 +01:00
Robin Koedood 3d1cfd244b [ADD] Main Activity Test 2021-01-06 10:50:14 +01:00
Bart 40e3ca3d51 Merge branch 'languages' into develop 2021-01-06 10:49:35 +01:00
Bart 6dd2f5de40 default strings.xml is now English, added more string resources 2021-01-06 10:48:23 +01:00
Sem van der Hoeven f6af7ae80b added route singleton 2021-01-06 10:48:03 +01:00
RemoMeijer d4cfa17fda Tried to add pictures in location detail 2021-01-06 10:45:00 +01:00
Sem van der Hoeven abc58d3606 following route stuff 2021-01-06 10:41:56 +01:00
Bipin 399652c2ce Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests 2021-01-06 10:41:10 +01:00
Bipin d9a6e1eff0 GeometryStart 2021-01-06 10:41:07 +01:00
Sem van der Hoeven 1877a693d0 added boolean to singleton 2021-01-06 10:40:20 +01:00
Sem van der Hoeven 80764591ad comment 2021-01-06 10:36:37 +01:00
sebas 738a733b72 Location adapter also now implements images into to location items 2021-01-06 10:20:55 +01:00
Bart 00d306631b Finished language functionality 2021-01-05 17:19:09 +01:00
Robin Koedood 20c09c3458 [TRIED] MainActivity Test 2021-01-05 16:52:48 +01:00
Sem van der Hoeven 587380fd89 added updating location when you're close to it 2021-01-05 16:39:12 +01:00
Bart f7a2a79d00 Language can be changed, doesn't refresh automatically yet 2021-01-05 16:20:43 +01:00
RemoMeijer faa79b5553 Added all pictures 2021-01-05 16:18:46 +01:00
Robin Koedood e71c195573 [ADD] DirectionResultTest 2021-01-05 16:11:19 +01:00
RemoMeijer 1834aec01b Updated buttons 2021-01-05 16:10:06 +01:00
Robin Koedood d4d452e723 Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-05 16:04:32 +01:00
Robin Koedood f381a29274 [ADD] DirectionsStep test 2021-01-05 16:04:25 +01:00
Sem van der Hoeven 062739ac7b added navigation to location from map 2021-01-05 16:02:48 +01:00
sebas 360198e784 65+ stand remember position and changes the theme. 2021-01-05 15:50:29 +01:00
Sem van der Hoeven 16bd30f785 added locations to map 2021-01-05 13:43:10 +01:00
Bart fe5a5b6dfd Added functionality to the dropdown in settings. Language preference is stored in the sharedPreferences 2021-01-05 13:38:21 +01:00
Bipin 7e0b888974 Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests 2021-01-05 13:36:43 +01:00
Bipin 804bdddbef Remove detail 2021-01-05 13:36:14 +01:00
Robin Koedood e1636c6bec Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-05 13:32:50 +01:00
Robin Koedood 77a6226c1d [ADD] Comments 2021-01-05 13:32:44 +01:00
RemoMeijer 2e5f57aa23 Added coupon arrow 2021-01-05 13:32:28 +01:00
Bipin c6b33f2663 fixie 2021-01-05 13:29:33 +01:00
Bipin ba83d69c9f Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests 
# Conflicts:
#	app/src/main/res/layout/fragment_settings.xml
 2021-01-05 13:27:46 +01:00
Bipin 08902472a3 Added Settings and Statistics, started detail 2021-01-05 13:27:25 +01:00
RemoMeijer fbf8cbe1c5 Small fix 2021-01-05 13:23:48 +01:00
Robin Koedood e36e853875 [ADD] Route Fragment test 2021-01-05 13:19:27 +01:00
RemoMeijer aae67f53ec Statistics button works 2021-01-05 13:18:25 +01:00
Robin Koedood 356ee55375 Merge remote-tracking branch 'origin/RecyclerView' into Tests 2021-01-05 13:16:30 +01:00
RemoMeijer bc8b83e4f6 Updated strings and values to @string/ 2021-01-05 13:15:25 +01:00
Sem van der Hoeven 65d2f31e3f stuff 2021-01-05 13:03:42 +01:00
Sem van der Hoeven 40331f3135 removed test route 2021-01-05 12:59:35 +01:00
Sem van der Hoeven f5f077db0f location stuff 2021-01-05 12:13:42 +01:00
Robin Koedood 3b363b3f33 [ADD] Location Detail Fragment Test 2021-01-05 12:07:15 +01:00
Robin Koedood 89902a5962 Merge remote-tracking branch 'origin/RecyclerView' into Tests 2021-01-05 12:03:36 +01:00
RemoMeijer d53f63a6d7 Updated values 2021-01-05 12:02:20 +01:00
Robin Koedood a0d35caeb5 [ADD] Coupon test 2021-01-05 11:44:25 +01:00
Sem van der Hoeven e8af38981f added visualizing route 2021-01-05 11:25:13 +01:00
Robin Koedood d3cab8c70d [ADD] Location Tests + ID at every XML file 2021-01-05 10:58:33 +01:00
RemoMeijer d63b150275 Improved fragments 2021-01-05 10:47:35 +01:00
Bart f236067706 Added English string.xml 2021-01-05 10:45:32 +01:00
RemoMeijer a75b81033f Fixed locationList 2021-01-05 10:09:24 +01:00
Sem van der Hoeven bcd9eb6378 merge 2021-01-04 15:49:42 +01:00
Sem van der Hoeven a12493972a Merge branch 'directions-api' into develop 2021-01-04 15:47:31 +01:00
RemoMeijer 678b179e04 added backbutton 2021-01-04 15:46:18 +01:00
Sem van der Hoeven 9b93ddaec5 stuff 2021-01-04 15:44:47 +01:00
RemoMeijer 1b770020ed Added List button on Home 2021-01-04 15:37:09 +01:00
Robin Koedood 29b3623ab5 Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-04 15:27:58 +01:00
Robin Koedood da45a0a40e [TRIED] Test FileIO class 
No luck so far
 2021-01-04 15:27:52 +01:00
Sem van der Hoeven 5e218f3b99 added getting directions for whole route 2021-01-04 15:20:24 +01:00
sebas e761dd80e5 Adjusted frame layout in main fragment so that topbar now longer displays over the top part of fragments, but instead above it. 2021-01-04 14:46:15 +01:00
sebas 79e24621e2 Statistics now shows amount of coupons 2021-01-04 14:38:39 +01:00
RemoMeijer 1549fc7a59 Coupon layout updated 2021-01-04 14:35:50 +01:00
Bart edcfd2ff0a Added popups for coupons 2021-01-04 14:31:16 +01:00
Sem van der Hoeven 96f32ccdbc added deserialization of the api response 2021-01-04 13:50:50 +01:00
Bart 547d676a68 Coupon onClick unfinished code 2021-01-04 13:44:09 +01:00
RemoMeijer d96a54863c coupons working 2021-01-04 13:04:02 +01:00
Bipin 7b9ca656aa Improved RouteTest, made LocationTest 2021-01-04 11:49:14 +01:00
Sem van der Hoeven d433565fef added parsing of directions response 2021-01-04 11:42:34 +01:00
RemoMeijer 2118336815 Switching fragment from statistics to coupon works 2021-01-04 11:40:06 +01:00
Robin Koedood 36eb28ce07 Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-04 11:39:08 +01:00
Robin Koedood eea66fd153 [ADD] Data and Coupon Tests 2021-01-04 11:38:54 +01:00
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 70a9878b06 Merge branch 'statisticsFragment' into RecyclerView 2021-01-04 11:00:00 +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
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
Bipin 180f7fc051 fixed icon in navbar 2020-12-14 13:13:36 +01:00
Robin Koedood 9622d3d068 [ADD] Coupons fragments, changed box height 2020-12-14 12:33:28 +01:00
Bart ad6e171a14 [ADD] bottomNav functionality 
TODO: change placeholder icons
 2020-12-14 12:22:26 +01:00
Robin Koedood a2365d1c19 [ADD] Statistieken en settings fragments 2020-12-14 12:20:51 +01:00
Sem van der Hoeven 6b97c21a8b added ignores to fields that dont need to be in the database 2020-12-14 12:16:39 +01:00
Sem van der Hoeven 23d23bead4 added location dao and repository 2020-12-14 12:13:15 +01:00
Robin Koedood 297067fcb2 Merge remote-tracking branch 'origin/Fragment' into Fragment 2020-12-14 12:06:38 +01:00
Robin Koedood 19ae360ee0 [ADD] Settings fragment 2020-12-14 12:06:25 +01:00
RemoMeijer 16b9b15856 Added some functionality 2020-12-14 12:05:32 +01:00
Sem van der Hoeven 204d45cece added packages for dao and repository 2020-12-14 12:03:47 +01:00
Sem van der Hoeven 08215e18c5 added database and coupon and route daos 2020-12-14 12:00:01 +01:00
Bipin f4d74f9880 added menu items 2020-12-14 11:55:20 +01:00
Bipin 759772097c menu items added 2020-12-14 11:55:03 +01:00
sebas 63c49c40d7 [change] Small change to adapter classes 2020-12-14 11:39:29 +01:00
sebas 13b73fb0de [Added] created method for CouponListManager 2020-12-14 11:21:43 +01:00
sebas e5fa7db27d [Added] Added some functionallity to the adapters (not finished yet due to missing functionallity from other classes) 2020-12-14 11:19:39 +01:00
Sem van der Hoeven c4fd44ad76 added room dependency 2020-12-14 11:19:11 +01:00
Sem van der Hoeven 3e9e41c118 Merge branch 'data' of https://github.com/SemvdH/Next-Location into data 2020-12-14 11:17:28 +01:00
Sem van der Hoeven 64c8b0591a [ADD] constructors 2020-12-14 11:16:40 +01:00
Robin Koedood 7666e2fc1a [ADD]Color in theme 2020-12-14 11:15:45 +01:00
sebas aee2797a0f [Added] methods to CouponAdapter 2020-12-14 11:10:51 +01:00
Bipin a8add1f58e [ADD]Colours to colors file 2020-12-14 11:09:39 +01:00
RemoMeijer 12b446b679 Implemented all Methods and interfaces 2020-12-14 11:09:00 +01:00
Bipin b2d3364042 Edited themes 2020-12-14 11:05:40 +01:00
Bart 8f8303d66a Merge remote-tracking branch 'origin/data' into data 2020-12-14 11:04:53 +01:00
Bart a2ffef1099 [ADD] data & location class fields and getters / setters 2020-12-14 11:04:31 +01:00
Sem van der Hoeven dec62e8b9a [ADD] coupon class fields and getters / setters 2020-12-14 10:56:49 +01:00
Sem van der Hoeven fac41e2ade [ADD] route class fields and getters / setters 2020-12-14 10:55:39 +01:00
Sem van der Hoeven bc0c1e3a96 [ADD] all classes and packages according to class diagram 2020-12-14 10:49:10 +01:00
Sem van der Hoeven 3b6faf0672 [ADD] packages and rafactored ui classes 2020-12-14 10:42:33 +01:00
sebas 4e5eea1d9f [Added] Created all fragments 2020-12-08 11:02:00 +01:00