Commit Graph
21 Commits
Author SHA1 Message Date
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
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
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
sebas 738a733b72 Location adapter also now implements images into to location items 2021-01-06 10:20:55 +01:00
sebas 360198e784 65+ stand remember position and changes the theme. 2021-01-05 15:50:29 +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
sebas e2bccb6e76 Changed couponfragment layout 2021-01-04 11:23:16 +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
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
sebas 7c200bf780 [Added] Created route_item layout and filled it, also filled fragment_route 2020-12-14 14:01:41 +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
sebas aee2797a0f [Added] methods to CouponAdapter 2020-12-14 11:10:51 +01:00
sebas 4e5eea1d9f [Added] Created all fragments 2020-12-08 11:02:00 +01:00