Skip to content

Commit 68c62a5

Browse files
authored
Merge branch 'next' into alpha-bump
2 parents 094081b + 43f8478 commit 68c62a5

5 files changed

Lines changed: 37 additions & 45 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ These are experimental plugins. Use at your own risk.
6161

6262
| GitHub | Package | Version |
6363
| --- | --- | --- |
64-
| [Watch](https://github.com/ionic-team/CapacitorWatch) | [`@capacitor/watch`](https://capacitorjs.com/docs/apis/watch) | [![npm badge](https://img.shields.io/npm/v/@capacitor/watch?style=flat-square)](https://www.npmjs.com/package/@capacitor/watch) |
64+
| [LocalLLM](https://github.com/ionic-team/capacitor-local-llm) | [`@capacitor/local-llm`](https://capacitorjs.com/docs/apis/local-llm) | [![npm badge](https://img.shields.io/npm/v/@capacitor/local-llm?style=flat-square)](https://www.npmjs.com/package/@capacitor/local-llm) |
6565

6666
## Contributing
6767

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,16 @@ public class AppPlugin extends Plugin {
3333
public void load() {
3434
boolean disableBackButtonHandler = getConfig().getBoolean("disableBackButtonHandler", false);
3535

36-
bridge
37-
.getApp()
38-
.setStatusChangeListener((isActive) -> {
39-
Logger.debug(getLogTag(), "Firing change: " + isActive);
40-
JSObject data = new JSObject();
41-
data.put("isActive", isActive);
42-
notifyListeners(EVENT_STATE_CHANGE, data, false);
43-
});
44-
bridge
45-
.getApp()
46-
.setAppRestoredListener((result) -> {
47-
Logger.debug(getLogTag(), "Firing restored result");
48-
notifyListeners(EVENT_RESTORED_RESULT, result.getWrappedResult(), true);
49-
});
36+
bridge.getApp().setStatusChangeListener((isActive) -> {
37+
Logger.debug(getLogTag(), "Firing change: " + isActive);
38+
JSObject data = new JSObject();
39+
data.put("isActive", isActive);
40+
notifyListeners(EVENT_STATE_CHANGE, data, false);
41+
});
42+
bridge.getApp().setAppRestoredListener((result) -> {
43+
Logger.debug(getLogTag(), "Firing restored result");
44+
notifyListeners(EVENT_RESTORED_RESULT, result.getWrappedResult(), true);
45+
});
5046
this.onBackPressedCallback = new OnBackPressedCallback(!disableBackButtonHandler) {
5147
@Override
5248
public void handleOnBackPressed() {

‎push-notifications/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.1.1](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/push-notifications@8.1.0...@capacitor/push-notifications@8.1.1) (2026-05-15)
7+
8+
**Note:** Version bump only for package @capacitor/push-notifications
9+
610
# [8.1.0](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/push-notifications@8.0.4...@capacitor/push-notifications@8.1.0) (2026-05-15)
711

812
### Features

‎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) {

‎status-bar/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ let package = Package(
1717
.target(
1818
name: "StatusBarPlugin",
1919
dependencies: [
20-
.product(name: "Capacitor", package: "capacitor-swift-pm")],
20+
.product(name: "Capacitor", package: "capacitor-swift-pm")
21+
],
2122
path: "ios/Sources/StatusBarPlugin"
2223
),
2324
.testTarget(

0 commit comments

Comments
 (0)