Update UI

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>

app/src/main/java/net/ossrs/yasea/MainActivity.java

@@ -1,12 +1,12 @@
 package net.ossrs.yasea;
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.hardware.Camera;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -22,14 +22,13 @@ import com.seu.magicfilter.utils.MagicFilterType;
 
 import java.util.Random;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
     private static final String TAG = "Yasea";
 
     Button btnPublish = null;
     Button btnSwitchCamera = null;
     Button btnRecord = null;
     Button btnSwitchEncoder = null;
-    Button btnSwitchFilter = null;
 
     private SharedPreferences sp;
     private String rtmpUrl = "rtmp://0.0.0.0/" + getRandomAlphaString(3) + '/' + getRandomAlphaDigitString(5);
@@ -59,7 +58,6 @@ public class MainActivity extends Activity {
         btnSwitchCamera = (Button) findViewById(R.id.swCam);
         btnRecord = (Button) findViewById(R.id.record);
         btnSwitchEncoder = (Button) findViewById(R.id.swEnc);
-        btnSwitchFilter = (Button) findViewById(R.id.swFilter);
         mPublisher = new SrsPublisher((SrsCameraView) findViewById(R.id.glsurfaceview_camera));
         mPublisher.setPreviewResolution(640, 480);
 
@@ -68,7 +66,6 @@ public class MainActivity extends Activity {
             public void onClick(View v) {
                 if (btnPublish.getText().toString().contentEquals("publish")) {
                     rtmpUrl = efu.getText().toString();
-                    Log.i(TAG, String.format("RTMP URL changed to %s", rtmpUrl));
                     SharedPreferences.Editor editor = sp.edit();
                     editor.putString("rtmpUrl", rtmpUrl);
                     editor.apply();
@@ -132,21 +129,6 @@ public class MainActivity extends Activity {
             }
         });
 
-        btnSwitchFilter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (btnSwitchFilter.getText().toString().contentEquals("beauty")) {
-                    if (mPublisher.switchCameraFilter(MagicFilterType.BEAUTY)) {
-                        btnSwitchFilter.setText("none");
-                    }
-                } else if (btnSwitchFilter.getText().toString().contentEquals("none")) {
-                    if (mPublisher.switchCameraFilter(MagicFilterType.NONE)) {
-                        btnSwitchFilter.setText("beauty");
-                    }
-                }
-            }
-        });
-
         mPublisher.setPublishEventHandler(new RtmpPublisher.EventHandler() {
             @Override
             public void onRtmpConnecting(final String msg) {
@@ -322,7 +304,57 @@ public class MainActivity extends Activity {
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
             return true;
+        } else {
+            switch (id) {
+                case R.id.cool_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.COOL);
+                    break;
+                case R.id.beauty_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.BEAUTY);
+                    break;
+                case R.id.early_bird_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.EARLYBIRD);
+                    break;
+                case R.id.evergreen_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.EVERGREEN);
+                    break;
+                case R.id.n1977_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.N1977);
+                    break;
+                case R.id.nostalgia_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.NOSTALGIA);
+                    break;
+                case R.id.romance_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.ROMANCE);
+                    break;
+                case R.id.sunrise_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.SUNRISE);
+                    break;
+                case R.id.sunset_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.SUNSET);
+                    break;
+                case R.id.tender_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.TENDER);
+                    break;
+                case R.id.toast_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.TOASTER2);
+                    break;
+                case R.id.valencia_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.VALENCIA);
+                    break;
+                case R.id.walden_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.WALDEN);
+                    break;
+                case R.id.warm_filter:
+                    mPublisher.switchCameraFilter(MagicFilterType.WARM);
+                    break;
+                case R.id.original_filter:
+                default:
+                    mPublisher.switchCameraFilter(MagicFilterType.NONE);
+                    break;
+            }
         }
+        setTitle(item.getTitle());
 
         return super.onOptionsItemSelected(item);
     }

app/src/main/res/layout/activity_main.xml

@@ -51,15 +51,6 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="beauty"
-        android:id="@+id/swFilter"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
-
     <EditText
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/menu/menu_main.xml

@@ -3,4 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools" tools:context="net.ossrs.yasea.MainActivity">
     <item android:id="@+id/action_settings" android:title="action_settings"
         android:orderInCategory="100" app:showAsAction="never" />
+
+    <item android:id="@+id/original_filter" android:title="Original" app:showAsAction="never"/>
+    <item android:id="@+id/beauty_filter" android:title="Beauty" app:showAsAction="never"/>
+    <item android:id="@+id/cool_filter" android:title="Cool" app:showAsAction="never"/>
+    <item android:id="@+id/early_bird_filter" android:title="Early Bird" app:showAsAction="never"/>
+    <item android:id="@+id/evergreen_filter" android:title="Evergreen" app:showAsAction="never"/>
+    <item android:id="@+id/n1977_filter" android:title="N1977" app:showAsAction="never"/>
+    <item android:id="@+id/nostalgia_filter" android:title="Nostalgia" app:showAsAction="never"/>
+    <item android:id="@+id/romance_filter" android:title="Romance" app:showAsAction="never"/>
+    <item android:id="@+id/sunrise_filter" android:title="Sunrise" app:showAsAction="never"/>
+    <item android:id="@+id/sunset_filter" android:title="Sunset" app:showAsAction="never"/>
+    <item android:id="@+id/warm_filter" android:title="Warm" app:showAsAction="never"/>
+    <item android:id="@+id/tender_filter" android:title="Tender" app:showAsAction="never"/>
+    <item android:id="@+id/toast_filter" android:title="Toast" app:showAsAction="never"/>
+    <item android:id="@+id/valencia_filter" android:title="Valencia" app:showAsAction="never"/>
+    <item android:id="@+id/walden_filter" android:title="Walden" app:showAsAction="never"/>
+
 </menu>