combine projects into one

Gallery.Share/App.cs

@@ -18,16 +18,14 @@ namespace Gallery
         public static Dictionary<string, System.DateTime> RefreshTimes { get; } = new();
         public static List<IGallerySource> GallerySources { get; } = new()
         {
-            new Yandere.GallerySource(),    // https://yande.re
+            new Sources.Yandere.GallerySource(),    // https://yande.re
-            new Danbooru.GallerySource(),   // https://danbooru.donmai.us
+            new Sources.Danbooru.GallerySource(),   // https://danbooru.donmai.us
-            new Gelbooru.GallerySource()    // https://gelbooru.com
+            new Sources.Gelbooru.GallerySource()    // https://gelbooru.com
         };
 
         public App()
         {
-            Preferences.Set(Config.IsProxiedKey, true);
+            //Device.SetFlags(new string[0]);
-            Preferences.Set(Config.ProxyHostKey, "192.168.25.9");
-            Preferences.Set(Config.ProxyPortKey, 1081);
         }
 
         private void InitResource()
@@ -44,6 +42,7 @@ namespace Gallery
         private void InitPreference()
         {
             Config.Proxy = null;
+            Config.DownloadThreads = Preferences.Get(Config.DownloadThreadsKey, 1);
 
             var isProxied = Preferences.Get(Config.IsProxiedKey, false);
             if (isProxied)

Gallery.Share/AppShell.xaml

@@ -4,7 +4,8 @@
        xmlns:local="clr-namespace:Gallery"
        xmlns:r="clr-namespace:Gallery.Resources"
        xmlns:ui="clr-namespace:Gallery.Resources.UI"
-       xmlns:util="clr-namespace:Gallery.Util;assembly=Gallery.Util"
+       xmlns:util="clr-namespace:Gallery.Util"
+       xmlns:v="clr-namespace:Gallery.Views"
        x:Class="Gallery.AppShell"
        x:Name="appShell"
        BackgroundColor="{DynamicResource NavigationColor}"
@@ -15,18 +16,18 @@
     <Shell.Resources>
         <ResourceDictionary>
             <Style x:Key="BaseStyle" TargetType="Element">
-                <Setter Property="Shell.BackgroundColor" Value="{DynamicResource NavigationColor}" />
+                <Setter Property="Shell.BackgroundColor" Value="{DynamicResource NavigationColor}"/>
-                <Setter Property="Shell.ForegroundColor" Value="{DynamicResource TintColor}" />
+                <Setter Property="Shell.ForegroundColor" Value="{DynamicResource TintColor}"/>
-                <Setter Property="Shell.TitleColor" Value="{DynamicResource TextColor}" />
+                <Setter Property="Shell.TitleColor" Value="{DynamicResource TextColor}"/>
-                <Setter Property="Shell.DisabledColor" Value="#B4FFFFFF" />
+                <Setter Property="Shell.DisabledColor" Value="#B4FFFFFF"/>
-                <Setter Property="Shell.UnselectedColor" Value="{DynamicResource TintColor}" />
+                <Setter Property="Shell.UnselectedColor" Value="{DynamicResource TintColor}"/>
-                <Setter Property="Shell.TabBarBackgroundColor" Value="{DynamicResource NavigationColor}" />
+                <Setter Property="Shell.TabBarBackgroundColor" Value="{DynamicResource NavigationColor}"/>
                 <Setter Property="Shell.TabBarForegroundColor" Value="{DynamicResource TintColor}"/>
                 <Setter Property="Shell.TabBarUnselectedColor" Value="{DynamicResource TintColor}"/>
                 <Setter Property="Shell.TabBarTitleColor" Value="{DynamicResource TextColor}"/>
             </Style>
-            <Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
+            <Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}"/>
-            <Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}" />
+            <Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}"/>
             <!--
             Custom Style you can apply to any Flyout Item
             <Style Class="MenuItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
