Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/ui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -962,25 +962,25 @@ pub fn draw(f: &mut Frame, app: &mut App) {
f.render_widget(gauge, tuner_area);
}

let controls = if is_jp {
vec![
("β–Άε†η”Ÿ", "SPC"),
("▢▢欑", "]"),
("◀◀前", "["),
("ιŸ³ι‡οΌ‹", "+"),
("ιŸ³ι‡οΌ", "-"),
("梈音", "m"),
("電源", "q"),
let controls: &[(&str, &str)] = if is_jp {
&[
(" β–Άε†η”Ÿ", " [SPC] "),
(" ▢▢欑", " []] "),
(" ◀◀前", " [[] "),
(" ιŸ³ι‡οΌ‹", " [+] "),
(" ιŸ³ι‡οΌ", " [-] "),
(" 梈音", " [m] "),
(" 電源", " [q] "),
]
} else {
vec![
("PLAY", "SPC"),
("SKIP", "]"),
("PREV", "["),
("VOL+", "+"),
("VOL-", "-"),
("MUTE", "m"),
("EXIT", "q"),
&[
(" PLAY", " [SPC] "),
(" SKIP", " []] "),
(" PREV", " [[] "),
(" VOL+", " [+] "),
(" VOL-", " [-] "),
(" MUTE", " [m] "),
(" EXIT", " [q] "),
]
};

Expand Down
29 changes: 15 additions & 14 deletions src/ui/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use ratatui::{
widgets::{Block, BorderType, Borders, Clear, List, ListItem, Paragraph},
Frame,
};
use std::borrow::Cow;

use crate::config::Language;
use crate::ui::Theme;
Expand Down Expand Up @@ -236,43 +237,43 @@ impl SettingsMenu {
}

let is_selected = i == self.selected_index;
let (label, value) = match item {
let (label, value): (&'static str, Cow<'static, str>) = match item {
SettingsItem::Language { current } => {
let lang_str = match current {
Language::English => "English",
Language::Japanese => "ζ—₯本θͺž",
Language::English => " English ",
Language::Japanese => " ζ—₯本θͺž ",
};
("Language / 言θͺž", lang_str.to_string())
(" Language / 言θͺž: ", Cow::Borrowed(lang_str))
}
SettingsItem::Theme {
current_index,
total_themes,
} => (
"Theme / γƒ†γƒΌγƒž",
format!("{} / {}", current_index + 1, total_themes),
" Theme / γƒ†γƒΌγƒž: ",
Cow::Owned(format!(" {} / {} ", current_index + 1, total_themes)),
),
SettingsItem::Album { enabled } => {
let status = if *enabled {
"ON / γ‚ͺン"
" ON / γ‚ͺン "
} else {
"OFF / γ‚ͺフ"
" OFF / γ‚ͺフ "
};
("Album Artwork / をルバム", status.to_string())
(" Album Artwork / をルバム: ", Cow::Borrowed(status))
}
SettingsItem::Mosaic { enabled } => {
let status = if *enabled {
"ON / γ‚ͺン"
" ON / γ‚ͺン "
} else {
"OFF / γ‚ͺフ"
" OFF / γ‚ͺフ "
};
("Mosaic Artwork / γƒ’γ‚Άγ‚€γ‚―", status.to_string())
(" Mosaic Artwork / γƒ’γ‚Άγ‚€γ‚―: ", Cow::Borrowed(status))
}
SettingsItem::Close => ("Close / ι–‰γ˜γ‚‹", String::new()),
SettingsItem::Close => (" Close / ι–‰γ˜γ‚‹ ", Cow::Borrowed("")),
};

let line = if value.is_empty() {
vec![Span::styled(
format!(" {} ", label),
label,
if is_selected {
Style::default()
.fg(theme.bg)
Expand Down
Loading