Skip to content

Commit d2c1c06

Browse files
chore: more lint fixes
1 parent 3f28d0b commit d2c1c06

3 files changed

Lines changed: 32 additions & 52 deletions

File tree

app/android/src/main/java/com/capacitorjs/plugins/app/AppPlugin.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,17 @@ public void load() {
5353
this.backButtonHandlerEnabled = !getConfig().getBoolean("disableBackButtonHandler", false);
5454
this.edgeGestureHandlerEnabled = canUseEdgeGesture && getConfig().getBoolean("enableEdgeGestureHandler", false);
5555

56-
bridge
57-
.getApp()
58-
.setStatusChangeListener((isActive) -> {
59-
Logger.debug(getLogTag(), "Firing change: " + isActive);
60-
JSObject data = new JSObject();
61-
data.put("isActive", isActive);
62-
notifyListeners(EVENT_STATE_CHANGE, data, false);
63-
});
64-
65-
bridge
66-
.getApp()
67-
.setAppRestoredListener((result) -> {
68-
Logger.debug(getLogTag(), "Firing restored result");
69-
notifyListeners(EVENT_RESTORED_RESULT, result.getWrappedResult(), true);
70-
});
56+
bridge.getApp().setStatusChangeListener((isActive) -> {
57+
Logger.debug(getLogTag(), "Firing change: " + isActive);
58+
JSObject data = new JSObject();
59+
data.put("isActive", isActive);
60+
notifyListeners(EVENT_STATE_CHANGE, data, false);
61+
});
62+
63+
bridge.getApp().setAppRestoredListener((result) -> {
64+
Logger.debug(getLogTag(), "Firing restored result");
65+
notifyListeners(EVENT_RESTORED_RESULT, result.getWrappedResult(), true);
66+
});
7167

7268
this.onBackPressedCallback = new OnBackPressedCallback(false) {
7369
@Override

splash-screen/android/src/main/java/com/capacitorjs/plugins/splashscreen/SplashScreen.java

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -138,17 +138,14 @@ public boolean onPreDraw() {
138138
if (!isVisible && !isHiding) {
139139
isVisible = true;
140140

141-
new Handler(context.getMainLooper()).postDelayed(
142-
() -> {
143-
// Splash screen is done... start drawing content.
144-
if (settings.isAutoHide()) {
145-
isVisible = false;
146-
onPreDrawListener = null;
147-
content.getViewTreeObserver().removeOnPreDrawListener(this);
148-
}
149-
},
150-
settings.getShowDuration()
151-
);
141+
new Handler(context.getMainLooper()).postDelayed(() -> {
142+
// Splash screen is done... start drawing content.
143+
if (settings.isAutoHide()) {
144+
isVisible = false;
145+
onPreDrawListener = null;
146+
content.getViewTreeObserver().removeOnPreDrawListener(this);
147+
}
148+
}, settings.getShowDuration());
152149
}
153150

154151
// Not ready to dismiss splash screen
@@ -225,16 +222,13 @@ private void showDialog(
225222
isVisible = true;
226223

227224
if (settings.isAutoHide()) {
228-
new Handler(context.getMainLooper()).postDelayed(
229-
() -> {
230-
hideDialog(activity, isLaunchSplash);
225+
new Handler(context.getMainLooper()).postDelayed(() -> {
226+
hideDialog(activity, isLaunchSplash);
231227

232-
if (splashListener != null) {
233-
splashListener.completed();
234-
}
235-
},
236-
settings.getShowDuration()
237-
);
228+
if (splashListener != null) {
229+
splashListener.completed();
230+
}
231+
}, settings.getShowDuration());
238232
} else {
239233
// If no autoHide, call complete
240234
if (splashListener != null) {
@@ -397,16 +391,13 @@ public void onAnimationEnd(Animator animator) {
397391
isVisible = true;
398392

399393
if (settings.isAutoHide()) {
400-
new Handler(context.getMainLooper()).postDelayed(
401-
() -> {
402-
hide(settings.getFadeOutDuration(), isLaunchSplash);
394+
new Handler(context.getMainLooper()).postDelayed(() -> {
395+
hide(settings.getFadeOutDuration(), isLaunchSplash);
403396

404-
if (splashListener != null) {
405-
splashListener.completed();
406-
}
407-
},
408-
settings.getShowDuration()
409-
);
397+
if (splashListener != null) {
398+
splashListener.completed();
399+
}
400+
}, settings.getShowDuration());
410401
} else {
411402
// If no autoHide, call complete
412403
if (splashListener != null) {

splash-screen/src/definitions.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,7 @@ declare module '@capacitor/cli' {
6969
* @example "CENTER_CROP"
7070
*/
7171
androidScaleType?:
72-
| 'CENTER'
73-
| 'CENTER_CROP'
74-
| 'CENTER_INSIDE'
75-
| 'FIT_CENTER'
76-
| 'FIT_END'
77-
| 'FIT_START'
78-
| 'FIT_XY'
79-
| 'MATRIX';
72+
'CENTER' | 'CENTER_CROP' | 'CENTER_INSIDE' | 'FIT_CENTER' | 'FIT_END' | 'FIT_START' | 'FIT_XY' | 'MATRIX';
8073

8174
/**
8275
* Show a loading spinner on the Splash Screen.

0 commit comments

Comments
 (0)