@@ -35,7 +36,7 @@
                         <VisualStateGroup x:Name="CommonStates">
                             <VisualState x:Name="Normal">
                                 <VisualState.Setters>
-                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{DynamicResource Primary}" />
+                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{DynamicResource Primary}"/>
                                 </VisualState.Setters>
                             </VisualState>
                         </VisualStateGroup>
@@ -109,10 +110,17 @@
     -->
     <FlyoutItem x:Name="flyoutItems"
                 FlyoutDisplayOptions="AsMultipleItems"
-                Route="{x:Static util:Routes.Gallery}" />
+                Route="{x:Static util:Routes.Gallery}"/>
+    <FlyoutItem FlyoutIcon="{DynamicResource FontIconOption}"
+                Title="{r:Text Option}"
+                Route="{x:Static util:Routes.Option}">
+        <Tab>
+            <ShellContent ContentTemplate="{DataTemplate v:OptionPage}"/>
+        </Tab>
+    </FlyoutItem>
 
     <!-- When the Flyout is visible this will be a menu item you can tie a click behavior to  -->
-    <!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked" />-->
+    <!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked"/>-->
 
     <!--
         TabBar lets you define content that won't show up in a flyout menu. When this content is active
@@ -121,7 +129,7 @@
         content you can do so by calling 
         await Shell.Current.GoToAsync("//LoginPage");
     <TabBar>
-        <ShellContent Route="LoginPage" ContentTemplate="{DataTemplate local:LoginPage}" />
+        <ShellContent Route="LoginPage" ContentTemplate="{DataTemplate local:LoginPage}"/>
     </TabBar>
     -->
 

Gallery.Share/AppShell.xaml.cs

@@ -1,7 +1,6 @@
-using System;
+using Gallery.Resources.UI;
-using Gallery.Resources;
-using Gallery.Resources.UI;
 using Gallery.Util;
+using Gallery.Util.Interface;
 using Gallery.Views;
 using Xamarin.Forms;
 
@@ -27,9 +26,14 @@ namespace Gallery
 
         private void InitFlyouts()
         {
+            IGallerySource @default = null;
             foreach (var source in App.GallerySources)
             {
                 var s = source;
+                if (@default == null)
+                {
+                    @default = s;
+                }
                 var tab = new Tab
                 {
                     Title = source.Name,
@@ -45,6 +49,9 @@ namespace Gallery
                 .DynamicResource(BaseShellItem.FlyoutIconProperty, source.FlyoutIconKey);
                 flyoutItems.Items.Add(tab);
             }
+
+            var route = @default?.Route ?? Routes.Option;
+            GoToAsync($"//{route}");
         }
 
         public void SetNavigationBarHeight(double height)

Gallery.Share/Gallery.Share.projitems

@@ -28,6 +28,23 @@
     <Compile Include="$(MSBuildThisFileDirectory)Views\GalleryPage.xaml.cs">
       <DependentUpon>GalleryPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Views\OptionPage.xaml.cs">
+      <DependentUpon>OptionPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Views\GalleryItemPage.xaml.cs">
+      <DependentUpon>GalleryItemPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Util\Interface\IGallerySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\Model\GalleryItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\Extensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\Log.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\NetHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\ParallelTask.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Util\Store.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Sources\Yandere\GallerySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Sources\Yandere\YandereItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Sources\Danbooru\GallerySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Sources\Gelbooru\GallerySource.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)Services\" />
@@ -36,6 +53,13 @@
     <Folder Include="$(MSBuildThisFileDirectory)Resources\Theme\" />
     <Folder Include="$(MSBuildThisFileDirectory)Resources\Languages\" />
     <Folder Include="$(MSBuildThisFileDirectory)Resources\UI\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Util\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Util\Interface\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Util\Model\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Sources\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Sources\Yandere\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Sources\Danbooru\" />
+    <Folder Include="$(MSBuildThisFileDirectory)Sources\Gelbooru\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)AppShell.xaml">
@@ -47,5 +71,13 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Languages\zh-CN.xml" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Views\OptionPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Views\GalleryItemPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>

