Merge branch 'main' into dev/doti/tip-calc

Author: morning4coffe-dev

.github/workflows/build-all.yml

@@ -16,16 +16,21 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Install .NET 9
+    - name: Install .NET SDKs
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
+        include-prerelease: true
+        dotnet-quality: 'preview'
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.4.app
+      run: sudo xcode-select -s /Applications/Xcode_16.3.app
       if: runner.os == 'macOS'
 
     - name: Find and build all C# projects

.github/workflows/build-pr.yml

@@ -20,21 +20,27 @@ jobs:
       with:
         fetch-depth: 2
 
-    - name: Install .NET 9
+    - name: Install .NET SDKs
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
+        include-prerelease: true
+        dotnet-quality: 'preview'
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.4.app
+      run: sudo xcode-select -s /Applications/Xcode_16.3.app
       if: runner.os == 'macOS'
 
     - name: Find and build changed projects
       run: |
         $failedProjectCount=0
+        $skippedProjectCount=0
         # Get the list of changed files
         $changedFiles = git diff --name-only -r --diff-filter=d HEAD^1 HEAD
 

9.0/Apps/DeveloperBalance/AppShell.xaml

@@ -33,8 +33,8 @@
                 SegmentWidth="40" SegmentHeight="40">
                 <sf:SfSegmentedControl.ItemsSource>
                     <x:Array Type="{x:Type sf:SfSegmentItem}">
-                        <sf:SfSegmentItem ImageSource="{StaticResource IconLight}"/>
-                        <sf:SfSegmentItem ImageSource="{StaticResource IconDark}"/>
+                        <sf:SfSegmentItem ImageSource="{StaticResource IconLight}" SemanticProperties.Description="Light mode"/>
+                        <sf:SfSegmentItem ImageSource="{StaticResource IconDark}" SemanticProperties.Description="Dark mode"/>
                     </x:Array>
                 </sf:SfSegmentedControl.ItemsSource>
             </sf:SfSegmentedControl>

9.0/Apps/DeveloperBalance/AppShell.xaml.cs

@@ -10,6 +10,9 @@ public AppShell()
 		InitializeComponent();
 		var currentTheme = Application.Current!.RequestedTheme;
 		ThemeSegmentedControl.SelectedIndex = currentTheme == AppTheme.Light ? 0 : 1;
+#if ANDROID || WINDOWS
+		SemanticProperties.SetDescription(ThemeSegmentedControl, "Theme selection");
+#endif
 	}
 	public static async Task DisplaySnackbarAsync(string message)
 	{

9.0/Apps/DeveloperBalance/Data/TagRepository.cs

@@ -200,6 +200,12 @@ public async Task<int> SaveItemAsync(Tag item, int projectID)
 		await Init();
 		await SaveItemAsync(item);
 
+		var isAssociated = await IsAssociated(item, projectID);
+		if (isAssociated)
+		{
+			return 0; // No need to save again if already associated
+		}
+
 		await using var connection = new SqliteConnection(Constants.DatabasePath);
 		await connection.OpenAsync();
 
@@ -212,6 +218,33 @@ public async Task<int> SaveItemAsync(Tag item, int projectID)
 		return await saveCmd.ExecuteNonQueryAsync();
 	}
 
+	/// <summary>
+	/// Checks if a tag is already associated with a specific project.
+	/// </summary>
+	/// <param name="item">The tag to save.</param>
+	/// <param name="projectID">The ID of the project.</param>
+	/// <returns>If tag is already associated with this project</returns>
+	async Task<bool> IsAssociated(Tag item, int projectID)
+	{
+		await Init();
+		await SaveItemAsync(item);
+
+		await using var connection = new SqliteConnection(Constants.DatabasePath);
+		await connection.OpenAsync();
+
+		// First check if the association already exists
+		var checkCmd = connection.CreateCommand();
+		checkCmd.CommandText = @"
+			SELECT COUNT(*) FROM ProjectsTags 
+			WHERE ProjectID = @projectID AND TagID = @tagID";
+		checkCmd.Parameters.AddWithValue("@projectID", projectID);
+		checkCmd.Parameters.AddWithValue("@tagID", item.ID);
+
+		int existingCount = Convert.ToInt32(await checkCmd.ExecuteScalarAsync());
+
+		return existingCount != 0;
+	}
+
 	/// <summary>
 	/// Deletes a tag from the database.
 	/// </summary>

