| @@ -4,7 +4,8 @@ | |||
| android:id="@+id/groupCalculation" | |||
| android:menuCategory="system" | |||
| android:orderInCategory="2" > | |||
| <item | |||
| <item android:id="@+id/addConfiguration" android:enabled="true" android:icon="@android:drawable/ic_menu_edit" android:menuCategory="secondary" android:orderInCategory="1" android:title="@string/menuAddEquipment" android:visible="true"> | |||
| </item><item | |||
| android:id="@+id/chooseConfiguration" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_edit" | |||
| @@ -13,6 +14,7 @@ | |||
| android:title="@string/menuChooseEquipment" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/doCalculation" | |||
| android:enabled="true" | |||
| @@ -45,7 +45,9 @@ | |||
| <string name="menuUserGuide">Benutzeranleitung</string> | |||
| <string name="menuSettings">Einstellungen…</string> | |||
| <string name="menuAbout">Info</string> | |||
| <!-- --> | |||
| <string name="menuChooseEquipment">Ausrüstung wählen</string> | |||
| <string name="menuAddEquipment">Ausrüstung hinzufügen</string> | |||
| <string name="menuDoCalculation">Berechnen</string> | |||
| <string name="menuMoreItems">Mehr…</string> | |||
| @@ -46,7 +46,9 @@ | |||
| <string name="menuUserGuide">User Guide</string> | |||
| <string name="menuSettings">Settings…</string> | |||
| <string name="menuAbout">Info</string> | |||
| <!-- --> | |||
| <string name="menuChooseEquipment">Choose Equipment</string> | |||
| <string name="menuAddEquipment">Add Equipment</string> | |||
| <string name="menuDoCalculation">Calculate</string> | |||
| <string name="menuMoreItems">More…</string> | |||
| @@ -46,6 +46,8 @@ public class RBSMainActivity extends Activity { | |||
| private Activity riserSightConfigActivity; | |||
| private boolean showInfoMenu; | |||
| private Menu optionsMenu; | |||
| @Override | |||
| public void onCreate(final Bundle savedInstanceState) { | |||
| @@ -241,16 +243,53 @@ public class RBSMainActivity extends Activity { | |||
| } | |||
| @Override | |||
| public boolean onPrepareOptionsMenu(Menu menu) { | |||
| if (this.showInfoMenu) { | |||
| this.showInfoMenu = false; | |||
| getMenuInflater().inflate(R.menu.rbs_info_menu, menu); | |||
| } else { | |||
| getMenuInflater().inflate(R.menu.rbs_main, menu); | |||
| } | |||
| return super.onPrepareOptionsMenu(menu); | |||
| } | |||
| @Override | |||
| public boolean onCreateOptionsMenu(final Menu menu) { | |||
| getMenuInflater().inflate(R.menu.rbs_main, menu); | |||
| getMenuInflater().inflate(R.menu.rbs_info_menu, menu.getItem(2).getSubMenu()); | |||
| // getMenuInflater().inflate(R.menu.rbs_main, menu); | |||
| // getMenuInflater().inflate(R.menu.rbs_info_menu, menu.getItem(3).getSubMenu()); | |||
| super.onCreateOptionsMenu(menu); | |||
| this.optionsMenu = menu; | |||
| return true; | |||
| } | |||
| @Override | |||
| public void closeOptionsMenu() { | |||
| for (int i = 0; i < this.optionsMenu.size(); i++) { | |||
| this.optionsMenu.removeItem(i); | |||
| } | |||
| super.closeOptionsMenu(); | |||
| } | |||
| @Override | |||
| public boolean onOptionsItemSelected(MenuItem item) { | |||
| if (item.getItemId() == R.id.moreItems) { | |||
| this.showInfoMenu = true; | |||
| closeOptionsMenu(); | |||
| runOnUiThread(new Runnable() { | |||
| @Override | |||
| public void run() { | |||
| openOptionsMenu(); | |||
| } | |||
| }); | |||
| return true; | |||
| } | |||
| return super.onOptionsItemSelected(item); | |||
| } | |||
| @@ -56,13 +56,13 @@ public class FontArrayAdapter<O extends Object> extends ArrayAdapter<O> { | |||
| ImageView checkBoxView = (ImageView) spinnerItem.findViewById(R.id.spinner_item_checkBox); | |||
| textView.setText(getItem(position).toString()); | |||
| spinnerItem.setBackgroundColor(getContext().getResources().getColor(R.color.black)); | |||
| if (this.parentSpinner.getSelectedItemPosition() == position) { | |||
| textView.setTextColor(getContext().getResources().getColor(R.color.android_blue_dark)); | |||
| checkBoxView.setVisibility(View.VISIBLE); | |||
| } else { | |||
| textView.setTextColor(getContext().getResources().getColor(R.color.black)); | |||
| textView.setTextColor(getContext().getResources().getColor(R.color.white)); | |||
| checkBoxView.setVisibility(View.INVISIBLE); | |||
| } | |||