Gallery.Share/Resources/Languages/zh-CN.xml

@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <root>
     <Title>Gallery</Title>
+    <Option>选项</Option>
+    <About>关于</About>
+    <Version>版本</Version>
+    <Gallery>图库</Gallery>
+    <DownloadThreads>多线程下载</DownloadThreads>
+    <Proxy>代理</Proxy>
+    <Enabled>启用</Enabled>
+    <Detail>详细</Detail>
+    <ProxyHost>代理主机</ProxyHost>
+    <ProxyPort>代理端口</ProxyPort>
 </root>

Gallery.Share/Resources/Theme/Theme.cs

@@ -22,6 +22,7 @@ namespace Gallery.Resources.Theme
         public const string ScreenBottomPadding = nameof(ScreenBottomPadding);
 
         public const string IconClose = nameof(IconClose);
+        public const string FontIconOption = nameof(FontIconOption);
         public const string FontIconRefresh = nameof(FontIconRefresh);
 
         protected void InitResources()
@@ -31,6 +32,7 @@ namespace Gallery.Resources.Theme
             Add(IconSolidFamily, Definition.IconSolidFamily);
             Add(ScreenBottomPadding, Definition.ScreenBottomPadding);
 
+            Add(FontIconOption, GetFontIcon(Definition.IconOption, Definition.IconSolidFamily));
             Add(FontIconRefresh, GetFontIcon(Definition.IconRefresh, Definition.IconSolidFamily));
 
             Add(IconClose, Definition.IconClose);

Gallery.Share/Resources/UI/Definition.cs

@@ -31,6 +31,7 @@ namespace Gallery.Resources.UI
         public const string IconLeft = "\uf053";
 #endif
 
+        public const string IconOption = "\uf013";
         public const string IconRefresh = "\uf2f9";
         public const string IconLove = "\uf004";
         public const string IconCircleLove = "\uf4c7";

Gallery.Share/Sources/Danbooru/GallerySource.cs

@@ -6,7 +6,7 @@ using Gallery.Util.Interface;
 using Gallery.Util.Model;
 using Xamarin.Forms;
 
