mirror of
https://github.com/Nioux/AideDeJeu.git
synced 2025-10-29 22:45:44 +00:00
Suppression du contenu de l'ancienne traduction
This commit is contained in:
Yan Maniez
parent
474b879b57
commit
7aa118fc23
5 changed files with 34 additions and 44 deletions
|
|
@ -26,20 +26,10 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="..\..\Data\monsters_vf.json" Link="Data\monsters_vf.json" />
|
||||
<EmbeddedResource Include="..\..\Data\monsters_vo.json" Link="Data\monsters_vo.json" />
|
||||
<EmbeddedResource Include="..\..\Data\spells_vf.json" Link="Data\spells_vf.json" />
|
||||
<EmbeddedResource Include="..\..\Data\spells_vo.json" Link="Data\spells_vo.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="..\..\Data\monsters.json" Link="Data\monsters.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="..\..\Data\spells.json" Link="Data\spells.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="OGL.txt" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -93,20 +93,20 @@ namespace AideDeJeu.Tools
|
|||
|
||||
public class ItemSourceTypeConverter<T> : IValueConverter
|
||||
{
|
||||
public T SpellVF { get; set; }
|
||||
//public T SpellVF { get; set; }
|
||||
public T SpellVO { get; set; }
|
||||
public T SpellHD { get; set; }
|
||||
public T MonsterVF { get; set; }
|
||||
//public T MonsterVF { get; set; }
|
||||
public T MonsterVO { get; set; }
|
||||
public T MonsterHD { get; set; }
|
||||
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
var itemType = value as ItemSourceType?;
|
||||
if (itemType == ItemSourceType.SpellVF)
|
||||
{
|
||||
return SpellVF;
|
||||
}
|
||||
//if (itemType == ItemSourceType.SpellVF)
|
||||
//{
|
||||
// return SpellVF;
|
||||
//}
|
||||
if (itemType == ItemSourceType.SpellVO)
|
||||
{
|
||||
return SpellVO;
|
||||
|
|
@ -115,10 +115,10 @@ namespace AideDeJeu.Tools
|
|||
{
|
||||
return SpellHD;
|
||||
}
|
||||
if (itemType == ItemSourceType.MonsterVF)
|
||||
{
|
||||
return MonsterVF;
|
||||
}
|
||||
//if (itemType == ItemSourceType.MonsterVF)
|
||||
//{
|
||||
// return MonsterVF;
|
||||
//}
|
||||
if (itemType == ItemSourceType.MonsterVO)
|
||||
{
|
||||
return MonsterVO;
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ namespace AideDeJeu.ViewModels
|
|||
string resourceName = null;
|
||||
switch (ItemSourceType)
|
||||
{
|
||||
case ItemSourceType.MonsterVF:
|
||||
resourceName = "AideDeJeu.Data.monsters_vf.json";
|
||||
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
|
||||
break;
|
||||
//case ItemSourceType.MonsterVF:
|
||||
// resourceName = "AideDeJeu.Data.monsters_vf.json";
|
||||
// _AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
|
||||
// break;
|
||||
case ItemSourceType.MonsterVO:
|
||||
resourceName = "AideDeJeu.Data.monsters_vo.json";
|
||||
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
|
||||
|
|
@ -50,12 +50,12 @@ namespace AideDeJeu.ViewModels
|
|||
_AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(mdm);
|
||||
//_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
|
||||
break;
|
||||
case ItemSourceType.SpellVF:
|
||||
resourceName = "AideDeJeu.Data.spells_vf.json";
|
||||
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(resourceName);
|
||||
//var md2 = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
|
||||
//_AllItems = Tools.MarkdownExtensions.MarkdownToSpells(md2).ToList();
|
||||
break;
|
||||
//case ItemSourceType.SpellVF:
|
||||
// resourceName = "AideDeJeu.Data.spells_vf.json";
|
||||
// _AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(resourceName);
|
||||
// //var md2 = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
|
||||
// //_AllItems = Tools.MarkdownExtensions.MarkdownToSpells(md2).ToList();
|
||||
// break;
|
||||
case ItemSourceType.SpellVO:
|
||||
resourceName = "AideDeJeu.Data.spells_vo.json";
|
||||
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(resourceName);
|
||||
|
|
|
|||
|
|
@ -24,20 +24,20 @@ namespace AideDeJeu.ViewModels
|
|||
{
|
||||
Spell = 0x01,
|
||||
Monster = 0x10,
|
||||
VF = 0x0100,
|
||||
//VF = 0x0100,
|
||||
VO = 0x1100,
|
||||
HD = 0x1000,
|
||||
SpellVF = Spell | VF,
|
||||
//SpellVF = Spell | VF,
|
||||
SpellVO = Spell | VO,
|
||||
SpellHD = Spell | HD,
|
||||
MonsterVF = Monster | VF,
|
||||
//MonsterVF = Monster | VF,
|
||||
MonsterVO = Monster | VO,
|
||||
MonsterHD = Monster | HD,
|
||||
}
|
||||
|
||||
public class MainViewModel : BaseViewModel
|
||||
{
|
||||
private ItemSourceType _ItemSourceType = ItemSourceType.SpellVF;
|
||||
private ItemSourceType _ItemSourceType = ItemSourceType.SpellHD;
|
||||
public ItemSourceType ItemSourceType
|
||||
{
|
||||
get
|
||||
|
|
@ -61,10 +61,10 @@ namespace AideDeJeu.ViewModels
|
|||
|
||||
public Dictionary<ItemSourceType, Lazy<ItemsViewModel>> AllItemsViewModel = new Dictionary<ItemSourceType, Lazy<ItemsViewModel>>()
|
||||
{
|
||||
{ ItemSourceType.SpellVF, new Lazy<ItemsViewModel>(() => new SpellsViewModel(ItemSourceType.SpellVF)) },
|
||||
//{ ItemSourceType.SpellVF, new Lazy<ItemsViewModel>(() => new SpellsViewModel(ItemSourceType.SpellVF)) },
|
||||
{ ItemSourceType.SpellVO, new Lazy<ItemsViewModel>(() => new SpellsViewModel(ItemSourceType.SpellVO)) },
|
||||
{ ItemSourceType.SpellHD, new Lazy<ItemsViewModel>(() => new SpellsViewModel(ItemSourceType.SpellHD)) },
|
||||
{ ItemSourceType.MonsterVF, new Lazy<ItemsViewModel>(() => new MonstersViewModel(ItemSourceType.MonsterVF)) },
|
||||
//{ ItemSourceType.MonsterVF, new Lazy<ItemsViewModel>(() => new MonstersViewModel(ItemSourceType.MonsterVF)) },
|
||||
{ ItemSourceType.MonsterVO, new Lazy<ItemsViewModel>(() => new MonstersViewModel(ItemSourceType.MonsterVO)) },
|
||||
{ ItemSourceType.MonsterHD, new Lazy<ItemsViewModel>(() => new MonstersViewModel(ItemSourceType.MonsterHD)) },
|
||||
};
|
||||
|
|
@ -76,10 +76,10 @@ namespace AideDeJeu.ViewModels
|
|||
|
||||
public Dictionary<ItemSourceType, Lazy<FilterViewModel>> AllFiltersViewModel = new Dictionary<ItemSourceType, Lazy<FilterViewModel>>()
|
||||
{
|
||||
{ ItemSourceType.SpellVF, new Lazy<FilterViewModel>(() => new VFSpellFilterViewModel()) },
|
||||
//{ ItemSourceType.SpellVF, new Lazy<FilterViewModel>(() => new VFSpellFilterViewModel()) },
|
||||
{ ItemSourceType.SpellVO, new Lazy<FilterViewModel>(() => new VOSpellFilterViewModel()) },
|
||||
{ ItemSourceType.SpellHD, new Lazy<FilterViewModel>(() => new HDSpellFilterViewModel()) },
|
||||
{ ItemSourceType.MonsterVF, new Lazy<FilterViewModel>(() => new VFMonsterFilterViewModel()) },
|
||||
//{ ItemSourceType.MonsterVF, new Lazy<FilterViewModel>(() => new VFMonsterFilterViewModel()) },
|
||||
{ ItemSourceType.MonsterVO, new Lazy<FilterViewModel>(() => new VOMonsterFilterViewModel()) },
|
||||
{ ItemSourceType.MonsterHD, new Lazy<FilterViewModel>(() => new HDMonsterFilterViewModel()) },
|
||||
};
|
||||
|
|
@ -125,7 +125,7 @@ namespace AideDeJeu.ViewModels
|
|||
|
||||
public Command SwitchToSpells { get; private set; }
|
||||
public Command SwitchToMonsters { get; private set; }
|
||||
public Command SwitchToVF { get; private set; }
|
||||
//public Command SwitchToVF { get; private set; }
|
||||
public Command SwitchToVO { get; private set; }
|
||||
public Command SwitchToHD { get; private set; }
|
||||
public Command AboutCommand { get; private set; }
|
||||
|
|
@ -145,9 +145,9 @@ namespace AideDeJeu.ViewModels
|
|||
});
|
||||
SwitchToSpells = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.Monster) | ItemSourceType.Spell);
|
||||
SwitchToMonsters = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.Spell) | ItemSourceType.Monster);
|
||||
SwitchToVF = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO & ~ItemSourceType.HD) | ItemSourceType.VF);
|
||||
SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.HD) | ItemSourceType.VO);
|
||||
SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.VO) | ItemSourceType.HD);
|
||||
//SwitchToVF = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO & ~ItemSourceType.HD) | ItemSourceType.VF);
|
||||
SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.HD) | ItemSourceType.VO);
|
||||
SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO) | ItemSourceType.HD);
|
||||
AboutCommand = new Command(async () => await Main.Navigator.GotoAboutPageAsync());
|
||||
SearchCommand = new Command<string>(async (text) =>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:AideDeJeu.Views" xmlns:tools="clr-namespace:AideDeJeu.Tools" x:Class="AideDeJeu.Views.MainPage" x:Name="This" IsPresented="False" Title="">
|
||||
<MasterDetailPage.Resources>
|
||||
<ResourceDictionary>
|
||||
<tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVF="Sorts" SpellVO="Spells" SpellHD="Sorts (H&D)" MonsterVF="Monstres" MonsterVO="Monsters" MonsterHD="Créatures (H&D)" />
|
||||
<tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVO="Spells" SpellHD="Sorts (H&D)" MonsterVO="Monsters" MonsterHD="Créatures (H&D)" />
|
||||
<tools:ItemSourceTypeToItemsConverter x:Key="ItemSourceTypeToItemsConverter" />
|
||||
<tools:ItemSourceTypeToFilterConverter x:Key="ItemSourceTypeToFilterConverter" />
|
||||
</ResourceDictionary>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" />
|
||||
<ToolbarItem Name="Monsters" Text="Monstres" Order="Primary" Icon="dragon_head.png" Command="{Binding SwitchToMonsters}" />
|
||||
<ToolbarItem Name="About" Text="À propos de..." Order="Primary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
|
||||
<ToolbarItem Name="VF" Text="VF AideDD" Order="Secondary" Command="{Binding SwitchToVF}" />
|
||||
<!--<ToolbarItem Name="VF" Text="VF AideDD" Order="Secondary" Command="{Binding SwitchToVF}" />-->
|
||||
<ToolbarItem Name="VO" Text="VO AideDD/SRD" Order="Secondary" Command="{Binding SwitchToVO}" />
|
||||
<ToolbarItem Name="HD" Text="VF H&D" Order="Secondary" Command="{Binding SwitchToHD}" />
|
||||
</ContentPage.ToolbarItems>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue