Skip to content

Commit

Permalink
Mobile fixups (#1346)
Browse files Browse the repository at this point in the history
* Fix logo size and background

* Comment out app shutdown on Android, because it needs more thought
  • Loading branch information
myieye authored Jan 7, 2025
1 parent bd9dc74 commit 8828874
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 1 addition & 2 deletions backend/FwLite/FwLiteMaui/FwLiteMaui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
<ItemGroup>
<!-- App Icon -->
<!-- background color is required for mac per: https://learn.microsoft.com/en-us/dotnet/maui/user-interface/images/app-icons?view=net-maui-8.0&tabs=windows#recolor-the-background -->
<MauiIcon Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'" Include="Resources\AppIcon\logo_light.svg" Color="#1c4e80" />
<MauiIcon Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'ios'" Include="Resources\AppIcon\logo_light.svg" />
<MauiIcon Include="Resources\AppIcon\logo_light.svg" Color="#1c4e80" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#152747" BaseSize="512,512" />
Expand Down
7 changes: 6 additions & 1 deletion backend/FwLite/FwLiteMaui/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ public static MauiApp CreateMauiApp()
{
#if ANDROID
events.AddAndroid(android => android
.OnDestroy((activity) => holder.Shutdown()));
.OnDestroy((activity) =>
{
// This doesn't work, because OnDestroy gets called e.g. when logging in via OAuth. (and maybe whenever the app is backgrounded?)
// It seems like there is no appropriate hook. Maybe we're just supposed to let the OS kill the app?
//holder.Shutdown();
}));
#endif
#if IOS || MACCATALYST
events.AddiOS(ios => ios
Expand Down
2 changes: 1 addition & 1 deletion backend/FwLite/FwLiteMaui/Resources/AppIcon/logo_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion backend/FwLite/FwLiteMaui/Resources/Splash/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8828874

Please sign in to comment.