From 92e6a8f68c1a3f8eee7b76ad56b1c121a3ba6911 Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Feb 2021 02:39:58 +0000
Subject: [PATCH 1/7] Add a Blurb call that creates a growler in the center of
 the app.

---
 DesktopEdge/Assets/Images/Error.png | Bin 0 -> 2101 bytes
 DesktopEdge/MainWindow.xaml         |  30 +++++++++++--
 DesktopEdge/MainWindow.xaml.cs      |  63 +++++++++++++++++++++++-----
 DesktopEdge/ZitiDesktopEdge.csproj  |   3 ++
 4 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100644 DesktopEdge/Assets/Images/Error.png

diff --git a/DesktopEdge/Assets/Images/Error.png b/DesktopEdge/Assets/Images/Error.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e595da085fe36332b4498482f3993d4c43b015
GIT binary patch
literal 2101
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

literal 0
HcmV?d00001

diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index 5bc519b0..fa16e22e 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -148,7 +148,7 @@
                     <Label Content="IDENTITY" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="White" Height="25" Margin="0,-14,0,0" FontSize="10" HorizontalAlignment="Right"></Label>
                 </StackPanel>
             </Grid>
-            <Canvas Name="ConnectButton" Width="400" Height="160" MouseUp="ConnectButtonClick" Visibility="Visible">
+            <Canvas Name="ConnectButton" Width="400" Height="160" MouseUp="StartZitiService" Visibility="Collapsed">
                 <Grid Width="{Binding ActualWidth, ElementName=ConnectButton}" Height="140">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="221*"/>
@@ -195,7 +195,7 @@
                         <Image Grid.Column="1" Source="/Assets/Images/up.png" Width="20" HorizontalAlignment="Left" Height="20"></Image>
                     </Grid>
                     <Label Name="UploadSpeed" Margin="0,-16,0,0" Foreground="#FF0047" Content="0" FontSize="40" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
-                    <Label Name="UploadSpeedLabel" Foreground="White" Margin="0,-20,0,30" Content="KBps" FontSize="11" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
+                    <Label Name="UploadSpeedLabel" MouseUp="UploadSpeedLabel_MouseUp" Foreground="White" Margin="0,-20,0,30" Content="KBps" FontSize="11" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
                 </StackPanel>
             </Grid>
             <!--
@@ -235,10 +235,32 @@
         </StackPanel>
         
         
-        
         <local:MainMenu x:Name="MainMenu" Visibility="Collapsed"></local:MainMenu>
         <local:IdentityDetails x:Name="IdentityMenu" Visibility="Collapsed"></local:IdentityDetails>
-        
+
+        <Grid x:Name="BlurbArea" Visibility="Collapsed" Height="80" Margin="30,100,30,0">
+            <Rectangle Margin="10,10,10,10" RadiusX="10" RadiusY="10" ClipToBounds="True">
+                <Rectangle.Fill>
+                    <SolidColorBrush Color="#FF0047" Opacity="0.9"/>
+                </Rectangle.Fill>
+            </Rectangle>
+            <Grid Margin="30,0,30,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="30"></ColumnDefinition>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                    <ColumnDefinition Width="30"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"></RowDefinition>
+                    <RowDefinition Height="60"></RowDefinition>
+                    <RowDefinition Height="*"></RowDefinition>
+                </Grid.RowDefinitions>
+                <Image Source="/Assets/Images/Error.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
+                <Label x:Name="Blurb" Content="An Update is available!" MouseUp="BlurbAction" Grid.Column="1" Padding="0,0,0,0" Grid.Row="1" Margin="0,0,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#FFFFFF" FontSize="12" Cursor="Hand" HorizontalAlignment="Center" VerticalAlignment="Center"></Label>
+                <Image Source="/Assets/Images/close.png" Grid.Column="2" Width="10" Height="10" Grid.Row="1" Margin="0,0,0,0" Cursor="Hand" MouseUp="DoHideBlurb"></Image>
+            </Grid> 
+        </Grid>
+
         <Grid x:Name="NoServiceView" Visibility="Collapsed" Margin="10,10,10,10">
             <Rectangle RadiusX="10" RadiusY="10">
                 <Rectangle.Fill>
diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index 54d78eb4..4e66ecbf 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -10,6 +10,7 @@ using System.Windows.Controls;
 using System.Drawing;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Media.Animation;
 
 using ZitiDesktopEdge.Models;
 using ZitiDesktopEdge.DataStructures;
@@ -445,6 +446,9 @@ namespace ZitiDesktopEdge {
 
 		bool startZitiButtonVisible = false;
 		private void ShowServiceNotStarted() {
+			TunnelConnected(false);
+			LoadIdentities(true);
+			/*
 			this.Dispatcher.Invoke(() => {
 				semaphoreSlim.Wait(); //make sure the event is only added to the button once
 				CloseErrorButton.Click -= CloseError;
@@ -456,6 +460,7 @@ namespace ZitiDesktopEdge {
 				semaphoreSlim.Release();
 				SetCantDisplay("Service Not Started", "Do you want to start the data service now?", Visibility.Visible);
 			});
+			*/
 		}
 
 		private void MonitorClient_OnClientConnected(object sender, object e) {
@@ -695,7 +700,7 @@ namespace ZitiDesktopEdge {
 			this.Height = height;
 			IdentityMenu.SetHeight(this.Height - 160);
 
-			if (ids.Length>0) {
+			if (ids.Length>0&&serviceClient.Connected) {
 				MainMenu.IdentitiesButton.Visibility = Visibility.Visible;
 				foreach (var id in ids) {
 					IdentityItem idItem = new IdentityItem();
@@ -712,9 +717,13 @@ namespace ZitiDesktopEdge {
 				}
 				IdList.Height = (double)(ids.Length * 64);
 				IdListScroller.Visibility = Visibility.Visible;
+				AddIdButton.Visibility = Visibility.Visible;
+				AddIdAreaButton.Visibility = Visibility.Visible;
 			} else {
 				MainMenu.IdentitiesButton.Visibility = Visibility.Collapsed;
 				IdListScroller.Visibility = Visibility.Collapsed;
+				AddIdButton.Visibility = Visibility.Collapsed;
+				AddIdAreaButton.Visibility = Visibility.Collapsed;
 			}
 
 			Placement();
@@ -858,16 +867,6 @@ namespace ZitiDesktopEdge {
 			_tunnelUptimeTimer.Enabled = true;
 			_tunnelUptimeTimer.Start();
 		}
-		private void ConnectButtonClick(object sender, RoutedEventArgs e) {
-			if (!_isServiceInError) {
-				ShowLoad("Starting Service", "Please wait while the service is started...");
-				this.Dispatcher.Invoke(async () => {
-					//Dispatcher.Invoke(new Action(() => { }), System.Windows.Threading.DispatcherPriority.ContextIdle);
-					await DoConnectAsync();
-					HideLoad();
-				});
-			}
-		}
 
 		async private Task DoConnectAsync() {
 			try {
@@ -994,6 +993,48 @@ namespace ZitiDesktopEdge {
             }
 		}
 
+		private string _blurbUrl = "";
+
+		public void ShowBlurb(string message, string url) {
+			Blurb.Content = message;
+			_blurbUrl = url;
+			BlurbArea.Visibility = Visibility.Visible;
+			BlurbArea.Opacity = 0;
+			DoubleAnimation animation = new DoubleAnimation(1, TimeSpan.FromSeconds(.3));
+			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(30, 0, 30, 0), TimeSpan.FromSeconds(.3));
+			BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
+			BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
+		}
+
+		private void DoHideBlurb(object sender, MouseButtonEventArgs e) {
+			HideBlurb();
+		}
+
+		private void HideBlurb() {
+			DoubleAnimation animation = new DoubleAnimation(0, TimeSpan.FromSeconds(.3));
+			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(30, 100, 30, 0), TimeSpan.FromSeconds(.3));
+			animation.Completed += HideComplete;
+			BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
+			BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
+		}
+
+		private void HideComplete(object sender, EventArgs e) {
+			BlurbArea.Visibility = Visibility.Collapsed;
+		}
+
+		private void BlurbAction(object sender, MouseButtonEventArgs e) {
+			if (_blurbUrl.Length>0) {
+				// So this simply execute a url but you could do like if (_blurbUrl=="DoSomethingNifty") CallNifyFunction();
+				Process.Start(new ProcessStartInfo(_blurbUrl) { UseShellExecute = true });
+			} else {
+				HideBlurb();
+			}
+		}
+
+		private void UploadSpeedLabel_MouseUp(object sender, MouseButtonEventArgs e) {
+			ShowBlurb("An Update is available!", "https://www.axeda.com?buddy=true");
+		}
+
 		/*
 
 		private void MainUI_DpiChanged(object sender, DpiChangedEventArgs e) {
diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj
index c957d407..3d5edaea 100644
--- a/DesktopEdge/ZitiDesktopEdge.csproj
+++ b/DesktopEdge/ZitiDesktopEdge.csproj
@@ -398,5 +398,8 @@
   <ItemGroup>
     <Resource Include="Assets\Images\identities.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\Error.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From de683c4281654b1165866a4e0a9ae06b8ae5dc2c Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Feb 2021 02:44:49 +0000
Subject: [PATCH 2/7] Add a shadow for depth

---
 DesktopEdge/MainWindow.xaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index fa16e22e..0a7e2fd8 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -239,6 +239,11 @@
         <local:IdentityDetails x:Name="IdentityMenu" Visibility="Collapsed"></local:IdentityDetails>
 
         <Grid x:Name="BlurbArea" Visibility="Collapsed" Height="80" Margin="30,100,30,0">
+            <Border Margin="10,10,10,10" BorderBrush="Black" BorderThickness="8" CornerRadius="10">
+                <Border.Effect>
+                    <DropShadowEffect BlurRadius="20" Direction="1" RenderingBias="Quality" ShadowDepth="1" Opacity="1"/>
+                </Border.Effect>
+            </Border>
             <Rectangle Margin="10,10,10,10" RadiusX="10" RadiusY="10" ClipToBounds="True">
                 <Rectangle.Fill>
                     <SolidColorBrush Color="#FF0047" Opacity="0.9"/>

From c400df2509c9d7505c6292603cfa0dec354ec30f Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Feb 2021 12:49:00 +0000
Subject: [PATCH 3/7] Animate the size so it doesnt look so clunky on start

---
 DesktopEdge/MainWindow.xaml.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index 4e66ecbf..c6a8115d 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -715,7 +715,9 @@ namespace ZitiDesktopEdge {
 					idItem.Identity = id;
 					IdList.Children.Add(idItem);
 				}
-				IdList.Height = (double)(ids.Length * 64);
+				//IdList.Height = ;
+				DoubleAnimation animation = new DoubleAnimation((double)(ids.Length * 64), TimeSpan.FromSeconds(.3));
+				IdList.BeginAnimation(FrameworkElement.HeightProperty, animation);
 				IdListScroller.Visibility = Visibility.Visible;
 				AddIdButton.Visibility = Visibility.Visible;
 				AddIdAreaButton.Visibility = Visibility.Visible;

From 263df03089d996dd3432af2d52237d48aa5c3813 Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Feb 2021 18:51:07 +0000
Subject: [PATCH 4/7] Animated and fixed up the Blurb menu

---
 DesktopEdge/Assets/Images/ErrorBlack.png | Bin 0 -> 2105 bytes
 DesktopEdge/Assets/Images/closeBlack.png | Bin 0 -> 572 bytes
 DesktopEdge/MainWindow.xaml              |  10 +++++-----
 DesktopEdge/MainWindow.xaml.cs           |  19 ++++++++++---------
 DesktopEdge/ZitiDesktopEdge.csproj       |   6 ++++++
 5 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 DesktopEdge/Assets/Images/ErrorBlack.png
 create mode 100644 DesktopEdge/Assets/Images/closeBlack.png

diff --git a/DesktopEdge/Assets/Images/ErrorBlack.png b/DesktopEdge/Assets/Images/ErrorBlack.png
new file mode 100644
index 0000000000000000000000000000000000000000..f861be9adc494510e0fb0a196f3736d29f6c6832
GIT binary patch
literal 2105
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

literal 0
HcmV?d00001

diff --git a/DesktopEdge/Assets/Images/closeBlack.png b/DesktopEdge/Assets/Images/closeBlack.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39fd1a1b52a051a6de2504b2ab6050fb689bb86
GIT binary patch
literal 572
zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00065Nkl<Zc%0qb
z!EM4Y6b9fYbpb}`u}2m_>IfZyQ925vFajg608)-URHCxwA4P_O<2>8%f4}5Y93+3S
z67X|)llyE%<U>Rz5&3y=oIUSpjFQH9mwh^Lowb9AY@7gu!5_2n9cL&p`>eyfog83n
zA6#U#Db12N$p1Q_F=ISKKnpWpK3{ZV#wbC+tSE+H!ze{Sizk$JX2DpBaKefC-IN()
zDZ({9EMhikaO@a02#5Sb*fCTP5LOIT1cVKv2?D}`(G&r(j?o1Hv5L_Z0kMWL1Oc&v
zF%$tAjbQ=-8HHgA0qKol5&`LjVHyExjX{Bcw8Ef5K(sL^5fCj5Y6N60h6@Cw7GviL
z0ja_G^@f1dV7Nm-T42y2AetDo2#5v-Jp!@@!wmwmt9UwG9PQ7Dsrj;m=3#$E%o+qY
z7#axl7@7#Q7%dR!FlrDk-Y{x^N_*L#5wmtZ!3Boaq6#&J_R10^MyusDDvZ`^j1(BX
z7FtbX^j>W?i7{%)-4w>?x`PP}E5(<g7}hFKLolqC;ksg2uSIsjU@6Ep#bB#SH^E>n
z&8uRt?@v&{@Ulr`HOA7DEtlbHFutYYEkA}@<Wh{YEPU^isUW))qZop*DqV_k``3W8
zLj<G*<2Jr8rwGV1j46MFhI_^Qjo>g#;@#9q!eGNi%`fssMC1>=(a6ceB`1&o0000<
KMNUMnLSTY7W$rcr

literal 0
HcmV?d00001

diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index 0a7e2fd8..d6255358 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -238,7 +238,7 @@
         <local:MainMenu x:Name="MainMenu" Visibility="Collapsed"></local:MainMenu>
         <local:IdentityDetails x:Name="IdentityMenu" Visibility="Collapsed"></local:IdentityDetails>
 
-        <Grid x:Name="BlurbArea" Visibility="Collapsed" Height="80" Margin="30,100,30,0">
+        <Grid x:Name="BlurbArea" Visibility="Collapsed" Height="80" Margin="0,500,0,0" VerticalAlignment="Bottom">
             <Border Margin="10,10,10,10" BorderBrush="Black" BorderThickness="8" CornerRadius="10">
                 <Border.Effect>
                     <DropShadowEffect BlurRadius="20" Direction="1" RenderingBias="Quality" ShadowDepth="1" Opacity="1"/>
@@ -246,7 +246,7 @@
             </Border>
             <Rectangle Margin="10,10,10,10" RadiusX="10" RadiusY="10" ClipToBounds="True">
                 <Rectangle.Fill>
-                    <SolidColorBrush Color="#FF0047" Opacity="0.9"/>
+                    <SolidColorBrush Color="#fc9814" Opacity="0.97"/>
                 </Rectangle.Fill>
             </Rectangle>
             <Grid Margin="30,0,30,0">
@@ -260,9 +260,9 @@
                     <RowDefinition Height="60"></RowDefinition>
                     <RowDefinition Height="*"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Image Source="/Assets/Images/Error.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
-                <Label x:Name="Blurb" Content="An Update is available!" MouseUp="BlurbAction" Grid.Column="1" Padding="0,0,0,0" Grid.Row="1" Margin="0,0,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#FFFFFF" FontSize="12" Cursor="Hand" HorizontalAlignment="Center" VerticalAlignment="Center"></Label>
-                <Image Source="/Assets/Images/close.png" Grid.Column="2" Width="10" Height="10" Grid.Row="1" Margin="0,0,0,0" Cursor="Hand" MouseUp="DoHideBlurb"></Image>
+                <Image Source="/Assets/Images/ErrorBlack.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
+                <Label x:Name="Blurb" Content="An Update is available!" MouseUp="BlurbAction" Grid.Column="1" Padding="0,0,0,0" Grid.Row="1" Margin="0,0,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#000000" FontSize="12" Cursor="Hand" HorizontalAlignment="Center" VerticalAlignment="Center"></Label>
+                <Image Source="/Assets/Images/closeBlack.png" Grid.Column="2" Width="10" Height="10" Grid.Row="1" Margin="0,0,0,0" Cursor="Hand" MouseUp="DoHideBlurb"></Image>
             </Grid> 
         </Grid>
 
diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index c6a8115d..335b51cd 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -313,7 +313,7 @@ namespace ZitiDesktopEdge {
 
 		string nextVersionStr  = null;
         private void MonitorClient_OnReconnectFailure(object sender, object e) {
-            if(nextVersionStr == null) {
+            if (nextVersionStr == null) {
 				// check for the current version
 				nextVersionStr = "checking for update";
 				Version nextVersion = VersionUtil.NormalizeVersion(GithubAPI.GetVersion(GithubAPI.GetJson(GithubAPI.ProdUrl)));
@@ -332,7 +332,6 @@ namespace ZitiDesktopEdge {
 					logger.Info("Current version installed: {0} is the same as the latest released version {1}", currentVersion, nextVersion);
 					MainMenu.SetAppUpgradeAvailableText("");
 				}
-
 			}
         }
 
@@ -694,13 +693,12 @@ namespace ZitiDesktopEdge {
 			IdList.MaxHeight = _maxHeight - 520;
 			ZitiIdentity[] ids = identities.OrderBy(i => i.Name.ToLower()).ToArray();
 			MainMenu.SetupIdList(ids);
-			double height = 490 + (ids.Length * 60);
-			if (height > _maxHeight) height = _maxHeight;
-
-			this.Height = height;
-			IdentityMenu.SetHeight(this.Height - 160);
 
 			if (ids.Length>0&&serviceClient.Connected) {
+				double height = 490 + (ids.Length * 60);
+				if (height > _maxHeight) height = _maxHeight;
+				this.Height = height;
+				IdentityMenu.SetHeight(this.Height - 160);
 				MainMenu.IdentitiesButton.Visibility = Visibility.Visible;
 				foreach (var id in ids) {
 					IdentityItem idItem = new IdentityItem();
@@ -722,10 +720,12 @@ namespace ZitiDesktopEdge {
 				AddIdButton.Visibility = Visibility.Visible;
 				AddIdAreaButton.Visibility = Visibility.Visible;
 			} else {
+				this.Height = 490;
 				MainMenu.IdentitiesButton.Visibility = Visibility.Collapsed;
 				IdListScroller.Visibility = Visibility.Collapsed;
 				AddIdButton.Visibility = Visibility.Collapsed;
 				AddIdAreaButton.Visibility = Visibility.Collapsed;
+				Debug.WriteLine("Height: " + this.Height + " " + this.ActualHeight);
 			}
 
 			Placement();
@@ -1002,8 +1002,9 @@ namespace ZitiDesktopEdge {
 			_blurbUrl = url;
 			BlurbArea.Visibility = Visibility.Visible;
 			BlurbArea.Opacity = 0;
+			BlurbArea.Margin = new Thickness(0, 0, 0, 0);
 			DoubleAnimation animation = new DoubleAnimation(1, TimeSpan.FromSeconds(.3));
-			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(30, 0, 30, 0), TimeSpan.FromSeconds(.3));
+			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(15, 0, 15, 15), TimeSpan.FromSeconds(.3));
 			BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
 			BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
 		}
@@ -1014,7 +1015,7 @@ namespace ZitiDesktopEdge {
 
 		private void HideBlurb() {
 			DoubleAnimation animation = new DoubleAnimation(0, TimeSpan.FromSeconds(.3));
-			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(30, 100, 30, 0), TimeSpan.FromSeconds(.3));
+			ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(0, 0, 0, 0), TimeSpan.FromSeconds(.3));
 			animation.Completed += HideComplete;
 			BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
 			BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj
index 3d5edaea..86949bce 100644
--- a/DesktopEdge/ZitiDesktopEdge.csproj
+++ b/DesktopEdge/ZitiDesktopEdge.csproj
@@ -401,5 +401,11 @@
   <ItemGroup>
     <Resource Include="Assets\Images\Error.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\ErrorBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\closeBlack.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From ad703082726b2c26cf07aea4344cf6d71e4966ad Mon Sep 17 00:00:00 2001
From: Jeremy Tellier - ROG <JeremyTellier@gmail.com>
Date: Thu, 11 Feb 2021 19:01:51 +0000
Subject: [PATCH 5/7] Fingers color scheme

---
 DesktopEdge/Assets/Images/WarningRed.png | Bin 0 -> 2062 bytes
 DesktopEdge/MainWindow.xaml              |   4 ++--
 DesktopEdge/ZitiDesktopEdge.csproj       |   3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 DesktopEdge/Assets/Images/WarningRed.png

diff --git a/DesktopEdge/Assets/Images/WarningRed.png b/DesktopEdge/Assets/Images/WarningRed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d92581fc35b0511d5b54f0bcc828fef2dba0583d
GIT binary patch
literal 2062
zcmV+p2=VucP)<h;3K|Lk000e1NJLTq004vl004yu1^@s6nix<5000NoNkl<Zc%1E>
zy-plg6vt1HYrHRjgv*GAbV-$^aa>YZwBW?OvHSpb9w6`ljstE<B$AG#F>Z`gWgC>z
zworPsFJSAEbEU~<cjuft_v4&%?@z*j`PkW=Kfk#%bLT&weS~kIB1QnP2>@dNxQ!n>
z-UGk~0GI&4IRISO^rCdRC1+8R;#T}q0N5rzhzrF_0613qe1ln0y4)O|0l;63FaR3l
z2ms#U$JJmt5N`8uie?C99ROYdz+u^^k`K#)IAmI38T)9NQJO`SgVjK|6}T7qcW$CB
zOozf^Al3(NCYG^@n<2AU48&>Tzv8jwF@?229CnT^q-5Xf-iM_FQ|q{!m<xBTVyo;^
zj*lfnq#8FYVr<b8Rt&+h!{vhTYyiMR09a!@t~pCs3B(a`H`9gTJ^)M?e0>!F{>1lG
zwlEkbu&~KkCx+pwCkzhvwKvSi&%LQiiiJQ>SI9w67(72RAAg)_&n64n1HrMw3GsJc
z;2VcW;ZH#p+5<tg1NX1~2j=(hVK~*JIS^DkOc{3YgjmAFSVD6kICh|n9cJN%$b==d
z24X}!we5oNJn%72aO}ZBy(P2;VxM>dE7T621LpUuw}i$(jEJN9A$IUoX9<mg$Ylpl
zRhG~eh@5utRAmWmfyiwKPc@d%6o?Xb@Pt?*_MFZvXbMCrJ9xO3c%*Scu9iSh?EnD>
zl&EkmF~Sh5LQ5d1b_h{B2kto$b(YW)2&x^pTIX`Y+#IR1goZ%u39$oU7))D2Lm)U4
zU~=%>vL&Pkg1SGS!ww$PmXIC@X?F0KwS?qANVJ2;tR*A|LaH4+A(jw-^ipadB-_Cg
zY6;Ou4MeKRv$5e?f;tbh7!m_PwZjEoiB*yiONc%-E-?_)7mPbqJ{8<^C!#GOEf8ad
z9k|ovQ^C0i$RpMg(gLB)4j%5Fj#x`b3Iw%pA%-2?)!jP)@C4s;uJ)dX8B0j219(LY
z#QlMRxQEq4-4IN11r3=?;d&+BGJocQw6<I+hR9_H7ls#ejIfF!*%|P=O;|!oAaacz
z`r6|TnGG_ts2@v62t-ahP{s;FwxJ=G*d6eA(UA~{Tz1$Xe&6kZkHfWusPeMXfuOz^
zSAvc^^r3nzQ92OP&uE6C))FNHvB|JQs;Tv<2r-%nOOy<Rl$q42;Es7jSfW%QQj~>B
zLuD;dsX$mAJItca5+wprgB?8TEKwp5wb;R<$`ZK)QIj1!s)|r^2ckARc(|6>E>$>^
zGY~b}!J}p@kuwm~C-`&X<tT-Uy5wAe;M5Sut^<<7g@*F7T!Ektl2X+HNkM#hS&l$Z
zFJZH62aouQ!yJJqT^1${(UwRZh>}%;QW0&5)PZPrn2%UXqzpu}!(zl*B4r?&9hMVf
ziR6VNsRGgL&`*dZlGhTY3Ix>-XO-H)Bd#tvMIbme#MVw?aS>OSoFWjCibgfSJ$IAT
z5-9@F?7%}*#bN9~XebMlhNz0e*ny~Z0?bgvSR!U1njOLsV~Lo7Xm%Ke2us8YM6<(i
zL=>UM3PiI*9E#T^#|T8TLp+KXp~eUVb%CtSq)tWAy5ymO;M5RnDf}qS6wmQ+h-QhQ
zfuIg*q!o=yr&xK}kU)&F^rMev2R_AWiG~D1YYnj$idZ5v5IJjzYo&-KLIct4kcaG+
z2nmE%JG>FF3|z8XA|w!6?GSQpr36AOu^qbH+(2j_JABvk^-F=1enTt~e2#+~2rV~9
zTZCKTcjuU5ihqfBg--g-R)osAU&a{kY0-y!vA+yin9O{I&G%Or6zQ|SxwmgP2Y@Z^
zgK!LC?TqFHs`x_5r2yQ`Mvx__fmk<OL#%}?wM5iFwD}G)NM3PB2}I3hVbVx$2}&TW
z*<lCoyY&yg{f(cyL8b<hTB2_+!`a~-;rD3Rvv9Xp`l)BdyT86~6$~<eVFsAI$I)j9
zD|T2VzKHJYe+;}4TMj}jL7A$sG!T}?4o?{O+*-p;h-8x0B`*tv6+5^U{E+!G8w2m*
znS&%nsEY!@DH`R@|H}<G3?Au$NV3PVC=i@;7Sab`)J?@K8umK4=ZtzSF)t9UXjBhp
zvCGTm1%i6Lp!KpaEzd1##o=rqES7~`2L7Cu8CFp%4rc>lu}Uy>Zidu39rK80iEbdQ
zRta7OtlTqYv&ExXq8kXyMWas{2hZFl=5gZXNkJ4#_(0T9H2N5Wu`JAzr_uEhVu}B)
zbANK{8S&V|fq`o+R`H<Iz0Uu+O~mg8>I!ynsvVVU0JwwiZ*YMa;TcWJ=Hm0pn`brf
zmU(jSdlbSAD~z$jNehDt2Gu3IKzvR7!8Sck2i*SfQFj6jbxvig1JXlCEzz$3fEtKq
z2VHP$iQJ`sM?efjvx7cDEa8qzY*PZ!?4T2_B^<kbfzW!zbmQMJa8K-wa^Cy9A)nWM
zfmm%Tu`15{0<ke*3R*)K?(p^bEy5zdz=35OOX!1R_+Q;Wlt8R8Pna}x@*CiBh)G+4
z)pP9);R5lY_E)2EbM5C1E8R~T)$+O<h)D}Y_58;WfYZyaYkyTLV}k4bPInyX_cA8f
zA8<;%|3yPD#{lqh(N>{*U}}PC`J(N4nB*AO?}KGSgn36QCw`x_VS;WD-uFGBWtBqP
s*g8U;V%Ly^8xOiY2NwqV*bo3d0VFN$Nl&0+umAu607*qoM6N<$f_&Gl761SM

literal 0
HcmV?d00001

diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index d6255358..31ac361c 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -246,7 +246,7 @@
             </Border>
             <Rectangle Margin="10,10,10,10" RadiusX="10" RadiusY="10" ClipToBounds="True">
                 <Rectangle.Fill>
-                    <SolidColorBrush Color="#fc9814" Opacity="0.97"/>
+                    <SolidColorBrush Color="#FFFFFF" Opacity="0.97"/>
                 </Rectangle.Fill>
             </Rectangle>
             <Grid Margin="30,0,30,0">
@@ -260,7 +260,7 @@
                     <RowDefinition Height="60"></RowDefinition>
                     <RowDefinition Height="*"></RowDefinition>
                 </Grid.RowDefinitions>
-                <Image Source="/Assets/Images/ErrorBlack.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
+                <Image Source="/Assets/Images/WarningRed.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
                 <Label x:Name="Blurb" Content="An Update is available!" MouseUp="BlurbAction" Grid.Column="1" Padding="0,0,0,0" Grid.Row="1" Margin="0,0,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#000000" FontSize="12" Cursor="Hand" HorizontalAlignment="Center" VerticalAlignment="Center"></Label>
                 <Image Source="/Assets/Images/closeBlack.png" Grid.Column="2" Width="10" Height="10" Grid.Row="1" Margin="0,0,0,0" Cursor="Hand" MouseUp="DoHideBlurb"></Image>
             </Grid> 
diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj
index 86949bce..da3cc0af 100644
--- a/DesktopEdge/ZitiDesktopEdge.csproj
+++ b/DesktopEdge/ZitiDesktopEdge.csproj
@@ -407,5 +407,8 @@
   <ItemGroup>
     <Resource Include="Assets\Images\closeBlack.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\WarningRed.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From f5ee7461bb781d439a1c19a53011ab45da480857 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Tue, 23 Feb 2021 18:14:54 -0500
Subject: [PATCH 6/7] update tsdk to 0.8.21 to pickup latest csdk

---
 service/build.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/build.bat b/service/build.bat
index 8a77e20d..db455192 100644
--- a/service/build.bat
+++ b/service/build.bat
@@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and
 REM limitations under the License.
 REM
 SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git
-SET ZITI_TUNNEL_REPO_BRANCH=v0.8.15
+SET ZITI_TUNNEL_REPO_BRANCH=v0.8.21
 REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk
 SET ZITI_SDK_C_BRANCH=
 REM the number of TCP connections the tunneler sdk can have at any one time

From 8e439e22427d0cb9d05c3e1035a85de722550aca Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:05:44 -0500
Subject: [PATCH 7/7] add UI blurb to release notes

---
 release-notes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release-notes.md b/release-notes.md
index d213cdbe..bb5a42a8 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,7 +1,8 @@
 # Release 1.7.9
 
 ## What's New
-* nothing
+* Stopping the data service (`ziti`) using the big button no longer shows the old warning asking to start the service or exit the UI.
+  Now the expected behavior is to see the button "off" which is used to turn the tunnel back "on"
 
 ## Other changes:
 * none