Add More Server

ghost1372 · Mar 20, 2020 · 93dffd3 · 93dffd3
1 parent 4bbc7ea
commit 93dffd3
Show file tree

Hide file tree

Showing 9 changed files with 257 additions and 30 deletions.
diff --git a/UrlShortener/App.xaml.cs b/UrlShortener/App.xaml.cs
@@ -1,5 +1,6 @@
 using HandyControl.Data;
 using Prism.Ioc;
+using Prism.Regions;
 using System;
 using System.Windows;
 using UrlShortener.Views;
@@ -42,6 +43,7 @@ public override void Initialize()
             {
                 UpdateSkin(GlobalData.Config.Skin);
             }
+            Container.Resolve<IRegionManager>().RequestNavigate("ContentRegion", "MainShortener");
         }
     }
 }
diff --git a/UrlShortener/Data/AppConfig.cs b/UrlShortener/Data/AppConfig.cs
@@ -7,9 +7,9 @@ internal class AppConfig
     {
         public static readonly string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json";
 
-
         public bool IsShowNotifyIcon { get; set; } = false;
         public bool IsFirstRun { get; set; } = true;
+        public int SelectedIndex { get; set; } = 0;
 
         public SkinType Skin { get; set; } = SkinType.Default;
     }

diff --git a/UrlShortener/Data/Extensions.cs b/UrlShortener/Data/Extensions.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Text;
+
+namespace UrlShortener.Data
+{
+    public static class Extensions
+    {
+        public static StringContent AsJson(this object o)
+        {
+            return new StringContent(JsonConvert.SerializeObject(o), Encoding.UTF8, "application/json");
+        }
+    }
+}
diff --git a/UrlShortener/Model/ComboModel.cs b/UrlShortener/Model/ComboModel.cs
@@ -0,0 +1,8 @@
+namespace UrlShortener.Model
+{
+    public class ComboModel
+    {
+        public string Name { get; set; }
+        public bool IsCustomTextAvailable { get; set; }
+    }
+}
diff --git a/UrlShortener/Model/ShorterListModel.cs b/UrlShortener/Model/ShorterListModel.cs
@@ -0,0 +1,8 @@
+namespace UrlShortener.Model
+{
+    public class ShorterListModel
+    {
+        public string Link { get; set; }
+        public string ShortLink { get; set; }
+    }
+}
diff --git a/UrlShortener/UrlShortener.csproj b/UrlShortener/UrlShortener.csproj
@@ -8,8 +8,8 @@
     <Version>1.0.0.0</Version>
     <Configurations>Debug;Release</Configurations>
     <Copyright>Copyright © Mahdi 2018-2020</Copyright>
-    <FileVersion>4.0.0.0</FileVersion>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <FileVersion>4.1.0.0</FileVersion>
+    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <LangVersion>latest</LangVersion>
     <ApplicationIcon>Resources\Img\icon.ico</ApplicationIcon>
     <Authors>Coded by Mahdi Hosseini</Authors>
@@ -26,7 +26,7 @@
     <None Remove="Resources\Img\cloud.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HandyControls" Version="2.4.9" />
+    <PackageReference Include="HandyControls" Version="2.4.9.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Prism.DryIoc" Version="7.2.0.1422" />
   </ItemGroup>
@@ -42,7 +42,4 @@
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Model\" />
-  </ItemGroup>
 </Project>
diff --git a/UrlShortener/ViewModels/LeftMainContentViewModel.cs b/UrlShortener/ViewModels/LeftMainContentViewModel.cs
@@ -1,7 +1,9 @@
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
+using System.Linq;
 using System.Windows.Controls;
+using UrlShortener.Views;
 
 namespace UrlShortener.ViewModels
 {
@@ -23,7 +25,24 @@ public LeftMainContentViewModel(IRegionManager regionManager)
 
         private void UrlShortener()
         {
-            _regionManager.RequestNavigate("ContentRegion", "MainShortener");
+            object activeView = _regionManager.Regions["ContentRegion"].ActiveViews.FirstOrDefault();
+            if (activeView != null)
+            {
+                bool IsViewMainShortener = activeView.GetType() == typeof(MainShortener);
+
+                if (IsViewMainShortener)
+                {
+                    _regionManager.Regions["ContentRegion"].RemoveAll();
+                }
+                else
+                {
+                    _regionManager.RequestNavigate("ContentRegion", "MainShortener");
+                }
+            }
+            else
+            {
+                _regionManager.RequestNavigate("ContentRegion", "MainShortener");
+            }
         }
 
         private void Switch(SelectionChangedEventArgs e)