> GetRecentItemsAsync(int page)
+ {
+ var offset = (page - 1) * 63;
+ var url = $"http://www.facets.la/offset/{offset}/";
+ var (result, error) = await NetHelper.RequestObject(url, @return: content => ResolveGalleryItems(content));
+
+ if (result == null || !string.IsNullOrEmpty(error))
+ {
+ Log.Error("facets.content.load", $"failed to load content array, error: {error}");
+ return null;
+ }
+
+ return result;
+ }
+
+ private GalleryItem[] ResolveGalleryItems(string content)
+ {
+ var regex = new Regex(
+ @"]+?>([^<]+?)",
+ RegexOptions.Multiline);
+ var matches = regex.Matches(content);
+ var items = new GalleryItem[matches.Count];
+ for (var i = 0; i < items.Length; i++)
+ {
+ var g = matches[i].Groups;
+ items[i] = new GalleryItem(int.Parse(g[1].Value))
+ {
+ Tags = new[] { g[6].Value },
+ //Width = int.Parse(g[4].Value),
+ Source = Route,
+ RawUrl = g[3].Value,
+ PreviewUrl = g[3].Value
+ };
+ }
+ return items;
+ }
+
+ public override void InitDynamicResources(string family, ResourceDictionary light, ResourceDictionary dark)
+ {
+ var icon = new FontImageSource
+ {
+ FontFamily = family,
+ Glyph = "\uf302",
+ Size = 18.0
+ };
+ light.Add(FlyoutIconKey, icon);
+ dark.Add(FlyoutIconKey, icon);
+ }
+
+ public override void SetCookie()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/Gallery.Share/Sources/Yandere/YandereItem.cs b/Gallery.Share/Sources/Yandere/YandereItem.cs
index e36cbbc..549629f 100644
--- a/Gallery.Share/Sources/Yandere/YandereItem.cs
+++ b/Gallery.Share/Sources/Yandere/YandereItem.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Gallery.Sources.Yandere
+namespace Gallery.Sources.Yandere
{
public class YandereItem
{
diff --git a/Gallery.Share/Util/Store.cs b/Gallery.Share/Util/Store.cs
index b961620..f8147d2 100644
--- a/Gallery.Share/Util/Store.cs
+++ b/Gallery.Share/Util/Store.cs
@@ -111,9 +111,9 @@ namespace Gallery.Util
}
}
- public static async Task LoadRawImage(GalleryItem item, bool force = false, Action<(int loc, int size)> action = null)
+ public static async Task LoadRawImage(GalleryItem item, bool downloading, bool force = false, Action<(int loc, int size)> action = null)
{
- return await LoadImageAsync(item.RawUrl, null, PersonalFolder, Path.Combine(imageFolder, item.Source), force, action);
+ return await LoadImageAsync(item.RawUrl, null, PersonalFolder, Path.Combine(imageFolder, item.Source), downloading, force, action);
}
public static string GetRawImagePath(GalleryItem item)
@@ -128,10 +128,10 @@ namespace Gallery.Util
public static async Task LoadPreviewImage(GalleryItem item, bool downloading, bool force = false)
{
- return await LoadImage(item.PreviewUrl, CacheFolder, Path.Combine(previewFolder, item.Source), downloading, force: force);
+ return await LoadImage(item.PreviewUrl, CacheFolder, Path.Combine(previewFolder, item.Source), downloading, force);
}
- private static async Task LoadImage(string url, string working, string folder, bool downloading, bool force = false)
+ private static async Task LoadImage(string url, string working, string folder, bool downloading, bool force)
{
var file = Path.Combine(working, folder, Path.GetFileName(url));
ImageSource image;
@@ -154,7 +154,7 @@ namespace Gallery.Util
return image;
}
- private static async Task LoadImageAsync(string url, string id, string working, string folder, bool force, Action<(int loc, int size)> action)
+ private static async Task LoadImageAsync(string url, string id, string working, string folder, bool downloading, bool force, Action<(int loc, int size)> action)
{
var file = Path.Combine(working, folder, Path.GetFileName(url));
ImageSource image;
@@ -166,7 +166,7 @@ namespace Gallery.Util
{
image = null;
}
- if (image == null)
+ if (downloading && image == null)
{
file = await NetHelper.DownloadImageAsync(url, id, working, folder, action);
if (file != null)
diff --git a/Gallery.Share/Views/GalleryItemPage.xaml.cs b/Gallery.Share/Views/GalleryItemPage.xaml.cs
index d19a17f..83dc257 100644
--- a/Gallery.Share/Views/GalleryItemPage.xaml.cs
+++ b/Gallery.Share/Views/GalleryItemPage.xaml.cs
@@ -115,7 +115,7 @@ namespace Gallery.Views
}
}
}
- var image = await Store.LoadRawImage(item, force: force, o =>
+ var image = await Store.LoadRawImage(item, true, force: force, o =>
{
var val = o.loc / (double)o.size;
if (val > progress.Progress)
diff --git a/Gallery.Share/Views/GalleryPage.xaml b/Gallery.Share/Views/GalleryPage.xaml
index 7e73ecf..f309f7d 100644
--- a/Gallery.Share/Views/GalleryPage.xaml
+++ b/Gallery.Share/Views/GalleryPage.xaml
@@ -6,8 +6,7 @@
x:Class="Gallery.Views.GalleryPage"
x:Name="yanderePage"
BackgroundColor="{DynamicResource WindowColor}"
- BindingContext="{x:Reference yanderePage}"
- Title="{Binding Source.Name}">
+ BindingContext="{x:Reference yanderePage}">
!IsLoading && !IsBottomLoading));
InitializeComponent();
diff --git a/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs b/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs
index 2c36bc0..7de9244 100644
--- a/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs
+++ b/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs
@@ -151,20 +151,26 @@ namespace Gallery.iOS.Renderers.AppShellSection
public void UpdateLayout(UITabBarController controller)
{
var tabBar = controller.TabBar;
- if (tabBar != null && tabBar.Items != null && tabBar.Items.Length >= 4)
+ if (tabBar != null && tabBar.Items != null && tabBar.Items.Length > 0)
{
var tabBarItem = tabBar.Items[0];
tabBarItem.Image = UIImage.FromBundle("IconBookmarkRegular");
tabBarItem.SelectedImage = UIImage.FromBundle("IconBookmark");
- tabBarItem = tabBar.Items[1];
- tabBarItem.Image = UIImage.FromBundle("IconYandereRegular");
- tabBarItem.SelectedImage = UIImage.FromBundle("IconYandere");
- tabBarItem = tabBar.Items[2];
- tabBarItem.Image = UIImage.FromBundle("IconSourceRegular");
- tabBarItem.SelectedImage = UIImage.FromBundle("IconSource");
- tabBarItem = tabBar.Items[3];
- tabBarItem.Image = UIImage.FromBundle("IconSourceRegular");
- tabBarItem.SelectedImage = UIImage.FromBundle("IconSource");
+ if (tabBar.Items.Length > 1)
+ {
+ tabBarItem = tabBar.Items[1];
+ tabBarItem.Image = UIImage.FromBundle("IconYandereRegular");
+ tabBarItem.SelectedImage = UIImage.FromBundle("IconYandere");
+ }
+ if (tabBar.Items.Length > 2)
+ {
+ for (var i = 2; i < tabBar.Items.Length; i++)
+ {
+ tabBarItem = tabBar.Items[i];
+ tabBarItem.Image = UIImage.FromBundle("IconSourceRegular");
+ tabBarItem.SelectedImage = UIImage.FromBundle("IconSource");
+ }
+ }
}
}
}