added disconnect button in action bar menu

romainpiel · Jan 12, 2014 · e8e75de · e8e75de
1 parent 812791b
commit e8e75de
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/Meatspace/src/main/java/com/romainpiel/meatspace/activity/MainActivity.java b/Meatspace/src/main/java/com/romainpiel/meatspace/activity/MainActivity.java
@@ -4,6 +4,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.FragmentManager;
+import android.content.Intent;
 import android.hardware.Camera;
 import android.os.Bundle;
 import android.text.Html;
@@ -16,6 +17,7 @@
 
 import com.bugsense.trace.BugSenseHandler;
 import com.google.analytics.tracking.android.EasyTracker;
+import com.romainpiel.Constants;
 import com.romainpiel.lib.bus.BusManager;
 import com.romainpiel.lib.bus.MuteEvent;
 import com.romainpiel.lib.bus.UIEvent;
@@ -73,7 +75,12 @@ public boolean onMenuItemSelected(int featureId, MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_main_switch_camera:
                 ChatFragment fragment = (ChatFragment) getFragmentManager().findFragmentById(R.id.main_fragment);
-                fragment.switchCamera();
+                if (fragment != null) {
+                    fragment.switchCamera();
+                }
+                break;
+            case R.id.menu_main_disconnect:
+                sendBroadcast(new Intent(Constants.FILTER_CHAT_CLOSE));
                 break;
             case R.id.menu_main_unmute_all:
                 BusManager.get().getChatBus().post(new MuteEvent(false, null));

diff --git a/Meatspace/src/main/res/menu/main.xml b/Meatspace/src/main/res/menu/main.xml
@@ -2,20 +2,24 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-            android:id="@+id/menu_main_switch_camera"
-            android:title="@string/menu_main_switch_camera"
-            android:icon="@drawable/ic_action_switch_camera"
-            android:showAsAction="ifRoom"/>
+        android:id="@+id/menu_main_switch_camera"
+        android:title="@string/menu_main_switch_camera"
+        android:icon="@drawable/ic_action_switch_camera"
+        android:showAsAction="ifRoom" />
     <item
-            android:id="@+id/menu_main_unmute_all"
-            android:title="@string/menu_main_unmute_all"
-            android:showAsAction="never"/>
+        android:id="@+id/menu_main_disconnect"
+        android:title="@string/menu_main_disconnect"
+        android:showAsAction="never" />
     <item
-            android:id="@+id/menu_main_settings"
-            android:title="@string/menu_main_settings"
-            android:showAsAction="never"/>
+        android:id="@+id/menu_main_unmute_all"
+        android:title="@string/menu_main_unmute_all"
+        android:showAsAction="never" />
     <item
-            android:id="@+id/menu_main_about"
-            android:title="@string/menu_main_about"
-            android:showAsAction="never"/>
+        android:id="@+id/menu_main_settings"
+        android:title="@string/menu_main_settings"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/menu_main_about"
+        android:title="@string/menu_main_about"
+        android:showAsAction="never" />
 </menu>
diff --git a/Meatspace/src/main/res/values/strings.xml b/Meatspace/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Meatspace</string>
     <string name="menu_main_switch_camera">Switch camera</string>
+    <string name="menu_main_disconnect">Disconnect</string>
     <string name="menu_main_unmute_all">Unmute</string>
     <string name="menu_main_about">About</string>
     <string name="menu_main_settings">Settings</string>