5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 15:06:06 +00:00
Code Issues Projects Releases Wiki Activity

Tests push/pop

Browse source
This commit is contained in:
Yan Maniez 2019-09-27 19:11:14 +02:00
parent 98f7aa09f9
commit 7479433922
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AideDeJeu/AideDeJeu/App.xaml.cs
View file

@ -4,6 +4,7 @@ using AideDeJeu.ViewModels.Library;
using AideDeJeu.ViewModels.PlayerCharacter; using AideDeJeu.ViewModels.PlayerCharacter;
using AideDeJeu.Views; using AideDeJeu.Views;
using AideDeJeuLib; using AideDeJeuLib;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xamarin.Forms; using Xamarin.Forms;

2
AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
View file

@ -239,7 +239,7 @@ namespace AideDeJeu.ViewModels
public async Task NavigateToLinkAsync(string s) public async Task NavigateToLinkAsync(string s)
{ {
await Shell.Current.GoToAsync($"item?path={s}"); await Shell.Current.Navigation.PushAsync(new ItemPage(s), true);//.GoToAsync($"item?path={Uri.EscapeDataString(s)}");
return; return;
if (s != null) if (s != null)
{ {

10
AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
View file

@ -49,10 +49,10 @@ namespace AideDeJeu.Views.Library
public ItemPage(string id) public ItemPage(string id)
{ {
Path = id;
BindingContext = this; BindingContext = this;
InitializeComponent(); InitializeComponent();
LoadPageAsync(); Path = id;
//LoadPageAsync();
} }
protected override void OnAppearing() protected override void OnAppearing()
@ -78,7 +78,7 @@ namespace AideDeJeu.Views.Library
private async Task LoadPageAsync() private async Task LoadPageAsync()
{ {
var regex = new Regex("/?(?<file>.*?)(_with_(?<with>.*))?\\.md(#(?<anchor>.*))?"); var regex = new Regex("/?(?<file>.*?)(_with_(?<with>.*))?\\.md(#(?<anchor>.*))?");
var match = regex.Match(Path); var match = regex.Match(Uri.UnescapeDataString(Path));
var file = match.Groups["file"].Value; var file = match.Groups["file"].Value;
var anchor = match.Groups["anchor"].Value; var anchor = match.Groups["anchor"].Value;
var with = match.Groups["with"].Value; var with = match.Groups["with"].Value;
@ -126,13 +126,13 @@ namespace AideDeJeu.Views.Library
backingStore = value; backingStore = value;
onChanged?.Invoke(); onChanged?.Invoke();
OnPropertyChanged(propertyName); CallOnPropertyChanged(propertyName);
return true; return true;
} }
#region INotifyPropertyChanged #region INotifyPropertyChanged
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
protected void OnPropertyChanged([CallerMemberName] string propertyName = "") protected void CallOnPropertyChanged([CallerMemberName] string propertyName = "")
{ {
var changed = PropertyChanged; var changed = PropertyChanged;
if (changed == null) if (changed == null)