rename some views

This commit is contained in:
tibbi 2016-07-12 11:29:20 +02:00
parent 5c091f49c5
commit d9879aed69
2 changed files with 4 additions and 4 deletions

View File

@ -49,7 +49,7 @@ import butterknife.OnClick;
public class MainActivity extends AppCompatActivity public class MainActivity extends AppCompatActivity
implements SensorEventListener, PreviewListener, PhotoProcessor.MediaSavedListener, MediaScannerConnection.OnScanCompletedListener { 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_camera) ImageView mToggleCameraBtn;
@BindView(R.id.toggle_flash) ImageView mToggleFlashBtn; @BindView(R.id.toggle_flash) ImageView mToggleFlashBtn;
@BindView(R.id.toggle_photo_video) ImageView mTogglePhotoVideoBtn; @BindView(R.id.toggle_photo_video) ImageView mTogglePhotoVideoBtn;
@ -157,7 +157,7 @@ public class MainActivity extends AppCompatActivity
ButterKnife.bind(this); ButterKnife.bind(this);
mCurrCamera = Camera.CameraInfo.CAMERA_FACING_BACK; 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)); mPreview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
mViewHolder.addView(mPreview); mViewHolder.addView(mPreview);
mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE); mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
android:id="@+id/viewHolder" android:id="@+id/view_holder"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/black"> android:background="@android:color/black">
<SurfaceView <SurfaceView
android:id="@+id/surfaceView" android:id="@+id/camera_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>