diff --git a/AideDeJeu/AideDeJeu.GTK/Program.cs b/AideDeJeu/AideDeJeu.GTK/Program.cs index 540cc9c6..053703e9 100644 --- a/AideDeJeu/AideDeJeu.GTK/Program.cs +++ b/AideDeJeu/AideDeJeu.GTK/Program.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Xamarin.Essentials; using Xamarin.Forms; using Xamarin.Forms.Platform.GTK; @@ -21,7 +22,7 @@ namespace AideDeJeu.GTK var window = new FormsWindow(); window.LoadApplication(app); window.SetApplicationIcon("main.png"); - window.SetApplicationTitle("Haches & Dés"); + window.SetApplicationTitle(AppInfo.Name); // "Haches & Dés"); window.Show(); Gtk.Application.Run(); diff --git a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs index ed4f126a..b5b856c4 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; using System.Threading.Tasks; using System.Windows.Input; - +using Xamarin.Essentials; using Xamarin.Forms; namespace AideDeJeu.ViewModels @@ -15,13 +15,6 @@ namespace AideDeJeu.ViewModels Title = "À propos de ..."; } - public string Version { - get - { - return DependencyService.Get().GetVersion(); - } - } - public string OGL { get diff --git a/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs index 624d69c9..2caaa501 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs @@ -4,13 +4,28 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; - +using Xamarin.Essentials; using Xamarin.Forms; namespace AideDeJeu.ViewModels { public class BaseViewModel : INotifyPropertyChanged { + public string Version + { + get + { + return AppInfo.VersionString; // DependencyService.Get().GetVersion(); + } + } + public string AppName + { + get + { + return AppInfo.Name; // DependencyService.Get().GetVersion(); + } + } + public MainViewModel Main { get diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index 5227a978..81ed68c6 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -26,8 +26,8 @@ - diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml index 14c5ddc7..263cd657 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml @@ -4,7 +4,7 @@ xmlns:vm="clr-namespace:AideDeJeu.ViewModels" x:Class="AideDeJeu.Views.MainPage" Visual="Material" - Title="Haches & Dés" + Title="{Binding AppName}" x:DataType="vm:BaseViewModel"> diff --git a/Data/Icons/tied-scroll.svg b/Data/Icons/tied-scroll.svg new file mode 100644 index 00000000..f1669b8d --- /dev/null +++ b/Data/Icons/tied-scroll.svg @@ -0,0 +1 @@ + \ No newline at end of file