refactor

Author: hacknus

src/gui.rs

@@ -14,7 +14,7 @@ use crate::settings_window::settings_window;
 use crate::toggle::toggle;
 use crate::update::check_update;
 use crate::FileOptions;
-use crate::{APP_INFO, PREFS_KEY};
+use crate::{APP_INFO, PREFERENCES_KEY};
 use eframe::egui::panel::Side;
 use eframe::egui::{
     Align2, CollapsingHeader, Color32, FontFamily, FontId, KeyboardShortcut, Pos2, Sense, Ui, Vec2,
@@ -90,10 +90,10 @@ impl Default for GuiSettingsContainer {
 }
 
 pub fn load_gui_settings() -> GuiSettingsContainer {
-    GuiSettingsContainer::load(&APP_INFO, PREFS_KEY).unwrap_or_else(|_| {
+    GuiSettingsContainer::load(&APP_INFO, PREFERENCES_KEY).unwrap_or_else(|_| {
         let gui_settings = GuiSettingsContainer::default();
         // save default settings
-        if gui_settings.save(&APP_INFO, PREFS_KEY).is_err() {
+        if gui_settings.save(&APP_INFO, PREFERENCES_KEY).is_err() {
             log::error!("failed to save gui_settings");
         }
         gui_settings
@@ -1300,7 +1300,7 @@ impl eframe::App for MyApp {
 
     fn save(&mut self, _storage: &mut dyn Storage) {
         save_serial_settings(&self.serial_devices);
-        if let Err(err) = self.gui_conf.save(&APP_INFO, PREFS_KEY) {
+        if let Err(err) = self.gui_conf.save(&APP_INFO, PREFERENCES_KEY) {
             log::error!("gui settings save failed: {:?}", err);
         }
     }

src/main.rs

@@ -34,8 +34,8 @@ const APP_INFO: AppInfo = AppInfo {
     name: "Serial Monitor",
     author: "Linus Leo Stöckli",
 };
-const PREFS_KEY: &str = "config/gui";
-const PREFS_KEY_SERIAL: &str = "config/serial_devices";
+const PREFERENCES_KEY: &str = "config/gui";
+const PREFERENCES_KEY_SERIAL: &str = "config/serial_devices";
 
 fn split(payload: &str) -> Vec<f32> {
     let mut split_data: Vec<&str> = vec![];

src/serial.rs

@@ -9,7 +9,7 @@ use std::time::{Duration, Instant};
 
 use crate::color_picker::COLORS;
 use crate::data::{get_epoch_ms, SerialDirection};
-use crate::{Packet, APP_INFO, PREFS_KEY_SERIAL};
+use crate::{Packet, APP_INFO, PREFERENCES_KEY_SERIAL};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SerialDevices {
@@ -37,7 +37,7 @@ impl Default for SerialDevices {
 }
 
 pub fn load_serial_settings() -> SerialDevices {
-    SerialDevices::load(&APP_INFO, PREFS_KEY_SERIAL).unwrap_or_else(|_| {
+    SerialDevices::load(&APP_INFO, PREFERENCES_KEY_SERIAL).unwrap_or_else(|_| {
         let serial_configs = SerialDevices::default();
         // save default settings
         save_serial_settings(&serial_configs);
@@ -46,14 +46,20 @@ pub fn load_serial_settings() -> SerialDevices {
 }
 
 pub fn save_serial_settings(serial_configs: &SerialDevices) {
-    if serial_configs.save(&APP_INFO, PREFS_KEY_SERIAL).is_err() {
+    if serial_configs
+        .save(&APP_INFO, PREFERENCES_KEY_SERIAL)
+        .is_err()
+    {
         log::error!("failed to save gui_settings");
     }
 }
 
 pub fn clear_serial_settings() {
     let serial_configs = SerialDevices::default();
-    if serial_configs.save(&APP_INFO, PREFS_KEY_SERIAL).is_err() {
+    if serial_configs
+        .save(&APP_INFO, PREFERENCES_KEY_SERIAL)
+        .is_err()
+    {
         log::error!("failed to clear gui_settings");
     }
 }