Merge pull request #600 from Leo-Corporation/vNext

Version 8.5.0.2408
Leo-Corporation · Aug 4, 2024 · 2140588 · 2140588
2 parents ae0d830 + 773a7b8
commit 2140588
Show file tree

Hide file tree

Showing 22 changed files with 393 additions and 102 deletions.
diff --git a/.github/images/banner.png b/.github/images/banner.png
diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs
@@ -47,10 +47,10 @@ public static class Global
 #if NIGHTLY
 	private static DateTime Date => System.IO.File.GetLastWriteTime(System.Reflection.Assembly.GetEntryAssembly().Location);
 
-	public static string Version => $"8.4.1.2407-nightly{Date:yyMM.dd@HHmm}";
+	public static string Version => $"8.5.0.2408-nightly{Date:yyMM.dd@HHmm}";
 
 #else
-	public static string Version => "8.4.1.2407";
+	public static string Version => "8.5.0.2408";
 #endif
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/InternetTest/7.0/Version.txt";
 	internal static string SynethiaPath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\NewSynethiaConfig.json";

diff --git a/InternetTest/InternetTest/InternetTest.csproj b/InternetTest/InternetTest/InternetTest.csproj
@@ -6,7 +6,7 @@
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>
 		<UseWindowsForms>True</UseWindowsForms>
-		<Version>8.4.1.2407</Version>
+		<Version>8.5.0.2408</Version>
 		<Copyright>© 2024</Copyright>
 		<Company>Léo Corporation</Company>
 		<Description>Taking you to another level. InternetTest can locate IP addresses, send ping request, recover your WiFi passwords and more!</Description>
@@ -41,7 +41,7 @@
 	  <PackageReference Include="PeyrSharp.Core" Version="2.1.0.2312" />
 	  <PackageReference Include="PeyrSharp.Env" Version="2.1.0.2312" />
 	  <PackageReference Include="QRCoder" Version="1.6.0" />
-	  <PackageReference Include="RestSharp" Version="111.3.0" />
+	  <PackageReference Include="RestSharp" Version="111.4.1" />
 	  <PackageReference Include="Synethia" Version="1.1.1.2302" />
 	  <PackageReference Include="Whois" Version="3.0.1" />
 	</ItemGroup>

diff --git a/InternetTest/InternetTest/Pages/DownDetectorPage.xaml b/InternetTest/InternetTest/Pages/DownDetectorPage.xaml
@@ -126,7 +126,23 @@
                 Style="{DynamicResource PrimaryButton}" />
 
         </StackPanel>
-
+        <Button
+            x:Name="ClearItemsBtn"
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="10 5"
+            Padding="5"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Center"
+            Background="{DynamicResource LightAccent}"
+            BorderThickness="0"
+            Click="ClearItemsBtn_Click"
+            Content="&#xF34D;"
+            Cursor="Hand"
+            FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+            FontWeight="ExtraBold"
+            Foreground="{DynamicResource Accent}"
+            Style="{DynamicResource PrimaryButton}" />
         <StackPanel
             x:Name="WebsiteDisplayer"
             Grid.Row="2"

diff --git a/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs b/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs
@@ -155,5 +155,13 @@ private void WebsiteTxt_TextChanged(object sender, TextChangedEventArgs e)
 		{
 			ClearBtn.Visibility = WebsiteTxt.Text.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
 		}
+
+		private void ClearItemsBtn_Click(object sender, RoutedEventArgs e)
+		{
+			WebsiteDisplayer.Children.Clear();
+			Websites.Clear();
+			Global.Settings.DownDetectorWebsites = Websites;
+			SettingsManager.Save();
+		}
 	}
 }
diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml b/InternetTest/InternetTest/Pages/LocateIpPage.xaml
@@ -165,6 +165,23 @@
                     <ToolTip Content="{x:Static lang:Resources.Save}" />
                 </Button.ToolTip>
             </Button>
+            <Button
+                x:Name="ResetBtn"
+                Margin="5 0 0 0"
+                Padding="5 2"
+                Background="{DynamicResource LightAccent}"
+                BorderThickness="0"
+                Click="ResetBtn_Click"
+                Content="&#xF34D;"
+                Cursor="Hand"
+                FontFamily="../Fonts/#FluentSystemIcons-Regular"
+                FontWeight="ExtraBold"
+                Foreground="{DynamicResource Accent}"
+                Style="{DynamicResource PrimaryButton}">
+                <Button.ToolTip>
+                    <ToolTip Content="{x:Static lang:Resources.Reset}" />
+                </Button.ToolTip>
+            </Button>
         </StackPanel>
 
         <WrapPanel

diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs b/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs
@@ -58,7 +58,7 @@ private async void InitUI()
 				LocateIP(""); // Get the current IP of the user
 			}
 		}
