Sem van der Hoeven
|
512ad3980f
|
[FIX] mapview stuff
|
2020-12-16 10:48:11 +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 |
|
Sem van der Hoeven
|
2479563474
|
Merge branch 'data' into develop
|
2020-12-14 15:10:09 +01:00 |
|
Sem van der Hoeven
|
ea59b97f0f
|
merge fragment
|
2020-12-14 15:09:59 +01:00 |
|
Sem van der Hoeven
|
0b9bba63a3
|
added all daos
|
2020-12-14 15:07:53 +01:00 |
|
Sem van der Hoeven
|
890a5264d6
|
added initmapview
|
2020-12-14 14:37:50 +01:00 |
|
Sem van der Hoeven
|
2792a62069
|
merge conflicts
|
2020-12-14 14:36:52 +01:00 |
|
Sem van der Hoeven
|
b3be078361
|
added mapview and osm map
|
2020-12-14 14:35:53 +01:00 |
|
Bart
|
996b061b65
|
Merge branch 'bottomNavigation' into develop
|
2020-12-14 13:36:18 +01:00 |
|
Sem van der Hoeven
|
8fdb88f71a
|
data dao
|
2020-12-14 13:16:03 +01:00 |
|
Bart
|
ad6e171a14
|
[ADD] bottomNav functionality
TODO: change placeholder icons
|
2020-12-14 12:22:26 +01:00 |
|
Sem van der Hoeven
|
6b97c21a8b
|
added ignores to fields that dont need to be in the database
|
2020-12-14 12:16:39 +01:00 |
|
Sem van der Hoeven
|
23d23bead4
|
added location dao and repository
|
2020-12-14 12:13:15 +01:00 |
|
Robin Koedood
|
19ae360ee0
|
[ADD] Settings fragment
|
2020-12-14 12:06:25 +01:00 |
|
RemoMeijer
|
16b9b15856
|
Added some functionality
|
2020-12-14 12:05:32 +01:00 |
|
Sem van der Hoeven
|
204d45cece
|
added packages for dao and repository
|
2020-12-14 12:03:47 +01:00 |
|
Sem van der Hoeven
|
08215e18c5
|
added database and coupon and route daos
|
2020-12-14 12:00:01 +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 |
|
Sem van der Hoeven
|
c4fd44ad76
|
added room dependency
|
2020-12-14 11:19:11 +01:00 |
|
Sem van der Hoeven
|
3e9e41c118
|
Merge branch 'data' of https://github.com/SemvdH/Next-Location into data
|
2020-12-14 11:17:28 +01:00 |
|
Sem van der Hoeven
|
64c8b0591a
|
[ADD] constructors
|
2020-12-14 11:16:40 +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 |
|
Bart
|
8f8303d66a
|
Merge remote-tracking branch 'origin/data' into data
|
2020-12-14 11:04:53 +01:00 |
|
Bart
|
a2ffef1099
|
[ADD] data & location class fields and getters / setters
|
2020-12-14 11:04:31 +01:00 |
|
Sem van der Hoeven
|
dec62e8b9a
|
[ADD] coupon class fields and getters / setters
|
2020-12-14 10:56:49 +01:00 |
|
Sem van der Hoeven
|
fac41e2ade
|
[ADD] route class fields and getters / setters
|
2020-12-14 10:55:39 +01:00 |
|
Sem van der Hoeven
|
bc0c1e3a96
|
[ADD] all classes and packages according to class diagram
|
2020-12-14 10:49:10 +01:00 |
|
Sem van der Hoeven
|
3b6faf0672
|
[ADD] packages and rafactored ui classes
|
2020-12-14 10:42:33 +01:00 |
|
sebas
|
4e5eea1d9f
|
[Added] Created all fragments
|
2020-12-08 11:02:00 +01:00 |
|
Sem van der Hoeven
|
b1503e7a8d
|
[ADD] comment
|
2020-12-08 10:35:10 +01:00 |
|
Sem van der Hoeven
|
0436e494d6
|
[ADD] add empty project
|
2020-12-08 10:33:41 +01:00 |
|