Compare commits

...
4 Commits
Author SHA1 Message Date
Ansho Rei 341ae614e1 feat: add a cover backdrop slider to the settings
The first range setting: its row draws a slider, and left and right
change it in steps of 10 while confirm still flips the toggles. Saved
as cover_backdrop in settings.toml, defaulting to the old fixed look.

Up to the default the cover fades in under the old overlay. Above it
the overlay thins as well, down to 0.55 on the left where the title and
progress sit, which kept them readable over a bright cover.
2026-11-04 14:31:17 +01:00
Ansho Rei 2e8b2e6a02 feat: flip the now-playing cover when the picture changes
The cover turns edge-on, swaps, and turns back with an overshooting
curve. Slint has no perspective, so the turn squashes the width.

Whether to flip is decided by a hash of the decoded pixels, not by the
cover id: Navidrome gives every track its own id even when the whole
album shares one image. While the new cover loads the old one stays up,
and the next track's cover is fetched ahead so a skip decides at once.
2026-11-04 13:44:38 +01:00
Ansho Rei 578a4f5607 fix: enlarge the app icon's mark so it reads at small sizes
The tile now starts 2 units from the edge instead of 8 and the mark is
100 tall instead of 74, nudged up 1 unit because its base reads heavier
than the R.
2026-11-04 13:06:36 +01:00
Ansho Rei d90191618d fix: centre the logo on the login screen 2026-11-04 13:05:46 +01:00
15 changed files with 418 additions and 34 deletions
+24
View File
@@ -2,6 +2,30 @@
One section per version, newest first.
## v0.6.4 (2026-11-04)
### Features
- Settings has a Cover backdrop slider for how much of the cover shows behind the now-playing screen, from off to 100 in steps of 10. Left and right change it. The default looks as before, and the strongest setting still keeps the text readable over a bright cover.
## v0.6.3 (2026-11-04)
### Features
- On the now-playing screen the cover flips around when the next track has a different picture, and settles with a small bounce. Tracks that share a picture do not flip, even on servers such as Navidrome that give every track its own cover id.
## v0.6.2 (2026-11-04)
### Bug fixes
- The app icon has thinner margins and a larger mark, so it stays legible at small sizes such as a taskbar or a repository avatar.
## v0.6.1 (2026-11-04)
### Bug fixes
- The logo is centred on the login screen.
## v0.6.0 (2026-11-04)
### Features
Generated
+1 -1
View File
@@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]]
name = "remus"
version = "0.6.0"
version = "0.6.4"
dependencies = [
"anyhow",
"directories",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "remus"
version = "0.6.0"
version = "0.6.4"
edition = "2024"
license = "MIT"
+5 -3
View File
@@ -166,12 +166,14 @@ def variants() -> dict[str, str]:
# Full-bleed square, the composition of the source artwork.
v["remus-square.svg"] = svg(1024, 1024, mark(CREAM, 512, 512, 512), MAROON)
# Desktop / Flatpak app icon: rounded tile with a margin, 128 grid.
# Desktop / Flatpak app icon: rounded tile on a 128 grid. The margins are
# kept thin so the mark stays legible at 16 to 32 px. The mark sits 1 unit
# above centre because its wide base reads heavier than the R.
v["remus-icon.svg"] = svg(
128,
128,
f'<rect x="8" y="8" width="112" height="112" rx="26" fill="{MAROON}"/>'
+ mark(CREAM, 64, 64, 74),
f'<rect x="2" y="2" width="124" height="124" rx="24" fill="{MAROON}"/>'
+ mark(CREAM, 64, 63, 100),
)
# Lockups with the wordmark, transparent background.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="8" y="8" width="112" height="112" rx="26" fill="#5a0712"/><g fill="#faebda" transform="translate(64 64) scale(0.117741) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="2" y="2" width="124" height="124" rx="24" fill="#5a0712"/><g fill="#faebda" transform="translate(64 63) scale(0.159109) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

@@ -20,6 +20,10 @@
</supports>
<content_rating type="oars-1.1"/>
<releases>
<release version="0.6.4" date="2026-11-04"/>
<release version="0.6.3" date="2026-11-04"/>
<release version="0.6.2" date="2026-11-04"/>
<release version="0.6.1" date="2026-11-04"/>
<release version="0.6.0" date="2026-11-04"/>
<release version="0.5.0" date="2026-11-04"/>
<release version="0.4.0" date="2026-11-04"/>
+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="8" y="8" width="112" height="112" rx="26" fill="#5a0712"/><g fill="#faebda" transform="translate(64 64) scale(0.117741) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="2" y="2" width="124" height="124" rx="24" fill="#5a0712"/><g fill="#faebda" transform="translate(64 63) scale(0.159109) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

+289 -21
View File
@@ -124,10 +124,14 @@ enum Target {
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
enum Setting {
AlbumArtColours,
CoverBackdrop,
}
/// How long the UI takes to change from one palette to the next.
const FADE: Duration = Duration::from_millis(800);
/// How long the now-playing cover takes to turn edge-on, the `in` animation
/// of the `turned` state in NowPlayingView. The turn back is in the .slint.
const FLIP_OUT: Duration = Duration::from_millis(170);
/// The palette on screen and the one it is fading towards.
struct Fade {
@@ -199,6 +203,8 @@ struct Covers {
/// Per cover id, whatever size it was decoded at. None for a cover with
/// too little colour to base a palette on.
tones: LruCache<String, Option<Tone>>,
/// Hash of each decoded cover's pixels, to tell two ids with one picture.
prints: LruCache<CoverKey, u64>,
pending: HashSet<CoverKey>,
failed: HashSet<CoverKey>,
limit: Arc<Semaphore>,
@@ -247,6 +253,20 @@ pub struct App {
icons: RefCell<HashMap<(Prompts, Control), Vec<Image>>>,
settings: Settings,
fade: Fade,
/// The now-playing art on screen, `None` when nothing is playing.
art_shown: Option<ShownArt>,
/// Runs while the cover turns away; the new art goes up when it fires.
flip_timer: Timer,
}
/// What the now-playing art shows, to decide whether a track change flips it.
/// Compared by picture, not by id: Navidrome gives every track its own cover
/// id even when the whole album shares one image.
struct ShownArt {
/// Cover id of the track the art belongs to.
id: Option<String>,
/// Hash of the decoded cover, `None` for the letter placeholder.
print: Option<u64>,
}
impl App {
@@ -282,6 +302,7 @@ impl App {
covers: Covers {
images: LruCache::new(NonZeroUsize::new(400).unwrap()),
tones: LruCache::new(NonZeroUsize::new(400).unwrap()),
prints: LruCache::new(NonZeroUsize::new(400).unwrap()),
pending: HashSet::new(),
failed: HashSet::new(),
limit: Arc::new(Semaphore::new(6)),
@@ -302,6 +323,8 @@ impl App {
last_save: Instant::now(),
login_focus: 0,
toast_timer: Timer::default(),
art_shown: None,
flip_timer: Timer::default(),
prompts: Prompts::Keyboard,
icons: RefCell::default(),
settings: config::load_settings(),
@@ -316,6 +339,7 @@ impl App {
}
fn start(&mut self) {
self.render_backdrop();
let labels: Vec<SharedString> = SECTIONS.iter().map(|s| s.label().into()).collect();
self.ui.set_sections(ModelRc::new(VecModel::from(labels)));
@@ -554,6 +578,9 @@ impl App {
_ => {}
},
Area::Content => match a {
Action::Left | Action::Right if let Some(s) = self.selected_range_setting() => {
self.adjust_setting(s, a == Action::Right)
}
Action::Up | Action::Down | Action::Left | Action::Right | Action::PageUp | Action::PageDown => {
self.move_sel(a)
}
@@ -849,12 +876,43 @@ impl App {
}
}
/// The range setting under the selection, which left and right adjust.
fn selected_range_setting(&self) -> Option<Setting> {
let page = self.current_page()?;
match page.entries.get(page.sel)?.target {
Target::Setting(s @ Setting::CoverBackdrop) => Some(s),
_ => None,
}
}
// ---------------------------------------------------------------- settings
fn toggle_setting(&mut self, setting: Setting) {
match setting {
Setting::AlbumArtColours => self.settings.album_art_colours = !self.settings.album_art_colours,
// A range: left and right change it, confirm does nothing.
Setting::CoverBackdrop => return,
}
self.settings_changed();
}
/// Moves a range setting one step up or down.
fn adjust_setting(&mut self, setting: Setting, up: bool) {
match setting {
Setting::CoverBackdrop => {
let v = step_backdrop(self.settings.cover_backdrop, up);
if v == self.settings.cover_backdrop {
return;
}
self.settings.cover_backdrop = v;
}
Setting::AlbumArtColours => return,
}
self.settings_changed();
}
/// Saves the settings and shows what they change.
fn settings_changed(&mut self) {
if let Err(e) = config::save_settings(&self.settings) {
self.toast(format!("Could not save settings: {e:#}"));
}
@@ -866,9 +924,17 @@ impl App {
self.sync_items(true);
}
}
self.render_backdrop();
self.update_theme();
}
fn render_backdrop(&self) {
let (opacity, left, right) = backdrop_look(self.settings.cover_backdrop);
self.ui.set_np_backdrop_opacity(opacity);
self.ui.set_np_backdrop_left(left);
self.ui.set_np_backdrop_right(right);
}
// ---------------------------------------------------------------- theme
/// The palette the UI should show: from the playing track's cover when
@@ -1277,6 +1343,10 @@ impl App {
_ => false,
};
let cover = entry.cover.as_deref().and_then(|id| self.cover(id, px));
let level = match entry.target {
Target::Setting(Setting::CoverBackdrop) => Some(self.settings.cover_backdrop as f32 / 100.0),
_ => None,
};
Some(Item {
index: index as i32,
letter: initial(&entry.title).into(),
@@ -1290,6 +1360,8 @@ impl App {
round: entry.round,
show_art: entry.show_art,
playing,
slider: level.is_some(),
level: level.unwrap_or_default(),
})
}
@@ -1333,6 +1405,7 @@ impl App {
.map(|e| &e.target);
match target {
Some(Target::Song(_)) => h(Control::Activate, "Play"),
Some(Target::Setting(Setting::CoverBackdrop)) => h(Control::Seek, "Adjust"),
Some(Target::Setting(_)) => h(Control::Activate, "Change"),
Some(_) => h(Control::Activate, "Open"),
None if self.current_page().is_some_and(|p| p.error.is_some()) => {
@@ -1449,11 +1522,12 @@ impl App {
None
}
fn cover_loaded(&mut self, key: CoverKey, result: Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>)>) {
fn cover_loaded(&mut self, key: CoverKey, result: Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>, u64)>) {
self.covers.pending.remove(&key);
match result {
Ok((buf, tone)) => {
Ok((buf, tone, print)) => {
self.covers.images.put(key.clone(), Image::from_rgb8(buf));
self.covers.prints.put(key.clone(), print);
// The first size decoded decides: other sizes give a tone that
// differs in the last digits, which would restart the fade.
if !self.covers.tones.contains(&key.0) {
@@ -1463,7 +1537,16 @@ impl App {
}
Err(e) => {
log::debug!("cover {} failed: {e:#}", key.0);
// The playing track's art may be waiting on this to flip.
let playing = self
.current
.and_then(|i| self.queue.get(i))
.and_then(|s| s.cover_art.as_deref())
== Some(key.0.as_str());
self.covers.failed.insert(key);
if playing {
self.render_player();
}
// The playing track's cover failing means the brand palette.
self.update_theme();
return;
@@ -1773,18 +1856,16 @@ impl App {
self.ui.set_np_paused(self.paused);
match song {
Some(s) => {
let px = self.now_playing_px();
let cover = s.cover_art.as_deref().and_then(|id| self.cover(id, px));
self.ui
.set_np_letter(initial(s.album.as_deref().unwrap_or(&s.title)).into());
self.ui.set_np_tint(tint(s.album.as_deref().unwrap_or(&s.title)));
self.ui.set_np_has_cover(cover.is_some());
self.ui.set_np_cover(cover.unwrap_or_default());
self.update_art(&s);
self.prefetch_next_cover();
self.ui.set_np_title(s.title.into());
self.ui.set_np_artist(s.artist.unwrap_or_default().into());
self.ui.set_np_album(s.album.unwrap_or_default().into());
}
None => {
self.flip_timer.stop();
self.ui.set_np_flip_out(false);
self.art_shown = None;
self.ui.set_np_has_cover(false);
self.ui.set_np_cover(Image::default());
self.ui.set_np_letter("".into());
@@ -1797,6 +1878,94 @@ impl App {
self.update_theme();
}
/// Shows the song's art, flipping the cover if it is a different picture
/// from the one on screen. While a changed track's cover loads, the old one
/// stays up: the load ends in a render either way, and decides then.
fn update_art(&mut self, s: &Song) {
if self.flip_timer.running() {
// Mid-turn: the midpoint puts up whatever is current then.
return;
}
let Some(shown) = &self.art_shown else {
// From nothing playing: no flip, the cover fades in when it loads.
self.render_art(s);
return;
};
if shown.id == s.cover_art || self.screen != Screen::NowPlaying {
self.render_art(s);
return;
}
let Some(print) = self.art_print(s) else { return };
if Some(print) == self.art_shown.as_ref().map(|a| a.print) {
log::debug!("same cover picture under a new id, no flip");
self.render_art(s);
} else {
log::debug!("cover picture changed, flipping");
self.ui.set_np_flip_out(true);
self.flip_timer
.start(slint::TimerMode::SingleShot, FLIP_OUT, || with_app(|app| app.flip_in()));
}
}
/// The picture the song's art will show: `Some(None)` for the placeholder,
/// `None` while its cover is still loading.
fn art_print(&mut self, s: &Song) -> Option<Option<u64>> {
let Some(id) = s.cover_art.as_deref() else {
return Some(None);
};
let key: CoverKey = (id.to_string(), self.now_playing_px());
if let Some(p) = self.covers.prints.get(&key) {
return Some(Some(*p));
}
if self.covers.failed.contains(&key) {
return Some(None);
}
// Starts the load if it is not under way.
self.cover(id, key.1);
None
}
/// Loads the next track's cover at the now-playing size, so a skip can
/// tell at once whether the picture changes.
fn prefetch_next_cover(&mut self) {
if self.screen != Screen::NowPlaying {
return;
}
let next = self.current.and_then(|i| self.queue.get(i + 1));
if let Some(id) = next.and_then(|s| s.cover_art.clone()) {
let px = self.now_playing_px();
self.cover(&id, px);
}
}
/// Puts the song's cover, or its letter placeholder, on screen.
fn render_art(&mut self, s: &Song) {
let px = self.now_playing_px();
let cover = s.cover_art.as_deref().and_then(|id| self.cover(id, px));
let print = s
.cover_art
.as_ref()
.and_then(|id| self.covers.prints.get(&(id.clone(), px)).copied())
.filter(|_| cover.is_some());
let name = s.album.as_deref().unwrap_or(&s.title);
self.ui.set_np_letter(initial(name).into());
self.ui.set_np_tint(tint(name));
self.ui.set_np_has_cover(cover.is_some());
self.ui.set_np_cover(cover.unwrap_or_default());
self.art_shown = Some(ShownArt {
id: s.cover_art.clone(),
print,
});
}
/// The cover is edge-on: swap in the current track's art and turn it back.
fn flip_in(&mut self) {
if let Some(s) = self.current.and_then(|i| self.queue.get(i)).cloned() {
self.render_art(&s);
}
self.ui.set_np_flip_out(false);
}
// ---------------------------------------------------------------- now playing
fn open_now_playing(&mut self) {
@@ -1892,6 +2061,8 @@ impl App {
round: false,
show_art: true,
playing: Some(index) == self.current,
slider: false,
level: 0.0,
}
}
}
@@ -1980,20 +2151,70 @@ fn song_entry(s: &Song, index: usize) -> Entry {
fn settings_data(s: &Settings) -> PageData {
let on_off = |on: bool| if on { "On" } else { "Off" }.to_string();
PageData {
entries: vec![Entry {
title: "Colours from album art".to_string(),
subtitle: "Tint the interface with the cover of the playing track".to_string(),
detail: on_off(s.album_art_colours),
number: String::new(),
cover: None,
round: false,
show_art: false,
target: Target::Setting(Setting::AlbumArtColours),
}],
entries: vec![
Entry {
title: "Colours from album art".to_string(),
subtitle: "Tint the interface with the cover of the playing track".to_string(),
detail: on_off(s.album_art_colours),
number: String::new(),
cover: None,
round: false,
show_art: false,
target: Target::Setting(Setting::AlbumArtColours),
},
Entry {
title: "Cover backdrop".to_string(),
subtitle: "How much of the cover shows behind the now-playing screen".to_string(),
detail: if s.cover_backdrop == 0 {
"Off".to_string()
} else {
s.cover_backdrop.to_string()
},
number: String::new(),
cover: None,
round: false,
show_art: false,
target: Target::Setting(Setting::CoverBackdrop),
},
],
..Default::default()
}
}
/// One step of the cover backdrop setting, kept within 0 to 100.
fn step_backdrop(v: u8, up: bool) -> u8 {
let v = v.min(100);
if up { (v + 10).min(100) } else { v.saturating_sub(10) }
}
/// The now-playing backdrop for a strength of 0 to 100: the cover's opacity
/// and the background alpha over it at the left and right edges.
///
/// Up to the default the cover fades in under today's overlay. Above it the
/// overlay thins too, but never below 0.55 on the left, where the title and
/// progress are, so the text stays readable over a bright cover.
fn backdrop_look(v: u8) -> (f32, f32, f32) {
// Today's look, reached at the default.
const OPACITY: f32 = 0.16;
const LEFT: f32 = 0.67;
const RIGHT: f32 = 0.95;
// The strongest, at 100.
const OPACITY_MAX: f32 = 0.40;
const LEFT_MIN: f32 = 0.55;
const RIGHT_MIN: f32 = 0.80;
let v = v.min(100) as f32;
let d = config::COVER_BACKDROP_DEFAULT as f32;
if v <= d {
return (OPACITY * v / d, LEFT, RIGHT);
}
let u = (v - d) / (100.0 - d);
(
OPACITY + u * (OPACITY_MAX - OPACITY),
LEFT + u * (LEFT_MIN - LEFT),
RIGHT + u * (RIGHT_MIN - RIGHT),
)
}
fn search_data(r: SearchResult) -> PageData {
let mut entries: Vec<Entry> = r.artist.into_iter().map(artist_entry).collect();
entries.extend(r.album.into_iter().map(|a| Entry {
@@ -2033,7 +2254,7 @@ fn bucket(px: f32) -> u32 {
}
/// Decodes a cover at `px` and works out its tone for the album art palette.
fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>)> {
fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>, u64)> {
let img = image::load_from_memory(bytes)?;
let img = if img.width() > px || img.height() > px {
img.resize(px, px, image::imageops::FilterType::Triangle)
@@ -2046,8 +2267,11 @@ fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>,
.to_rgb8();
let tone = crate::palette::tone(small.as_raw());
let rgb = img.to_rgb8();
let mut hasher = std::hash::DefaultHasher::new();
std::hash::Hash::hash(rgb.as_raw(), &mut hasher);
let print = std::hash::Hasher::finish(&hasher);
let buf = SharedPixelBuffer::clone_from_slice(rgb.as_raw(), rgb.width(), rgb.height());
Ok((buf, tone))
Ok((buf, tone, print))
}
fn color(lab: Lab) -> Color {
@@ -2156,6 +2380,50 @@ fn join_dot<I: IntoIterator<Item = Option<String>>>(parts: I) -> String {
mod tests {
use super::*;
fn png(pixel: [u8; 3]) -> Vec<u8> {
let img = image::RgbImage::from_pixel(8, 8, image::Rgb(pixel));
let mut out = std::io::Cursor::new(Vec::new());
img.write_to(&mut out, image::ImageFormat::Png).unwrap();
out.into_inner()
}
#[test]
fn one_picture_under_two_ids_has_one_print() {
let (_, _, a) = decode_cover(&png([120, 20, 30]), 64).unwrap();
let (_, _, b) = decode_cover(&png([120, 20, 30]), 64).unwrap();
let (_, _, c) = decode_cover(&png([20, 120, 30]), 64).unwrap();
assert_eq!(a, b);
assert_ne!(a, c);
}
#[test]
fn default_backdrop_looks_like_before_it_was_a_setting() {
assert_eq!(backdrop_look(config::COVER_BACKDROP_DEFAULT), (0.16, 0.67, 0.95));
}
#[test]
fn backdrop_off_draws_no_cover() {
assert_eq!(backdrop_look(0).0, 0.0);
}
#[test]
fn backdrop_strongest_keeps_an_overlay() {
let (opacity, left, right) = backdrop_look(100);
assert!((opacity - 0.40).abs() < 1e-6);
assert!((left - 0.55).abs() < 1e-6);
assert!((right - 0.80).abs() < 1e-6);
assert_eq!(backdrop_look(250), backdrop_look(100));
}
#[test]
fn backdrop_steps_stay_in_range() {
assert_eq!(step_backdrop(30, true), 40);
assert_eq!(step_backdrop(30, false), 20);
assert_eq!(step_backdrop(100, true), 100);
assert_eq!(step_backdrop(0, false), 0);
assert_eq!(step_backdrop(200, false), 90);
}
#[test]
fn grid_window_is_row_aligned() {
assert_eq!(window(1000, 0, 5, false), (0, 55));
+24 -1
View File
@@ -88,11 +88,25 @@ pub fn save(cfg: &Config) -> Result<()> {
}
/// Preferences. Kept apart from the login, so logging out does not reset them.
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(default)]
pub struct Settings {
/// Tint the UI with the colours of the playing track's cover.
pub album_art_colours: bool,
/// How strongly the cover shows behind the now-playing screen, 0 to 100.
pub cover_backdrop: u8,
}
/// The cover backdrop strength that looks like it did before it was a setting.
pub const COVER_BACKDROP_DEFAULT: u8 = 30;
impl Default for Settings {
fn default() -> Self {
Settings {
album_art_colours: false,
cover_backdrop: COVER_BACKDROP_DEFAULT,
}
}
}
fn settings_path() -> Option<PathBuf> {
@@ -193,12 +207,21 @@ mod tests {
let s: Settings = toml::from_str("").unwrap();
assert_eq!(s, Settings::default());
assert!(!s.album_art_colours);
assert_eq!(s.cover_backdrop, COVER_BACKDROP_DEFAULT);
}
#[test]
fn settings_from_before_the_backdrop_load_its_default() {
let s: Settings = toml::from_str("album_art_colours = true\n").unwrap();
assert!(s.album_art_colours);
assert_eq!(s.cover_backdrop, COVER_BACKDROP_DEFAULT);
}
#[test]
fn settings_round_trip() {
let s = Settings {
album_art_colours: true,
cover_backdrop: 70,
};
let back: Settings = toml::from_str(&toml::to_string(&s).unwrap()).unwrap();
assert_eq!(back, s);
+68 -5
View File
@@ -27,6 +27,9 @@ export struct Item {
round: bool,
show-art: bool,
playing: bool,
// A setting with a range: draws `level` (0 to 1) as a slider before `detail`.
slider: bool,
level: float,
}
export struct Header {
@@ -237,10 +240,38 @@ component Row inherits Rectangle {
}
}
if root.item.slider: VerticalLayout {
alignment: center;
Rectangle {
width: 180px * Theme.s;
height: 6px * Theme.s;
border-radius: 3px * Theme.s;
background: Theme.line;
Rectangle {
x: 0;
width: parent.width * root.item.level;
border-radius: 3px * Theme.s;
background: root.selected && root.active ? Theme.highlight : Theme.muted;
animate width { duration: 120ms; easing: ease-out; }
}
Rectangle {
x: parent.width * root.item.level - self.width / 2;
width: 16px * Theme.s;
height: 16px * Theme.s;
border-radius: 8px * Theme.s;
background: root.selected && root.active ? Theme.text : Theme.muted;
animate x { duration: 120ms; easing: ease-out; }
}
}
}
Text {
// Fixed for a slider, so the bar does not shift as the number grows.
min-width: root.item.slider ? 44px * Theme.s : 0;
text: root.item.detail;
font-size: 15px * Theme.s;
color: Theme.muted;
horizontal-alignment: right;
vertical-alignment: center;
}
}
@@ -666,7 +697,7 @@ component LoginView inherits Rectangle {
spacing: 20px * Theme.s;
HorizontalLayout {
alignment: start;
alignment: center;
Image {
source: @image-url("../branding/svg/remus-logo.svg");
height: 68px * Theme.s;
@@ -756,6 +787,14 @@ component NowPlayingView inherits Rectangle {
in property <string> duration;
in property <bool> paused;
in property <bool> has-track;
// From the cover backdrop setting: the blown-up cover's opacity and the
// alpha of the background drawn over it, at the left and right edges.
in property <float> backdrop-opacity: 0.16;
in property <float> backdrop-left: 0.67;
in property <float> backdrop-right: 0.95;
// True while the cover turns away; the app swaps the cover at edge-on and
// sets it back to false to turn the new one in.
in property <bool> flip-out;
in property <[Item]> queue;
in property <int> queue-count;
in property <int> queue-selected;
@@ -765,15 +804,15 @@ component NowPlayingView inherits Rectangle {
out property <length> art-size: 440px * Theme.s;
// Blown-up cover as a dim backdrop.
if root.has-cover: Image {
if root.has-cover && root.backdrop-opacity > 0: Image {
width: parent.width;
height: parent.height;
source: root.cover;
image-fit: ImageFit.cover;
opacity: 0.16;
opacity: root.backdrop-opacity;
}
Rectangle {
background: @linear-gradient(90deg, Theme.bg.with-alpha(0.67), Theme.bg.with-alpha(0.95));
background: @linear-gradient(90deg, Theme.bg.with-alpha(root.backdrop-left), Theme.bg.with-alpha(root.backdrop-right));
}
HorizontalLayout {
@@ -786,9 +825,11 @@ component NowPlayingView inherits Rectangle {
spacing: 10px * Theme.s;
width: root.art-size;
Art {
art := Art {
width: root.art-size;
height: root.art-size;
// Set here so the turned state below has a value to return to.
transform-scale-x: 100%;
source: root.cover;
has-image: root.has-cover;
tint: root.tint;
@@ -873,6 +914,20 @@ component NowPlayingView inherits Rectangle {
}
}
}
// A flip around the vertical axis, faked by squashing the width: Slint has
// no perspective. The turn back overshoots a little and settles.
states [
turned when root.flip-out: {
art.transform-scale-x: 0%;
in {
animate art.transform-scale-x { duration: 170ms; easing: ease-in; }
}
out {
animate art.transform-scale-x { duration: 380ms; easing: cubic-bezier(0.34, 1.5, 0.64, 1); }
}
}
]
}
export component AppWindow inherits Window {
@@ -936,6 +991,10 @@ export component AppWindow inherits Window {
in property <string> np-position;
in property <string> np-duration;
in property <bool> np-paused;
in property <bool> np-flip-out;
in property <float> np-backdrop-opacity: 0.16;
in property <float> np-backdrop-left: 0.67;
in property <float> np-backdrop-right: 0.95;
in property <[Item]> queue-items;
in property <int> queue-count;
in property <int> queue-selected;
@@ -1097,6 +1156,10 @@ export component AppWindow inherits Window {
duration: root.np-duration;
paused: root.np-paused;
has-track: root.np-has-track;
flip-out: root.np-flip-out;
backdrop-opacity: root.np-backdrop-opacity;
backdrop-left: root.np-backdrop-left;
backdrop-right: root.np-backdrop-right;
queue: root.queue-items;
queue-count: root.queue-count;
queue-selected: root.queue-selected;