diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 166b98436e..83776ec2c1 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -144,9 +144,12 @@
-
+
+
+
+
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 1726028a3f..a9bf150ff9 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -60,7 +60,7 @@ namespace ControlCatalog
{
if (flowDirections.SelectedItem is FlowDirection flowDirection)
{
- this.FlowDirection = flowDirection;
+ TopLevel.GetTopLevel(this).FlowDirection = flowDirection;
}
};
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 5325534909..90c717e7ed 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -1,6 +1,8 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+ xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections">
@@ -42,6 +44,19 @@
+
+
+
+ Desktop
+ Documents
+ Downloads
+ Pictures
+ Videos
+ Music
+
+
+
+
("PickerLastResults");
var resultsVisible = this.Get("PickerLastResultsVisible");
var bookmarkContainer = this.Get("BookmarkContainer");
var openedFileContent = this.Get("OpenedFileContent");
var openMultiple = this.Get("OpenMultiple");
+ var currentFolderBox = this.Get("CurrentFolderBox");
+
+ currentFolderBox.TextChanged += async (sender, args) =>
+ {
+ if (ignoreTextChanged) return;
+
+ if (Enum.TryParse(currentFolderBox.Text, true, out var folderEnum))
+ {
+ lastSelectedDirectory = await GetStorageProvider().TryGetWellKnownFolder(folderEnum);
+ }
+ else
+ {
+ if (!Uri.TryCreate(currentFolderBox.Text, UriKind.Absolute, out var folderLink))
+ {
+ Uri.TryCreate("file://" + currentFolderBox.Text, UriKind.Absolute, out folderLink);
+ }
+
+ if (folderLink is not null)
+ {
+ lastSelectedDirectory = await GetStorageProvider().TryGetFolderFromPath(folderLink);
+ }
+ }
+ };
- IStorageFolder? lastSelectedDirectory = null;
List GetFilters()
{
@@ -84,7 +109,7 @@ namespace ControlCatalog.Pages
{
Title = "Open multiple files",
Filters = GetFilters(),
- Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+ Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
AllowMultiple = true
}.ShowAsync(GetWindow());
results.Items = result;
@@ -97,7 +122,7 @@ namespace ControlCatalog.Pages
{
Title = "Save file",
Filters = filters,
- Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+ Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
DefaultExtension = filters?.Any() == true ? "txt" : null,
InitialFileName = "test.txt"
}.ShowAsync(GetWindow());
@@ -109,7 +134,7 @@ namespace ControlCatalog.Pages
var result = await new OpenFolderDialog()
{
Title = "Select folder",
- Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null
+ Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
}.ShowAsync(GetWindow());
if (string.IsNullOrEmpty(result))
{
@@ -117,7 +142,7 @@ namespace ControlCatalog.Pages
}
else
{
- lastSelectedDirectory = new BclStorageFolder(new System.IO.DirectoryInfo(result));
+ SetFolder(await GetStorageProvider().TryGetFolderFromPath(result));
results.Items = new[] { result };
resultsVisible.IsVisible = true;
}
@@ -127,7 +152,7 @@ namespace ControlCatalog.Pages
var result = await new OpenFileDialog()
{
Title = "Select both",
- Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+ Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
AllowMultiple = true
}.ShowManagedAsync(GetWindow(), new ManagedFileDialogOptions
{
@@ -210,7 +235,7 @@ namespace ControlCatalog.Pages
#endif
await reader.WriteLineAsync(openedFileContent.Text);
- lastSelectedDirectory = await file.GetParentAsync();
+ SetFolder(await file.GetParentAsync());
}
await SetPickerResult(file is null ? null : new[] { file });
@@ -226,7 +251,7 @@ namespace ControlCatalog.Pages
await SetPickerResult(folders);
- lastSelectedDirectory = folders.FirstOrDefault();
+ SetFolder(folders.FirstOrDefault());
};
this.Get
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
index dcd7a88a56..a097f1f951 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
@@ -9,6 +9,7 @@ namespace ControlCatalog.Pages
public class ScrollViewerPageViewModel : ViewModelBase
{
private bool _allowAutoHide;
+ private bool _enableInertia;
private ScrollBarVisibility _horizontalScrollVisibility;
private ScrollBarVisibility _verticalScrollVisibility;
@@ -25,6 +26,7 @@ namespace ControlCatalog.Pages
HorizontalScrollVisibility = ScrollBarVisibility.Auto;
VerticalScrollVisibility = ScrollBarVisibility.Auto;
AllowAutoHide = true;
+ EnableInertia = true;
}
public bool AllowAutoHide
@@ -33,6 +35,12 @@ namespace ControlCatalog.Pages
set => this.RaiseAndSetIfChanged(ref _allowAutoHide, value);
}
+ public bool EnableInertia
+ {
+ get => _enableInertia;
+ set => this.RaiseAndSetIfChanged(ref _enableInertia, value);
+ }
+
public ScrollBarVisibility HorizontalScrollVisibility
{
get => _horizontalScrollVisibility;
diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
index c06f5c74ec..247008c503 100644
--- a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
@@ -1,6 +1,8 @@
using System;
using Android.App;
using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
using Android.OS;
using Android.Runtime;
using Android.Views;
@@ -13,6 +15,7 @@ namespace Avalonia.Android
internal static object ViewContent;
public Action ActivityResult { get; set; }
+ public Action RequestPermissionsResult { get; set; }
internal AvaloniaView View;
private GlobalLayoutListener _listener;
@@ -82,6 +85,13 @@ namespace Avalonia.Android
ActivityResult?.Invoke(requestCode, resultCode, data);
}
+ public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
+ {
+ base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+
+ RequestPermissionsResult?.Invoke(requestCode, permissions, grantResults);
+ }
+
class GlobalLayoutListener : Java.Lang.Object, ViewTreeObserver.IOnGlobalLayoutListener
{
private AvaloniaView _view;
diff --git a/src/Android/Avalonia.Android/IActivityResultHandler.cs b/src/Android/Avalonia.Android/IActivityResultHandler.cs
index 14094ee185..40a8b5cbcf 100644
--- a/src/Android/Avalonia.Android/IActivityResultHandler.cs
+++ b/src/Android/Avalonia.Android/IActivityResultHandler.cs
@@ -1,11 +1,14 @@
using System;
using Android.App;
using Android.Content;
+using Android.Content.PM;
namespace Avalonia.Android
{
public interface IActivityResultHandler
{
public Action ActivityResult { get; set; }
+
+ public Action RequestPermissionsResult { get; set; }
}
}
diff --git a/src/Android/Avalonia.Android/Platform/PlatformSupport.cs b/src/Android/Avalonia.Android/Platform/PlatformSupport.cs
new file mode 100644
index 0000000000..9877f48664
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/PlatformSupport.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+
+namespace Avalonia.Android.Platform;
+
+internal static class PlatformSupport
+{
+ private static int s_lastRequestCode = 20000;
+
+ public static int GetNextRequestCode() => s_lastRequestCode++;
+
+ public static async Task CheckPermission(this Activity activity, string permission)
+ {
+ if (activity is not IActivityResultHandler mainActivity)
+ {
+ throw new InvalidOperationException("Main activity must implement IActivityResultHandler interface.");
+ }
+
+ if (!OperatingSystem.IsAndroidVersionAtLeast(23))
+ {
+ return true;
+ }
+
+ if (activity.CheckSelfPermission(permission) == Permission.Granted)
+ {
+ return true;
+ }
+
+ var currentRequestCode = GetNextRequestCode();
+ var tcs = new TaskCompletionSource();
+ mainActivity.RequestPermissionsResult += RequestPermissionsResult;
+ activity.RequestPermissions(new [] { permission }, currentRequestCode);
+
+ return await tcs.Task;
+
+ void RequestPermissionsResult(int requestCode, string[] arg2, Permission[] arg3)
+ {
+ if (currentRequestCode != requestCode)
+ {
+ return;
+ }
+
+ mainActivity.RequestPermissionsResult -= RequestPermissionsResult;
+
+ _ = tcs.TrySetResult(arg3.All(p => p == Permission.Granted));
+ }
+ }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index 078f70db60..9838bb06c8 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -2,10 +2,11 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
+using Android;
+using Android.App;
using Android.Content;
using Android.Provider;
using Avalonia.Logging;
@@ -19,41 +20,48 @@ namespace Avalonia.Android.Platform.Storage;
internal abstract class AndroidStorageItem : IStorageBookmarkItem
{
- private Context? _context;
+ private Activity? _activity;
+ private readonly bool _needsExternalFilesPermission;
- protected AndroidStorageItem(Context context, AndroidUri uri)
+ protected AndroidStorageItem(Activity activity, AndroidUri uri, bool needsExternalFilesPermission)
{
- _context = context;
+ _activity = activity;
+ _needsExternalFilesPermission = needsExternalFilesPermission;
Uri = uri;
}
internal AndroidUri Uri { get; }
+
+ protected Activity Activity => _activity ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
- protected Context Context => _context ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
-
- public string Name => GetColumnValue(Context, Uri, MediaStore.IMediaColumns.DisplayName)
+ public virtual string Name => GetColumnValue(Activity, Uri, MediaStore.IMediaColumns.DisplayName)
?? Uri.PathSegments?.LastOrDefault() ?? string.Empty;
+ public Uri Path => new(Uri.ToString()!);
+
public bool CanBookmark => true;
- public Task SaveBookmarkAsync()
+ public async Task SaveBookmarkAsync()
{
- Context.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
- return Task.FromResult(Uri.ToString());
- }
+ if (!await EnsureExternalFilesPermission(false))
+ {
+ return null;
+ }
- public Task ReleaseBookmarkAsync()
- {
- Context.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
- return Task.CompletedTask;
+ Activity.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+ return Uri.ToString();
}
- public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+ public async Task ReleaseBookmarkAsync()
{
- uri = new Uri(Uri.ToString()!);
- return true;
- }
+ if (!await EnsureExternalFilesPermission(false))
+ {
+ return;
+ }
+ Activity.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+ }
+
public abstract Task GetBasicPropertiesAsync();
protected string? GetColumnValue(Context context, AndroidUri contentUri, string column, string? selection = null, string[]? selectionArgs = null)
@@ -77,29 +85,44 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
return null;
}
- public Task GetParentAsync()
+ public async Task GetParentAsync()
{
+ if (!await EnsureExternalFilesPermission(false))
+ {
+ return null;
+ }
+
using var javaFile = new JavaFile(Uri.Path!);
// Java file represents files AND directories. Don't be confused.
if (javaFile.ParentFile is {} parentFile
&& AndroidUri.FromFile(parentFile) is {} androidUri)
{
- return Task.FromResult(new AndroidStorageFolder(Context, androidUri));
+ return new AndroidStorageFolder(Activity, androidUri, false);
}
- return Task.FromResult(null);
+ return null;
}
+ protected async Task EnsureExternalFilesPermission(bool write)
+ {
+ if (!_needsExternalFilesPermission)
+ {
+ return true;
+ }
+
+ return await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+ }
+
public void Dispose()
{
- _context = null;
+ _activity = null;
}
}
-internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
+internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
{
- public AndroidStorageFolder(Context context, AndroidUri uri) : base(context, uri)
+ public AndroidStorageFolder(Activity activity, AndroidUri uri, bool needsExternalFilesPermission) : base(activity, uri, needsExternalFilesPermission)
{
}
@@ -110,6 +133,11 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
public async Task> GetItemsAsync()
{
+ if (!await EnsureExternalFilesPermission(false))
+ {
+ return Array.Empty();
+ }
+
using var javaFile = new JavaFile(Uri.Path!);
// Java file represents files AND directories. Don't be confused.
@@ -124,8 +152,8 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
.Where(t => t.uri is not null)
.Select(t => t.file switch
{
- { IsFile: true } => (IStorageItem)new AndroidStorageFile(Context, t.uri!),
- { IsDirectory: true } => new AndroidStorageFolder(Context, t.uri!),
+ { IsFile: true } => (IStorageItem)new AndroidStorageFile(Activity, t.uri!),
+ { IsDirectory: true } => new AndroidStorageFolder(Activity, t.uri!, false),
_ => null
})
.Where(i => i is not null)
@@ -133,9 +161,20 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
}
}
+internal sealed class WellKnownAndroidStorageFolder : AndroidStorageFolder
+{
+ public WellKnownAndroidStorageFolder(Activity activity, string identifier, AndroidUri uri, bool needsExternalFilesPermission)
+ : base(activity, uri, needsExternalFilesPermission)
+ {
+ Name = identifier;
+ }
+
+ public override string Name { get; }
+}
+
internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkFile
{
- public AndroidStorageFile(Context context, AndroidUri uri) : base(context, uri)
+ public AndroidStorageFile(Activity activity, AndroidUri uri) : base(activity, uri, false)
{
}
@@ -143,10 +182,10 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
public bool CanOpenWrite => true;
- public Task OpenReadAsync() => Task.FromResult(OpenContentStream(Context, Uri, false)
+ public Task OpenReadAsync() => Task.FromResult(OpenContentStream(Activity, Uri, false)
?? throw new InvalidOperationException("Failed to open content stream"));
- public Task OpenWriteAsync() => Task.FromResult(OpenContentStream(Context, Uri, true)
+ public Task OpenWriteAsync() => Task.FromResult(OpenContentStream(Activity, Uri, true)
?? throw new InvalidOperationException("Failed to open content stream"));
private Stream? OpenContentStream(Context context, AndroidUri uri, bool isOutput)
@@ -210,7 +249,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
MediaStore.IMediaColumns.Size, MediaStore.IMediaColumns.DateAdded,
MediaStore.IMediaColumns.DateModified
};
- using var cursor = Context.ContentResolver!.Query(Uri, projection, null, null, null);
+ using var cursor = Activity.ContentResolver!.Query(Uri, projection, null, null, null);
if (cursor?.MoveToFirst() == true)
{
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
index 62e43ff2ef..f611f50164 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
@@ -4,18 +4,21 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using Android;
using Android.App;
using Android.Content;
using Android.Provider;
using Avalonia.Platform.Storage;
+using Java.Lang;
using AndroidUri = Android.Net.Uri;
+using Exception = System.Exception;
+using JavaFile = Java.IO.File;
namespace Avalonia.Android.Platform.Storage;
internal class AndroidStorageProvider : IStorageProvider
{
private readonly Activity _activity;
- private int _lastRequestCode = 20000;
public AndroidStorageProvider(Activity activity)
{
@@ -31,7 +34,108 @@ internal class AndroidStorageProvider : IStorageProvider
public Task OpenFolderBookmarkAsync(string bookmark)
{
var uri = AndroidUri.Parse(bookmark) ?? throw new ArgumentException("Couldn't parse Bookmark value", nameof(bookmark));
- return Task.FromResult(new AndroidStorageFolder(_activity, uri));
+ return Task.FromResult(new AndroidStorageFolder(_activity, uri, false));
+ }
+
+ public async Task TryGetFileFromPath(Uri filePath)
+ {
+ if (filePath is null)
+ {
+ throw new ArgumentNullException(nameof(filePath));
+ }
+
+ if (filePath is not { IsAbsoluteUri: true, Scheme: "file" or "content" })
+ {
+ throw new ArgumentException("File path is expected to be an absolute link with \"file\" or \"content\" scheme.");
+ }
+
+ var androidUri = AndroidUri.Parse(filePath.ToString());
+ if (androidUri?.Path is not {} androidUriPath)
+ {
+ return null;
+ }
+
+ var hasPerms = await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+ if (!hasPerms)
+ {
+ throw new SecurityException("Application doesn't have ReadExternalStorage permission. Make sure android manifest has this permission defined and user allowed it.");
+ }
+
+ var javaFile = new JavaFile(androidUriPath);
+ if (javaFile.Exists() && javaFile.IsFile)
+ {
+ return null;
+ }
+
+ return new AndroidStorageFile(_activity, androidUri);
+ }
+
+ public async Task TryGetFolderFromPath(Uri folderPath)
+ {
+ if (folderPath is null)
+ {
+ throw new ArgumentNullException(nameof(folderPath));
+ }
+
+ if (folderPath is not { IsAbsoluteUri: true, Scheme: "file" or "content" })
+ {
+ throw new ArgumentException("Folder path is expected to be an absolute link with \"file\" or \"content\" scheme.");
+ }
+
+ var androidUri = AndroidUri.Parse(folderPath.ToString());
+ if (androidUri?.Path is not {} androidUriPath)
+ {
+ return null;
+ }
+
+ var hasPerms = await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+ if (!hasPerms)
+ {
+ throw new SecurityException("Application doesn't have ReadExternalStorage permission. Make sure android manifest has this permission defined and user allowed it.");
+ }
+
+ var javaFile = new JavaFile(androidUriPath);
+ if (javaFile.Exists() && javaFile.IsDirectory)
+ {
+ return null;
+ }
+
+ return new AndroidStorageFolder(_activity, androidUri, false);
+ }
+
+ public Task TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+ {
+ var dirCode = wellKnownFolder switch
+ {
+ WellKnownFolder.Desktop => null,
+ WellKnownFolder.Documents => global::Android.OS.Environment.DirectoryDocuments,
+ WellKnownFolder.Downloads => global::Android.OS.Environment.DirectoryDownloads,
+ WellKnownFolder.Music => global::Android.OS.Environment.DirectoryMusic,
+ WellKnownFolder.Pictures => global::Android.OS.Environment.DirectoryPictures,
+ WellKnownFolder.Videos => global::Android.OS.Environment.DirectoryMovies,
+ _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+ };
+ if (dirCode is null)
+ {
+ return Task.FromResult(null);
+ }
+
+ var dir = _activity.GetExternalFilesDir(dirCode);
+ if (dir is null || !dir.Exists())
+ {
+ return Task.FromResult(null);
+ }
+
+ var uri = AndroidUri.FromFile(dir);
+ if (uri is null)
+ {
+ return Task.FromResult(null);
+ }
+
+ // To make TryGetWellKnownFolder API easier to use, we don't check for the permissions.
+ // It will work with file picker activities, but it will fail on any direct access to the folder, like getting list of children.
+ // We pass "needsExternalFilesPermission" parameter here, so folder itself can check for permissions on any FS access.
+ return Task.FromResult(new WellKnownAndroidStorageFolder(_activity, dirCode, uri, true));
}
public Task OpenFileBookmarkAsync(string bookmark)
@@ -110,19 +214,21 @@ internal class AndroidStorageProvider : IStorageProvider
var pickerIntent = Intent.CreateChooser(intent, options.Title ?? "Select folder");
var uris = await StartActivity(pickerIntent, false);
- return uris.Select(u => new AndroidStorageFolder(_activity, u)).ToArray();
+ return uris.Select(u => new AndroidStorageFolder(_activity, u, false)).ToArray();
}
private async Task> StartActivity(Intent? pickerIntent, bool singleResult)
{
var resultList = new List(1);
var tcs = new TaskCompletionSource();
- var currentRequestCode = _lastRequestCode++;
+ var currentRequestCode = PlatformSupport.GetNextRequestCode();
- if (_activity is IActivityResultHandler mainActivity)
+ if (!(_activity is IActivityResultHandler mainActivity))
{
- mainActivity.ActivityResult += OnActivityResult;
+ throw new InvalidOperationException("Main activity must implement IActivityResultHandler interface.");
}
+
+ mainActivity.ActivityResult += OnActivityResult;
_activity.StartActivityForResult(pickerIntent, currentRequestCode);
var result = await tcs.Task;
@@ -161,11 +267,7 @@ internal class AndroidStorageProvider : IStorageProvider
return;
}
-
- if (_activity is IActivityResultHandler mainActivity)
- {
- mainActivity.ActivityResult -= OnActivityResult;
- }
+ mainActivity.ActivityResult -= OnActivityResult;
_ = tcs.TrySetResult(resultCode == Result.Ok ? data : null);
}
diff --git a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
index 068c190fa1..801f247754 100644
--- a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using Avalonia.Data;
using Avalonia.Media;
using Avalonia.Media.Immutable;
+using Avalonia.Media.Transformation;
#nullable enable
@@ -30,7 +31,7 @@ namespace Avalonia.Animation.Animators
return new ImmutableRadialGradientBrush(
InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
- oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+ InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
oldValue.SpreadMethod,
s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
@@ -41,7 +42,7 @@ namespace Avalonia.Animation.Animators
return new ImmutableConicGradientBrush(
InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
- oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+ InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
oldValue.SpreadMethod,
s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
@@ -51,7 +52,7 @@ namespace Avalonia.Animation.Animators
return new ImmutableLinearGradientBrush(
InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
- oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+ InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
oldValue.SpreadMethod,
s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
@@ -72,6 +73,25 @@ namespace Avalonia.Animation.Animators
return control.Bind((AvaloniaProperty)Property, instance, BindingPriority.Animation);
}
+ private static ImmutableTransform? InterpolateTransform(double progress,
+ ITransform? oldTransform, ITransform? newTransform)
+ {
+ if (oldTransform is TransformOperations oldTransformOperations
+ && newTransform is TransformOperations newTransformOperations)
+ {
+
+ return new ImmutableTransform(TransformOperations
+ .Interpolate(oldTransformOperations, newTransformOperations, progress).Value);
+ }
+
+ if (oldTransform is not null)
+ {
+ return new ImmutableTransform(oldTransform.Value);
+ }
+
+ return null;
+ }
+
private static IReadOnlyList InterpolateStops(double progress, IReadOnlyList oldValue, IReadOnlyList newValue)
{
var resultCount = Math.Max(oldValue.Count, newValue.Count);
diff --git a/src/Avalonia.Base/AttachedProperty.cs b/src/Avalonia.Base/AttachedProperty.cs
index a43194153c..31b6cad8ab 100644
--- a/src/Avalonia.Base/AttachedProperty.cs
+++ b/src/Avalonia.Base/AttachedProperty.cs
@@ -24,11 +24,9 @@ namespace Avalonia
Func? validate = null)
: base(name, ownerType, metadata, inherits, validate)
{
+ IsAttached = true;
}
- ///
- public override bool IsAttached => true;
-
///
/// Attaches the property as a non-attached property on the specified type.
///
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index dc94dfba40..1946d4ba5c 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -132,7 +132,7 @@ namespace Avalonia
switch (property)
{
- case StyledPropertyBase styled:
+ case StyledProperty styled:
ClearValue(styled);
break;
case DirectPropertyBase direct:
@@ -147,7 +147,7 @@ namespace Avalonia
/// Clears a 's local value.
///
/// The property.
- public void ClearValue(StyledPropertyBase property)
+ public void ClearValue(StyledProperty property)
{
property = property ?? throw new ArgumentNullException(nameof(property));
VerifyAccess();
@@ -220,7 +220,7 @@ namespace Avalonia
/// The type of the property.
/// The property.
/// The value.
- public T GetValue(StyledPropertyBase property)
+ public T GetValue(StyledProperty property)
{
_ = property ?? throw new ArgumentNullException(nameof(property));
VerifyAccess();
@@ -243,7 +243,7 @@ namespace Avalonia
}
///
- public Optional GetBaseValue(StyledPropertyBase property)
+ public Optional GetBaseValue(StyledProperty property)
{
_ = property ?? throw new ArgumentNullException(nameof(property));
VerifyAccess();
@@ -309,7 +309,7 @@ namespace Avalonia
/// An if setting the property can be undone, otherwise null.
///
public IDisposable? SetValue(
- StyledPropertyBase property,
+ StyledProperty property,
T value,
BindingPriority priority = BindingPriority.LocalValue)
{
@@ -373,7 +373,7 @@ namespace Avalonia
/// A disposable which can be used to terminate the binding.
///
public IDisposable Bind(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source,
BindingPriority priority = BindingPriority.LocalValue)
{
@@ -396,7 +396,7 @@ namespace Avalonia
/// A disposable which can be used to terminate the binding.
///
public IDisposable Bind(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source,
BindingPriority priority = BindingPriority.LocalValue)
{
@@ -419,7 +419,7 @@ namespace Avalonia
/// A disposable which can be used to terminate the binding.
///
public IDisposable Bind(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable> source,
BindingPriority priority = BindingPriority.LocalValue)
{
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 7b17b9152d..6231483ff8 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -146,7 +146,7 @@ namespace Avalonia
return property switch
{
- StyledPropertyBase styled => target.Bind(styled, source, priority),
+ StyledProperty styled => target.Bind(styled, source, priority),
DirectPropertyBase direct => target.Bind(direct, source),
_ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
};
@@ -170,7 +170,7 @@ namespace Avalonia
{
return property switch
{
- StyledPropertyBase styled => target.Bind(styled, source, priority),
+ StyledProperty styled => target.Bind(styled, source, priority),
DirectPropertyBase direct => target.Bind(direct, source),
_ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
};
@@ -231,7 +231,7 @@ namespace Avalonia
return property switch
{
- StyledPropertyBase styled => target.GetValue(styled),
+ StyledProperty styled => target.GetValue(styled),
DirectPropertyBase direct => target.GetValue(direct),
_ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
};
@@ -280,7 +280,7 @@ namespace Avalonia
return property switch
{
- StyledPropertyBase styled => target.GetBaseValue(styled),
+ StyledProperty styled => target.GetBaseValue(styled),
DirectPropertyBase direct => target.GetValue(direct),
_ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
};
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index e0782c51a2..5db4d81f03 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -107,22 +107,22 @@ namespace Avalonia
///
/// Gets a value indicating whether the property inherits its value.
///
- public virtual bool Inherits => false;
+ public bool Inherits { get; private protected set; }
///
/// Gets a value indicating whether this is an attached property.
///
- public virtual bool IsAttached => false;
+ public bool IsAttached { get; private protected set; }
///
/// Gets a value indicating whether this is a direct property.
///
- public virtual bool IsDirect => false;
+ public bool IsDirect { get; private protected set; }
///
/// Gets a value indicating whether this is a readonly property.
///
- public virtual bool IsReadOnly => false;
+ public bool IsReadOnly { get; private protected set; }
///
/// Gets an observable that is fired when this property changes on any
diff --git a/src/Avalonia.Base/DirectProperty.cs b/src/Avalonia.Base/DirectProperty.cs
index 729240e5a1..d02e277074 100644
--- a/src/Avalonia.Base/DirectProperty.cs
+++ b/src/Avalonia.Base/DirectProperty.cs
@@ -33,6 +33,8 @@ namespace Avalonia
{
Getter = getter ?? throw new ArgumentNullException(nameof(getter));
Setter = setter;
+ IsDirect = true;
+ IsReadOnly = setter is null;
}
///
@@ -51,17 +53,10 @@ namespace Avalonia
{
Getter = getter ?? throw new ArgumentNullException(nameof(getter));
Setter = setter;
+ IsDirect = true;
+ IsReadOnly = setter is null;
}
- ///
- public override bool IsDirect => true;
-
- ///
- public override bool IsReadOnly => Setter == null;
-
- ///
- public override Type Owner => typeof(TOwner);
-
///
/// Gets the getter function.
///
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index ec9eba6d61..9ee1eee0fa 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -1,8 +1,6 @@
using System;
using Avalonia.Data;
using Avalonia.PropertyStore;
-using Avalonia.Reactive;
-using Avalonia.Styling;
namespace Avalonia
{
@@ -28,6 +26,7 @@ namespace Avalonia
AvaloniaPropertyMetadata metadata)
: base(name, ownerType, metadata)
{
+ Owner = ownerType;
}
///
@@ -42,12 +41,13 @@ namespace Avalonia
AvaloniaPropertyMetadata metadata)
: base(source, ownerType, metadata)
{
+ Owner = ownerType;
}
///
/// Gets the type that registered the property.
///
- public abstract Type Owner { get; }
+ public Type Owner { get; }
///
/// Gets the value of the property on the instance.
diff --git a/src/Avalonia.Base/Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
index 7a27c53023..403dd6f23e 100644
--- a/src/Avalonia.Base/Input/DragEventArgs.cs
+++ b/src/Avalonia.Base/Input/DragEventArgs.cs
@@ -1,5 +1,6 @@
using System;
using Avalonia.Interactivity;
+using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input
@@ -32,7 +33,9 @@ namespace Avalonia.Input
return point;
}
- internal DragEventArgs(RoutedEvent routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
+ [Unstable]
+ [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using DragDrop.DoDragDrop or IHeadlessWindow.DragDrop.")]
+ public DragEventArgs(RoutedEvent routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
: base(routedEvent)
{
Data = data;
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
index eea7c3b7d1..3b83d0cb87 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
@@ -57,7 +57,10 @@ namespace Avalonia.Input
var scale = distance / _initialDistance;
- _target?.RaiseEvent(new PinchEventArgs(scale, _origin));
+ var pinchEventArgs = new PinchEventArgs(scale, _origin);
+ _target?.RaiseEvent(pinchEventArgs);
+
+ e.Handled = pinchEventArgs.Handled;
}
}
}
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
index 23bab13fc8..991694cc60 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using Avalonia.Input.GestureRecognizers;
namespace Avalonia.Input
@@ -88,7 +89,10 @@ namespace Avalonia.Input
}
_pullInProgress = true;
- _target?.RaiseEvent(new PullGestureEventArgs(_gestureId, delta, PullDirection));
+ var pullEventArgs = new PullGestureEventArgs(_gestureId, delta, PullDirection);
+ _target?.RaiseEvent(pullEventArgs);
+
+ e.Handled = pullEventArgs.Handled;
}
}
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
index 790439245a..7c1ee13eed 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -8,6 +8,10 @@ namespace Avalonia.Input.GestureRecognizers
: StyledElement, // It's not an "element" in any way, shape or form, but TemplateBinding refuse to work otherwise
IGestureRecognizer
{
+ // Pixels per second speed that is considered to be the stop of inertial scroll
+ internal const double InertialScrollSpeedEnd = 5;
+ public const double InertialResistance = 0.15;
+
private bool _scrolling;
private Point _trackedRootPoint;
private IPointer? _tracking;
@@ -23,7 +27,8 @@ namespace Avalonia.Input.GestureRecognizers
// Movement per second
private Vector _inertia;
private ulong? _lastMoveTimestamp;
-
+ private bool _isScrollInertiaEnabled;
+
///
/// Defines the property.
///
@@ -42,6 +47,15 @@ namespace Avalonia.Input.GestureRecognizers
o => o.CanVerticallyScroll,
(o, v) => o.CanVerticallyScroll = v);
+ ///
+ /// Defines the property.
+ ///
+ public static readonly DirectProperty IsScrollInertiaEnabledProperty =
+ AvaloniaProperty.RegisterDirect(
+ nameof(IsScrollInertiaEnabled),
+ o => o.IsScrollInertiaEnabled,
+ (o, v) => o.IsScrollInertiaEnabled = v);
+
///
/// Defines the property.
///
@@ -68,6 +82,15 @@ namespace Avalonia.Input.GestureRecognizers
get => _canVerticallyScroll;
set => SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value);
}
+
+ ///
+ /// Gets or sets whether the gesture should include inertia in it's behavior.
+ ///
+ public bool IsScrollInertiaEnabled
+ {
+ get => _isScrollInertiaEnabled;
+ set => SetAndRaise(IsScrollInertiaEnabledProperty, ref _isScrollInertiaEnabled, value);
+ }
///
/// Gets or sets a value indicating the distance the pointer moves before scrolling is started
@@ -97,9 +120,6 @@ namespace Avalonia.Input.GestureRecognizers
}
}
- // Pixels per second speed that is considered to be the stop of inertial scroll
- private const double InertialScrollSpeedEnd = 5;
-
public void PointerMoved(PointerEventArgs e)
{
if (e.Pointer == _tracking)
@@ -168,7 +188,8 @@ namespace Avalonia.Input.GestureRecognizers
if (_inertia == default
|| e.Timestamp == 0
|| _lastMoveTimestamp == 0
- || e.Timestamp - _lastMoveTimestamp > 200)
+ || e.Timestamp - _lastMoveTimestamp > 200
+ || !IsScrollInertiaEnabled)
EndGesture();
else
{
@@ -176,6 +197,7 @@ namespace Avalonia.Input.GestureRecognizers
var savedGestureId = _gestureId;
var st = Stopwatch.StartNew();
var lastTime = TimeSpan.Zero;
+ _target!.RaiseEvent(new ScrollGestureInertiaStartingEventArgs(_gestureId, _inertia));
DispatcherTimer.Run(() =>
{
// Another gesture has started, finish the current one
@@ -187,7 +209,7 @@ namespace Avalonia.Input.GestureRecognizers
var elapsedSinceLastTick = st.Elapsed - lastTime;
lastTime = st.Elapsed;
- var speed = _inertia * Math.Pow(0.15, st.Elapsed.TotalSeconds);
+ var speed = _inertia * Math.Pow(InertialResistance, st.Elapsed.TotalSeconds);
var distance = speed * elapsedSinceLastTick.TotalSeconds;
var scrollGestureEventArgs = new ScrollGestureEventArgs(_gestureId, distance);
_target!.RaiseEvent(scrollGestureEventArgs);
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index a9e42c2374..167f61eead 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -45,6 +45,10 @@ namespace Avalonia.Input
RoutedEvent.Register(
"ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
+ public static readonly RoutedEvent ScrollGestureInertiaStartingEvent =
+ RoutedEvent.Register(
+ "ScrollGestureInertiaStarting", RoutingStrategies.Bubble, typeof(Gestures));
+
public static readonly RoutedEvent ScrollGestureEndedEvent =
RoutedEvent.Register(
"ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
diff --git a/src/Avalonia.Base/Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
index f3de55ebae..8d15c3f9ec 100644
--- a/src/Avalonia.Base/Input/GotFocusEventArgs.cs
+++ b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
@@ -7,19 +7,18 @@ namespace Avalonia.Input
///
public class GotFocusEventArgs : RoutedEventArgs
{
- internal GotFocusEventArgs()
+ public GotFocusEventArgs() : base(InputElement.GotFocusEvent)
{
-
}
///
/// Gets or sets a value indicating how the change in focus occurred.
///
- public NavigationMethod NavigationMethod { get; set; }
+ public NavigationMethod NavigationMethod { get; init; }
///
/// Gets or sets any key modifiers active at the time of focus.
///
- public KeyModifiers KeyModifiers { get; set; }
+ public KeyModifiers KeyModifiers { get; init; }
}
}
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
index 35fa549995..9fa097c4b1 100644
--- a/src/Avalonia.Base/Input/KeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -5,15 +5,10 @@ namespace Avalonia.Input
{
public class KeyEventArgs : RoutedEventArgs
{
- public KeyEventArgs()
- {
+ public IKeyboardDevice? Device { get; init; }
- }
+ public Key Key { get; init; }
- public IKeyboardDevice? Device { get; set; }
-
- public Key Key { get; set; }
-
- public KeyModifiers KeyModifiers { get; set; }
+ public KeyModifiers KeyModifiers { get; init; }
}
}
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
index 26ff71a4e7..c46834fff4 100644
--- a/src/Avalonia.Base/Input/KeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -156,7 +156,6 @@ namespace Avalonia.Input
interactive?.RaiseEvent(new GotFocusEventArgs
{
- RoutedEvent = InputElement.GotFocusEvent,
NavigationMethod = method,
KeyModifiers = keyModifiers,
});
diff --git a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
index af0fa83382..c405cdfacd 100644
--- a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
@@ -1,13 +1,17 @@
+using System;
using Avalonia.Interactivity;
+using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input
{
public class PointerDeltaEventArgs : PointerEventArgs
{
- public Vector Delta { get; set; }
+ public Vector Delta { get; }
- internal PointerDeltaEventArgs(RoutedEvent routedEvent, object? source,
+ [Unstable]
+ [Obsolete("This constructor might be removed in 12.0.")]
+ public PointerDeltaEventArgs(RoutedEvent routedEvent, object? source,
IPointer pointer, Visual rootVisual, Point rootVisualPosition, ulong timestamp,
PointerPointProperties properties, KeyModifiers modifiers, Vector delta)
: base(routedEvent, source, pointer, rootVisual, rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
index d736253728..502da52597 100644
--- a/src/Avalonia.Base/Input/PointerEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using Avalonia.Input.Raw;
using Avalonia.Interactivity;
+using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input
@@ -13,7 +14,9 @@ namespace Avalonia.Input
private readonly PointerPointProperties _properties;
private readonly Lazy?>? _previousPoints;
- internal PointerEventArgs(RoutedEvent routedEvent,
+ [Unstable]
+ [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
+ public PointerEventArgs(RoutedEvent routedEvent,
object? source,
IPointer pointer,
Visual? rootVisual, Point rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
index a3de0eaaea..903019d85d 100644
--- a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
@@ -1,13 +1,17 @@
+using System;
using Avalonia.Interactivity;
+using Avalonia.Metadata;
using Avalonia.VisualTree;
namespace Avalonia.Input
{
public class PointerWheelEventArgs : PointerEventArgs
{
- public Vector Delta { get; set; }
+ public Vector Delta { get; }
- internal PointerWheelEventArgs(object source, IPointer pointer, Visual rootVisual,
+ [Unstable]
+ [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow.MouseWheel.")]
+ public PointerWheelEventArgs(object source, IPointer pointer, Visual rootVisual,
Point rootVisualPosition, ulong timestamp,
PointerPointProperties properties, KeyModifiers modifiers, Vector delta)
: base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
index 48c882197f..cd1cf29bcf 100644
--- a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
+++ b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
@@ -12,6 +12,6 @@ namespace Avalonia.Input.Raw
Text = text;
}
- public string Text { get; set; }
+ public string Text { get; }
}
}
diff --git a/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
index f1a0887b60..dd78080708 100644
--- a/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
+++ b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Input
public static int GetNextFreeId() => _nextId++;
- internal ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
+ public ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
{
Id = id;
Delta = delta;
@@ -25,9 +25,21 @@ namespace Avalonia.Input
{
public int Id { get; }
- internal ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
+ public ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
{
Id = id;
}
}
+
+ public class ScrollGestureInertiaStartingEventArgs : RoutedEventArgs
+ {
+ public int Id { get; }
+ public Vector Inertia { get; }
+
+ internal ScrollGestureInertiaStartingEventArgs(int id, Vector inertia) : base(Gestures.ScrollGestureInertiaStartingEvent)
+ {
+ Id = id;
+ Inertia = inertia;
+ }
+ }
}
diff --git a/src/Avalonia.Base/Input/TappedEventArgs.cs b/src/Avalonia.Base/Input/TappedEventArgs.cs
index 3e15c4843a..663207a104 100644
--- a/src/Avalonia.Base/Input/TappedEventArgs.cs
+++ b/src/Avalonia.Base/Input/TappedEventArgs.cs
@@ -1,3 +1,4 @@
+using System;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
@@ -7,7 +8,7 @@ namespace Avalonia.Input
{
private readonly PointerEventArgs lastPointerEventArgs;
- internal TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
+ public TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
: base(routedEvent)
{
this.lastPointerEventArgs = lastPointerEventArgs;
diff --git a/src/Avalonia.Base/Input/TextInputEventArgs.cs b/src/Avalonia.Base/Input/TextInputEventArgs.cs
index a027bec0c6..cda0103749 100644
--- a/src/Avalonia.Base/Input/TextInputEventArgs.cs
+++ b/src/Avalonia.Base/Input/TextInputEventArgs.cs
@@ -4,10 +4,6 @@ namespace Avalonia.Input
{
public class TextInputEventArgs : RoutedEventArgs
{
- public TextInputEventArgs()
- {
-
- }
public IKeyboardDevice? Device { get; set; }
public string? Text { get; set; }
diff --git a/src/Avalonia.Base/Input/VectorEventArgs.cs b/src/Avalonia.Base/Input/VectorEventArgs.cs
index 3e8098f904..2ce95cf35a 100644
--- a/src/Avalonia.Base/Input/VectorEventArgs.cs
+++ b/src/Avalonia.Base/Input/VectorEventArgs.cs
@@ -5,11 +5,6 @@ namespace Avalonia.Input
{
public class VectorEventArgs : RoutedEventArgs
{
- internal VectorEventArgs()
- {
-
- }
-
- public Vector Vector { get; set; }
+ public Vector Vector { get; init; }
}
}
diff --git a/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
index 749d2ecc2b..1cdc775b13 100644
--- a/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
+++ b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Layout
///
public class EffectiveViewportChangedEventArgs : EventArgs
{
- internal EffectiveViewportChangedEventArgs(Rect effectiveViewport)
+ public EffectiveViewportChangedEventArgs(Rect effectiveViewport)
{
EffectiveViewport = effectiveViewport;
}
diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/TraceLogSink.cs
index fc3897fade..a1b4dfe3aa 100644
--- a/src/Avalonia.Base/Logging/TraceLogSink.cs
+++ b/src/Avalonia.Base/Logging/TraceLogSink.cs
@@ -141,7 +141,7 @@ namespace Avalonia.Logging
result.Append(')');
}
- return result.ToString();
+ return StringBuilderCache.GetStringAndRelease(result);
}
}
}
diff --git a/src/Avalonia.Base/Media/Brush.cs b/src/Avalonia.Base/Media/Brush.cs
index b9a560ad8f..accabce145 100644
--- a/src/Avalonia.Base/Media/Brush.cs
+++ b/src/Avalonia.Base/Media/Brush.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Media
/// Describes how an area is painted.
///
[TypeConverter(typeof(BrushConverter))]
- public abstract class Brush : Animatable
+ public abstract class Brush : Animatable, IBrush
{
///
/// Defines the property.
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index 65575617d0..0ec7152359 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -13,14 +13,22 @@ namespace Avalonia.Media
///
public sealed class GlyphRun : IDisposable
{
+ private readonly static IPlatformRenderInterface s_renderInterface;
+
private IRef? _platformImpl;
private double _fontRenderingEmSize;
private int _biDiLevel;
private GlyphRunMetrics? _glyphRunMetrics;
private ReadOnlyMemory _characters;
private IReadOnlyList _glyphInfos;
+ private Point? _baselineOrigin;
private bool _hasOneCharPerCluster; // if true, character index and cluster are similar
+ static GlyphRun()
+ {
+ s_renderInterface = AvaloniaLocator.Current.GetRequiredService();
+ }
+
///
/// Initializes a new instance of the class by specifying properties of the class.
///
@@ -28,15 +36,17 @@ namespace Avalonia.Media
/// The rendering em size.
/// The characters.
/// The glyph indices.
+ /// The baseline origin of the run.
/// The bidi level.
public GlyphRun(
IGlyphTypeface glyphTypeface,
double fontRenderingEmSize,
ReadOnlyMemory characters,
IReadOnlyList glyphIndices,
+ Point? baselineOrigin = null,
int biDiLevel = 0)
: this(glyphTypeface, fontRenderingEmSize, characters,
- CreateGlyphInfos(glyphIndices, fontRenderingEmSize, glyphTypeface), biDiLevel)
+ CreateGlyphInfos(glyphIndices, fontRenderingEmSize, glyphTypeface), baselineOrigin, biDiLevel)
{
_hasOneCharPerCluster = true;
}
@@ -48,12 +58,14 @@ namespace Avalonia.Media
/// The rendering em size.
/// The characters.
/// The list of glyphs used.
+ /// The baseline origin of the run.
/// The bidi level.
public GlyphRun(
IGlyphTypeface glyphTypeface,
double fontRenderingEmSize,
ReadOnlyMemory characters,
IReadOnlyList glyphInfos,
+ Point? baselineOrigin = null,
int biDiLevel = 0)
{
GlyphTypeface = glyphTypeface;
@@ -64,6 +76,8 @@ namespace Avalonia.Media
_glyphInfos = glyphInfos;
+ _baselineOrigin = baselineOrigin;
+
_biDiLevel = biDiLevel;
}
@@ -72,6 +86,7 @@ namespace Avalonia.Media
_glyphInfos = Array.Empty();
GlyphTypeface = Typeface.Default.GlyphTypeface;
_platformImpl = platformImpl;
+ _baselineOrigin = platformImpl.Item.BaselineOrigin;
}
private static IReadOnlyList CreateGlyphInfos(IReadOnlyList glyphIndices,
@@ -147,9 +162,13 @@ namespace Avalonia.Media
=> _glyphRunMetrics ??= CreateGlyphRunMetrics();
///
- /// Gets the baseline origin of the.
+ /// Gets or sets the baseline origin of the.
///
- public Point BaselineOrigin => PlatformImpl.Item.BaselineOrigin;
+ public Point BaselineOrigin
+ {
+ get => _baselineOrigin ?? default;
+ set => Set(ref _baselineOrigin, value);
+ }
///
/// Gets or sets the list of UTF16 code points that represent the Unicode content of the .
@@ -204,9 +223,7 @@ namespace Avalonia.Media
/// The geometry returned contains the combined geometry of all glyphs in the glyph run.
public Geometry BuildGeometry()
{
- var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService();
-
- var geometryImpl = platformRenderInterface.BuildGlyphRunGeometry(this);
+ var geometryImpl = s_renderInterface.BuildGlyphRunGeometry(this);
return new PlatformGeometry(geometryImpl);
}
@@ -802,9 +819,11 @@ namespace Avalonia.Media
private IRef CreateGlyphRunImpl()
{
- var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService();
-
- var platformImpl = platformRenderInterface.CreateGlyphRun(GlyphTypeface, FontRenderingEmSize, GlyphInfos);
+ var platformImpl = s_renderInterface.CreateGlyphRun(
+ GlyphTypeface,
+ FontRenderingEmSize,
+ GlyphInfos,
+ _baselineOrigin ?? new Point(0, -GlyphTypeface.Metrics.Ascent * Scale));
_platformImpl = RefCountable.Create(platformImpl);
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs b/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs
index cb8168e693..c7cd58eb6d 100644
--- a/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs
@@ -93,16 +93,19 @@ namespace Avalonia.Media.TextFormatting
[Conditional("DEBUG")]
public void VerifyAllReturned()
{
- if (_pendingReturnCount > 0)
+ var pendingReturnCount = _pendingReturnCount;
+ _pendingReturnCount = 0;
+
+ if (pendingReturnCount > 0)
{
throw new InvalidOperationException(
- $"{_pendingReturnCount} RentedList<{typeof(T).Name} haven't been returned to the pool!");
+ $"{pendingReturnCount} RentedList<{typeof(T).Name}> haven't been returned to the pool!");
}
- if (_pendingReturnCount < 0)
+ if (pendingReturnCount < 0)
{
throw new InvalidOperationException(
- $"{-_pendingReturnCount} RentedList<{typeof(T).Name} extra lists have been returned to the pool!");
+ $"{-pendingReturnCount} RentedList<{typeof(T).Name}> extra lists have been returned to the pool!");
}
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
index ac196bf7e0..7f23ac98b4 100644
--- a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
@@ -185,7 +185,7 @@ namespace Avalonia.Media.TextFormatting
ShapedBuffer.FontRenderingEmSize,
Text,
ShapedBuffer,
- BidiLevel);
+ biDiLevel: BidiLevel);
}
public void Dispose()
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
index 47973e37b5..4c93a1d851 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
@@ -113,14 +113,18 @@ namespace Avalonia.Media.TextFormatting
var (preSplitRuns, postSplitRuns) = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength, objectPool);
- var collapsedRuns = new TextRun[preSplitRuns.Count + 1];
- preSplitRuns.CopyTo(collapsedRuns);
- collapsedRuns[collapsedRuns.Length - 1] = shapedSymbol;
-
- objectPool.TextRunLists.Return(ref preSplitRuns);
- objectPool.TextRunLists.Return(ref postSplitRuns);
-
- return collapsedRuns;
+ try
+ {
+ var collapsedRuns = new TextRun[preSplitRuns.Count + 1];
+ preSplitRuns.CopyTo(collapsedRuns);
+ collapsedRuns[collapsedRuns.Length - 1] = shapedSymbol;
+ return collapsedRuns;
+ }
+ finally
+ {
+ objectPool.TextRunLists.Return(ref preSplitRuns);
+ objectPool.TextRunLists.Return(ref postSplitRuns);
+ }
}
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
index 7de842ab39..7505b9ccdd 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
@@ -32,58 +32,64 @@ namespace Avalonia.Media.TextFormatting
var fetchedRuns = FetchTextRuns(textSource, firstTextSourceIndex, objectPool,
out var textEndOfLine, out var textSourceLength);
- RentedList? shapedTextRuns;
+ RentedList? shapedTextRuns = null;
- if (previousLineBreak?.RemainingRuns is { } remainingRuns)
+ try
{
- resolvedFlowDirection = previousLineBreak.FlowDirection;
- textRuns = remainingRuns;
- nextLineBreak = previousLineBreak;
- shapedTextRuns = null;
- }
- else
- {
- shapedTextRuns = ShapeTextRuns(fetchedRuns, paragraphProperties, objectPool, fontManager, out resolvedFlowDirection);
- textRuns = shapedTextRuns;
-
- if (nextLineBreak == null && textEndOfLine != null)
+ if (previousLineBreak?.RemainingRuns is { } remainingRuns)
{
- nextLineBreak = new TextLineBreak(textEndOfLine, resolvedFlowDirection);
+ resolvedFlowDirection = previousLineBreak.FlowDirection;
+ textRuns = remainingRuns;
+ nextLineBreak = previousLineBreak;
+ shapedTextRuns = null;
}
- }
+ else
+ {
+ shapedTextRuns = ShapeTextRuns(fetchedRuns, paragraphProperties, objectPool, fontManager,
+ out resolvedFlowDirection);
+ textRuns = shapedTextRuns;
- TextLineImpl textLine;
+ if (nextLineBreak == null && textEndOfLine != null)
+ {
+ nextLineBreak = new TextLineBreak(textEndOfLine, resolvedFlowDirection);
+ }
+ }
- switch (textWrapping)
- {
- case TextWrapping.NoWrap:
+ TextLineImpl textLine;
+
+ switch (textWrapping)
{
- // perf note: if textRuns comes from remainingRuns above, it's very likely coming from this class
- // which already uses an array: ToArray() won't ever be called in this case
- var textRunArray = textRuns as TextRun[] ?? textRuns.ToArray();
+ case TextWrapping.NoWrap:
+ {
+ // perf note: if textRuns comes from remainingRuns above, it's very likely coming from this class
+ // which already uses an array: ToArray() won't ever be called in this case
+ var textRunArray = textRuns as TextRun[] ?? textRuns.ToArray();
- textLine = new TextLineImpl(textRunArray, firstTextSourceIndex, textSourceLength,
- paragraphWidth, paragraphProperties, resolvedFlowDirection, nextLineBreak);
+ textLine = new TextLineImpl(textRunArray, firstTextSourceIndex, textSourceLength,
+ paragraphWidth, paragraphProperties, resolvedFlowDirection, nextLineBreak);
- textLine.FinalizeLine();
+ textLine.FinalizeLine();
- break;
- }
- case TextWrapping.WrapWithOverflow:
- case TextWrapping.Wrap:
- {
- textLine = PerformTextWrapping(textRuns, firstTextSourceIndex, paragraphWidth,
- paragraphProperties, resolvedFlowDirection, nextLineBreak, objectPool, fontManager);
- break;
+ break;
+ }
+ case TextWrapping.WrapWithOverflow:
+ case TextWrapping.Wrap:
+ {
+ textLine = PerformTextWrapping(textRuns, firstTextSourceIndex, paragraphWidth,
+ paragraphProperties, resolvedFlowDirection, nextLineBreak, objectPool, fontManager);
+ break;
+ }
+ default:
+ throw new ArgumentOutOfRangeException(nameof(textWrapping));
}
- default:
- throw new ArgumentOutOfRangeException(nameof(textWrapping));
- }
-
- objectPool.TextRunLists.Return(ref shapedTextRuns);
- objectPool.TextRunLists.Return(ref fetchedRuns);
- return textLine;
+ return textLine;
+ }
+ finally
+ {
+ objectPool.TextRunLists.Return(ref shapedTextRuns);
+ objectPool.TextRunLists.Return(ref fetchedRuns);
+ }
}
///
@@ -224,23 +230,26 @@ namespace Avalonia.Media.TextFormatting
(resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
var processedRuns = objectPool.TextRunLists.Rent();
+ var groupedRuns = objectPool.UnshapedTextRunLists.Rent();
- CoalesceLevels(textRuns, bidiAlgorithm.ResolvedLevels.Span, fontManager, processedRuns);
+ try
+ {
+ CoalesceLevels(textRuns, bidiAlgorithm.ResolvedLevels.Span, fontManager, processedRuns);
- bidiData.Reset();
- bidiAlgorithm.Reset();
+ bidiData.Reset();
+ bidiAlgorithm.Reset();
- var groupedRuns = objectPool.UnshapedTextRunLists.Rent();
- var textShaper = TextShaper.Current;
- for (var index = 0; index < processedRuns.Count; index++)
- {
- var currentRun = processedRuns[index];
+ var textShaper = TextShaper.Current;
- switch (currentRun)
+ for (var index = 0; index < processedRuns.Count; index++)
{
- case UnshapedTextRun shapeableRun:
+ var currentRun = processedRuns[index];
+
+ switch (currentRun)
{
+ case UnshapedTextRun shapeableRun:
+ {
groupedRuns.Clear();
groupedRuns.Add(shapeableRun);
@@ -277,17 +286,20 @@ namespace Avalonia.Media.TextFormatting
break;
}
- default:
+ default:
{
shapedRuns.Add(currentRun);
break;
}
+ }
}
}
-
- objectPool.TextRunLists.Return(ref processedRuns);
- objectPool.UnshapedTextRunLists.Return(ref groupedRuns);
+ finally
+ {
+ objectPool.TextRunLists.Return(ref processedRuns);
+ objectPool.UnshapedTextRunLists.Return(ref groupedRuns);
+ }
return shapedRuns;
}
@@ -805,25 +817,29 @@ namespace Avalonia.Media.TextFormatting
var (preSplitRuns, postSplitRuns) = SplitTextRuns(textRuns, measuredLength, objectPool);
- var textLineBreak = postSplitRuns?.Count > 0 ?
- new TextLineBreak(null, resolvedFlowDirection, postSplitRuns.ToArray()) :
- null;
-
- if (textLineBreak is null && currentLineBreak?.TextEndOfLine != null)
+ try
{
- textLineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, resolvedFlowDirection);
- }
+ var textLineBreak = postSplitRuns?.Count > 0 ?
+ new TextLineBreak(null, resolvedFlowDirection, postSplitRuns.ToArray()) :
+ null;
- var textLine = new TextLineImpl(preSplitRuns.ToArray(), firstTextSourceIndex, measuredLength,
- paragraphWidth, paragraphProperties, resolvedFlowDirection,
- textLineBreak);
-
- textLine.FinalizeLine();
+ if (textLineBreak is null && currentLineBreak?.TextEndOfLine != null)
+ {
+ textLineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, resolvedFlowDirection);
+ }
- objectPool.TextRunLists.Return(ref preSplitRuns);
- objectPool.TextRunLists.Return(ref postSplitRuns);
+ var textLine = new TextLineImpl(preSplitRuns.ToArray(), firstTextSourceIndex, measuredLength,
+ paragraphWidth, paragraphProperties, resolvedFlowDirection,
+ textLineBreak);
- return textLine;
+ textLine.FinalizeLine();
+ return textLine;
+ }
+ finally
+ {
+ objectPool.TextRunLists.Return(ref preSplitRuns);
+ objectPool.TextRunLists.Return(ref postSplitRuns);
+ }
}
private struct TextRunEnumerator
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
index bb58e0d692..4923cdbe32 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -441,128 +441,133 @@ namespace Avalonia.Media.TextFormatting
var textLines = objectPool.TextLines.Rent();
- double left = double.PositiveInfinity, width = 0.0, height = 0.0;
-
- _textSourceLength = 0;
+ try
+ {
+ double left = double.PositiveInfinity, width = 0.0, height = 0.0;
- TextLine? previousLine = null;
+ _textSourceLength = 0;
- var textFormatter = TextFormatter.Current;
+ TextLine? previousLine = null;
- while (true)
- {
- var textLine = textFormatter.FormatLine(_textSource, _textSourceLength, MaxWidth, _paragraphProperties,
- previousLine?.TextLineBreak);
+ var textFormatter = TextFormatter.Current;
- if (textLine.Length == 0)
+ while (true)
{
- if (previousLine != null && previousLine.NewLineLength > 0)
+ var textLine = textFormatter.FormatLine(_textSource, _textSourceLength, MaxWidth,
+ _paragraphProperties, previousLine?.TextLineBreak);
+
+ if (textLine.Length == 0)
{
- var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth,
- _paragraphProperties, fontManager);
+ if (previousLine != null && previousLine.NewLineLength > 0)
+ {
+ var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth,
+ _paragraphProperties, fontManager);
- textLines.Add(emptyTextLine);
+ textLines.Add(emptyTextLine);
- UpdateBounds(emptyTextLine, ref left, ref width, ref height);
- }
+ UpdateBounds(emptyTextLine, ref left, ref width, ref height);
+ }
- break;
- }
+ break;
+ }
- _textSourceLength += textLine.Length;
+ _textSourceLength += textLine.Length;
- //Fulfill max height constraint
- if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
- {
- if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+ //Fulfill max height constraint
+ if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight)
+ && height + textLine.Height > MaxHeight)
{
- var collapsedLine =
- previousLine.Collapse(GetCollapsingProperties(MaxWidth));
+ if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+ {
+ var collapsedLine =
+ previousLine.Collapse(GetCollapsingProperties(MaxWidth));
- textLines[textLines.Count - 1] = collapsedLine;
- }
+ textLines[textLines.Count - 1] = collapsedLine;
+ }
- break;
- }
+ break;
+ }
- var hasOverflowed = textLine.HasOverflowed;
+ var hasOverflowed = textLine.HasOverflowed;
- if (hasOverflowed && _textTrimming != TextTrimming.None)
- {
- textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
- }
+ if (hasOverflowed && _textTrimming != TextTrimming.None)
+ {
+ textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
+ }
- textLines.Add(textLine);
+ textLines.Add(textLine);
- UpdateBounds(textLine, ref left, ref width, ref height);
+ UpdateBounds(textLine, ref left, ref width, ref height);
- previousLine = textLine;
+ previousLine = textLine;
- //Fulfill max lines constraint
- if (MaxLines > 0 && textLines.Count >= MaxLines)
- {
- if(textLine.TextLineBreak?.RemainingRuns is not null)
+ //Fulfill max lines constraint
+ if (MaxLines > 0 && textLines.Count >= MaxLines)
{
- textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+ if (textLine.TextLineBreak?.RemainingRuns is not null)
+ {
+ textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+ }
+
+ break;
}
- break;
+ if (textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+ {
+ break;
+ }
}
- if (textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+ //Make sure the TextLayout always contains at least on empty line
+ if (textLines.Count == 0)
{
- break;
- }
- }
+ var textLine =
+ TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties, fontManager);
- //Make sure the TextLayout always contains at least on empty line
- if (textLines.Count == 0)
- {
- var textLine = TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties, fontManager);
-
- textLines.Add(textLine);
-
- UpdateBounds(textLine, ref left, ref width, ref height);
- }
+ textLines.Add(textLine);
- Bounds = new Rect(left, 0, width, height);
+ UpdateBounds(textLine, ref left, ref width, ref height);
+ }
- if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
- {
- var whitespaceWidth = 0d;
+ Bounds = new Rect(left, 0, width, height);
- for (var i = 0; i < textLines.Count; i++)
+ if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
{
- var line = textLines[i];
- var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
+ var whitespaceWidth = 0d;
- if (lineWhitespaceWidth > whitespaceWidth)
+ for (var i = 0; i < textLines.Count; i++)
{
- whitespaceWidth = lineWhitespaceWidth;
- }
- }
+ var line = textLines[i];
+ var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
- var justificationWidth = width - whitespaceWidth;
+ if (lineWhitespaceWidth > whitespaceWidth)
+ {
+ whitespaceWidth = lineWhitespaceWidth;
+ }
+ }
- if (justificationWidth > 0)
- {
- var justificationProperties = new InterWordJustification(justificationWidth);
+ var justificationWidth = width - whitespaceWidth;
- for (var i = 0; i < textLines.Count - 1; i++)
+ if (justificationWidth > 0)
{
- var line = textLines[i];
+ var justificationProperties = new InterWordJustification(justificationWidth);
- line.Justify(justificationProperties);
+ for (var i = 0; i < textLines.Count - 1; i++)
+ {
+ var line = textLines[i];
+
+ line.Justify(justificationProperties);
+ }
}
}
- }
- var result = textLines.ToArray();
-
- objectPool.TextLines.Return(ref textLines);
- objectPool.VerifyAllReturned();
-
- return result;
+ return textLines.ToArray();
+ }
+ finally
+ {
+ objectPool.TextLines.Return(ref textLines);
+ objectPool.VerifyAllReturned();
+ }
}
///
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
index 0d777ad043..2e85b1e187 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
@@ -86,7 +86,6 @@ namespace Avalonia.Media.TextFormatting
RentedList? rentedPreSplitRuns = null;
RentedList? rentedPostSplitRuns = null;
- TextRun[]? results;
try
{
@@ -113,9 +112,7 @@ namespace Avalonia.Media.TextFormatting
if (measuredLength <= _prefixLength || effectivePostSplitRuns is null)
{
- results = collapsedRuns.ToArray();
- objectPool.TextRunLists.Return(ref collapsedRuns);
- return results;
+ return collapsedRuns.ToArray();
}
var availableSuffixWidth = availableWidth;
@@ -157,16 +154,15 @@ namespace Avalonia.Media.TextFormatting
}
}
}
+
+ return collapsedRuns.ToArray();
}
finally
{
objectPool.TextRunLists.Return(ref rentedPreSplitRuns);
objectPool.TextRunLists.Return(ref rentedPostSplitRuns);
+ objectPool.TextRunLists.Return(ref collapsedRuns);
}
-
- results = collapsedRuns.ToArray();
- objectPool.TextRunLists.Return(ref collapsedRuns);
- return results;
}
return new TextRun[] { shapedSymbol };
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
index e2160f21d2..41e792d58e 100644
--- a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -168,8 +168,9 @@ namespace Avalonia.Platform
/// The glyph typeface.
/// The font rendering em size.
/// The list of glyphs.
+ /// The baseline origin of the run. Can be null.
/// An .
- IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList glyphInfos);
+ IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList glyphInfos, Point baselineOrigin);
///
/// Creates a backend-specific object using a low-level API graphics context
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
index cec20678cf..a4005d4f5f 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
@@ -1,50 +1,65 @@
using System;
-using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Security;
using System.Threading.Tasks;
-using Avalonia.Metadata;
namespace Avalonia.Platform.Storage.FileIO;
-[Unstable]
-public class BclStorageFile : IStorageBookmarkFile
+internal class BclStorageFile : IStorageBookmarkFile
{
- private readonly FileInfo _fileInfo;
-
public BclStorageFile(string fileName)
{
- _fileInfo = new FileInfo(fileName);
+ FileInfo = new FileInfo(fileName);
}
public BclStorageFile(FileInfo fileInfo)
{
- _fileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
+ FileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
}
+ public FileInfo FileInfo { get; }
+
public bool CanOpenRead => true;
public bool CanOpenWrite => true;
- public string Name => _fileInfo.Name;
+ public string Name => FileInfo.Name;
public virtual bool CanBookmark => true;
+ public Uri Path
+ {
+ get
+ {
+ try
+ {
+ if (FileInfo.Directory is not null)
+ {
+ return StorageProviderHelpers.FilePathToUri(FileInfo.FullName);
+ }
+ }
+ catch (SecurityException)
+ {
+ }
+ return new Uri(FileInfo.Name, UriKind.Relative);
+ }
+ }
+
public Task GetBasicPropertiesAsync()
{
- if (_fileInfo.Exists)
+ if (FileInfo.Exists)
{
return Task.FromResult(new StorageItemProperties(
- (ulong)_fileInfo.Length,
- _fileInfo.CreationTimeUtc,
- _fileInfo.LastAccessTimeUtc));
+ (ulong)FileInfo.Length,
+ FileInfo.CreationTimeUtc,
+ FileInfo.LastAccessTimeUtc));
}
return Task.FromResult(new StorageItemProperties());
}
public Task GetParentAsync()
{
- if (_fileInfo.Directory is { } directory)
+ if (FileInfo.Directory is { } directory)
{
return Task.FromResult(new BclStorageFolder(directory));
}
@@ -53,17 +68,17 @@ public class BclStorageFile : IStorageBookmarkFile
public Task OpenReadAsync()
{
- return Task.FromResult(_fileInfo.OpenRead());
+ return Task.FromResult(FileInfo.OpenRead());
}
public Task OpenWriteAsync()
{
- return Task.FromResult(_fileInfo.OpenWrite());
+ return Task.FromResult(FileInfo.OpenWrite());
}
public virtual Task SaveBookmarkAsync()
{
- return Task.FromResult(_fileInfo.FullName);
+ return Task.FromResult(FileInfo.FullName);
}
public Task ReleaseBookmarkAsync()
@@ -72,28 +87,6 @@ public class BclStorageFile : IStorageBookmarkFile
return Task.CompletedTask;
}
- public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
- {
- try
- {
- if (_fileInfo.Directory is not null)
- {
- uri = Path.IsPathRooted(_fileInfo.FullName) ?
- new Uri(new Uri("file://"), _fileInfo.FullName) :
- new Uri(_fileInfo.FullName, UriKind.Relative);
- return true;
- }
-
- uri = null;
- return false;
- }
- catch (SecurityException)
- {
- uri = null;
- return false;
- }
- }
-
protected virtual void Dispose(bool disposing)
{
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
index b91e910777..1e21c197bb 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -1,23 +1,18 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Security;
using System.Threading.Tasks;
-using Avalonia.Metadata;
namespace Avalonia.Platform.Storage.FileIO;
-[Unstable]
-public class BclStorageFolder : IStorageBookmarkFolder
+internal class BclStorageFolder : IStorageBookmarkFolder
{
- private readonly DirectoryInfo _directoryInfo;
-
public BclStorageFolder(string path)
{
- _directoryInfo = new DirectoryInfo(path);
- if (!_directoryInfo.Exists)
+ DirectoryInfo = new DirectoryInfo(path);
+ if (!DirectoryInfo.Exists)
{
throw new ArgumentException("Directory must exist");
}
@@ -25,29 +20,46 @@ public class BclStorageFolder : IStorageBookmarkFolder
public BclStorageFolder(DirectoryInfo directoryInfo)
{
- _directoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
- if (!_directoryInfo.Exists)
+ DirectoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
+ if (!DirectoryInfo.Exists)
{
throw new ArgumentException("Directory must exist", nameof(directoryInfo));
}
}
- public string Name => _directoryInfo.Name;
+ public string Name => DirectoryInfo.Name;
+
+ public DirectoryInfo DirectoryInfo { get; }
public bool CanBookmark => true;
+ public Uri Path
+ {
+ get
+ {
+ try
+ {
+ return StorageProviderHelpers.FilePathToUri(DirectoryInfo.FullName);
+ }
+ catch (SecurityException)
+ {
+ return new Uri(DirectoryInfo.Name, UriKind.Relative);
+ }
+ }
+ }
+
public Task GetBasicPropertiesAsync()
{
var props = new StorageItemProperties(
null,
- _directoryInfo.CreationTimeUtc,
- _directoryInfo.LastAccessTimeUtc);
+ DirectoryInfo.CreationTimeUtc,
+ DirectoryInfo.LastAccessTimeUtc);
return Task.FromResult(props);
}
public Task GetParentAsync()
{
- if (_directoryInfo.Parent is { } directory)
+ if (DirectoryInfo.Parent is { } directory)
{
return Task.FromResult(new BclStorageFolder(directory));
}
@@ -56,9 +68,9 @@ public class BclStorageFolder : IStorageBookmarkFolder
public Task> GetItemsAsync()
{
- var items = _directoryInfo.GetDirectories()
+ var items = DirectoryInfo.GetDirectories()
.Select(d => (IStorageItem)new BclStorageFolder(d))
- .Concat(_directoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
+ .Concat(DirectoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
.ToArray();
return Task.FromResult>(items);
@@ -66,7 +78,7 @@ public class BclStorageFolder : IStorageBookmarkFolder
public virtual Task SaveBookmarkAsync()
{
- return Task.FromResult(_directoryInfo.FullName);
+ return Task.FromResult(DirectoryInfo.FullName);
}
public Task ReleaseBookmarkAsync()
@@ -75,23 +87,6 @@ public class BclStorageFolder : IStorageBookmarkFolder
return Task.CompletedTask;
}
- public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
- {
- try
- {
- uri = Path.IsPathRooted(_directoryInfo.FullName) ?
- new Uri(new Uri("file://"), _directoryInfo.FullName) :
- new Uri(_directoryInfo.FullName, UriKind.Relative);
-
- return true;
- }
- catch (SecurityException)
- {
- uri = null;
- return false;
- }
- }
-
protected virtual void Dispose(bool disposing)
{
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
index 469388021e..ee169d62a5 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
@@ -1,12 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.IO;
+using System.Runtime.InteropServices;
using System.Threading.Tasks;
-using Avalonia.Metadata;
+using Avalonia.Compatibility;
namespace Avalonia.Platform.Storage.FileIO;
-[Unstable]
-public abstract class BclStorageProvider : IStorageProvider
+internal abstract class BclStorageProvider : IStorageProvider
{
public abstract bool CanOpen { get; }
public abstract Task> OpenFilePickerAsync(FilePickerOpenOptions options);
@@ -32,4 +33,98 @@ public abstract class BclStorageProvider : IStorageProvider
? Task.FromResult(new BclStorageFolder(folder))
: Task.FromResult(null);
}
+
+ public virtual Task TryGetFileFromPath(Uri filePath)
+ {
+ if (filePath.IsAbsoluteUri)
+ {
+ var file = new FileInfo(filePath.LocalPath);
+ if (file.Exists)
+ {
+ return Task.FromResult(new BclStorageFile(file));
+ }
+ }
+
+ return Task.FromResult(null);
+ }
+
+ public virtual Task TryGetFolderFromPath(Uri folderPath)
+ {
+ if (folderPath.IsAbsoluteUri)
+ {
+ var directory = new DirectoryInfo(folderPath.LocalPath);
+ if (directory.Exists)
+ {
+ return Task.FromResult(new BclStorageFolder(directory));
+ }
+ }
+
+ return Task.FromResult(null);
+ }
+
+ public virtual Task TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+ {
+ // Note, this BCL API returns different values depending on the .NET version.
+ // We should also document it.
+ // https://github.com/dotnet/docs/issues/31423
+ // For pre-breaking change values see table:
+ // https://johnkoerner.com/csharp/special-folder-values-on-windows-versus-mac/
+ var folderPath = wellKnownFolder switch
+ {
+ WellKnownFolder.Desktop => GetFromSpecialFolder(Environment.SpecialFolder.Desktop),
+ WellKnownFolder.Documents => GetFromSpecialFolder(Environment.SpecialFolder.MyDocuments),
+ WellKnownFolder.Downloads => GetDownloadsWellKnownFolder(),
+ WellKnownFolder.Music => GetFromSpecialFolder(Environment.SpecialFolder.MyMusic),
+ WellKnownFolder.Pictures => GetFromSpecialFolder(Environment.SpecialFolder.MyPictures),
+ WellKnownFolder.Videos => GetFromSpecialFolder(Environment.SpecialFolder.MyVideos),
+ _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+ };
+
+ if (folderPath is null)
+ {
+ return Task.FromResult(null);
+ }
+
+ var directory = new DirectoryInfo(folderPath);
+ if (!directory.Exists)
+ {
+ return Task.FromResult(null);
+ }
+
+ return Task.FromResult(new BclStorageFolder(directory));
+
+ string GetFromSpecialFolder(Environment.SpecialFolder folder) =>
+ Environment.GetFolderPath(folder, Environment.SpecialFolderOption.Create);
+ }
+
+ // TODO, replace with https://github.com/dotnet/runtime/issues/70484 when implemented.
+ // Normally we want to avoid platform specific code in the Avalonia.Base assembly.
+ protected static string? GetDownloadsWellKnownFolder()
+ {
+ if (OperatingSystemEx.IsWindows())
+ {
+ return Environment.OSVersion.Version.Major < 6 ? null :
+ SHGetKnownFolderPath(s_folderDownloads, 0, IntPtr.Zero);
+ }
+
+ if (OperatingSystemEx.IsLinux())
+ {
+ var envDir = Environment.GetEnvironmentVariable("XDG_DOWNLOAD_DIR");
+ if (envDir != null && Directory.Exists(envDir))
+ {
+ return envDir;
+ }
+ }
+
+ if (OperatingSystemEx.IsLinux() || OperatingSystemEx.IsMacOS())
+ {
+ return "~/Downloads";
+ }
+
+ return null;
+ }
+
+ private static readonly Guid s_folderDownloads = new Guid("374DE290-123F-4565-9164-39C4925E467B");
+ [DllImport("shell32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
+ private static extern string SHGetKnownFolderPath([MarshalAs(UnmanagedType.LPStruct)] Guid id, int flags, IntPtr token);
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
index f90d0a5a2f..55e84ee937 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
@@ -1,13 +1,23 @@
using System;
using System.IO;
using System.Linq;
-using Avalonia.Metadata;
+using System.Text;
namespace Avalonia.Platform.Storage.FileIO;
-[Unstable]
-public static class StorageProviderHelpers
+internal static class StorageProviderHelpers
{
+ public static Uri FilePathToUri(string path)
+ {
+ var uriPath = new StringBuilder(path)
+ .Replace("%", $"%{(int)'%':X2}")
+ .Replace("[", $"%{(int)'[':X2}")
+ .Replace("]", $"%{(int)']':X2}")
+ .ToString();
+
+ return new UriBuilder("file", string.Empty) { Path = uriPath }.Uri;
+ }
+
public static string NameWithExtension(string path, string? defaultExtension, FilePickerFileType? filter)
{
var name = Path.GetFileName(path);
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
index f5469d31c9..c2c93400b0 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
@@ -20,13 +20,13 @@ public interface IStorageItem : IDisposable
string Name { get; }
///
- /// Gets the full file-system path of the item, if the item has a path.
+ /// Gets the file-system path of the item.
///
///
/// Android backend might return file path with "content:" scheme.
/// Browser and iOS backends might return relative uris.
///
- bool TryGetUri([NotNullWhen(true)] out Uri? uri);
+ Uri Path { get; }
///
/// Gets the basic properties of the current item.
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
index 0f5cf931d9..6922151e02 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Versioning;
using System.Threading.Tasks;
using Avalonia.Metadata;
@@ -53,4 +55,35 @@ public interface IStorageProvider
/// Bookmark ID.
/// Bookmarked folder or null if OS denied request.
Task OpenFolderBookmarkAsync(string bookmark);
+
+ ///
+ /// Attempts to read file from the file-system by its path.
+ ///
+ /// The path of the item to retrieve in Uri format.
+ ///
+ /// Uri path is usually expected to be an absolute path with "file" scheme.
+ /// But it can be an uri with "content" scheme on the Android.
+ /// It also might ask user for the permission, and throw an exception if it was denied.
+ ///
+ /// File or null if it doesn't exist.
+ Task TryGetFileFromPath(Uri filePath);
+
+ ///
+ /// Attempts to read folder from the file-system by its path.
+ ///
+ /// The path of the folder to retrieve in Uri format.
+ ///
+ /// Uri path is usually expected to be an absolute path with "file" scheme.
+ /// But it can be an uri with "content" scheme on the Android.
+ /// It also might ask user for the permission, and throw an exception if it was denied.
+ ///
+ /// Folder or null if it doesn't exist.
+ Task TryGetFolderFromPath(Uri folderPath);
+
+ ///
+ /// Attempts to read folder from the file-system by its path
+ ///
+ /// Well known folder identifier.
+ /// Folder or null if it doesn't exist.
+ Task TryGetWellKnownFolder(WellKnownFolder wellKnownFolder);
}
diff --git a/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs b/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs
new file mode 100644
index 0000000000..4a0d0c634f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.Platform.Storage;
+
+public class NameCollisionOption
+{
+
+}
diff --git a/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
new file mode 100644
index 0000000000..c7772d1196
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage.FileIO;
+
+namespace Avalonia.Platform.Storage;
+
+///
+/// Group of public extensions for class.
+///
+public static class StorageProviderExtensions
+{
+ ///
+ public static Task TryGetFileFromPath(this IStorageProvider provider, string filePath)
+ {
+ return provider.TryGetFileFromPath(StorageProviderHelpers.FilePathToUri(filePath));
+ }
+
+ ///
+ public static Task TryGetFolderFromPath(this IStorageProvider provider, string folderPath)
+ {
+ return provider.TryGetFolderFromPath(StorageProviderHelpers.FilePathToUri(folderPath));
+ }
+
+ internal static string? TryGetFullPath(this IStorageFolder folder)
+ {
+ // We can avoid double escaping of the path by checking for BclStorageFolder.
+ // Ideally, `folder.Path.LocalPath` should also work, as that's only available way for the users.
+ if (folder is BclStorageFolder storageFolder)
+ {
+ return storageFolder.DirectoryInfo.FullName;
+ }
+
+ if (folder.Path is { IsAbsoluteUri: true, Scheme: "file" } absolutePath)
+ {
+ return absolutePath.LocalPath;
+ }
+
+ // android "content:", browser and ios relative links go here.
+ return null;
+ }
+
+ internal static string? TryGetFullPath(this IStorageFile file)
+ {
+ if (file is BclStorageFile storageFolder)
+ {
+ return storageFolder.FileInfo.FullName;
+ }
+
+ if (file.Path is { IsAbsoluteUri: true, Scheme: "file" } absolutePath)
+ {
+ return absolutePath.LocalPath;
+ }
+
+ return null;
+ }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs b/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs
new file mode 100644
index 0000000000..fcc933bc53
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs
@@ -0,0 +1,37 @@
+namespace Avalonia.Platform.Storage;
+
+///
+/// Specifies enumerated constants used to retrieve directory paths to system well known folders.
+///
+public enum WellKnownFolder
+{
+ ///
+ /// Current user desktop folder.
+ ///
+ Desktop,
+
+ ///
+ /// Current user documents folder.
+ ///
+ Documents,
+
+ ///
+ /// Current user downloads folder.
+ ///
+ Downloads,
+
+ ///
+ /// Current user music folder
+ ///
+ Music,
+
+ ///
+ /// Current user pictures folder
+ ///
+ Pictures,
+
+ ///
+ /// Current user videos folder
+ ///
+ Videos,
+}
diff --git a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
index 93fffb3755..3e20dcce56 100644
--- a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
+++ b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
@@ -19,7 +19,7 @@ namespace Avalonia.PropertyStore
private T? _baseValue;
private UncommonFields? _uncommon;
- public EffectiveValue(AvaloniaObject owner, StyledPropertyBase property)
+ public EffectiveValue(AvaloniaObject owner, StyledProperty property)
{
Priority = BindingPriority.Unset;
BasePriority = BindingPriority.Unset;
@@ -57,12 +57,12 @@ namespace Avalonia.PropertyStore
Debug.Assert(priority != BindingPriority.LocalValue);
UpdateValueEntry(value, priority);
- SetAndRaiseCore(owner, (StyledPropertyBase)value.Property, GetValue(value), priority);
+ SetAndRaiseCore(owner, (StyledProperty)value.Property, GetValue(value), priority);
}
public void SetLocalValueAndRaise(
ValueStore owner,
- StyledPropertyBase property,
+ StyledProperty property,
T value)
{
SetAndRaiseCore(owner, property, value, BindingPriority.LocalValue);
@@ -82,7 +82,7 @@ namespace Avalonia.PropertyStore
{
Debug.Assert(oldValue is not null || newValue is not null);
- var p = (StyledPropertyBase)property;
+ var p = (StyledProperty)property;
var o = oldValue is not null ? ((EffectiveValue)oldValue).Value : _metadata.DefaultValue;
var n = newValue is not null ? ((EffectiveValue)newValue).Value : _metadata.DefaultValue;
var priority = newValue is not null ? BindingPriority.Inherited : BindingPriority.Unset;
@@ -98,7 +98,7 @@ namespace Avalonia.PropertyStore
Debug.Assert(Priority != BindingPriority.Animation);
Debug.Assert(BasePriority != BindingPriority.Unset);
UpdateValueEntry(null, BindingPriority.Animation);
- SetAndRaiseCore(owner, (StyledPropertyBase)property, _baseValue!, BasePriority);
+ SetAndRaiseCore(owner, (StyledProperty)property, _baseValue!, BasePriority);
}
public override void CoerceValue(ValueStore owner, AvaloniaProperty property)
@@ -107,7 +107,7 @@ namespace Avalonia.PropertyStore
return;
SetAndRaiseCore(
owner,
- (StyledPropertyBase)property,
+ (StyledProperty)property,
_uncommon._uncoercedValue!,
Priority,
_uncommon._uncoercedBaseValue!,
@@ -117,10 +117,10 @@ namespace Avalonia.PropertyStore
public override void DisposeAndRaiseUnset(ValueStore owner, AvaloniaProperty property)
{
UnsubscribeValueEntries();
- DisposeAndRaiseUnset(owner, (StyledPropertyBase)property);
+ DisposeAndRaiseUnset(owner, (StyledProperty)property);
}
- public void DisposeAndRaiseUnset(ValueStore owner, StyledPropertyBase property)
+ public void DisposeAndRaiseUnset(ValueStore owner, StyledProperty property)
{
BindingPriority priority;
T oldValue;
@@ -156,7 +156,7 @@ namespace Avalonia.PropertyStore
private void SetAndRaiseCore(
ValueStore owner,
- StyledPropertyBase property,
+ StyledProperty property,
T value,
BindingPriority priority)
{
@@ -203,7 +203,7 @@ namespace Avalonia.PropertyStore
private void SetAndRaiseCore(
ValueStore owner,
- StyledPropertyBase property,
+ StyledProperty property,
T value,
BindingPriority priority,
T baseValue,
diff --git a/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs b/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
index 364b4e1225..d8a353dc70 100644
--- a/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
@@ -9,7 +9,7 @@ namespace Avalonia.PropertyStore
public ImmediateValueEntry(
ImmediateValueFrame owner,
- StyledPropertyBase property,
+ StyledProperty property,
T value)
{
_owner = owner;
@@ -17,7 +17,7 @@ namespace Avalonia.PropertyStore
Property = property;
}
- public StyledPropertyBase Property { get; }
+ public StyledProperty Property { get; }
public bool HasValue => true;
AvaloniaProperty IValueEntry.Property => Property;
diff --git a/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs b/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
index 50d5333b9f..7e9f3ab312 100644
--- a/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
+++ b/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
@@ -15,7 +15,7 @@ namespace Avalonia.PropertyStore
}
public TypedBindingEntry AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable> source)
{
var e = new TypedBindingEntry(this, property, source);
@@ -24,7 +24,7 @@ namespace Avalonia.PropertyStore
}
public TypedBindingEntry AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source)
{
var e = new TypedBindingEntry(this, property, source);
@@ -33,7 +33,7 @@ namespace Avalonia.PropertyStore
}
public SourceUntypedBindingEntry AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source)
{
var e = new SourceUntypedBindingEntry(this, property, source);
@@ -41,7 +41,7 @@ namespace Avalonia.PropertyStore
return e;
}
- public ImmediateValueEntry AddValue(StyledPropertyBase property, T value)
+ public ImmediateValueEntry AddValue(StyledProperty property, T value)
{
var e = new ImmediateValueEntry(this, property, value);
Add(e);
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs b/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
index 8acb885604..f89cb029b6 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
@@ -11,13 +11,13 @@ namespace Avalonia.PropertyStore
private readonly ValueStore _owner;
private IDisposable? _subscription;
- public LocalValueBindingObserver(ValueStore owner, StyledPropertyBase property)
+ public LocalValueBindingObserver(ValueStore owner, StyledProperty property)
{
_owner = owner;
Property = property;
}
- public StyledPropertyBase Property { get;}
+ public StyledProperty Property { get;}
public void Start(IObservable source)
{
@@ -41,7 +41,7 @@ namespace Avalonia.PropertyStore
public void OnNext(T value)
{
- static void Execute(ValueStore owner, StyledPropertyBase property, T value)
+ static void Execute(ValueStore owner, StyledProperty property, T value)
{
if (property.ValidateValue?.Invoke(value) != false)
owner.SetValue(property, value, BindingPriority.LocalValue);
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs b/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
index 7c529591b6..2d157b2519 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
@@ -11,13 +11,13 @@ namespace Avalonia.PropertyStore
private readonly ValueStore _owner;
private IDisposable? _subscription;
- public LocalValueUntypedBindingObserver(ValueStore owner, StyledPropertyBase property)
+ public LocalValueUntypedBindingObserver(ValueStore owner, StyledProperty property)
{
_owner = owner;
Property = property;
}
- public StyledPropertyBase Property { get; }
+ public StyledProperty Property { get; }
public void Start(IObservable source)
{
diff --git a/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs b/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
index b4ac06d2bf..b56d0d4529 100644
--- a/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
@@ -13,14 +13,14 @@ namespace Avalonia.PropertyStore
public SourceUntypedBindingEntry(
ValueFrame frame,
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source)
: base(frame, property, source)
{
_validate = property.ValidateValue;
}
- public new StyledPropertyBase Property => (StyledPropertyBase)base.Property;
+ public new StyledProperty Property => (StyledProperty)base.Property;
protected override BindingValue ConvertAndValidate(object? value)
{
diff --git a/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs b/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
index 2276991a18..697725c87b 100644
--- a/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
@@ -11,7 +11,7 @@ namespace Avalonia.PropertyStore
{
public TypedBindingEntry(
ValueFrame frame,
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source)
: base(frame, property, source)
{
@@ -19,13 +19,13 @@ namespace Avalonia.PropertyStore
public TypedBindingEntry(
ValueFrame frame,
- StyledPropertyBase property,
+ StyledProperty property,
IObservable> source)
: base(frame, property, source)
{
}
- public new StyledPropertyBase Property => (StyledPropertyBase)base.Property;
+ public new StyledProperty Property => (StyledProperty)base.Property;
protected override BindingValue ConvertAndValidate(T value)
{
diff --git a/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs b/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
index 5c5591dcb5..372a808fb2 100644
--- a/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
+++ b/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
@@ -26,7 +26,7 @@ namespace Avalonia.PropertyStore
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
public static bool TryConvertAndValidate(
- StyledPropertyBase property,
+ StyledProperty property,
object? value,
[MaybeNullWhen(false)] out T result)
{
diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 92e5288255..f36a96992b 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -43,7 +43,7 @@ namespace Avalonia.PropertyStore
}
public IDisposable AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable> source,
BindingPriority priority)
{
@@ -71,7 +71,7 @@ namespace Avalonia.PropertyStore
}
public IDisposable AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source,
BindingPriority priority)
{
@@ -99,7 +99,7 @@ namespace Avalonia.PropertyStore
}
public IDisposable AddBinding(
- StyledPropertyBase property,
+ StyledProperty property,
IObservable source,
BindingPriority priority)
{
@@ -165,7 +165,7 @@ namespace Avalonia.PropertyStore
}
}
- public IDisposable? SetValue(StyledPropertyBase property, T value, BindingPriority priority)
+ public IDisposable? SetValue(StyledProperty property, T value, BindingPriority priority)
{
if (property.ValidateValue?.Invoke(value) == false)
{
@@ -219,7 +219,7 @@ namespace Avalonia.PropertyStore
return GetDefaultValue(property);
}
- public T GetValue(StyledPropertyBase property)
+ public T GetValue