From 82527789c867965a68da0c2452b67a24fdd1434c Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Sun, 24 May 2020 17:08:15 +0800
Subject: [PATCH] fix: dev region to China feature: add version display in
 option page

---
 .../Properties/AndroidManifest.xml            |  2 +-
 Pixiview.iOS.OpenExtension/Info.plist         |  4 +--
 Pixiview.iOS/Info.plist                       |  4 ++-
 Pixiview/OptionPage.xaml                      |  3 +++
 Pixiview/OptionPage.xaml.cs                   | 26 +++++++++++++++++++
 Pixiview/Resources/Languages/zh-CN.xml        |  2 ++
 Pixiview/UI/OptionCell.cs                     | 23 +++++++++++++++-
 7 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/Pixiview.Android/Properties/AndroidManifest.xml b/Pixiview.Android/Properties/AndroidManifest.xml
index 6e743fa..2390d4e 100644
--- a/Pixiview.Android/Properties/AndroidManifest.xml
+++ b/Pixiview.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.524" package="org.tsanie.pixiview" android:versionCode="13">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.524" package="org.tsanie.pixiview" android:versionCode="15">
 	<uses-sdk android:minSdkVersion="25" android:targetSdkVersion="28" />
 	<application android:label="Pixiview" android:icon="@mipmap/icon" android:roundIcon="@mipmap/icon_round"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Pixiview.iOS.OpenExtension/Info.plist b/Pixiview.iOS.OpenExtension/Info.plist
index 75cf818..ffb57f4 100644
--- a/Pixiview.iOS.OpenExtension/Info.plist
+++ b/Pixiview.iOS.OpenExtension/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.tsanie.Pixiview.OpenExtension</string>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>China</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -31,6 +31,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.524</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>15</string>
 </dict>
 </plist>
diff --git a/Pixiview.iOS/Info.plist b/Pixiview.iOS/Info.plist
index 424ad73..d9a0ab7 100644
--- a/Pixiview.iOS/Info.plist
+++ b/Pixiview.iOS/Info.plist
@@ -81,6 +81,8 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.524</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>15</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>China</string>
 </dict>
 </plist>
diff --git a/Pixiview/OptionPage.xaml b/Pixiview/OptionPage.xaml
index 26ddf88..36c3c8b 100644
--- a/Pixiview/OptionPage.xaml
+++ b/Pixiview/OptionPage.xaml
@@ -12,6 +12,9 @@
     <TableView Intent="Settings" VerticalOptions="Start"
                BackgroundColor="{DynamicResource OptionBackColor}">
         <TableRoot>
+            <TableSection Title="{r:Text About}">
+                <u:OptionTextCell Title="{r:Text Version}" Detail="{Binding Version}"/>
+            </TableSection>
             <TableSection Title="{r:Text Illusts}">
                 <u:OptionSwitchCell Title="{r:Text R18}"
                                     IsToggled="{Binding IsOnR18, Mode=TwoWay}"/>
diff --git a/Pixiview/OptionPage.xaml.cs b/Pixiview/OptionPage.xaml.cs
index cdac905..7722b0c 100644
--- a/Pixiview/OptionPage.xaml.cs
+++ b/Pixiview/OptionPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Pixiview.Resources;
 using Pixiview.UI;
 using Pixiview.Utils;
@@ -9,6 +10,15 @@ namespace Pixiview
 {
     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 IsOnR18Property = BindableProperty.Create(
             nameof(IsOnR18), typeof(bool), typeof(OptionPage));
         public static readonly BindableProperty SyncFavTypeProperty = BindableProperty.Create(
@@ -65,12 +75,27 @@ namespace Pixiview
                 ResourceHelper.SyncAuto,
             };
             SyncFavType = 0;
+#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})";
             IsOnR18 = Configs.IsOnR18;
             SyncFavType = (int)Configs.SyncFavType;
             var proxy = Configs.Proxy;
@@ -173,6 +198,7 @@ namespace Pixiview
 #if LOG
                         App.DebugPrint($"cookie changed, user id: {session}");
 #endif
+                        Task.Run(() => AppShell.Current.DoLoginInformation(true));
                     }
                 }
             }
diff --git a/Pixiview/Resources/Languages/zh-CN.xml b/Pixiview/Resources/Languages/zh-CN.xml
index ca3863a..5b78952 100644
--- a/Pixiview/Resources/Languages/zh-CN.xml
+++ b/Pixiview/Resources/Languages/zh-CN.xml
@@ -7,6 +7,8 @@
     <Yes>是</Yes>
     <No>否</No>
     <Login>登录</Login>
+    <About>关于</About>
+    <Version>版本</Version>
     <Illusts>插画</Illusts>
     <Proxy>代理</Proxy>
     <Detail>详细</Detail>
diff --git a/Pixiview/UI/OptionCell.cs b/Pixiview/UI/OptionCell.cs
index 6691d54..93be88e 100644
--- a/Pixiview/UI/OptionCell.cs
+++ b/Pixiview/UI/OptionCell.cs
@@ -49,6 +49,26 @@ namespace Pixiview.UI
         }
     }
 
+    public class OptionTextCell : OptionCell
+    {
+        public static readonly BindableProperty DetailProperty = BindableProperty.Create(
+            nameof(Detail), typeof(string), typeof(OptionCell));
+
+        public string Detail
+        {
+            get => (string)GetValue(DetailProperty);
+            set => SetValue(DetailProperty, value);
+        }
+
+        protected override View Content => new Label
+        {
+            HorizontalOptions = LayoutOptions.End,
+            VerticalOptions = LayoutOptions.Center
+        }
+        .Binding(Label.TextProperty, nameof(Detail))
+        .DynamicResource(Label.TextColorProperty, ThemeBase.SubTextColor);
+    }
+
     public class OptionSwitchCell : OptionCell
     {
         public static readonly BindableProperty IsToggledProperty = BindableProperty.Create(
@@ -64,7 +84,8 @@ namespace Pixiview.UI
         {
             HorizontalOptions = LayoutOptions.End,
             VerticalOptions = LayoutOptions.Center
-        }.Binding(Switch.IsToggledProperty, nameof(IsToggled), BindingMode.TwoWay);
+        }
+        .Binding(Switch.IsToggledProperty, nameof(IsToggled), BindingMode.TwoWay);
     }
 
     public class OptionDropCell : OptionCell