-		catch (Exception) { } // Cancel if there is no internet connection
+		catch { } // Cancel if there is no internet connection
 	}
 
 	internal void ToggleConfidentialMode(bool toggle)
@@ -171,4 +171,26 @@ private void MyIpBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LocateIP(""); // Empty query will return the user's public IP
 	}
+
+	private void ResetUI()
+	{
+		StatusIconTxt.Text = "\uF4AB";
+		StatusIconTxt.Foreground = Global.GetBrushFromResource("Gray");
+		MyIPTxt.Text = Properties.Resources.IPShowHere2;
+		CountryTxt.Text = "N/A";
+		RegionTxt.Text = "N/A";
+		CityTxt.Text = "N/A";
+		ZipCodeTxt.Text = "N/A";
+		LatTxt.Text = "N/A";
+		LongitudeTxt.Text = "N/A";
+		TimezoneTxt.Text = "N/A";
+		IspTxt.Text = "N/A";
+		IpTxt.Text = "";
+	}
+
+	private void ResetBtn_Click(object sender, RoutedEventArgs e)
+	{
+		ResetUI();
+		CurrentIP = null;
+	}
 }
diff --git a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml
@@ -44,6 +44,7 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <Border
                 Width="300"
@@ -96,11 +97,23 @@
                 </Grid>
             </Border>
             <Button
-                x:Name="ExportBtn"
+                x:Name="ShowBtn"
                 Grid.Column="2"
                 Margin="5"
                 Padding="5"
                 Background="Transparent"
+                Click="ShowBtn_Click"
+                Content="&#xF3FC;"
+                Cursor="Hand"
+                FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+                Foreground="{DynamicResource Foreground1}"
+                Style="{DynamicResource ToolButton}" />
+            <Button
+                x:Name="ExportBtn"
+                Grid.Column="3"
+                Margin="5"
+                Padding="5"
+                Background="Transparent"
                 Click="ExportBtn_Click"
                 Content="&#xF1A5;"
                 Cursor="Hand"
@@ -109,7 +122,7 @@
                 Style="{DynamicResource ToolButton}" />
             <Button
                 x:Name="GetWiFiBtn"
-                Grid.Column="3"
+                Grid.Column="4"
                 Margin="5"
                 Padding="5"
                 Background="{DynamicResource LightAccent}"

