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

Fixed #1757 Swipe down On MediaPicker only closes its window #1765

Merged
merged 23 commits into from
Jul 12, 2021
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7b54620
Merge branch xamarin:main into dimonovdd:main
dimonovdd Oct 8, 2020
19c4b9c
Merge pull request #5 from xamarin/main
dimonovdd Oct 14, 2020
221b129
Merge xamarin:main into dimonovdd:main
dimonovdd Oct 14, 2020
d46ce2e
Merge xamarin:main into dimonovdd:main
dimonovdd Oct 19, 2020
d129f51
Merge Xamarin:main into dimonovdd:main
dimonovdd Oct 24, 2020
01aa686
merge xamarin:main into dimonovdd:main
dimonovdd Nov 7, 2020
c49f378
merge xamarin:main into dimonovdd:main
dimonovdd Nov 7, 2020
47fcaee
merge xamarin:main into dimonovdd:main
dimonovdd Nov 15, 2020
c6e9303
merge xamarin:main into dimonovdd:main
dimonovdd Nov 20, 2020
bf59618
merge xamarin:main into dimonovdd:main
dimonovdd Nov 22, 2020
a2950ec
merge xamarin:main into dimonovdd:main
dimonovdd Nov 24, 2020
637d91f
merge xamarin:main into dimonovdd:main
dimonovdd Nov 25, 2020
7b88eca
merge xamarin:main into dimonovdd:main
dimonovdd Dec 19, 2020
29244c6
Merge pull request #18 from xamarin/main
dimonovdd Dec 22, 2020
bb65055
merge xamarin:main into dimonovdd:main
dimonovdd Dec 27, 2020
0868e1c
merge xamarin:main into dimonovdd:main
dimonovdd Jan 16, 2021
fa2cd60
merge xamarin:main into dimonovdd:main
dimonovdd Jan 24, 2021
18dd6c6
merge xamarin:main into dimonovdd:main
dimonovdd Jan 26, 2021
66fb6ac
merge xamarin:main into dimonovdd:main
dimonovdd Jan 30, 2021
5f8314f
merge xamarin:main into dimonovdd:main
dimonovdd Feb 13, 2021
65739e7
merge xamarin:main into dimonovdd:main
dimonovdd Feb 19, 2021
aee6b07
Controller's dismiss moved to Complete action
dimonovdd Apr 17, 2021
f8e98e9
Merge branch 'main' into fix1757
Redth Jul 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Xamarin.Essentials/MediaPicker/MediaPicker.ios.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ static async Task<FileResult> PhotoAsync(MediaPickerOptions options, bool photo,
var tcs = new TaskCompletionSource<FileResult>(picker);
picker.Delegate = new PhotoPickerDelegate
{
CompletedHandler = info => GetFileResult(info, tcs)
CompletedHandler = async info =>
{
GetFileResult(info, tcs);
await vc.DismissViewControllerAsync(true);
}
};

if (picker.PresentationController != null)
Expand All @@ -80,8 +84,6 @@ static async Task<FileResult> PhotoAsync(MediaPickerOptions options, bool photo,

var result = await tcs.Task;

await vc.DismissViewControllerAsync(true);

picker?.Dispose();
picker = null;

Expand Down