Skip to content

Commit

Permalink
typo
Browse files Browse the repository at this point in the history
  • Loading branch information
MrPio committed Aug 8, 2023
1 parent 2eb0348 commit 8f8b601
Show file tree
Hide file tree
Showing 18 changed files with 56 additions and 19 deletions.
2 changes: 1 addition & 1 deletion MuseoOmero/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace MuseoOmero;
public partial class App : Application
{

#if WINDOWS
#if WINDOWS || MACCATALYST
public App(SignInUpViewModelWin signInUpViewModelWin, ShellViewModelWin shellViewModelWin)
{
InitializeComponent();
Expand Down
2 changes: 1 addition & 1 deletion MuseoOmero/MauiProgram.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static void MakeStatusBarTranslucent(Android.App.Activity activity)
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

// ANDROID
#if ANDROID
#if ANDROID
builder.Services.AddSingleton<SignInUpView>();
builder.Services.AddSingleton<MainView>();
builder.Services.AddSingleton<MainViewModel>();
Expand Down
3 changes: 2 additions & 1 deletion MuseoOmero/Model/Biglietto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Biglietto
{
[JsonProperty("uid")] public string Uid { get; set; }
Expand Down Expand Up @@ -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{ };
}
}
3 changes: 2 additions & 1 deletion MuseoOmero/Model/Chat.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Chat
{
//[JsonIgnore] public string Utente { get; set; }
Expand All @@ -13,4 +13,5 @@ public Chat( List<Messaggio> messaggiMuseo, List<Messaggio> messaggiUtente, Date
MessaggiUtente = messaggiUtente ??= new();
DataInizio = dataInizio;
}
}
}
3 changes: 2 additions & 1 deletion MuseoOmero/Model/Dipendente.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Dipendente
{
[JsonIgnore] public string Uid { get; set; }
Expand Down Expand Up @@ -32,3 +32,4 @@ public Dipendente(string uid, string nome, string cognome, string cellulare, str
LastOnline = lastOnline;
}
}
}
3 changes: 2 additions & 1 deletion MuseoOmero/Model/Messaggio.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Messaggio
{
[JsonProperty("data")] public DateTime Data { get; set; }
Expand All @@ -20,4 +20,5 @@ public Messaggio(DateTime data, string testo)
Data = data;
Testo = testo;
}
}
}
4 changes: 2 additions & 2 deletions MuseoOmero/Model/Mostra.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Mostra
{
public string Id { get; set; }
Expand All @@ -21,4 +21,4 @@ public Mostra( DateTime dataAggiunta, DateTime dataInizio, DateTime dataFine, st
Descrizione = descrizione;
Opere = opere;
}
}
}}
4 changes: 2 additions & 2 deletions MuseoOmero/Model/Opera.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Opera
{
public string Id { get; set; }
Expand Down Expand Up @@ -27,4 +27,4 @@ public Opera(string sala, string nome, string autore, DateTime dataAggiunta, flo
Descrizione = descrizione;
Visualizzazioni = visualizzazioni;
}
}
}}
4 changes: 2 additions & 2 deletions MuseoOmero/Model/Questionario.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{
public class Questionario
{
[JsonProperty("tipologia_visita")] public string TipologiaVisita { get; set; }
Expand Down Expand Up @@ -27,4 +27,4 @@ public Questionario(string tipologiaVisita, string accompagnatoriVisita, string
DataCompilazione = dataCompilazione;
DataVisita = dataVisita;
}
}
}}
4 changes: 2 additions & 2 deletions MuseoOmero/Model/Utente.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MuseoOmero.Model;
namespace MuseoOmero.Model{

public class Utente
{
Expand Down Expand Up @@ -40,4 +40,4 @@ public Utente(string uid, string username, string nome, string cognome, string c
LastOnline = lastOnline;
FotoProfilo = fotoProfilo is { } ? fotoProfilo : ImagesOnline.Anonymous;
}
}
}}
13 changes: 13 additions & 0 deletions MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions MuseoOmero/Resources/Raw/.idea/.idea.Raw.dir/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions MuseoOmero/View/ShellViewWin.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MuseoOmero/ViewMob/BiglietteriaView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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." />

<!--Linea-->
<Line Style="{StaticResource HRuleMob}"/>
Expand Down
4 changes: 2 additions & 2 deletions MuseoOmero/ViewMob/QuestionarioView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace MuseoOmero.ViewMob;
public partial class QuestionarioView
{
IPopupNavigation popupNavigation => Service.Get<IPopupNavigation>();
StatisticheViewModel statisticheViewModels => Service.Get<StatisticheViewModel>();
StatisticheViewModel statisticheViewModel => Service.Get<StatisticheViewModel>();

public Visita Visita { get; set; }

Expand All @@ -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");

}
Expand Down
1 change: 1 addition & 0 deletions MuseoOmero/ViewMob/SignInUpView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 8f8b601

Please sign in to comment.