diff --git a/apps/toolbox/src/main-page.xml b/apps/toolbox/src/main-page.xml
index 60389d0de..8440b4ea7 100644
--- a/apps/toolbox/src/main-page.xml
+++ b/apps/toolbox/src/main-page.xml
@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page" statusBarStyle="dark">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page" androidOverflowEdge="bottom" statusBarStyle="dark">
   <Page.actionBar>
     <ActionBar title="Dev Toolbox" icon="" class="action-bar">
     </ActionBar>
@@ -35,3 +35,4 @@
     </ScrollView>
   </StackLayout>
 </Page>
+
diff --git a/apps/toolbox/src/main-view-model.ts b/apps/toolbox/src/main-view-model.ts
index 406161ce0..bf21709d1 100644
--- a/apps/toolbox/src/main-view-model.ts
+++ b/apps/toolbox/src/main-view-model.ts
@@ -1,4 +1,4 @@
-import { Observable, Frame, StackLayout } from '@nativescript/core';
+import { Observable, Frame, StackLayout, AndroidOverflowInsetData } from '@nativescript/core';
 
 export class HelloWorldModel extends Observable {
 	viewDemo(args) {
@@ -7,4 +7,16 @@ export class HelloWorldModel extends Observable {
 			moduleName: `pages/${args.object.text}`,
 		});
 	}
+
+	onInset(args: AndroidOverflowInsetData) {
+		args.inset.top += 10; // add 10px to the top inset
+		args.inset.bottom += 10; // add 10px to the bottom inset
+		args.inset.left += 10; // add 10px to the left inset
+		args.inset.right += 10; // add 10px to the right inset
+
+		args.inset.topConsumed = true; // consume the top inset
+		args.inset.bottomConsumed = true; // consume the bottom inset
+		args.inset.leftConsumed = true; // consume the left inset
+		args.inset.rightConsumed = true; // consume the right inset
+	}
 }
diff --git a/apps/toolbox/src/pages/list-page.xml b/apps/toolbox/src/pages/list-page.xml
index d46ecd4be..cce6c49c7 100644
--- a/apps/toolbox/src/pages/list-page.xml
+++ b/apps/toolbox/src/pages/list-page.xml
@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" actionBarHidden="false">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" actionBarHidden="false" androidOverflowEdge="bottom">
      <Page.actionBar>
         <ActionBar>
             <Label text="Components" class="header"/>
diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts
index acf33ca79..44abf1817 100644
--- a/packages/core/core-types/index.ts
+++ b/packages/core/core-types/index.ts
@@ -7,6 +7,10 @@ import { makeValidator, makeParser } from './validators';
 import { CubicBezierAnimationCurve } from './animation-types';
 
 export namespace CoreTypes {
+	type AndroidOverflowSingle = 'ignore' | 'none' | 'dont-apply';
+	type AndroidOverflowMultiple = 'left' | 'right' | 'top' | 'bottom' | 'left-dont-consume' | 'top-dont-consume' | 'right-dont-consume' | 'bottom-dont-consume' | 'all-but-left' | 'all-but-top' | 'all-but-right' | 'all-but-bottom';
+	type AndroidOverflowStacked = AndroidOverflowSingle | `${AndroidOverflowSingle},${AndroidOverflowMultiple}`;
+	export type AndroidOverflow = AndroidOverflowSingle | AndroidOverflowStacked;
 	export type CSSWideKeywords = 'initial' | 'inherit' | 'unset' | 'revert';
 
 	/**
diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar
index b0cb2cd98..eb21fead4 100644
Binary files a/packages/core/platforms/android/widgets-release.aar and b/packages/core/platforms/android/widgets-release.aar differ
diff --git a/packages/core/ui/animation/index.d.ts b/packages/core/ui/animation/index.d.ts
index eb610adc6..24292e7aa 100644
--- a/packages/core/ui/animation/index.d.ts
+++ b/packages/core/ui/animation/index.d.ts
@@ -6,11 +6,11 @@ import type { AnimationDefinition, AnimationPromise } from './animation-types';
  * Defines a animation set.
  */
 export class Animation {
-    constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
-    public play: (resetOnFinish?: boolean) => AnimationPromise;
-    public cancel: () => void;
-    public isPlaying: boolean;
-    public _resolveAnimationCurve(curve: any): any;
+	constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
+	public play: (resetOnFinish?: boolean) => AnimationPromise;
+	public cancel: () => void;
+	public isPlaying: boolean;
+	public _resolveAnimationCurve(curve: any): any;
 }
 
 export function _resolveAnimationCurve(curve: any): any;
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index b9eb6047b..74fc92bde 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -1,7 +1,7 @@
 import type { Point, Position } from './view-interfaces';
 import type { GestureTypes, GestureEventData } from '../../gestures';
 import { getNativeScriptGlobals } from '../../../globals/global-utils';
-import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper, statusBarStyleProperty } from './view-common';
+import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper, androidOverflowEdgeProperty, statusBarStyleProperty } from './view-common';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../../styling/style-properties';
 import { Length } from '../../styling/length-shared';
 import { layout } from '../../../utils';
@@ -320,6 +320,121 @@ function getModalOptions(domId: number): DialogOptions {
 	return modalMap.get(domId);
 }
 