9.0/Apps/DeveloperBalance/DeveloperBalance.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
@@ -21,13 +21,14 @@
 		<Nullable>enable</Nullable>
 		<!-- https://github.com/CommunityToolkit/Maui/issues/2205 -->
 		<NoWarn>XC0103</NoWarn>
+		<MauiVersion>9.0.60</MauiVersion>
 		<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
 
 		<!-- Display name -->
 		<ApplicationTitle>DeveloperBalance</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.developerbalance</ApplicationId>
+		<ApplicationId>com.companyname.developerbalance</ApplicationId> 
 
 		<!-- Versions -->
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -63,7 +64,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.40" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
@@ -72,7 +73,7 @@
 		<PackageReference Include="CommunityToolkit.Maui" Version="11.1.1" />
 		<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.8" />
 		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
-		<PackageReference Include="Syncfusion.Maui.Toolkit" Version="1.0.4" />
+		<PackageReference Include="Syncfusion.Maui.Toolkit" Version="1.0.5" />
 	</ItemGroup>
 
 </Project>

9.0/Apps/DeveloperBalance/MauiProgram.cs

@@ -1,5 +1,7 @@
 using CommunityToolkit.Maui;
 using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
 using Syncfusion.Maui.Toolkit.Hosting;
 
 namespace DeveloperBalance;
@@ -16,9 +18,23 @@ public static MauiApp CreateMauiApp()
 			.ConfigureMauiHandlers(handlers =>
 			{
 #if IOS || MACCATALYST
-				handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();
+			handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();
 #endif
-			})
+#if WINDOWS
+			Microsoft.Maui.Controls.Handlers.Items.CollectionViewHandler.Mapper.AppendToMapping("KeyboardAccessibleCollectionView", (handler, view) =>
+			{
+				handler.PlatformView.SingleSelectionFollowsFocus = false;
+			});
+
+            Microsoft.Maui.Handlers.ContentViewHandler.Mapper.AppendToMapping(nameof(Pages.Controls.CategoryChart), (handler, view) =>
+            {
+                if (view is Pages.Controls.CategoryChart && handler.PlatformView is ContentPanel contentPanel)
+                {
+                    contentPanel.IsTabStop = true;
+                }
+            });
+#endif
+            })
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

9.0/Apps/DeveloperBalance/PageModels/MainPageModel.cs

@@ -35,6 +35,9 @@ public partial class MainPageModel : ObservableObject, IProjectTaskPageModel
 	[ObservableProperty]
 	private string _today = DateTime.Now.ToString("dddd, MMM d");
 
+	[ObservableProperty]
+	private Project? selectedProject;
+
 	public bool HasCompletedTasks
 		=> Tasks?.Any(t => t.IsCompleted) ?? false;
 
@@ -149,8 +152,8 @@ private Task AddTask()
 		=> Shell.Current.GoToAsync($"task");
 
 	[RelayCommand]
-	private Task NavigateToProject(Project project)
-		=> Shell.Current.GoToAsync($"project?id={project.ID}");
+	private Task? NavigateToProject(Project project)
+		=> project is null ? null : Shell.Current.GoToAsync($"project?id={project.ID}");
 
 	[RelayCommand]
 	private Task NavigateToTask(ProjectTask task)

9.0/Apps/DeveloperBalance/PageModels/ProjectDetailPageModel.cs

@@ -1,6 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using DeveloperBalance.Models;
+using System.Collections.ObjectModel;
+using System.Windows.Input;
 
 namespace DeveloperBalance.PageModels;
 
@@ -34,14 +36,16 @@ public partial class ProjectDetailPageModel : ObservableObject, IQueryAttributab
 	[ObservableProperty]
 	private List<Tag> _allTags = [];
 
+	public IList<object> SelectedTags { get; set; } = new List<object>();
+
 	[ObservableProperty]
 	private IconData _icon;
 
 	[ObservableProperty]
 	bool _isBusy;
 
 	[ObservableProperty]
