From d80055188fa36edbd6b1ece8b4c1e4b9ab015787 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Mon, 16 Feb 2015 13:39:32 +0100 Subject: [PATCH] UI helper: refactor menu creation/setup --- src/MainListActivity.scala | 5 ----- src/UIHelper.scala | 13 +++++++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/MainListActivity.scala b/src/MainListActivity.scala index 30fb9ea..aae2024 100644 --- a/src/MainListActivity.scala +++ b/src/MainListActivity.scala @@ -42,11 +42,6 @@ class MainListActivity(actname : String, menuid : Int) extends LoadingListActivi unregisterReceiver(miclReceiver) } - override def onCreateOptionsMenu(menu : Menu) : Boolean = { - getMenuInflater().inflate(R.menu.options, menu); - true - } - def setupButtons(running : Boolean) { //singleBtn.setEnabled(!running) if (running) { diff --git a/src/UIHelper.scala b/src/UIHelper.scala index 801b5ca..6cc420a 100644 --- a/src/UIHelper.scala +++ b/src/UIHelper.scala @@ -197,16 +197,21 @@ trait UIHelper extends Activity .create.show } - abstract override def onPrepareOptionsMenu(menu : Menu) : Boolean = { - val mi = menu.findItem(R.id.startstopbtn) - mi.setTitle(if (AprsService.running) R.string.stoplog else R.string.startlog) - mi.setIcon(if (AprsService.running) android.R.drawable.ic_menu_close_clear_cancel else android.R.drawable.ic_menu_compass) + abstract override def onCreateOptionsMenu(menu : Menu) : Boolean = { + getMenuInflater().inflate(R.menu.options, menu); // disable the "own" menu Array(R.id.hub, R.id.map, R.id.log, R.id.conversations).map((id) => { menu.findItem(id).setVisible(id != menu_id) }) menu.findItem(R.id.age).setVisible(R.id.map == menu_id || R.id.hub == menu_id) menu.findItem(R.id.overlays).setVisible(R.id.map == menu_id) + true + } + + abstract override def onPrepareOptionsMenu(menu : Menu) : Boolean = { + val mi = menu.findItem(R.id.startstopbtn) + mi.setTitle(if (AprsService.running) R.string.stoplog else R.string.startlog) + mi.setIcon(if (AprsService.running) android.R.drawable.ic_menu_close_clear_cancel else android.R.drawable.ic_menu_compass) menu.findItem(R.id.objects).setChecked(prefs.getShowObjects()) menu.findItem(R.id.satellite).setChecked(prefs.getShowSatellite()) true