diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 9f7ffcc6..7c20c13a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -49,6 +49,7 @@ import com.otaliastudios.cameraview.engine.CameraEngine; import com.otaliastudios.cameraview.engine.offset.Reference; import com.otaliastudios.cameraview.filter.Filter; import com.otaliastudios.cameraview.filter.Filters; +import com.otaliastudios.cameraview.filter.NoFilter; import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.gesture.Gesture; @@ -2143,7 +2144,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { * {@link #takePictureSnapshot()} and any video snapshot taken with * {@link #takeVideoSnapshot(File)}. * - * Use {@link com.otaliastudios.cameraview.filters.NoFilter} to clear the existing filter, + * Use {@link NoFilter} to clear the existing filter, * and take a look at the {@link Filters} class for commonly used filters. * * @see Filters diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java index 6ee251c5..ea9b453a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java @@ -5,7 +5,6 @@ import android.opengl.GLES20; import androidx.annotation.NonNull; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.internal.GlUtils; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java index 2188e006..a3c6f35e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java @@ -1,7 +1,6 @@ package com.otaliastudios.cameraview.filter; import com.otaliastudios.cameraview.CameraView; -import com.otaliastudios.cameraview.filters.NoFilter; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java index 9e1292d0..a0c279db 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java @@ -16,7 +16,6 @@ import com.otaliastudios.cameraview.filters.GrayscaleFilter; import com.otaliastudios.cameraview.filters.HueFilter; import com.otaliastudios.cameraview.filters.InvertColorsFilter; import com.otaliastudios.cameraview.filters.LomoishFilter; -import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.filters.PosterizeFilter; import com.otaliastudios.cameraview.filters.SaturationFilter; import com.otaliastudios.cameraview.filters.SepiaFilter; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/NoFilter.java similarity index 84% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filter/NoFilter.java index 5cc14a46..c801da28 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/NoFilter.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.filters; +package com.otaliastudios.cameraview.filter; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java index 648d99fd..1141810a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.filter.Filter; -import com.otaliastudios.cameraview.filters.NoFilter; +import com.otaliastudios.cameraview.filter.NoFilter; import com.otaliastudios.cameraview.internal.GlUtils; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java index 9cb0d8c8..d65e23ef 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java @@ -16,7 +16,7 @@ import com.otaliastudios.cameraview.R; import com.otaliastudios.cameraview.internal.egl.EglViewport; import com.otaliastudios.cameraview.internal.utils.Op; import com.otaliastudios.cameraview.filter.Filter; -import com.otaliastudios.cameraview.filters.NoFilter; +import com.otaliastudios.cameraview.filter.NoFilter; import com.otaliastudios.cameraview.size.AspectRatio; import java.util.Collections; diff --git a/cameraview/src/main/res/values/strings.xml b/cameraview/src/main/res/values/strings.xml index dd25e92b..297dd303 100644 --- a/cameraview/src/main/res/values/strings.xml +++ b/cameraview/src/main/res/values/strings.xml @@ -1,4 +1,27 @@ com.otaliastudios.cameraview.markers.DefaultAutoFocusMarker + + com.otaliastudios.cameraview.filter.NoFilter + com.otaliastudios.cameraview.filters.AutoFixFilter + com.otaliastudios.cameraview.filters.BlackAndWhiteFilter + com.otaliastudios.cameraview.filters.BrightnessFilter + com.otaliastudios.cameraview.filters.ContrastFilter + com.otaliastudios.cameraview.filters.CrossProcessFilter + com.otaliastudios.cameraview.filters.DocumentaryFilter + com.otaliastudios.cameraview.filters.DuotoneFilter + com.otaliastudios.cameraview.filters.FillLightFilter + com.otaliastudios.cameraview.filters.GammaFilter + com.otaliastudios.cameraview.filters.GrainFilter + com.otaliastudios.cameraview.filters.GrayscaleFilter + com.otaliastudios.cameraview.filters.HueFilter + com.otaliastudios.cameraview.filters.InvertColorsFilter + com.otaliastudios.cameraview.filters.LomoishFilter + com.otaliastudios.cameraview.filters.PosterizeFilter + com.otaliastudios.cameraview.filters.SaturationFilter + com.otaliastudios.cameraview.filters.SepiaFilter + com.otaliastudios.cameraview.filters.SharpnessFilter + com.otaliastudios.cameraview.filters.TemperatureFilter + com.otaliastudios.cameraview.filters.TintFilter + com.otaliastudios.cameraview.filters.VignetteFilter \ No newline at end of file