Azorlogh/tunefire - Change N6XOUOHS2X4M2BREDJXHRGICO4RFPNRS7OOYYQKNGUNQ5MK6LK7AC

some styling

Created by GufFboPKDiYnS7CDGbzWji864drnPsg9SDtHSQB4uTWd on July 7, 2022

N6XOUOHS2X4M2BREDJXHRGICO4RFPNRS7OOYYQKNGUNQ5MK6LK7AC

Dependencies

In channels

main

Change contents

Insertion in tf-player/src/player/mod.rs at line 9 [3.20875]
[3.20996]
[3.20996]
```
use crate::{SongSource, SourceError};
```
Replacement in tf-player/src/player/mod.rs at line 12 [3.20875]
B:BD[3.20997] → [3.20997:21048]
```
use crate::{PlayerState, SongSource, SourceError};
```
[3.20997]
[3.21048]
```
pub mod state;
pub use state::State;
```
Replacement in tf-player/src/player/mod.rs at line 29 [3.20875]
B:BD[3.21264] → [3.21264:21302]
```
	pub state: Arc<RwLock<PlayerState>>,
```
[3.21264]
[3.21302]
```
	pub state: Arc<RwLock<State>>,
```
Replacement in tf-player/src/player/mod.rs at line 40 [3.20875]
B:BD[3.21529] → [3.21529:21581]
```
			state: Arc::new(RwLock::new(PlayerState::Idle)),
```
[3.21529]
[3.21581]
```
			state: Arc::new(RwLock::new(State::Idle)),
```
Replacement in tf-player/src/player/mod.rs at line 57 [3.20875]
B:BD[3.21925] → [3.21925:21971]
```
					*self.state.write() = PlayerState::Idle;
```
[3.21925]
[3.21971]
```
					*self.state.write() = State::Idle;
```

Replacement in tf-player/src/player/mod.rs at line 87 [3.20875]

B:BD[3.22748] → [3.22748:22799]

			PlayerState::Playing { paused, .. } => !paused,

[3.22748]

[3.22799]

			State::Playing(state::Playing { paused, .. }) => !paused,

Replacement in tf-player/src/player/mod.rs at line 117 [3.20875]
B:BD[3.23434] → [3.23434:23481]
```
						*self.state.write() = PlayerState::Idle;
```
[3.23434]
[2.895]
```
						*self.state.write() = State::Idle;
```

Replacement in tf-player/src/player/mod.rs at line 121 [3.20875]

