diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java index a5a6d022..92549229 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java @@ -5,14 +5,14 @@ import androidx.annotation.NonNull; /** * Attempts to auto-fix the preview based on histogram equalization. */ -public class AutoFixEffect extends Filter { +public class AutoFixFilter extends Filter { private float scale = 1.0f; /** * Initialize Effect */ - public AutoFixEffect() { + public AutoFixFilter() { } public float getScale() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java similarity index 88% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java index 5141a870..c7316ea0 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Converts the preview into black and white colors */ -public class BlackAndWhiteEffect extends Filter { +public class BlackAndWhiteFilter extends Filter { /** * Initialize effect */ - public BlackAndWhiteEffect() { + public BlackAndWhiteFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java similarity index 92% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java index 3868340b..f2718b8c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Adjusts the brightness of the preview. */ -public class BrightnessEffect extends Filter { +public class BrightnessFilter extends Filter { private float brightnessValue = 2.0f; /** * Initialize Effect */ - public BrightnessEffect() { + public BrightnessFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java similarity index 92% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java index 98a53e87..03034f46 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Adjusts the contrast of the preview. */ -public class ContrastEffect extends Filter { +public class ContrastFilter extends Filter { private float contrast = 2.0f; /** * Initialize Effect */ - public ContrastEffect() { + public ContrastFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java similarity index 92% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java index c388d6f5..883a15bb 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java @@ -6,12 +6,12 @@ import androidx.annotation.NonNull; * Applies a cross process effect on preview, in which the red and green channels * are enhanced while the blue channel is restricted. */ -public class CrossProcessEffect extends Filter { +public class CrossProcessFilter extends Filter { /** * Initialize Effect */ - public CrossProcessEffect() { + public CrossProcessFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomFilter.java similarity index 82% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomFilter.java index ad9e6de5..f1b53220 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomFilter.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; /** * This class is to implement any custom effect. */ -public class CustomEffect extends Filter { +public class CustomFilter extends Filter { /** * Parameterized constructor with vertex and fragment shader as parameter @@ -14,7 +14,7 @@ public class CustomEffect extends Filter { * @param vertexShader * @param fragmentShader */ - public CustomEffect(String vertexShader, String fragmentShader) { + public CustomFilter(String vertexShader, String fragmentShader) { this.mVertexShader = vertexShader; this.mFragmentShader = fragmentShader; } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java index c45a9de3..c81fcac4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java @@ -8,10 +8,10 @@ import java.util.Random; /** * Applies black and white documentary style effect on preview. */ -public class DocumentaryEffect extends Filter { +public class DocumentaryFilter extends Filter { private Random mRandom; - public DocumentaryEffect() { + public DocumentaryFilter() { mRandom = new Random(new Date().getTime()); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java index ea1fdcd4..de34f7d5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; /** * Representation of preview using only two color tones. */ -public class DuotoneEffect extends Filter { +public class DuotoneFilter extends Filter { // Default values private int mFirstColor = Color.MAGENTA; private int mSecondColor = Color.YELLOW; @@ -15,7 +15,7 @@ public class DuotoneEffect extends Filter { /** * Initialize effect */ - public DuotoneEffect() { + public DuotoneFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java similarity index 93% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java index 3b35b0d0..8d807137 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Applies back-light filling to the preview. */ -public class FillLightEffect extends Filter { +public class FillLightFilter extends Filter { private float strength = 0.5f; /** * Initialize Effect */ - public FillLightEffect() { + public FillLightFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java index 06281cdf..26bf6d82 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java @@ -1,122 +1,122 @@ package com.otaliastudios.cameraview.filters; public enum Filters { - NO_EFFECT, - - AUTO_FIX_EFFECT, - BLACK_AND_WHITE_EFFECT, - BRIGHTNESS_EFFECT, - CONTRAST_EFFECT, - CROSS_PROCESS_EFFECT, - DOCUMENTARY_EFFECT, - DUO_TONE_COLOR_EFFECT, - FILL_LIGHT_EFFECT, - GAMMA_EFFECT, - GRAIN_EFFECT, - GREY_SCALE_EFFECT, - HUE_EFFECT, - INVERT_COLOR_EFFECT, - LAMOISH_EFFECT, - POSTERIZE_EFFECT, - SATURATION_EFFECT, - SEPIA_EFFECT, - SHARPNESS_EFFECT, - TEMPERATURE_EFFECT, - TINT_EFFECT, - VIGNETTE_EFFECT; + NO_FILTER, + + AUTO_FIX_FILTER, + BLACK_AND_WHITE_FILTER, + BRIGHTNESS_FILTER, + CONTRAST_FILTER, + CROSS_PROCESS_FILTER, + DOCUMENTARY_FILTER, + DUO_TONE_COLOR_FILTER, + FILL_LIGHT_FILTER, + GAMMA_FILTER, + GRAIN_FILTER, + GREY_SCALE_FILTER, + HUE_FILTER, + INVERT_COLOR_FILTER, + LAMOISH_FILTER, + POSTERIZE_FILTER, + SATURATION_FILTER, + SEPIA_FILTER, + SHARPNESS_FILTER, + TEMPERATURE_FILTER, + TINT_FILTER, + VIGNETTE_FILTER; public Filter newInstance() { Filter shaderEffect; switch (this) { - case AUTO_FIX_EFFECT: - shaderEffect = new AutoFixEffect(); + case AUTO_FIX_FILTER: + shaderEffect = new AutoFixFilter(); break; - case BLACK_AND_WHITE_EFFECT: - shaderEffect = new BlackAndWhiteEffect(); + case BLACK_AND_WHITE_FILTER: + shaderEffect = new BlackAndWhiteFilter(); break; - case BRIGHTNESS_EFFECT: - shaderEffect = new BrightnessEffect(); + case BRIGHTNESS_FILTER: + shaderEffect = new BrightnessFilter(); break; - case CONTRAST_EFFECT: - shaderEffect = new ContrastEffect(); + case CONTRAST_FILTER: + shaderEffect = new ContrastFilter(); break; - case CROSS_PROCESS_EFFECT: - shaderEffect = new CrossProcessEffect(); + case CROSS_PROCESS_FILTER: + shaderEffect = new CrossProcessFilter(); break; - case DOCUMENTARY_EFFECT: - shaderEffect = new DocumentaryEffect(); + case DOCUMENTARY_FILTER: + shaderEffect = new DocumentaryFilter(); break; - case DUO_TONE_COLOR_EFFECT: - shaderEffect = new DuotoneEffect(); + case DUO_TONE_COLOR_FILTER: + shaderEffect = new DuotoneFilter(); break; - case FILL_LIGHT_EFFECT: - shaderEffect = new FillLightEffect(); + case FILL_LIGHT_FILTER: + shaderEffect = new FillLightFilter(); break; - case GAMMA_EFFECT: - shaderEffect = new GammaEffect(); + case GAMMA_FILTER: + shaderEffect = new GammaFilter(); break; - case GRAIN_EFFECT: - shaderEffect = new GrainEffect(); + case GRAIN_FILTER: + shaderEffect = new GrainFilter(); break; - case GREY_SCALE_EFFECT: - shaderEffect = new GreyScaleEffect(); + case GREY_SCALE_FILTER: + shaderEffect = new GreyScaleFilter(); break; - case HUE_EFFECT: - shaderEffect = new HueEffect(); + case HUE_FILTER: + shaderEffect = new HueFilter(); break; - case INVERT_COLOR_EFFECT: - shaderEffect = new InvertColorsEffect(); + case INVERT_COLOR_FILTER: + shaderEffect = new InvertColorsFilter(); break; - case LAMOISH_EFFECT: - shaderEffect = new LamoishEffect(); + case LAMOISH_FILTER: + shaderEffect = new LamoishFilter(); break; - case POSTERIZE_EFFECT: - shaderEffect = new PosterizeEffect(); + case POSTERIZE_FILTER: + shaderEffect = new PosterizeFilter(); break; - case SATURATION_EFFECT: - shaderEffect = new SaturationEffect(); + case SATURATION_FILTER: + shaderEffect = new SaturationFilter(); break; - case SEPIA_EFFECT: - shaderEffect = new SepiaEffect(); + case SEPIA_FILTER: + shaderEffect = new SepiaFilter(); break; - case SHARPNESS_EFFECT: - shaderEffect = new SharpnessEffect(); + case SHARPNESS_FILTER: + shaderEffect = new SharpnessFilter(); break; - case TEMPERATURE_EFFECT: - shaderEffect = new TemperatureEffect(); + case TEMPERATURE_FILTER: + shaderEffect = new TemperatureFilter(); break; - case TINT_EFFECT: - shaderEffect = new TintEffect(); + case TINT_FILTER: + shaderEffect = new TintFilter(); break; - case VIGNETTE_EFFECT: - shaderEffect = new VignetteEffect(); + case VIGNETTE_FILTER: + shaderEffect = new VignetteFilter(); break; - case NO_EFFECT: + case NO_FILTER: default: - shaderEffect = new NoFilterEffect(); + shaderEffect = new NoFilter(); } return shaderEffect; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java index 06d94b6c..aa17715a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Apply Gamma Effect on preview being played */ -public class GammaEffect extends Filter { +public class GammaFilter extends Filter { private float gammaValue = 2.0f; /** * Initialize Effect */ - public GammaEffect() { + public GammaFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java index 8e022848..e7292ac7 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java @@ -8,14 +8,14 @@ import java.util.Random; /** * Applies film grain effect to preview. */ -public class GrainEffect extends Filter { +public class GrainFilter extends Filter { private float strength = 0.5f; private Random mRandom; /** * Initialize Effect */ - public GrainEffect() { + public GrainFilter() { mRandom = new Random(new Date().getTime()); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleFilter.java similarity index 87% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleFilter.java index 71d6c5a8..a5872562 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleFilter.java @@ -5,11 +5,11 @@ import androidx.annotation.NonNull; /** * Converts preview to GreyScale. */ -public class GreyScaleEffect extends Filter { +public class GreyScaleFilter extends Filter { /** * Initialize Effect */ - public GreyScaleEffect() { + public GreyScaleFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java similarity index 97% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java index 536a7fb3..8099b00d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Apply Hue effect on the preview */ -public class HueEffect extends Filter { +public class HueFilter extends Filter { float hueValue = 0.0f; /** * Initialize Effect */ - public HueEffect() { + public HueFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java similarity index 88% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java index 80e85cb9..638819d8 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java @@ -5,11 +5,11 @@ import androidx.annotation.NonNull; /** * Inverts the preview colors. This can also be known as negative Effect. */ -public class InvertColorsEffect extends Filter { +public class InvertColorsFilter extends Filter { /** * Initialize Effect */ - public InvertColorsEffect() { + public InvertColorsFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishFilter.java similarity index 96% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishFilter.java index 459e15e8..b4fce780 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishFilter.java @@ -8,13 +8,13 @@ import java.util.Random; /** * Applies lomo-camera style effect to preview. */ -public class LamoishEffect extends Filter { +public class LamoishFilter extends Filter { private Random mRandom; /** * Initialize Effect */ - public LamoishEffect() { + public LamoishFilter() { mRandom = new Random(new Date().getTime()); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java similarity index 81% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java index 25ab266c..5f76028d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java @@ -2,7 +2,7 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; -public class NoFilterEffect extends Filter { +public class NoFilter extends Filter { @NonNull @Override diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java similarity index 89% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java index 468e10e4..df70697e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java @@ -5,11 +5,11 @@ import androidx.annotation.NonNull; /** * Applies Posterization effect to Preview. */ -public class PosterizeEffect extends Filter { +public class PosterizeFilter extends Filter { /** * Initialize Effect */ - public PosterizeEffect() { + public PosterizeFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java index 2f10655e..ddb02931 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Adjusts color saturation of preview. */ -public class SaturationEffect extends Filter { +public class SaturationFilter extends Filter { private float scale = 1.0f; /** * Initialize Effect */ - public SaturationEffect() { + public SaturationFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java index 5a2cc82c..c312bee2 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java @@ -5,11 +5,11 @@ import androidx.annotation.NonNull; /** * Converts preview to Sepia tone. */ -public class SepiaEffect extends Filter { +public class SepiaFilter extends Filter { /** * Initialize Effect */ - public SepiaEffect() { + public SepiaFilter() { } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java index 3387f04a..8984a12d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Sharpens the preview. */ -public class SharpnessEffect extends Filter { +public class SharpnessFilter extends Filter { private float scale = 0.5f; /** * Initialize Effect */ - public SharpnessEffect() { + public SharpnessFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java similarity index 93% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java index 2e987aeb..fbcf5710 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java @@ -5,13 +5,13 @@ import androidx.annotation.NonNull; /** * Adjusts color temperature of the preview. */ -public class TemperatureEffect extends Filter { +public class TemperatureFilter extends Filter { private float scale = 0f; /** * Initialize Effect */ - public TemperatureEffect() { + public TemperatureFilter() { } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java index b82610f9..a7a9cd08 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java @@ -8,13 +8,13 @@ import androidx.annotation.NonNull; /** * Tints the preview with specified color.. */ -public class TintEffect extends Filter { +public class TintFilter extends Filter { private int mTint = 0xFFFF0000; /** * Initialize Effect */ - public TintEffect() { + public TintFilter() { } public void setTintColor(int color) { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java index 742a97d2..3d515e48 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java @@ -6,14 +6,14 @@ import androidx.annotation.NonNull; /** * Applies lomo-camera style effect to your preview. */ -public class VignetteEffect extends Filter { +public class VignetteFilter extends Filter { private float mScale = 0.85f; private float mShade = 0.5f; /** * Initialize Effect */ - public VignetteEffect() { + public VignetteFilter() { } /** 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 20989ee4..300bc80a 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.filters.Filter; -import com.otaliastudios.cameraview.filters.NoFilterEffect; +import com.otaliastudios.cameraview.filters.NoFilter; import java.nio.FloatBuffer; @@ -67,7 +67,7 @@ public class EglViewport extends EglElement { mTextureUnit = GLES20.GL_TEXTURE0; //init the default shader effect - mShaderEffect = new NoFilterEffect(); + mShaderEffect = new NoFilter(); initProgram(); } 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 06fd4abf..1afa4faa 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.filters.Filter; -import com.otaliastudios.cameraview.filters.NoFilterEffect; +import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.size.AspectRatio; import java.util.Collections; @@ -167,7 +167,7 @@ public class GlCameraPreview extends CameraPreview