diff --git a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
@@ -42,6 +42,7 @@ namespace InternetTest.Pages;
 public partial class WiFiPasswordsPage : Page
 {
 	bool codeInjected = !Global.Settings.UseSynethia;
+	bool showKeys = false;
 	public WiFiPasswordsPage()
 	{
 		InitializeComponent();
@@ -53,7 +54,7 @@ public WiFiPasswordsPage()
 	private void InitUI()
 	{
 		TitleTxt.Text = $"{Properties.Resources.Commands} > {Properties.Resources.WifiPasswords}";
-		PlaceholderGrid.Children.Add(Placeholder); // Show the placeholder instead of an empty page
+		if (PlaceholderGrid.Children.Count == 0) PlaceholderGrid.Children.Add(Placeholder); // Show the placeholder instead of an empty page
 
 		try
 		{
@@ -128,6 +129,7 @@ internal async Task ExportWiFiNetworkInfo(string path, bool includePasswords)
 
 	internal void LoadWiFiInfo(string path)
 	{
+		WiFiItemDisplayer.Children.Clear();
 		string[] files = Directory.GetFiles(path);
 		for (int i = 0; i < files.Length; i++)
 		{
@@ -138,7 +140,7 @@ internal void LoadWiFiInfo(string path)
 
 			if (test != null)
 			{
-				WiFiItemDisplayer.Children.Add(new WiFiInfoItem(test));
+				WiFiItemDisplayer.Children.Add(new WiFiInfoItem(test, showKeys));
 			}
 			streamReader.Close();
 		}
@@ -238,4 +240,11 @@ private async void ExportWithoutPasswordBtn_Click(object sender, RoutedEventArgs
 			await ExportWiFiNetworkInfo(folderBrowserDialog.SelectedPath, false);
 		}
 	}
+
+	private void ShowBtn_Click(object sender, RoutedEventArgs e)
+	{
+		showKeys = !showKeys;
+		InitUI();
+		ShowBtn.Content = showKeys ? "\uF3F8" : "\uF3FC";
+	}
 }
diff --git a/InternetTest/InternetTest/Properties/Resources.Designer.cs b/InternetTest/InternetTest/Properties/Resources.Designer.cs
diff --git a/InternetTest/InternetTest/Properties/Resources.en-US.resx b/InternetTest/InternetTest/Properties/Resources.en-US.resx
@@ -1047,4 +1047,16 @@ Absolutely NO data is sent to Léo Corporation.</value>
   <data name="ShowHideTimedOut" xml:space="preserve">
     <value>Show/Hide Timed Out items</value>
   </data>
+  <data name="PerformanceMetrics" xml:space="preserve">
+    <value>Performance Metrics</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="AdapterDesc" xml:space="preserve">
+    <value>View information about your network adapter</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
 </root>
diff --git a/InternetTest/InternetTest/Properties/Resources.fr-FR.resx b/InternetTest/InternetTest/Properties/Resources.fr-FR.resx
@@ -1047,4 +1047,16 @@ Absolument AUCUNE donnée n'est envoyée à Léo Corporation.</value>
   <data name="ShowHideTimedOut" xml:space="preserve">
     <value>Afficher/masquer les éléments hors délai</value>
   </data>
+  <data name="PerformanceMetrics" xml:space="preserve">
+    <value>Mesures de performance</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="AdapterDesc" xml:space="preserve">
+    <value>Afficher des informations sur votre adaptateur réseau</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Réinitialiser</value>
+  </data>
 </root>
diff --git a/InternetTest/InternetTest/Properties/Resources.it-IT.resx b/InternetTest/InternetTest/Properties/Resources.it-IT.resx
@@ -1047,4 +1047,16 @@ Assolutamente NESSUN dato verrà inviato a Léo Corporation.</value>
   <data name="ShowHideTimedOut" xml:space="preserve">
     <value>Visualizza/nascondi elementi scaduti</value>
   </data>
+  <data name="PerformanceMetrics" xml:space="preserve">
+    <value>Metriche di prestazione</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configurazione</value>
+  </data>
+  <data name="AdapterDesc" xml:space="preserve">
+    <value>Visualizzare le informazioni sulla scheda di rete</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
 </root>
diff --git a/InternetTest/InternetTest/Properties/Resources.resx b/InternetTest/InternetTest/Properties/Resources.resx
@@ -1047,4 +1047,16 @@ Absolutely NO data is sent to Léo Corporation.</value>
   <data name="ShowHideTimedOut" xml:space="preserve">
     <value>Show/Hide Timed Out items</value>
   </data>
+  <data name="PerformanceMetrics" xml:space="preserve">
+    <value>Performance Metrics</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="AdapterDesc" xml:space="preserve">
+    <value>View information about your network adapter</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
 </root>
diff --git a/InternetTest/InternetTest/Properties/Resources.zh-CN.resx b/InternetTest/InternetTest/Properties/Resources.zh-CN.resx
@@ -1038,4 +1038,16 @@
   <data name="ShowHideTimedOut" xml:space="preserve">
     <value>显示/隐藏超时项目</value>
   </data>
+  <data name="PerformanceMetrics" xml:space="preserve">
+    <value>性能指标</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>配置</value>
+  </data>
+  <data name="AdapterDesc" xml:space="preserve">
+    <value>查看网络适配器的相关信息</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>重置</value>
+  </data>
 </root>
diff --git a/InternetTest/InternetTest/Themes/Dark.xaml b/InternetTest/InternetTest/Themes/Dark.xaml
@@ -8,6 +8,7 @@
     <SolidColorBrush x:Key="Background3" Color="#141428" />
     <SolidColorBrush x:Key="CardBackground" Color="#141446" />
     <SolidColorBrush x:Key="Foreground1" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="Foreground2" Color="#DBDBD7" />
     <SolidColorBrush x:Key="WindowButtonsHover1" Color="#141428" />
     <SolidColorBrush x:Key="WindowButtonsPressed1" Color="#1E1E32" />
     <SolidColorBrush x:Key="WindowButtonsHoverForeground1" Color="#ffffff" />

diff --git a/InternetTest/InternetTest/Themes/Light.xaml b/InternetTest/InternetTest/Themes/Light.xaml
@@ -8,6 +8,7 @@
     <SolidColorBrush x:Key="Background3" Color="#efefef" />
     <SolidColorBrush x:Key="CardBackground" Color="#ffffff" />
     <SolidColorBrush x:Key="Foreground1" Color="#000000" />
+    <SolidColorBrush x:Key="Foreground2" Color="#6E6E77" />
     <SolidColorBrush x:Key="WindowButtonsHover1" Color="#E5E5E5" />
     <SolidColorBrush x:Key="WindowButtonsPressed1" Color="#DBDBDB" />
     <SolidColorBrush x:Key="WindowButtonsHoverForeground1" Color="#ffffff" />

diff --git a/InternetTest/InternetTest/UserControls/AdapterItem.xaml.cs b/InternetTest/InternetTest/UserControls/AdapterItem.xaml.cs
@@ -57,6 +57,8 @@ private void InitUI()
 				_ => "\uF8AC"
 			};
 
+			if (AdapterInfo.Name.Contains("Bluetooth")) AdapterIcon.Text = "\uF1DF";
+
 			StatusTxt.Text = AdapterInfo.Status switch
 			{
 				OperationalStatus.Up => Properties.Resources.ConnectedS,