#160 Add prefix for resources (#162)

pull/166/head
Michael Möbius 7 years ago committed by Mattia Iavarone
parent e3abae9d7b
commit 9bb5a7c289
  1. 0
      cameraview/src/main/res/layout/cameraview_layout_focus_marker.xml
  2. 0
      cameraview/src/main/res/layout/cameraview_surface_view.xml
  3. 0
      cameraview/src/main/res/layout/cameraview_texture_view.xml
  4. 2
      cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java
  5. 2
      cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java
  6. 2
      cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java

@ -26,7 +26,7 @@ class SurfaceCameraPreview extends CameraPreview<View, SurfaceHolder> {
@NonNull
@Override
protected View onCreateView(Context context, ViewGroup parent) {
View root = LayoutInflater.from(context).inflate(R.layout.surface_view, parent, false);
View root = LayoutInflater.from(context).inflate(R.layout.cameraview_surface_view, parent, false);
parent.addView(root, 0);
mSurfaceView = root.findViewById(R.id.surface_view);
final SurfaceHolder holder = mSurfaceView.getHolder();

@ -57,7 +57,7 @@ class TapGestureLayout extends GestureLayout {
// Views to draw the focus marker.
LayoutInflater.from(getContext()).inflate(R.layout.layout_focus_marker, this);
LayoutInflater.from(getContext()).inflate(R.layout.cameraview_layout_focus_marker, this);
mFocusMarkerContainer = findViewById(R.id.focusMarkerContainer);
mFocusMarkerFill = findViewById(R.id.fill);
}

@ -21,7 +21,7 @@ class TextureCameraPreview extends CameraPreview<TextureView, SurfaceTexture> {
@NonNull
@Override
protected TextureView onCreateView(Context context, ViewGroup parent) {
View root = LayoutInflater.from(context).inflate(R.layout.texture_view, parent, false);
View root = LayoutInflater.from(context).inflate(R.layout.cameraview_texture_view, parent, false);
parent.addView(root, 0);
TextureView texture = root.findViewById(R.id.texture_view);
texture.setSurfaceTextureListener(new TextureView.SurfaceTextureListener() {

Loading…
Cancel
Save