Display current filter in DemoApp

pull/537/head
Mattia Iavarone 6 years ago
parent 06760efd1c
commit 8da9ece4da
  1. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java
  2. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java
  3. 4
      demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java

@ -103,7 +103,9 @@ public class DuotoneFilter extends BaseFilter implements TwoParameterFilter {
@Override @Override
public float getParameter1() { public float getParameter1() {
return (float) getFirstColor() / 0xFFFFFF; int color = getFirstColor();
color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color));
return (float) color / 0xFFFFFF;
} }
@Override @Override
@ -114,7 +116,9 @@ public class DuotoneFilter extends BaseFilter implements TwoParameterFilter {
@Override @Override
public float getParameter2() { public float getParameter2() {
return (float) getSecondColor() / 0xFFFFFF; int color = getSecondColor();
color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color));
return (float) color / 0xFFFFFF;
} }
@NonNull @NonNull

@ -66,7 +66,9 @@ public class TintFilter extends BaseFilter implements OneParameterFilter {
@Override @Override
public float getParameter1() { public float getParameter1() {
return (float) getTint() / 0xFFFFFF; int color = getTint();
color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color));
return (float) color / 0xFFFFFF;
} }
@NonNull @NonNull

@ -331,7 +331,9 @@ public class CameraActivity extends AppCompatActivity implements View.OnClickLis
} else { } else {
mCurrentFilter = 0; mCurrentFilter = 0;
} }
camera.setFilter(mAllFilters[mCurrentFilter].newInstance()); Filters filter = mAllFilters[mCurrentFilter];
camera.setFilter(filter.newInstance());
message(filter.toString(), false);
} }
@Override @Override

Loading…
Cancel
Save