#160 Add prefix for resources (#162)

natario1 · Feb 22, 2018 · 9bb5a7c · 9bb5a7c
1 parent e3abae9
commit 9bb5a7c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/...c/main/res/layout/layout_focus_marker.xml → ...layout/cameraview_layout_focus_marker.xml b/...c/main/res/layout/layout_focus_marker.xml → ...layout/cameraview_layout_focus_marker.xml
diff --git a/...view/src/main/res/layout/surface_view.xml → ...in/res/layout/cameraview_surface_view.xml b/...view/src/main/res/layout/surface_view.xml → ...in/res/layout/cameraview_surface_view.xml
diff --git a/...view/src/main/res/layout/texture_view.xml → ...in/res/layout/cameraview_texture_view.xml b/...view/src/main/res/layout/texture_view.xml → ...in/res/layout/cameraview_texture_view.xml
diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.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();

diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java
@@ -57,7 +57,7 @@ public void onLongPress(MotionEvent e) {
 
 
         // 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);
     }

diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java
@@ -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() {