Fix: Status bar overlap

LiftLog.Maui/Platforms/Android/MainActivity.cs

@@ -1,4 +1,5 @@
-using Android;
+using System.Globalization;
+using Android;
 using Android.App;
 using Android.Content.PM;
 using Android.Content.Res;
@@ -48,10 +49,14 @@ protected override void OnCreate(Bundle? savedInstanceState)
             IPlatformApplication.Current?.Services.GetRequiredService<InsetsManager>();
         if (insetsManager is not null)
         {
-            insetsManager.SystemSafeInsetBottom =
-                $"{WebViewSoftInputPatch.GetNavBarHeight() / Resources!.DisplayMetrics!.Density}px";
-            insetsManager.SystemSafeInsetTop =
-                $"{WebViewSoftInputPatch.GetStatusBarHeight() / Resources.DisplayMetrics.Density}px";
+            insetsManager.SystemSafeInsetBottom = string.Create(
+                CultureInfo.InvariantCulture,
+                $"{WebViewSoftInputPatch.GetNavBarHeight() / Resources!.DisplayMetrics!.Density}px"
+            );
+            insetsManager.SystemSafeInsetTop = string.Create(
+                CultureInfo.InvariantCulture,
+                $"{WebViewSoftInputPatch.GetStatusBarHeight() / Resources.DisplayMetrics.Density}px"
+            );
             ViewCompat.SetOnApplyWindowInsetsListener(
                 Window!.DecorView,
                 new WindowInsetsListener(insetsManager!, Resources.DisplayMetrics.Density)
@@ -86,15 +91,25 @@ WindowInsetsCompat insets
             }
             if (top == 0 || bottom == 0)
             {
-                insetsManager.SystemSafeInsetBottom =
-                    $"{WebViewSoftInputPatch.GetNavBarHeight() / density}px";
-                insetsManager.SystemSafeInsetTop =
-                    $"{WebViewSoftInputPatch.GetStatusBarHeight() / density}px";
+                insetsManager.SystemSafeInsetBottom = string.Create(
+                    CultureInfo.InvariantCulture,
+                    $"{WebViewSoftInputPatch.GetNavBarHeight() / density}px"
+                );
+                insetsManager.SystemSafeInsetTop = string.Create(
+                    CultureInfo.InvariantCulture,
+                    $"{WebViewSoftInputPatch.GetStatusBarHeight() / density}px"
+                );
                 insetsManager.NotifyInsetsChanged();
                 return insets;
             }
-            insetsManager.SystemSafeInsetTop = $"{top}px";
-            insetsManager.SystemSafeInsetBottom = $"{bottom}px";
+            insetsManager.SystemSafeInsetTop = string.Create(
+                CultureInfo.InvariantCulture,
+                $"{top}px"
+            );
+            insetsManager.SystemSafeInsetBottom = string.Create(
+                CultureInfo.InvariantCulture,
+                $"{bottom}px"
+            );
             insetsManager.NotifyInsetsChanged();
             return insets;
         }

LiftLog.Ui/Pages/Settings/AppConfigPage.razor

@@ -2,19 +2,13 @@
 @inject IState<SettingsState> SettingsState
 @inject IDispatcher Dispatcher
 @inject IThemeProvider ThemeProvider
-@inject IDeviceService DeviceService
 
 @inherits Fluxor.Blazor.Web.Components.FluxorComponent
 
 <md-list>
     <ListSwitch Headline="@UiStrings.UseImperialUnits" SupportingText="@UiStrings.UseImperialUnitsSubtitle" Value="@SettingsState.Value.UseImperialUnits" OnSwitched="SetUseImperialUnits" />
     <ListSwitch Headline="@UiStrings.ShowBodyweight" SupportingText="@UiStrings.ShowBodyweightSubtitle" Value="@SettingsState.Value.ShowBodyweight" OnSwitched="SetShowBodyweight" />
     <ListSwitch Headline="@UiStrings.ShowFeed" SupportingText="@UiStrings.ShowFeedSubtitle" Value="@SettingsState.Value.ShowFeed" OnSwitched="SetShowFeed" />
