Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

1.5.1 #1145

Merged
merged 15 commits into from
Mar 3, 2020
Merged

1.5.1 #1145

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
5 changes: 4 additions & 1 deletion Xamarin.Essentials/AppInfo/AppInfo.ios.tvos.watchos.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ static AppTheme PlatformRequestedTheme()
if (!Platform.HasOSVersion(13, 0))
return AppTheme.Unspecified;

return Platform.GetCurrentViewController().TraitCollection.UserInterfaceStyle switch
var uiStyle = Platform.GetCurrentUIViewController()?.TraitCollection?.UserInterfaceStyle ??
UITraitCollection.CurrentTraitCollection.UserInterfaceStyle;

return uiStyle switch
{
UIUserInterfaceStyle.Light => AppTheme.Light,
UIUserInterfaceStyle.Dark => AppTheme.Dark,
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Essentials/Launcher/Launcher.shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static Task<bool> TryOpenAsync(Uri uri)
if (uri == null)
throw new ArgumentNullException(nameof(uri));

return PlatformCanOpenAsync(uri);
return PlatformTryOpenAsync(uri);
}
}

Expand Down
19 changes: 13 additions & 6 deletions Xamarin.Essentials/Permissions/Permissions.android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,22 @@ public override (string androidPermission, bool isRuntime)[] RequiredPermissions

public partial class LocationAlways : BasePlatformPermission
{
public override (string androidPermission, bool isRuntime)[] RequiredPermissions =>
new (string, bool)[]
public override (string androidPermission, bool isRuntime)[] RequiredPermissions
{
get
{
var permissions = new List<(string, bool)>();
#if __ANDROID_29__
(Manifest.Permission.AccessBackgroundLocation, true),
if (Platform.HasApiLevelQ)
permissions.Add((Manifest.Permission.AccessBackgroundLocation, true));
#endif
(Manifest.Permission.AccessCoarseLocation, true),
(Manifest.Permission.AccessFineLocation, true)
};

permissions.Add((Manifest.Permission.AccessCoarseLocation, true));
permissions.Add((Manifest.Permission.AccessFineLocation, true));

return permissions.ToArray();
}
}
}

public partial class Maps : BasePlatformPermission
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Essentials/Permissions/Permissions.uwp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static bool IsCapabilityDeclared(string capabilityName)

public abstract partial class BasePlatformPermission : BasePermission
{
protected virtual Func<IEnumerable<string>> RequiredDeclarations { get; }
protected virtual Func<IEnumerable<string>> RequiredDeclarations { get; } = () => Array.Empty<string>();

public override Task<PermissionStatus> CheckStatusAsync()
{
Expand Down
7 changes: 7 additions & 0 deletions Xamarin.Essentials/Platform/Platform.android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ internal static AndroidUri GetShareableFileUri(string filename)
false;
#endif

internal static bool HasApiLevelQ =>
#if __ANDROID_29__
HasApiLevel(BuildVersionCodes.Q);
#else
false;
#endif

internal static bool HasApiLevel(BuildVersionCodes versionCode) =>
(int)Build.VERSION.SdkInt >= (int)versionCode;

Expand Down
1 change: 1 addition & 0 deletions Xamarin.Essentials/Xamarin.Essentials.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<None Include="..\Assets\xamarin.essentials_128x128.png" PackagePath="icon.png" Pack="true" />
<None Include="..\nugetreadme.txt" PackagePath="readme.txt" Pack="true" />
<PackageReference Include="mdoc" Version="5.7.4.10" PrivateAssets="All" />
<PackageReference Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
<Compile Include="**\*.shared.cs" />
<Compile Include="**\*.shared.*.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/en/Xamarin.Essentials/PlacemarkExtensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</Base>
<Interfaces />
<Docs>
<summary>Extensions for the palcemark.</summary>
<summary>Extensions for the placemark.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
Expand Down