sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
307 Commits 23 Branches 4 Tags
452bc00848232249e6f7232accf48824ca6c0ffe
Commit Graph

80 Commits

Author SHA1 Message Date
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
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
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
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
RemoMeijer
1b770020ed Added List button on Home 2021-01-04 15:37:09 +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
RemoMeijer
d96a54863c coupons working 2021-01-04 13:04:02 +01:00
RemoMeijer
2118336815 Switching fragment from statistics to coupon works 2021-01-04 11:40:06 +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