Feature/minor fixes (#545)

* Updated copyright * Fixed binding to ObservableRangeCollection.Count when calling RemoveRange (#544) * Removed excess AndroidResource tags * Restored mistakenly deleted PropertyGroup * Fixed copyright * rename methods --------- Co-authored-by: Pavel Leonenko <pleonenko@halocollar.com> Co-authored-by: s.leushunou <siarhei.leushunou@softeq.com>
Softeq · Mar 27, 2024 · 4ea3f80 · 4ea3f80
1 parent 1e59f30
commit 4ea3f80
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 45 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,7 +12,7 @@
   <PropertyGroup>
     <Product>XToolkit</Product>
     <Company>Softeq Development Corporation</Company>
-    <Copyright>Copyright © 2023 Softeq Development Corporation</Copyright>
+    <Copyright>Copyright © 2024 Softeq Development Corporation</Copyright>
   </PropertyGroup>
 
 </Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Softeq
+Copyright (c) 2024 Softeq
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj b/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
     <ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj" />

diff --git a/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj b/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>

diff --git a/Softeq.XToolkit.Common/Collections/ObservableRangeCollection.cs b/Softeq.XToolkit.Common/Collections/ObservableRangeCollection.cs
@@ -303,6 +303,8 @@ public void RemoveRange(
                     Items.Remove(item);
                 }
 
+                OnPropertyChanged(EventArgsCache.CountPropertyChanged);
+                OnPropertyChanged(EventArgsCache.IndexerPropertyChanged);
                 OnCollectionChanged(EventArgsCache.ResetCollectionChanged);
 
                 return;

diff --git a/Softeq.XToolkit.Permissions.Droid/Permissions/Bluetooth.cs b/Softeq.XToolkit.Permissions.Droid/Permissions/Bluetooth.cs
@@ -20,15 +20,15 @@ public override (string, bool)[] RequiredPermissions
 
                 // When targeting Android 11 or lower, AccessFineLocation is required for Bluetooth.
                 // For Android 12 and above, it is optional.
-                if (SdkVersion.IsBuildVersionLower(BuildVersionCodes.R) ||
+                if (SdkVersion.IsTargetSdkLower(BuildVersionCodes.R) ||
                     EssentialsPermissions.IsDeclaredInManifest(Manifest.Permission.AccessFineLocation))
                 {
                     permissions.Add((Manifest.Permission.AccessFineLocation, true));
                 }
 
 #if __ANDROID_31__
-                if (SdkVersion.IsBuildVersionAtLeast(BuildVersionCodes.S) &&
-                    SdkVersion.IsDeviceVersionAtLeast(BuildVersionCodes.S))
+                if (SdkVersion.IsTargetSdkAtLeast(BuildVersionCodes.S) &&
+                    SdkVersion.IsBuildSdkAtLeast(BuildVersionCodes.S))
                 {
                     if (EssentialsPermissions.IsDeclaredInManifest(Manifest.Permission.BluetoothScan))
                     {

diff --git a/Softeq.XToolkit.Permissions.Droid/Permissions/Notifications.cs b/Softeq.XToolkit.Permissions.Droid/Permissions/Notifications.cs
@@ -18,8 +18,8 @@ public override (string, bool)[] RequiredPermissions
 #if __ANDROID_33__
 #pragma warning disable CA1416
                 var isSupport =
-                    SdkVersion.IsBuildVersionAtLeast(BuildVersionCodes.Tiramisu) &&
-                    SdkVersion.IsDeviceVersionAtLeast(BuildVersionCodes.Tiramisu) &&
+                    SdkVersion.IsTargetSdkAtLeast(BuildVersionCodes.Tiramisu) &&
+                    SdkVersion.IsBuildSdkAtLeast(BuildVersionCodes.Tiramisu) &&
                     EssentialsPermissions.IsDeclaredInManifest(Manifest.Permission.PostNotifications);
 
                 return isSupport ?

diff --git a/Softeq.XToolkit.Permissions.Droid/SdkVersion.cs b/Softeq.XToolkit.Permissions.Droid/SdkVersion.cs
@@ -8,17 +8,17 @@ namespace Softeq.XToolkit.Permissions.Droid
 {
     internal static class SdkVersion
     {
-        public static bool IsBuildVersionLower(BuildVersionCodes versionCode)
+        public static bool IsTargetSdkLower(BuildVersionCodes versionCode)
         {
             return Platform.AppContext.ApplicationInfo?.TargetSdkVersion <= versionCode;
         }
 
-        public static bool IsBuildVersionAtLeast(BuildVersionCodes versionCode)
+        public static bool IsTargetSdkAtLeast(BuildVersionCodes versionCode)
         {
             return Platform.AppContext.ApplicationInfo?.TargetSdkVersion >= versionCode;
         }
 
-        public static bool IsDeviceVersionAtLeast(BuildVersionCodes versionCode)
+        public static bool IsBuildSdkAtLeast(BuildVersionCodes versionCode)
         {
             return Build.VERSION.SdkInt >= versionCode;
         }

diff --git a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj" />
     <ProjectReference Include="..\Softeq.XToolkit.Permissions\Softeq.XToolkit.Permissions.csproj" />

diff --git a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
     <ProjectReference Include="..\Softeq.XToolkit.PushNotifications\Softeq.XToolkit.PushNotifications.csproj" />

diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
     <ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj" />

diff --git a/...q.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj b/...q.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj
@@ -14,10 +14,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
     <ProjectReference Include="..\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj" />

diff --git a/nuget/Softeq.XToolkit.Bindings.nuspec b/nuget/Softeq.XToolkit.Bindings.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/bindings.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Bindings implementation based on INotifyPropertyChanged interface.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, bindings</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.Common.nuspec b/nuget/Softeq.XToolkit.Common.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/common.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>The most common components without dependencies that can be reused in any project.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, kit</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.Permissions.nuspec b/nuget/Softeq.XToolkit.Permissions.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/permissions.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Simple cross platform plugin to request and check permissions for Android and iOS.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, permissions</tags>
     <releaseNotes/>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.PushNotifications.nuspec b/nuget/Softeq.XToolkit.PushNotifications.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/push-notifications.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Simple cross platform plugin to use push-notifications for Android and iOS.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, push-notifications, firebase, apns, fcm</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.Remote.nuspec b/nuget/Softeq.XToolkit.Remote.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/remote.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Advanced HttpClient infrastructure for mobile applications.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, remote, http, rest, api, auth</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/essentials.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Library over the Softeq.XToolkit.WhiteLabel that contains optional components for any application.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, android, ios, whitelabel, xamarin, essentials, imagepicker, picker</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/forms.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Integration library for using Softeq.XToolkit.WhiteLabel in Xamarin.Forms projects.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, whitelabel, xamarin, forms, xamarinforms, xamarin.forms</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/nuget/Softeq.XToolkit.WhiteLabel.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.nuspec
@@ -11,7 +11,7 @@
     <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel.html</projectUrl>
     <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>XToolkit.WhiteLabel is a collection of "lego" components for fast create cross-platform mobile applications with Xamarin, based on XToolkit.</description>
-    <copyright>Copyright 2023 Softeq Development Corp.</copyright>
+    <copyright>Copyright 2024 Softeq Development Corp.</copyright>
     <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, whitelabel</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>

diff --git a/samples/Playground.Forms/Playground.Forms.Droid/Properties/AssemblyInfo.cs b/samples/Playground.Forms/Playground.Forms.Droid/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Softeq Development Corporation")]
 [assembly: AssemblyProduct("XToolkit")]
-[assembly: AssemblyCopyright("Copyright © Softeq Development Corporation 2020")]
+[assembly: AssemblyCopyright("Copyright © Softeq Development Corporation 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

diff --git a/samples/Playground.Forms/Playground.Forms.iOS/Properties/AssemblyInfo.cs b/samples/Playground.Forms/Playground.Forms.iOS/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Softeq Development Corporation")]
 [assembly: AssemblyProduct("XToolkit")]
-[assembly: AssemblyCopyright("Copyright © Softeq Development Corporation 2020")]
+[assembly: AssemblyCopyright("Copyright © Softeq Development Corporation 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

diff --git a/samples/Playground/Playground.Droid/Playground.Droid.csproj b/samples/Playground/Playground.Droid/Playground.Droid.csproj
@@ -21,7 +21,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
     <AndroidResource Include="Resources\**\*.png" />
   </ItemGroup>