-    @* If android, we need a status bar fix sometimes *@
-    @if(DeviceService.GetDeviceType() == DeviceType.Android)
-    {
-        <ListSwitch Headline="@UiStrings.StatusBarFix" SupportingText="@UiStrings.StatusBarFixSubtitle" Value="@SettingsState.Value.StatusBarFix" OnSwitched="SetStatusBarFix" />
-    }
 
     <ListSwitch Headline="@UiStrings.ShowTips" SupportingText="@UiStrings.ShowTipsSubtitle" Value="@SettingsState.Value.ShowTips" OnSwitched="SetShowTips" />
     <AppButton Type="AppButtonType.Text" OnClick="ResetTips">@UiStrings.ResetTips</AppButton>
@@ -48,9 +42,6 @@
     private void SetShowTips(bool value)
         => Dispatcher.Dispatch(new SetShowTipsAction(value));
 
-    private void SetStatusBarFix(bool value)
-        => Dispatcher.Dispatch(new SetStatusBarFixAction(value));
-
     private void ResetTips()
         => Dispatcher.Dispatch(new SetTipToShowAction(1));
 

LiftLog.Ui/Repository/PreferencesRepository.cs

@@ -90,16 +90,6 @@ public async Task<bool> GetShowFeedAsync()
         return await preferenceStore.GetItemAsync("showFeed") is "True" or null;
     }
 
