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 |
|
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 |
|
RemoMeijer
|
d4cfa17fda
|
Tried to add pictures in location detail
|
2021-01-06 10:45:00 +01:00 |
|
sebas
|
738a733b72
|
Location adapter also now implements images into to location items
|
2021-01-06 10:20:55 +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 |
|
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 |
|
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 |
|
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 |
|
Bart
|
edcfd2ff0a
|
Added popups for coupons
|
2021-01-04 14:31:16 +01:00 |
|
Bart
|
547d676a68
|
Coupon onClick unfinished code
|
2021-01-04 13:44:09 +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 |
|
RemoMeijer
|
c355f64d38
|
Added couponadapter
|
2021-01-04 11:08:49 +01:00 |
|
sebas
|
91c0435e55
|
Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView
|
2021-01-04 11:06:38 +01:00 |
|
sebas
|
9ca3b12d71
|
Added code to CouponFragment
|
2021-01-04 11:06:04 +01:00 |
|
Bart
|
294814dea8
|
StatisticFragment navigation to CouponFragment
|
2021-01-04 10:59:43 +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 |
|
Robin Koedood
|
1ca13e3a6b
|
[ADD]Locations from JSON now in app. Markers good color. No action bar.
|
2020-12-17 14:45:58 +01:00 |
|
RemoMeijer
|
1f7cd49a90
|
Route works and is clickable
|
2020-12-17 14:35:05 +01:00 |
|
Bipin
|
9c4eb98fb4
|
Added real locations to JSON
|
2020-12-17 14:24:06 +01:00 |
|
Sem van der Hoeven
|
610b23b056
|
added custom overlay
|
2020-12-17 14:22:20 +01:00 |
|
RemoMeijer
|
aba26f3211
|
Merge branch 'develop' into RecyclerView
|
2020-12-17 13:55:01 +01:00 |
|
Sem van der Hoeven
|
95a2e4e849
|
made list managers load on mainactivity oncreate
|
2020-12-17 13:53:00 +01:00 |
|
Sem van der Hoeven
|
74fb4440ed
|
made listmanagers enums
|
2020-12-17 13:51:45 +01:00 |
|
Bart
|
6c923d27b2
|
Connected locationFragment with recyclerview and added functionality
|
2020-12-17 13:46:41 +01:00 |
|
Sem van der Hoeven
|
17d977bb17
|
fixed loading
|
2020-12-17 13:41:20 +01:00 |
|
Sem van der Hoeven
|
b52c5556d2
|
finished loading
|
2020-12-17 11:50:31 +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 |
|
Sem van der Hoeven
|
12c8d6a62d
|
[ADD] loaders and fileio read
|
2020-12-17 11:14:43 +01:00 |
|
Sem van der Hoeven
|
9e8e9f4cdd
|
changed loader stuff
|
2020-12-17 11:00:14 +01:00 |
|
Sem van der Hoeven
|
1d48ada0ab
|
changed loader stuff
|
2020-12-17 10:59:07 +01:00 |
|