Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/minor fixes #545

Merged
merged 6 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ public void RemoveRange(
Items.Remove(item);
}

OnPropertyChanged(EventArgsCache.CountPropertyChanged);
OnPropertyChanged(EventArgsCache.IndexerPropertyChanged);
OnCollectionChanged(EventArgsCache.ResetCollectionChanged);

return;
Expand Down
6 changes: 3 additions & 3 deletions Softeq.XToolkit.Permissions.Droid/Permissions/Bluetooth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?
Expand Down
6 changes: 3 additions & 3 deletions Softeq.XToolkit.Permissions.Droid/SdkVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.Bindings.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.Common.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.Permissions.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.PushNotifications.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.Remote.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.WhiteLabel.Essentials.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.WhiteLabel.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion nuget/Softeq.XToolkit.WhiteLabel.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
</PropertyGroup>

<ItemGroup>
<AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
<AndroidResource Include="Resources\**\*.png" />
</ItemGroup>

Expand Down
Loading