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

1.28 + bookmarks

Browse source
This commit is contained in:
Yan Maniez 2018-10-01 22:28:45 +02:00
parent 39e1d6866f
commit dc8655199a
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="27" android:versionName="1.27" package="com.nioux.aidedejeu" android:installLocation="preferExternal"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="28" android:versionName="1.28" package="com.nioux.aidedejeu" android:installLocation="preferExternal">
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="27" /> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:label="Haches &amp; Dés" android:icon="@drawable/battle_axe"></application> <application android:label="Haches &amp; Dés" android:icon="@drawable/battle_axe"></application>
</manifest> </manifest>

15
AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs
View file

@ -17,7 +17,7 @@ namespace AideDeJeu.ViewModels
{ {
public BookmarksViewModel() public BookmarksViewModel()
{ {
LoadBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); LoadBookmarkCollectionAsync(BookmarkCollectionNames[BookmarkCollectionIndex]);
} }
public ObservableCollection<string> BookmarkCollectionNames { get; set; } = new ObservableCollection<string>() public ObservableCollection<string> BookmarkCollectionNames { get; set; } = new ObservableCollection<string>()
@ -68,7 +68,7 @@ namespace AideDeJeu.ViewModels
{ {
if (BookmarkCollectionIndex >= 0 && BookmarkCollectionIndex < BookmarkCollectionNames.Count - 1) if (BookmarkCollectionIndex >= 0 && BookmarkCollectionIndex < BookmarkCollectionNames.Count - 1)
{ {
await LoadBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); await LoadBookmarkCollectionAsync(BookmarkCollectionNames[BookmarkCollectionIndex]);
} }
else if(BookmarkCollectionIndex == BookmarkCollectionNames.Count - 1) else if(BookmarkCollectionIndex == BookmarkCollectionNames.Count - 1)
{ {
@ -184,7 +184,7 @@ namespace AideDeJeu.ViewModels
} }
else if (result.Item2 == Navigator.PopupResultEnum.Save) else if (result.Item2 == Navigator.PopupResultEnum.Save)
{ {
var items = await GetBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); var items = await GetBookmarkCollectionAsync(BookmarkCollectionNames[BookmarkCollectionIndex]);
await SaveBookmarksAsync(BookmarkCollectionNames[BookmarkCollectionIndex], null); await SaveBookmarksAsync(BookmarkCollectionNames[BookmarkCollectionIndex], null);
BookmarkCollectionNames[BookmarkCollectionIndex] = result.Item1; BookmarkCollectionNames[BookmarkCollectionIndex] = result.Item1;
await SaveBookmarksAsync(BookmarkCollectionNames[BookmarkCollectionIndex], items); await SaveBookmarksAsync(BookmarkCollectionNames[BookmarkCollectionIndex], items);
@ -193,7 +193,7 @@ namespace AideDeJeu.ViewModels
public async Task<List<Item>> GetBookmarkCollection(string key) public async Task<List<Item>> GetBookmarkCollectionAsync(string key)
{ {
if (key != null) if (key != null)
{ {
@ -208,9 +208,9 @@ namespace AideDeJeu.ViewModels
} }
return null; return null;
} }
public async Task LoadBookmarkCollection(string key) public async Task LoadBookmarkCollectionAsync(string key)
{ {
var items = await GetBookmarkCollection(key); var items = await GetBookmarkCollectionAsync(key);
BookmarkCollection.Clear(); BookmarkCollection.Clear();
if (items != null) if (items != null)
{ {
@ -221,7 +221,7 @@ namespace AideDeJeu.ViewModels
public async Task AddBookmarkAsync(string key, Item item) public async Task AddBookmarkAsync(string key, Item item)
{ {
var linkItem = new LinkItem() { Name = item.Name, AltName = item.AltName, Link = item.Id }; var linkItem = new LinkItem() { Name = item.Name, AltName = item.AltName, Link = item.Id };
var items = await GetBookmarkCollection(key); var items = await GetBookmarkCollectionAsync(key);
if(items == null) if(items == null)
{ {
items = new List<Item>(); items = new List<Item>();
@ -229,6 +229,7 @@ namespace AideDeJeu.ViewModels
items.Add(linkItem); items.Add(linkItem);
await SaveBookmarksAsync(key, items); await SaveBookmarksAsync(key, items);
BookmarkCollectionIndex = BookmarkCollectionNames.IndexOf(key); BookmarkCollectionIndex = BookmarkCollectionNames.IndexOf(key);
await LoadBookmarkCollectionAsync(key);
} }
public async Task SaveBookmarksAsync() public async Task SaveBookmarksAsync()