feature: adds functional navigation between different modules UserCon…

…trols
andr9528 · Dec 6, 2024 · 5d5991c · 5d5991c
1 parent e71f673
commit 5d5991c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 40 deletions.
diff --git a/Tracker.Frontend.Uno/App.xaml.cs b/Tracker.Frontend.Uno/App.xaml.cs
@@ -14,7 +14,7 @@ public App()
     }
 
     protected Window? MainWindow { get; private set; }
-    protected IHost? Host { get; private set; }
+    public IHost? Host { get; private set; }
 
     protected override async void OnLaunched(LaunchActivatedEventArgs args)
     {

diff --git a/Tracker.Frontend.Uno/Presentation/ModulesNavigationPage.cs b/Tracker.Frontend.Uno/Presentation/ModulesNavigationPage.cs
@@ -14,11 +14,10 @@ public sealed partial class ModulesNavigationPage : Page
 
     public ModulesNavigationPage()
     {
-        var viewModel = new ModulesNavigationViewModel();
+        DataContext ??= (Application.Current as App).Host.Services.GetRequiredService<ModulesNavigationViewModel>();
 
-        this.DataContext(viewModel,
-            (page, vm) => page.NavigationCacheMode(NavigationCacheMode.Required)
-                .Background(Theme.Brushes.Background.Default).Content(BuildContent(vm)));
+        this.NavigationCacheMode(NavigationCacheMode.Required).Background(Theme.Brushes.Background.Default).Content(
+            BuildContent((ModulesNavigationViewModel) DataContext));
     }
 
     private Grid BuildContent(ModulesNavigationViewModel viewModel)
@@ -60,8 +59,6 @@ private ListView BuildNavigationListView(ModulesNavigationViewModel viewModel)
     {
         var view = new ListView();
 
-        view.Region(true);
-
         var options = Modules.Select(module =>
         {
             var item = new TextBlock()
@@ -74,12 +71,6 @@ private ListView BuildNavigationListView(ModulesNavigationViewModel viewModel)
                 FocusVisualPrimaryBrush = view.Background,
                 FocusVisualSecondaryBrush = view.Background,
             };
-            item.Region(name: module.GetModuleAsReadableString());
-            //item.SetRequest(module.GetModuleAsReadableString());
-            //item.SetData(module.GetModuleControl());
-
-            //item.Command(() => GetModuleCommand(viewModel, module.TypeModule));
-            //item.Style(new Style(typeof(TextBlock)));
 
             return item;
         });
@@ -93,10 +84,7 @@ private ListView BuildNavigationListView(ModulesNavigationViewModel viewModel)
     private void ListViewOnSelectionChanged(
         object sender, SelectionChangedEventArgs e, ModulesNavigationViewModel viewModel)
     {
-        Console.WriteLine($"Listview Selection Changed Called");
         viewModel.ListViewOnSelectionChanged(sender, e);
-        // Not Fired...
-        Console.WriteLine($"View Model Called");
     }
 
     private Grid BuildContentGrid(ModulesNavigationViewModel viewModel)
@@ -105,7 +93,8 @@ private Grid BuildContentGrid(ModulesNavigationViewModel viewModel)
         {
             Background = new SolidColorBrush(Colors.AliceBlue),
         };
-        grid.Region(true, navigator: "Visibility");
+
+        Dictionary<TrackerModule.Module, Grid> contentGrids = new();
 
         foreach (TrackerModule module in Modules)
         {
@@ -115,24 +104,14 @@ private Grid BuildContentGrid(ModulesNavigationViewModel viewModel)
                 VerticalAlignment = VerticalAlignment.Stretch,
                 Visibility = Visibility.Collapsed,
             };
-            contentGrid.Visibility(() => GetModuleVisibility(viewModel, module.TypeModule));
-            contentGrid.Region(name: module.GetModuleAsReadableString());
             contentGrid.Children.Add(module.GetModuleControl());
 
+            contentGrids.Add(module.TypeModule, contentGrid);
             grid.Children.Add(contentGrid);
         }
 
-        return grid;
-    }
+        viewModel.SetContentGridsDictionary(contentGrids);
 
-    private Visibility GetModuleVisibility(ModulesNavigationViewModel viewModel, TrackerModule.Module module)
-    {
-        return module switch
-        {
-            TrackerModule.Module.TIME => viewModel.TimeModuleVisibility,
-            TrackerModule.Module.DINING => viewModel.DiningModuleVisibility,
-            TrackerModule.Module.BUDGET => viewModel.BudgetModuleVisibility,
-            _ => viewModel.BudgetModuleVisibility,
-        };
+        return grid;
     }
 }
diff --git a/Tracker.Frontend.Uno/Presentation/ModulesNavigationViewModel.cs b/Tracker.Frontend.Uno/Presentation/ModulesNavigationViewModel.cs
@@ -1,4 +1,5 @@
 using Uno.Extensions.Equality;
+using Console = System.Console;
 
 namespace Tracker.Frontend.Uno.Presentation;
 
@@ -7,16 +8,12 @@ public partial class ModulesNavigationViewModel : ObservableObject
     //private readonly INavigator _navigator;
 
     [ObservableProperty] private TrackerModule.Module activeModule;
-    [ObservableProperty] private Visibility budgetModuleVisibility;
-    [ObservableProperty] private Visibility diningModuleVisibility;
-    [ObservableProperty] private Visibility timeModuleVisibility;
+    private Dictionary<TrackerModule.Module, Grid> contentGrids = new();
 
     public ModulesNavigationViewModel()
     {
         //_navigator = navigator;
         Title = "Tracker";
-
-        SetActiveModule(ModulesNavigationPage.Modules[0].TypeModule);
     }
 
     public string? Title { get; }
@@ -29,13 +26,32 @@ public void ListViewOnSelectionChanged(object sender, SelectionChangedEventArgs
         SetActiveModule(trackerModule.TypeModule);
     }
 
+    public void SetContentGridsDictionary(Dictionary<TrackerModule.Module, Grid> contentGrids)
+    {
+        this.contentGrids = contentGrids;
+        SetActiveModule(ModulesNavigationPage.Modules[0].TypeModule);
+    }
+
     private void SetActiveModule(TrackerModule.Module module)
     {
         ActiveModule = module;
-        BudgetModuleVisibility =
-            ActiveModule == TrackerModule.Module.BUDGET ? Visibility.Visible : Visibility.Collapsed;
-        DiningModuleVisibility =
-            ActiveModule == TrackerModule.Module.DINING ? Visibility.Visible : Visibility.Collapsed;
-        TimeModuleVisibility = ActiveModule == TrackerModule.Module.TIME ? Visibility.Visible : Visibility.Collapsed;
+
+        foreach (var grid in contentGrids)
+        {
+            grid.Value.Visibility = Visibility.Collapsed;
+        }
+
+        contentGrids[ActiveModule].Visibility = Visibility.Visible;
+
+        Console.WriteLine($"Collapsed all grids except {ActiveModule}");
+
+        //BudgetModuleVisibility =
+        //    ActiveModule == TrackerModule.Module.BUDGET ? Visibility.Visible : Visibility.Collapsed;
+        //DiningModuleVisibility =
+        //    ActiveModule == TrackerModule.Module.DINING ? Visibility.Visible : Visibility.Collapsed;
+        //TimeModuleVisibility = ActiveModule == TrackerModule.Module.TIME ? Visibility.Visible : Visibility.Collapsed;
+
+        //Console.WriteLine(
+        //    $"Budget: {BudgetModuleVisibility}; Dining: {DiningModuleVisibility}; Time: {TimeModuleVisibility}");
     }
 }