Gestiti allegati da galleria e fotocamera e aggiunto sentry
This commit is contained in:
9
.idea/.idea.SteUp/.idea/libraries/androidx_lifecycle_lifecycle_common_java8.xml
generated
Normal file
9
.idea/.idea.SteUp/.idea/libraries/androidx_lifecycle_lifecycle_common_java8.xml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<component name="libraryTable">
|
||||
<library name="androidx.lifecycle.lifecycle-common-java8">
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.nuget/packages/xamarin.androidx.lifecycle.common.java8/2.8.7.2/jar/androidx.lifecycle.lifecycle-common-java8.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
9
.idea/.idea.SteUp/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk7_2_0_0.xml
generated
Normal file
9
.idea/.idea.SteUp/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk7_2_0_0.xml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<component name="libraryTable">
|
||||
<library name="org.jetbrains.kotlin.kotlin-stdlib-jdk7-2.0.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.nuget/packages/xamarin.kotlin.stdlib.jdk7/2.0.0/jar/org.jetbrains.kotlin.kotlin-stdlib-jdk7-2.0.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
9
.idea/.idea.SteUp/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk8_2_0_0.xml
generated
Normal file
9
.idea/.idea.SteUp/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk8_2_0_0.xml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<component name="libraryTable">
|
||||
<library name="org.jetbrains.kotlin.kotlin-stdlib-jdk8-2.0.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$USER_HOME$/.nuget/packages/xamarin.kotlin.stdlib.jdk8/2.0.0/jar/org.jetbrains.kotlin.kotlin-stdlib-jdk8-2.0.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
101
SteUp.Maui/Core/Services/AttachedService.cs
Normal file
101
SteUp.Maui/Core/Services/AttachedService.cs
Normal file
@@ -0,0 +1,101 @@
|
||||
using SteUp.Shared.Core.Dto;
|
||||
using SteUp.Shared.Core.Interface.System;
|
||||
|
||||
namespace SteUp.Maui.Core.Services;
|
||||
|
||||
public class AttachedService : IAttachedService
|
||||
{
|
||||
public async Task<AttachedDto?> SelectImageFromCamera()
|
||||
{
|
||||
var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
|
||||
var storagePerm = await Permissions.RequestAsync<Permissions.StorageWrite>();
|
||||
|
||||
if (cameraPerm != PermissionStatus.Granted || storagePerm != PermissionStatus.Granted)
|
||||
return null;
|
||||
|
||||
FileResult? result;
|
||||
|
||||
try
|
||||
{
|
||||
result = await MediaPicker.Default.CapturePhotoAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Errore cattura foto: {ex.Message}");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return null;
|
||||
}
|
||||
|
||||
return result is null ? null : await ConvertToDto(result, AttachedDto.TypeAttached.Image);
|
||||
}
|
||||
|
||||
public async Task<AttachedDto?> SelectImageFromGallery()
|
||||
{
|
||||
var storagePerm = await Permissions.RequestAsync<Permissions.StorageRead>();
|
||||
if (storagePerm != PermissionStatus.Granted)
|
||||
return null;
|
||||
|
||||
FileResult? result;
|
||||
|
||||
try
|
||||
{
|
||||
result = await MediaPicker.Default.PickPhotoAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Errore selezione galleria: {ex.Message}");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return null;
|
||||
}
|
||||
|
||||
return result is null ? null : await ConvertToDto(result, AttachedDto.TypeAttached.Image);
|
||||
}
|
||||
|
||||
private static async Task<AttachedDto> ConvertToDto(FileResult file, AttachedDto.TypeAttached type)
|
||||
{
|
||||
var stream = await file.OpenReadAsync();
|
||||
using var ms = new MemoryStream();
|
||||
await stream.CopyToAsync(ms);
|
||||
|
||||
return new AttachedDto
|
||||
{
|
||||
Name = file.FileName,
|
||||
Path = file.FullPath,
|
||||
MimeType = file.ContentType,
|
||||
DimensionBytes = ms.Length,
|
||||
FileBytes = ms.ToArray(),
|
||||
Type = type
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<string> SaveToTempStorage(Stream file, string fileName, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(file);
|
||||
|
||||
if (file.CanSeek)
|
||||
file.Position = 0;
|
||||
|
||||
fileName = Path.GetFileName(fileName);
|
||||
|
||||
var dir = FileSystem.CacheDirectory;
|
||||
var filePath = Path.Combine(dir, fileName);
|
||||
|
||||
await using var fileStream = File.Create(filePath);
|
||||
await file.CopyToAsync(fileStream, ct);
|
||||
|
||||
return filePath;
|
||||
}
|
||||
|
||||
public Task OpenFile(string fileName, string filePath)
|
||||
{
|
||||
#if IOS
|
||||
throw new NotImplementedException();
|
||||
#else
|
||||
return Launcher.OpenAsync(new OpenFileRequest
|
||||
{
|
||||
Title = "Apri file",
|
||||
File = new ReadOnlyFile(filePath)
|
||||
});
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -4,5 +4,12 @@ namespace SteUp.Maui.Core.System;
|
||||
|
||||
public class GenericSystemService : IGenericSystemService
|
||||
{
|
||||
public string GetCurrentAppVersion() => AppInfo.VersionString;
|
||||
public string GetCurrentAppVersion()
|
||||
{
|
||||
#if DEBUG
|
||||
return $"v{AppInfo.VersionString} [DEBUG]";
|
||||
#else
|
||||
return $"v{AppInfo.VersionString}";
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,14 @@ namespace SteUp.Maui
|
||||
.UseMauiApp<App>()
|
||||
.UseIntegry(appToken: AppToken, useLoginAzienda: true)
|
||||
.UseMauiCommunityToolkit()
|
||||
.UseSentry(options =>
|
||||
{
|
||||
options.Dsn = "https://c1ff03e3d1d2dd973a1ce73c58f92a8d@o4508499810254848.ingest.de.sentry.io/4510900455866448";
|
||||
#if DEBUG
|
||||
options.Debug = true;
|
||||
#endif
|
||||
options.TracesSampleRate = 1.0;
|
||||
})
|
||||
.ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); });
|
||||
|
||||
builder.Services.AddMauiBlazorWebView();
|
||||
|
||||
@@ -120,6 +120,7 @@
|
||||
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.120"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.12" />
|
||||
<PackageReference Include="Sentry.Maui" Version="5.16.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -36,7 +36,7 @@ else
|
||||
</div>
|
||||
|
||||
<div class="my-4 login-footer">
|
||||
<span>@($"v{GenericSystemService.GetCurrentAppVersion()} | Powered by")</span>
|
||||
<span>@GenericSystemService.GetCurrentAppVersion() | Powered by")</span>
|
||||
<img src="_content/SteUp.Shared/images/logoIntegry.svg" class="img-fluid" alt="Integry">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,21 +2,5 @@
|
||||
@inject IGenericSystemService GenericSystemService
|
||||
|
||||
<div class="app-version">
|
||||
<span>@Version</span>
|
||||
<span>@GenericSystemService.GetCurrentAppVersion()</span>
|
||||
</div>
|
||||
|
||||
@code
|
||||
{
|
||||
private string Version { get; set; } = "";
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
#if DEBUG
|
||||
Version = $"v{GenericSystemService.GetCurrentAppVersion()} [DEBUG]";
|
||||
#else
|
||||
Version = $"v{GenericSystemService.GetCurrentAppVersion()}";
|
||||
#endif
|
||||
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
@using SteUp.Shared.Components.Layout
|
||||
@using SteUp.Shared.Components.Layout.Overlay
|
||||
@using SteUp.Shared.Core.Dto
|
||||
@using SteUp.Shared.Core.Interface.System
|
||||
@inject IAttachedService AttachedService
|
||||
|
||||
<MudDialog Class="customDialog-form disable-safe-area">
|
||||
<DialogContent>
|
||||
@@ -34,18 +36,11 @@
|
||||
</DialogActions>
|
||||
</MudDialog>
|
||||
|
||||
<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
|
||||
|
||||
@code {
|
||||
[CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
|
||||
|
||||
[CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = null!;
|
||||
[Parameter] public bool CanAddPosition { get; set; }
|
||||
|
||||
//Overlay for save
|
||||
private bool VisibleOverlay { get; set; }
|
||||
private bool SuccessAnimation { get; set; }
|
||||
|
||||
// private AttachedDTO? Attached { get; set; }
|
||||
|
||||
private AttachedDto? Attached { get; set; }
|
||||
|
||||
private bool _requireNewName;
|
||||
|
||||
@@ -60,8 +55,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
private bool SelectTypePicture { get; set; }
|
||||
|
||||
private string TitleModal { get; set; } = "Aggiungi allegati";
|
||||
|
||||
private string? _newName;
|
||||
@@ -76,66 +69,53 @@
|
||||
}
|
||||
}
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
SelectTypePicture = true;
|
||||
RequireNewName = false;
|
||||
Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
|
||||
}
|
||||
|
||||
private async Task OnCamera()
|
||||
{
|
||||
// Attached = await AttachedService.SelectImageFromCamera();
|
||||
//
|
||||
// if (Attached != null)
|
||||
// {
|
||||
// RequireNewName = true;
|
||||
// StateHasChanged();
|
||||
// }
|
||||
Attached = await AttachedService.SelectImageFromCamera();
|
||||
|
||||
if (Attached != null)
|
||||
{
|
||||
RequireNewName = true;
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnGallery()
|
||||
{
|
||||
// Attached = await AttachedService.SelectImageFromGallery();
|
||||
//
|
||||
// if (Attached != null)
|
||||
// {
|
||||
// RequireNewName = true;
|
||||
// StateHasChanged();
|
||||
// }
|
||||
Attached = await AttachedService.SelectImageFromGallery();
|
||||
|
||||
if (Attached != null)
|
||||
{
|
||||
RequireNewName = true;
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnNewName()
|
||||
{
|
||||
// if (Attached != null)
|
||||
// {
|
||||
// switch (Attached.Type)
|
||||
// {
|
||||
// case AttachedDTO.TypeAttached.Position:
|
||||
// {
|
||||
// CanAddPosition = false;
|
||||
//
|
||||
// Attached.Description = NewName!;
|
||||
// Attached.Name = NewName!;
|
||||
//
|
||||
// break;
|
||||
// }
|
||||
// case AttachedDTO.TypeAttached.Image:
|
||||
// {
|
||||
// var extension = Path.GetExtension(Attached.Name);
|
||||
// Attached.Name = NewName! + extension;
|
||||
//
|
||||
// break;
|
||||
// }
|
||||
// case AttachedDTO.TypeAttached.Document:
|
||||
// break;
|
||||
// default:
|
||||
// throw new ArgumentOutOfRangeException();
|
||||
// }
|
||||
// }
|
||||
if (Attached != null)
|
||||
{
|
||||
switch (Attached.Type)
|
||||
{
|
||||
case AttachedDto.TypeAttached.Image:
|
||||
{
|
||||
var extension = Path.GetExtension(Attached.Name);
|
||||
Attached.Name = NewName! + extension;
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
}
|
||||
|
||||
// MudDialog.Close(Attached);
|
||||
MudDialog.Close();
|
||||
MudDialog.Close(Attached);
|
||||
}
|
||||
|
||||
}
|
||||
23
SteUp.Shared/Core/Dto/AttachedDto.cs
Normal file
23
SteUp.Shared/Core/Dto/AttachedDto.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
namespace SteUp.Shared.Core.Dto;
|
||||
|
||||
public class AttachedDto
|
||||
{
|
||||
public string? Name { get; set; }
|
||||
public string? Description { get; set; }
|
||||
|
||||
public string? MimeType { get; set; }
|
||||
public long? DimensionBytes { get; set; }
|
||||
public string? Path { get; set; }
|
||||
|
||||
public byte[]? FileBytes { get; set; }
|
||||
|
||||
public Stream? FileContent =>
|
||||
FileBytes is null ? null : new MemoryStream(FileBytes);
|
||||
|
||||
public TypeAttached Type { get; set; }
|
||||
|
||||
public enum TypeAttached
|
||||
{
|
||||
Image
|
||||
}
|
||||
}
|
||||
12
SteUp.Shared/Core/Interface/System/IAttachedService.cs
Normal file
12
SteUp.Shared/Core/Interface/System/IAttachedService.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
using SteUp.Shared.Core.Dto;
|
||||
|
||||
namespace SteUp.Shared.Core.Interface.System;
|
||||
|
||||
public interface IAttachedService
|
||||
{
|
||||
Task<AttachedDto?> SelectImageFromCamera();
|
||||
Task<AttachedDto?> SelectImageFromGallery();
|
||||
|
||||
Task<string> SaveToTempStorage(Stream file, string fileName, CancellationToken ct = default);
|
||||
Task OpenFile(string fileName, string filePath);
|
||||
}
|
||||
@@ -16,6 +16,7 @@
|
||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
|
||||
<PackageReference Include="MudBlazor" Version="8.13.0" />
|
||||
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.4" />
|
||||
<PackageReference Include="Sentry" Version="5.16.1" />
|
||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.12"/>
|
||||
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.120"/>
|
||||
|
||||
Reference in New Issue
Block a user