Skip to content

RDMR-1052: decouple bottom nav bar from background color #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OS-kepatotorica merged 1 commit into from
Jan 16, 2026
+7 −5
Merged

RDMR-1052: decouple bottom nav bar from background color #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/src/org/apache/cordova/CoreAndroid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public void run() {
*/
public void overrideBackbutton(boolean override) {
LOG.i("App", "WARNING: Back Button Default Behavior will be overridden. The backbutton event will be fired!");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
if (Build.VERSION.SDK_INT >= 36) { // Build.VERSION_CODES.BAKLAVA
Copy link
Author

@OS-kepatotorica OS-kepatotorica Jan 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Node CI / NodeJS 20.x on ubuntu-latest (push)

was failing because of this.

if (override) {
synchronized (backButtonHandlerLock) {
if (backCallback == null) {
Expand Down
10 changes: 6 additions & 4 deletions framework/src/org/apache/cordova/SplashScreenPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ Licensed to the Apache Software Foundation (ASF) under one
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;

import androidx.annotation.NonNull;
import androidx.core.splashscreen.SplashScreen;
import androidx.core.splashscreen.SplashScreenViewProvider;

import org.json.JSONArray;
import org.json.JSONException;

Expand Down Expand Up @@ -95,6 +93,8 @@ public class SplashScreenPlugin extends CordovaPlugin {
*/
private int fadeDuration;

private static boolean hasCustomSplashscreens;

// Internal variables
/**
* Boolean flag to determine if the splash screen remains visible.
Expand Down Expand Up @@ -125,7 +125,7 @@ protected void pluginInitialize() {

Context context = cordova.getContext();
boolean showSpinner = preferences.getBoolean("ShowSplashScreenSpinner", DEFAULT_SHOW_SPINNER);
boolean hasCustomSplashscreens = preferences.getBoolean("HasCustomSplashscreens", DEFAULT_HAS_CUSTOM_SPLASHSCREENS);
hasCustomSplashscreens = preferences.getBoolean("HasCustomSplashscreens", DEFAULT_HAS_CUSTOM_SPLASHSCREENS);
if (!showSpinner && !hasCustomSplashscreens) {
// Use only the Android Splashscreen API
behaviours.registerBehaviour(new AndroidSplashScreenBehaviour(context, autoHide, delayTime, isFadeEnabled, fadeDuration, webView));
Expand Down Expand Up @@ -329,7 +329,9 @@ public void onAnimationEnd(Animator animation) {
}
});
} else {
cordovaWebView.getPluginManager().postMessage("updateSystemBars", null);
if(!hasCustomSplashscreens){
cordovaWebView.getPluginManager().postMessage("updateSystemBars", null);
}
}

}
Expand Down
Loading