diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-15 13:52:25 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2019-01-16 14:07:28 +0100 |
commit | e0aeeba10f5d36be010ba773443aa8edd74343f5 (patch) | |
tree | 9f799e88335e9c9acde9bdbc496b82a13bf9f525 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk | |
parent | d5231b303b8d01ff5f9b7b67109762b64a61db27 (diff) | |
download | qtlocation-mapboxgl-e0aeeba10f5d36be010ba773443aa8edd74343f5.tar.gz |
[android] - allow reset fps listener, update debug mode activity with
menu options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java index 0add72ec2d..9d52798d00 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java @@ -9,6 +9,7 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -36,13 +37,14 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; /** * Test activity showcasing the different debug modes and allows to cycle between the default map styles. */ -public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCallback { +public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCallback, MapboxMap.OnFpsChangedListener { private MapView mapView; private MapboxMap mapboxMap; private ActionBarDrawerToggle actionBarDrawerToggle; private int currentStyleIndex; private IdleZoomListener idleZoomListener; + private boolean isReportFps = true; private static final String[] STYLES = new String[] { Style.MAPBOX_STREETS, @@ -54,6 +56,7 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa Style.TRAFFIC_DAY, Style.TRAFFIC_NIGHT }; + private TextView fpsView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -63,7 +66,6 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa setupMapView(savedInstanceState); setupDebugChangeView(); setupStyleChangeView(); - setupFpsChangeView(); } private void setupToolbar() { @@ -113,10 +115,13 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa } private void setFpsView() { - final TextView fpsView = findViewById(R.id.fpsView); - mapboxMap.setOnFpsChangedListener(fps -> - fpsView.setText(String.format(Locale.US, "FPS: %4.2f", fps)) - ); + fpsView = findViewById(R.id.fpsView); + mapboxMap.setOnFpsChangedListener(this); + } + + @Override + public void onFpsChanged(double fps) { + fpsView.setText(String.format(Locale.US, "FPS: %4.2f", fps)); } private void setupNavigationView(List<Layer> layerList) { @@ -173,18 +178,26 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa }); } - private void setupFpsChangeView() { - findViewById(R.id.fps_30).setOnClickListener(view -> { + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == R.id.menu_action_toggle_report_fps) { + isReportFps = !isReportFps; + fpsView.setVisibility(isReportFps ? View.VISIBLE : View.GONE); + mapboxMap.setOnFpsChangedListener(isReportFps ? this : null); + } else if (itemId == R.id.menu_action_limit_to_30_fps) { mapView.setMaximumFps(30); - }); - findViewById(R.id.fps_60).setOnClickListener(view -> { + } else if (itemId == R.id.menu_action_limit_to_60_fps) { mapView.setMaximumFps(60); - }); + } + + return actionBarDrawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item); } @Override - public boolean onOptionsItemSelected(MenuItem item) { - return actionBarDrawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item); + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_debug, menu); + return true; } @Override |