Sem van der Hoeven
|
c68bbd4062
|
ctrl alt L
|
2021-01-06 21:19:06 +01:00 |
|
RemoMeijer
|
bbdf9a7d29
|
Replaced images with icons
|
2021-01-06 20:51:16 +01:00 |
|
Bart
|
195377fada
|
Fixed coupons
Locating wrong json
|
2021-01-06 19:52:42 +01:00 |
|
Bart
|
033052f480
|
Merge branch 'languages' into develop
|
2021-01-06 19:35:04 +01:00 |
|
RemoMeijer
|
a4413ca42c
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 19:29:03 +01:00 |
|
RemoMeijer
|
c3d317baea
|
Added even more comments
|
2021-01-06 19:29:00 +01:00 |
|
Sem van der Hoeven
|
4d00735f24
|
Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop
|
2021-01-06 19:25:15 +01:00 |
|
Sem van der Hoeven
|
c2bf1d762a
|
added findbyname in locationlistmanager
|
2021-01-06 19:25:10 +01:00 |
|
RemoMeijer
|
5f3fcf2889
|
Added comments
|
2021-01-06 19:25:04 +01:00 |
|
RemoMeijer
|
4021f9903d
|
Removed custOverlay, Added comments
|
2021-01-06 19:24:51 +01:00 |
|
Bart
|
7089524be6
|
Added support for different language routes and coupons
|
2021-01-06 17:41:57 +01:00 |
|
Bart
|
98a1ad799c
|
Location loader now loads the correct location.json according to the selected language
|
2021-01-06 16:03:59 +01:00 |
|
sebas
|
738a733b72
|
Location adapter also now implements images into to location items
|
2021-01-06 10:20:55 +01:00 |
|
RemoMeijer
|
1b770020ed
|
Added List button on Home
|
2021-01-04 15:37:09 +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
|
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
|
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
|
1f7cd49a90
|
Route works and is clickable
|
2020-12-17 14:35:05 +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
|
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 |
|
RemoMeijer
|
16b9b15856
|
Added some functionality
|
2020-12-14 12:05:32 +01:00 |
|
sebas
|
63c49c40d7
|
[change] Small change to adapter classes
|
2020-12-14 11:39:29 +01:00 |
|
sebas
|
13b73fb0de
|
[Added] created method for CouponListManager
|
2020-12-14 11:21:43 +01:00 |
|
sebas
|
e5fa7db27d
|
[Added] Added some functionallity to the adapters (not finished yet due to missing functionallity from other classes)
|
2020-12-14 11:19:39 +01:00 |
|
sebas
|
aee2797a0f
|
[Added] methods to CouponAdapter
|
2020-12-14 11:10:51 +01:00 |
|
RemoMeijer
|
12b446b679
|
Implemented all Methods and interfaces
|
2020-12-14 11:09:00 +01:00 |
|
Sem van der Hoeven
|
bc0c1e3a96
|
[ADD] all classes and packages according to class diagram
|
2020-12-14 10:49:10 +01:00 |
|