Merge pull request #15 from Khiro95/dev

Update to v3.1

AwqatSalaat.Common/AwqatSalaat.Common.csproj

@@ -5,6 +5,14 @@
     <RootNamespace>AwqatSalaat</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Assets\countries.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\countries.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

AwqatSalaat.Common/Data/Country.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace AwqatSalaat.Data
+{
+    public class Country
+    {
+        public string Name { get; }
+        public string Code { get; }
+
+        [JsonConstructor]
+        private Country(string name, string code)
+        {
+            Name = name;
+            Code = code;
+        }
+    }
+}

AwqatSalaat.Common/Data/LocationDetectionMode.cs

@@ -0,0 +1,9 @@
+namespace AwqatSalaat.Data
+{
+    public enum LocationDetectionMode
+    {
+        ByCountryCode,
+        ByCoordinates,
+        ByQuery
+    }
+}

AwqatSalaat.Common/Data/School.cs

@@ -0,0 +1,8 @@
+namespace AwqatSalaat.Data
+{
+    public enum School
+    {
+        Standard = 0,
+        Hanafi = 1,
+    }
+}

AwqatSalaat.Common/Helpers/CountriesProvider.cs

@@ -0,0 +1,38 @@
+using AwqatSalaat.Data;
+using Newtonsoft.Json;
+using System.IO;
+
+namespace AwqatSalaat.Helpers
+{
+    public static class CountriesProvider
+    {
+        private static Country[] s_countries;
+
+        public static Country[] GetCountries()
+        {
+            if (s_countries is null)
+            {
+                var asm = typeof(CountriesProvider).Assembly;
+                using (Stream stream = asm.GetManifestResourceStream("AwqatSalaat.Assets.countries.json"))
+                {
+                    s_countries = DeserializeFromStream<Country[]>(stream);
+                }
+            }
+
+            return s_countries;
+        }
+
+        private static T DeserializeFromStream<T>(Stream stream)
+        {
+            var serializer = new JsonSerializer();
+
+            using (var reader = new StreamReader(stream))
+            {
+                using (var jsonTextReader = new JsonTextReader(reader))
+                {
+                    return serializer.Deserialize<T>(jsonTextReader);
+                }
+            }
+        }
+    }
+}

AwqatSalaat.Common/Helpers/LocaleManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 
 namespace AwqatSalaat.Helpers
@@ -15,6 +16,7 @@ public class LocaleManager : INotifyPropertyChanged
         private string _current;
 
         public string Current { get => _current; set => SetLocale(value); }
+        public CultureInfo CurrentCulture { get; private set; }
 
         public event EventHandler CurrentChanged;
         public event PropertyChangedEventHandler PropertyChanged;
@@ -25,7 +27,7 @@ private LocaleManager()
 
             if (string.IsNullOrEmpty(lang))
             {
-                lang = System.Globalization.CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+                lang = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
             }
 
             SetLocale(lang);
@@ -61,11 +63,13 @@ private void SetLocale(string locale)
                 locale = "en";
             }
 
-            string previous = _current;
             _current = locale;
-            Properties.Resources.Culture = new System.Globalization.CultureInfo(locale);
+            CurrentCulture = new CultureInfo(locale);
+            Properties.Resources.Culture = CurrentCulture;
             Properties.Settings.Default.DisplayLanguage = locale;
+
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Current)));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentCulture)));
             CurrentChanged?.Invoke(this, EventArgs.Empty);
         }
     }

AwqatSalaat.Common/Helpers/ObservableObject.cs

@@ -62,13 +62,16 @@ protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
             }
         }
 
-        protected void SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
         {
             if (!Equals(field, value))
             {
                 field = value;
                 OnPropertyChanged(propertyName);
+                return true;
             }
+
+            return false;
         }
     }
 }

AwqatSalaat.Common/Helpers/RelayCommand.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Windows.Input;
 
 namespace AwqatSalaat.Helpers
@@ -14,6 +15,7 @@ public class RelayCommand : ICommand
     {
         private readonly Action<object> _execute;
         private readonly Predicate<object> _canExecute;
+        private readonly SynchronizationContext _syncContext;
         /// <summary>
         /// Raised when RaiseCanExecuteChanged is called.
         /// </summary>
@@ -35,6 +37,7 @@ public RelayCommand(Action<object> execute, Predicate<object> canExecute)
         {
             _execute = execute ?? throw new ArgumentNullException("execute");
             _canExecute = canExecute;
+            _syncContext = SynchronizationContext.Current;
         }
         /// <summary>
         /// Determines whether this RelayCommand can execute in its current state.
@@ -66,7 +69,18 @@ public void Execute(object parameter)
         /// </summary>
         public void RaiseCanExecuteChanged()
         {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            if (_syncContext is null)
+            {
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            }
+            else
+            {
+                _syncContext.Post(arg =>
+                {
+                    var _this = (RelayCommand)arg;
+                    _this.CanExecuteChanged?.Invoke(_this, EventArgs.Empty);
+                }, this);
+            }
         }
     }
 }

