From 8491ac1341ad9e993c510d4914f3473c1aedb85a Mon Sep 17 00:00:00 2001
From: Shahriar <shahriar.yazdipour@outlook.com>
Date: Thu, 23 May 2019 15:24:24 +0430
Subject: [PATCH] v2.1 (#55)

* Update README

* Add Theme

* deprecated items

* Add VM Classes

* Rm Dotnet Core Test

* Add LoggerLib

* Add UnitTest

* Clean Code

* Use Logger

* Rename Source Folder for clarification

* Update README

* Oops :)

* RM old keys

* Rm OldUnitTestProj

* UI Changes

* Resharper suggestions

* Add ui concepts And Little ui changes

* ui update

* ui improvements

* improv Login + Singlton PocketHandler + Cleaning a bit

* Update UiUtil

* VM in MainPage

* VM in MainPage

* Half VM for MainContent

* New navview (#45)

* Fix Login Theme

* VM MainContent with Controls

* Rm MainPage

* TagsList Ctrl

* ArticleList Ctrl

* Fix ImageDialog

* Update Screenshots

* Fix All ListViews

* Bug fixes related to Themes

* Fix Minor Problems

* Encapsulate InAppNotification

* Fix InAppNotif UI

* Fix WhiteTheme

* Rm UserInfo from Settings

* Improve binding

* Fix Minor UI Bugs

* UPdate README

* Rm TagListCtrl

* little ui changes

* Fix WebViewBtn on Error Page (Issue #53)

* UpdateGitIgnore

* Minor fixes

* If there is no tag, get center

* Fix Caching the List

* Making sure first remove cache then Delete it from server - in case of exceptions

* Better tag loading

* Cache User Info

* Add UserStatistics
---
 .gitignore                                    |   1 +
 Source/PocketX/Controls/MarkdownControl.xaml  |  14 +-
 .../PocketX/Controls/MarkdownControl.xaml.cs  |   4 +
 .../Converter/ArrayToStringConverter.cs       |  13 ++
 .../PocketX/Converter/HideIfEmptyConverter.cs |  16 ++
 Source/PocketX/Handlers/PocketHandler.cs      | 171 ++++++++++--------
 Source/PocketX/Package.StoreAssociation.xml   |  49 ++++-
 Source/PocketX/Package.appxmanifest           |   9 +-
 Source/PocketX/PocketX.csproj                 |  12 +-
 .../ViewModels/MainContentViewModel.cs        |   2 +
 .../PocketX/Views/Dialog/SettingsDialog.xaml  | 105 ++++++++---
 .../Views/Dialog/SettingsDialog.xaml.cs       |  14 +-
 Source/PocketX/Views/MainContent.xaml         |  29 +--
 Source/PocketX/Views/MainContent.xaml.cs      |   4 +
 14 files changed, 298 insertions(+), 145 deletions(-)
 create mode 100644 Source/PocketX/Converter/ArrayToStringConverter.cs
 create mode 100644 Source/PocketX/Converter/HideIfEmptyConverter.cs

diff --git a/.gitignore b/.gitignore
index 51de314..3746275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+Source/PocketX/Package.StoreAssociation.xml
 Source/PocketX/Handlers/Keys.cs
\ No newline at end of file
diff --git a/Source/PocketX/Controls/MarkdownControl.xaml b/Source/PocketX/Controls/MarkdownControl.xaml
index 2895d84..9c01c76 100644
--- a/Source/PocketX/Controls/MarkdownControl.xaml
+++ b/Source/PocketX/Controls/MarkdownControl.xaml
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:converter="using:PocketX.Converter"
-    Background="{x:Bind Settings.ReaderBg,Mode=OneWay}" 
     RequestedTheme="{x:Bind Settings.ReaderTheme,Mode=OneWay}"
     mc:Ignorable="d">
     <UserControl.Resources>
@@ -82,8 +81,7 @@
                                 VerticalAlignment="Center" />
             <StackPanel Orientation="Horizontal" Margin="0 8" HorizontalAlignment="Center">
                 <Button Content="Reload ArticleView" Click="Reload_ArticleView" />
-                <Button Margin="8 0" Content="Open WebView" Tag="webView"
-                                    Click="AppBar_Click" />
+                <Button Margin="8 0" Content="Open WebView" Tag="error" Click="AppBar_Click" />
             </StackPanel>
         </StackPanel>
         <!--Audio Player-->
@@ -119,13 +117,17 @@
                         <!--Icon="{x:Bind ArchiveIcon,Mode=OneWay}"-->
                 </AppBarButton.Icon>
             </AppBarButton>
+            <AppBarButton Icon="Volume"
+                          Label="Read"
+                          Command="{x:Bind TextToSpeech}"/>
+            
             <AppBarButton Tag="Share" 
                           Icon="Share" 
                           Label="Share" 
+                          LabelPosition="Collapsed"
+                          Width="48"
+                          Margin="0 2 0 0"
                           Click="AppBar_Click" />
-            <AppBarButton Icon="Volume"
-                          Label="Read"
-                          Command="{x:Bind TextToSpeech}"/>
             <CommandBar.SecondaryCommands>
                 <AppBarButton Click="AppBar_Click"
                               Tag="Favorite"
diff --git a/Source/PocketX/Controls/MarkdownControl.xaml.cs b/Source/PocketX/Controls/MarkdownControl.xaml.cs
index 044c630..330924c 100644
--- a/Source/PocketX/Controls/MarkdownControl.xaml.cs
+++ b/Source/PocketX/Controls/MarkdownControl.xaml.cs
@@ -116,6 +116,10 @@ private async void AppBar_Click(object sender, RoutedEventArgs e)
                     Utils.CopyToClipboard(Article?.Uri?.AbsoluteUri);
                     NotificationHandler.InAppNotification("Copied", 2000);
                     break;
+                case "error":
+                    IsInTextView = true;
+                    AppBar_Click("view", null);
+                    break;
                 case "view":
                     if (IsInTextView)
                     {
diff --git a/Source/PocketX/Converter/ArrayToStringConverter.cs b/Source/PocketX/Converter/ArrayToStringConverter.cs
new file mode 100644
index 0000000..883303c
--- /dev/null
+++ b/Source/PocketX/Converter/ArrayToStringConverter.cs
@@ -0,0 +1,13 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace PocketX.Converter
+{
+    public class ArrayToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language) =>
+            string.Join(parameter is string spl ? spl : " ", value);
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => value;
+    }
+}
diff --git a/Source/PocketX/Converter/HideIfEmptyConverter.cs b/Source/PocketX/Converter/HideIfEmptyConverter.cs
new file mode 100644
index 0000000..3183d1b
--- /dev/null
+++ b/Source/PocketX/Converter/HideIfEmptyConverter.cs
@@ -0,0 +1,16 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace PocketX.Converter
+{
+    public class HideIfEmptyConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language) =>
+            value == null || value is string str && string.IsNullOrEmpty(str) || value is Array arr && arr.Length == 0
+                ? Visibility.Collapsed
+                : Visibility.Visible;
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+    }
+}
diff --git a/Source/PocketX/Handlers/PocketHandler.cs b/Source/PocketX/Handlers/PocketHandler.cs
index dc06942..f8c8bfc 100644
--- a/Source/PocketX/Handlers/PocketHandler.cs
+++ b/Source/PocketX/Handlers/PocketHandler.cs
@@ -9,19 +9,20 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using static Logger.Logger;
 
 namespace PocketX.Handlers
 {
     internal class PocketHandler : INotifyPropertyChanged
     {
         public PocketClient Client;
+        public PocketUser User { get; set; }
         private static PocketHandler _pocketHandler;
         private PocketItem _currentPocketItem;
         public ObservableCollection<string> Tags { set; get; } = new ObservableCollection<string>();
         public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        protected virtual void OnPropertyChanged(string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         public PocketItem CurrentPocketItem
         {
             get => _currentPocketItem;
@@ -31,44 +32,39 @@ public PocketItem CurrentPocketItem
                 OnPropertyChanged(nameof(CurrentPocketItem));
             }
         }
-
-        public PocketUser User { get; set; }
-
-        #region Login\Logout
-
         public static PocketHandler GetInstance() => _pocketHandler ?? (_pocketHandler = new PocketHandler());
 
-        public async void LoadCacheClient()
+        #region Login\Logout
+        public void LoadCacheClient()
         {
             var cache = new LocalObjectStorageHelper().Read(Keys.PocketClientCache, "");
             Client = cache == "" ? null : new PocketClient(Keys.Pocket, cache);
-            try { if (Client != null) User = await Client.GetUser(); }
-            catch{ }
+            User = new LocalObjectStorageHelper().Read<PocketUser>(Keys.PocketClientCache + "user");
         }
 
-        private void SaveCacheUser(PocketUser user)
-            => new LocalObjectStorageHelper().Save(Keys.PocketClientCache, user.Code);
-
         internal void Logout()
         {
-            Logger.Logger.L("Logout");
+            L("Logout");
             Client = null;
+            User = null;
             _pocketHandler = null;
             SettingsHandler.Clear();
             BlobCache.LocalMachine.InvalidateAll();
             BlobCache.LocalMachine.Vacuum();
             new LocalObjectStorageHelper().Save(Keys.PocketClientCache, "");
+            new LocalObjectStorageHelper().Save(Keys.PocketClientCache + "user", "");
         }
 
-        internal async Task<bool> LoginAsync()
+        public async Task<bool> LoginAsync()
         {
             User = await Client.GetUser();
             if (User == null) return false;
-            SaveCacheUser(User);
+            new LocalObjectStorageHelper().Save(Keys.PocketClientCache, User.Code);
+            new LocalObjectStorageHelper().Save(Keys.PocketClientCache + "user", User);
             return true;
         }
 
-        internal async Task<Uri> LoginUriAsync()
+        public async Task<Uri> LoginUriAsync()
         {
             Client = new PocketClient(Keys.Pocket, callbackUri: App.Protocol);
             await Client.GetRequestCode();
@@ -77,48 +73,6 @@ internal async Task<Uri> LoginUriAsync()
 
         #endregion Login\Logout
 
-        internal async Task<(string, string)> AddFromShare(Uri url)
-        {
-            var SUCCESS = "Successfully Saved to Pocket";
-            var FAILED = "FAILED (Be Sure You Are Logged In)";
-            if (Client != null)
-            {
-                await Client.Add(url);
-                return (SUCCESS, url.AbsoluteUri);
-            }
-            try
-            {
-                _pocketHandler.LoadCacheClient();
-                await _pocketHandler.Client.Add(url);
-                return (SUCCESS, url.AbsoluteUri);
-            }
-            catch (Exception e) { return (FAILED, e.Message); }
-        }
-
-        internal async Task<IEnumerable<PocketItem>> GetListAsync(
-            State state, bool? favorite, string tag, string search, int count, int offset)
-        {
-            try
-            {
-                if (!Microsoft.Toolkit.Uwp.Connectivity.NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable)
-                    throw new Exception();
-                var pocketItems = await Client.Get(
-                       state: state, favorite: favorite,
-                       tag: tag, contentType: null,
-                       sort: Sort.newest, search: search,
-                       domain: null, since: null,
-                       count: count, offset: offset);
-
-                if (offset == 0) await SetItemsCache(pocketItems);
-                return pocketItems;
-            }
-            catch
-            {
-                if (offset == 0) return await GetItemsCache();
-                else return null;
-            }
-        }
-
         #region Cache Items
 
         internal async Task<IEnumerable<PocketItem>> GetItemsCache()
@@ -165,7 +119,49 @@ internal async Task SetItemCache(int index, PocketItem item)
 
         #endregion Cache Items
 
-        internal async Task<string> Read(Uri url, bool force)
+        #region Tags
+        public async Task FetchOnlineTagsAsync()
+        {
+            var tags = (await Client.GetTags()).ToArray().Select(o => o.Name).ToArray();
+            if (!tags.Any()) return;
+            Tags.Clear();
+            foreach (var t in tags) Tags?.Add(t);
+            if (Tags?.Count > 0)
+            {
+                OnPropertyChanged(nameof(Tags));
+                await BlobCache.LocalMachine.InsertObject("tags", Tags);
+            }
+        }
+        public async Task FetchOfflineTagsAsync()
+        {
+            foreach (var t in await BlobCache.LocalMachine.GetObject<IEnumerable<string>>("tags")) Tags?.Add(t);
+            if (Tags?.Count > 0) OnPropertyChanged(nameof(Tags));
+        }
+        public async Task FetchTagsAsync()
+        {
+            if (Tags.Count > 0) return;
+            try
+            {
+                await FetchOfflineTagsAsync();
+            }
+            catch (Exception e)
+            {
+                E(e);
+            }
+            try
+            {
+                await FetchOnlineTagsAsync();
+            }
+            catch (Exception e)
+            {
+                E(e);
+            }
+        }
+        #endregion
+
+        public async Task<PocketStatistics> UserStatistics() => await Client.GetUserStatistics();
+
+        public async Task<string> Read(Uri url, bool force)
         {
             var cache = await BlobCache.LocalMachine.GetObject<string>(url?.AbsoluteUri)
                 .Catch(Observable.Return(""));
@@ -180,40 +176,59 @@ internal async Task<string> Read(Uri url, bool force)
             return content;
         }
 
-        internal async Task FetchTagsAsync()
+        public async Task<(string, string)> AddFromShare(Uri url)
+        {
+            const string success = "Successfully Saved to Pocket";
+            const string failed = "FAILED (Be Sure You Are Logged In)";
+            if (Client != null)
+            {
+                await Client.Add(url);
+                return (success, url.AbsoluteUri);
+            }
+            try
+            {
+                _pocketHandler.LoadCacheClient();
+                await _pocketHandler.Client.Add(url);
+                return (success, url.AbsoluteUri);
+            }
+            catch (Exception e) { return (failed, e.Message); }
+        }
+
+        public async Task<IEnumerable<PocketItem>> GetListAsync(
+            State state, bool? favorite, string tag, string search, int count, int offset)
         {
             try
             {
-                if (Tags?.Count > 0) return;
-                var offlineTags = await BlobCache.LocalMachine.GetObject<ObservableCollection<string>>("tags");
-                if (offlineTags != null)
-                    foreach (var t in offlineTags)
-                        Tags?.Add(t);
-                var tags = (await Client.GetTags()).ToList().Select(o => o.Name);
-                var enumerable = tags as string[] ?? tags.ToArray();
-                if (enumerable.Length < 1) return;
-                Tags.Clear();
-                foreach (var t in enumerable) Tags?.Add(t);
-                await BlobCache.LocalMachine.InsertObject("tags", Tags);
+                if (!Microsoft.Toolkit.Uwp.Connectivity.NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable)
+                    throw new Exception();
+                var pocketItems = await Client.Get(
+                    state: state, favorite: favorite,
+                    tag: tag, contentType: null,
+                    sort: Sort.newest, search: search,
+                    domain: null, since: null,
+                    count: count, offset: offset);
+
+                if (state == State.unread && tag == null && search == null && offset == 0)
+                    await SetItemsCache(pocketItems);
+                return pocketItems;
             }
-            catch { }
-            finally
+            catch
             {
-                OnPropertyChanged(nameof(Tags));
+                return state == State.unread && tag == null && search == null && offset == 0 ? await GetItemsCache() : null;
             }
         }
 
-        internal async Task Delete(PocketItem pocketItem)
+        public async Task Delete(PocketItem pocketItem)
         {
             try
             {
-                await Client.Delete(pocketItem);
                 await BlobCache.LocalMachine.Invalidate(pocketItem.Uri.AbsoluteUri);
                 await BlobCache.LocalMachine.Invalidate("plain_" + pocketItem.Uri.AbsoluteUri);
+                await Client.Delete(pocketItem);
             }
             catch (Exception e)
             {
-                Logger.Logger.E(e);
+                E(e);
             }
         }
 
diff --git a/Source/PocketX/Package.StoreAssociation.xml b/Source/PocketX/Package.StoreAssociation.xml
index c7d098b..e31eff7 100644
--- a/Source/PocketX/Package.StoreAssociation.xml
+++ b/Source/PocketX/Package.StoreAssociation.xml
@@ -366,27 +366,62 @@
     </ReservedNames>
   </ProductReservedInfo>
   <AccountPackageIdentityNames>
-    <MainPackageIdentityName>3783mindprojects.BitconLottery</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.BlackReader</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.ColorLibrary</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.githublibrary</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.GithubX</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.InfixPrefixPostfix</MainPackageIdentityName>
-    <MainPackageIdentityName>3783mindprojects.InstagramPro</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.iTehran</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.KharazmiUniversityBlogs</MainPackageIdentityName>
-    <MainPackageIdentityName>3783mindprojects.Lyricer</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.Schema</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.SegaStore</MainPackageIdentityName>
     <MainPackageIdentityName>3783MINDPROJECTS.SUBTITLER</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.TelegramStore</MainPackageIdentityName>
-    <MainPackageIdentityName>3783mindprojects.TodoX</MainPackageIdentityName>
-    <MainPackageIdentityName>3783mindprojects.wakaX</MainPackageIdentityName>
-    <MainPackageIdentityName>3783mindprojects.Windos</MainPackageIdentityName>
+    <MainPackageIdentityName>3783mindprojects.TwitterX</MainPackageIdentityName>
+    <MainPackageIdentityName>3783mindprojects.38069ACD6F7CF</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.YDM</MainPackageIdentityName>
+    <MainPackageIdentityName>3783mindprojects.YoutubeX</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.52602C4675F0A</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.53420548E01F3</MainPackageIdentityName>
     <MainPackageIdentityName>3783mindprojects.6550439DC5047</MainPackageIdentityName>
   </AccountPackageIdentityNames>
-  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9NDT5N34SR2P" />
+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9NDT5N34SR2P">
+    <BundleInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>X86</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>X64</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>Arm</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>0.0.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.4.6.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+    </BundleInfo>
+  </PackageInfoList>
 </StoreAssociation>
\ No newline at end of file
diff --git a/Source/PocketX/Package.appxmanifest b/Source/PocketX/Package.appxmanifest
index fac667d..ad942b2 100644
--- a/Source/PocketX/Package.appxmanifest
+++ b/Source/PocketX/Package.appxmanifest
@@ -2,9 +2,10 @@
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
 				 xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" 
 				 xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
-				 xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-				 IgnorableNamespaces="uap mp uap5">
-  <Identity Name="3783mindprojects.PocketX" Publisher="CN=5055881C-9F85-4877-AEA1-AF64140AD34D" Version="2.0.2.0" />
+				 xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" 
+         xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+				 IgnorableNamespaces="uap mp uap5 uap3">
+  <Identity Name="3783mindprojects.PocketX" Publisher="CN=5055881C-9F85-4877-AEA1-AF64140AD34D" Version="2.1.2.0" />
   <mp:PhoneIdentity PhoneProductId="8ecc3aa1-99f7-4d15-9a77-1dad532ac8bc" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>PocketX</DisplayName>
@@ -38,7 +39,7 @@
         </uap:Extension>
         <uap:Extension Category="windows.shareTarget" Executable="$targetnametoken$.exe" EntryPoint="PocketX.App">
           <uap:ShareTarget Description="Add URL to your Pocket">
-            <uap:DataFormat>WebLink</uap:DataFormat>
+            <uap:DataFormat>Uri</uap:DataFormat>
           </uap:ShareTarget>
         </uap:Extension>
 				<uap5:Extension
diff --git a/Source/PocketX/PocketX.csproj b/Source/PocketX/PocketX.csproj
index 885eb58..4a25c25 100644
--- a/Source/PocketX/PocketX.csproj
+++ b/Source/PocketX/PocketX.csproj
@@ -22,7 +22,7 @@
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>88B0404ADE7DA5D3EEE3654671D060758C49C839</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>8DE482F59938C692B4568B9CBFC7EAC5EC95C4A7</PackageCertificateThumbprint>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
   </PropertyGroup>
@@ -105,11 +105,10 @@
     <Compile Include="Controls\MarkdownControl.xaml.cs">
       <DependentUpon>MarkdownControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TagsListControl.xaml.cs">
-      <DependentUpon>TagsListControl.xaml</DependentUpon>
-    </Compile>
+    <Compile Include="Converter\ArrayToStringConverter.cs" />
     <Compile Include="Converter\BooleanToCustomStringConverter.cs" />
     <Compile Include="Converter\BooleanToVisibilityConverter.cs" />
+    <Compile Include="Converter\HideIfEmptyConverter.cs" />
     <Compile Include="Handlers\AudioHandler.cs" />
     <Compile Include="Handlers\NotificationHandler.cs" />
     <Compile Include="Handlers\Keys.cs" />
@@ -215,6 +214,7 @@
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+    <None Include="PocketX_StoreKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -225,10 +225,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\TagsListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Themes\ColorPalette.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Source/PocketX/ViewModels/MainContentViewModel.cs b/Source/PocketX/ViewModels/MainContentViewModel.cs
index 7fc75ca..6ddc26c 100644
--- a/Source/PocketX/ViewModels/MainContentViewModel.cs
+++ b/Source/PocketX/ViewModels/MainContentViewModel.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Windows.ApplicationModel.DataTransfer;
diff --git a/Source/PocketX/Views/Dialog/SettingsDialog.xaml b/Source/PocketX/Views/Dialog/SettingsDialog.xaml
index 8b3a7c8..87c71de 100644
--- a/Source/PocketX/Views/Dialog/SettingsDialog.xaml
+++ b/Source/PocketX/Views/Dialog/SettingsDialog.xaml
@@ -7,9 +7,14 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:converter="using:PocketX.Converter"
     mc:Ignorable="d" 
+    Loaded="ContentDialog_Loaded"
     Closed="ContentDialog_Closed"
     CornerRadius="4">
+    <ContentDialog.Resources>
+        <converter:HideIfEmptyConverter x:Key="HideIfEmpty" />
+    </ContentDialog.Resources>
     <Grid>
         <Pivot>
             <!--Pivot Header-->
@@ -18,28 +23,7 @@
                     <TextBlock Text="{Binding}" FontWeight="Light" FontSize="16"/>
                 </DataTemplate>
             </Pivot.HeaderTemplate>
-            <!--Settings-->
-            <!--<PivotItem Header="Account" RequestedTheme="Light">
-                <Grid>
-                    <controls:DropShadowPanel Margin="42" HorizontalAlignment="Center" VerticalAlignment="Center" ShadowOpacity=".2" OffsetY="3">
-                        <StackPanel Background="White" CornerRadius="8" Padding="16 8 6 8" Orientation="Horizontal"
-                                    HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <PersonPicture ProfilePicture="{x:Bind PocketHandler.User.Avatar.AbsoluteUri}" 
-                                           DisplayName="Jane Doe" Height="62"/>
-                            <controls:HeaderedContentControl Header="{x:Bind PocketHandler.User.Username}"
-                                                             Margin="12 0"
-                                                             VerticalAlignment="Center">
-                                <TextBlock FontSize="12" Text="Jane Doe"/>
-                            </controls:HeaderedContentControl>
-                            <AppBarButton Icon="ContactPresence"  Label="Log Out" 
-                                          Click="Logout_Click" 
-                                          Height="48" VerticalAlignment="Center"
-                                          Style="{ThemeResource AppBarButtonRevealStyle}"/>
-                        </StackPanel>
-                    </controls:DropShadowPanel>
-                </Grid>
-            </PivotItem>-->
-            <!--Reading Settings-->
+            <!--#region Reading Settings-->
             <PivotItem Header="Settings">
                 <StackPanel Spacing="8">
                     <TextBlock Text="Theme"/>
@@ -52,7 +36,7 @@
                                 <controls:ImageEx CornerRadius="6" 
                                                       Source="{x:Bind Thumbnail}"
                                                       Height="92"
-                                                      BorderThickness="2"
+                                                      BorderThickness="1"
                                                       BorderBrush="{ThemeResource AccentColor}"/>
                             </DataTemplate>
                         </GridView.ItemTemplate>
@@ -71,17 +55,79 @@
                         <x:String>24</x:String>
                         <x:String>30</x:String>
                     </ComboBox>
-                    <AppBarButton Icon="ContactPresence"  
-                                  Label="Log Out" 
-                                  Click="Logout_Click" 
-                                  Height="48"
-                                  Style="{ThemeResource AppBarButtonRevealStyle}"/>
                     <Button Content="Click to Clear Cache" 
                             Click="ClearCache_Click" 
                             Style="{ThemeResource TextBlockButtonStyle}"/>
                 </StackPanel>
             </PivotItem>
-            <!--About-->
+            <!--#endregion-->
+            <!--#region Account-->
+            <PivotItem Header="Account" RequestedTheme="Light" Visibility="{x:Bind User, Converter={StaticResource HideIfEmpty}}">
+                <Grid HorizontalAlignment="Center">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                    <controls:DropShadowPanel 
+                        Margin="12" 
+                        HorizontalAlignment="Center" 
+                        VerticalAlignment="Center" 
+                        ShadowOpacity=".2" 
+                        OffsetY="3" 
+                        Grid.Row="0" 
+                        Grid.ColumnSpan="2">
+                        <Grid Background="White" 
+                            CornerRadius="8" 
+                            Padding="16 8 6 8" 
+                            Width="360">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <PersonPicture ProfilePicture="{x:Bind User.Avatar.AbsoluteUri}" 
+                                           DisplayName="Jane Doe" 
+                                           Height="62"
+                                           Grid.Column="0"/>
+                            <controls:HeaderedContentControl
+                                Header="{x:Bind User.Username}"
+                                Grid.Column="1"
+                                Margin="12 0"
+                                VerticalAlignment="Center">
+                                <TextBlock FontSize="12" Text="{x:Bind User.Email}"/>
+                            </controls:HeaderedContentControl>
+                            <AppBarButton Icon="ContactPresence"  
+                            Label="Log Out" 
+                                          Click="Logout_Click" 
+                        Grid.Column="2"
+                                          Height="48" VerticalAlignment="Center"
+                                          Style="{ThemeResource AppBarButtonRevealStyle}"/>
+                        </Grid>
+                    </controls:DropShadowPanel>
+                    <controls:RadialProgressBar
+                        x:Name="RadialProgressBarControl"
+                        Grid.Column="0"
+                        Grid.Row="1"
+                        Thickness="16"
+                        Width="80"
+                        HorizontalAlignment="Right"
+                        Height="80"
+                        Outline="LightGray" />
+                    <controls:HeaderedTextBlock 
+                        x:Name="StatisticsCtrl"
+                        Grid.Column="1"
+                        Grid.Row="1"
+                        HorizontalAlignment="Left"
+                        Margin="8"
+                        VerticalAlignment="Center"/>
+                </Grid>
+            </PivotItem>
+            <!--#endregion-->
+            <!--#region About-->
             <PivotItem Header="About">
                 <StackPanel>
                     <Image Source="ms-appx:///Assets/Icons/Logo.png" Height="84" Margin="0 24 0 0"/>
@@ -116,6 +162,7 @@
                     </HyperlinkButton>
                 </StackPanel>
             </PivotItem>
+            <!--#endregion-->
         </Pivot>
         <!--Close Windows Control-->
         <Button Content="Close" Click="Close_Click" HorizontalAlignment="Right"
diff --git a/Source/PocketX/Views/Dialog/SettingsDialog.xaml.cs b/Source/PocketX/Views/Dialog/SettingsDialog.xaml.cs
index e446477..e90a501 100644
--- a/Source/PocketX/Views/Dialog/SettingsDialog.xaml.cs
+++ b/Source/PocketX/Views/Dialog/SettingsDialog.xaml.cs
@@ -6,11 +6,13 @@
 using System;
 using System.Collections.Generic;
 using Windows.ApplicationModel;
+using PocketSharp.Models;
 
 namespace PocketX.Views.Dialog
 {
     public sealed partial class SettingsDialog : ContentDialog
     {
+        public SettingsDialog() => InitializeComponent();
         private Settings Settings => SettingsHandler.Settings;
         private readonly string _versionString = $"Version {Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}";
         private List<string> FontsList => Utils.GetAllFonts();
@@ -19,8 +21,7 @@ public sealed partial class SettingsDialog : ContentDialog
             new Settings { AppTheme = ElementTheme.Dark,ReaderBg = "#454545",ReaderTheme = ElementTheme.Dark,Thumbnail = "/Assets/ReadTheme/theme4.png"},
             new Settings { AppTheme = ElementTheme.Dark,ReaderBg = "#111111",ReaderTheme = ElementTheme.Dark,Thumbnail = "/Assets/ReadTheme/theme5.png"},
         };
-
-        public SettingsDialog() => InitializeComponent();
+        private PocketUser User => PocketHandler.GetInstance().User;
         private void Close_Click(object sender, RoutedEventArgs e) => Hide();
         private async void Logout_Click(object sender, RoutedEventArgs e)
         {
@@ -50,5 +51,14 @@ private void ContentDialog_Closed(ContentDialog sender, ContentDialogClosedEvent
             Settings.ReaderFontSize = int.Parse(comboBox.SelectedValue?.ToString());
             SettingsHandler.Save();
         }
+        private async void ContentDialog_Loaded(object sender, RoutedEventArgs e)
+        {
+            var userStatistics = await PocketHandler.GetInstance().UserStatistics();
+            if (userStatistics == null) return;
+            RadialProgressBarControl.Maximum = userStatistics.CountAll;
+            RadialProgressBarControl.Value = userStatistics.CountRead;
+            StatisticsCtrl.Header = $"{userStatistics.CountAll} Articles";
+            StatisticsCtrl.Text = $"Unread {userStatistics.CountUnread} Articles";
+        }
     }
 }
diff --git a/Source/PocketX/Views/MainContent.xaml b/Source/PocketX/Views/MainContent.xaml
index 710627e..88bf30f 100644
--- a/Source/PocketX/Views/MainContent.xaml
+++ b/Source/PocketX/Views/MainContent.xaml
@@ -7,10 +7,13 @@
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:pocket="using:PocketSharp.Models"
     xmlns:ctrl="using:PocketX.Controls"
+    xmlns:converter="using:PocketX.Converter"
+    xmlns:local="using:PocketX.Views"
     RequestedTheme="{x:Bind _vm.Settings.AppTheme,Mode=OneWay}"
     Background="{ThemeResource SystemControlAcrylicWindowBrush}"
     mc:Ignorable="d">
     <Page.Resources>
+        <converter:HideIfEmptyConverter x:Key="HideIfEmpty" />
         <FontIconSource x:Key="Delete" Glyph="&#xE107;" />
         <FontIconSource x:Key="Add" Glyph="" />
         <FontIconSource x:Key="Archive" Glyph="&#xE15D;" />
@@ -35,7 +38,7 @@
         <DataTemplate x:DataType="pocket:PocketItem" x:Key="ArticleTemplate">
             <SwipeControl RightItems="{StaticResource SwipeItemsRight}" Margin="-10 2">
                 <StackPanel Orientation="Horizontal"
-                            Height="64"
+                            Height="70"
                             Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                             CornerRadius="2"
                             HorizontalAlignment="Stretch"
@@ -51,10 +54,22 @@
                                       BorderThickness="0 0 .5 0"/>
                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">
                         <TextBlock Text="{x:Bind Title}"
-                                   Width="200"
+                                   Width="220"
                                    MaxLines="1"
+                                   HorizontalAlignment="Left"
+                                   TextTrimming="WordEllipsis"
                                    Style="{ThemeResource BaseTextBlockStyle}" />
-                        <TextBlock Text="{x:Bind Uri.Host}" Style="{ThemeResource CaptionTextBlockStyle}" />
+                        <TextBlock Text="{x:Bind Uri.Host}" 
+                                   x:Phase="9"
+                                   Style="{ThemeResource CaptionTextBlockStyle}" />
+                        <TextBlock
+                            Text="{x:Bind local:MainContent.ConvertTagsToString(Tags)}"
+                            FontSize="11"
+                            x:Phase="11"
+                            Width="220"
+                            Visibility="{x:Bind Tags, Converter={StaticResource HideIfEmpty}}"
+                            TextTrimming="WordEllipsis"
+                            Foreground="{ThemeResource AccentColor}"/>
                     </StackPanel>
                 </StackPanel>
             </SwipeControl>
@@ -150,13 +165,6 @@
                             <ListView ItemsSource="{x:Bind _vm.PocketHandler.Tags, Mode=OneWay}" 
                                       IsItemClickEnabled="True" 
                                       ItemClick="TagItemClick"/>
-                                <!--<GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <uwpChipsX:Chip Content="{Binding}" 
-                                                        CloseButtonVisiblity="Collapsed"/>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>-->
                         </PivotItem>
                     </Pivot>
                     <!--AddLink Button-->
@@ -165,7 +173,6 @@
                                           BlurRadius="35"
                                           HorizontalAlignment="Center"
                                           VerticalAlignment="Bottom">
-                        <!-- ReSharper disable once Xaml.InvalidResourceType -->
                         <Button  CornerRadius="16"
                              Content="ADD LINK"
                              Foreground="White"
diff --git a/Source/PocketX/Views/MainContent.xaml.cs b/Source/PocketX/Views/MainContent.xaml.cs
index 2aa36c5..5712b1e 100644
--- a/Source/PocketX/Views/MainContent.xaml.cs
+++ b/Source/PocketX/Views/MainContent.xaml.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using PocketSharp.Models;
 
 using PocketX.Handlers;
@@ -73,5 +75,7 @@ private async void TopAppBarClick(object sender, RoutedEventArgs e)
             }
             Bindings.Update();
         }
+        public static string ConvertTagsToString(IEnumerable<PocketTag> tags)
+            => tags == null ? "" : "#" + string.Join(" #", tags.Select(_ => _.Name).ToArray());
     }
 }
\ No newline at end of file