Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions packages/core/ui/core/view/index.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,12 @@ function initializeDialogFragment() {
this._windowSoftInputMode = options.windowSoftInputMode;
this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0);

let theme = this.getTheme();
if (this._fullscreen) {
// In fullscreen mode, get the application's theme.
theme = this.getActivity().getApplicationInfo().theme;
}

const theme = this._fullscreen ? this.getActivity().getApplicationInfo().theme : this.getTheme();
const dialog = new DialogImpl(this, this.getActivity(), theme);

Utils.android.enableEdgeToEdge(this.getActivity(), dialog.getWindow());
if (this._fullscreen) {
Utils.android.enableEdgeToEdge(this.getActivity(), dialog.getWindow());
}

// do not override alignment unless fullscreen modal will be shown;
// otherwise we might break component-level layout:
Expand Down Expand Up @@ -1333,7 +1330,7 @@ export class View extends ViewCommon {
const controller = window.getInsetsController?.();
if (controller) {
const APPEARANCE_LIGHT_STATUS_BARS = android.view.WindowInsetsController?.APPEARANCE_LIGHT_STATUS_BARS;

if (typeof value === 'string') {
this.style.statusBarStyle = value;
if (value === 'light') {
Expand Down
Loading