diff --git a/MuseoOmero/App.xaml.cs b/MuseoOmero/App.xaml.cs index 6d8952b..11b9955 100644 --- a/MuseoOmero/App.xaml.cs +++ b/MuseoOmero/App.xaml.cs @@ -15,7 +15,7 @@ namespace MuseoOmero; public partial class App : Application { -#if WINDOWS +#if WINDOWS || MACCATALYST public App(SignInUpViewModelWin signInUpViewModelWin, ShellViewModelWin shellViewModelWin) { InitializeComponent(); diff --git a/MuseoOmero/MauiProgram.cs b/MuseoOmero/MauiProgram.cs index 648b503..02526ed 100644 --- a/MuseoOmero/MauiProgram.cs +++ b/MuseoOmero/MauiProgram.cs @@ -75,7 +75,7 @@ static void MakeStatusBarTranslucent(Android.App.Activity activity) Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // ANDROID -#if ANDROID +#if ANDROID builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/MuseoOmero/Model/Biglietto.cs b/MuseoOmero/Model/Biglietto.cs index 7350369..a558755 100644 --- a/MuseoOmero/Model/Biglietto.cs +++ b/MuseoOmero/Model/Biglietto.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Biglietto { [JsonProperty("uid")] public string Uid { get; set; } @@ -38,3 +38,4 @@ public Biglietto(string uid, DateTime dataAcquisto, DateTime dataValidita, TipoB public bool IsConvalidabile => DataValidita.Date == DateTime.Today && DataConvalida is null; public bool IsConvalidato => DataConvalida is{ }; } +} \ No newline at end of file diff --git a/MuseoOmero/Model/Chat.cs b/MuseoOmero/Model/Chat.cs index 82769df..a1327c0 100644 --- a/MuseoOmero/Model/Chat.cs +++ b/MuseoOmero/Model/Chat.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Chat { //[JsonIgnore] public string Utente { get; set; } @@ -13,4 +13,5 @@ public Chat( List messaggiMuseo, List messaggiUtente, Date MessaggiUtente = messaggiUtente ??= new(); DataInizio = dataInizio; } +} } \ No newline at end of file diff --git a/MuseoOmero/Model/Dipendente.cs b/MuseoOmero/Model/Dipendente.cs index beaa05d..21d1599 100644 --- a/MuseoOmero/Model/Dipendente.cs +++ b/MuseoOmero/Model/Dipendente.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Dipendente { [JsonIgnore] public string Uid { get; set; } @@ -32,3 +32,4 @@ public Dipendente(string uid, string nome, string cognome, string cellulare, str LastOnline = lastOnline; } } +} \ No newline at end of file diff --git a/MuseoOmero/Model/Messaggio.cs b/MuseoOmero/Model/Messaggio.cs index 39c86ca..4127bd0 100644 --- a/MuseoOmero/Model/Messaggio.cs +++ b/MuseoOmero/Model/Messaggio.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Messaggio { [JsonProperty("data")] public DateTime Data { get; set; } @@ -20,4 +20,5 @@ public Messaggio(DateTime data, string testo) Data = data; Testo = testo; } +} } \ No newline at end of file diff --git a/MuseoOmero/Model/Mostra.cs b/MuseoOmero/Model/Mostra.cs index dbc77e4..9678278 100644 --- a/MuseoOmero/Model/Mostra.cs +++ b/MuseoOmero/Model/Mostra.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Mostra { public string Id { get; set; } @@ -21,4 +21,4 @@ public Mostra( DateTime dataAggiunta, DateTime dataInizio, DateTime dataFine, st Descrizione = descrizione; Opere = opere; } -} +}} diff --git a/MuseoOmero/Model/Opera.cs b/MuseoOmero/Model/Opera.cs index f13f12c..a690139 100644 --- a/MuseoOmero/Model/Opera.cs +++ b/MuseoOmero/Model/Opera.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Opera { public string Id { get; set; } @@ -27,4 +27,4 @@ public Opera(string sala, string nome, string autore, DateTime dataAggiunta, flo Descrizione = descrizione; Visualizzazioni = visualizzazioni; } -} +}} diff --git a/MuseoOmero/Model/Questionario.cs b/MuseoOmero/Model/Questionario.cs index 95c1d01..e6b782b 100644 --- a/MuseoOmero/Model/Questionario.cs +++ b/MuseoOmero/Model/Questionario.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Questionario { [JsonProperty("tipologia_visita")] public string TipologiaVisita { get; set; } @@ -27,4 +27,4 @@ public Questionario(string tipologiaVisita, string accompagnatoriVisita, string DataCompilazione = dataCompilazione; DataVisita = dataVisita; } -} +}} diff --git a/MuseoOmero/Model/Utente.cs b/MuseoOmero/Model/Utente.cs index 167a307..5c232dd 100644 --- a/MuseoOmero/Model/Utente.cs +++ b/MuseoOmero/Model/Utente.cs @@ -1,4 +1,4 @@ -namespace MuseoOmero.Model; +namespace MuseoOmero.Model{ public class Utente { @@ -40,4 +40,4 @@ public Utente(string uid, string username, string nome, string cognome, string c LastOnline = lastOnline; FotoProfilo = fotoProfilo is { } ? fotoProfilo : ImagesOnline.Anonymous; } -} +}} diff --git a/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/.gitignore b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/.gitignore new file mode 100644 index 0000000..edb4949 --- /dev/null +++ b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/contentModel.xml +/projectSettingsUpdater.xml +/.idea.Raw.iml +/modules.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/encodings.xml b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/indexLayout.xml b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/vcs.xml b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MuseoOmero/View/ShellViewWin.xaml.cs b/MuseoOmero/View/ShellViewWin.xaml.cs index a682aec..55fe380 100644 --- a/MuseoOmero/View/ShellViewWin.xaml.cs +++ b/MuseoOmero/View/ShellViewWin.xaml.cs @@ -4,14 +4,15 @@ namespace MuseoOmero.ViewWin; public partial class ShellViewWin : Shell { + private ShellViewModelWin _viewModel; private bool _shellExpanded = false; private float _shellMaxWidth = 246; private float _shellMinWidth = 80; public ShellViewWin(ShellViewModelWin viewModel) { //DeviceManager.Instance.ResizeWin(1330, 850); - - BindingContext = viewModel; + _viewModel = viewModel; + BindingContext = _viewModel; InitializeComponent(); InitRoutes(); var t = Task.Run(async delegate diff --git a/MuseoOmero/ViewMob/BiglietteriaView.xaml b/MuseoOmero/ViewMob/BiglietteriaView.xaml index 59f9df8..5a78b17 100644 --- a/MuseoOmero/ViewMob/BiglietteriaView.xaml +++ b/MuseoOmero/ViewMob/BiglietteriaView.xaml @@ -48,7 +48,7 @@ Margin="0,-12,0,0" FontSize="18" LineBreakMode="WordWrap" - Text="Scegli di seguito la tipologia del biglietto che desideri acquistare acqusitare" /> + Text="Scegli di seguito la tipologia del biglietto che desideri acquistare." /> diff --git a/MuseoOmero/ViewMob/QuestionarioView.xaml.cs b/MuseoOmero/ViewMob/QuestionarioView.xaml.cs index ccb483f..0454d14 100644 --- a/MuseoOmero/ViewMob/QuestionarioView.xaml.cs +++ b/MuseoOmero/ViewMob/QuestionarioView.xaml.cs @@ -5,7 +5,7 @@ namespace MuseoOmero.ViewMob; public partial class QuestionarioView { IPopupNavigation popupNavigation => Service.Get(); - StatisticheViewModel statisticheViewModels => Service.Get(); + StatisticheViewModel statisticheViewModel => Service.Get(); public Visita Visita { get; set; } @@ -22,7 +22,7 @@ private void ConfermaButton_Clicked(object sender, EventArgs e) DatabaseManager.Instance.Put($"utenti/{utente.Uid}/questionari/{utente.Questionari.Count - 1}", questionario); Visita.Questionario = questionario; popupNavigation.PopAllAsync(); - statisticheViewModels.Initialize(); + statisticheViewModel.Initialize(); App.Current.MainPage.DisplayAlert("Compilazione inviata", "Hai compilato con successo il questionario. Grazie per il tuo prezioso contributo!", "Ok"); } diff --git a/MuseoOmero/ViewMob/SignInUpView.xaml.cs b/MuseoOmero/ViewMob/SignInUpView.xaml.cs index adf5747..1948de3 100644 --- a/MuseoOmero/ViewMob/SignInUpView.xaml.cs +++ b/MuseoOmero/ViewMob/SignInUpView.xaml.cs @@ -75,6 +75,7 @@ private void Registrati_Clicked(object sender, EventArgs e) var popup = new SignUpView(_mainViewModel,_popupNavigation); popup.Email = EmailEntry.Text; popup.Password = PasswordEntry.Text; + //App.Current.MainPage = popup; _popupNavigation.PushAsync(popup); }