Merge pull request #1 from natario1/master

1.4.2

CHANGELOG.md

@@ -1,3 +1,12 @@
+### v1.4.2
+
+- Add prefix to XML resources so they don't collide, thanks to [@RocketRider][RocketRider] ([#162][162])
+- Add `videoMaxSize` API and XML attribute, to set max size video in bytes, thanks to [@chaitanyaraghav][chaitanyaraghav] ([#104][104])
+- Improved the preview size selection, thanks to [@YeungKC][YeungKC] ([#133][133])
+- Improved the playSounds attribute, was playing incorrectly, thanks to [@xp-vit][xp-vit] ([#143][143])
+
+https://github.com/natario1/CameraView/compare/v1.4.1...v1.4.2
+
 ### v1.4.1
 
 - Fixed a bug that would flip the front camera preview on some devices ([#112][112])
@@ -56,7 +65,11 @@ https://github.com/natario1/CameraView/compare/v1.2.3...v1.3.0
 
 [v-gar]: https://github.com/v-gar
 [andrewmunn]: https://github.com/andrewmunn
+[chaitanyaraghav]: https://github.com/chaitanyaraghav
+[YeungKC]: https://github.com/YeungKC
 [RobertoMorelos]: https://github.com/RobertoMorelos
+[RocketRider]: https://github.com/RocketRider
+[xp-vit]: https://github.com/xp-vit
 
 [73]: https://github.com/natario1/CameraView/pull/73
 [80]: https://github.com/natario1/CameraView/pull/80
@@ -70,5 +83,9 @@ https://github.com/natario1/CameraView/compare/v1.2.3...v1.3.0
 [97]: https://github.com/natario1/CameraView/pull/97
 [99]: https://github.com/natario1/CameraView/pull/99
 [101]: https://github.com/natario1/CameraView/pull/101
+[104]: https://github.com/natario1/CameraView/pull/104
 [105]: https://github.com/natario1/CameraView/pull/105
 [112]: https://github.com/natario1/CameraView/pull/112
+[133]: https://github.com/natario1/CameraView/pull/133
+[143]: https://github.com/natario1/CameraView/pull/143
+[162]: https://github.com/natario1/CameraView/pull/162

README.md

@@ -12,16 +12,18 @@ addressing most of the common issues and needs, and still leaving you with flexi
 See [CHANGELOG](https://github.com/natario1/CameraView/blob/master/CHANGELOG.md).
 
 ```groovy
-compile 'com.otaliastudios:cameraview:1.4.1'
+compile 'com.otaliastudios:cameraview:1.4.2'
 ```
-If you're facing gradle issues while installing it, make sure your project dependencies have the jcenter() repository correctly confgured:
+
+Make sure your project repositories include the `jcenter()`:
+
 ```groovy
 allprojects {
- +  repositories {
+  repositories {
- +    jcenter()
+    jcenter()
- +  }
+  }
- +}
+}
- ```
+```
 
 
 <p>

cameraview/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 // Required by bintray
-version = '1.4.1'
+version = '1.4.2'
 group = 'com.otaliastudios'
 
 //region android dependencies

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();

cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java

@@ -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);
     }

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() {