-    public async Task SetStatusBarFixAsync(bool statusBarFix)
-    {
-        await preferenceStore.SetItemAsync("statusBarFix", statusBarFix.ToString());
-    }
-
-    public async Task<bool> GetStatusBarFixAsync()
-    {
-        return await preferenceStore.GetItemAsync("statusBarFix") is "True";
-    }
-
     public async Task<bool> GetHasRequestedNotificationPermissionAsync()
     {
         return await preferenceStore.GetItemAsync("hasRequestedNotificationPermission") is "True";

LiftLog.Ui/Shared/MainLayout.razor

@@ -129,7 +129,7 @@
 
     private string Justify => AppState.Value.BackNavigationUrl is null ? "justify-center" : "justify-start";
 
-    private string TopInset => SettingsState.Value.StatusBarFix ? "46px" : InsetsManager.SystemSafeInsetTop;
+    private string TopInset => InsetsManager.SystemSafeInsetTop;
 
     private RenderFragment? RenderBackButton()
     {

LiftLog.Ui/Shared/Smart/NavBar.razor

@@ -27,7 +27,7 @@
 
 @code {
 
-    private string BottomInset => SettingsState.Value.StatusBarFix ? "32px" : InsetsManager.SystemSafeInsetBottom;
+    private string BottomInset => InsetsManager.SystemSafeInsetBottom;
 
     protected override void OnInitialized()
     {

LiftLog.Ui/Store/Settings/SettingsActions.cs

@@ -40,8 +40,6 @@ public record SetTipToShowAction(int TipToShow);
 
 public record SetShowFeedAction(bool ShowFeed);
 
-public record SetStatusBarFixAction(bool StatusBarFix);
-
 public record ExecuteRemoteBackupAction(RemoteBackupSettings Settings, bool Force = false);
 
 public record RemoteBackupSucceededEvent();

LiftLog.Ui/Store/Settings/SettingsEffects.cs

@@ -220,12 +220,6 @@ IDispatcher _
         await preferencesRepository.SetLastSuccessfulRemoteBackupHashAsync(action.Hash);
     }
 
-    [EffectMethod]
-    public async Task HandleStatusBarFixAction(SetStatusBarFixAction action, IDispatcher dispatcher)
-    {
-        await preferencesRepository.SetStatusBarFixAsync(action.StatusBarFix);
-    }
-
     [EffectMethod]
     public async Task ExecuteRemoteBackup(ExecuteRemoteBackupAction action, IDispatcher dispatcher)
     {

LiftLog.Ui/Store/Settings/SettingsReducers.cs

@@ -65,12 +65,6 @@ state with
             ShowFeed = action.ShowFeed,
         };
 
-    [ReducerMethod]
-    public static SettingsState SetStatusBarFix(
-        SettingsState state,
-        SetStatusBarFixAction action
-    ) => state with { StatusBarFix = action.StatusBarFix };
-
     [ReducerMethod]
     public static SettingsState SetRestNotifications(
         SettingsState state,

LiftLog.Ui/Store/Settings/SettingsState.cs

@@ -14,7 +14,6 @@ public record SettingsState(
     bool ShowTips,
     int TipToShow,
     bool ShowFeed,
-    bool StatusBarFix,
     bool RestNotifications,
     RemoteBackupSettings RemoteBackupSettings,
     string LastSuccessfulRemoteBackupHash,
@@ -34,7 +33,6 @@ bool BackupReminder
             ShowTips: true,
             TipToShow: 1,
             ShowFeed: true,
-            StatusBarFix: false,
             RestNotifications: true,
             RemoteBackupSettings: new RemoteBackupSettings(string.Empty, string.Empty, false),
             LastSuccessfulRemoteBackupHash: string.Empty,

LiftLog.Ui/Store/Settings/SettingsStateInitMiddleware.cs

@@ -20,7 +20,6 @@ public override async Task InitializeAsync(IDispatcher dispatch, IStore store)
                 showTips,
                 tipToShow,
                 showFeed,
-                statusBarFix,
                 restNotifications,
                 remoteBackupSettings,
                 lastSuccessfulRemoteBackupHash,
@@ -32,7 +31,6 @@ public override async Task InitializeAsync(IDispatcher dispatch, IStore store)
                 preferencesRepository.GetShowTipsAsync(),
                 preferencesRepository.GetTipToShowAsync(),
                 preferencesRepository.GetShowFeedAsync(),
-                preferencesRepository.GetStatusBarFixAsync(),
                 preferencesRepository.GetRestNotificationsAsync(),
                 preferencesRepository.GetRemoteBackupSettingsAsync(),
                 preferencesRepository.GetLastSuccessfulRemoteBackupHashAsync(),
@@ -48,7 +46,6 @@ public override async Task InitializeAsync(IDispatcher dispatch, IStore store)
                 ShowTips = showTips,
                 TipToShow = tipToShow,
                 ShowFeed = showFeed,
-                StatusBarFix = statusBarFix,
                 RestNotifications = restNotifications,
                 RemoteBackupSettings = remoteBackupSettings,
                 LastSuccessfulRemoteBackupHash = lastSuccessfulRemoteBackupHash,

LiftLog.Ui/i18n/UiStrings.it-IT.resx

@@ -448,12 +448,6 @@
   <data name="ShowFeedSubtitle" xml:space="preserve">
     <value>Mostra il feed nella barra di navigazione</value>
   </data>
-  <data name="StatusBarFix" xml:space="preserve">
-    <value>Fix barra di stato</value>
-  </data>
-  <data name="StatusBarFixSubtitle" xml:space="preserve">
-    <value>Risolve il problema della sovrapposizione della barra di stato sui controlli in alcuni dispositivi.</value>
-  </data>
   <data name="ShowTips" xml:space="preserve">
     <value>Mostra suggerimenti</value>
   </data>

LiftLog.Ui/i18n/UiStrings.resx

@@ -500,12 +500,6 @@
   <data name="ShowFeedSubtitle" xml:space="preserve">
     <value>Display the feed in the navigation bar</value>
   </data>
-  <data name="StatusBarFix" xml:space="preserve">
-    <value>Status bar fix</value>
-  </data>
-  <data name="StatusBarFixSubtitle" xml:space="preserve">
-    <value>Fixes the status bar overlapping the page title controls on some devices</value>
-  </data>
   <data name="ShowTips" xml:space="preserve">
     <value>Show tips</value>
   </data>