chore: rename IFilePicker properties to avoid clash with preexisting …

…public properties
jeromelaban · Feb 20, 2024 · e24264b · e24264b
1 parent f166b7a
commit e24264b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.X11/LinuxFilePickerExtension.cs b/src/Uno.UI.Runtime.Skia.X11/LinuxFilePickerExtension.cs
@@ -139,11 +139,11 @@ public async Task<IReadOnlyList<string>> PickFilesAsync(CancellationToken token,
 			var requestPath2 = await fileChooser.OpenFileAsync(window, title, new Dictionary<string, object>
 			{
 				{ "handle_token", handleToken },
-				{ "accept_label", string.IsNullOrEmpty(picker.CommitButtonText) ? ResourceAccessor.GetLocalizedStringResource("FILE_PICKER_ACCEPT_LABEL") : picker.CommitButtonText },
+				{ "accept_label", string.IsNullOrEmpty(picker.CommitButtonTextInternal) ? ResourceAccessor.GetLocalizedStringResource("FILE_PICKER_ACCEPT_LABEL") : picker.CommitButtonTextInternal },
 				{ "multiple", multiple },
 				{ "directory", directory },
-				{ "filters", GetPortalFilters(picker.FileTypeFilter) },
-				{ "current_folder", Encoding.UTF8.GetBytes(PickerHelpers.GetInitialDirectory(picker.SuggestedStartLocation)).Append((byte)'\0') }
+				{ "filters", GetPortalFilters(picker.FileTypeFilterInternal) },
+				{ "current_folder", Encoding.UTF8.GetBytes(PickerHelpers.GetInitialDirectory(picker.SuggestedStartLocationInternal)).Append((byte)'\0') }
 			});
 
 			if (requestPath != requestPath2)

diff --git a/src/Uno.UWP/Storage/Pickers/FileOpenPicker.cs b/src/Uno.UWP/Storage/Pickers/FileOpenPicker.cs
@@ -47,6 +47,10 @@ public string CommitButtonText
 			set => _commitButtonText = value ?? throw new ArgumentNullException(nameof(value));
 		}
 
+		string IFilePicker.CommitButtonTextInternal => CommitButtonText;
+		PickerLocationId IFilePicker.SuggestedStartLocationInternal => PickerLocationId.DocumentsLibrary;
+		IList<string> IFilePicker.FileTypeFilterInternal => new FileExtensionVector();
+
 #if __SKIA__ || __WASM__ || __IOS__ || __ANDROID__ || __MACOS__
 		public FileOpenPicker()
 		{

diff --git a/src/Uno.UWP/Storage/Pickers/FolderPicker.cs b/src/Uno.UWP/Storage/Pickers/FolderPicker.cs
@@ -57,6 +57,10 @@ public string CommitButtonText
 			set => _commitButtonText = value ?? throw new ArgumentNullException(nameof(value));
 		}
 
+		string IFilePicker.CommitButtonTextInternal => CommitButtonText;
+		PickerLocationId IFilePicker.SuggestedStartLocationInternal => PickerLocationId.DocumentsLibrary;
+		IList<string> IFilePicker.FileTypeFilterInternal => new FileExtensionVector();
+
 #if __SKIA__ || __MACOS__ || __WASM__ || __IOS__ || __ANDROID__
 		public FolderPicker()
 		{

diff --git a/src/Uno.UWP/Storage/Pickers/IFilePicker.cs b/src/Uno.UWP/Storage/Pickers/IFilePicker.cs
@@ -3,7 +3,7 @@ namespace Windows.Storage.Pickers;
 
 internal interface IFilePicker
 {
-	string CommitButtonText { get; }
-	IList<string> FileTypeFilter { get; }
-	PickerLocationId SuggestedStartLocation { get; }
+	string CommitButtonTextInternal { get; }
+	IList<string> FileTypeFilterInternal { get; }
+	PickerLocationId SuggestedStartLocationInternal { get; }
 }