Move everything out of the app dir

This commit is contained in:
Emi Simpson 2022-01-01 11:20:25 -05:00
parent 5724b25a88
commit eecb67909a
Signed by: Emi
GPG Key ID: A12F2C2FFDC3D847
5 changed files with 13 additions and 14 deletions

View File

@ -1,4 +1,7 @@
use rfd::{AsyncFileDialog, FileHandle};
use crate::lyrics::Lyrics;
use crate::file_select::FileSelector;
use crate::styles::Theme;
use rfd::AsyncFileDialog;
use std::path::PathBuf;
use core::time::Duration;
use iced::Subscription;
@ -17,19 +20,12 @@ use iced_native::keyboard;
use iced_native::window;
use iced_native::event::Event;
mod lyrics;
mod styles;
mod file_select;
use styles::Theme;
use file_select::FileSelector;
#[derive(Clone, Debug)]
pub struct DelyriumApp {
lyrics_component: lyrics::Lyrics,
lyrics_component: Lyrics,
theme: Theme,
mode: AppMode,
file_selector: file_select::FileSelector,
file_selector: FileSelector,
}
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
@ -59,7 +55,7 @@ impl Application for DelyriumApp {
fn new(_: Self::Flags) -> (Self, Command<Message>) {
(
DelyriumApp {
lyrics_component: lyrics::Lyrics::new(),
lyrics_component: Lyrics::new(),
theme: Theme::default(),
mode: AppMode::FileSelect,
file_selector: FileSelector::default(),

View File

@ -41,7 +41,7 @@ const MAX_TICKS: usize = 900;
const FONT_MR_PIXEL: Font = Font::External {
name: "Mister Pixel",
bytes: include_bytes!("../../fonts/mister-pixel/mister-pixel.otf"),
bytes: include_bytes!("../fonts/mister-pixel/mister-pixel.otf"),
};
#[derive(Clone, Copy, Debug, Eq, PartialEq)]

View File

@ -1,6 +1,6 @@
use crate::app::Theme;
use iced::Element;
use crate::styles::Theme;
use crate::app::Message;
use crate::app::Element;
use iced::Align;
use iced::Length;

View File

@ -3,6 +3,9 @@ use iced::settings::Settings;
mod palette;
mod app;
mod lyrics;
mod styles;
mod file_select;
fn main() {
app::DelyriumApp::run(Settings::default()).unwrap();