+const INSET_LEFT = 0;
+const INSET_TOP = 4;
+const INSET_RIGHT = 8;
+const INSET_BOTTOM = 12;
+const INSET_LEFT_CONSUMED = 16;
+const INSET_TOP_CONSUMED = 20;
+const INSET_RIGHT_CONSUMED = 24;
+const INSET_BOTTOM_CONSUMED = 28;
+
+const OverflowEdgeIgnore = -1;
+const OverflowEdgeNone: number = 0;
+const OverflowEdgeLeft: number = 1 << 1;
+const OverflowEdgeTop: number = 1 << 2;
+const OverflowEdgeRight: number = 1 << 3;
+const OverflowEdgeBottom: number = 1 << 4;
+const OverflowEdgeDontApply: number = 1 << 5;
+const OverflowEdgeLeftDontConsume: number = 1 << 6;
+const OverflowEdgeTopDontConsume: number = 1 << 7;
+const OverflowEdgeRightDontConsume: number = 1 << 8;
+const OverflowEdgeBottomDontConsume: number = 1 << 9;
+const OverflowEdgeAllButLeft: number = 1 << 10;
+const OverflowEdgeAllButTop: number = 1 << 11;
+const OverflowEdgeAllButRight: number = 1 << 12;
+const OverflowEdgeAllButBottom: number = 1 << 13;
+
+class Inset {
+	private view: DataView;
+	private data: ArrayBuffer;
+	constructor(data: java.nio.ByteBuffer) {
+		this.data = (<any>ArrayBuffer).from(data);
+		this.view = new DataView(this.data);
+	}
+
+	public get left(): number {
+		return this.view.getInt32(INSET_LEFT, true);
+	}
+
+	public set left(value: number) {
+		this.view.setInt32(INSET_LEFT, value, true);
+	}
+
+	public get top(): number {
+		return this.view.getInt32(INSET_TOP, true);
+	}
+
+	public set top(value: number) {
+		this.view.setInt32(INSET_TOP, value, true);
+	}
+
+	public get right(): number {
+		return this.view.getInt32(INSET_RIGHT, true);
+	}
+
+	public set right(value: number) {
+		this.view.setInt32(INSET_RIGHT, value, true);
+	}
+
+	public get bottom(): number {
+		return this.view.getInt32(INSET_BOTTOM, true);
+	}
+
+	public set bottom(value: number) {
+		this.view.setInt32(INSET_BOTTOM, value, true);
+	}
+
+	public get leftConsumed(): boolean {
+		return this.view.getInt32(INSET_LEFT_CONSUMED, true) > 0;
+	}
+
+	public set leftConsumed(value: boolean) {
+		this.view.setInt32(INSET_LEFT_CONSUMED, value ? 1 : 0, true);
+	}
+
+	public get topConsumed(): boolean {
+		return this.view.getInt32(INSET_TOP_CONSUMED, true) > 0;
+	}
+
+	public set topConsumed(value: boolean) {
+		this.view.setInt32(INSET_TOP_CONSUMED, value ? 1 : 0, true);
+	}
+
+	public get rightConsumed(): boolean {
+		return this.view.getInt32(INSET_RIGHT_CONSUMED, true) > 0;
+	}
+
+	public set rightConsumed(value: boolean) {
+		this.view.setInt32(INSET_RIGHT_CONSUMED, value ? 1 : 0, true);
+	}
+
+	public get bottomConsumed(): boolean {
+		return this.view.getInt32(INSET_BOTTOM_CONSUMED, true) > 0;
+	}
+
+	public set bottomConsumed(value: boolean) {
+		this.view.setInt32(INSET_BOTTOM_CONSUMED, value ? 1 : 0, true);
+	}
+
+	toString() {
+		return `Inset: left=${this.left}, top=${this.top}, right=${this.right}, bottom=${this.bottom}, ` + `leftConsumed=${this.leftConsumed}, topConsumed=${this.topConsumed}, ` + `rightConsumed=${this.rightConsumed}, bottomConsumed=${this.bottomConsumed}`;
+	}
+
+	toJSON() {
+		return {
+			left: this.left,
+			top: this.top,
+			right: this.right,
+			bottom: this.bottom,
+			leftConsumed: this.leftConsumed,
+			topConsumed: this.topConsumed,
+			rightConsumed: this.rightConsumed,
+			bottomConsumed: this.bottomConsumed,
+		};
+	}
+}
+
 export class View extends ViewCommon {
 	public static androidBackPressedEvent = androidBackPressedEvent;
 
@@ -330,6 +445,8 @@ export class View extends ViewCommon {
 	private layoutChangeListenerIsSet: boolean;
 	private layoutChangeListener: android.view.View.OnLayoutChangeListener;
 	private _rootManager: androidx.fragment.app.FragmentManager;
+	private insetListenerIsSet: boolean;
+	private needsInsetListener: boolean;
 
 	nativeViewProtected: android.view.View;
 
@@ -348,6 +465,12 @@ export class View extends ViewCommon {
 		if (this.isLoaded && !this.layoutChangeListenerIsSet && isLayoutEvent) {
 			this.setOnLayoutChangeListener();
 		}
+
+		const isInsetEvent = typeof eventNames === 'string' ? eventNames.indexOf(ViewCommon.androidOverflowInsetEvent) !== -1 : false;
+		// only avaiable on LayoutBase
+		if (!this.insetListenerIsSet && isInsetEvent) {
+			this.setInsetListener();
+		}
 	}
 
 	removeEventListener(eventNames: string, callback?: (data: EventData) => void, thisArg?: any) {
@@ -359,6 +482,43 @@ export class View extends ViewCommon {
 			this.nativeViewProtected.removeOnLayoutChangeListener(this.layoutChangeListener);
 			this.layoutChangeListenerIsSet = false;
 		}
+
+		const isInsetEvent = typeof eventNames === 'string' ? eventNames.indexOf(ViewCommon.androidOverflowInsetEvent) !== -1 : false;
+
+		if (this.insetListenerIsSet && isInsetEvent && this.nativeViewProtected && (this.nativeViewProtected as any).setInsetListener) {
+			(this.nativeViewProtected as any).setInsetListener(null);
+			this.insetListenerIsSet = false;
+		}
+	}
+
+	private setInsetListener() {
+		if (this.nativeViewProtected) {
+			if ((this.nativeViewProtected as any).setInsetListener) {
+				const ref = new WeakRef(this);
+				(this.nativeViewProtected as any).setInsetListener(
+					new org.nativescript.widgets.LayoutBase.WindowInsetListener({
+						onApplyWindowInsets(param0) {
+							const owner = ref.get();
+							if (!owner) {
+								return;
+							}
+
+							const inset = new Inset(param0);
+							const args = {
+								eventName: ViewCommon.androidOverflowInsetEvent,
+								object: this,
+								inset,
+							};
+							owner.notify(args);
+						},
+					}),
+				);
+				this.insetListenerIsSet = true;
+			}
+			this.needsInsetListener = false;
+		} else {
+			this.needsInsetListener = true;
+		}
 	}
 
 	public _getChildFragmentManager(): androidx.fragment.app.FragmentManager {
@@ -419,6 +579,35 @@ export class View extends ViewCommon {
 		return manager;
 	}
 
+	[androidOverflowEdgeProperty.setNative](value: CoreTypes.AndroidOverflow) {
+		const nativeView = this.nativeViewProtected as any;
+		if (typeof value !== 'string' || nativeView === null || nativeView == undefined) {
+			return;
+		}
+
+		if (!('setOverflowEdge' in nativeView)) {
+			return;
+		}
+
+		switch (value) {
+			case 'none':
+				nativeView.setOverflowEdge(OverflowEdgeNone);
+				break;
+			case 'ignore':
+				nativeView.setOverflowEdge(OverflowEdgeIgnore);
+				break;
+			default:
+				{
+					const edge = parseEdges(value);
+
+					if (edge != null) {
+						nativeView.setOverflowEdge(edge);
+					}
+				}
+				break;
+		}
+	}
+
 	@profile
 	public onLoaded() {
 		this._manager = null;
@@ -468,6 +657,10 @@ export class View extends ViewCommon {
 		if (this.needsOnLayoutChangeListener()) {
 			this.setOnLayoutChangeListener();
 		}
+
+		if (!this.insetListenerIsSet && this.needsInsetListener) {
+			this.setInsetListener();
+		}
 	}
 
 	public needsOnLayoutChangeListener() {
@@ -1356,8 +1549,43 @@ export class View extends ViewCommon {
 	}
 }
 
+const edgeMap: Record<string, number> = {
+	none: OverflowEdgeNone,
+	left: OverflowEdgeLeft,
+	top: OverflowEdgeTop,
+	right: OverflowEdgeRight,
+	bottom: OverflowEdgeBottom,
+	'dont-apply': OverflowEdgeDontApply,
+	'left-dont-consume': OverflowEdgeLeftDontConsume,
+	'top-dont-consume': OverflowEdgeTopDontConsume,
+	'right-dont-consume': OverflowEdgeRightDontConsume,
+	'bottom-dont-consume': OverflowEdgeBottomDontConsume,
+	'all-but-left': OverflowEdgeAllButLeft,
+	'all-but-top': OverflowEdgeAllButTop,
+	'all-but-right': OverflowEdgeAllButRight,
+	'all-but-bottom': OverflowEdgeAllButBottom,
+};
+
+function parseEdges(edges: string): number | null {
+	let result = 0;
+	const values = edges.split(',');
+	for (const raw of values) {
+		const value = edgeMap[raw.trim()];
+		if (value === undefined) continue;
+		// dont-apply overrides everything else
+		if (value === OverflowEdgeDontApply) return value;
+		result |= value;
+	}
+	return result === 0 ? null : result;
+}
+
 export class ContainerView extends View {
 	public iosOverflowSafeArea: boolean;
+
+	constructor() {
+		super();
+		this.androidOverflowEdge = 'none';
+	}
 }
 
 export class CustomLayoutView extends ContainerView {
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
index 3eba41492..fc87bd184 100644
--- a/packages/core/ui/core/view/index.d.ts
+++ b/packages/core/ui/core/view/index.d.ts
@@ -92,6 +92,13 @@ export abstract class View extends ViewCommon {
 	 */
 	public static accessibilityFocusChangedEvent: string;
 
+	/**
+	 * String value used when hooking to androidOverflowInset event.
+	 *
+	 * @nsEvent {EventDataValue} androidOverflowInset
+	 */
+	public static androidOverflowInsetEvent: string;
+
 	/**
 	 * Gets the android-specific native instance that lies behind this proxy. Will be available if running on an Android platform.
 	 */
@@ -802,6 +809,11 @@ export abstract class View extends ViewCommon {
 	 */
 	on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any);
 
+	/**
+	 * Raised after the view is shown as a modal dialog.
+	 */
+	on(event: 'androidOverflowInset', callback: (args: ShownModallyData) => void, thisArg?: any);
+
 	/**
 	 * Returns the current modal view that this page is showing (is parent of), if any.
 	 */
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
index e95e267de..b1deee197 100644
--- a/packages/core/ui/core/view/view-common.ts
+++ b/packages/core/ui/core/view/view-common.ts
@@ -80,6 +80,7 @@ export abstract class ViewCommon extends ViewBase {
 	public static accessibilityFocusEvent = accessibilityFocusEvent;
 	public static accessibilityFocusChangedEvent = accessibilityFocusChangedEvent;
 	public static accessibilityPerformEscapeEvent = accessibilityPerformEscapeEvent;
+	public static androidOverflowInsetEvent = 'androidOverflowInset';
 
 	public accessibilityIdentifier: string;
 	public accessibilityLabel: string;
@@ -994,6 +995,7 @@ export abstract class ViewCommon extends ViewBase {
 	public iosOverflowSafeArea: boolean;
 	public iosOverflowSafeAreaEnabled: boolean;
 	public iosIgnoreSafeArea: boolean;
+	public androidOverflowEdge: CoreTypes.AndroidOverflow;
 
 	get isLayoutValid(): boolean {
 		return this._isLayoutValid;
@@ -1344,6 +1346,12 @@ export const iosIgnoreSafeAreaProperty = new InheritedProperty({
 });
 iosIgnoreSafeAreaProperty.register(ViewCommon);
 
+export const androidOverflowEdgeProperty = new Property<ViewCommon, CoreTypes.AndroidOverflow>({
+	name: 'androidOverflowEdge',
+	defaultValue: 'ignore',
+});
+androidOverflowEdgeProperty.register(ViewCommon);
+
 /**
  * Glass effects
  */
diff --git a/packages/core/ui/core/view/view-interfaces.ts b/packages/core/ui/core/view/view-interfaces.ts
index 1e471f1a9..994ca3410 100644
--- a/packages/core/ui/core/view/view-interfaces.ts
+++ b/packages/core/ui/core/view/view-interfaces.ts
@@ -59,3 +59,27 @@ export interface Size {
 	 */
 	height: number;
 }
+
+/**
+ * Defines the inset values for AndroidOverflowInsetData.
+ */
+export interface Inset {
+	top: number;
+	right: number;
+	bottom: number;
+	left: number;
+	topConsumed: boolean;
+	rightConsumed: boolean;
+	bottomConsumed: boolean;
+	leftConsumed: boolean;
+}
+
+/**
+ * Defines the data for the androidOverflowInset event.
+ */
+export interface AndroidOverflowInsetData extends EventData {
+	/**
+	 * The inset values passed to the view to consume or update.
+	 */
+	inset?: Inset;
+}
diff --git a/packages/core/ui/frame/activity.android.ts b/packages/core/ui/frame/activity.android.ts
index ef6c2360c..398be2844 100644
--- a/packages/core/ui/frame/activity.android.ts
+++ b/packages/core/ui/frame/activity.android.ts
@@ -2,7 +2,7 @@ import '../../globals';
 import { setActivityCallbacks } from '.';
 import { Application } from '../../application';
 import { isEmbedded } from '../embedding';
-
+import { enableEdgeToEdge } from '../../utils/native-helper-for-android';
 const EMPTY_FN = () => {};
 declare const com: any;
 
@@ -22,6 +22,7 @@ if (!isEmbedded()) {
 			// Set isNativeScriptActivity in onCreate.
 			// The JS constructor might not be called because the activity is created from Android.
 			this.isNativeScriptActivity = true;
+			enableEdgeToEdge(this);
 			if (!this._callbacks) {
 				setActivityCallbacks(this);
 			}
@@ -78,6 +79,7 @@ if (!isEmbedded()) {
 			// Set isNativeScriptActivity in onCreate.
 			// The JS constructor might not be called because the activity is created from Android.
 			activity.isNativeScriptActivity = true;
+			enableEdgeToEdge(this);
 			if (!activity._callbacks) {
 				setActivityCallbacks(activity);
 			}
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index 0d86871ea..a8838b7e8 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -74,6 +74,8 @@ export class Frame extends FrameBase {
 	private _containerViewId = -1;
 	private _tearDownPending = false;
 	private _attachedToWindow = false;
+	_defaultOverflowEdge: number;
+	_defaultOverflowEdgeValue: string;
 	/**
 	 * This property indicates that the view is to be reused as a root view or has been previously disposed.
 	 */
@@ -84,6 +86,7 @@ export class Frame extends FrameBase {
 	constructor() {
 		super();
 		this._android = new AndroidFrame(this);
+		this.androidOverflowEdge = 'ignore';
 	}
 
 	public static reloadPage(context?: ModuleContext): void {
diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts
index 08eb12f97..d64ccaa44 100644
--- a/packages/core/ui/index.ts
+++ b/packages/core/ui/index.ts
@@ -17,7 +17,7 @@ export { ViewBase, eachDescendant, getAncestor, getViewById, booleanConverter, q
 export type { ShowModalOptions } from './core/view-base';
 export { View, CSSType, ContainerView, ViewHelper, AndroidHelper, IOSHelper, isUserInteractionEnabledProperty, PseudoClassHandler, CustomLayoutView } from './core/view';
 export type { Template, KeyedTemplate, AddArrayFromBuilder, AddChildFromBuilder, GlassEffectConfig, GlassEffectType, GlassEffectVariant } from './core/view';
-export type { ShownModallyData, Size } from './core/view/view-interfaces';
+export type { ShownModallyData, Size, AndroidOverflowInsetData } from './core/view/view-interfaces';
 export { Property, CoercibleProperty, InheritedProperty, CssProperty, InheritedCssProperty, ShorthandProperty, CssAnimationProperty, makeParser, makeValidator } from './core/properties';
 export { unsetValue } from './core/properties/property-shared';
 export { addWeakEventListener, removeWeakEventListener } from './core/weak-event-listener';
diff --git a/packages/core/utils/native-helper-for-android.ts b/packages/core/utils/native-helper-for-android.ts
index cd0bf59a5..beac14f54 100644
--- a/packages/core/utils/native-helper-for-android.ts
+++ b/packages/core/utils/native-helper-for-android.ts
@@ -1,3 +1,4 @@
+import { Color } from '../color';
 import { numberHasDecimals, numberIs64Bit } from './types';
 import { getNativeApp } from '../application/helpers-common';
 import { androidGetCurrentActivity } from '../application/helpers';
@@ -294,3 +295,133 @@ export function isRealDevice(): boolean {
 
 	return fingerprint != null && (fingerprint.indexOf('vbox') > -1 || fingerprint.indexOf('generic') > -1);
 }
+
+const DefaultLightScrim = new Color(0xe6, 0xff, 0xff, 0xff);
+const DefaultDarkScrim = new Color(0x80, 0x1b, 0x1b, 0x1b);
+const DefaultStatusBarLight = new Color(0);
+const DefaultStatusBarDark = new Color(0);
+
+interface ISystemColor {
+	navigationBarLight: Color;
+	navigationBarDark: Color;
+	statusBarLight: Color;
+	statusBarDark: Color;
+	handler?: (bar: 'status' | 'navigation', resources: android.content.res.Resources) => boolean;
+}
+const systemColors = new WeakMap<androidx.appcompat.app.AppCompatActivity, ISystemColor>();
+
+function setEnableEdgeToEdge(activity: androidx.appcompat.app.AppCompatActivity, existingColors: ISystemColor) {
+	enableEdgeToEdge(activity, {
+		statusBarLightColor: existingColors.statusBarLight,
+		statusBarDarkColor: existingColors.statusBarDark,
+		navigationBarLightColor: existingColors.navigationBarLight,
+		navigationBarDarkColor: existingColors.navigationBarDark,
+		handleDarkMode: existingColors?.handler ?? null,
+	});
+}
+
+export function setStatusBarColor(options?: { activity?: androidx.appcompat.app.AppCompatActivity; lightColor?: Color; darkColor?: Color }): void {
+	const statusBarLightColor = options?.lightColor ?? null;
+	const statusBarDarkColor = options?.darkColor ?? null;
+	const activity = options?.activity ?? getCurrentActivity();
+
+	if (activity) {
+		const existingColors = systemColors.get(activity) ?? {
+			navigationBarLight: DefaultLightScrim,
+			navigationBarDark: DefaultDarkScrim,
+			statusBarLight: DefaultStatusBarLight,
+			statusBarDark: DefaultStatusBarDark,
+		};
+		existingColors.statusBarLight ??= statusBarLightColor;
+		existingColors.statusBarDark ??= statusBarDarkColor;
+		systemColors.set(getCurrentActivity(), existingColors);
+
+		setEnableEdgeToEdge(activity, existingColors);
+	}
+}
+
+export function setNavigationBarColor(options?: { activity?: androidx.appcompat.app.AppCompatActivity; lightColor?: Color; darkColor?: Color }): void {
+	const navigationBarLightColor = options?.lightColor ?? null;
+	const navigationBarDarkColor = options?.darkColor ?? null;
+	const activity = options?.activity ?? getCurrentActivity();
+	if (activity) {
+		const existingColors = systemColors.get(activity) ?? {
+			navigationBarLight: DefaultLightScrim,
+			navigationBarDark: DefaultDarkScrim,
+			statusBarLight: DefaultStatusBarLight,
+			statusBarDark: DefaultStatusBarDark,
+		};
+		existingColors.navigationBarLight ??= navigationBarLightColor;
+		existingColors.navigationBarDark ??= navigationBarDarkColor;
+		systemColors.set(getCurrentActivity(), existingColors);
+
+		setEnableEdgeToEdge(activity, existingColors);
+	}
+}
+
+export function setDarkModeHandler(options?: { activity?: androidx.appcompat.app.AppCompatActivity; handler: (bar: 'status' | 'navigation', resources: android.content.res.Resources) => boolean }): void {
+	const darkModeHandler = options?.handler ?? null;
+	const activity = options?.activity ?? getCurrentActivity();
+	if (activity) {
+		const existingColors = systemColors.get(activity) ?? {
+			navigationBarLight: DefaultLightScrim,
+			navigationBarDark: DefaultDarkScrim,
+			statusBarLight: DefaultStatusBarLight,
+			statusBarDark: DefaultStatusBarDark,
+		};
+
+		existingColors.handler ??= darkModeHandler;
+
+		systemColors.set(getCurrentActivity(), existingColors);
+
+		setEnableEdgeToEdge(activity, existingColors);
+	}
+}
+
+export function enableEdgeToEdge(
+	activity: androidx.appcompat.app.AppCompatActivity,
+	options?: {
+		statusBarLightColor?: Color;
+		statusBarDarkColor?: Color;
+		navigationBarLightColor?: Color;
+		navigationBarDarkColor?: Color;
+		handleDarkMode?: (bar: 'status' | 'navigation', resources: android.content.res.Resources) => boolean;
+	},
+): void {
+	let handleDarkMode: org.nativescript.widgets.Utils.HandleDarkMode;
+	let statusBarLight: number = 0;
+	let statusBarDark: number = 0;
+	let navigationBarLight: number = DefaultLightScrim.android;
+	let navigationBarDark: number = DefaultDarkScrim.android;
+	if (options) {
+		if (typeof options.handleDarkMode === 'function') {
+			handleDarkMode = new org.nativescript.widgets.Utils.HandleDarkMode({
+				onHandle(bar, resources) {
+					if (bar === 0) {
+						return options.handleDarkMode('status', resources);
+					} else {
+						return options.handleDarkMode('navigation', resources);
+					}
+				},
+			});
+		}
+		if (options.statusBarLightColor instanceof Color) {
+			statusBarLight = options.statusBarLightColor.android;
+		}
+		if (options.statusBarDarkColor instanceof Color) {
+			statusBarDark = options.statusBarDarkColor.android;
+		}
+		if (options.navigationBarLightColor instanceof Color) {
+			navigationBarLight = options.navigationBarLightColor.android;
+		}
+		if (options.navigationBarDarkColor instanceof Color) {
+			navigationBarDark = options.navigationBarDarkColor.android;
+		}
+	}
+
+	if (handleDarkMode) {
+		org.nativescript.widgets.Utils.enableEdgeToEdge(activity, java.lang.Integer.valueOf(statusBarLight), java.lang.Integer.valueOf(statusBarDark), java.lang.Integer.valueOf(navigationBarLight), java.lang.Integer.valueOf(navigationBarDark), handleDarkMode);
+	} else {
+		org.nativescript.widgets.Utils.enableEdgeToEdge(activity, java.lang.Integer.valueOf(statusBarLight), java.lang.Integer.valueOf(statusBarDark), java.lang.Integer.valueOf(navigationBarLight), java.lang.Integer.valueOf(navigationBarDark));
+	}
+}
diff --git a/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts b/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
index 9e3fa800f..3603d9e98 100644
--- a/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
+++ b/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
@@ -246,9 +246,37 @@
             }
 
             export class LayoutBase extends android.view.ViewGroup {
+                public static OverflowEdgeNone: number;
+                public static OverflowEdgeLeft: number;
+                public static OverflowEdgeTop: number;
+                public static OverflowEdgeRight: number;
+                public static OverflowEdgeBottom: number;
+                public static OverflowEdgeDontApply: number;
+                public static OverflowEdgeLeftDontConsume: number;
+                public static OverflowEdgeTopDontConsume: number;
+                public static OverflowEdgeRightDontConsume: number;
+                public static OverflowEdgeBottomDontConsume: number;
+                public static OverflowEdgeAllButLeft: number;
+                public static OverflowEdgeAllButTop: number;
+                public static OverflowEdgeAllButRight: number;
+                public static OverflowEdgeAllButBottom: number;
                 constructor(context: android.content.Context);
+                public getOverflowEdge(): number;
+                public setOverflowEdge(value: number): void;
             }
 
+            export module LayoutBase {
+                	export class WindowInsetListener {
+					public constructor(implementation: {
+						onApplyWindowInsets(param0: java.nio.ByteBuffer): void;
+					});
+					public constructor();
+					public onApplyWindowInsets(param0: java.nio.ByteBuffer): void;
+				}
+            }
+
+            
+
             export class AbsoluteLayout extends LayoutBase {
                 constructor(context: android.content.Context);
             }
@@ -731,6 +759,10 @@ declare module org {
                 public static saveToFileAsync(param0: globalAndroid.graphics.Bitmap, param1: string, param2: string, param3: number, param4: org.nativescript.widgets.Utils.AsyncImageCallback): void;
                 public static toBase64StringAsync(param0: globalAndroid.graphics.Bitmap, param1: string, param2: number, param3: org.nativescript.widgets.Utils.AsyncImageCallback): void;
                 public static resizeAsync(param0: globalAndroid.graphics.Bitmap, param1: number, param2: string, param3: org.nativescript.widgets.Utils.AsyncImageCallback): void;
+                public static enableEdgeToEdge(activity: androidx.activity.ComponentActivity): void;
+                public static enableEdgeToEdge(activity: androidx.activity.ComponentActivity, handleDarkMode: org.nativescript.widgets.Utils.HandleDarkMode): void;
+                public static enableEdgeToEdge(activity: androidx.activity.ComponentActivity, statusBarLight: java.lang.Integer, statusBarDark: java.lang.Integer, navigationBarLight: java.lang.Integer, navigationBarDark: java.lang.Integer): void;
+				public static enableEdgeToEdge(activity: androidx.activity.ComponentActivity, statusBarLight: java.lang.Integer, statusBarDark: java.lang.Integer, navigationBarLight: java.lang.Integer, navigationBarDark: java.lang.Integer, handleDarkMode: org.nativescript.widgets.Utils.HandleDarkMode): void;
 				public constructor();
 			}
 			export module Utils {
@@ -747,6 +779,25 @@ declare module org {
 					public onSuccess(param0: any): void;
 					public onError(param0: java.lang.Exception): void;
 				}
+                export class HandleDarkMode {
+                    public static class: java.lang.Class<org.nativescript.widgets.Utils.HandleDarkMode>;
+                    /**
+                     * Constructs a new instance of the org.nativescript.widgets.Utils$HandleDarkMode interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+                     */
+                    public constructor(implementation: {
+                        onHandle(param0: number, param1: globalAndroid.content.res.Resources): boolean;
+                    });
+                    public constructor();
+                    public onHandle(param0: number, param1: globalAndroid.content.res.Resources): boolean;
+                }
+                export class HandleDarkModeBar {
+					public static class: java.lang.Class<org.nativescript.widgets.Utils.HandleDarkModeBar>;
+					public static status: org.nativescript.widgets.Utils.HandleDarkModeBar;
+					public static navigation: org.nativescript.widgets.Utils.HandleDarkModeBar;
+					public static valueOf(name: string): org.nativescript.widgets.Utils.HandleDarkModeBar;
+					public static values(): androidNative.Array<org.nativescript.widgets.Utils.HandleDarkModeBar>;
+					public getValue(): number;
+				}
 				export class ImageAssetOptions {
 					public static class: java.lang.Class<org.nativescript.widgets.Utils.ImageAssetOptions>;
 				}
diff --git a/packages/ui-mobile-base/android/build.gradle b/packages/ui-mobile-base/android/build.gradle
index 3cb150366..6051f05df 100644
--- a/packages/ui-mobile-base/android/build.gradle
+++ b/packages/ui-mobile-base/android/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        // Updated for Java 21 compatibility via Gradle 8.4
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.11.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.jar b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.jar
index 0d4a95168..d64cd4917 100644
Binary files a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.jar and b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
index e411586a5..bb63a325f 100644
--- a/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,8 @@
+#Fri Jul 25 11:31:30 AST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/ui-mobile-base/android/gradlew b/packages/ui-mobile-base/android/gradlew
index cccdd3d51..1aa94a426 100755
--- a/packages/ui-mobile-base/android/gradlew
+++ b/packages/ui-mobile-base/android/gradlew
@@ -1,78 +1,127 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/packages/ui-mobile-base/android/gradlew.bat b/packages/ui-mobile-base/android/gradlew.bat
index e95643d6a..6689b85be 100644
--- a/packages/ui-mobile-base/android/gradlew.bat
+++ b/packages/ui-mobile-base/android/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,23 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/packages/ui-mobile-base/android/settings.gradle b/packages/ui-mobile-base/android/settings.gradle
index 09ee5ce4c..05d616254 100644
--- a/packages/ui-mobile-base/android/settings.gradle
+++ b/packages/ui-mobile-base/android/settings.gradle
@@ -1 +1,2 @@
 include ':widgets'
+include ':widgetdemo'
diff --git a/packages/ui-mobile-base/android/widgetdemo/.gitignore b/packages/ui-mobile-base/android/widgetdemo/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/packages/ui-mobile-base/android/widgetdemo/build.gradle.kts b/packages/ui-mobile-base/android/widgetdemo/build.gradle.kts
new file mode 100644
index 000000000..06caf9631
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/build.gradle.kts
@@ -0,0 +1,49 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "org.nativescript.widgetsdemo"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "org.nativescript.widgetsdemo"
+        minSdk = 21
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+
+    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.activity:activity:1.10.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
+	implementation(project(":widgets"))
+	testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+}
diff --git a/packages/ui-mobile-base/android/widgetdemo/proguard-rules.pro b/packages/ui-mobile-base/android/widgetdemo/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/androidTest/java/org/nativescript/widgetsdemo/ExampleInstrumentedTest.kt b/packages/ui-mobile-base/android/widgetdemo/src/androidTest/java/org/nativescript/widgetsdemo/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..c9a50b1d6
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/androidTest/java/org/nativescript/widgetsdemo/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package org.nativescript.widgetsdemo
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("org.nativescript.widgetsdemo", appContext.packageName)
+    }
+}
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/AndroidManifest.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..dfca784f0
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Android">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/java/org/nativescript/widgetsdemo/MainActivity.kt b/packages/ui-mobile-base/android/widgetdemo/src/main/java/org/nativescript/widgetsdemo/MainActivity.kt
new file mode 100644
index 000000000..b39922196
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/java/org/nativescript/widgetsdemo/MainActivity.kt
@@ -0,0 +1,136 @@
+package org.nativescript.widgetsdemo
+
+import android.graphics.Color
+import android.os.Bundle
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.NestedScrollView
+import org.nativescript.widgets.CommonLayoutParams
+import org.nativescript.widgets.ContentLayout
+import org.nativescript.widgets.GridLayout
+import org.nativescript.widgets.LayoutBase
+import org.nativescript.widgets.StackLayout
+import org.nativescript.widgets.Utils
+
+class MainActivity : AppCompatActivity() {
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+
+		Utils.enableEdgeToEdge(this)
+		val frame = ContentLayout(this)
+		val page = GridLayout(this)
+		page.layoutParams = CommonLayoutParams(
+			ViewGroup.LayoutParams(
+				ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.MATCH_PARENT
+			)
+		)
+		page.setBackgroundColor(Color.MAGENTA)
+		page.overflowEdge = LayoutBase.OverflowEdgeAllButTop
+//		page.setInsetListener {
+//			val insets = it.asIntBuffer()
+//			insets.put(0,0)
+//			insets.put(1,0)
+//			insets.put(2,0)
+//			insets.put(3,0)
+////			insets.put(3,0)
+////			insets.put(5,1)
+//		}
+
+		frame.setBackgroundColor(Color.BLUE)
+		frame.overflowEdge = LayoutBase.OverflowEdgeDontApply
+		frame.layoutParams = CommonLayoutParams(
+			ViewGroup.LayoutParams(
+				ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.MATCH_PARENT
+			)
+		)
+
+		val svp = StackLayout(this)
+//		svp.setBackgroundColor(Color.YELLOW)
+		svp.layoutParams = CommonLayoutParams(
+			ViewGroup.LayoutParams(
+				ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.MATCH_PARENT
+			)
+		)
+//		svp.setInsetListener {
+//			val insets = it.asIntBuffer()
+//			insets.put(0,0)
+//			insets.put(1,0)
+//			insets.put(2,0)
+//			insets.put(3,0)
+//			// insets.put(7, 1)
+//		}
+
+		svp.overflowEdge = StackLayout.OverflowEdgeAllButBottom
+		val scrollView = NestedScrollView(this)
+		scrollView.layoutParams = CommonLayoutParams(
+			ViewGroup.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.MATCH_PARENT
+			)
+		)
+		svp.addView(scrollView)
+
+		val container = StackLayout(this)
+		container.setBackgroundColor(Color.RED)
+		container.overflowEdge = StackLayout.OverflowEdgeNone
+
+		val text = TextView(this)
+		text.text = getString(R.string.ipsum)
+		text.textSize = 40f
+		text.setTextColor(Color.WHITE)
+		container.addView(text)
+		scrollView.addView(container)
+		page.addView(svp)
+		val btn = Button(this)
+		btn.text = "Toggle Overflow"
+		val params = CommonLayoutParams(
+			ViewGroup.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT
+			)
+		)
+		params.width = 300
+		params.height = 300
+		params.width
+		btn.layoutParams = params
+		btn.setOnClickListener {
+			val new_page = StackLayout(this)
+			new_page.setBackgroundColor(Color.BLUE)
+			new_page.layoutParams = CommonLayoutParams(
+				ViewGroup.LayoutParams(
+					300, 300
+				)
+			)
+			container.addView(new_page)
+
+
+			svp.overflowEdge = when (svp.overflowEdge) {
+				LayoutBase.OverflowEdgeNone -> {
+					LayoutBase.OverflowEdgeDontApply
+				}
+
+				LayoutBase.OverflowEdgeDontApply -> {
+					LayoutBase.OverflowEdgeTop
+				}
+
+				LayoutBase.OverflowEdgeTop -> {
+					LayoutBase.OverflowEdgeBottom
+				}
+
+				LayoutBase.OverflowEdgeBottom -> {
+					LayoutBase.OverflowEdgeTop.and(LayoutBase.OverflowEdgeBottom)
+				}
+
+				else -> LayoutBase.OverflowEdgeDontApply
+			}
+		}
+		page.addView(btn)
+		frame.addView(page)
+		setContentView(frame)
+	}
+}
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable-v24/ic_launcher_foreground.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..7706ab9e6
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable/ic_launcher_background.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/layout/activity_main.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..24d17df2c
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/layout/activity_main.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..c209e78ec
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..b2dfe3d1b
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f0f1d64e
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..62b611da0
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..948a3070f
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..1b9a6956b
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..28d4b77f9
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9287f5083
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..aa7d6427e
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9126ae37c
Binary files /dev/null and b/packages/ui-mobile-base/android/widgetdemo/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/values-night/themes.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..b622f26c0
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values-night/themes.xml
@@ -0,0 +1,7 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Base.Theme.Android" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your dark theme here. -->
+        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+    </style>
+</resources>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/colors.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/colors.xml
new file mode 100644
index 000000000..768b058a6
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/strings.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/strings.xml
new file mode 100644
index 000000000..7917a8704
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/strings.xml
@@ -0,0 +1,9 @@
+<resources>
+	<string name="app_name">WidgetDemo</string>
+	<string name="ipsum">
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur euismod dictum purus, non tempor tortor fermentum vehicula. Donec condimentum eleifend lacus, non varius dui feugiat quis. Integer tincidunt, erat nec lacinia maximus, ante tortor placerat arcu, eu dignissim mauris ipsum et diam. Proin sed magna dui. Donec consequat volutpat mi, sed facilisis quam sollicitudin ac. Nullam pulvinar nunc nec diam molestie, sit amet semper lectus efficitur. Aenean ut lacus arcu. Donec non tempor risus.
+
+Pellentesque blandit congue mattis. Proin eget nibh id nisl pellentesque elementum. Vestibulum neque arcu, luctus vitae pretium sed, venenatis quis odio. Quisque varius ligula id quam ullamcorper, ut gravida magna aliquam. Proin sit amet nibh tempus, aliquam justo ut, accumsan nibh. Curabitur non neque dui. Phasellus ac semper nunc. Aenean placerat lacinia suscipit. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+</string>
+</resources>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/themes.xml b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/themes.xml
new file mode 100644
index 000000000..d1dae57aa
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/main/res/values/themes.xml
@@ -0,0 +1,9 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Base.Theme.Android" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+    </style>
+
+    <style name="Theme.Android" parent="Base.Theme.Android" />
+</resources>
diff --git a/packages/ui-mobile-base/android/widgetdemo/src/test/java/org/nativescript/widgetsdemo/ExampleUnitTest.kt b/packages/ui-mobile-base/android/widgetdemo/src/test/java/org/nativescript/widgetsdemo/ExampleUnitTest.kt
new file mode 100644
index 000000000..6874110e0
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgetdemo/src/test/java/org/nativescript/widgetsdemo/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package org.nativescript.widgetsdemo
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/packages/ui-mobile-base/android/widgets/build.gradle b/packages/ui-mobile-base/android/widgets/build.gradle
index 1208c04a1..b4f7d52ea 100644
--- a/packages/ui-mobile-base/android/widgets/build.gradle
+++ b/packages/ui-mobile-base/android/widgets/build.gradle
@@ -1,114 +1,123 @@
-import groovy.json.JsonSlurper // used to parse package.json
-import groovy.json.JsonBuilder
-import groovy.json.JsonOutput
+// used to parse package.json
 
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 
 apply plugin: 'com.android.library'
 
-def computeCompileSdkValue () {
-    if(project.hasProperty("compileSdk")) {
-        return compileSdk
-    }
-    else {
-        return 31
-    }
+def computeCompileSdkVersion() {
+	if (project.hasProperty("compileSdk")) {
+		return compileSdk
+	} else {
+		return 35
+	}
+}
+
+def computeBuildToolsVersion() {
+	if (project.hasProperty("buildToolsVersion")) {
+		return buildToolsVersion
+	} else {
+		return "35.0.0"
+	}
 }
 
 def computeTargetSdkVersion() {
-    if(project.hasProperty("targetSdk")) {
-        return targetSdk
-    }
-    else {
-        return 30
-    }
+	if (project.hasProperty("targetSdk")) {
+		return targetSdk
+	} else {
+		return 35
+	}
 }
 
 android {
-    // AGP 8 DSL: use 'compileSdk' and specify namespace
-    compileSdk computeCompileSdkValue()
-    namespace "org.nativescript.widgets"
+	namespace "org.nativescript.widgets"
+	compileSdkVersion computeCompileSdkVersion()
+	buildToolsVersion computeBuildToolsVersion()
 
-    defaultConfig {
-        minSdk 17
-        targetSdk computeTargetSdkVersion()
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
+	defaultConfig {
+		minSdkVersion 21
+		targetSdkVersion computeTargetSdkVersion()
+	}
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+		}
+	}
 }
 
 dependencies {
-    def androidXViewPagerVersion = "1.0.0"
-    if (project.hasProperty("androidXViewPager")) {
-        androidXViewPagerVersion = androidXViewPager
-        println "\t + using android X library androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
-    }
+	def androidXViewPagerVersion = "1.1.0"
+	if (project.hasProperty("androidXViewPager")) {
+		androidXViewPagerVersion = androidXViewPager
+		println "\t + using android X library androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
+	}
 
-    def androidXFragmentVersion = "1.4.1"
-    if (project.hasProperty("androidXFragment")) {
-        androidXFragmentVersion = androidXFragment
-        outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.fragment:fragment:$androidXFragmentVersion"
-    }
+	def androidXFragmentVersion = "1.8.8"
+	if (project.hasProperty("androidXFragment")) {
+		androidXFragmentVersion = androidXFragment
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.fragment:fragment:$androidXFragmentVersion"
+	}
 
-    def androidXTransitionVersion = "1.4.1"
-    if (project.hasProperty("androidXTransition")) {
-        androidXTransitionVersion = androidXTransition
-        outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.transition:transition:$androidXTransitionVersion"
-    }
+	def androidXTransitionVersion = "1.6.0"
+	if (project.hasProperty("androidXTransition")) {
+		androidXTransitionVersion = androidXTransition
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.transition:transition:$androidXTransitionVersion"
+	}
 
-    def androidXExifInterfaceVersion = "1.3.3"
-    if (project.hasProperty("androidXExifInterface")) {
-        androidXExifInterfaceVersion = androidXExifInterface
-        outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
-    }
-
-
-    def androidXAppCompatVersion = "1.4.1"
-    if (project.hasProperty("androidXAppCompat")) {
-        androidXAppCompatVersion = androidXAppCompat
-        outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.appcompat:appcompat:$androidXAppCompatVersion"
-    }
-
-		def androidXDocumentFileVersion = "1.0.1"
-		if (project.hasProperty("androidXDocumentFile")) {
-			androidXDocumentFileVersion = androidXDocumentFile
-		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+	def androidXExifInterfaceVersion = "1.4.1"
+	if (project.hasProperty("androidXExifInterface")) {
+		androidXExifInterfaceVersion = androidXExifInterface
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
 	}
 
 
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+	def androidXAppCompatVersion = "1.7.1"
+	if (project.hasProperty("androidXAppCompat")) {
+		androidXAppCompatVersion = androidXAppCompat
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.appcompat:appcompat:$androidXAppCompatVersion"
+	}
 
-    println 'Using android X'
-    // implementation 'androidx.viewpager:viewpager:' + androidxVersion
-    implementation "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
-    implementation "androidx.fragment:fragment:$androidXFragmentVersion"
-    implementation "androidx.transition:transition:$androidXTransitionVersion"
-    implementation "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
-    implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
-		implementation "androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+	def androidXDocumentFileVersion = "1.1.0"
+	if (project.hasProperty("androidXDocumentFile")) {
+		androidXDocumentFileVersion = androidXDocumentFile
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+	}
+
+	def androidXActivityVersion = "1.10.1"
+	if (project.hasProperty("androidXActivity")) {
+		androidXActivityVersion = androidXActivity
+		outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.activity:activity:$androidXActivityVersion"
+	}
+
+
+	implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+	println 'Using android X'
+	// implementation 'androidx.viewpager:viewpager:' + androidxVersion
+	implementation "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
+	implementation "androidx.fragment:fragment:$androidXFragmentVersion"
+	implementation "androidx.transition:transition:$androidXTransitionVersion"
+	implementation "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
+	implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
+	implementation "androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+	implementation "androidx.activity:activity:$androidXActivityVersion"
 }
 
-task cleanBuildDir (type: Delete) {
-    delete "../build/"
+tasks.register('cleanBuildDir', Delete) {
+	delete "../build/"
 }
 
-task copyAar {
-    doLast {
-        copy {
-            from "build/outputs/aar/widgets-release.aar"
-            into "../build/"
-        }
-    }
+tasks.register('copyAar') {
+	doLast {
+		copy {
+			from "build/outputs/aar/widgets-release.aar"
+			into "../build/"
+		}
+	}
 }
 
-tasks.withType(JavaCompile) {
-    options.deprecation = true
+tasks.withType(JavaCompile).configureEach {
+	options.deprecation = true
 }
 
 assemble.dependsOn(cleanBuildDir)
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
index f0571cdf0..16a23457a 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
@@ -1,11 +1,11 @@
 package org.nativescript.widgets;
 
 import android.content.Context;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.MeasureSpec;
-import android.util.AttributeSet;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -29,18 +29,22 @@ public class GridLayout extends LayoutBase {
 	private final HashMap<View, MeasureSpecs> map = new HashMap<>();
 
 	public GridLayout(Context context) {
-		this(context, (AttributeSet)null);
+		this(context, (AttributeSet) null);
 	}
+
 	public GridLayout(Context context, AttributeSet attrs) {
 		this(context, attrs, 0);
 	}
+
 	public GridLayout(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
+
 	public GridLayout(Context context, String rows) {
 		this(context);
 		this.addRowsFromJSON(rows);
 	}
+
 	public GridLayout(Context context, String rows, String columns) {
 		this(context, rows);
 		this.addColumnsFromJSON(rows);
@@ -92,7 +96,7 @@ public class GridLayout extends LayoutBase {
 				return;
 			}
 			JSONArray rows = new JSONArray(value);
-			for (int i = 0; i < rows.length() ; i++) {
+			for (int i = 0; i < rows.length(); i++) {
 				JSONObject row = rows.getJSONObject(i);
 				addRow(row.getInt("value"), GridUnitType.values()[row.getInt("type")]);
 			}
@@ -101,13 +105,14 @@ public class GridLayout extends LayoutBase {
 			exception.printStackTrace();
 		}
 	}
+
 	public void addColumnsFromJSON(String value) {
 		try {
 			if (value == null) {
 				return;
 			}
 			JSONArray columns = new JSONArray(value);
-			for (int i = 0; i < columns.length() ; i++) {
+			for (int i = 0; i < columns.length(); i++) {
 				JSONObject column = columns.getJSONObject(i);
 				addColumn(column.getInt("value"), GridUnitType.values()[column.getInt("type")]);
 			}
@@ -116,6 +121,7 @@ public class GridLayout extends LayoutBase {
 			exception.printStackTrace();
 		}
 	}
+
 	public void addRowsAndColumnsFromJSON(String rowsString, String jsonString) {
 		addRowsFromJSON(rowsString);
 		addColumnsFromJSON(jsonString);
@@ -223,7 +229,7 @@ public class GridLayout extends LayoutBase {
 	}
 
 	private ItemSpec getColumnSpec(CommonLayoutParams lp) {
-		if (this._cols.size() == 0) {
+		if (this._cols.isEmpty()) {
 			return this.helper.singleColumn;
 		}
 
@@ -232,7 +238,7 @@ public class GridLayout extends LayoutBase {
 	}
 
 	private ItemSpec getRowSpec(CommonLayoutParams lp) {
-		if (this._rows.size() == 0) {
+		if (this._rows.isEmpty()) {
 			return this.helper.singleRow;
 		}
 
@@ -241,7 +247,7 @@ public class GridLayout extends LayoutBase {
 	}
 
 	private int getColumnSpan(CommonLayoutParams lp, int columnIndex) {
-		if (this._cols.size() == 0) {
+		if (this._cols.isEmpty()) {
 			return 1;
 		}
 
@@ -249,7 +255,7 @@ public class GridLayout extends LayoutBase {
 	}
 
 	private int getRowSpan(CommonLayoutParams lp, int rowIndex) {
-		if (this._rows.size() == 0) {
+		if (this._rows.isEmpty()) {
 			return 1;
 		}
 
@@ -344,8 +350,10 @@ public class GridLayout extends LayoutBase {
 			}
 
 			MeasureSpecs measureSpecs = this.map.get(child);
-			this.updateMeasureSpecs(child, measureSpecs);
-			this.helper.addMeasureSpec(measureSpecs);
+			if (measureSpecs != null) {
+				this.updateMeasureSpecs(child, measureSpecs);
+				this.helper.addMeasureSpec(measureSpecs);
+			}
 		}
 
 		this.helper.measure();
@@ -1145,7 +1153,7 @@ class MeasureHelper {
 			}
 
 			if (remainingSpace > 0) {
-				this.minRowStarValue = Math.max(remainingSpace / measureSpec.starRowsCount, this.minRowStarValue);
+				this.minRowStarValue = Math.max((float) remainingSpace / measureSpec.starRowsCount, this.minRowStarValue);
 			}
 		}
 	}
@@ -1165,7 +1173,7 @@ class MeasureHelper {
 			}
 
 			if (remainingSpace > 0) {
-				this.minColumnStarValue = Math.max(remainingSpace / measureSpec.starColumnsCount, this.minColumnStarValue);
+				this.minColumnStarValue = Math.max((float) remainingSpace / measureSpec.starColumnsCount, this.minColumnStarValue);
 			}
 		}
 	}
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
index ff49c3432..fd40c6ee3 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
@@ -6,22 +6,113 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+
 /**
  * @author hhristov
  */
 public abstract class LayoutBase extends ViewGroup {
 	private boolean passThroughParent;
+	boolean applyingEdges;
+
+	public static final int OverflowEdgeIgnore = -1;
+	public static final int OverflowEdgeNone = 0;
+	public static final int OverflowEdgeLeft = 1 << 1;
+	public static final int OverflowEdgeTop = 1 << 2;
+	public static final int OverflowEdgeRight = 1 << 3;
+	public static final int OverflowEdgeBottom = 1 << 4;
+	public static final int OverflowEdgeDontApply = 1 << 5;
+	public static final int OverflowEdgeLeftDontConsume = 1 << 6;
+	public static final int OverflowEdgeTopDontConsume = 1 << 7;
+	public static final int OverflowEdgeRightDontConsume = 1 << 8;
+	public static final int OverflowEdgeBottomDontConsume = 1 << 9;
+	public static final int OverflowEdgeAllButLeft = 1 << 10;
+	public static final int OverflowEdgeAllButTop = 1 << 11;
+	public static final int OverflowEdgeAllButRight = 1 << 12;
+	public static final int OverflowEdgeAllButBottom = 1 << 13;
+
+	public static final class BufferOffset {
+		public static final int INSET_LEFT = 0;
+		public static final int INSET_TOP = 4;
+		public static final int INSET_RIGHT = 8;
+		public static final int INSET_BOTTOM = 12;
+
+		public static final int INSET_LEFT_CONSUMED = 16;
+		public static final int INSET_TOP_CONSUMED = 20;
+		public static final int INSET_RIGHT_CONSUMED = 24;
+		public static final int INSET_BOTTOM_CONSUMED = 28;
+	}
+
+	int mPaddingLeft = 0;
+	int mPaddingTop = 0;
+	int mPaddingRight = 0;
+	int mPaddingBottom = 0;
+
+	Insets edgeInsets = Insets.NONE;
+
+	int overflowEdge = OverflowEdgeIgnore;
+
+	private final ByteBuffer insetBuffer = ByteBuffer.allocateDirect(32);
+
+	private WindowInsetListener insetListener = null;
+	private androidx.core.view.OnApplyWindowInsetsListener windowInsetsListener = null;
+
+	public void setInsetListener(@Nullable WindowInsetListener insetListener) {
+		this.insetListener = insetListener;
+	}
+
+	public interface WindowInsetListener {
+		void onApplyWindowInsets(ByteBuffer inset);
+	}
+
+	private static final byte[] EMPTY_INSETS = new byte[32];
+
+
+	private boolean pendingInsetApply = false;
+	private final OnAttachStateChangeListener onAttachStateChangeListener = new OnAttachStateChangeListener() {
+		@Override
+		public void onViewAttachedToWindow(@NonNull View v) {
+			if (pendingInsetApply) {
+				pendingInsetApply = false;
+				removeOnAttachStateChangeListener(onAttachStateChangeListener);
+				ViewCompat.requestApplyInsets(v);
+			}
+		}
+
+		@Override
+		public void onViewDetachedFromWindow(@NonNull View v) {
+		}
+	};
 
 	public LayoutBase(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
+		insetBuffer.order(ByteOrder.nativeOrder());
+	}
+
+	@Override
+	public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+		return super.onApplyWindowInsets(insets);
 	}
 
 	public LayoutBase(Context context) {
 		super(context);
 	}
 
+	public Insets getEdgeInsets() {
+		return edgeInsets;
+	}
+
 	@Override
 	protected LayoutParams generateDefaultLayoutParams() {
 		return new CommonLayoutParams();
@@ -95,4 +186,237 @@ public abstract class LayoutBase extends ViewGroup {
 	public void setPassThroughParent(boolean value) {
 		this.passThroughParent = value;
 	}
+
+	@Override
+	public void setPadding(int left, int top, int right, int bottom) {
+		if (!applyingEdges) {
+			mPaddingLeft = left;
+			mPaddingTop = top;
+			mPaddingRight = right;
+			mPaddingBottom = bottom;
+		}
+		super.setPadding(left, top, right, bottom);
+	}
+
+	public void setOverflowEdge(int value) {
+		overflowEdge = value;
+
+		if (value == OverflowEdgeIgnore) {
+			ViewCompat.setOnApplyWindowInsetsListener(this, null);
+			ViewCompat.requestApplyInsets(this);
+		} else if (windowInsetsListener == null) {
+			// if incoming inset is empty and previous inset is empty return consumed
+			// an incoming empty inset is one way to detect a consumed inset e.g multiple views consumed top/bottom
+			windowInsetsListener = new androidx.core.view.OnApplyWindowInsetsListener() {
+				@NonNull
+				@Override
+				public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
+					if (insets.isConsumed()) {
+						return insets;
+					}
+					if (v instanceof LayoutBase) {
+						LayoutBase base = (LayoutBase) v;
+
+						// should not occur but if it does return the inset
+						if (overflowEdge == OverflowEdgeIgnore) {
+							return insets;
+						}
+
+						Insets statusBar = insets.getInsets(WindowInsetsCompat.Type.statusBars());
+						Insets navBar = insets.getInsets(WindowInsetsCompat.Type.navigationBars());
+						Insets ime = insets.getInsets(WindowInsetsCompat.Type.ime());
+
+						int insetLeft = navBar.left;
+						int insetRight = navBar.right;
+						int insetBottom = Math.max(navBar.bottom, ime.bottom);
+
+						insetBuffer.put(EMPTY_INSETS, 0, 32);
+						insetBuffer.rewind();
+
+						if (overflowEdge == OverflowEdgeNone) {
+							base.applyingEdges = true;
+							v.setPadding(mPaddingLeft + insetLeft, mPaddingTop + statusBar.top, mPaddingRight + insetRight, mPaddingBottom + insetBottom);
+							edgeInsets = Insets.of(insetLeft, statusBar.top, insetRight, insetBottom);
+							base.applyingEdges = false;
+							return WindowInsetsCompat.CONSUMED;
+						}
+
+						if (base.insetListener != null) {
+							if (overflowEdge == OverflowEdgeDontApply) {
+								// if incoming inset is empty and previous inset is empty return consumed
+								// an incoming empty inset is one way to detect a consumed inset e.g multiple views consumed top/bottom
+								if (Insets.NONE.equals(statusBar) && Insets.NONE.equals(navBar) && Insets.NONE.equals(ime) && Insets.NONE.equals(edgeInsets)) {
+									return WindowInsetsCompat.CONSUMED;
+								}
+
+								IntBuffer insetData = insetBuffer.asIntBuffer();
+
+								boolean leftPreviouslyConsumed = insetLeft == 0;
+								boolean topPreviouslyConsumed = statusBar.top == 0;
+								boolean rightPreviouslyConsumed = insetRight == 0;
+								boolean bottomPreviouslyConsumed = insetBottom == 0;
+
+
+								insetData.put(0, insetLeft).put(1, statusBar.top).put(2, insetRight).put(3, insetBottom).put(4, leftPreviouslyConsumed ? 1 : 0).put(5, topPreviouslyConsumed ? 1 : 0).put(6, rightPreviouslyConsumed ? 1 : 0).put(7, bottomPreviouslyConsumed ? 1 : 0);
+
+								base.insetListener.onApplyWindowInsets(insetBuffer);
+
+								int leftInset = insetData.get(0);
+								int topInset = insetData.get(1);
+								int rightInset = insetData.get(2);
+								int bottomInset = insetData.get(3);
+
+								boolean leftConsumed = insetData.get(4) > 0;
+								boolean topConsumed = insetData.get(5) > 0;
+								boolean rightConsumed = insetData.get(6) > 0;
+								boolean bottomConsumed = insetData.get(7) > 0;
+
+								if (leftConsumed && topConsumed && rightConsumed && bottomConsumed) {
+									edgeInsets = Insets.of(leftInset, topInset, rightInset, bottomInset);
+									base.setPadding(leftInset, topInset, rightInset, bottomInset);
+									return new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars(), Insets.NONE).build();
+								}
+
+								base.setPadding(leftPreviouslyConsumed ? 0 : leftInset, topPreviouslyConsumed ? 0 : topInset, rightPreviouslyConsumed ? 0 : rightInset, bottomPreviouslyConsumed ? 0 : bottomInset);
+
+								// restore inset edge if not consumed
+
+								if (!(leftPreviouslyConsumed || leftConsumed)) {
+									leftInset = insetLeft;
+								}
+
+								if (!(topPreviouslyConsumed || topConsumed)) {
+									topInset = statusBar.top;
+								}
+
+								if (!(rightPreviouslyConsumed || rightConsumed)) {
+									rightInset = insetRight;
+								}
+
+								if (!(bottomPreviouslyConsumed || bottomConsumed)) {
+									bottomInset = insetBottom;
+								}
+
+								edgeInsets = Insets.of(leftPreviouslyConsumed ? 0 : leftInset, topPreviouslyConsumed ? 0 : topInset, rightPreviouslyConsumed ? 0 : rightInset, bottomPreviouslyConsumed ? 0 : bottomInset);
+
+								return new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars(), Insets.of(leftPreviouslyConsumed || leftConsumed ? 0 : leftInset, topPreviouslyConsumed || topConsumed ? 0 : topInset, rightPreviouslyConsumed || rightConsumed ? 0 : rightInset, bottomPreviouslyConsumed || bottomConsumed ? 0 : bottomInset)).build();
+							}
+						}
+
+						boolean overflowLeftConsume = (overflowEdge & OverflowEdgeLeft) == OverflowEdgeLeft;
+						boolean overflowTopConsume = (overflowEdge & OverflowEdgeTop) == OverflowEdgeTop;
+						boolean overflowRightConsume = (overflowEdge & OverflowEdgeRight) == OverflowEdgeRight;
+						boolean overflowBottomConsume = (overflowEdge & OverflowEdgeBottom) == OverflowEdgeBottom;
+
+						boolean overflowLeft = (overflowEdge & OverflowEdgeLeftDontConsume) == OverflowEdgeLeftDontConsume;
+						boolean overflowTop = (overflowEdge & OverflowEdgeTopDontConsume) == OverflowEdgeTopDontConsume;
+						boolean overflowRight = (overflowEdge & OverflowEdgeRightDontConsume) == OverflowEdgeRightDontConsume;
+						boolean overflowBottom = (overflowEdge & OverflowEdgeBottomDontConsume) == OverflowEdgeBottomDontConsume;
+
+
+						boolean overflowAllButLeft = (overflowEdge & OverflowEdgeAllButLeft) == OverflowEdgeAllButLeft;
+						boolean overflowAllButTop = (overflowEdge & OverflowEdgeAllButTop) == OverflowEdgeAllButTop;
+						boolean overflowAllButRight = (overflowEdge & OverflowEdgeAllButRight) == OverflowEdgeAllButRight;
+						boolean overflowAllButBottom = (overflowEdge & OverflowEdgeAllButBottom) == OverflowEdgeAllButBottom;
+
+
+						WindowInsetsCompat ret = insets;
+						base.applyingEdges = true;
+						int left = 0;
+						int top = 0;
+						int right = 0;
+						int bottom = 0;
+
+
+						if (overflowAllButLeft || overflowAllButTop || overflowAllButRight || overflowAllButBottom) {
+							Insets newInset;
+							if (overflowAllButLeft) {
+								left = mPaddingLeft + insetLeft;
+								edgeInsets = Insets.of(insetLeft, 0, 0, 0);
+								newInset = Insets.of(0, statusBar.top, insetRight, insetBottom);
+							} else if (overflowAllButTop) {
+								top = mPaddingTop + statusBar.top;
+								edgeInsets = Insets.of(0, statusBar.top, 0, 0);
+								newInset = Insets.of(insetLeft, 0, insetRight, insetBottom);
+							} else if (overflowAllButRight) {
+								right = mPaddingRight + insetRight;
+								edgeInsets = Insets.of(0, 0, insetRight, 0);
+								newInset = Insets.of(insetLeft, statusBar.top, 0, insetBottom);
+							} else {
+								bottom = mPaddingBottom + insetBottom;
+								edgeInsets = Insets.of(0, 0, 0, insetBottom);
+								newInset = Insets.of(insetLeft, statusBar.top, insetRight, 0);
+							}
+
+							ret = new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars(), newInset).build();
+							base.setPadding(left, top, right, bottom);
+							base.applyingEdges = false;
+							if (newInset == Insets.NONE) {
+								return WindowInsetsCompat.CONSUMED;
+							}
+							return ret;
+						}
+
+						if (overflowLeftConsume || overflowLeft) {
+							top = mPaddingTop + statusBar.top;
+							right = mPaddingRight + insetRight;
+							bottom = mPaddingBottom + insetBottom;
+							edgeInsets = Insets.of(insetLeft, statusBar.top, insetRight, insetBottom);
+							if (overflowRightConsume) {
+								ret = WindowInsetsCompat.CONSUMED;
+							}
+						}
+						if (overflowTopConsume || overflowTop) {
+							left = mPaddingLeft + insetLeft;
+							right = mPaddingRight + insetRight;
+							bottom = mPaddingBottom + insetBottom;
+							edgeInsets = Insets.of(insetLeft, statusBar.top, insetRight, insetBottom);
+							if (overflowTopConsume) {
+								ret = WindowInsetsCompat.CONSUMED;
+							}
+						}
+						if (overflowRightConsume || overflowRight) {
+							left = mPaddingLeft + insetLeft;
+							top = mPaddingTop + statusBar.top;
+							bottom = mPaddingBottom + insetBottom;
+							edgeInsets = Insets.of(insetLeft, statusBar.top, insetRight, insetBottom);
+							if (overflowRightConsume) {
+								ret = WindowInsetsCompat.CONSUMED;
+							}
+						}
+						if (overflowBottomConsume || overflowBottom) {
+							left = mPaddingLeft + insetLeft;
+							top = mPaddingTop + statusBar.top;
+							right = mPaddingRight + insetRight;
+							edgeInsets = Insets.of(insetLeft, statusBar.top, insetRight, insetBottom);
+							if (overflowBottomConsume) {
+								ret = WindowInsetsCompat.CONSUMED;
+							}
+						}
+
+						base.setPadding(left, top, right, bottom);
+
+						base.applyingEdges = false;
+						return ret;
+					}
+					return insets;
+				}
+			};
+			ViewCompat.setOnApplyWindowInsetsListener(this, windowInsetsListener);
+		}
+
+		if (pendingInsetApply) {
+			return;
+		}
+		if (isAttachedToWindow()) {
+			ViewCompat.requestApplyInsets(this);
+		} else {
+			pendingInsetApply = true;
+			addOnAttachStateChangeListener(onAttachStateChangeListener);
+		}
+	}
+
+	public int getOverflowEdge() {
+		return overflowEdge;
+	}
 }
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
index 29a3da916..4cd0ae150 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
@@ -2,6 +2,7 @@ package org.nativescript.widgets;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -23,6 +24,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
+import androidx.activity.ComponentActivity;
+import androidx.activity.SystemBarStyle;
+import androidx.annotation.ColorInt;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.view.ViewCompat;
 import androidx.exifinterface.media.ExifInterface;
@@ -38,8 +42,53 @@ import java.io.IOException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+
 public class Utils {
 
+	public interface HandleDarkMode {
+		boolean onHandle(int bar, Resources resources);
+	}
+
+	enum HandleDarkModeBar {
+		status(0),
+		navigation(1);
+
+		private final int mValue;
+
+		HandleDarkModeBar(int i) {
+			this.mValue = i;
+		}
+
+		public int getValue() {
+			return this.mValue;
+		}
+	}
+
+	// The light scrim color used in the platform API 29+
+// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/policy/DecorView.java;drc=6ef0f022c333385dba2c294e35b8de544455bf19;l=142
+	static final int DefaultLightScrim = Color.argb(0xe6, 0xFF, 0xFF, 0xFF);
+
+	// The dark scrim color used in the platform.
+// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/res/color/system_bar_background_semi_transparent.xml
+// 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(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(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(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 Drawable getDrawable(String uri, Context context) {
 		int resId = 0;
 		int resPrefixLength = "res://".length();
@@ -457,10 +506,7 @@ public class Utils {
 
 					Bitmap.CompressFormat targetFormat = getTargetFormat(format);
 
-					try (
-						ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-						Base64OutputStream base64Stream = new Base64OutputStream(outputStream, android.util.Base64.NO_WRAP)
-					) {
+					try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); Base64OutputStream base64Stream = new Base64OutputStream(outputStream, android.util.Base64.NO_WRAP)) {
 						bitmap.compress(targetFormat, quality, base64Stream);
 						result = outputStream.toString();
 					} catch (Exception e) {
@@ -491,9 +537,7 @@ public class Utils {
 				return new Pair<>((int) width, (int) height);
 			}
 
-			return new Pair<>(
-				Math.round((maxSize * width) / height)
-				, (int) maxSize);
+			return new Pair<>(Math.round((maxSize * width) / height), (int) maxSize);
 		}
 
 		if (width <= maxSize) {