GyulyVGC · GyulyVGC · Nov 13, 2023 · Jun 8, 2023 · Jun 11, 2023 · Jun 12, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,6 +45,7 @@ confy = "0.5.1"
 serde = { version = "1.0.188", default_features = false, features = ["derive"] }
 rodio = { version = "0.17.1", default_features = false, features = ["mp3"] }
 dns-lookup = "2.0.2"
+toml = "0.8.0"
 
 [target.'cfg(target_arch = "powerpc64")'.dependencies]
 reqwest = { version = "0.11.20", features = ["json", "blocking"] }
@@ -55,6 +56,7 @@ reqwest = { version = "0.11.20", default-features = false, features = ["json", "
 #───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
 [dev-dependencies]
+serde_test = "1.0.176"
 rstest = "0.18.2"
 
 #───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 <p align="center"><a href="https://www.sniffnet.net"><img alt="" src="https://github.com/GyulyVGC/sniffnet/blob/main/resources/repository/header_repository.png?raw=true" width="100%"/></a></p>
 
-<p align="center"> 
+<p align="center">
 <a href="https://github.com/GyulyVGC/sniffnet/blob/main/LICENSE-APACHE"><img alt="" src="https://img.shields.io/crates/l/sniffnet?&color=orange"/></a>
 &nbsp;
 <a href="https://crates.io/crates/sniffnet"><img alt="" src="https://img.shields.io/crates/v/sniffnet?&logo=rust&color=blue"/></a> <br>
 </p>
 
-<p align="center"> 
+<p align="center">
 Application to comfortably monitor your Internet traffic <br>
 Multithreaded, cross-platform, reliable <br>
 🌐 <a href="https://www.sniffnet.net">www.sniffnet.net</a>
@@ -78,17 +78,17 @@ You can install Sniffnet in one of the following ways:
 [32-bit](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_Windows_32-bit.msi)
 
   ### macOS
-  
+
   - [Intel](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_macOS_Intel.dmg) |
 [Apple silicon](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_macOS_AppleSilicon.dmg)
 
   ### Linux
 
   - deb: [amd64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_amd64.deb) |
-[arm64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_arm64.deb) | 
+[arm64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_arm64.deb) |
 [i386](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_i386.deb) |
 [armhf](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxDEB_armhf.deb)
-  
+
   - rpm: [x86_64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxRPM_x86_64.rpm) |
 [aarch64](https://github.com/GyulyVGC/sniffnet/releases/latest/download/Sniffnet_LinuxRPM_aarch64.rpm)
 
@@ -245,7 +245,7 @@ sudo sniffnet
 - 🌍 get information about the country of the remote hosts (IP geolocation)
 - ⭐ save your favorite network hosts
 - 🔉 set custom notifications to inform you when defined network events occur
-- 🎨 choose the style that fits you the most from 4 different available themes
+- 🎨 choose the style that fits you the most from 4 different available themes plus custom theme support
 - 🕵️ inspect each of your network connections in real time
 - 📁 save complete textual reports with detailed information for each network connection:
   * source and destination IP addresses
@@ -267,13 +267,13 @@ sudo sniffnet
   Geolocation and network providers (ASN) refer to the remote IP address of each connection. They are retrieved performing lookups against [MMDB files](https://maxmind.github.io/MaxMind-DB/):
 
   > **Note**
-  > 
+  >
   > The MMDB (MaxMind database) format has been developed especially for IP lookup.<br>
   > It is optimized to perform lookups on data indexed by IP network ranges quickly and efficiently.<br>
   > It permits the best performance on IP lookups, and it's suitable for use in a production environment.
-  > 
+  >
   > This product includes GeoLite2 data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com </a>
-  
+
   This file format potentially allows Sniffnet to execute hundreds of different IP lookups in a matter of a few milliseconds.
 
 </details>
@@ -284,23 +284,23 @@ sudo sniffnet
 <details>
 
   <summary>See details</summary>
-  
+
   <br>
-  
+
   Application layer protocols are inferred from the transport port numbers,
   following the convention maintained by [IANA](https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml).
 
   Please, remember that this is just a convention:
 
   > **Warning**
-  > 
+  >
   > The Internet Assigned Numbers Authority (IANA) is responsible for maintaining
   > the official assignments of port numbers for specific uses. <br>
   > However, many unofficial uses of well-known port numbers occur in practice.
 
   The following table reports the port-to-service mappings used by Sniffnet,
   chosen from the most common assignments by IANA.
-  
+
 <div align="center">
 
 |Port number(s)|Application protocol  |  Description |
@@ -372,6 +372,36 @@ The currently usable hotkeys are reported in the following.
 
 </details>
 
+## Custom themes
+<details>
+
+  <summary>See details</summary>
+
+  Custom themes are specified as a TOML file.
+
+  The TOML must follow this format:
+  ```toml
+  name = "Catppuccin (Mocha)"
+
+  # Color palettes are in RGBA hexadecimal where the alpha is optional.
+  [palette]
+  primary = "#1e1e2e"          # Base
+  secondary = "#89b4fa"        # Blue
+  outgoing = "#f5c2e7"         # Pink
+  buttons = "#313244"          # Surface0
+  text_headers = "#11111b"     # Crust
+  text_body = "#cdd6f4"        # Text
+  round_borders = "#74c7ec"    # Sapphire
+  round_containers = "#585b70" # Surface 2
+  starred = "#f9e2af"          # Yellow
+
+  # Alpha channels are floats within [0.0, 1.0]
+  badge_alpha = 0.75
+  color_mix_chart = 0.3
+  ```
+
+  The example theme above uses colors from [Catppuccin Mocha](https://github.com/catppuccin/catppuccin).
+</details>
 
 ## Troubleshooting
 
@@ -387,15 +417,35 @@ Check the [required dependencies](#required-dependencies) section for instructio
 
 ### Rendering problems
 
+<<<<<<< HEAD
+In some cases, especially if you are running on an old architecture, the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced)
+may cause some problems that could prevent you from running Sniffnet. <br>
+In this case, you can try building the application from the [`glow-renderer`](https://github.com/GyulyVGC/sniffnet/tree/glow-renderer)
+branch, which uses the `glow` renderer.
+
+> **Note**
+>
+> View issues labeled with [`renderer`](https://github.com/GyulyVGC/sniffnet/issues?q=is%3Aissue+label%3Arenderer) to see how those problems have been solved by others.
+||||||| ec3c96f
+In some cases, especially if you are running on an old architecture, the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced)
+may cause some problems that could prevent you from running Sniffnet. <br>
+In this case, you can try building the application from the [`glow-renderer`](https://github.com/GyulyVGC/sniffnet/tree/glow-renderer)
+branch, which uses the `glow` renderer.
+
+> **Note**
+>
+> View issues labeled with [`renderer`](https://github.com/GyulyVGC/sniffnet/issues?q=is%3Aissue+label%3Arenderer) to see how those problems have been solved by others.
+=======
 In some circumstances, especially if you are running on an old architecture or your graphical drivers are not up-to-date,
-the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced) 
+the `wgpu` default renderer used by [iced](https://github.com/iced-rs/iced)
 may cause problems (country icons are completely black, or the interface glitches). <br>
-In these cases you can download an alternative version of the application, 
+In these cases you can download an alternative version of the application,
 which is based on `tiny-skia`, a CPU-only software renderer that should work properly on every environment: <br>
 [Windows](https://github.com/GyulyVGC/sniffnet/suites/14909529200/artifacts/849640695) |
 [macOS](https://github.com/GyulyVGC/sniffnet/suites/14909529200/artifacts/849640694) |
 [Linux DEB](https://github.com/GyulyVGC/sniffnet/suites/14909529200/artifacts/849640693) |
 [Linux RPM](https://github.com/GyulyVGC/sniffnet/suites/14909529200/artifacts/849640696)
+>>>>>>> upstream/advanced-settings
 
 ### ***In any case don't hesitate to [open an issue](https://github.com/GyulyVGC/sniffnet/issues), and I will do my best to help you!***
 

diff --git a/resources/themes/catppuccin_frappe.toml b/resources/themes/catppuccin_frappe.toml
@@ -0,0 +1,12 @@
+# https://github.com/catppuccin/catppuccin
+primary = "#303446"           # Base
+secondary = "#a6d189"         # Green
+buttons = "#414559"           # Surface0
+outgoing = "#f4b8e4"          # Pink
+text_headers = "#232634"      # Crust
+text_body = "#c6d0f5"         # Text
+starred = "#e5c890"           # Yellow
+round_borders_alpha = 0.1
+round_containers_alpha = 0.04
+chart_badge_alpha = 0.55
+nightly = true
diff --git a/resources/themes/catppuccin_latte.toml b/resources/themes/catppuccin_latte.toml
@@ -0,0 +1,12 @@
+# https://github.com/catppuccin/catppuccin"
+primary = "#eff1f5"           # Base
+secondary = "#1e66f5"         # Blue
+buttons = "#ccd0da"           # Surface0
+outgoing = "#ea76cb"          # Pink
+text_headers = "#dce0e8"      # Crust
+text_body = "#4c4f69"         # Text
+starred = "#df8e1d"           # Yellow
+round_borders_alpha = 0.15
+round_containers_alpha = 0.25
+chart_badge_alpha = 0.75
+nightly = false
diff --git a/resources/themes/catppuccin_macchiato.toml b/resources/themes/catppuccin_macchiato.toml
@@ -0,0 +1,12 @@
+# https://github.com/catppuccin/catppuccin
+primary = "#24273a"           # Base
+secondary = "#f5bde6"         # Pink
+buttons = "#363a4f"           # Surface0
+outgoing = "#c6a0f6"          # Mauve
+text_headers = "#181926"      # Crust
+text_body = "#cad3f5"         # Text
+starred = "#eed49f"           # Yellow
+round_borders_alpha = 0.1
+round_containers_alpha = 0.15
+chart_badge_alpha = 0.75
+nightly = true
diff --git a/resources/themes/catppuccin_mocha.toml b/resources/themes/catppuccin_mocha.toml
@@ -0,0 +1,12 @@
+# https://github.com/catppuccin/catppuccin
+primary = "#1e1e2e"           # Base
+secondary = "#89b4fa"         # Blue
+buttons = "#313244"           # Surface0
+outgoing = "#f5c2e7"          # Pink
+text_headers = "#11111b"      # Crust
+text_body = "#cdd6f4"         # Text
+starred = "#f9e2af"           # Yellow
+round_borders_alpha = 0.1
+round_containers_alpha = 0.15
+chart_badge_alpha = 0.75
+nightly = true
diff --git a/resources/themes/dracula.toml b/resources/themes/dracula.toml
@@ -0,0 +1,11 @@
+primary = "#44475a"           # Current line
+secondary = "#ff79c6"         # Pink
+buttons = "#6272a4"           # Comment
+outgoing = "#8be9fd"          # Cyan
+text_headers = "#282a36"      # Background
+text_body = "#f8f8f2"         # Foreground
+starred = "#f1fa8cb2"         # Yellow
+round_borders_alpha = 0.1
+round_containers_alpha = 0.04
+chart_badge_alpha = 0.15
+nightly = true
diff --git a/src/configs/types/config_advanced_settings.rs b/src/configs/types/config_advanced_settings.rs
@@ -11,6 +11,7 @@ pub struct ConfigAdvancedSettings {
     pub mmdb_country: String,
     pub mmdb_asn: String,
     pub output_path: PathBuf,
+    pub style_path: Option<PathBuf>
 }
 
 impl ConfigAdvancedSettings {
@@ -42,6 +43,7 @@ impl Default for ConfigAdvancedSettings {
             mmdb_country: String::new(),
             mmdb_asn: String::new(),
             output_path: get_default_report_directory(),
+            style_path: None
         }
     }
 }
diff --git a/src/configs/types/configs.rs b/src/configs/types/configs.rs
@@ -1,3 +1,5 @@
+use crate::gui::styles::types::custom_palette::{CustomPalette, ExtraStyles};
+use crate::gui::styles::types::style_type::StyleType;
 use crate::{ConfigAdvancedSettings, ConfigDevice, ConfigSettings, ConfigWindow};
 
 #[derive(Default)]
@@ -10,10 +12,22 @@ pub struct Configs {
 
 impl Configs {
     pub fn load() -> Self {
+        let mut settings = ConfigSettings::load();
+        let advanced_settings = ConfigAdvancedSettings::load();
+
+        if let Some(style_path) = &advanced_settings.style_path {
+            // Don't clobber the previously set style if the path is broken
+            if let Ok(style) = CustomPalette::from_file(style_path)
+                .map(|palette| StyleType::Custom(ExtraStyles::CustomToml(palette)))
+            {
+                settings.style = style;
+            }
+        }
+
         Configs {
-            settings: ConfigSettings::load(),
+            settings,
             device: ConfigDevice::load(),
-            advanced_settings: ConfigAdvancedSettings::load(),
+            advanced_settings,
             window: ConfigWindow::load(),
         }
     }