Skip to content

fix(android): edge to edge guards on activity type #11005

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
NathanWalker merged 2 commits into from
Dec 6, 2025
+29 −8
Merged

fix(android): edge to edge guards on activity type #11005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d5179d
fix(android): edge to edge guards on activity type
NathanWalker Dec 6, 2025
0b95597
fix: android widgets build
NathanWalker Dec 6, 2025
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
Binary file modified packages/core/platforms/android/widgets-release.aar
View file
Open in desktop
Binary file not shown.
37 changes: 29 additions & 8 deletions packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.nativescript.widgets;

import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
Expand Down Expand Up @@ -74,20 +75,40 @@ public int getValue() {
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/remote_color_resources_res/values/colors.xml;l=67
static final int DefaultDarkScrim = Color.argb(0x80, 0x1b, 0x1b, 0x1b);

public static void enableEdgeToEdge(ComponentActivity activity) {
androidx.activity.EdgeToEdge.enable(activity);
public static void enableEdgeToEdge(Activity activity) {
if (activity instanceof ComponentActivity) {
androidx.activity.EdgeToEdge.enable((ComponentActivity) activity);
}
}

public static void enableEdgeToEdge(ComponentActivity activity, HandleDarkMode handleDarkMode) {
androidx.activity.EdgeToEdge.enable(activity, SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT, resources -> handleDarkMode.onHandle(HandleDarkModeBar.status.getValue(), resources)), SystemBarStyle.auto(DefaultLightScrim, DefaultDarkScrim, resources -> handleDarkMode.onHandle(HandleDarkModeBar.navigation.getValue(), resources)));
public static void enableEdgeToEdge(Activity activity, HandleDarkMode handleDarkMode) {
if (activity instanceof ComponentActivity) {
ComponentActivity componentActivity = (ComponentActivity) activity;
androidx.activity.EdgeToEdge.enable(componentActivity,
SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT, resources -> handleDarkMode.onHandle(HandleDarkModeBar.status.getValue(), resources)),
SystemBarStyle.auto(DefaultLightScrim, DefaultDarkScrim, resources -> handleDarkMode.onHandle(HandleDarkModeBar.navigation.getValue(), resources))
);
}
}

public static void enableEdgeToEdge(ComponentActivity activity, @ColorInt Integer statusBarLight, @ColorInt Integer statusBarDark, @ColorInt Integer navigationBarLight, @ColorInt Integer navigationBarDark) {
androidx.activity.EdgeToEdge.enable(activity, SystemBarStyle.auto(statusBarLight, statusBarDark), SystemBarStyle.auto(navigationBarLight, navigationBarDark));
public static void enableEdgeToEdge(Activity activity, @ColorInt Integer statusBarLight, @ColorInt Integer statusBarDark, @ColorInt Integer navigationBarLight, @ColorInt Integer navigationBarDark) {
if (activity instanceof ComponentActivity) {
ComponentActivity componentActivity = (ComponentActivity) activity;
androidx.activity.EdgeToEdge.enable(componentActivity,
SystemBarStyle.auto(statusBarLight, statusBarDark),
SystemBarStyle.auto(navigationBarLight, navigationBarDark)
);
}
}

public static void enableEdgeToEdge(ComponentActivity activity, @ColorInt Integer statusBarLight, @ColorInt Integer statusBarDark, @ColorInt Integer navigationBarLight, @ColorInt Integer navigationBarDark, HandleDarkMode handleDarkMode) {
androidx.activity.EdgeToEdge.enable(activity, SystemBarStyle.auto(statusBarLight, statusBarDark, resources -> handleDarkMode.onHandle(HandleDarkModeBar.status.getValue(), resources)), SystemBarStyle.auto(navigationBarLight, navigationBarDark, resources -> handleDarkMode.onHandle(HandleDarkModeBar.navigation.getValue(), resources)));
public static void enableEdgeToEdge(Activity activity, @ColorInt Integer statusBarLight, @ColorInt Integer statusBarDark, @ColorInt Integer navigationBarLight, @ColorInt Integer navigationBarDark, HandleDarkMode handleDarkMode) {
if (activity instanceof ComponentActivity) {
ComponentActivity componentActivity = (ComponentActivity) activity;
androidx.activity.EdgeToEdge.enable(componentActivity,
SystemBarStyle.auto(statusBarLight, statusBarDark, resources -> handleDarkMode.onHandle(HandleDarkModeBar.status.getValue(), resources)),
SystemBarStyle.auto(navigationBarLight, navigationBarDark, resources -> handleDarkMode.onHandle(HandleDarkModeBar.navigation.getValue(), resources))
);
}
}

public static Drawable getDrawable(String uri, Context context) {
Expand Down