Bipin
|
d87adeec8d
|
text sizes and colours
|
2021-01-12 15:10:54 +01:00 |
|
Robin Koedood
|
37a803b3a6
|
HELP popup en setting recreate nu na een switch ding switchen q8)
|
2021-01-12 14:54:31 +01:00 |
|
Bart
|
428fa10433
|
Merge branch 'AAAAAAAAAAAAAAAAAAAAAAAAAAAA' into develop
|
2021-01-12 14:39:51 +01:00 |
|
Bipin
|
6d21ca16b8
|
last visual fixes for real this time promise
|
2021-01-12 14:35:18 +01:00 |
|
Bart
|
363899811a
|
Added English help translation, ok-button moved to the bottom
|
2021-01-12 14:30:14 +01:00 |
|
Bipin
|
3880d7b4a2
|
Fixed last colour problems
|
2021-01-12 14:28:22 +01:00 |
|
Bipin
|
70efd6b97c
|
Merge branch 'fuckcolours' into develop
|
2021-01-12 14:05:10 +01:00 |
|
Sem van der Hoeven
|
4cc49c77f6
|
yeet
|
2021-01-12 14:04:25 +01:00 |
|
RemoMeijer
|
efbbe7124b
|
Route detail added
|
2021-01-12 13:52:02 +01:00 |
|
Bipin
|
2f5b53e2b4
|
barFix
|
2021-01-12 12:13:29 +01:00 |
|
Bipin
|
0663dabca5
|
Some non-functional changes
|
2021-01-12 11:54:33 +01:00 |
|
Bipin
|
e7f152bc00
|
WAT MOOOOOOI
|
2021-01-12 11:00:44 +01:00 |
|
Bipin
|
f3dbb2b1d1
|
big bordfer
|
2021-01-12 10:44:59 +01:00 |
|
Bipin
|
c15125d0c2
|
Removed all soul from application :)
|
2021-01-12 10:12:17 +01:00 |
|
Sem van der Hoeven
|
20431d019b
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-07 11:20:58 +01:00 |
|
Sem van der Hoeven
|
7e99070002
|
added ok button to help popup
|
2021-01-07 11:20:48 +01:00 |
|
Bart
|
c98acaf7c0
|
Added support for imperial units
|
2021-01-06 22:27:59 +01:00 |
|
RemoMeijer
|
bbab7b2bb1
|
improved icons
|
2021-01-06 20:59:27 +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
|
115c064f11
|
Scrollable help
|
2021-01-06 20:16:48 +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 |
|
Robin Koedood
|
0d94d17b2f
|
[REMOVED] Color blind
|
2021-01-06 19:17:21 +01:00 |
|
Sem van der Hoeven
|
aeb676e594
|
Merge branch 'helpPopup' into develop
|
2021-01-06 17:21:44 +01:00 |
|
RemoMeijer
|
d67d78b385
|
Added total distance in route detail
|
2021-01-06 16:27:28 +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 |
|
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 |
|
Sem van der Hoeven
|
fcec6e1ecd
|
stuffff
|
2021-01-06 14:33:25 +01:00 |
|
Robin Koedood
|
ca8d291262
|
[CHANGED] String values
|
2021-01-06 13:44:17 +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 |
|
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 |
|
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 |
|
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 |
|
Bart
|
40e3ca3d51
|
Merge branch 'languages' into develop
|
2021-01-06 10:49:35 +01:00 |
|
Sem van der Hoeven
|
587380fd89
|
added updating location when you're close to it
|
2021-01-05 16:39:12 +01:00 |
|
RemoMeijer
|
1834aec01b
|
Updated buttons
|
2021-01-05 16:10:06 +01:00 |
|
sebas
|
360198e784
|
65+ stand remember position and changes the theme.
|
2021-01-05 15:50:29 +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 |
|
RemoMeijer
|
fbf8cbe1c5
|
Small fix
|
2021-01-05 13:23:48 +01:00 |
|
RemoMeijer
|
aae67f53ec
|
Statistics button works
|
2021-01-05 13:18:25 +01:00 |
|