@@ -516,8 +516,74 @@ module App =
516516 match app.ApplicationLifetime with
517517 | :? Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime as desktop ->
518518 desktop.MainWindow |> Option.ofObj |> Option.map (fun w -> w.StorageProvider)
519+ | :? Avalonia.Controls.ApplicationLifetimes.ISingleViewApplicationLifetime as singleView ->
520+ singleView.MainView
521+ |> Option.ofObj
522+ |> Option.bind (fun v -> Avalonia.Controls.TopLevel.GetTopLevel(v) |> Option.ofObj)
523+ |> Option.map (fun tl -> tl.StorageProvider)
519524 | _ -> None
520525
526+ let private cropToSquarePng (imageBytes: byte[]) =
527+ use skBmp = SkiaSharp.SKBitmap.Decode(imageBytes)
528+ let size = min skBmp.Width skBmp.Height
529+ let x = (skBmp.Width - size) / 2
530+ let y = (skBmp.Height - size) / 2
531+ use cropped = new SkiaSharp.SKBitmap(size, size)
532+ skBmp.ExtractSubset(cropped, SkiaSharp.SKRectI(x, y, x + size, y + size)) |> ignore
533+ use img = SkiaSharp.SKImage.FromBitmap(cropped)
534+ use data = img.Encode(SkiaSharp.SKEncodedImageFormat.Png, 90)
535+ data.ToArray()
536+
537+#if MOBILE
538+ let private pickPhotoCmd =
539+ Cmd.ofEffect (fun dispatch ->
540+ task {
541+ try
542+ let! bytes = Skrepka.iOS.PhotoPicker.pick ()
543+
544+ match bytes with
545+ | Some b -> dispatch (PhotoPicked(Some(cropToSquarePng b)))
546+ | None -> dispatch (PhotoPicked None)
547+ with _ ->
548+ dispatch (PhotoPicked None)
549+ }
550+ |> ignore)
551+#else
552+ let private pickPhotoCmd =
553+ Cmd.ofEffect (fun dispatch ->
554+ Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(fun () ->
555+ task {
556+ try
557+ match getStorageProvider () with
558+ | Some sp ->
559+ let opts =
560+ Avalonia.Platform.Storage.FilePickerOpenOptions(
561+ AllowMultiple = false,
562+ Title = "Pick Photo",
563+ FileTypeFilter =
564+ [ Avalonia.Platform.Storage.FilePickerFileType(
565+ "Images",
566+ Patterns = [ "*.png"; "*.jpg"; "*.jpeg"; "*.gif"; "*.bmp" ]
567+ ) ]
568+ )
569+
570+ let! files = sp.OpenFilePickerAsync(opts)
571+
572+ match files |> Seq.tryHead with
573+ | None -> dispatch (PhotoPicked None)
574+ | Some file ->
575+ use! stream = file.OpenReadAsync()
576+ use ms = new MemoryStream()
577+ do! stream.CopyToAsync(ms)
578+ dispatch (PhotoPicked(Some(cropToSquarePng (ms.ToArray()))))
579+ | None -> dispatch (PhotoPicked None)
580+ with _ ->
581+ dispatch (PhotoPicked None)
582+ }
583+ :> System.Threading.Tasks.Task)
584+ |> ignore)
585+#endif
586+
521587 let mapCmd cmdMsg =
522588 match cmdMsg with
523589 | CmdConnect(url, identity) ->
@@ -634,50 +700,7 @@ module App =
634700
635701 | CmdSaveData data -> Cmd.ofEffect (fun _ -> Store.saveData data)
636702
637− | CmdPickPhoto ->
638− Cmd.ofEffect (fun dispatch ->
639− Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(fun () ->
640− task {
641− try
642− match getStorageProvider () with
643− | Some sp ->
644− let opts =
645− Avalonia.Platform.Storage.FilePickerOpenOptions(
646− AllowMultiple = false,
647− Title = "Pick Photo",
648− FileTypeFilter =
649− [ Avalonia.Platform.Storage.FilePickerFileType(
650− "Images",
651− Patterns = [ "*.png"; "*.jpg"; "*.jpeg"; "*.gif"; "*.bmp" ]
652− ) ]
653− )
654−
655− let! files = sp.OpenFilePickerAsync(opts)
656−
657− match files |> Seq.tryHead with
658− | None -> dispatch (PhotoPicked None)
659− | Some file ->
660− use! stream = file.OpenReadAsync()
661− use ms = new MemoryStream()
662− do! stream.CopyToAsync(ms)
663− use skBmp = SkiaSharp.SKBitmap.Decode(ms.ToArray())
664− let size = min skBmp.Width skBmp.Height
665− let x = (skBmp.Width - size) / 2
666− let y = (skBmp.Height - size) / 2
667− use cropped = new SkiaSharp.SKBitmap(size, size)
668−
669− skBmp.ExtractSubset(cropped, SkiaSharp.SKRectI(x, y, x + size, y + size))
670− |> ignore
671−
672− use img = SkiaSharp.SKImage.FromBitmap(cropped)
673− use data = img.Encode(SkiaSharp.SKEncodedImageFormat.Png, 90)
674− dispatch (PhotoPicked(Some(data.ToArray())))
675− | None -> dispatch (PhotoPicked None)
676− with _ ->
677− dispatch (PhotoPicked None)
678− }
679− :> System.Threading.Tasks.Task)
680− |> ignore)
703+ | CmdPickPhoto -> pickPhotoCmd
681704
682705 | CmdSaveProfile profile -> Cmd.ofEffect (fun _ -> Store.saveProfile profile)
683706