chore: fix linting

This commit is contained in:
Mikael Sand 2019-11-09 00:48:08 +02:00
parent 6ded8f0817
commit fcba6ea8b7
8 changed files with 36 additions and 33 deletions

View File

@ -4,11 +4,12 @@ def safeExtGet(prop, fallback) {
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:3.5.2'
} }
} }
@ -37,5 +38,6 @@ repositories {
} }
dependencies { dependencies {
//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+' implementation 'com.facebook.react:react-native:+'
} }

View File

@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest package="com.cmcewen.blurview" />
package="com.cmcewen.blurview" >
</manifest>

View File

@ -2,27 +2,29 @@ package com.cmcewen.blurview;
import android.view.View; import android.view.View;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactProp;
import javax.annotation.Nonnull;
public class BlurViewManager extends SimpleViewManager<BlurringView> {
public static final String REACT_CLASS = "BlurView";
public static final int defaultRadius = 10; @SuppressWarnings("unused")
public static final int defaultSampling = 10; class BlurViewManager extends SimpleViewManager<BlurringView> {
private static final String REACT_CLASS = "BlurView";
private static final int defaultRadius = 10;
private static final int defaultSampling = 10;
private static ThemedReactContext context; private static ThemedReactContext context;
@Override @Override
public String getName() { public @Nonnull String getName() {
return REACT_CLASS; return REACT_CLASS;
} }
@Override @Override
public BlurringView createViewInstance(ThemedReactContext ctx) { public @Nonnull BlurringView createViewInstance(@Nonnull ThemedReactContext ctx) {
context = ctx; context = ctx;
BlurringView blurringView = new BlurringView(ctx); BlurringView blurringView = new BlurringView(ctx);

View File

@ -1,7 +1,5 @@
package com.cmcewen.blurview; package com.cmcewen.blurview;
import android.app.Activity;
import com.facebook.react.ReactPackage; import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.JavaScriptModule;
import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.NativeModule;
@ -9,24 +7,27 @@ import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager; import com.facebook.react.uimanager.ViewManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.annotation.Nonnull;
public class BlurViewPackage implements ReactPackage { public class BlurViewPackage implements ReactPackage {
@Override @Override
public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) { @Nonnull
List<NativeModule> modules = new ArrayList<>(); public List<NativeModule> createNativeModules(@Nonnull ReactApplicationContext reactApplicationContext) {
return modules; return new ArrayList<>();
} }
@SuppressWarnings("unused")
public List<Class<? extends JavaScriptModule>> createJSModules() { public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList(); return Collections.emptyList();
} }
@Override @Override
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) { @Nonnull
return Arrays.<ViewManager>asList( public List<ViewManager> createViewManagers(@Nonnull ReactApplicationContext reactContext) {
return Collections.<ViewManager>singletonList(
new BlurViewManager() new BlurViewManager()
); );
} }

View File

@ -30,7 +30,7 @@ public class BlurringView extends View {
this(context, null); this(context, null);
} }
public BlurringView(ThemedReactContext context, AttributeSet attrs) { public BlurringView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
final Resources res = getResources(); final Resources res = getResources();
@ -40,11 +40,11 @@ public class BlurringView extends View {
initializeRenderScript(context); initializeRenderScript(context);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PxBlurringView); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BlurringView);
setBlurRadius(a.getInt(R.styleable.PxBlurringView_blurRadius, defaultBlurRadius)); setBlurRadius(a.getInt(R.styleable.BlurringView_blurRadius, defaultBlurRadius));
setDownsampleFactor(a.getInt(R.styleable.PxBlurringView_downsampleFactor, setDownsampleFactor(a.getInt(R.styleable.BlurringView_downsampleFactor,
defaultDownsampleFactor)); defaultDownsampleFactor));
setOverlayColor(a.getColor(R.styleable.PxBlurringView_overlayColor, defaultOverlayColor)); setOverlayColor(a.getColor(R.styleable.BlurringView_overlayColor, defaultOverlayColor));
a.recycle(); a.recycle();
} }
@ -111,7 +111,7 @@ public class BlurringView extends View {
mBlurScript = ScriptIntrinsicBlur.create(mRenderScript, Element.U8_4(mRenderScript)); mBlurScript = ScriptIntrinsicBlur.create(mRenderScript, Element.U8_4(mRenderScript));
} }
protected boolean prepare() { private boolean prepare() {
final int width = mBlurredView.getWidth(); final int width = mBlurredView.getWidth();
final int height = mBlurredView.getHeight(); final int height = mBlurredView.getHeight();
@ -156,7 +156,7 @@ public class BlurringView extends View {
return true; return true;
} }
protected void blur() { private void blur() {
mBlurInput.copyFrom(mBitmapToBlur); mBlurInput.copyFrom(mBitmapToBlur);
mBlurScript.setInput(mBlurInput); mBlurScript.setInput(mBlurInput);
mBlurScript.forEach(mBlurOutput); mBlurScript.forEach(mBlurOutput);
@ -182,7 +182,7 @@ public class BlurringView extends View {
// Need to wait until blurredView is set and the view is attached to window. // Need to wait until blurredView is set and the view is attached to window.
if (mBlurredView == null || getParent() == null) return; if (mBlurredView == null || getParent() == null) return;
Boolean circularReference = (mBlurredView.findViewById(getId()) != null); boolean circularReference = (mBlurredView.findViewById(getId()) != null);
if (circularReference) { if (circularReference) {
ThemedReactContext reactContext = (ThemedReactContext) getContext(); ThemedReactContext reactContext = (ThemedReactContext) getContext();
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
@ -191,14 +191,13 @@ public class BlurringView extends View {
setBlurredView(null); setBlurredView(null);
invalidate(); invalidate();
return;
} }
} }
private int mDownsampleFactor; private int mDownsampleFactor;
private int mOverlayColor; private int mOverlayColor;
protected View mBlurredView; private View mBlurredView;
private int mBlurredViewWidth, mBlurredViewHeight; private int mBlurredViewWidth, mBlurredViewHeight;
private boolean mDownsampleFactorChanged; private boolean mDownsampleFactorChanged;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<declare-styleable name="PxBlurringView"> <declare-styleable name="BlurringView">
<attr name="blurRadius" format="integer"/> <attr name="blurRadius" format="integer"/>
<attr name="downsampleFactor" format="integer"/> <attr name="downsampleFactor" format="integer"/>
<attr name="overlayColor" format="color"/> <attr name="overlayColor" format="color"/>

View File

@ -3,7 +3,7 @@
buildscript { buildscript {
ext { ext {
buildToolsVersion = "28.0.3" buildToolsVersion = "28.0.3"
minSdkVersion = 16 minSdkVersion = 17
compileSdkVersion = 28 compileSdkVersion = 28
targetSdkVersion = 28 targetSdkVersion = 28
supportLibVersion = "28.0.0" supportLibVersion = "28.0.0"
@ -13,7 +13,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.android.tools.build:gradle:3.5.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -1,5 +1,6 @@
#Sat Nov 09 00:42:16 EET 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip