More fixes

shinyorg · Dec 16, 2024 · 1f679d6 · 1f679d6
1 parent 0d35152
commit 1f679d6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 39 deletions.
diff --git a/ProjectTemplates/ShinyApp/App.xaml.cs b/ProjectTemplates/ShinyApp/App.xaml.cs
@@ -2,7 +2,7 @@
 
 public partial class App : Application
 {
-#if (shinyframework || prism)
+#if (prism)
 	public App()
 	{
 		this.InitializeComponent();

diff --git a/ProjectTemplates/ShinyApp/AppSettings.cs b/ProjectTemplates/ShinyApp/AppSettings.cs
@@ -1,29 +1,5 @@
 namespace ShinyApp;
 
-#if shinyframework
-//[Shiny.Stores.ObjectStoreBinder("secure")] // defaults to standard platform preferences
-// any public get/set values marked with [Reactive] will automatically be saved to the configured store
-public class AppSettings : ReactiveObject, IShinyStartupTask
-{
-    [Reactive] public AppTheme CurrentTheme { get; set; } = AppTheme.Unspecified;
-
-
-    public void Start()
-    {
-        if (Application.Current != null)
-        {
-            Observable
-                .Interval(TimeSpan.FromSeconds(1))
-                .Where(_ => Application.Current != null)
-                .Take(1)
-                .Subscribe(_ => Application.Current!.UserAppTheme = this.CurrentTheme);
-        }        
-        this.WhenAnyValue(x => x.CurrentTheme)
-            .Skip(1)
-            .Subscribe(x => Application.Current!.UserAppTheme = x);
-    }
-}
-#else
 //[Shiny.Stores.ObjectStoreBinder("secure")] // defaults to standard platform preferences
 // any public get/set values that notify will automatically be saved to the configured store
 public class AppSettings : NotifyPropertyChanged, IShinyStartupTask
@@ -42,5 +18,4 @@ public void Start()
             .Skip(1)
             .Subscribe(x => Application.Current!.UserAppTheme = x);
     }
-}
-#endif
+}
diff --git a/ProjectTemplates/ShinyApp/GlobalUsings.cs b/ProjectTemplates/ShinyApp/GlobalUsings.cs
@@ -10,31 +10,31 @@
 global using System.Reactive.Linq;
 global using System.Reactive.Threading.Tasks;
 global using Microsoft.Extensions.Logging;
-#if (useconfig)
+#if useconfig
 global using Microsoft.Extensions.Configuration;
 #endif
-#if (localization)
+#if localization
 global using Microsoft.Extensions.Localization;
 #endif
-#if shinyframework || reactiveui
+#if reactiveui
 global using ReactiveUI;
 global using ReactiveUI.Fody.Helpers;
 #endif
-#if shinyframework || prism
+#if prism
 global using Prism.AppModel;
 global using Prism.Navigation;
 global using Prism.Services;
 #endif
-#if shinyframework || localization
+#if localization
 global using Microsoft.Extensions.Localization;
 #endif
-#if shinyframework || communitytoolkit
+#if communitytoolkit
 global using CommunityToolkit.Maui;
 #endif
 #if usecsharpmarkup
 global using CommunityToolkit.Maui.Markup;
 #endif
-#if (ctmvvm)
+#if ctmvvm
 global using CommunityToolkit.Mvvm.ComponentModel;
 global using CommunityToolkit.Mvvm.Input;
 #endif
diff --git a/ProjectTemplates/ShinyApp/MainPage.xaml.cs b/ProjectTemplates/ShinyApp/MainPage.xaml.cs
@@ -3,7 +3,7 @@
 
 public partial class MainPage : ContentPage
 {
-#if (shinyframework || prism)
+#if (prism)
 	public MainPage()
 	{
 		this.InitializeComponent();

diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs
@@ -251,10 +251,8 @@ public static MauiApp CreateMauiApp()
 #endif
 //+:cnd:noEmit
 #endif
-#if (!shinyframework)
         builder.Services.AddConnectivity();
         builder.Services.AddBattery();
-#endif
 #if shinymediator
         builder.Services.AddShinyMediator(x => x 
             .AddMemoryCaching()
@@ -270,10 +268,10 @@ public static MauiApp CreateMauiApp()
                     pipeline.AddTimeout(TimeSpan.FromSeconds(5));
                 })
             )
-#if shinyframework
+            .UseMaui()
+#if prism
             .AddPrismSupport()
 #endif
-            .UseMaui()
 #if useblazor
             .UseBlazor()
 #endif