Move NoFilter, add string resources

pull/535/head
Mattia Iavarone 6 years ago
parent 0261b7c08f
commit 3e57e10f89
  1. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  2. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java
  3. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java
  4. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java
  5. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/NoFilter.java
  6. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
  7. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
  8. 23
      cameraview/src/main/res/values/strings.xml

@ -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

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

@ -1,7 +1,6 @@
package com.otaliastudios.cameraview.filter;
import com.otaliastudios.cameraview.CameraView;
import com.otaliastudios.cameraview.filters.NoFilter;
import androidx.annotation.NonNull;

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

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview.filters;
package com.otaliastudios.cameraview.filter;
import androidx.annotation.NonNull;

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

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

@ -1,4 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cameraview_default_autofocus_marker">com.otaliastudios.cameraview.markers.DefaultAutoFocusMarker</string>
<string name="cameraview_filter_none">com.otaliastudios.cameraview.filter.NoFilter</string>
<string name="cameraview_filter_autofix">com.otaliastudios.cameraview.filters.AutoFixFilter</string>
<string name="cameraview_filter_black_and_white">com.otaliastudios.cameraview.filters.BlackAndWhiteFilter</string>
<string name="cameraview_filter_brightness">com.otaliastudios.cameraview.filters.BrightnessFilter</string>
<string name="cameraview_filter_contrast">com.otaliastudios.cameraview.filters.ContrastFilter</string>
<string name="cameraview_filter_cross_process">com.otaliastudios.cameraview.filters.CrossProcessFilter</string>
<string name="cameraview_filter_documentary">com.otaliastudios.cameraview.filters.DocumentaryFilter</string>
<string name="cameraview_filter_duotone">com.otaliastudios.cameraview.filters.DuotoneFilter</string>
<string name="cameraview_filter_fill_light">com.otaliastudios.cameraview.filters.FillLightFilter</string>
<string name="cameraview_filter_gamma">com.otaliastudios.cameraview.filters.GammaFilter</string>
<string name="cameraview_filter_grain">com.otaliastudios.cameraview.filters.GrainFilter</string>
<string name="cameraview_filter_grayscale">com.otaliastudios.cameraview.filters.GrayscaleFilter</string>
<string name="cameraview_filter_hue">com.otaliastudios.cameraview.filters.HueFilter</string>
<string name="cameraview_filter_invert_colors">com.otaliastudios.cameraview.filters.InvertColorsFilter</string>
<string name="cameraview_filter_lomoish">com.otaliastudios.cameraview.filters.LomoishFilter</string>
<string name="cameraview_filter_posterize">com.otaliastudios.cameraview.filters.PosterizeFilter</string>
<string name="cameraview_filter_saturation">com.otaliastudios.cameraview.filters.SaturationFilter</string>
<string name="cameraview_filter_sepia">com.otaliastudios.cameraview.filters.SepiaFilter</string>
<string name="cameraview_filter_sharpness">com.otaliastudios.cameraview.filters.SharpnessFilter</string>
<string name="cameraview_filter_temperature">com.otaliastudios.cameraview.filters.TemperatureFilter</string>
<string name="cameraview_filter_tint">com.otaliastudios.cameraview.filters.TintFilter</string>
<string name="cameraview_filter_vignette">com.otaliastudios.cameraview.filters.VignetteFilter</string>
</resources>
Loading…
Cancel
Save