Merge pull request #196 from edgiardina/calendar-sync

Replace IReminderService with ICalendarStore implementation

IfpaMaui.csproj

@@ -59,6 +59,7 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 		<PackageReference Include="PinballApi" Version="3.1.2" />
+		<PackageReference Include="Plugin.Maui.CalendarStore" Version="2.0.0" />
 		<PackageReference Include="Plugin.Maui.NativeCalendar" Version="0.9.0" />
 		<PackageReference Include="Scrutor" Version="5.0.2" />
 		<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />

MauiProgram.cs

@@ -1,25 +1,26 @@
-using Ifpa.ViewModels;
+using CommunityToolkit.Maui;
+using CommunityToolkit.Maui.ApplicationModel;
+using Ifpa.BackgroundJobs;
+using Ifpa.Controls;
+using Ifpa.Interfaces;
 using Ifpa.Models;
-using Microsoft.Extensions.Configuration;
-using Ifpa.Views;
-using Syncfusion.Maui.Core.Hosting;
-using CommunityToolkit.Maui;
+using Ifpa.Platforms.Renderers;
+using Ifpa.Platforms.Services;
 using Ifpa.Services;
-using Ifpa.Interfaces;
+using Ifpa.ViewModels;
+using Ifpa.Views;
 using MauiIcons.Fluent;
-using Ifpa.BackgroundJobs;
-using Shiny.Infrastructure;
-using PinballApi;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Maui.Controls.Compatibility.Hosting;
-using SkiaSharp.Views.Maui.Controls.Hosting;
+using PinballApi;
+using Plugin.Maui.CalendarStore;
+using Plugin.Maui.NativeCalendar;
 using Serilog;
 using Shiny;
-using CommunityToolkit.Maui.ApplicationModel;
+using Shiny.Infrastructure;
+using SkiaSharp.Views.Maui.Controls.Hosting;
+using Syncfusion.Maui.Core.Hosting;
 using The49.Maui.BottomSheet;
-using Ifpa.Platforms.Renderers;
-using Ifpa.Platforms.Services;
-using Ifpa.Controls;
-using Plugin.Maui.NativeCalendar;
 
 namespace Ifpa;
 
@@ -61,9 +62,9 @@ public static MauiApp CreateMauiApp()
             {
                 //TODO: it's unclear whether icons must be in the Resources/Images folder or in the Platforms/{platform} folder
                 essentials
-                    .AddAppAction("calendar", "Calendar", "IFPA Tournament Calendar", "calendar")
-                    .AddAppAction("my-stats", "My Stats", "Your IFPA player data", "mystats")
-                    .AddAppAction("rankings/player-search", "Player Search", "Search for other players in the IFPA database", "search")
+                    .AddAppAction("calendar", Strings.AppShell_Calendar, "IFPA Tournament Calendar", "calendar")
+                    .AddAppAction("my-stats", Strings.AppShell_MyStats, "Your IFPA player data", "mystats")
+                    .AddAppAction("rankings/player-search", Strings.PlayerSearchPage_Title, "Search for other players in the IFPA database", "search")
                     .OnAppAction(App.HandleAppActions);
 
                 essentials.UseVersionTracking();
@@ -122,13 +123,14 @@ static MauiAppBuilder RegisterIfpaServices(this MauiAppBuilder builder)
 
         s.AddSingleton<BlogPostService>();
         s.AddSingleton<NotificationService>();
-        s.AddTransient<IReminderService, ReminderService>();
         s.AddSingleton<IToolbarBadgeService, ToolbarBadgeService>();
 
         s.AddSingleton(x => new PinballRankingApiV2(appSettings.IfpaApiKey));
         s.AddSingleton(x => new PinballRankingApi(appSettings.IfpaApiKey));
-        s.AddSingleton<IGeocoding>(Geocoding.Default);
-        s.AddSingleton<IBadge>(Badge.Default);
+        s.AddSingleton(Geocoding.Default);
+        s.AddSingleton(Badge.Default);
+        s.AddSingleton(CalendarStore.Default);
+        s.AddSingleton(Map.Default);
 
         return builder;
     }

Models/ActivityFeedItem.cs → Models/Database/ActivityFeedItem.cs

@@ -1,7 +1,6 @@
 using SQLite;
-using System;
 
-namespace Ifpa.Models
+namespace Ifpa.Models.Database
 {
     public class ActivityFeedItem
     {

Models/ActivityFeedType.cs → Models/Database/ActivityFeedType.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ifpa.Models
+namespace Ifpa.Models.Database
 {
     public enum ActivityFeedType
     {

Models/Favorite.cs → Models/Database/Favorite.cs

@@ -1,7 +1,6 @@
 using SQLite;
-using System;
 
-namespace Ifpa.Models
+namespace Ifpa.Models.Database
 {
     public class Favorite
     {

Services/LocalDatabase.cs

@@ -1,4 +1,4 @@
-using Ifpa.Models;
+using Ifpa.Models.Database;
 using SQLite;
 
 namespace Ifpa.Services

Services/NotificationService.cs

@@ -1,5 +1,6 @@
 using CommunityToolkit.Maui.ApplicationModel;
 using Ifpa.Models;
+using Ifpa.Models.Database;
 using Microsoft.Extensions.Logging;
 using PinballApi;
 using PinballApi.Models.WPPR;

Strings.resx

@@ -642,6 +642,18 @@
   <data name="CalendarDetailPage_SharePrompt" xml:space="preserve">
     <value>Share Upcoming Tournament</value>
   </data>
+  <data name="CalendarDetailPage_SelectCalendarPrompt" xml:space="preserve">
+    <value>Select which calendar to add this tournament to</value>
+  </data>
+  <data name="CalendarDetailPage_TournamentAdded" xml:space="preserve">
+    <value>Tournament added to your Calendar</value>
+  </data>
+  <data name="CalendarDetailPage_TournamentNotAdded" xml:space="preserve">
+    <value>Unable to add Tournament to your Calendar</value>
+  </data>
+  <data name="CalendarDetailPage_AddCalendarPermissionRequest" xml:space="preserve">
+    <value>IFPA Companion requires your permission before adding items to your Calendar</value>
+  </data>
   <data name="CalendarDetailPage_FinalsFormat" xml:space="preserve">
     <value>Finals Format</value>
   </data>
@@ -675,4 +687,7 @@
   <data name="TournamentSearchPage_Placeholder" xml:space="preserve">
     <value>Search for tournaments by name</value>
   </data>
+  <data name="PermissionRequired" xml:space="preserve">
+    <value>Permission Required</value>
+  </data>
 </root>

ViewModels/ActivityFeedViewModel.cs

@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.Input;
 using Ifpa.Models;
+using Ifpa.Models.Database;
 using Ifpa.Services;
 using Microsoft.Extensions.Logging;
 using PinballApi;