diff --git a/JournalApp/MainPage.xaml b/JournalApp/MainPage.xaml index dfcf265a..a75cf062 100644 --- a/JournalApp/MainPage.xaml +++ b/JournalApp/MainPage.xaml @@ -2,7 +2,8 @@ + x:Class="JournalApp.MainPage" + Padding="0"> diff --git a/JournalApp/Platforms/Android/MainActivity.cs b/JournalApp/Platforms/Android/MainActivity.cs index c53ff5b9..72bfc9d1 100644 --- a/JournalApp/Platforms/Android/MainActivity.cs +++ b/JournalApp/Platforms/Android/MainActivity.cs @@ -3,6 +3,7 @@ using Android.Content.PM; using Android.OS; using AndroidX.Activity; +using AndroidX.Core.View; using JournalApp.Platforms.Android; namespace JournalApp; @@ -14,6 +15,12 @@ protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); + // Enable edge-to-edge display + if (Window != null) + { + WindowCompat.SetDecorFitsSystemWindows(Window, false); + } + var backCallback = new OnBackPressedCallbackProxy(() => { var service = IPlatformApplication.Current.Services.GetService(); diff --git a/JournalApp/Platforms/Android/Resources/values/styles.xml b/JournalApp/Platforms/Android/Resources/values/styles.xml new file mode 100644 index 00000000..b899e486 --- /dev/null +++ b/JournalApp/Platforms/Android/Resources/values/styles.xml @@ -0,0 +1,11 @@ + + + + diff --git a/JournalApp/wwwroot/app.css b/JournalApp/wwwroot/app.css index 6bccc0b9..59c386bd 100644 --- a/JournalApp/wwwroot/app.css +++ b/JournalApp/wwwroot/app.css @@ -69,7 +69,7 @@ body { flex-direction: column; padding: 0 !important; margin: 0 !important; - top: 0 !important; + top: env(safe-area-inset-top) !important; position: sticky !important; background-color: var(--mud-palette-surface); color: var(--mud-palette-primary-text); @@ -80,7 +80,7 @@ body { max-width: 960px; margin: 0 auto !important; padding: 8px !important; - padding-bottom: 15vh !important; + padding-bottom: calc(15vh + env(safe-area-inset-bottom)) !important; animation: fadeInUp 0.15s ease-out; } @@ -207,33 +207,7 @@ body { z-index: 1000; } -.status-bar-safe-area { - display: none; -} - -@supports (-webkit-touch-callout: none) { - .status-bar-safe-area { - display: flex; - position: sticky; - top: 0; - height: env(safe-area-inset-top); - width: 100%; - z-index: 1; - } - - .flex-column, .navbar-brand { - padding-left: env(safe-area-inset-left); - } -} - -@media (prefers-color-scheme: dark) { - .status-bar-safe-area { - background-color: #120D10; - } -} - -@media (prefers-color-scheme: light) { - .status-bar-safe-area { - background-color: #FFF8F9; - } +.flex-column, .navbar-brand { + padding-left: env(safe-area-inset-left); + padding-right: env(safe-area-inset-right); } diff --git a/JournalApp/wwwroot/index.html b/JournalApp/wwwroot/index.html index faeb006a..40d0da5b 100644 --- a/JournalApp/wwwroot/index.html +++ b/JournalApp/wwwroot/index.html @@ -15,8 +15,6 @@ -
-

Getting things ready...