android-projects/DonetskWebcam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menu

Browse Source
This commit is contained in:
Victor 2014-03-29 15:31:05 +02:00
parent e5e1a9c236
commit 64b8ea9e56
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/annimon/donetskwebcam/MainActivity.java
View File

@ -26,9 +26,16 @@ public class MainActivity extends FragmentActivity implements WebcamChooserFragm
public boolean onCreateOptionsMenu(Menu menu) {
if (isLandscape()) {
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;
}

15
src/com/annimon/donetskwebcam/WebcamViewerActvity.java
View File

@ -28,10 +28,17 @@ public class WebcamViewerActvity extends FragmentActivity {
@Override
public boolean onCreateOptionsMenu(Menu 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;
}
@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;
}
}

2
src/com/annimon/donetskwebcam/WebcamViewerFragment.java
View File

@ -60,7 +60,7 @@ public class WebcamViewerFragment extends Fragment {
ex.printStackTrace();
}
break;
case R.string.menu_videos:
case R.id.menu_videos:
final String camimg = "/camimg/cam";
final int start = imageUrl.indexOf(camimg) + camimg.length();
String camId = imageUrl.substring(start, imageUrl.indexOf("-5.jpg"));