- Adjust for nullable reference types

- Set version to 1.2.0
SirJohnK · Oct 10, 2023 · d9c3c45 · d9c3c45
1 parent ad41f8a
commit d9c3c45
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 54 deletions.
diff --git a/LocalizationResourceManager.Maui.Sample/LocalizationResourceManager.Maui.Sample.csproj b/LocalizationResourceManager.Maui.Sample/LocalizationResourceManager.Maui.Sample.csproj
@@ -19,7 +19,7 @@
 		<ApplicationIdGuid>73206c16-0bbf-4382-a442-f90b21cbca3c</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.2.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>

diff --git a/LocalizationResourceManager.Maui.Sample/MainPage.xaml.cs b/LocalizationResourceManager.Maui.Sample/MainPage.xaml.cs
@@ -8,7 +8,15 @@ public partial class MainPage : ContentPage
         private int count = 0;
         private readonly ILocalizationResourceManager resourceManager;
 
-        public int Count => count;
+        public int Count
+        {
+            get => count;
+            set
+            {
+                count = value;
+                OnPropertyChanged(nameof(Count));
+            }
+        }
 
         public LocalizedString HelloWorld { get; }
         public LocalizedString CurrentCulture { get; }
@@ -24,11 +32,7 @@ public MainPage(ILocalizationResourceManager resourceManager)
             BindingContext = this;
         }
 
-        private void OnCounterClicked(object sender, EventArgs e)
-        {
-            count++;
-            OnPropertyChanged(nameof(Count));
-        }
+        private void OnCounterClicked(object sender, EventArgs e) => Count++;
 
         private void OnToggleLanguage(object sender, EventArgs e)
         {

diff --git a/LocalizationResourceManager.Maui/LocalizationResourceManager.Maui.csproj b/LocalizationResourceManager.Maui/LocalizationResourceManager.Maui.csproj
@@ -27,10 +27,10 @@
 		<RepositoryUrl>https://github.com/SirJohnK/LocalizationResourceManager.Maui</RepositoryUrl>
 		<PackageTags>dotnet,dotnetmaui,localization</PackageTags>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-		<AssemblyVersion>1.1.0.0</AssemblyVersion>
-		<FileVersion>1.1.0.0</FileVersion>
-		<PackageReleaseNotes>- Update to .NET 7.</PackageReleaseNotes>
-		<Version>1.1.0</Version>
+		<AssemblyVersion>1.2.0.0</AssemblyVersion>
+		<FileVersion>1.2.0.0</FileVersion>
+		<PackageReleaseNotes>- Add TranslateBindingExtension for custom binding with format and plural support in XAML.</PackageReleaseNotes>
+		<Version>1.2.0</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/LocalizationResourceManager.Maui/TranslateBindingExtension.cs b/LocalizationResourceManager.Maui/TranslateBindingExtension.cs
@@ -16,25 +16,25 @@ public class TranslateBindingExtension : IMarkupExtension<BindingBase>, IMultiVa
     public string StringFormat { get; set; } = "{0}";
 
     /// <inheritdoc/>
-    public IValueConverter Converter { get; set; } = null;
+    public IValueConverter? Converter { get; set; } = null;
 
     /// <inheritdoc/>
-    public object ConverterParameter { get; set; } = null;
+    public object? ConverterParameter { get; set; } = null;
 
     /// <inheritdoc/>
-    public object Source { get; set; } = null;
+    public object? Source { get; set; } = null;
 
     /// <inheritdoc/>
     public bool TranslateValue { get; set; } = false;
 
     /// <inheritdoc/>
-    public string TranslateFormat { get; set; }
+    public string? TranslateFormat { get; set; }
 
     /// <inheritdoc/>
-    public string TranslateOne { get; set; }
+    public string? TranslateOne { get; set; }
 
     /// <inheritdoc/>
-    public string TranslateZero { get; set; }
+    public string? TranslateZero { get; set; }
 
     /// <inheritdoc/>
     public object ProvideValue(IServiceProvider serviceProvider)
@@ -51,70 +51,49 @@ BindingBase IMarkupExtension<BindingBase>.ProvideValue(IServiceProvider serviceP
             Mode = Mode,
             Bindings = new Collection<BindingBase>
             {
-                new Binding(Path, Mode, Converter, ConverterParameter, null, Source),
-                new Binding(nameof(LocalizationResourceManager.CurrentCulture), BindingMode.OneWay, null, null, null, LocalizationResourceManager.Current)
+                new Binding(Path, Mode, Converter, ConverterParameter, source: Source),
+                new Binding(nameof(LocalizationResourceManager.CurrentCulture), BindingMode.OneWay, source:LocalizationResourceManager.Current)
             }
         };
     }
 
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        if (values.Length == 0 || values[0] == null)
+        var value = values?.FirstOrDefault();
+        if (value is null)
         {
-            return "";
+            return string.Empty;
         }
 
-        if (!string.IsNullOrEmpty(TranslateZero) && IsZero(values[0]))
+        if (!string.IsNullOrWhiteSpace(TranslateZero) && IsZero(value))
         {
-            return LocalizationResourceManager.Current[TranslateZero, values];
+            return LocalizationResourceManager.Current[TranslateZero, value];
         }
 
-        if (!string.IsNullOrEmpty(TranslateOne) && IsOne(values[0]))
+        if (!string.IsNullOrWhiteSpace(TranslateOne) && IsOne(value))
         {
-            return LocalizationResourceManager.Current[TranslateOne, values];
+            return LocalizationResourceManager.Current[TranslateOne, value];
         }
 
-        if (!string.IsNullOrEmpty(TranslateFormat))
+        if (!string.IsNullOrWhiteSpace(TranslateFormat))
         {
-            return LocalizationResourceManager.Current[TranslateFormat, values];
+            return LocalizationResourceManager.Current[TranslateFormat, value];
         }
 
         if (TranslateValue)
         {
-            return LocalizationResourceManager.Current[values[0].ToString()];
+            return LocalizationResourceManager.Current[$"{value}"];
         }
 
-        return values[0];
+        return value;
     }
 
-    static bool IsZero(object value)
-    {
-        if (value == null)
-        {
-            return false;
-        }
-        if (value.GetType() == typeof(int) && (int)value == 0)
-        {
-            return true;
-        }
-        return false;
-    }
+    private static bool IsZero(object value) => (value is int number && number == 0);
 
-    static bool IsOne(object value)
-    {
-        if (value == null)
-        {
-            return false;
-        }
-        if (value.GetType() == typeof(int) && (int)value == 1)
-        {
-            return true;
-        }
-        return false;
-    }
+    private static bool IsOne(object value) => (value is int number && number == 1);
 
     public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
     {
         throw new NotImplementedException();
     }
-}
+}