From 9bb5a7c2898f94e433cdb37c78dec4bda05eb5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=B6bius?= Date: Thu, 22 Feb 2018 13:09:48 +0100 Subject: [PATCH 1/2] #160 Add prefix for resources (#162) --- ...yout_focus_marker.xml => cameraview_layout_focus_marker.xml} | 0 .../layout/{surface_view.xml => cameraview_surface_view.xml} | 0 .../layout/{texture_view.xml => cameraview_texture_view.xml} | 0 .../com/otaliastudios/cameraview/SurfaceCameraPreview.java | 2 +- .../views/com/otaliastudios/cameraview/TapGestureLayout.java | 2 +- .../com/otaliastudios/cameraview/TextureCameraPreview.java | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename cameraview/src/main/res/layout/{layout_focus_marker.xml => cameraview_layout_focus_marker.xml} (100%) rename cameraview/src/main/res/layout/{surface_view.xml => cameraview_surface_view.xml} (100%) rename cameraview/src/main/res/layout/{texture_view.xml => cameraview_texture_view.xml} (100%) diff --git a/cameraview/src/main/res/layout/layout_focus_marker.xml b/cameraview/src/main/res/layout/cameraview_layout_focus_marker.xml similarity index 100% rename from cameraview/src/main/res/layout/layout_focus_marker.xml rename to cameraview/src/main/res/layout/cameraview_layout_focus_marker.xml diff --git a/cameraview/src/main/res/layout/surface_view.xml b/cameraview/src/main/res/layout/cameraview_surface_view.xml similarity index 100% rename from cameraview/src/main/res/layout/surface_view.xml rename to cameraview/src/main/res/layout/cameraview_surface_view.xml diff --git a/cameraview/src/main/res/layout/texture_view.xml b/cameraview/src/main/res/layout/cameraview_texture_view.xml similarity index 100% rename from cameraview/src/main/res/layout/texture_view.xml rename to cameraview/src/main/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 index 0abc3cdd..5a0d5ea3 100644 --- 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 { @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 index bf2965cf..2d25d0ad 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java +++ b/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); } diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java index e2d34056..60652886 100644 --- 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 { @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() { From bcb2cfeb7f0a8b651b77d94f6bd71caa30ad6bbc Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 27 Feb 2018 15:57:09 +0100 Subject: [PATCH 2/2] Bump version (#166) --- CHANGELOG.md | 17 +++++++++++++++++ README.md | 16 +++++++++------- cameraview/build.gradle | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d14d5504..1c855c2e 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index f1462704..4a46c8da 100644 --- a/README.md +++ b/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 { - + jcenter() - + } - +} - ``` + repositories { + jcenter() + } +} +```

diff --git a/cameraview/build.gradle b/cameraview/build.gradle index dfe4f5af..0f265ced 100644 --- a/cameraview/build.gradle +++ b/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