-	private List<IconData> _icons =	new List<IconData>
+	private List<IconData> _icons = new List<IconData>
 	{
 		new IconData { Icon = FluentUI.ribbon_24_regular, Description = "Ribbon Icon" },
 		new IconData { Icon = FluentUI.ribbon_star_24_regular, Description = "Ribbon Star Icon" },
@@ -135,6 +139,10 @@ private async Task LoadData(int id)
 			foreach (var tag in allTags)
 			{
 				tag.IsSelected = _project.Tags.Any(t => t.ID == tag.ID);
+				if (tag.IsSelected)
+				{
+					SelectedTags.Add(tag);
+				}
 			}
 			AllTags = new(allTags);
 		}
@@ -173,14 +181,11 @@ private async Task Save()
 		_project.Icon = Icon.Icon ?? FluentUI.ribbon_24_regular;
 		await _projectRepository.SaveItemAsync(_project);
 
-		if (_project.IsNullOrNew())
+		foreach (var tag in AllTags)
 		{
-			foreach (var tag in AllTags)
+			if (tag.IsSelected)
 			{
-				if (tag.IsSelected)
-				{
-					await _tagRepository.SaveItemAsync(tag, _project.ID);
-				}
+				await _tagRepository.SaveItemAsync(tag, _project.ID);
 			}
 		}
 
@@ -235,7 +240,7 @@ private Task NavigateToTask(ProjectTask task) =>
 		Shell.Current.GoToAsync($"task?id={task.ID}");
 
 	[RelayCommand]
-	private async Task ToggleTag(Tag tag)
+	internal async Task ToggleTag(Tag tag)
 	{
 		tag.IsSelected = !tag.IsSelected;
 
@@ -244,20 +249,15 @@ private async Task ToggleTag(Tag tag)
 			if (tag.IsSelected)
 			{
 				await _tagRepository.SaveItemAsync(tag, _project.ID);
-				AllTags = new(AllTags);
-				await AnnouncementHelper.Announce($"{tag.Title} selected");
 			}
 			else
 			{
 				await _tagRepository.DeleteItemAsync(tag, _project.ID);
-				AllTags = new(AllTags);
-				await AnnouncementHelper.Announce($"{tag.Title} unselected");
 			}
 		}
-		else
-		{
-			AllTags = new(AllTags);
-		}
+
+		AllTags = new(AllTags);
+		await AnnouncementHelper.Announce($"{tag.Title} {(tag.IsSelected ? "selected" : "unselected")}");
 	}
 
 	[RelayCommand]
@@ -280,4 +280,19 @@ private async Task CleanTasks()
 		OnPropertyChanged(nameof(HasCompletedTasks));
 		await AppShell.DisplayToastAsync("All cleaned up!");
 	}
-}
+
+	[RelayCommand]
+	private async Task SelectionChanged(object parameter)
+	{
+		if (parameter is IEnumerable<object> enumerableParameter)
+		{
+			var changed = enumerableParameter.OfType<Tag>().ToList();
+
+			if (changed.Count == 0 && SelectedTags is not null)
+				changed = SelectedTags.OfType<Tag>().Except(enumerableParameter.OfType<Tag>()).ToList();
+
+			if (changed.Count == 1)
+				await ToggleTag(changed[0]);
+		}
+	}
+}

9.0/Apps/DeveloperBalance/PageModels/ProjectListPageModel.cs

@@ -1,4 +1,3 @@
-#nullable disable
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using DeveloperBalance.Data;
@@ -14,6 +13,9 @@ public partial class ProjectListPageModel : ObservableObject
 	[ObservableProperty]
 	private List<Project> _projects = [];
 
+	[ObservableProperty]
+	private Project? selectedProject;
+
 	public ProjectListPageModel(ProjectRepository projectRepository)
 	{
 		_projectRepository = projectRepository;
@@ -26,8 +28,8 @@ private async Task Appearing()
 	}
 
 	[RelayCommand]
-	Task NavigateToProject(Project project)
-		=> Shell.Current.GoToAsync($"project?id={project.ID}");
+	Task? NavigateToProject(Project project)
+		=> project is null ? null : Shell.Current.GoToAsync($"project?id={project.ID}");
 
 	[RelayCommand]
 	async Task AddProject()