wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Add manual input elements to the app an ui #216

Merged
wojtek merged 17 commits from 188---add-option-for-manual-input-during-fetch into main 2024-09-15 15:20:11 +02:00
Conversation 0 Commits 17 Files Changed 23 +4 -28
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c39988d96 - Show all commits

31
src/tui/app/machine/mod.rs
View File

@ -26,7 +26,7 @@ use match_state::MatchState;
use reload_state::ReloadState; use reload_state::ReloadState;
use search_state::SearchState; use search_state::SearchState;
use super::{AppMode, IAppBase}; use super::{AppMode, IAppBase, IAppState};
pub type App = AppState< pub type App = AppState<
AppMachine<BrowseState>, AppMachine<BrowseState>,
@ -130,36 +130,11 @@ impl IApp for App {
self self
} }
fn state( fn state(self) -> IAppState!() {
self,
) -> AppState<
Self::BrowseState,
Self::InfoState,
Self::ReloadState,
Self::SearchState,
Self::FetchState,
Self::MatchState,
Self::ErrorState,
Self::CriticalState,
> {
self self
} }
fn mode( fn mode(mut self) -> super::AppMode<IAppState!(), Self::InputMode> {
mut self,
) -> super::AppMode<
AppState<
Self::BrowseState,
Self::InfoState,
Self::ReloadState,
Self::SearchState,
Self::FetchState,
Self::MatchState,
Self::ErrorState,
Self::CriticalState,
>,
Self::InputMode,
> {
if let Some(input) = self.inner_mut().input.take() { if let Some(input) = self.inner_mut().input.take() {
AppMode::Input(AppInputMode::new(input, self.state())) AppMode::Input(AppInputMode::new(input, self.state()))
} else { } else {

1
src/tui/app/mod.rs
View File

@ -30,6 +30,7 @@ macro_rules! IAppState {
Self::FetchState, Self::MatchState, Self::ErrorState, Self::CriticalState> Self::FetchState, Self::MatchState, Self::ErrorState, Self::CriticalState>
}; };
} }
use IAppState;
pub trait IApp { pub trait IApp {
type BrowseState: IAppBase<APP = Self> + IAppInteractBrowse<APP = Self>; type BrowseState: IAppBase<APP = Self> + IAppInteractBrowse<APP = Self>;