Remove Navi usage in sample

Great lib but as a sample app it needs to be more readable as possible.
happylinhdn · Oct 20, 2015 · 2d230ff · 2d230ff
1 parent 8be0d5b
commit 2d230ff
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 34 deletions.
diff --git a/navi b/navi
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -41,7 +41,6 @@ repositories {
 
 dependencies {
     compile project(':lib')
-    compile project(':navi')
 
     compile rootProject.ext.appCompat
     compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'

diff --git a/sample/src/main/java/com/tbruyelle/rxpermissions/sample/MainActivity.java b/sample/src/main/java/com/tbruyelle/rxpermissions/sample/MainActivity.java
@@ -2,56 +2,56 @@
 
 import android.Manifest;
 import android.hardware.Camera;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.SurfaceView;
 import android.widget.Toast;
 
 import com.jakewharton.rxbinding.view.RxView;
 import com.tbruyelle.rxpermissions.RxPermissions;
-import com.trello.navi.component.AbstractNaviActivity;
-import com.trello.navi.rx.RxNaviActivity;
 
 import java.io.IOException;
 
-public class MainActivity extends AbstractNaviActivity {
+public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "RxPermissions";
 
     private RxPermissions mRxPermissions;
     private Camera mCamera;
     private SurfaceView mSurfaceView;
 
-    public MainActivity() {
-        RxNaviActivity.creating(this).subscribe(b -> {
-            mRxPermissions = RxPermissions.getInstance(this);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mRxPermissions = RxPermissions.getInstance(this);
 
-            setContentView(R.layout.act_main);
-            mSurfaceView = (SurfaceView) findViewById(R.id.surfaceView);
+        setContentView(R.layout.act_main);
+        mSurfaceView = (SurfaceView) findViewById(R.id.surfaceView);
 
-            mRxPermissions
-                    .request(RxView.clicks(findViewById(R.id.enableCamera)), Manifest.permission.CAMERA)
-                    .takeUntil(RxNaviActivity.destroying(this))
-                    .subscribe(granted -> {
-                                Log.i(TAG, "Received result " + granted);
-                                if (granted) {
-                                    releaseCamera();
-                                    mCamera = Camera.open(0);
-                                    try {
-                                        mCamera.setPreviewDisplay(mSurfaceView.getHolder());
-                                        mCamera.startPreview();
-                                    } catch (IOException e) {
-                                        Log.e(TAG, "Error while trying to display the camera preview", e);
-                                    }
-                                } else {
-                                    Toast.makeText(MainActivity.this,
-                                            "Permission denied, can't enable the camera",
-                                            Toast.LENGTH_SHORT).show();
+        mRxPermissions
+                .request(RxView.clicks(findViewById(R.id.enableCamera)), Manifest.permission.CAMERA)
+                .subscribe(granted -> {
+                            Log.i(TAG, "Received result " + granted);
+                            if (granted) {
+                                releaseCamera();
+                                mCamera = Camera.open(0);
+                                try {
+                                    mCamera.setPreviewDisplay(mSurfaceView.getHolder());
+                                    mCamera.startPreview();
+                                } catch (IOException e) {
+                                    Log.e(TAG, "Error while trying to display the camera preview", e);
                                 }
-                            },
-                            t -> Log.e(TAG, "onError", t),
-                            () -> Log.i(TAG, "OnComplete")
-                    );
-        });
+                            } else {
+                                Toast.makeText(MainActivity.this,
+                                        "Permission denied, can't enable the camera",
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                        },
+                        t -> Log.e(TAG, "onError", t),
+                        () -> Log.i(TAG, "OnComplete")
+                );
     }
 
     @Override

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,2 @@
 include 'lib'
-include 'navi'
 include 'sample'