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 |
|
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 |
|
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 |
|
Bart
|
6c923d27b2
|
Connected locationFragment with recyclerview and added functionality
|
2020-12-17 13:46:41 +01:00 |
|
Sem van der Hoeven
|
5edf50c808
|
Merge branch 'Fragment' into develop
|
2020-12-17 10:07:36 +01:00 |
|
Robin Koedood
|
4f68398f33
|
[ADD] route detail landscape mode
|
2020-12-16 11:38:24 +01:00 |
|
Robin Koedood
|
4229acf87c
|
[ADD] Route Detail Contraints
|
2020-12-16 11:20:52 +01:00 |
|
Sem van der Hoeven
|
512ad3980f
|
[FIX] mapview stuff
|
2020-12-16 10:48:11 +01:00 |
|
Sem van der Hoeven
|
ea59b97f0f
|
merge fragment
|
2020-12-14 15:09:59 +01:00 |
|
sebas
|
75b7ff47cd
|
[Added] small changes to route detail, location detail
|
2020-12-14 14:51:43 +01:00 |
|
sebas
|
a2d1ecfc71
|
[Added] layout created for routedetailfragment
|
2020-12-14 14:38:47 +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 |
|
Bipin
|
0092b2e839
|
fixie wixie
|
2020-12-14 14:08:40 +01:00 |
|
Bipin
|
9854f5f6ab
|
finalize main activity (for now)
|
2020-12-14 14:07:08 +01:00 |
|
sebas
|
7c200bf780
|
[Added] Created route_item layout and filled it, also filled fragment_route
|
2020-12-14 14:01:41 +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 |
|
Robin Koedood
|
c6a9b175cc
|
[ADD] coupon landscape mode
|
2020-12-14 13:59:13 +01:00 |
|
Robin Koedood
|
d4d3e8d19f
|
[ADD] forgot one string
|
2020-12-14 13:58:01 +01:00 |
|
Robin Koedood
|
8aa316fc97
|
[ADD] String values
|
2020-12-14 13:55:13 +01:00 |
|
Robin Koedood
|
ed6d80b399
|
[ADD] Imagebutton
|
2020-12-14 13:50:46 +01:00 |
|
Bipin
|
dc69d9a2ad
|
Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment
|
2020-12-14 13:41:36 +01:00 |
|
Bipin
|
83796481e8
|
back button image added
|
2020-12-14 13:41:23 +01:00 |
|
Robin Koedood
|
14d9cf686f
|
Merge remote-tracking branch 'origin/Fragment' into Fragment
|
2020-12-14 13:40:53 +01:00 |
|
Robin Koedood
|
49ec448e56
|
[FIXED] offset
|
2020-12-14 13:40:48 +01:00 |
|
Bipin
|
64f76f46c0
|
Added top bar
|
2020-12-14 13:35:16 +01:00 |
|
Bipin
|
8c25197967
|
Merge branch 'Fragment' of https://github.com/SemvdH/Next-Location into Fragment
|
2020-12-14 13:13:55 +01:00 |
|
Bipin
|
180f7fc051
|
fixed icon in navbar
|
2020-12-14 13:13:36 +01:00 |
|
Robin Koedood
|
9622d3d068
|
[ADD] Coupons fragments, changed box height
|
2020-12-14 12:33:28 +01:00 |
|
Bart
|
ad6e171a14
|
[ADD] bottomNav functionality
TODO: change placeholder icons
|
2020-12-14 12:22:26 +01:00 |
|
Robin Koedood
|
a2365d1c19
|
[ADD] Statistieken en settings fragments
|
2020-12-14 12:20:51 +01:00 |
|
Robin Koedood
|
297067fcb2
|
Merge remote-tracking branch 'origin/Fragment' into Fragment
|
2020-12-14 12:06:38 +01:00 |
|
Robin Koedood
|
19ae360ee0
|
[ADD] Settings fragment
|
2020-12-14 12:06:25 +01:00 |
|
Bipin
|
f4d74f9880
|
added menu items
|
2020-12-14 11:55:20 +01:00 |
|
Bipin
|
759772097c
|
menu items added
|
2020-12-14 11:55:03 +01:00 |
|
Robin Koedood
|
7666e2fc1a
|
[ADD]Color in theme
|
2020-12-14 11:15:45 +01:00 |
|
Bipin
|
a8add1f58e
|
[ADD]Colours to colors file
|
2020-12-14 11:09:39 +01:00 |
|
Bipin
|
b2d3364042
|
Edited themes
|
2020-12-14 11:05:40 +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
|
0436e494d6
|
[ADD] add empty project
|
2020-12-08 10:33:41 +01:00 |
|