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

..

CouponFragment.java

Updated buttons

2021-01-05 16:10:06 +01:00

HelpPopup.java

[ADD] all classes and packages according to class diagram

2020-12-14 10:49:10 +01:00

HomeFragment.java

added comments

2021-01-06 12:08:18 +01:00

LocationDetailFragment.java

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

LocationFragment.java

Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView

2021-01-06 11:13:16 +01:00

RouteDetailFragment.java

Route detail fragment now fills in the right name and text

2021-01-06 13:22:37 +01:00

RouteFragment.java

Merge branch 'RecyclerView' into follow-route

2021-01-06 13:20:52 +01:00

SettingsFragment.java

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

StatisticFragment.java

Merge branch 'RecyclerView' into follow-route

2021-01-06 13:20:52 +01:00