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 |
|
Bipin
|
7dc5ce098c
|
Layout fix
|
2021-01-06 16:07:45 +01:00 |
|
Bart
|
f5a2eabf61
|
Added popup functionality
|
2021-01-06 15:35:16 +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 |
|