Skip to content

Commit fcba6ea

Browse files
committed
chore: fix linting
1 parent 6ded8f0 commit fcba6ea

File tree

8 files changed

+36
-33
lines changed

8 files changed

+36
-33
lines changed

android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ def safeExtGet(prop, fallback) {
44

55
buildscript {
66
repositories {
7+
google()
78
jcenter()
89
}
910

1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:2.2.3'
12+
classpath 'com.android.tools.build:gradle:3.5.2'
1213
}
1314
}
1415

@@ -37,5 +38,6 @@ repositories {
3738
}
3839

3940
dependencies {
41+
//noinspection GradleDynamicVersion
4042
implementation 'com.facebook.react:react-native:+'
4143
}

android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.cmcewen.blurview" >
4-
</manifest>
2+
<manifest package="com.cmcewen.blurview" />

android/src/main/java/com/cmcewen/blurview/BlurViewManager.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22

33
import android.view.View;
44

5-
import com.facebook.react.bridge.ReactMethod;
65
import com.facebook.react.uimanager.SimpleViewManager;
76
import com.facebook.react.uimanager.ThemedReactContext;
87
import com.facebook.react.uimanager.annotations.ReactProp;
98

9+
import javax.annotation.Nonnull;
1010

11-
public class BlurViewManager extends SimpleViewManager<BlurringView> {
12-
public static final String REACT_CLASS = "BlurView";
1311

14-
public static final int defaultRadius = 10;
15-
public static final int defaultSampling = 10;
12+
@SuppressWarnings("unused")
13+
class BlurViewManager extends SimpleViewManager<BlurringView> {
14+
private static final String REACT_CLASS = "BlurView";
15+
16+
private static final int defaultRadius = 10;
17+
private static final int defaultSampling = 10;
1618

1719
private static ThemedReactContext context;
1820

1921
@Override
20-
public String getName() {
22+
public @Nonnull String getName() {
2123
return REACT_CLASS;
2224
}
2325

2426
@Override
25-
public BlurringView createViewInstance(ThemedReactContext ctx) {
27+
public @Nonnull BlurringView createViewInstance(@Nonnull ThemedReactContext ctx) {
2628
context = ctx;
2729

2830
BlurringView blurringView = new BlurringView(ctx);

android/src/main/java/com/cmcewen/blurview/BlurViewPackage.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
package com.cmcewen.blurview;
22

3-
import android.app.Activity;
4-
53
import com.facebook.react.ReactPackage;
64
import com.facebook.react.bridge.JavaScriptModule;
75
import com.facebook.react.bridge.NativeModule;
86
import com.facebook.react.bridge.ReactApplicationContext;
97
import com.facebook.react.uimanager.ViewManager;
108

119
import java.util.ArrayList;
12-
import java.util.Arrays;
1310
import java.util.Collections;
1411
import java.util.List;
1512

13+
import javax.annotation.Nonnull;
14+
1615
public class BlurViewPackage implements ReactPackage {
1716
@Override
18-
public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
19-
List<NativeModule> modules = new ArrayList<>();
20-
return modules;
17+
@Nonnull
18+
public List<NativeModule> createNativeModules(@Nonnull ReactApplicationContext reactApplicationContext) {
19+
return new ArrayList<>();
2120
}
2221

22+
@SuppressWarnings("unused")
2323
public List<Class<? extends JavaScriptModule>> createJSModules() {
2424
return Collections.emptyList();
2525
}
2626

2727
@Override
28-
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
29-
return Arrays.<ViewManager>asList(
28+
@Nonnull
29+
public List<ViewManager> createViewManagers(@Nonnull ReactApplicationContext reactContext) {
30+
return Collections.<ViewManager>singletonList(
3031
new BlurViewManager()
3132
);
3233
}

android/src/main/java/com/cmcewen/blurview/BlurringView.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public BlurringView(ThemedReactContext context) {
3030
this(context, null);
3131
}
3232

33-
public BlurringView(ThemedReactContext context, AttributeSet attrs) {
33+
public BlurringView(Context context, AttributeSet attrs) {
3434
super(context, attrs);
3535

3636
final Resources res = getResources();
@@ -40,11 +40,11 @@ public BlurringView(ThemedReactContext context, AttributeSet attrs) {
4040

4141
initializeRenderScript(context);
4242

43-
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PxBlurringView);
44-
setBlurRadius(a.getInt(R.styleable.PxBlurringView_blurRadius, defaultBlurRadius));
45-
setDownsampleFactor(a.getInt(R.styleable.PxBlurringView_downsampleFactor,
43+
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BlurringView);
44+
setBlurRadius(a.getInt(R.styleable.BlurringView_blurRadius, defaultBlurRadius));
45+
setDownsampleFactor(a.getInt(R.styleable.BlurringView_downsampleFactor,
4646
defaultDownsampleFactor));
47-
setOverlayColor(a.getColor(R.styleable.PxBlurringView_overlayColor, defaultOverlayColor));
47+
setOverlayColor(a.getColor(R.styleable.BlurringView_overlayColor, defaultOverlayColor));
4848
a.recycle();
4949
}
5050

@@ -111,7 +111,7 @@ private void initializeRenderScript(Context context) {
111111
mBlurScript = ScriptIntrinsicBlur.create(mRenderScript, Element.U8_4(mRenderScript));
112112
}
113113

114-
protected boolean prepare() {
114+
private boolean prepare() {
115115
final int width = mBlurredView.getWidth();
116116
final int height = mBlurredView.getHeight();
117117

@@ -156,7 +156,7 @@ protected boolean prepare() {
156156
return true;
157157
}
158158

159-
protected void blur() {
159+
private void blur() {
160160
mBlurInput.copyFrom(mBitmapToBlur);
161161
mBlurScript.setInput(mBlurInput);
162162
mBlurScript.forEach(mBlurOutput);
@@ -182,7 +182,7 @@ private void checkForCircularReference() {
182182
// Need to wait until blurredView is set and the view is attached to window.
183183
if (mBlurredView == null || getParent() == null) return;
184184

185-
Boolean circularReference = (mBlurredView.findViewById(getId()) != null);
185+
boolean circularReference = (mBlurredView.findViewById(getId()) != null);
186186
if (circularReference) {
187187
ThemedReactContext reactContext = (ThemedReactContext) getContext();
188188
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
@@ -191,14 +191,13 @@ private void checkForCircularReference() {
191191

192192
setBlurredView(null);
193193
invalidate();
194-
return;
195194
}
196195
}
197196

198197
private int mDownsampleFactor;
199198
private int mOverlayColor;
200199

201-
protected View mBlurredView;
200+
private View mBlurredView;
202201
private int mBlurredViewWidth, mBlurredViewHeight;
203202

204203
private boolean mDownsampleFactorChanged;

android/src/main/res/values/attr.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<declare-styleable name="PxBlurringView">
3+
<declare-styleable name="BlurringView">
44
<attr name="blurRadius" format="integer"/>
55
<attr name="downsampleFactor" format="integer"/>
66
<attr name="overlayColor" format="color"/>

example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44
ext {
55
buildToolsVersion = "28.0.3"
6-
minSdkVersion = 16
6+
minSdkVersion = 17
77
compileSdkVersion = 28
88
targetSdkVersion = 28
99
supportLibVersion = "28.0.0"
@@ -13,7 +13,7 @@ buildscript {
1313
jcenter()
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.3.1'
16+
classpath 'com.android.tools.build:gradle:3.5.2'
1717

1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Nov 09 00:42:16 EET 2019
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)