From d9879aed6993d5755481f8cdbe3c01acf201b55f Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 12 Jul 2016 11:29:20 +0200 Subject: [PATCH] rename some views --- .../com/simplemobiletools/camera/activities/MainActivity.java | 4 ++-- app/src/main/res/layout/activity_main.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java index ba3730d8..68cd3abe 100644 --- a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java @@ -49,7 +49,7 @@ import butterknife.OnClick; public class MainActivity extends AppCompatActivity implements SensorEventListener, PreviewListener, PhotoProcessor.MediaSavedListener, MediaScannerConnection.OnScanCompletedListener { - @BindView(R.id.viewHolder) RelativeLayout mViewHolder; + @BindView(R.id.view_holder) RelativeLayout mViewHolder; @BindView(R.id.toggle_camera) ImageView mToggleCameraBtn; @BindView(R.id.toggle_flash) ImageView mToggleFlashBtn; @BindView(R.id.toggle_photo_video) ImageView mTogglePhotoVideoBtn; @@ -157,7 +157,7 @@ public class MainActivity extends AppCompatActivity ButterKnife.bind(this); mCurrCamera = Camera.CameraInfo.CAMERA_FACING_BACK; - mPreview = new Preview(this, (SurfaceView) findViewById(R.id.surfaceView), this); + mPreview = new Preview(this, (SurfaceView) findViewById(R.id.camera_view), this); mPreview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); mViewHolder.addView(mPreview); mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 26bbd1c9..13146154 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,13 +1,13 @@