From 68b47ffa1a8fb10b2bb6830bff3972d81ff1b57b Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Thu, 28 Dec 2023 22:18:51 -0500 Subject: [PATCH] Refactorings --- fitnesstrax/app/src/app_window.rs | 6 ++---- fitnesstrax/app/src/views/mod.rs | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/fitnesstrax/app/src/app_window.rs b/fitnesstrax/app/src/app_window.rs index a9ce905..6e6c975 100644 --- a/fitnesstrax/app/src/app_window.rs +++ b/fitnesstrax/app/src/app_window.rs @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with Fit use crate::{ app::App, - views::{HistoricalView, PlaceholderView, View, ViewName, WelcomeView}, + views::{HistoricalView, PlaceholderView, View, WelcomeView}, }; use adw::prelude::*; use chrono::{Duration, Local}; @@ -148,13 +148,11 @@ impl AppWindow { } fn on_apply_config(&self, path: PathBuf) { - println!("saving configuration"); glib::spawn_future_local({ let s = self.clone(); async move { if s.app.open_db(path.clone()).await.is_ok() { - let settings = gio::Settings::new(&s.app_id); - let _ = settings.set("series-path", path.to_str().unwrap()); + let _ = s.settings.set("series-path", path.to_str().unwrap()); s.show_historical_view(); } } diff --git a/fitnesstrax/app/src/views/mod.rs b/fitnesstrax/app/src/views/mod.rs index 123929f..e014581 100644 --- a/fitnesstrax/app/src/views/mod.rs +++ b/fitnesstrax/app/src/views/mod.rs @@ -25,12 +25,6 @@ pub use placeholder_view::PlaceholderView; mod welcome_view; pub use welcome_view::WelcomeView; -#[derive(Clone, Debug, PartialEq)] -pub enum ViewName { - Welcome, - Historical, -} - pub enum View { Placeholder(PlaceholderView), Welcome(WelcomeView),