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

#1856 - Moving ActionBar actions to Navigation Drawer

Browse Source
This commit is contained in:
Brad Leege
2015-08-07 14:50:18 -05:00
parent 440ae9df9d
commit a8462aa5f7
3 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
View File

@@ -11,8 +11,6 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.GestureDetector;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
@@ -230,6 +228,7 @@ public class MainActivity extends AppCompatActivity {
// Other events
//
/*
// Adds items to the action bar menu
@Override
public boolean onCreateOptionsMenu(Menu menu) {
@@ -243,6 +242,7 @@ public class MainActivity extends AppCompatActivity {
}
return super.onCreateOptionsMenu(menu);
}
*/
// Called when pressing action bar items
@Override
@@ -251,36 +251,6 @@ public class MainActivity extends AppCompatActivity {
case android.R.id.home:
mDrawerLayout.openDrawer(GravityCompat.START);
return true;
case R.id.action_gps:
// Toggle GPS position updates
toggleGps(!mapView.isMyLocationEnabled());
updateMap();
return true;
case R.id.action_debug:
// Toggle debug mode
mapView.toggleDebug();
// Show the FPS counter
if (mapView.isDebugActive()) {
mFpsTextView.setVisibility(View.VISIBLE);
mFpsTextView.setText(getResources().getString(R.string.label_fps));
} else {
mFpsTextView.setVisibility(View.INVISIBLE);
}
return true;
case R.id.action_markers:
// Toggle markers
toggleMarkers(!mIsMarkersOn);
return true;
case R.id.action_compass:
// Toggle compass
mapView.setCompassEnabled(!mapView.isCompassEnabled());
return true;
default:
return super.onOptionsItemSelected(item);
}
@@ -293,6 +263,39 @@ public class MainActivity extends AppCompatActivity {
public boolean onNavigationItemSelected(MenuItem menuItem) {
menuItem.setChecked(true);
mDrawerLayout.closeDrawers();
// Respond To Selection
switch (menuItem.getItemId()) {
case R.id.action_gps:
// Toggle GPS position updates
toggleGps(!mapView.isMyLocationEnabled());
updateMap();
break;
case R.id.action_debug:
// Toggle debug mode
mapView.toggleDebug();
// Show the FPS counter
if (mapView.isDebugActive()) {
mFpsTextView.setVisibility(View.VISIBLE);
mFpsTextView.setText(getResources().getString(R.string.label_fps));
} else {
mFpsTextView.setVisibility(View.INVISIBLE);
}
break;
case R.id.action_markers:
// Toggle markers
toggleMarkers(!mIsMarkersOn);
break;
case R.id.action_compass:
// Toggle compass
mapView.setCompassEnabled(!mapView.isCompassEnabled());
break;
}
return true;
}
});

8
android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
View File

@@ -10,5 +10,13 @@
android:icon="@android:drawable/ic_menu_myplaces"
android:title="@string/action_point_annotations"
/>
<item android:id="@+id/action_gps"
android:icon="@drawable/ic_action_location_searching"
android:title="@string/action_gps"
/>
<item android:id="@+id/action_compass"
android:icon="@drawable/ic_explore_white_24dp"
android:title="@string/action_compass"
/>
</menu>

8
android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
View File

@@ -1,11 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_gps"
android:icon="@drawable/ic_action_location_searching"
android:title="@string/action_gps"
app:showAsAction="ifRoom" />
<item android:id="@+id/action_compass"
android:icon="@drawable/ic_explore_white_24dp"
android:title="@string/action_compass"
app:showAsAction="ifRoom"/>
</menu>