AwqatSalaat.Common/Helpers/SystemInfos.cs

@@ -73,7 +73,7 @@ public static bool IsTaskBarCentered()
                 {
                     if (key != null)
                     {
-                        int value = Convert.ToInt32(key.GetValue("TaskbarAl", 0));
+                        int value = Convert.ToInt32(key.GetValue("TaskbarAl", 1));
                         return value == 1;
                     }
 

AwqatSalaat.Common/Helpers/TimeZoneHelper.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using TimeZoneConverter;
+
+namespace AwqatSalaat.Helpers
+{
+    internal static class TimeZoneHelper
+    {
+        private static readonly Dictionary<string, TimeZoneInfo> tzInfoCache = new Dictionary<string, TimeZoneInfo>();
+
+        public static string GetIanaTimeZone()
+        {
+            var id = TimeZoneInfo.Local.Id;
+
+            if (TZConvert.TryWindowsToIana(id, out string ianaTimeZone))
+            {
+                return ianaTimeZone;
+            }
+
+            return null;
+        }
+
+        public static DateTime ConvertDateTimeToLocal(DateTime dateTime, string ianaTimeZone)
+        {
+            TimeZoneInfo timeZoneInfo = null;
+
+            if (!string.IsNullOrEmpty(ianaTimeZone) && !tzInfoCache.TryGetValue(ianaTimeZone, out timeZoneInfo))
+            {
+                if (TZConvert.TryIanaToWindows(ianaTimeZone, out string timeZoneId))
+                {
+                    timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+
+                    tzInfoCache[ianaTimeZone] = timeZoneInfo;
+                }
+            }
+
+            if (timeZoneInfo is null || timeZoneInfo.BaseUtcOffset == TimeZoneInfo.Local.BaseUtcOffset)
+            {
+                return dateTime;
+            }
+
+            dateTime = TimeZoneInfo.ConvertTimeToUtc(dateTime, timeZoneInfo);
+
+            return TimeZoneInfo.ConvertTimeFromUtc(dateTime, TimeZoneInfo.Local);
+        }
+    }
+}

AwqatSalaat.Common/Interop/Native.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace AwqatSalaat.Interop
 {
     public delegate IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+    public delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
 
     public static class User32
     {
@@ -14,6 +16,9 @@ public static int MessageBox(IntPtr HWND, string lpText, string lpCaption, Messa
         public static int MessageBox(IntPtr HWND, string lpText, string lpCaption, MessageBoxButtons buttons, MessageBoxIcon icon)
             => MessageBox(HWND, lpText, lpCaption, (uint)buttons | (uint)icon);
 
+        [DllImport("user32.dll")]
+        public static extern uint GetDpiForWindow([In] IntPtr hWnd);
+
         [DllImport("user32.dll")]
         public static extern bool GetWindowRect([In] IntPtr hWnd, [Out] out RECT lpRect);
 
@@ -60,6 +65,15 @@ public static int MessageBox(IntPtr HWND, string lpText, string lpCaption, Messa
 
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         public static extern bool DestroyWindow(IntPtr hwnd);
+
+        [DllImport("user32.dll")]
+        public static extern bool EnumChildWindows(IntPtr hWndParent, EnumWindowProc lpEnumFunc, IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetAncestor(IntPtr hwnd, GetAncestorFlags gaFlags);
+
+        [DllImport("user32.dll", CharSet = CharSet.Ansi)]
+        public static extern int GetClassName(IntPtr hwnd, [Out] StringBuilder lpClassName, int nMaxCount);
     }
 
     public static class Dwmapi
@@ -146,6 +160,13 @@ public enum MessageBoxIcon : uint
         MB_ICONSTOP = MB_ICONHAND,
     }
 
+    public enum GetAncestorFlags
+    {
+        GA_PARENT = 1,
+        GA_ROOT = 2,
+        GA_ROOTOWNER = 3,
+    }
+
     public enum AccentState
     {
         ACCENT_DISABLED = 0,
@@ -288,7 +309,8 @@ public enum AlphaFormat : byte
 
     public enum WindowMessage : uint
     {
-        WM_SETREDRAW = 0x000B
+        WM_SETREDRAW = 0x000B,
+        WM_SETTINGCHANGE = 0x001A
     }
 
     [Flags]