Bipin
|
c6b33f2663
|
fixie
|
2021-01-05 13:29:33 +01:00 |
|
Bipin
|
ba83d69c9f
|
Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests
# Conflicts:
# app/src/main/res/layout/fragment_settings.xml
|
2021-01-05 13:27:46 +01:00 |
|
Bipin
|
08902472a3
|
Added Settings and Statistics, started detail
|
2021-01-05 13:27:25 +01:00 |
|
RemoMeijer
|
fbf8cbe1c5
|
Small fix
|
2021-01-05 13:23:48 +01:00 |
|
Robin Koedood
|
e36e853875
|
[ADD] Route Fragment test
|
2021-01-05 13:19:27 +01:00 |
|
RemoMeijer
|
aae67f53ec
|
Statistics button works
|
2021-01-05 13:18:25 +01:00 |
|
Robin Koedood
|
356ee55375
|
Merge remote-tracking branch 'origin/RecyclerView' into Tests
|
2021-01-05 13:16:30 +01:00 |
|
RemoMeijer
|
bc8b83e4f6
|
Updated strings and values to @string/
|
2021-01-05 13:15:25 +01:00 |
|
Sem van der Hoeven
|
65d2f31e3f
|
stuff
|
2021-01-05 13:03:42 +01:00 |
|
Sem van der Hoeven
|
40331f3135
|
removed test route
|
2021-01-05 12:59:35 +01:00 |
|
Sem van der Hoeven
|
f5f077db0f
|
location stuff
|
2021-01-05 12:13:42 +01:00 |
|
Robin Koedood
|
3b363b3f33
|
[ADD] Location Detail Fragment Test
|
2021-01-05 12:07:15 +01:00 |
|
Robin Koedood
|
89902a5962
|
Merge remote-tracking branch 'origin/RecyclerView' into Tests
|
2021-01-05 12:03:36 +01:00 |
|
RemoMeijer
|
d53f63a6d7
|
Updated values
|
2021-01-05 12:02:20 +01:00 |
|
Robin Koedood
|
a0d35caeb5
|
[ADD] Coupon test
|
2021-01-05 11:44:25 +01:00 |
|
Sem van der Hoeven
|
e8af38981f
|
added visualizing route
|
2021-01-05 11:25:13 +01:00 |
|
Robin Koedood
|
d3cab8c70d
|
[ADD] Location Tests + ID at every XML file
|
2021-01-05 10:58:33 +01:00 |
|
RemoMeijer
|
d63b150275
|
Improved fragments
|
2021-01-05 10:47:35 +01:00 |
|
Bart
|
f236067706
|
Added English string.xml
|
2021-01-05 10:45:32 +01:00 |
|
RemoMeijer
|
a75b81033f
|
Fixed locationList
|
2021-01-05 10:09:24 +01:00 |
|
Sem van der Hoeven
|
bcd9eb6378
|
merge
|
2021-01-04 15:49:42 +01:00 |
|
Sem van der Hoeven
|
a12493972a
|
Merge branch 'directions-api' into develop
|
2021-01-04 15:47:31 +01:00 |
|
RemoMeijer
|
678b179e04
|
added backbutton
|
2021-01-04 15:46:18 +01:00 |
|
Sem van der Hoeven
|
9b93ddaec5
|
stuff
|
2021-01-04 15:44:47 +01:00 |
|
RemoMeijer
|
1b770020ed
|
Added List button on Home
|
2021-01-04 15:37:09 +01:00 |
|
Robin Koedood
|
29b3623ab5
|
Merge remote-tracking branch 'origin/Tests' into Tests
|
2021-01-04 15:27:58 +01:00 |
|
Robin Koedood
|
da45a0a40e
|
[TRIED] Test FileIO class
No luck so far
|
2021-01-04 15:27:52 +01:00 |
|
Sem van der Hoeven
|
5e218f3b99
|
added getting directions for whole route
|
2021-01-04 15:20:24 +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 |
|
Sem van der Hoeven
|
96f32ccdbc
|
added deserialization of the api response
|
2021-01-04 13:50:50 +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 |
|
Bipin
|
7b9ca656aa
|
Improved RouteTest, made LocationTest
|
2021-01-04 11:49:14 +01:00 |
|
Sem van der Hoeven
|
d433565fef
|
added parsing of directions response
|
2021-01-04 11:42:34 +01:00 |
|
RemoMeijer
|
2118336815
|
Switching fragment from statistics to coupon works
|
2021-01-04 11:40:06 +01:00 |
|
Robin Koedood
|
36eb28ce07
|
Merge remote-tracking branch 'origin/Tests' into Tests
|
2021-01-04 11:39:08 +01:00 |
|
Robin Koedood
|
eea66fd153
|
[ADD] Data and Coupon Tests
|
2021-01-04 11:38:54 +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 |
|
Bipin
|
08d9543e3b
|
RouteTest made
|
2021-01-04 11:01:23 +01:00 |
|
Bart
|
70a9878b06
|
Merge branch 'statisticsFragment' into RecyclerView
|
2021-01-04 11:00:00 +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 |
|