 RemoMeijer
|
deb4bd5a19
|
Distance Calculation works, added distance test
|
2021-01-06 15:26:07 +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 |
|
|
RemoMeijer
|
09ced99654
|
Added route
|
2021-01-06 11:59:45 +01:00 |
|
|
RemoMeijer
|
9be5ba27ab
|
Added descriptions on all locations
|
2021-01-06 11:47:14 +01:00 |
|
|
RemoMeijer
|
d4cfa17fda
|
Tried to add pictures in location detail
|
2021-01-06 10:45:00 +01:00 |
|
|
RemoMeijer
|
faa79b5553
|
Added all pictures
|
2021-01-05 16:18:46 +01:00 |
|
|
RemoMeijer
|
1834aec01b
|
Updated buttons
|
2021-01-05 16:10:06 +01:00 |
|
|
RemoMeijer
|
2e5f57aa23
|
Added coupon arrow
|
2021-01-05 13:32:28 +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 |
|
|
RemoMeijer
|
bc8b83e4f6
|
Updated strings and values to @string/
|
2021-01-05 13:15:25 +01:00 |
|
|
RemoMeijer
|
d53f63a6d7
|
Updated values
|
2021-01-05 12:02:20 +01:00 |
|
|
RemoMeijer
|
d63b150275
|
Improved fragments
|
2021-01-05 10:47:35 +01:00 |
|
|
RemoMeijer
|
a75b81033f
|
Fixed locationList
|
2021-01-05 10:09:24 +01:00 |
|
|
RemoMeijer
|
678b179e04
|
added backbutton
|
2021-01-04 15:46:18 +01:00 |
|
|
RemoMeijer
|
1b770020ed
|
Added List button on Home
|
2021-01-04 15:37:09 +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 |
|
|
RemoMeijer
|
c355f64d38
|
Added couponadapter
|
2021-01-04 11:08:49 +01:00 |
|
|
RemoMeijer
|
6b197c4742
|
Location implements parcable
|
2020-12-17 14:57:04 +01:00 |
|
|
RemoMeijer
|
a3d8bdfd77
|
Merge branch 'develop' into RecyclerView
# Conflicts:
# app/src/main/java/com/a1/nextlocation/data/Location.java
|
2020-12-17 14:56:15 +01:00 |
|
|
RemoMeijer
|
6f10444126
|
Route displays name
|
2020-12-17 14:48:15 +01:00 |
|
|
RemoMeijer
|
1f7cd49a90
|
Route works and is clickable
|
2020-12-17 14:35:05 +01:00 |
|
|
RemoMeijer
|
aba26f3211
|
Merge branch 'develop' into RecyclerView
|
2020-12-17 13:55:01 +01:00 |
|
|
RemoMeijer
|
dbc10014f9
|
Merge branch 'develop' into RecyclerView
|
2020-12-17 11:16:36 +01:00 |
|
|
RemoMeijer
|
1f835a94b0
|
Updated managers so they can load
|
2020-12-17 11:16:03 +01:00 |
|
|
RemoMeijer
|
ee1ae23e0f
|
Merge branch 'develop' into RecyclerView
|
2020-12-16 10:56:36 +01:00 |
|
|
RemoMeijer
|
e2f76c94f7
|
Merge branch 'develop' into RecyclerView
# Conflicts: resolved
# app/src/main/res/layout/fragment_location.xml
# app/src/main/res/layout/fragment_location_detail.xml
|
2020-12-16 10:43:46 +01:00 |
|
|
RemoMeijer
|
148e84483a
|
Added mapView
|
2020-12-14 14:35:24 +01:00 |
|
|
RemoMeijer
|
bf1c5d0ac4
|
Added fragment_location layout and location_item layout
|
2020-12-14 14:20:54 +01:00 |
|
|
RemoMeijer
|
b174778dbf
|
Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment
|
2020-12-14 14:00:55 +01:00 |
|
|
RemoMeijer
|
d33237791b
|
Added location detail, location_item
|
2020-12-14 14:00:15 +01:00 |
|
|
RemoMeijer
|
16b9b15856
|
Added some functionality
|
2020-12-14 12:05:32 +01:00 |
|
|
RemoMeijer
|
12b446b679
|
Implemented all Methods and interfaces
|
2020-12-14 11:09:00 +01:00 |
|