-namespace Gallery.Danbooru
+namespace Gallery.Sources.Danbooru
 {
     public class GallerySource : IGallerySource
     {

Gallery.Share/Sources/Gelbooru/GallerySource.cs

@@ -6,7 +6,7 @@ using Gallery.Util.Interface;
 using Gallery.Util.Model;
 using Xamarin.Forms;
 
-namespace Gallery.Gelbooru
+namespace Gallery.Sources.Gelbooru
 {
     public class GallerySource : IGallerySource
     {

Gallery.Share/Sources/Yandere/GallerySource.cs

@@ -6,7 +6,7 @@ using Gallery.Util.Interface;
 using Gallery.Util.Model;
 using Xamarin.Forms;
 
-namespace Gallery.Yandere
+namespace Gallery.Sources.Yandere
 {
     public class GallerySource : IGallerySource
     {

Gallery.Share/Sources/Yandere/YandereItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Gallery.Yandere
+namespace Gallery.Sources.Yandere
 {
     public class YandereItem
     {

Gallery.Share/Util/Model/GalleryItem.cs

@@ -1,10 +1,12 @@
 using System;
-using System.Text.Json.Serialization;
+//using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 using Xamarin.Forms;
 
 namespace Gallery.Util.Model
 {
-    [JsonConverter(typeof(GalleryItemConverter))]
+    //[JsonConverter(typeof(GalleryItemConverter))]
+    [JsonObject(MemberSerialization.OptIn)]
     public class GalleryItem : BindableObject
     {
         const double PREVIEW_WIDTH = 200.0;
@@ -39,14 +41,18 @@ namespace Gallery.Util.Model
             get => (bool)GetValue(IsFavoriteProperty);
             set => SetValue(IsFavoriteProperty, value);
         }
+
+        [JsonProperty]
         public string BookmarkId
         {
             get => (string)GetValue(BookmarkIdProperty);
             set => SetValue(BookmarkIdProperty, value);
         }
 
+        [JsonProperty]
         public long Id { get; internal set; }
         private string[] tags;
+        [JsonProperty]
         public string[] Tags
         {
             get => tags;
@@ -63,17 +69,26 @@ namespace Gallery.Util.Model
                 }
             }
         }
+        [JsonProperty]
         public DateTime CreatedTime { get; set; }
+        [JsonProperty]
         public DateTime UpdatedTime { get; set; }
+        [JsonProperty]
         public string UserId { get; set; }
+        [JsonProperty]
         public string UserName { get; set; }
+        [JsonProperty]
         public string Source { get; set; }
+        [JsonProperty]
         public string PreviewUrl { get; set; }
+        [JsonProperty]
         public string RawUrl { get; set; }
+        [JsonProperty]
         public bool IsRawPage { get; set; }
 
         private int width;
         private int height;
+        [JsonProperty]
         public int Width
         {
             get => width;
@@ -86,6 +101,7 @@ namespace Gallery.Util.Model
                 }
             }
         }
+        [JsonProperty]
         public int Height
         {
             get => height;

Gallery.Share/Util/NetHelper.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using Xamarin.Essentials;
 
 namespace Gallery.Util
@@ -81,7 +81,7 @@ namespace Gallery.Util
             }
             try
             {
-                var result = JsonSerializer.Deserialize<T>(content);
+                var result = JsonConvert.DeserializeObject<T>(content);
                 return (result, null);
             }
             catch (Exception ex)

Gallery.Share/Util/Store.cs

@@ -76,14 +76,17 @@ namespace Gallery.Util
     {
         public static readonly TimeSpan Timeout = TimeSpan.FromSeconds(30);
 
+        public const string DownloadThreadsKey = "download_threads";
         public const string IsProxiedKey = "is_proxied";
         public const string ProxyHostKey = "proxy_host";
         public const string ProxyPortKey = "proxy_port";
 
+        public const int MaxThreads = 8;
         public const string UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36";
         public const string AcceptLanguage = "zh-cn";
         public const string AcceptImage = "image/png,image/*,*/*;q=0.8";
 
+        public static int DownloadThreads;
         public static WebProxy Proxy;
     }
 

Gallery.Share/Views/GalleryItemPage.xaml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:AdaptedPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:ui="clr-namespace:Gallery.Resources.UI"
+    x:Class="Gallery.Views.GalleryItemPage"
+    x:Name="galleryItemPage"
+    BindingContext="{x:Reference galleryItemPage}">
+    <ContentPage.Content>
+        
+    </ContentPage.Content>
+</ui:AdaptedPage>

Gallery.Share/Views/GalleryItemPage.xaml.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Gallery.Resources.UI;
+using Xamarin.Forms;
+
+namespace Gallery.Views
+{
+    public partial class GalleryItemPage : AdaptedPage
+    {
+        public GalleryItemPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

Gallery.Share/Views/GalleryPage.xaml

@@ -6,7 +6,8 @@
     x:Class="Gallery.Views.GalleryPage"
     x:Name="yanderePage"
     BackgroundColor="{DynamicResource WindowColor}"
-    BindingContext="{x:Reference yanderePage}">
+    BindingContext="{x:Reference yanderePage}"
+    Title="{Binding Source.Name}">
     <ContentPage.Content>
         <Grid>
             <ScrollView x:Name="scrollView" Scrolled="ScrollView_Scrolled"

Gallery.Share/Views/OptionPage.xaml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:AdaptedPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:r="clr-namespace:Gallery.Resources"
+    xmlns:ui="clr-namespace:Gallery.Resources.UI"
+    x:Class="Gallery.Views.OptionPage"
+    x:Name="optionPage"
+    BindingContext="{x:Reference optionPage}"
+    Title="{r:Text Option}">
+    <ContentPage.Content>
+        <TableView Intent="Settings" VerticalOptions="Start"
+                   BackgroundColor="{DynamicResource OptionBackColor}">
+            <TableRoot>
+                <TableSection Title="{r:Text About}">
+                    <ui:OptionTextCell Title="{r:Text Version}" Detail="{Binding Version}"/>
+                </TableSection>
+                <TableSection Title="{r:Text Gallery}">
+                    <ui:OptionEntryCell Title="{r:Text DownloadThreads}"
+                                        Text="{Binding DownloadThreads, Mode=TwoWay}"
+                                        Keyboard="Numeric" Placeholder="1~10"/>
+                </TableSection>
+                <TableSection Title="{r:Text Proxy}">
+                    <ui:OptionSwitchCell Title="{r:Text Enabled}"
+                                         IsToggled="{Binding IsProxied, Mode=TwoWay}"/>
+                </TableSection>
+                <TableSection Title="{r:Text Detail}">
+                    <ui:OptionEntryCell Title="{r:Text ProxyHost}"
+                                        Text="{Binding ProxyHost, Mode=TwoWay}"
+                                        Keyboard="Url" Placeholder="www.example.com"/>
+                    <ui:OptionEntryCell Title="{r:Text ProxyPort}"
+                                        Text="{Binding ProxyPort, Mode=TwoWay}"
+                                        Keyboard="Numeric" Placeholder="8080"/>
+                </TableSection>
+            </TableRoot>
+        </TableView>
+    </ContentPage.Content>
+</ui:AdaptedPage>

Gallery.Share/Views/OptionPage.xaml.cs

@@ -0,0 +1,152 @@
+using System;
+using Gallery.Resources.UI;
+using Gallery.Util;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace Gallery.Views
+{
+    public partial class OptionPage : AdaptedPage
+    {
+        public static readonly BindableProperty VersionProperty = BindableProperty.Create(nameof(Version), typeof(string), typeof(OptionPage));
+
+        public string Version
+        {
+            get => (string)GetValue(VersionProperty);
+            set => SetValue(VersionProperty, value);
+        }
+
+        public static readonly BindableProperty DownloadThreadsProperty = BindableProperty.Create(nameof(DownloadThreads), typeof(string), typeof(OptionPage));
+        public static readonly BindableProperty IsProxiedProperty = BindableProperty.Create(nameof(IsProxied), typeof(bool), typeof(OptionPage));
+        public static readonly BindableProperty ProxyHostProperty = BindableProperty.Create(nameof(ProxyHost), typeof(string), typeof(OptionPage));
+        public static readonly BindableProperty ProxyPortProperty = BindableProperty.Create(nameof(ProxyPort), typeof(string), typeof(OptionPage));
+
+        public string DownloadThreads
+        {
+            get => (string)GetValue(DownloadThreadsProperty);
+            set => SetValue(DownloadThreadsProperty, value);
+        }
+        public bool IsProxied
+        {
+            get => (bool)GetValue(IsProxiedProperty);
+            set => SetValue(IsProxiedProperty, value);
+        }
+        public string ProxyHost
+        {
+            get => (string)GetValue(ProxyHostProperty);
+            set => SetValue(ProxyHostProperty, value);
+        }
+        public string ProxyPort
+        {
+            get => (string)GetValue(ProxyPortProperty);
+            set => SetValue(ProxyPortProperty, value);
+        }
+
+
+        public OptionPage()
+        {
+            InitializeComponent();
+
+#if OBSOLETE
+#if __IOS__
+            string version = Foundation.NSBundle.MainBundle.ObjectForInfoDictionary("CFBundleShortVersionString").ToString();
+            int build = int.Parse(Foundation.NSBundle.MainBundle.ObjectForInfoDictionary("CFBundleVersion").ToString());
+#elif __ANDROID__
+            var context = Android.App.Application.Context;
+            var manager = context.PackageManager;
+            var info = manager.GetPackageInfo(context.PackageName, 0);
+
+            string version = info.VersionName;
+            long build = info.LongVersionCode;
+#endif
+            Version = $"{version} ({build})";
+#endif
+        }
+
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+
+            Version = $"{AppInfo.VersionString} ({AppInfo.BuildString})";
+            DownloadThreads = Config.DownloadThreads.ToString();
+            var proxy = Config.Proxy;
+            if (proxy != null)
+            {
+                IsProxied = true;
+                ProxyHost = proxy.Address.Host;
+                ProxyPort = proxy.Address.Port.ToString();
+            }
+            else
+            {
+                IsProxied = false;
+                ProxyHost = Preferences.Get(Config.ProxyHostKey, string.Empty);
+                ProxyPort = Preferences.Get(Config.ProxyPortKey, string.Empty);
+            }
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+
+            var proxied = IsProxied;
+
+            if (int.TryParse(DownloadThreads, out int threads) && threads > 0 && threads <= 10 && threads != Config.DownloadThreads)
+            {
+                Preferences.Set(Config.DownloadThreadsKey, threads);
+                Config.DownloadThreads = threads;
+#if DEBUG
+                Log.Print($"will use {threads} threads to download image");
+#endif
+            }
+
+            var proxy = Config.Proxy;
+            var h = ProxyHost?.Trim();
+            int.TryParse(ProxyPort, out int pt);
+            if (proxied &&
+                !string.IsNullOrEmpty(h) &&
+                pt > 0 && pt < 65535)
+            {
+                if (proxy == null ||
+                    proxy.Address.Host != h ||
+                    proxy.Address.Port != pt)
+                {
+                    Preferences.Set(Config.IsProxiedKey, true);
+                    Preferences.Set(Config.ProxyHostKey, h);
+                    Preferences.Set(Config.ProxyPortKey, pt);
+                    try
+                    {
+                        if (h.IndexOf(':') >= 0)
+                        {
+                            h = $"[{h}]";
+                        }
+                        var uri = new Uri($"http://{h}:{pt}");
+                        Config.Proxy = new System.Net.WebProxy(uri);
+#if DEBUG
+                        Log.Print($"set proxy to: {uri}");
+#endif
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Error("on.disappearing", $"failed to parse proxy: {h}:{pt}, error: {ex.Message}");
+                    }
+                }
+            }
+            else
+            {
+                Preferences.Set(Config.IsProxiedKey, false);
+                Preferences.Set(Config.ProxyHostKey, h);
+                if (pt > 0)
+                {
+                    Preferences.Set(Config.ProxyPortKey, pt);
+                }
+                if (proxy != null)
+                {
+                    Config.Proxy = null;
+#if DEBUG
+                    Log.Print("clear proxy");
+#endif
+                }
+            }
+        }
+    }
+}

Gallery.UI/OptionCells.cs

@@ -49,7 +49,7 @@ namespace Gallery.Resources.UI
 
     public class OptionTextCell : OptionCell
     {
-        public static readonly BindableProperty DetailProperty = BindableProperty.Create(nameof(Detail), typeof(string), typeof(OptionCell));
+        public static readonly BindableProperty DetailProperty = BindableProperty.Create(nameof(Detail), typeof(string), typeof(OptionTextCell));
 
         public string Detail
         {
@@ -150,7 +150,7 @@ namespace Gallery.Resources.UI
             .Binding(Entry.TextProperty, nameof(Text), mode: BindingMode.TwoWay)
             .Binding(Entry.PlaceholderProperty, nameof(Placeholder))
             .Binding(InputView.KeyboardProperty, nameof(Keyboard))
-            .DynamicResource(Entry.TextProperty, Extensions.TextColor)
+            .DynamicResource(Entry.TextColorProperty, Extensions.TextColor)
             .DynamicResource(Entry.PlaceholderColorProperty, Extensions.SubTextColor)
             .DynamicResource(VisualElement.BackgroundColorProperty, Extensions.OptionTintColor);
     }

Gallery.Util/Gallery.Util.csproj

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <AssemblyOriginatorKeyFile>..\Ref\Tsanie.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="System.Text.Json" />
-    <None Remove="Xamarin.Forms" />
-    <None Remove="Interface\" />
-    <None Remove="Model\" />
-    <None Remove="Xamarin.Essentials" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Interface\" />
-    <Folder Include="Model\" />
-  </ItemGroup>
-</Project>

Gallery.iOS/AppDelegate.cs

@@ -6,7 +6,7 @@ namespace Gallery.iOS
     // The UIApplicationDelegate for the application. This class is responsible for launching the 
     // User Interface of the application, as well as listening (and optionally responding) to 
     // application events from iOS.
-    [Register("AppDelegate")]
+    [Register(nameof(AppDelegate))]
     public partial class AppDelegate : Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
     {
         //

Gallery.iOS/Gallery.iOS.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Renderers\OptionPickerRenderer.cs" />
     <Compile Include="Renderers\RoundImageRenderer.cs" />
     <Compile Include="Renderers\RoundLabelRenderer.cs" />
+    <Compile Include="Renderers\AdaptedPageRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
@@ -140,28 +141,12 @@
     <Reference Include="Xamarin.iOS" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
-  </ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  <ItemGroup>
-    <ProjectReference Include="..\Gallery.Util\Gallery.Util.csproj">
-      <Project>{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}</Project>
-      <Name>Gallery.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GallerySources\Gallery.Yandere\Gallery.Yandere.csproj">
-      <Project>{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}</Project>
-      <Name>Gallery.Yandere</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GallerySources\Gallery.Gelbooru\Gallery.Gelbooru.csproj">
-      <Project>{83760017-F2A6-4450-A4F8-8E143E800C2F}</Project>
-      <Name>Gallery.Gelbooru</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GallerySources\Gallery.Danbooru\Gallery.Danbooru.csproj">
-      <Project>{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}</Project>
-      <Name>Gallery.Danbooru</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Renderers\" />

Gallery.iOS/Main.cs

@@ -9,7 +9,7 @@ namespace Gallery.iOS
         {
             // if you want to use a different Application Delegate class from "AppDelegate"
             // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }

Gallery.iOS/Renderers/AdaptedPageRenderer.cs

@@ -0,0 +1,97 @@
+using Foundation;
+using Gallery.iOS.Renderers;
+using Gallery.Resources.UI;
+using Gallery.Services;
+using UIKit;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
+
+[assembly: ExportRenderer(typeof(AdaptedPage), typeof(AdaptedPageRenderer))]
+namespace Gallery.iOS.Renderers
+{
+    public class AdaptedPageRenderer : PageRenderer
+    {
+        UIDeviceOrientation lastOrientation;
+        NSObject observer;
+
+        public override void ViewDidLoad()
+        {
+            base.ViewDidLoad();
+
+            if (Element is AdaptedPage page)
+            {
+                page.OnLoad();
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (Element is AdaptedPage page)
+            {
+                page.OnUnload();
+            }
+            base.Dispose(disposing);
+        }
+
+        public override void ViewDidAppear(bool animated)
+        {
+            base.ViewDidAppear(animated);
+
+            var element = Element;
+            if (element != null)
+            {
+                var style = Environment.ConvertStyle(Screen.GetStatusBarStyle(element));
+                Environment.SetStatusBarStyle(style);
+            }
+
+            observer = UIDevice.Notifications.ObserveOrientationDidChange(OnOrientationChanged);
+            OnOrientationChanged(null, null);
+        }
+
+        public override void ViewWillDisappear(bool animated)
+        {
+            if (observer != null)
+            {
+                observer.Dispose();
+                observer = null;
+            }
+
+            base.ViewWillDisappear(animated);
+        }
+
+        private void OnOrientationChanged(object sender, NSNotificationEventArgs e)
+        {
+            var current = UIDevice.CurrentDevice.Orientation;
+            if (current == UIDeviceOrientation.FaceUp || current == UIDeviceOrientation.FaceDown)
+            {
+                return;
+            }
+            if (lastOrientation != current)
+            {
+                lastOrientation = current;
+                if (current == UIDeviceOrientation.Portrait && UIApplication.SharedApplication.StatusBarHidden)
+                {
+                    var style = Environment.ConvertStyle(Screen.GetStatusBarStyle(Element));
+                    if (style != UIStatusBarStyle.BlackOpaque)
+                    {
+                        UIApplication.SharedApplication.SetStatusBarHidden(false, true);
+                    }
+                }
+                if (Element is AdaptedPage page)
+                {
+                    AppShell.Current?.SetStatusBarHeight(
+                        NavigationController?.NavigationBar.Frame.Height ?? 0,
+                        UIApplication.SharedApplication.StatusBarFrame.Height);
+                    var landscape =
+                        current == UIDeviceOrientation.LandscapeLeft ||
+                        current == UIDeviceOrientation.LandscapeRight;
+                    if (UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Phone)
+                    {
+                        landscape |= current == UIDeviceOrientation.PortraitUpsideDown;
+                    }
+                    page.OnOrientationChanged(landscape);
+                }
+            }
+        }
+    }
+}

Gallery.sln

@@ -7,16 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.iOS", "Gallery.iOS\
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gallery.Share", "Gallery.Share\Gallery.Share.shproj", "{E72B5C40-090B-4A1C-9170-BD33C14A9A91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Util", "Gallery.Util\Gallery.Util.csproj", "{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GallerySources", "GallerySources", "{F37B4FEC-D2B1-4289-BA6D-A154F783572A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Yandere", "GallerySources\Gallery.Yandere\Gallery.Yandere.csproj", "{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Danbooru", "GallerySources\Gallery.Danbooru\Gallery.Danbooru.csproj", "{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Gelbooru", "GallerySources\Gallery.Gelbooru\Gallery.Gelbooru.csproj", "{83760017-F2A6-4450-A4F8-8E143E800C2F}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gallery.UI", "Gallery.UI\Gallery.UI.shproj", "{73AB85FB-D11A-43FB-BBC5-54BED5A056D1}"
 EndProject
 Global
@@ -41,54 +31,6 @@ Global
 		{94E59D2C-9083-4BAB-9567-A0B0C4B4266D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{94E59D2C-9083-4BAB-9567-A0B0C4B4266D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
 		{94E59D2C-9083-4BAB-9567-A0B0C4B4266D}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|iPhone.Build.0 = Release|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{222C22EC-3A47-4CF5-B9FB-CA28DE9F4BC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|iPhone.Build.0 = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|iPhone.Build.0 = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|iPhone.Build.0 = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83760017-F2A6-4450-A4F8-8E143E800C2F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,8 +39,5 @@ Global
 		SolutionGuid = {A969B750-3E3E-4815-B336-02B32908D0C4}
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F7ECCC03-28AC-4326-B0D1-F24C08808B9F} = {F37B4FEC-D2B1-4289-BA6D-A154F783572A}
-		{F9187AE4-BC64-4906-9CAF-89BE43CD4A34} = {F37B4FEC-D2B1-4289-BA6D-A154F783572A}
-		{83760017-F2A6-4450-A4F8-8E143E800C2F} = {F37B4FEC-D2B1-4289-BA6D-A154F783572A}
 	EndGlobalSection
 EndGlobal

GallerySources/Gallery.Danbooru/Gallery.Danbooru.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Gallery.Util\Gallery.Util.csproj" />
-  </ItemGroup>
-</Project>

GallerySources/Gallery.Gelbooru/Gallery.Gelbooru.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Gallery.Util\Gallery.Util.csproj" />
-  </ItemGroup>
-</Project>

GallerySources/Gallery.Yandere/Gallery.Yandere.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Gallery.Util\Gallery.Util.csproj" />
-  </ItemGroup>
-</Project>