Move everything out of the app dir
This commit is contained in:
parent
5724b25a88
commit
eecb67909a
|
@ -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 std::path::PathBuf;
|
||||||
use core::time::Duration;
|
use core::time::Duration;
|
||||||
use iced::Subscription;
|
use iced::Subscription;
|
||||||
|
@ -17,19 +20,12 @@ use iced_native::keyboard;
|
||||||
use iced_native::window;
|
use iced_native::window;
|
||||||
use iced_native::event::Event;
|
use iced_native::event::Event;
|
||||||
|
|
||||||
mod lyrics;
|
|
||||||
mod styles;
|
|
||||||
mod file_select;
|
|
||||||
|
|
||||||
use styles::Theme;
|
|
||||||
use file_select::FileSelector;
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct DelyriumApp {
|
pub struct DelyriumApp {
|
||||||
lyrics_component: lyrics::Lyrics,
|
lyrics_component: Lyrics,
|
||||||
theme: Theme,
|
theme: Theme,
|
||||||
mode: AppMode,
|
mode: AppMode,
|
||||||
file_selector: file_select::FileSelector,
|
file_selector: FileSelector,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
||||||
|
@ -59,7 +55,7 @@ impl Application for DelyriumApp {
|
||||||
fn new(_: Self::Flags) -> (Self, Command<Message>) {
|
fn new(_: Self::Flags) -> (Self, Command<Message>) {
|
||||||
(
|
(
|
||||||
DelyriumApp {
|
DelyriumApp {
|
||||||
lyrics_component: lyrics::Lyrics::new(),
|
lyrics_component: Lyrics::new(),
|
||||||
theme: Theme::default(),
|
theme: Theme::default(),
|
||||||
mode: AppMode::FileSelect,
|
mode: AppMode::FileSelect,
|
||||||
file_selector: FileSelector::default(),
|
file_selector: FileSelector::default(),
|
|
@ -41,7 +41,7 @@ const MAX_TICKS: usize = 900;
|
||||||
|
|
||||||
const FONT_MR_PIXEL: Font = Font::External {
|
const FONT_MR_PIXEL: Font = Font::External {
|
||||||
name: "Mister Pixel",
|
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)]
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::app::Theme;
|
use iced::Element;
|
||||||
|
use crate::styles::Theme;
|
||||||
use crate::app::Message;
|
use crate::app::Message;
|
||||||
use crate::app::Element;
|
|
||||||
|
|
||||||
use iced::Align;
|
use iced::Align;
|
||||||
use iced::Length;
|
use iced::Length;
|
|
@ -3,6 +3,9 @@ use iced::settings::Settings;
|
||||||
|
|
||||||
mod palette;
|
mod palette;
|
||||||
mod app;
|
mod app;
|
||||||
|
mod lyrics;
|
||||||
|
mod styles;
|
||||||
|
mod file_select;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
app::DelyriumApp::run(Settings::default()).unwrap();
|
app::DelyriumApp::run(Settings::default()).unwrap();
|
||||||
|
|
Loading…
Reference in New Issue