Set up the welcome screen and open the database #125

Merged
savanni merged 7 commits from fitnesstrax/welcome into main 2023-12-19 22:02:41 +00:00
1 changed files with 103 additions and 13 deletions
Showing only changes of commit 50268ffadc - Show all commits

View File

@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Fit
mod ui; mod ui;
use adw::prelude::*; use adw::prelude::*;
use emseries::Series; use emseries::{EmseriesReadError, Series};
use ft_core::TraxRecord; use ft_core::TraxRecord;
use gio::resources_lookup_data; use gio::resources_lookup_data;
use glib::Object; use glib::Object;
@ -36,6 +36,14 @@ const APP_ID_PROD: &str = "com.luminescent-dreams.fitnesstrax";
const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/fitnesstrax/"; const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/fitnesstrax/";
/// A set of events that can occur at the global application level. These events should represent
/// significant state changes that should go through a central dispatcher.
enum Events {
DatabaseChanged(Series<TraxRecord>),
}
// Note that I have not yet figured out the communication channel or how the central dispatcher
// should work. There's a dance between the App and the AppWindow that I haven't figured out yet.
/// The real, headless application. This is where all of the logic will reside. /// The real, headless application. This is where all of the logic will reside.
#[derive(Clone)] #[derive(Clone)]
struct App { struct App {
@ -50,6 +58,34 @@ impl App {
} }
} }
pub struct PlaceholderViewPrivate {}
#[glib::object_subclass]
impl ObjectSubclass for PlaceholderViewPrivate {
const NAME: &'static str = "PlaceholderView";
type Type = PlaceholderView;
type ParentType = gtk::Box;
fn new() -> Self {
Self {}
}
}
impl ObjectImpl for PlaceholderViewPrivate {}
impl WidgetImpl for PlaceholderViewPrivate {}
impl BoxImpl for PlaceholderViewPrivate {}
glib::wrapper! {
pub struct PlaceholderView(ObjectSubclass<PlaceholderViewPrivate>) @extends gtk::Box, gtk::Widget;
}
impl PlaceholderView {
pub fn new() -> Self {
let s: Self = Object::builder().build();
s
}
}
/// This is the view to show if the application has not yet been configured. It will walk the user /// This is the view to show if the application has not yet been configured. It will walk the user
/// through the most critical setup steps so that we can move on to the other views in the app. /// through the most critical setup steps so that we can move on to the other views in the app.
pub struct WelcomeViewPrivate {} pub struct WelcomeViewPrivate {}
@ -74,7 +110,7 @@ glib::wrapper! {
} }
impl WelcomeView { impl WelcomeView {
pub fn new<F>(on_save: F) -> Self pub fn new<F>(on_save: Box<F>) -> Self
where where
F: Fn(PathBuf) + 'static, F: Fn(PathBuf) + 'static,
{ {
@ -111,7 +147,7 @@ impl WelcomeView {
content.append(&gtk::Label::new(Some("Welcome to FitnessTrax. The application has not yet been configured, so I will walk you through that. Let's start out by selecting your database."))); content.append(&gtk::Label::new(Some("Welcome to FitnessTrax. The application has not yet been configured, so I will walk you through that. Let's start out by selecting your database.")));
content.append(&db_row); content.append(&db_row);
let on_save = Box::new(on_save); let on_save = on_save;
save_button.connect_clicked({ save_button.connect_clicked({
move |_| { move |_| {
if let Some(path) = db_row.path() { if let Some(path) = db_row.path() {
@ -166,11 +202,12 @@ impl HistoricalView {
/// The application window, or the main window, is the main user interface for the app. Almost /// The application window, or the main window, is the main user interface for the app. Almost
/// everything occurs here. /// everything occurs here.
#[derive(Clone)]
struct AppWindow { struct AppWindow {
app: App, app: App,
window: adw::ApplicationWindow, window: adw::ApplicationWindow,
layout: gtk::Box, layout: gtk::Box,
current_view: RefCell<gtk::Widget>, current_view: Rc<RefCell<gtk::Widget>>,
} }
impl AppWindow { impl AppWindow {
@ -187,12 +224,6 @@ impl AppWindow {
.height_request(600) .height_request(600)
.build(); .build();
let current_view = if app.database.read().unwrap().is_none() {
WelcomeView::new(&|_| {}).upcast()
} else {
HistoricalView::new().upcast()
};
let stylesheet = String::from_utf8( let stylesheet = String::from_utf8(
resources_lookup_data( resources_lookup_data(
&format!("{}style.css", RESOURCE_BASE_PATH), &format!("{}style.css", RESOURCE_BASE_PATH),
@ -216,18 +247,77 @@ impl AppWindow {
let layout = gtk::Box::builder() let layout = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical) .orientation(gtk::Orientation::Vertical)
.build(); .build();
let initial_view = PlaceholderView::new();
layout.append(&header); layout.append(&header);
layout.append(&current_view); layout.append(&initial_view);
window.set_content(Some(&layout)); window.set_content(Some(&layout));
window.present(); window.present();
let s = Self { let s = Self {
app, app: app.clone(),
window, window,
layout, layout,
current_view: RefCell::new(current_view), current_view: Rc::new(RefCell::new(initial_view.upcast())),
}; };
let initial_view = if app.database.read().unwrap().is_none() {
WelcomeView::new({
let app = app.clone();
let s = s.clone();
Box::new(move |path: PathBuf| {
// The user has selected a path. Perhaps the path is new, perhaps it already
// exists.
//
// If the file exists already, attempt to read it. Fail if that doesn't work.
// A should show to the user something that indicates that the file exists but is
// not already a database.
//
// If the file does not exist, create a new one. Again, show the user an error if
// some kind of error occurs.
if path.exists() {
let db = Series::open(&path);
match db {
Ok(db) => {
*app.database.write().unwrap() = Some(db);
s.change_view(HistoricalView::new().upcast());
}
Err(EmseriesReadError::UUIDParseError(_)) => {
println!("Invalid UUID detected in the file")
}
Err(EmseriesReadError::JSONParseError(_)) => {
println!("The file cannot be parsed and may not be a database")
}
Err(EmseriesReadError::IOError(err)) => {
println!("The file cannot be read: {}", err)
}
}
} else {
let db = Series::open(&path);
match db {
Ok(db) => {
*app.database.write().unwrap() = Some(db);
s.change_view(HistoricalView::new().upcast());
}
Err(EmseriesReadError::IOError(err)) => {
println!("The file cannot be read: {}", err)
}
_ => unreachable!(
"other error types should not be possible when creating a new DB"
),
}
}
})
})
.upcast()
} else {
HistoricalView::new().upcast()
};
s.change_view(initial_view);
s s
} }