B:BD[3.23542] → [3.23542:23589]

						PlayerState::Playing { offset, .. } => {

[3.23542]

[3.23589]

						State::Playing(state::Playing { offset, .. }) => {

Deletion in tf-player/src/lib.rs at line 22 [4.11625]
B:BD[4.11927] → [4.11927:11928]
B:BD[4.11928] → [5.168:203]
∅:D[5.203] → [4.11928:11958]
B:BD[4.11928] → [4.11928:11958]
B:BD[4.12010] → [4.12010:12059]
B:BD[4.12059] → [3.23971:23987]
∅:D[3.23987] → [4.12085:12111]
B:BD[4.12085] → [4.12085:12111]
B:BD[4.12111] → [5.204:272]
∅:D[5.272] → [4.12111:12131]
B:BD[4.12111] → [4.12111:12131]
B:BD[4.12131] → [5.273:339]
B:BD[5.339] → [3.23988:24027]
∅:D[3.24027] → [5.400:488]
B:BD[5.400] → [5.400:488]
B:BD[5.488] → [3.24028:24071]
∅:D[3.24071] → [5.555:577]
B:BD[5.555] → [5.555:577]
∅:D[5.577] → [4.12131:12173]
B:BD[4.12131] → [4.12131:12173]
B:BD[4.12173] → [3.24072:24092]
∅:D[3.24092] → [4.12192:12228]
B:BD[4.12192] → [4.12192:12228]
B:BD[4.12228] → [3.24093:24110]
∅:D[3.24110] → [4.12228:12236]
B:BD[4.12228] → [4.12228:12236]
```
#[derive(Debug, Clone, PartialEq)]
pub enum PlayerState {
	Idle,
	Playing {
		song: SongInfo,
		offset: Duration,
		paused: bool,
	},
}
use PlayerState::*;
impl Default for PlayerState {
	fn default() -> Self {
		Idle
	}
}
impl PlayerState {
	pub fn current_song(&self) -> Option<&SongInfo> {
		match self {
			Playing { song, .. } => Some(song),
			_ => None,
		}
	}
	pub fn current_time(&self) -> Option<&Duration> {
		match self {
			Playing { offset, .. } => Some(offset),
			_ => None,
		}
	}
	fn set_song(&mut self, song: SongInfo) {
		*self = Playing {
			song,
			offset: Duration::ZERO,
			paused: true,
		};
	}
```

Deletion in tf-player/src/lib.rs at line 23 [4.11625]

B:BD[4.12237] → [4.12237:12288]

B:BD[4.12288] → [3.24111:24163]

∅:D[3.24163] → [4.12425:12538]

B:BD[4.12425] → [4.12425:12538]

B:BD[4.12538] → [3.24164:24215]

∅:D[3.24215] → [4.12718:12850]

B:BD[4.12718] → [4.12718:12850]

B:BD[4.12850] → [3.24216:24247]

∅:D[3.24247] → [4.12880:12920]

B:BD[4.12880] → [4.12880:12920]

B:BD[4.13058] → [4.13058:13105]

	fn play(&mut self) -> Result<()> {
		match self {
			Playing { paused, .. } => {
				*paused = false;
				Ok(())
			}
			_ => Err(anyhow!("wrong state")),
		}
	}
	fn pause(&mut self) -> Result<()> {
		match self {
			Playing { paused, .. } => {
				*paused = true;
				Ok(())
			}
			_ => Err(anyhow!("wrong state")),
		}
	}
	fn seek(&mut self, position: Duration) -> Result<()> {
		match self {
			Playing { offset, .. } => {
				*offset = position;
				Ok(())
			}
			_ => Err(anyhow!("wrong state")),
		}
	}
}

Replacement in tf-player/src/lib.rs at line 27 [4.11625]
B:BD[4.13239] → [3.24273:24307]
```
	state: Arc<RwLock<PlayerState>>,
```
[4.13239]
[4.13260]
```
	state: Arc<RwLock<player::State>>,
```

Replacement in tf-player/src/lib.rs at line 108 [4.11625]

B:BD[4.15124] → [3.24453:24595]

		let paused = match *self.state.read() {
			Playing { paused, .. } => paused,
			_ => return Err(anyhow!("wrong state")),
		};
		if paused {

[4.15124]

[3.24595]

		if self
			.state
			.read()
			.get_playing()
			.ok_or(anyhow!("wrong state"))?
			.paused
		{

Replacement in tf-player/src/lib.rs at line 126 [4.11625]
B:BD[4.15413] → [3.24638:24685]
```
	pub fn state(&self) -> &RwLock<PlayerState> {
```
[4.15413]
[4.15608]
```
	pub fn state(&self) -> &RwLock<player::State> {
```
Replacement in tf-desktop/src/widget/tag_edit.rs at line 7 [4.16467]
∅:D[5.601] → [4.16596:16639]
B:BD[4.16596] → [4.16596:16639]
```
use crate::{command, theme::THEME_ACCENT};
```
[5.601]
[4.16639]
```
use crate::{command, theme};
```

Replacement in tf-desktop/src/widget/tag_edit.rs at line 28 [4.16467]

B:BD[4.17084] → [4.17084:17152]

						env.set(druid::theme::FOREGROUND_DARK, env.get(THEME_ACCENT))

[4.17084]

[4.17152]

						env.set(druid::theme::FOREGROUND_DARK, env.get(theme::ACCENT))

Insertion in tf-desktop/src/widget/player_tick.rs at line 11 [3.25049]
[3.25246]
[3.25246]
```
const DT: Duration = Duration::from_millis(500);
```
Replacement in tf-desktop/src/widget/player_tick.rs at line 19 [3.25049]
B:BD[3.25513] → [3.25513:25573]
```
				self.timer = Some(ctx.request_timer(Duration::SECOND));
```
[3.25513]
[3.25573]
```
				self.timer = Some(ctx.request_timer(DT));
```
Replacement in tf-desktop/src/widget/player_tick.rs at line 22 [3.25049]
B:BD[3.25632] → [3.25632:25692]
```
				self.timer = Some(ctx.request_timer(Duration::SECOND));
```
[3.25632]
[3.25692]
```
				self.timer = Some(ctx.request_timer(DT));
```
Replacement in tf-desktop/src/widget/player_bar.rs at line 9 [4.20566]
B:BD[5.770] → [5.770:798]
```
use tf_player::PlayerState;
```
[5.770]
[4.20883]
```
use tf_player::player;
```
Replacement in tf-desktop/src/widget/player_bar.rs at line 11 [4.20566]
B:BD[4.20884] → [4.20884:20904]
```
use crate::command;
```
[4.20884]
[4.20904]
```
use crate::{command, theme};
```
Replacement in tf-desktop/src/widget/player_bar.rs at line 18 [4.20566]
B:BD[4.21002] → [5.799:828]
```
type Data = Rc<PlayerState>;
```
[4.21002]
[4.21045]
```
type Data = Rc<player::state::Playing>;
```
Replacement in tf-desktop/src/widget/player_bar.rs at line 24 [4.20566]
∅:D[5.857] → [4.21243:21304]
B:BD[4.21243] → [4.21243:21304]
```
				if !ctx.is_disabled() && data.current_song().is_some() {
```
[5.857]
[4.21304]
```
				if !ctx.is_disabled() {
```

Replacement in tf-desktop/src/widget/player_bar.rs at line 37 [4.20566]

B:BD[4.21633] → [4.21633:21754]

B:BD[4.21754] → [5.858:921]

∅:D[5.921] → [4.21790:21797]

B:BD[4.21790] → [4.21790:21797]

					if let Some(song) = data.current_song() {
						let position = song.duration.mul_f64(evt.pos.x / ctx.size().width);
						ctx.submit_command(command::PLAYER_SEEK.with(position));
					}

[4.21594]

[4.21797]

					let position = data.song.duration.mul_f64(evt.pos.x / ctx.size().width);
					ctx.submit_command(command::PLAYER_SEEK.with(position));

Replacement in tf-desktop/src/widget/player_bar.rs at line 76 [4.20566]
B:BD[4.23023] → [4.23023:23067]
```
			&env.get(druid::theme::FOREGROUND_DARK),
```
[4.23023]
[4.23067]
```
			&env.get(theme::BACKGROUND_HIGHLIGHT0),
```

Replacement in tf-desktop/src/widget/player_bar.rs at line 85 [4.20566]

B:BD[4.23192] → [5.1012:1068]

B:BD[5.1068] → [3.25827:25897]

∅:D[5.1187] → [4.23475:23635]

∅:D[3.25897] → [4.23475:23635]

B:BD[4.23475] → [4.23475:23635]

B:BD[4.23750] → [4.23750:23828]

		if let Some((position, song)) = match data.as_ref() {
			PlayerState::Playing { offset, song, .. } => Some((offset, song)),
			_ => None,
		} {
			let progress = if ctx.is_active() {
				self.position_preview
			} else {
				position.as_secs_f64() / song.duration.as_secs_f64()
			};
			let progress_right = Point::new(size.width * progress, size.height / 2.0);

[4.23192]

[4.23828]

		let progress = if ctx.is_active() {
			self.position_preview
		} else {
			data.offset.as_secs_f64() / data.song.duration.as_secs_f64()
		};
		let progress_right = Point::new(size.width * progress, size.height / 2.0);

Replacement in tf-desktop/src/widget/player_bar.rs at line 92 [4.20566]

B:BD[4.23829] → [4.23829:24065]

			ctx.stroke_styled(
				Line::new(left, progress_right),
				&env.get(druid::theme::PRIMARY_DARK),
				6.0,
				&StrokeStyle {
					line_join: LineJoin::Round,
					line_cap: LineCap::Round,
					..Default::default()
				},
			);
		}

[4.23829]

[4.24065]

		ctx.stroke_styled(
			Line::new(left, progress_right),
			&env.get(theme::ACCENT),
			6.0,
			&StrokeStyle {
				line_join: LineJoin::Round,
				line_cap: LineCap::Round,
				..Default::default()
			},
		);

Replacement in tf-desktop/src/widget/knob.rs at line 89 [4.25789]
B:BD[4.27692] → [4.27692:27735]
```
		let mut arc_path: BezPath = kurbo::Arc {
```
[4.27692]
[4.27735]
```
		let arc_path: BezPath = kurbo::Arc {
```

Replacement in tf-desktop/src/widget/knob.rs at line 102 [4.25789]

B:BD[4.27969] → [4.27969:28050]

		arc_path.line_to(center);
		arc_path.line_to(center - Vec2::new(0.0, radius));

[4.27969]

[4.28050]

		let mut wheel = arc_path.clone();
		wheel.line_to(center);
		wheel.line_to(center - Vec2::new(0.0, radius));

Replacement in tf-desktop/src/widget/knob.rs at line 106 [4.25789]

B:BD[4.28051] → [4.28051:28114]

		ctx.fill(arc_path, &env.get(druid::theme::FOREGROUND_DARK));

[4.28051]

[4.28114]

		ctx.fill(wheel, &env.get(crate::theme::ACCENT));
		ctx.stroke(arc_path, &env.get(crate::theme::ACCENT_DIM), 2.0);

Replacement in tf-desktop/src/ui/mod.rs at line 1 [4.28167]
B:BD[4.28167] → [3.25986:26021]
```
use std::{rc::Rc, time::Duration};
```
[4.28167]
[5.1553]
```
use std::rc::Rc;
```
Replacement in tf-desktop/src/ui/mod.rs at line 4 [4.28167]
B:BD[4.28181] → [4.28181:28193]
```
	im, theme,
```
[4.28181]
[4.28193]
```
	im,
	kurbo::{BezPath, Circle},
	lens::Map,
	theme,
```
Replacement in tf-desktop/src/ui/mod.rs at line 10 [4.28167]
B:BD[5.1648] → [5.1648:1677]
```
		Scroll, SizedBox, TextBox,
```
[5.1648]
[4.28349]
```
		Painter, Scroll, SizedBox, TextBox,
```

Replacement in tf-desktop/src/ui/mod.rs at line 12 [4.28167]

B:BD[4.28353] → [4.28353:28408]

	Color, Insets, Key, TextAlignment, Widget, WidgetExt,

[4.28353]

[4.28408]

	Affine, Color, Env, EventCtx, Insets, Key, PaintCtx, RenderContext, TextAlignment, Widget,
	WidgetExt,

Replacement in tf-desktop/src/ui/mod.rs at line 15 [4.28167]
B:BD[4.28411] → [3.26022:26050]
```
use tf_player::PlayerState;
```
[4.28411]
[4.28411]
```
use tf_player::player;
```

Replacement in tf-desktop/src/ui/mod.rs at line 20 [4.28167]

B:BD[4.28478] → [5.1727:1805]

	widget::{player_bar::PlayerBar, player_tick::PlayerTick, tag_edit::TagEdit},

[4.28478]

[4.28570]

	widget::{player_tick::PlayerTick, tag_edit::TagEdit},

Insertion in tf-desktop/src/ui/mod.rs at line 26 [4.28167]
[4.28668]
[4.28668]
```
mod media_bar;
```

Replacement in tf-desktop/src/ui/mod.rs at line 53 [4.28167]

B:BD[4.29372] → [4.29372:29413]

	root.add_child(player_controller_ui());

[4.29372]

[5.1806]

	root.add_child(
		Maybe::new(|| media_bar::ui(), || SizedBox::empty())
			.lens(Map::new(
				|s: &Rc<player::State>| s.get_playing().map(|s| Rc::new(s.clone())),
				|s: &mut Rc<player::State>, inner: Option<Rc<player::state::Playing>>| {
					*s = Rc::new(
						inner
							.map(|s| player::State::Playing((*s).clone()))
							.unwrap_or(player::State::Idle),
					);
				},
			))
			.lens(State::player_state),
	);

Replacement in tf-desktop/src/ui/mod.rs at line 73 [4.28167]

B:BD[4.29548] → [4.29548:29738]

			.with_child(
				Button::new("▶")
					.on_click(|ctx, item: &mut SongListItem, _| {
						ctx.submit_command(command::SONG_PLAY.with(item.song.id))
					})
					.expand_height(),
			)

[4.29548]

[4.29738]

			.with_child(play_button())

Replacement in tf-desktop/src/ui/mod.rs at line 81 [4.28167]

B:BD[4.29920] → [4.29920:29994]

				Button::new("✎")
					.on_click(|ctx, item: &mut SongListItem, _| {

[4.29920]

[4.29994]

				Painter::new(|ctx, _, env| draw_icon_button(ctx, env, ICON_EDIT))
					.fix_size(36.0, 36.0)
					.on_click(|ctx: &mut EventCtx, item: &mut SongListItem, _| {

Replacement in tf-desktop/src/ui/mod.rs at line 85 [4.28167]
B:BD[4.30066] → [4.30066:30097]
```
					})
					.expand_height(),
```
[4.30066]
[4.30097]
```
					}),
```

Replacement in tf-desktop/src/ui/mod.rs at line 88 [4.28167]

B:BD[4.30118] → [4.30118:30193]

				Button::new("🗑")
					.on_click(|ctx, item: &mut SongListItem, _| {

[4.30118]

[4.30193]

				Painter::new(|ctx, _, env| draw_icon_button(ctx, env, ICON_DELETE))
					.fix_size(36.0, 36.0)
					.on_click(|ctx: &mut EventCtx, item: &mut SongListItem, _| {

Replacement in tf-desktop/src/ui/mod.rs at line 92 [4.28167]
B:BD[4.30259] → [4.30259:30290]
```
					})
					.expand_height(),
```
[4.30259]
[4.30290]
```
					}),
```
Replacement in tf-desktop/src/ui/mod.rs at line 102 [4.28167]
B:BD[4.30442] → [4.30442:30480]
```
						env.get(theme::BACKGROUND_DARK)
```
[4.30442]
[4.30480]
```
						env.get(crate::theme::BACKGROUND_HIGHLIGHT0)
```

Replacement in tf-desktop/src/ui/mod.rs at line 108 [4.28167]

B:BD[4.30539] → [4.30539:30704]

			Flex::row()
				.with_flex_child(
					Container::new(row).background(SONG_LIST_ITEM_BACKGROUND),
					1.0,
				)
				.with_child(SizedBox::empty().width(10.0)),

[4.30539]

[4.30704]

			Container::new(row).background(SONG_LIST_ITEM_BACKGROUND),

Replacement in tf-desktop/src/ui/mod.rs at line 115 [4.28167]

B:BD[4.30774] → [4.30774:31444]

	Flex::column()
		.cross_axis_alignment(CrossAxisAlignment::Fill)
		.with_child(
			Flex::row()
				.with_child(Label::new("title"))
				.with_child(TextBox::new().lens(SongEdit::title)),
		)
		.with_default_spacer()
		.with_child(
			Flex::row()
				.with_child(Label::new("source"))
				.with_child(TextBox::new().lens(SongEdit::source)),
		)
		.with_default_spacer()
		.with_child(List::new(|| TagEdit::new()).lens(SongEdit::tags))
		.with_child(Button::new("+").on_click(|ctx, data: &mut SongEdit, _| {
			ctx.submit_command(command::TAG_ADD.with(*data.id))
		}))
		.with_flex_spacer(1.0)
		.with_child(
			Button::new("CLOSE").on_click(|ctx, _: &mut SongEdit, _| {

[4.30774]

[4.31444]

	let col =
		Flex::column()
			.cross_axis_alignment(CrossAxisAlignment::Fill)
			.with_child(
				Flex::row()
					.with_child(Label::new("title"))
					.with_child(TextBox::new().lens(SongEdit::title)),
			)
			.with_default_spacer()
			.with_child(
				Flex::row()
					.with_child(Label::new("source"))
					.with_child(TextBox::new().lens(SongEdit::source)),
			)
			.with_default_spacer()
			.with_child(List::new(|| TagEdit::new()).lens(SongEdit::tags))
			.with_child(Button::new("+").on_click(|ctx, data: &mut SongEdit, _| {
				ctx.submit_command(command::TAG_ADD.with(*data.id))
			}))
			.with_flex_spacer(1.0)
			.with_child(Button::new("CLOSE").on_click(|ctx, _: &mut SongEdit, _| {

Replacement in tf-desktop/src/ui/mod.rs at line 137 [4.28167]

B:BD[4.31496] → [4.31496:31598]

			}),
		)
		.env_scope(|env, _| env.set(theme::BORDER_DARK, Color::TRANSPARENT))
		.fix_width(400.0)

[4.31496]

[4.31598]

			}))
			.env_scope(|env, _| env.set(theme::BORDER_DARK, Color::TRANSPARENT))
			.fix_width(400.0)
			.padding(8.0);
	Container::new(col).background(crate::theme::BACKGROUND_HIGHLIGHT0)

Replacement in tf-desktop/src/ui/mod.rs at line 171 [4.28167]

B:BD[4.32239] → [4.32239:32351]

B:BD[4.32351] → [5.1886:1911]

∅:D[5.1911] → [4.32351:32385]

B:BD[4.32351] → [4.32351:32385]

B:BD[4.32385] → [5.1912:2073]

∅:D[5.2073] → [4.32481:32515]

B:BD[4.32481] → [4.32481:32515]

B:BD[4.32515] → [5.2074:2099]

∅:D[5.2099] → [4.32515:32551]

B:BD[4.32515] → [4.32515:32551]

fn player_controller_ui() -> impl Widget<State> {
	let buttons = Flex::row()
		.with_child(Button::new("🔀"))
		.with_default_spacer()
		.with_child(Button::new("⏮"))
		.with_default_spacer()
		.with_child(
			Button::new("⏯").on_click(|ctx, _, _| ctx.submit_command(command::PLAYER_PLAY_PAUSE)),
		)
		.with_default_spacer()
		.with_child(Button::new("⏭"))
		.with_default_spacer()
		.with_child(Button::new("🔁"));

[4.32239]

[4.32551]

fn play_button() -> impl Widget<SongListItem> {
	Painter::new(|ctx, _: &SongListItem, env| draw_icon_button(ctx, env, ICON_PLAY))
		.fix_size(36.0, 36.0)
		.on_click(|ctx: &mut EventCtx, item: &mut SongListItem, _| {
			ctx.submit_command(command::SONG_PLAY.with(item.song.id));
		})
}

Replacement in tf-desktop/src/ui/mod.rs at line 179 [4.28167]

B:BD[4.32605] → [4.32605:32644]

B:BD[4.32644] → [5.2100:2564]

∅:D[5.2564] → [4.32663:32681]

B:BD[4.32663] → [4.32663:32681]

B:BD[4.32681] → [5.2565:2594]

∅:D[5.2594] → [4.32681:32683]

B:BD[4.32681] → [4.32681:32683]

	Flex::column()
		.with_child(buttons)
		.with_child(
			Flex::row()
				.with_child(Label::new(|data: &Rc<PlayerState>, _: &_| {
					format_duration(data.current_time().unwrap_or(&Duration::ZERO))
				}))
				.with_default_spacer()
				.with_flex_child(PlayerBar::default(), 1.0)
				.with_default_spacer()
				.with_child(Label::new(|data: &Rc<PlayerState>, _: &_| {
					format_duration(
						data.current_song()
							.map(|s| &s.duration)
							.unwrap_or(&Duration::ZERO),
					)
				})),
		)
		.expand_width()
		.lens(State::player_state)
}

[4.32552]

[5.2595]

pub const ICON_PLAY: &str = "M0.750,0.567 L0.750,1.433 L1.500,1.000 L0.750,0.567";
pub const ICON_PAUSE: &str = "M0.598,0.521 L0.598,1.479 L0.866,1.479 L0.866,0.521 L0.598,0.521 M1.402,0.521 L1.134,0.521 L1.134,1.479 L1.402,1.479 L1.402,0.521";
pub const ICON_PREV: &str = "M1.250,0.567 L0.700,0.885 L0.700,0.567 L0.500,0.567 L0.500,1.000 L0.500,1.433 L0.700,1.433 L0.700,1.115 L1.250,1.433 L1.250,0.567";
pub const ICON_NEXT: &str = "M0.750,1.433 L1.300,1.115 L1.300,1.433 L1.500,1.433 L1.500,1.000 L1.500,0.567 L1.300,0.567 L1.300,0.885 L0.750,0.567 L0.750,1.433";
pub const ICON_EDIT: &str = "M1.000 0.513 L0.700,0.513 L0.700,1.000 L0.700,1.487 L1.000,1.487 L1.300,1.487 L1.300,1.017 L1.024,1.017 L1.024,0.699 L1.210,0.513 L1.000,0.513 M1.654 0.564 L1.477,0.387 L1.124,0.741 L1.124,0.917 L1.300,0.917 L1.654,0.564";
pub const ICON_DELETE: &str = "M0.814 1.394 L1.000,1.394 L1.186,1.394 A0.044,0.044 0 0,0 1.229,1.357 L1.348,0.695 A0.044,0.044 0 0,0 1.393,0.651 A0.044,0.044 0 0,0 1.348,0.606 L0.652,0.606 A0.044,0.044 0 0,0 0.607,0.651 A0.044,0.044 0 0,0 0.652,0.695 L0.771,1.357 A0.044,0.044 0 0,0 0.814,1.394";

Replacement in tf-desktop/src/ui/mod.rs at line 186 [4.28167]

B:BD[5.2596] → [5.2596:2701]

fn format_duration(d: &Duration) -> String {
	format!("{:02}:{:02}", d.as_secs() / 60, d.as_secs() % 60)

[5.2596]

[5.2701]

pub fn draw_icon_button(ctx: &mut PaintCtx, env: &Env, icon_svg: &str) {
	let size = ctx.size();
	let rad = size.min_side() / 2.0;
	if ctx.is_hot() {
		ctx.fill(
			Circle::new((size.to_vec2() / 2.0).to_point(), rad),
			&env.get(crate::theme::BACKGROUND_HIGHLIGHT1),
		);
	}
	ctx.fill(
		Affine::scale(rad) * BezPath::from_svg(icon_svg).unwrap(),
		&env.get(theme::FOREGROUND_LIGHT),
	);

File addition: media_bar.rs (----------)

[4.28134]

use std::{rc::Rc, time::Duration};
use druid::{
	widget::{Flex, Label, Painter},
	EventCtx, Widget, WidgetExt,
};
use tf_player::player::{self, state::Playing};
use super::{draw_icon_button, ICON_NEXT, ICON_PAUSE, ICON_PLAY, ICON_PREV};
use crate::{command, widget::player_bar::PlayerBar};
pub fn ui() -> impl Widget<Rc<player::state::Playing>> {
	let buttons = Flex::row()
		.with_child(prev_button())
		.with_default_spacer()
		.with_child(play_pause_button())
		.with_default_spacer()
		.with_child(next_button());
	Flex::column()
		.with_child(buttons)
		.with_child(
			Flex::row()
				.with_child(Label::new(|data: &Rc<Playing>, _: &_| {
					format_duration(&data.offset)
				}))
				.with_default_spacer()
				.with_flex_child(PlayerBar::default(), 1.0)
				.with_default_spacer()
				.with_child(Label::new(|data: &Rc<Playing>, _: &_| {
					format_duration(&data.song.duration)
				})),
		)
		.expand_width()
}
fn play_pause_button() -> impl Widget<Rc<Playing>> {
	Painter::new(|ctx, data: &Rc<Playing>, env| {
		draw_icon_button(ctx, env, if data.paused { ICON_PLAY } else { ICON_PAUSE })
	})
	.fix_size(36.0, 36.0)
	.on_click(|ctx: &mut EventCtx, _, _| {
		ctx.submit_command(command::PLAYER_PLAY_PAUSE);
	})
}
fn prev_button() -> impl Widget<Rc<Playing>> {
	Painter::new(|ctx, _, env| draw_icon_button(ctx, env, ICON_PREV))
		.fix_size(36.0, 36.0)
		.on_click(|ctx: &mut EventCtx, _, _| {
			ctx.submit_command(command::PLAYER_PREV);
		})
}
fn next_button() -> impl Widget<Rc<Playing>> {
	Painter::new(|ctx, _, env| draw_icon_button(ctx, env, ICON_NEXT))
		.fix_size(36.0, 36.0)
		.on_click(|ctx: &mut EventCtx, _, _| {
			ctx.submit_command(command::PLAYER_NEXT);
		})
}
fn format_duration(d: &Duration) -> String {
	format!("{:02}:{:02}", d.as_secs() / 60, d.as_secs() % 60)
}

Replacement in tf-desktop/src/theme.rs at line 5 [4.32717]

B:BD[4.32768] → [4.32768:32831]

pub const THEME_ACCENT: Key<Color> = Key::new("theme.accent");

[4.32768]

[4.32831]

pub const ACCENT: Key<Color> = Key::new("theme.accent");
pub const ACCENT_DIM: Key<Color> = Key::new("theme.accent-dim");
pub const BACKGROUND: Key<Color> = Key::new("theme.background");
pub const BACKGROUND_HIGHLIGHT0: Key<Color> = Key::new("theme.background-highlight-0");
pub const BACKGROUND_HIGHLIGHT1: Key<Color> = Key::new("theme.background-highlight-1");

Replacement in tf-desktop/src/theme.rs at line 15 [4.32717]

B:BD[4.32938] → [4.32938:32977]

const ACCENT: Color = color(0x26c4e7);

[4.32938]

[4.32977]

mod colors {
	use druid::Color;
	use super::color;
	pub const BACKGROUND: Color = color(0x282C34);
	pub const BACKGROUND_HIGHLIGHT0: Color = color(0x2c313a);
	pub const BACKGROUND_HIGHLIGHT1: Color = color(0x3a404c);
	pub const ACCENT: Color = color(0x98c379);
	pub const ACCENT_DIM: Color = color(0x8bb16e);
}

Replacement in tf-desktop/src/theme.rs at line 28 [4.32717]

B:BD[4.33023] → [4.33023:33055]

	env.set(THEME_ACCENT, ACCENT);

[4.33023]

[4.33055]

	env.set(ACCENT, colors::ACCENT);
	env.set(ACCENT_DIM, colors::ACCENT_DIM);
	env.set(BACKGROUND, colors::BACKGROUND);
	env.set(BACKGROUND_HIGHLIGHT0, colors::BACKGROUND_HIGHLIGHT0);
	env.set(BACKGROUND_HIGHLIGHT1, colors::BACKGROUND_HIGHLIGHT1);

Replacement in tf-desktop/src/theme.rs at line 36 [4.32717]

B:BD[4.33081] → [4.33081:33225]

		env.set(WINDOW_BACKGROUND_COLOR, color(0xffffff));
		env.set(BACKGROUND_DARK, color(0xeeeeee));
		env.set(BACKGROUND_LIGHT, color(0xffffff));

[4.33081]

[4.33225]

		env.set(WINDOW_BACKGROUND_COLOR, color(0x282C34));
		env.set(BACKGROUND_DARK, color(0x282C34));
		env.set(BACKGROUND_LIGHT, color(0x363b43));

Replacement in tf-desktop/src/theme.rs at line 40 [4.32717]

B:BD[4.33226] → [4.33226:33308]

		env.set(TEXT_COLOR, color(0x000000));
		env.set(CURSOR_COLOR, color(0x000000));

[4.33226]

[4.33308]

		env.set(TEXT_COLOR, color(0xFFFFFF));
		env.set(CURSOR_COLOR, color(0xFFFFFF));

Replacement in tf-desktop/src/theme.rs at line 43 [4.32717]

B:BD[4.33309] → [4.33309:33392]

		env.set(BUTTON_DARK, color(0xeeeeee));
		env.set(BUTTON_LIGHT, color(0xcccccc));

[4.33309]

[4.33392]

		env.set(BUTTON_DARK, color(0x282C34));
		env.set(BUTTON_LIGHT, color(0x282C34));

Replacement in tf-desktop/src/theme.rs at line 46 [4.32717]

B:BD[4.33393] → [4.33393:33519]

		env.set(BORDER_LIGHT, color(0x000000));
		env.set(BORDER_DARK, color(0xaaaaaa));
		env.set(PRIMARY_LIGHT, color(0x26c4e7));

[4.33393]

[4.33519]

		env.set(BORDER_LIGHT, color(0xFFFFFF));
		env.set(BORDER_DARK, color(0x21252b));
		env.set(PRIMARY_LIGHT, color(0x98c379));

Replacement in tf-desktop/src/theme.rs at line 52 [4.32717]
B:BD[4.33606] → [4.33606:33642]
```
		// env.set(TEXTBOX_INSETS, 12.0);
```
[4.33606]
[4.33642]
```
		env.set(TEXTBOX_INSETS, 8.0);
```
Replacement in tf-desktop/src/state.rs at line 7 [4.33681]
B:BD[4.33808] → [3.26069:26097]
```
use tf_player::PlayerState;
```
[4.33808]
[4.33841]
```
use tf_player::player;
```
Replacement in tf-desktop/src/state.rs at line 15 [4.33681]
B:BD[5.2789] → [5.2789:2825]
```
	pub player_state: Rc<PlayerState>,
```
[5.2789]
[4.34024]
```
	pub player_state: Rc<player::State>,
```
Replacement in tf-desktop/src/state.rs at line 37 [4.33681]
B:BD[4.34436] → [5.2871:2921]
```
			player_state: Rc::new(PlayerState::default()),
```
[4.34436]
[4.34478]
```
			player_state: Rc::new(player::State::default()),
```

Insertion in tf-desktop/src/command.rs at line 11 [4.40078]

[5.4105]

[4.40207]

pub const PLAYER_PREV: Selector = Selector::new("player.seek");
pub const PLAYER_NEXT: Selector = Selector::new("player.seek");

some styling

Dependencies

In channels

Change contents

Insertion in tf-player/src/player/mod.rs at line 9 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 12 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 29 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 40 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 57 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 87 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 117 [3.20875]

Replacement in tf-player/src/player/mod.rs at line 121 [3.20875]

Deletion in tf-player/src/lib.rs at line 22 [4.11625]

Deletion in tf-player/src/lib.rs at line 23 [4.11625]

Replacement in tf-player/src/lib.rs at line 27 [4.11625]

Replacement in tf-player/src/lib.rs at line 108 [4.11625]

Replacement in tf-player/src/lib.rs at line 126 [4.11625]

Replacement in tf-desktop/src/widget/tag_edit.rs at line 7 [4.16467]

Replacement in tf-desktop/src/widget/tag_edit.rs at line 28 [4.16467]

Insertion in tf-desktop/src/widget/player_tick.rs at line 11 [3.25049]

Replacement in tf-desktop/src/widget/player_tick.rs at line 19 [3.25049]

Replacement in tf-desktop/src/widget/player_tick.rs at line 22 [3.25049]

Replacement in tf-desktop/src/widget/player_bar.rs at line 9 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 11 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 18 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 24 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 37 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 76 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 85 [4.20566]

Replacement in tf-desktop/src/widget/player_bar.rs at line 92 [4.20566]

Replacement in tf-desktop/src/widget/knob.rs at line 89 [4.25789]

Replacement in tf-desktop/src/widget/knob.rs at line 102 [4.25789]

Replacement in tf-desktop/src/widget/knob.rs at line 106 [4.25789]

Replacement in tf-desktop/src/ui/mod.rs at line 1 [4.28167]

Replacement in tf-desktop/src/ui/mod.rs at line 4 [4.28167]

Replacement in tf-desktop/src/ui/mod.rs at line 10 [4.28167]