Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #402 - Add bikeshare support - Layers and Trip Plan #776

Merged
merged 140 commits into from
Aug 30, 2017
Merged
Changes from 1 commit
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
dcf8367
Added bike stations to the map from OTP server. (Default marker is sh…
carvalhorr Jun 9, 2017
def334a
Added bounding box to request to OTP from the current map view.
carvalhorr Jun 12, 2017
bd38de3
Added item in HomeActitity drawer to switch bikes on/off.
carvalhorr Jun 13, 2017
8b1d61d
Added support for multiple overlays respond to marker selection.
carvalhorr Jun 14, 2017
0f7d5a5
Added personalized icons for bike station and info window when they a…
carvalhorr Jun 16, 2017
19465fc
Updating the progress notes document.
carvalhorr Jun 16, 2017
4140046
Updating the progress notes document.
carvalhorr Jun 17, 2017
411f42e
Extracted strings in bike info window to strings resource file.
carvalhorr Jun 19, 2017
c3e3808
Updating the progress notes document.
carvalhorr Jun 19, 2017
b92b91b
Changed the way to activate the bikeshare on the map using layers
carvalhorr Jun 20, 2017
a76938f
Updated daily log for June 20
carvalhorr Jun 21, 2017
1b74a70
Updated bikeshare info window UI to be more similar to other info win…
carvalhorr Jun 21, 2017
56b2127
Added animation to move the new Layers FAB with sliding panel.
carvalhorr Jun 21, 2017
5c915b5
Updated daily log for June 21
carvalhorr Jun 22, 2017
4a13cc2
Updated daily log for June 22
carvalhorr Jun 23, 2017
b86a0a5
Fixed bug #307.
carvalhorr Jun 23, 2017
2814eba
Revert "Fixed bug #307."
carvalhorr Jun 23, 2017
85513c2
Removed LatLng from MapModeController
carvalhorr Jun 23, 2017
d87cf31
Complementing previous commit, LatLng can be used (and is prefered) i…
carvalhorr Jun 23, 2017
e2d1857
fixing bug on clearBikeStations()
carvalhorr Jun 25, 2017
e2e07fb
fixing bug on clearBikeStations()
carvalhorr Jun 25, 2017
a291e98
Adding markers for bikes stations
carvalhorr Jun 25, 2017
e80d312
Updated daily log and TODOs
carvalhorr Jun 25, 2017
0737126
Changed the image for the bike small marker to use XML instead of PNG
carvalhorr Jun 26, 2017
7a190e7
Added missing bike icons for different screen sizes.
carvalhorr Jun 26, 2017
ff2d38a
Included credits for using USF Maps App icon.
carvalhorr Jun 27, 2017
1cea0b7
Removed use of Marker.getTag()/Marker.setTag() as Amazon map does not…
carvalhorr Jun 27, 2017
374dc90
Adding bikeshare source images in SVG to the version control.
carvalhorr Jun 27, 2017
7470e5d
Changed bike color to white in the bike station maps marker.
carvalhorr Jun 27, 2017
0f8801f
Switched to FAB Speed Dial library (https://github.com/markormesher/a…
carvalhorr Jun 28, 2017
18ff5f6
included missing documentation and license information.
carvalhorr Jun 28, 2017
218864a
Added layers FAB cancel icon when opened and added images and control…
carvalhorr Jun 29, 2017
d84cb07
Udated bike station marker to be just the (P)arking signal for now.
carvalhorr Jun 29, 2017
9e8ccb6
Including missing change in previous commit to reference correct imag…
carvalhorr Jun 29, 2017
eb56241
Removed unnecessary references to bikeshare from BaseMapFragment
carvalhorr Jun 29, 2017
f10d292
Gracefully handle non existing bikeshare info on OTP
carvalhorr Jul 10, 2017
1be71b3
Gracefully handle non existing bikeshare info on OTP (store supportsO…
carvalhorr Jul 10, 2017
b0d08fa
Progress log update
carvalhorr Jul 11, 2017
641940f
Refactored BikeStationOverlay to have a static final instance of Laye…
carvalhorr Jul 11, 2017
cc2c136
Added an option in the preferences window to let users select whether…
carvalhorr Jul 11, 2017
c293efe
Minor changes in the bikeshare preference.
carvalhorr Jul 11, 2017
4106050
Minor changes in the bikeshare preference.
carvalhorr Jul 11, 2017
bb23044
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr Jul 11, 2017
c145bbb
Changed bike markers depending on map zoom level
carvalhorr Jul 11, 2017
7bf2fc8
Added analytics to bikeshare
carvalhorr Jul 12, 2017
3cd4d3f
Changed preference window to not display bikeshare option if it is no…
carvalhorr Jul 12, 2017
e13aee6
Added different analytics labels for clicking on floating bike and bi…
carvalhorr Jul 12, 2017
28b970b
Changed bike station marker (to add more padding inside the marker)
carvalhorr Jul 12, 2017
784e2e5
Refactored bike request/response from OTP to make implementation simi…
carvalhorr Jul 13, 2017
abd33e7
Included mock data for testing bike share requests.
carvalhorr Jul 13, 2017
98de3bd
Progress log update
carvalhorr Jul 13, 2017
dcc0d8e
Added test for bike station request.
carvalhorr Jul 14, 2017
2c856b5
Added test for bike station request.
carvalhorr Jul 14, 2017
8b09cd4
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr Jul 14, 2017
c88f16b
Fixing code style issues.
carvalhorr Jul 14, 2017
339352e
Added tests for all values of first bike station in the response.
carvalhorr Jul 14, 2017
b9e49b1
Adding missing license information
carvalhorr Jul 14, 2017
3c38f1e
Refactoring: added setIsOtp and removed overloaded constructor that t…
carvalhorr Jul 14, 2017
3d01076
Documentation and style
carvalhorr Jul 15, 2017
fb35584
Created separate info window for bike station and floating bike.
carvalhorr Jul 15, 2017
2e5224f
Added margin on the bike station divider.
carvalhorr Jul 17, 2017
a6ca5a0
speed dial map layer on/off control layout changes (removed little gr…
carvalhorr Jul 18, 2017
beac4bc
Fixed method name misspelling
carvalhorr Jul 18, 2017
d4a3129
Extracted hardcoded string to resources file.
carvalhorr Jul 18, 2017
0395f1f
Added shared preference keys to string resources and renamed other st…
carvalhorr Jul 18, 2017
e1f1804
Fixed bug: bikeshare layer was displayed after deactivating it at pre…
carvalhorr Jul 18, 2017
12fc840
Fixing issue: made bike station markers to remain on screen on map zo…
carvalhorr Jul 18, 2017
2be7329
Fixed small error on bike marker info window.
carvalhorr Jul 18, 2017
c35d2b6
Improving performance for bike overlay markers. Instead of removing a…
carvalhorr Jul 19, 2017
7275435
Added background to the speed dial label.
carvalhorr Jul 19, 2017
1b1739c
Fixed layers floating action button color on main activity.
carvalhorr Jul 19, 2017
0975138
Cleaning unused styles.
carvalhorr Jul 20, 2017
d842d33
Made BaseMapFragment support multiple MapModeController (to make bike…
carvalhorr Jul 20, 2017
6725f1f
updated the work log.
carvalhorr Jul 20, 2017
f32031d
Issue fixed: set the bike window adapter before displaying the info w…
carvalhorr Jul 20, 2017
919ad56
Made bike layer work when map is on route mode.
carvalhorr Jul 20, 2017
617c009
Added feedback through a toast message when layer is activated/deacti…
carvalhorr Jul 21, 2017
d622853
Make the bikeshare layer available in regions where it is not support…
carvalhorr Jul 21, 2017
c6f4b0d
removed toast message when bikeshare layer is activated/deactivated.
carvalhorr Jul 21, 2017
d7c2ed9
updated the work log.
carvalhorr Jul 21, 2017
ef67efa
Included bikeshare as one option in trip planning.
carvalhorr Jul 24, 2017
d9aa908
Fixed documentation and naming for LayerUtils class.
carvalhorr Jul 24, 2017
b13182d
Merge branch 'gbfs' into gbfs-tripplan
carvalhorr Jul 24, 2017
e3d79ec
Showing bike stations part of a trip plan in the map view.
carvalhorr Jul 25, 2017
db99636
Fixed bug that sometimes made the app crash when a bike station marke…
carvalhorr Jul 26, 2017
102292f
Update Spanish Translation
themonki Jul 27, 2017
34be55e
Included bikeshare title on directions result.
carvalhorr Jul 28, 2017
e40a529
updated the work log.
carvalhorr Jul 28, 2017
82398ae
Merge pull request #1 from themonki/gbfs
carvalhorr Aug 2, 2017
1f6fae8
Updated the regions URL to use the production regions server.
carvalhorr Aug 3, 2017
215c2c7
Merge branch 'gbfs-tripplan' into gbfs
carvalhorr Aug 3, 2017
eadc8fe
Included check to avoid bike markers to be displayed if the bike laye…
carvalhorr Aug 3, 2017
60148c2
Stopped map to zoom to region when trip planning and viewing route on…
carvalhorr Aug 4, 2017
920def2
Removed bikeshare layer activation from the preferences window.
carvalhorr Aug 6, 2017
e081c26
Made "Additional Trip Preferences" on "Trip Planner" to persist after…
carvalhorr Aug 6, 2017
c348659
Added deep-linkning integration
carvalhorr Aug 7, 2017
ddef3f1
Removed hard coded code for TAMPA and refactored string resources lin…
carvalhorr Aug 7, 2017
b9cb8ab
Fixing code style issues.
carvalhorr Aug 7, 2017
16724df
Making sure bikeshare is turned on by default.
carvalhorr Aug 7, 2017
8ef67da
Adding "Rodrigo Carvalho" to contributors list.
carvalhorr Aug 7, 2017
e6e737d
Added analytics to bikeshare baloon click (deep-link)
carvalhorr Aug 7, 2017
e341f68
Fixed misspelling in the word balloon.
carvalhorr Aug 7, 2017
bc5561e
Fixed issue with navigation drawer selected item.
carvalhorr Aug 8, 2017
0dcc8e0
Fixed issue with vehicle balloon when displayed with bike layer.
carvalhorr Aug 8, 2017
bc974d1
Merge branch 'master' into gbfs
carvalhorr Aug 8, 2017
b0a698f
Fixed issue bikeshare not showing correctly when multiple instances o…
carvalhorr Aug 9, 2017
736fb11
Pointing regions_api to github to release a beta version of OBA Andro…
carvalhorr Aug 9, 2017
4003c15
Fixed bike station/floating bike ID on deep linking integration
carvalhorr Aug 9, 2017
97ffd54
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr Aug 9, 2017
d8eeb7a
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr Aug 9, 2017
44a8e95
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr Aug 9, 2017
83e5027
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr Aug 9, 2017
874c6ca
BaseMapFragment was crashing after latest fixes regarding showing bik…
carvalhorr Aug 10, 2017
80c9ba9
Included bikeshare by default when planning a trip in a region that b…
carvalhorr Aug 10, 2017
8f38538
Renamed LayerUtils.isBikeshareLayerActive() to LayerUtils.isBikeshare…
carvalhorr Aug 11, 2017
f79dccd
Put the bike ID as the title in the bike station balloon.
carvalhorr Aug 12, 2017
37aa659
Refactoring: moved method isBikeshareEnabled() from LayerUtils to App…
carvalhorr Aug 12, 2017
359329b
Removed commented code
carvalhorr Aug 13, 2017
342054d
Removed commented code
carvalhorr Aug 13, 2017
93402db
Fixed problem of stop info sliding panel collapsing when click on bik…
carvalhorr Aug 13, 2017
ed41138
Tint the ">" in the bike marker balloons to be gray to match the bus …
carvalhorr Aug 17, 2017
a7d890f
Changes in floating bike/bike station balloons
carvalhorr Aug 17, 2017
4319973
Issue fixed: layers FAB not hidden when switching to "Starred stops" …
carvalhorr Aug 17, 2017
25267b7
Issue fixed: layers FAB in wrong position after opening other apps an…
carvalhorr Aug 17, 2017
effba63
Removed unused files
carvalhorr Aug 18, 2017
91bdc0c
Issue fixed: layers FAB icon displayed wrong when alternating between…
carvalhorr Aug 18, 2017
155e9cb
Changed bikeshare small icon size to 15dp instead of 22dp
carvalhorr Aug 18, 2017
6796ae8
Issue fixed: layers FAB not hidden when switching to "Starred stops" …
carvalhorr Aug 19, 2017
adde643
Change text in additional trip plan options if bikeshare is supported…
carvalhorr Aug 19, 2017
2a88d4d
Files cleanup
carvalhorr Aug 19, 2017
92bc1be
Issue fixed: first time the app run, the layers FAB did not appear if…
carvalhorr Aug 20, 2017
802680f
Issue fixed: wrong visibility of layers FAB. There were many states t…
carvalhorr Aug 20, 2017
adec834
Made layers FAB speed dial stay open after toggling bikeshare on/off
carvalhorr Aug 22, 2017
7c5c7ea
Added proguard rules required by library uk.co.markormesher:android-f…
carvalhorr Aug 22, 2017
42251b1
Made interaction with map work while layers FAB speed dial is open.
carvalhorr Aug 23, 2017
4ec0960
Code cleanup
carvalhorr Aug 24, 2017
551c71a
Fixed issue: bike stations need to be displayed when planing a trip r…
carvalhorr Aug 26, 2017
c0d50df
Fixed issue: trip plan additional preferences not saving transit mode
carvalhorr Aug 27, 2017
300d3f4
Remove USF Maps icon credit
barbeau Aug 28, 2017
8cf7217
Remove USF Maps app icon credit from Spanish translation
barbeau Aug 28, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove USF Maps icon credit
We're no longer using USF Maps icons
  • Loading branch information
barbeau authored Aug 28, 2017
commit 300d3f451a8331b8d09619678569886462ef7ad2
2 changes: 0 additions & 2 deletions onebusaway-android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,6 @@
"Thanks to Google for the material design icons
(https://github.com/google/material-design-icons), "
"licensed under Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0).\n\n"

"Thanks to the USF Maps App for the use of the bikeshare icons licensed under Apache v2.0"
</string>

<!-- Trip Planner strings -->
Expand Down