From 02fbd15f44f9bf8754ffa160ec392e42bb167325 Mon Sep 17 00:00:00 2001 From: Emi Simpson Date: Sat, 1 Jan 2022 23:11:47 -0500 Subject: [PATCH] Split Lyrics -> Editor + Lyrics --- src/app.rs | 6 ++-- src/editor.rs | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lyrics.rs | 65 +++++++---------------------------------- src/main.rs | 1 + 4 files changed, 95 insertions(+), 58 deletions(-) create mode 100644 src/editor.rs diff --git a/src/app.rs b/src/app.rs index 032c9af..3d1bc01 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,5 +1,5 @@ use crate::load_song::load_song; -use crate::lyrics::Lyrics; +use crate::editor::Editor; use crate::file_select::FileSelector; use rfd::AsyncFileDialog; use std::path::PathBuf; @@ -17,7 +17,7 @@ use iced_native::window; use iced_native::event::Event; pub struct DelyriumApp { - lyrics_component: Option, + lyrics_component: Option, file_selector: FileSelector, size: (u32, u32), } @@ -89,7 +89,7 @@ impl Application for DelyriumApp { Message::FileOpened(path) => { println!("File opened! {}", path.display()); let song = load_song(&path).unwrap().format; - self.lyrics_component = Some(Lyrics::new(song, self.size)); + self.lyrics_component = Some(Editor::new(song, self.size)); }, Message::PromptForFile => { let task = async { diff --git a/src/editor.rs b/src/editor.rs new file mode 100644 index 0000000..3e74d12 --- /dev/null +++ b/src/editor.rs @@ -0,0 +1,81 @@ +use crate::lyrics::Lyric; +use crate::lyrics::Lyrics; +use crate::app::Message; +use iced::Element; +use crate::styles::Theme; +use std::sync::Arc; +use iced::Container; +use iced::Row; +use crate::palette::Palette; +use crate::load_song::extract_cover; +use crate::peripheries::Periphery; +use iced::Length; +use iced::Align; + +use symphonia::core::formats::FormatReader; + +use image::GenericImageView; +pub struct Editor { + lyrics: Lyrics, + theme: Theme, + song: Box, + left_peri: Periphery, + rite_peri: Periphery, +} + +impl Editor { + pub fn new(mut song: Box, size: (u32, u32)) -> Self { + let cover = extract_cover(song.as_mut()); + + let theme = cover.as_ref() + .map(|cover| { + Theme::from_palette( + Palette::generate(&cover) + ) + }).unwrap_or_else(|| Theme::default()); + + let cover = cover.expect("TODO"); + let cover = Arc::new(cover.blur((cover.width() / 50) as f32)); + + let left_peri = Periphery::new(cover.clone(), true, size); + let rite_peri = Periphery::new(cover, false, size); + + Self { + lyrics: Lyrics::new(), + song, theme, left_peri, rite_peri, + } + } + + // TODO: work on untangling this mess + pub fn insert_text(&mut self, text: String) { + self.lyrics.insert_text(text); + } + pub fn update_line(&mut self, new_content: String, line_no: usize) { + self.lyrics.update_line(new_content, line_no); + } + pub fn advance_line(&mut self, current_line: usize) { + self.lyrics.advance_line(current_line); + } + pub fn current_line_mut(&mut self) -> (usize, &mut Lyric) { + self.lyrics.current_line_mut() + } + + pub fn notify_resized(&mut self, w: u32, h: u32) { + self.left_peri.notify_resized(w, h); + self.rite_peri.notify_resized(w, h); + } + + pub fn view(&mut self) -> Element { + + Container::new( + Row::new() + .push(self.left_peri.view()) + .push(self.lyrics.view(self.theme)) + .push(self.rite_peri.view()) + ) + .align_y(Align::Center) + .style(self.theme) + .height(Length::Fill) + .into() + } +} diff --git a/src/lyrics.rs b/src/lyrics.rs index 7b63566..a8dfb56 100644 --- a/src/lyrics.rs +++ b/src/lyrics.rs @@ -1,56 +1,25 @@ -use std::sync::Arc; -use iced::Container; -use iced::Row; -use crate::palette::Palette; -use crate::load_song::extract_cover; +use iced::Length; use iced::Element; use crate::styles::Theme; use crate::app::Message; -use crate::peripheries::Periphery; -use iced::Align; -use iced::Length; use iced::widget::text_input::{self, TextInput}; use iced::widget::scrollable::{self, Scrollable}; - -use symphonia::core::formats::FormatReader; - -use image::GenericImageView; +use iced::Align; pub struct Lyrics { lines: Vec, scroll_state: scrollable::State, - theme: Theme, - song: Box, - left_peri: Periphery, - rite_peri: Periphery, } impl Lyrics { - pub fn new(mut song: Box, size: (u32, u32)) -> Self { - + pub fn new() -> Lyrics { let mut lyric = Lyric::new(); lyric.select(); - let cover = extract_cover(song.as_mut()); - - let theme = cover.as_ref() - .map(|cover| { - Theme::from_palette( - Palette::generate(&cover) - ) - }).unwrap_or_else(|| Theme::default()); - - let cover = cover.expect("TODO"); - let cover = Arc::new(cover.blur((cover.width() / 50) as f32)); - - let left_peri = Periphery::new(cover.clone(), true, size); - let rite_peri = Periphery::new(cover, false, size); - - Lyrics { + Self { lines: vec![lyric], scroll_state: scrollable::State::new(), - song, theme, left_peri, rite_peri, } } @@ -98,11 +67,6 @@ impl Lyrics { .deselect(); } - pub fn notify_resized(&mut self, w: u32, h: u32) { - self.left_peri.notify_resized(w, h); - self.rite_peri.notify_resized(w, h); - } - pub fn insert_line(&mut self, index: usize, content: Option) -> &mut Lyric { self.lines.insert(index, match content { Some(content) => Lyric::new_with_value(content), @@ -120,29 +84,20 @@ impl Lyrics { .expect("no line currently selected") } - pub fn view(&mut self) -> Element { + pub fn view(&mut self, theme: Theme) -> Element { let is_sole_line = self.lines.len() == 1; - let lyrics = self.lines.iter_mut() + self.lines.iter_mut() .enumerate() - .map(|(i, l)| l.view(is_sole_line, i, self.theme)) + .map(|(i, l)| l.view(is_sole_line, i, theme)) .fold(Scrollable::new(&mut self.scroll_state), |s, l| s.push(l)) .width(Length::Fill) - .align_items(Align::Center); - - Container::new( - Row::new() - .push(self.left_peri.view()) - .push(lyrics) - .push(self.rite_peri.view()) - ) - .align_y(Align::Center) - .style(self.theme) - .height(Length::Fill) - .into() + .align_items(Align::Center) + .into() } } + #[derive(Clone, Debug)] pub struct Lyric { state: text_input::State, diff --git a/src/main.rs b/src/main.rs index d85a39f..9c6fcd5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,6 +8,7 @@ mod styles; mod file_select; mod load_song; mod peripheries; +mod editor; fn main() { app::DelyriumApp::run(Settings::default()).unwrap();