Fix menu
This commit is contained in:
parent
e5e1a9c236
commit
64b8ea9e56
@ -26,9 +26,16 @@ public class MainActivity extends FragmentActivity implements WebcamChooserFragm
|
|||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
if (isLandscape()) {
|
if (isLandscape()) {
|
||||||
getMenuInflater().inflate(R.menu.main, menu);
|
getMenuInflater().inflate(R.menu.main, menu);
|
||||||
if (lastUrl != null && lastUrl.contains("videoprobki")) {
|
|
||||||
menu.add(0, R.string.menu_videos, 0, getString(R.string.menu_videos));
|
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||||
|
super.onPrepareOptionsMenu(menu);
|
||||||
|
if (isLandscape()) {
|
||||||
|
final boolean show = (lastUrl != null && lastUrl.contains("videoprobki"));
|
||||||
|
menu.findItem(R.id.menu_videos).setVisible(show);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -28,10 +28,17 @@ public class WebcamViewerActvity extends FragmentActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
getMenuInflater().inflate(R.menu.main, menu);
|
getMenuInflater().inflate(R.menu.main, menu);
|
||||||
final String lastUrl = getIntent().getExtras().getString("url");
|
|
||||||
if (lastUrl != null && lastUrl.contains("videoprobki")) {
|
|
||||||
menu.add(0, R.string.menu_videos, 0, getString(R.string.menu_videos));
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||||
|
super.onPrepareOptionsMenu(menu);
|
||||||
|
final String lastUrl = getIntent().getExtras().getString("url");
|
||||||
|
final boolean show = (lastUrl != null && lastUrl.contains("videoprobki"));
|
||||||
|
menu.findItem(R.id.menu_videos).setVisible(show);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ public class WebcamViewerFragment extends Fragment {
|
|||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case R.string.menu_videos:
|
case R.id.menu_videos:
|
||||||
final String camimg = "/camimg/cam";
|
final String camimg = "/camimg/cam";
|
||||||
final int start = imageUrl.indexOf(camimg) + camimg.length();
|
final int start = imageUrl.indexOf(camimg) + camimg.length();
|
||||||
String camId = imageUrl.substring(start, imageUrl.indexOf("-5.jpg"));
|
String camId = imageUrl.substring(start, imageUrl.indexOf("-5.jpg"));
|
||||||
|
Loading…
Reference in New Issue
Block a user