From 4ea3f80571894ced207c7b07859c0e319f5f4beb Mon Sep 17 00:00:00 2001 From: Pavel Leonenko <1992leon@bk.ru> Date: Wed, 27 Mar 2024 16:06:46 +0100 Subject: [PATCH] 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 Co-authored-by: s.leushunou --- Directory.Build.props | 2 +- LICENSE | 2 +- .../Softeq.XToolkit.Bindings.Droid.csproj | 4 ---- .../Softeq.XToolkit.Common.Droid.csproj | 4 ---- .../Collections/ObservableRangeCollection.cs | 2 ++ Softeq.XToolkit.Permissions.Droid/Permissions/Bluetooth.cs | 6 +++--- .../Permissions/Notifications.cs | 4 ++-- Softeq.XToolkit.Permissions.Droid/SdkVersion.cs | 6 +++--- .../Softeq.XToolkit.Permissions.Droid.csproj | 4 ---- .../Softeq.XToolkit.PushNotifications.Droid.csproj | 4 ---- .../Softeq.XToolkit.WhiteLabel.Droid.csproj | 4 ---- .../Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj | 4 ---- nuget/Softeq.XToolkit.Bindings.nuspec | 2 +- nuget/Softeq.XToolkit.Common.nuspec | 2 +- nuget/Softeq.XToolkit.Permissions.nuspec | 2 +- nuget/Softeq.XToolkit.PushNotifications.nuspec | 2 +- nuget/Softeq.XToolkit.Remote.nuspec | 2 +- nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec | 2 +- nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec | 2 +- nuget/Softeq.XToolkit.WhiteLabel.nuspec | 2 +- .../Playground.Forms.Droid/Properties/AssemblyInfo.cs | 2 +- .../Playground.Forms.iOS/Properties/AssemblyInfo.cs | 2 +- samples/Playground/Playground.Droid/Playground.Droid.csproj | 1 - 23 files changed, 22 insertions(+), 45 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7eba25610..3ab7eea7b 100755 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,7 +12,7 @@ XToolkit Softeq Development Corporation - Copyright © 2023 Softeq Development Corporation + Copyright © 2024 Softeq Development Corporation \ No newline at end of file diff --git a/LICENSE b/LICENSE index 25c1277cb..bfa391608 100644 --- 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 index 7f35df664..731b40980 100644 --- a/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj +++ b/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj b/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj index 835b75bb8..60be0cbf5 100644 --- a/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj +++ b/Softeq.XToolkit.Common.Droid/Softeq.XToolkit.Common.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/Softeq.XToolkit.Common/Collections/ObservableRangeCollection.cs b/Softeq.XToolkit.Common/Collections/ObservableRangeCollection.cs index 60112feec..1daaa7949 100644 --- 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 index c9a18e43f..8f5b0cff3 100644 --- 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 index f5d07b2e6..7555a456f 100644 --- 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 index eece15e64..602ab16f6 100644 --- 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 index c12098125..e44ebd58b 100644 --- a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj +++ b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj index c83c75a4b..ceb49c3a6 100644 --- a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj +++ b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj index cca1a38e8..384b8d28f 100644 --- a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj +++ b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj index 4dc6767b9..b6a7ad5d3 100644 --- a/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj +++ b/Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj @@ -14,10 +14,6 @@ SdkOnly - - - - diff --git a/nuget/Softeq.XToolkit.Bindings.nuspec b/nuget/Softeq.XToolkit.Bindings.nuspec index 1bab00941..1ae0628bb 100644 --- a/nuget/Softeq.XToolkit.Bindings.nuspec +++ b/nuget/Softeq.XToolkit.Bindings.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/bindings.html Bindings implementation based on INotifyPropertyChanged interface. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, mvvm, bindings Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.Common.nuspec b/nuget/Softeq.XToolkit.Common.nuspec index c99771411..e7e9837da 100644 --- a/nuget/Softeq.XToolkit.Common.nuspec +++ b/nuget/Softeq.XToolkit.Common.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/common.html The most common components without dependencies that can be reused in any project. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, kit Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.Permissions.nuspec b/nuget/Softeq.XToolkit.Permissions.nuspec index 310aaa272..5bbeb4c79 100644 --- a/nuget/Softeq.XToolkit.Permissions.nuspec +++ b/nuget/Softeq.XToolkit.Permissions.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/permissions.html Simple cross platform plugin to request and check permissions for Android and iOS. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, permissions diff --git a/nuget/Softeq.XToolkit.PushNotifications.nuspec b/nuget/Softeq.XToolkit.PushNotifications.nuspec index 569d55e25..ce91c5972 100644 --- a/nuget/Softeq.XToolkit.PushNotifications.nuspec +++ b/nuget/Softeq.XToolkit.PushNotifications.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/push-notifications.html Simple cross platform plugin to use push-notifications for Android and iOS. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, push-notifications, firebase, apns, fcm Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.Remote.nuspec b/nuget/Softeq.XToolkit.Remote.nuspec index c371da4c5..70b75fa05 100644 --- a/nuget/Softeq.XToolkit.Remote.nuspec +++ b/nuget/Softeq.XToolkit.Remote.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/remote.html Advanced HttpClient infrastructure for mobile applications. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, remote, http, rest, api, auth Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec index b1b804652..331a55909 100644 --- a/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec +++ b/nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/essentials.html Library over the Softeq.XToolkit.WhiteLabel that contains optional components for any application. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, android, ios, whitelabel, xamarin, essentials, imagepicker, picker Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec index 6596141ca..38569221c 100644 --- a/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec +++ b/nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel/forms.html Integration library for using Softeq.XToolkit.WhiteLabel in Xamarin.Forms projects. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, whitelabel, xamarin, forms, xamarinforms, xamarin.forms Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/nuget/Softeq.XToolkit.WhiteLabel.nuspec b/nuget/Softeq.XToolkit.WhiteLabel.nuspec index 4a51b69e3..6d546b57a 100644 --- a/nuget/Softeq.XToolkit.WhiteLabel.nuspec +++ b/nuget/Softeq.XToolkit.WhiteLabel.nuspec @@ -11,7 +11,7 @@ https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/whitelabel.html XToolkit.WhiteLabel is a collection of "lego" components for fast create cross-platform mobile applications with Xamarin, based on XToolkit. - Copyright 2023 Softeq Development Corp. + Copyright 2024 Softeq Development Corp. softeq, xtoolkit, xamarin, ios, android, mvvm, toolkit, whitelabel Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases diff --git a/samples/Playground.Forms/Playground.Forms.Droid/Properties/AssemblyInfo.cs b/samples/Playground.Forms/Playground.Forms.Droid/Properties/AssemblyInfo.cs index 4a22c9fd0..073cfd49c 100644 --- 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 index 4c170dbeb..1caa182d7 100644 --- 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 index c640e6181..2c4bbdfd3 100644 --- a/samples/Playground/Playground.Droid/Playground.Droid.csproj +++ b/samples/Playground/Playground.Droid/Playground.Droid.csproj @@ -21,7 +21,6 @@ -