-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Conversation
tobrun
commented
Nov 2, 2017
•
edited
Loading
edited
8c99bc1
to
5b686e5
Compare
} | ||
|
||
public AttributionLayout measure() { | ||
float logoContainerWidth = logo.getWidth() + (2 * margin); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
measure()
is kinda long. What about extracting each block of code into a private method?
boolean shortText = textViewShortContainerWidth + margin <= maxSizeShort; | ||
shorterText = fullLogoShortText || smallLogoShortText || shortText; | ||
|
||
if (fullLogoText) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about removing the if else if
chain using a map/dictionary?
* @return if the url is valid for improve this map | ||
*/ | ||
private boolean isValidForImproveThisMap(String url) { | ||
return withImproveMap || !url.equals("https://www.mapbox.com/map-feedback/"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Magic number
* @return if the url is valid for Mapbox | ||
*/ | ||
private boolean isValidForMapbox(String url) { | ||
return withMapboxAttribution || !url.equals("https://www.mapbox.com/about/maps/"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Magic number
*/ | ||
private void addAdditionalAttributions() { | ||
if (withTelemetryAttribution) { | ||
String telemetryKey = "Telemetry Settings"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Magic numbers
|
||
AttributionLayout layout = measure.measure(); | ||
|
||
// draw logo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addOverlay
is getting long.
What about extracting these blocks of code into private methods and give them a name based on the comments? This way addOverlay
will be easier to read and understand and comments will become superfluous so they won't be necessary.
} | ||
|
||
@Test | ||
@Ignore |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the tests are ignored, could we remove AttributionLayoutTest
?
for (Attribution attribution : attributionList) { | ||
switch (counter) { | ||
case 0: | ||
assertEquals("URL mapbox should match", "https://www.mapbox.com/about/maps/", attribution.getUrl()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about extracting the different assertions into different tests and give them a name based on the messages?
This way I guess that the for
loop won't be necessary and tests will be more maintainable and readable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't have bandwith to pick this up. feel free to ticket out any follow up work.
5b686e5
to
186f366
Compare
* release-android-v5.2.0: (788 commits) release android v5.2.0 release v5.2.0-beta.5 (mapbox#10464) [ios] Update puck arrow stroke color when tint changes Monkey crashes (mapbox#10440) (mapbox#10472) Deploy macosapp as part of releases (mapbox#10191) [ios] Update podspecs to v3.7.0-rc.1 [ios] Updated Spanish, Vietnamese translations [ios] Fix toCamera.centerCoordinate in shouldChangeFromCamera (mapbox#10433) MapSnapshot attribution (mapbox#10362) Downgrade min sdk to 14 (mapbox#10355) Update MGLMapSnapshotter docs (mapbox#10438) [android] - harden deselection mechanism for markers (mapbox#10403) [android] Cherry picks to agua (mapbox#10442) [ios] Silence smart invert warnings (mapbox#10425) [ios] Doc fixes for "Adding Points to a Map" guide [ios, macos] Cleanup duplicated snapshotter frame code. [android] release 5.2.0-beta.4 (mapbox#10384) [android] - add config file for excluding generated tests, refactor generation script output [ios] Bump podspec to beta.4 [ios, macos] Add attribution to snapshots. ... # Conflicts: # .gitignore # cmake/core-files.cmake # include/mbgl/annotation/annotation.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/gradle.properties # platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java # platform/android/build.gradle # platform/android/config.cmake # platform/android/dependencies.gradle # platform/android/settings.gradle # platform/android/src/map/camera_position.cpp # platform/android/src/native_map_view.cpp # platform/android/src/native_map_view.hpp # src/mbgl/algorithm/generate_clip_ids_impl.hpp # src/mbgl/annotation/line_annotation_impl.cpp # src/mbgl/renderer/layers/render_line_layer.hpp # src/mbgl/renderer/painter.cpp # src/mbgl/renderer/painter_line.cpp # src/mbgl/renderer/render_item.hpp # src/mbgl/renderer/render_line_layer.cpp # src/mbgl/sprite/sprite_atlas.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/sprite/sprite_parser.cpp # src/mbgl/sprite/sprite_parser.hpp # src/mbgl/storage/resource.cpp # src/mbgl/style/layers/line_layer.cpp # src/mbgl/style/layers/line_layer_impl.hpp # src/mbgl/style/style.cpp # src/mbgl/style/style.hpp # src/mbgl/tile/tile_loader_impl.hpp # test/algorithm/generate_clip_ids.test.cpp # test/sprite/sprite_atlas.test.cpp # test/storage/resource.test.cpp
* mapbox_release_5.2: (788 commits) release android v5.2.0 release v5.2.0-beta.5 (mapbox#10464) [ios] Update puck arrow stroke color when tint changes Monkey crashes (mapbox#10440) (mapbox#10472) Deploy macosapp as part of releases (mapbox#10191) [ios] Update podspecs to v3.7.0-rc.1 [ios] Updated Spanish, Vietnamese translations [ios] Fix toCamera.centerCoordinate in shouldChangeFromCamera (mapbox#10433) MapSnapshot attribution (mapbox#10362) Downgrade min sdk to 14 (mapbox#10355) Update MGLMapSnapshotter docs (mapbox#10438) [android] - harden deselection mechanism for markers (mapbox#10403) [android] Cherry picks to agua (mapbox#10442) [ios] Silence smart invert warnings (mapbox#10425) [ios] Doc fixes for "Adding Points to a Map" guide [ios, macos] Cleanup duplicated snapshotter frame code. [android] release 5.2.0-beta.4 (mapbox#10384) [android] - add config file for excluding generated tests, refactor generation script output [ios] Bump podspec to beta.4 [ios, macos] Add attribution to snapshots. ... # Conflicts: # .gitignore # .gitmodules # cmake/core-files.cmake # include/mbgl/annotation/annotation.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/gradle.properties # platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java # platform/android/build.gradle # platform/android/config.cmake # platform/android/dependencies.gradle # platform/android/settings.gradle # platform/android/src/map/camera_position.cpp # platform/android/src/native_map_view.cpp # platform/android/src/native_map_view.hpp # src/mbgl/algorithm/generate_clip_ids_impl.hpp # src/mbgl/annotation/line_annotation_impl.cpp # src/mbgl/renderer/layers/render_line_layer.hpp # src/mbgl/renderer/painter.cpp # src/mbgl/renderer/painter_line.cpp # src/mbgl/renderer/render_item.hpp # src/mbgl/renderer/render_line_layer.cpp # src/mbgl/sprite/sprite_atlas.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/sprite/sprite_parser.cpp # src/mbgl/sprite/sprite_parser.hpp # src/mbgl/storage/resource.cpp # src/mbgl/style/layers/line_layer.cpp # src/mbgl/style/layers/line_layer_impl.hpp # src/mbgl/style/style.cpp # src/mbgl/style/style.hpp # src/mbgl/tile/tile_loader_impl.hpp # test/algorithm/generate_clip_ids.test.cpp # test/sprite/sprite_atlas.test.cpp # test/storage/resource.test.cpp