tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #3358 - Making Core GL camera methods private. Adding moveCamera() API method. Updating CameraActivity to use only animateCamera() and moveCamera() API.

Browse Source
This commit is contained in:
Brad Leege
2015-12-20 09:19:03 -06:00
parent f3de446bd9
commit 8f532eeefa
4 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CameraActivity.java
View File

@@ -43,7 +43,7 @@ public class CameraActivity extends AppCompatActivity {
mMapView.setCompassEnabled(true);
mMapView.onCreate(savedInstanceState);
Button cameraButton = (Button) findViewById(R.id.cameraAnimateButton);
Button cameraButton = (Button) findViewById(R.id.cameraMoveButton);
cameraButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -52,11 +52,11 @@ public class CameraActivity extends AppCompatActivity {
.zoom(14) // Sets the zoom
.tilt(30) // Sets the tilt of the camera to 30 degrees
.build(); // Creates a CameraPosition from the builder
mMapView.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
mMapView.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
}
});
Button cameraCallbackButton = (Button) findViewById(R.id.cameraAnimateCallbackButton);
Button cameraCallbackButton = (Button) findViewById(R.id.cameraEaseButton);
cameraCallbackButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -67,27 +67,11 @@ public class CameraActivity extends AppCompatActivity {
.bearing(180) // Sets the orientation of the camera to south
.build(); // Creates a CameraPosition from the builder
MapView.CancelableCallback callback = new MapView.CancelableCallback() {
@Override
public void onCancel() {
// NOTE: This shouldn't appear
Log.i(TAG, "onCancel Callback called.");
Toast.makeText(CameraActivity.this, "onCancel Callback called.", Toast.LENGTH_LONG).show();
}
@Override
public void onFinish() {
Log.i(TAG, "onFinish Callback called.");
Toast.makeText(CameraActivity.this, "onFinish Callback called.", Toast.LENGTH_LONG).show();
}
};
mMapView.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), callback);
mMapView.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
}
});
Button cameraDurationButton = (Button) findViewById(R.id.cameraAnimateDurationButton);
Button cameraDurationButton = (Button) findViewById(R.id.cameraAnimateButton);
cameraDurationButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

16
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera.xml
View File

@@ -21,8 +21,8 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_camera_animate"
android:id="@+id/cameraAnimateButton"
android:text="@string/button_camera_move"
android:id="@+id/cameraMoveButton"
android:layout_margin="@dimen/fab_margin"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@@ -32,18 +32,18 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_camera_animate_callback"
android:id="@+id/cameraAnimateCallbackButton"
android:layout_alignTop="@+id/cameraAnimateButton"
android:text="@string/button_camera_ease"
android:id="@+id/cameraEaseButton"
android:layout_alignTop="@+id/cameraMoveButton"
android:layout_centerHorizontal="true"
android:background="@color/white"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_camera_animate_duration"
android:id="@+id/cameraAnimateDurationButton"
android:layout_alignBottom="@+id/cameraAnimateCallbackButton"
android:text="@string/button_camera_animate"
android:id="@+id/cameraAnimateButton"
android:layout_alignBottom="@+id/cameraEaseButton"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/fab_margin"
android:background="@color/white"/>

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
View File

@@ -42,9 +42,9 @@
<string name="action_visible_bounds_explanation">Center map around 2 markers</string>
<string name="action_remove_polylines">Remove polylines</string>
<string name="button_camera_move">Move</string>
<string name="button_camera_ease">Ease</string>
<string name="button_camera_animate">Animate</string>
<string name="button_camera_animate_callback">Callback</string>
<string name="button_camera_animate_duration">Duration</string>
<string name="label_fps">FPS:</string>