From 2592e0d22d351669dcbf74e450f30060531c9e95 Mon Sep 17 00:00:00 2001
From: Khiro95 <126525910+Khiro95@users.noreply.github.com>
Date: Sun, 7 Apr 2024 17:30:22 +0100
Subject: [PATCH 01/23] Move the main components to a separate assembly
AwqatSalaat.Core
---
AwqatSalaat.Core/AwqatSalaat.Core.csproj | 42 +++++++++
.../Data/Location.cs | 0
.../Data/NetworkException.cs | 0
.../Data/PrayerTimes.cs | 0
.../Data/PrayerTimesService.cs | 0
.../Helpers/LocaleManager.cs | 0
AwqatSalaat.Core/Helpers/ObservableObject.cs | 67 +++++++++++++++
AwqatSalaat.Core/Helpers/RelayCommand.cs | 72 ++++++++++++++++
.../Helpers/SystemInfos.cs | 0
.../Helpers/TimeStamp.cs | 0
.../Interop/Native.cs | 0
.../Properties/Resources.Designer.cs | 0
.../Properties/Resources.ar.resx | 86 +++++++++----------
.../Properties/Resources.resx | 0
.../Properties/Settings.Designer.cs | 0
AwqatSalaat.Core/Properties/Settings.settings | 41 +++++++++
.../Services/AlAdhan/AlAdhanApiException.cs | 0
.../Services/AlAdhan/AlAdhanClient.cs | 2 +-
.../Services/AlAdhan/AlAdhanMethod.cs | 0
.../Services/AlAdhan/AlAdhanRequest.cs | 2 +-
.../Services/AlAdhan/DataResponse.cs | 0
.../Services/AlAdhan/Date.cs | 0
.../Services/AlAdhan/DayData.cs | 0
.../Services/AlAdhan/ErrorResponse.cs | 0
.../Services/AlAdhan/Meta.cs | 0
.../Services/AlAdhan/MonthResponse.cs | 0
.../Services/AlAdhan/Response.cs | 0
.../Services/AlAdhan/Times.cs | 0
.../Services/IRequest.cs | 0
.../Services/IServiceClient.cs | 0
.../IslamicFinder/EntireMonthResponse.cs | 2 +-
.../IslamicFinderApiException.cs | 0
.../IslamicFinder/IslamicFinderClient.cs | 2 +-
.../IslamicFinder/IslamicFinderMethod.cs | 0
.../IslamicFinder/IslamicFinderRequest.cs | 2 +-
.../Services/IslamicFinder/Response.cs | 2 +-
.../Services/IslamicFinder/Settings.cs | 2 +-
.../IslamicFinder/SingleDayResponse.cs | 0
.../Services/ServiceData.cs | 0
.../ViewModels/PrayerTimeViewModel.cs | 6 +-
.../ViewModels/WidgetSettingsViewModel.cs | 2 +-
.../ViewModels/WidgetViewModel.cs | 19 ++--
AwqatSalaat.sln | 22 ++++-
AwqatSalaat/AwqatSalaat.csproj | 27 +-----
AwqatSalaat/Helpers/ObservableObject.cs | 24 ------
AwqatSalaat/Helpers/RelayCommand.cs | 35 --------
AwqatSalaat/Properties/Settings.settings | 39 ---------
AwqatSalaat/UI/Views/SettingsPanel.xaml | 8 +-
AwqatSalaat/UI/Views/WidgetPanel.xaml | 3 +-
AwqatSalaat/UI/Views/WidgetSummary.xaml | 2 +-
AwqatSalaat/UI/Views/WidgetSummary.xaml.cs | 2 +-
51 files changed, 317 insertions(+), 194 deletions(-)
create mode 100644 AwqatSalaat.Core/AwqatSalaat.Core.csproj
rename {AwqatSalaat => AwqatSalaat.Core}/Data/Location.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Data/NetworkException.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Data/PrayerTimes.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Data/PrayerTimesService.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Helpers/LocaleManager.cs (100%)
create mode 100644 AwqatSalaat.Core/Helpers/ObservableObject.cs
create mode 100644 AwqatSalaat.Core/Helpers/RelayCommand.cs
rename {AwqatSalaat => AwqatSalaat.Core}/Helpers/SystemInfos.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Helpers/TimeStamp.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Interop/Native.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Properties/Resources.Designer.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Properties/Resources.ar.resx (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Properties/Resources.resx (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Properties/Settings.Designer.cs (100%)
create mode 100644 AwqatSalaat.Core/Properties/Settings.settings
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/AlAdhanApiException.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/AlAdhanClient.cs (97%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/AlAdhanMethod.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/AlAdhanRequest.cs (93%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/DataResponse.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/Date.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/DayData.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/ErrorResponse.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/Meta.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/MonthResponse.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/Response.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/AlAdhan/Times.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IRequest.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IServiceClient.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/EntireMonthResponse.cs (95%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/IslamicFinderApiException.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/IslamicFinderClient.cs (97%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/IslamicFinderMethod.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/IslamicFinderRequest.cs (92%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/Response.cs (97%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/Settings.cs (89%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/IslamicFinder/SingleDayResponse.cs (100%)
rename {AwqatSalaat => AwqatSalaat.Core}/Services/ServiceData.cs (100%)
rename {AwqatSalaat/UI => AwqatSalaat.Core}/ViewModels/PrayerTimeViewModel.cs (94%)
rename {AwqatSalaat/UI => AwqatSalaat.Core}/ViewModels/WidgetSettingsViewModel.cs (98%)
rename {AwqatSalaat/UI => AwqatSalaat.Core}/ViewModels/WidgetViewModel.cs (94%)
delete mode 100644 AwqatSalaat/Helpers/ObservableObject.cs
delete mode 100644 AwqatSalaat/Helpers/RelayCommand.cs
delete mode 100644 AwqatSalaat/Properties/Settings.settings
diff --git a/AwqatSalaat.Core/AwqatSalaat.Core.csproj b/AwqatSalaat.Core/AwqatSalaat.Core.csproj
new file mode 100644
index 0000000..dfc3114
--- /dev/null
+++ b/AwqatSalaat.Core/AwqatSalaat.Core.csproj
@@ -0,0 +1,42 @@
+
+
+
+ netstandard2.0
+ AwqatSalaat
+
+
+
+
+
+
+
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ True
+ Settings.settings
+
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+ PublicSettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
diff --git a/AwqatSalaat/Data/Location.cs b/AwqatSalaat.Core/Data/Location.cs
similarity index 100%
rename from AwqatSalaat/Data/Location.cs
rename to AwqatSalaat.Core/Data/Location.cs
diff --git a/AwqatSalaat/Data/NetworkException.cs b/AwqatSalaat.Core/Data/NetworkException.cs
similarity index 100%
rename from AwqatSalaat/Data/NetworkException.cs
rename to AwqatSalaat.Core/Data/NetworkException.cs
diff --git a/AwqatSalaat/Data/PrayerTimes.cs b/AwqatSalaat.Core/Data/PrayerTimes.cs
similarity index 100%
rename from AwqatSalaat/Data/PrayerTimes.cs
rename to AwqatSalaat.Core/Data/PrayerTimes.cs
diff --git a/AwqatSalaat/Data/PrayerTimesService.cs b/AwqatSalaat.Core/Data/PrayerTimesService.cs
similarity index 100%
rename from AwqatSalaat/Data/PrayerTimesService.cs
rename to AwqatSalaat.Core/Data/PrayerTimesService.cs
diff --git a/AwqatSalaat/Helpers/LocaleManager.cs b/AwqatSalaat.Core/Helpers/LocaleManager.cs
similarity index 100%
rename from AwqatSalaat/Helpers/LocaleManager.cs
rename to AwqatSalaat.Core/Helpers/LocaleManager.cs
diff --git a/AwqatSalaat.Core/Helpers/ObservableObject.cs b/AwqatSalaat.Core/Helpers/ObservableObject.cs
new file mode 100644
index 0000000..95bd254
--- /dev/null
+++ b/AwqatSalaat.Core/Helpers/ObservableObject.cs
@@ -0,0 +1,67 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace AwqatSalaat.Helpers
+{
+ // using SynchronizationContext is necessary here when this class is used with Windows App SDK
+ // because WinUI 3 still doesn't support dispatching PropertyChanged event to UI thread
+ public class ObservableObject : INotifyPropertyChanged
+ {
+ private class PropertyChangedEventState
+ {
+ public readonly ObservableObject Sender;
+ public readonly PropertyChangedEventArgs Args;
+
+ public PropertyChangedEventState(ObservableObject sender, PropertyChangedEventArgs args)
+ {
+ Sender = sender;
+ Args = args;
+ }
+ }
+
+ private event PropertyChangedEventHandler propertyChanged;
+ private SynchronizationContext synchronizationContext;
+
+ public event PropertyChangedEventHandler PropertyChanged
+ {
+ add
+ {
+ propertyChanged += value;
+ synchronizationContext = synchronizationContext ?? SynchronizationContext.Current;
+ }
+ remove
+ {
+ propertyChanged -= value;
+ }
+ }
+
+ protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ var args = new PropertyChangedEventArgs(propertyName);
+
+ if (synchronizationContext is null)
+ {
+ propertyChanged?.Invoke(this, args);
+ }
+ else
+ {
+ synchronizationContext.Post((state) =>
+ {
+ PropertyChangedEventState eventState = (PropertyChangedEventState)state;
+ eventState.Sender.propertyChanged?.Invoke(eventState.Sender, eventState.Args);
+ },
+ new PropertyChangedEventState(this, args));
+ }
+ }
+
+ protected void SetProperty(ref T field, T value, [CallerMemberName] string propertyName = null)
+ {
+ if (!Equals(field, value))
+ {
+ field = value;
+ OnPropertyChanged(propertyName);
+ }
+ }
+ }
+}
diff --git a/AwqatSalaat.Core/Helpers/RelayCommand.cs b/AwqatSalaat.Core/Helpers/RelayCommand.cs
new file mode 100644
index 0000000..e00ba2d
--- /dev/null
+++ b/AwqatSalaat.Core/Helpers/RelayCommand.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Windows.Input;
+
+namespace AwqatSalaat.Helpers
+{
+ ///
+ /// A command whose sole purpose is to relay its functionality
+ /// to other objects by invoking delegates.
+ /// The default return value for the CanExecute method is 'true'.
+ /// RaiseCanExecuteChanged needs to be called whenever
+ /// CanExecute is expected to return a different value.
+ ///
+ public class RelayCommand : ICommand
+ {
+ private readonly Action