Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Minor improvements #50

Merged
merged 1 commit into from
Mar 25, 2024
Merged

feature: Minor improvements #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions mupl.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@
isa = PBXGroup;
children = (
086FDB8C2B7E5D7700A4102E /* ArtistDetails */,
08D1B6042B7656F5005FB6FA /* PlaylistDetails */,
08B5F6FC2B53EBAA006248A7 /* AlbumDetails */,
08D1B6042B7656F5005FB6FA /* PlaylistDetails */,
086FDB7D2B7E32B700A4102E /* Chart */,
08415CDA2B3C901500764CD6 /* Home */,
08415CE32B3CC06400764CD6 /* Search */,
Expand All @@ -333,18 +333,17 @@
isa = PBXGroup;
children = (
084E07C72B8E1F5A00E14695 /* AppInfo */,
084E07BB2B8CBA2F00E14695 /* Chips */,
0890981F2BB17C9D00D3DABF /* Prompts */,
08415CF22B3DBCAE00764CD6 /* Playbar */,
0856A4FA2B4B32500073ACE7 /* MusicArtworkImage */,
0856A4D42B4738080073ACE7 /* Styles */,
0856A4EA2B48AD6F0073ACE7 /* Section */,
0856A4C32B4710420073ACE7 /* TrackCollectionItem */,
0856A4F22B49C6DD0073ACE7 /* SongItem */,
0856A4FA2B4B32500073ACE7 /* MusicArtworkImage */,
084E07D02B8F750800E14695 /* MusicAuthorizationPrompt */,
08B6DC862B9C889F006FE677 /* MusicSubscriptionPrompt */,
084E07BB2B8CBA2F00E14695 /* Chips */,
08415D112B40BA5700764CD6 /* QueueBar */,
08415CF92B3DC1F400764CD6 /* Slider */,
08415CF22B3DBCAE00764CD6 /* Playbar */,
08415CCA2B321B3A00764CD6 /* Sidebar */,
0856A4C32B4710420073ACE7 /* TrackCollectionItem */,
08415D112B40BA5700764CD6 /* QueueBar */,
);
path = Components;
sourceTree = "<group>";
Expand Down Expand Up @@ -783,6 +782,15 @@
path = Submanagers;
sourceTree = "<group>";
};
0890981F2BB17C9D00D3DABF /* Prompts */ = {
isa = PBXGroup;
children = (
084E07D02B8F750800E14695 /* MusicAuthorizationPrompt */,
08B6DC862B9C889F006FE677 /* MusicSubscriptionPrompt */,
);
path = Prompts;
sourceTree = "<group>";
};
08B4552D2B67F46A006007A9 /* LoadableValue */ = {
isa = PBXGroup;
children = (
Expand Down
6 changes: 3 additions & 3 deletions mupl/Common/Components/Playbar/Playbar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ struct Playbar: View {
var body: some View {
ZStack(alignment: .bottomTrailing) {
HStack(spacing: .zero) {
PlaybarSongPreview()
SongPreview()
.frame(maxWidth: .infinity, alignment: .leading)

PlaybarSongControls()
SongControls()
.frame(maxWidth: .infinity)

PlaybarVolumeControls()
VolumeControls()
.frame(maxWidth: .infinity, alignment: .trailing)

Image(systemName: "list.bullet")
Expand Down
89 changes: 65 additions & 24 deletions mupl/Common/Components/Playbar/PlaybarSongControls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,27 @@

import SwiftUI

struct PlaybarSongControls: View {
@EnvironmentObject private var musicPlayer: MusicPlayer

@State private var playbackTimePercentage: CGFloat = 0.0

var body: some View {
VStack(spacing: 8.0) {
extension Playbar {
struct SongControls: View {
@EnvironmentObject private var musicPlayer: MusicPlayer

@State private var isSliderHovered: Bool = false
@State private var playbackTimePercentage: CGFloat = 0.0

var body: some View {
VStack(spacing: 4.0) {
self.controls
self.slider
}
.onChange(of: self.musicPlayer.playbackTime) { _, value in
guard let duration = self.musicPlayer.currentSong?.duration else { return }
self.playbackTimePercentage = value / duration
}
}

// MARK: - Components

private var controls: some View {
HStack(spacing: 8.0) {
Image(systemName: "shuffle")
.font(.system(size: 10.0, weight: .medium))
Expand Down Expand Up @@ -57,26 +71,53 @@ struct PlaybarSongControls: View {
}
}
.frame(height: 24.0)

Slider(width: .flexible(min: 320.0, ideal: 320.0, max: 500.0), percentage: self.$playbackTimePercentage)
.onDrag {
self.musicPlayer.pause()
}

private var slider: some View {
HStack(spacing: 8.0) {
Group {
if let duration = self.musicPlayer.currentSong?.duration, self.isSliderHovered {
Text((self.playbackTimePercentage * duration).minutesAndSeconds)
.font(.system(size: 10.0))
.foregroundStyle(Color.secondaryText)
} else {
Color.clear
}
}
.onChange { requestedPercentage in
guard let duration = self.musicPlayer.currentSong?.duration else { return }

self.playbackTimePercentage = requestedPercentage

self.musicPlayer.seek(to: requestedPercentage * duration)

Task {
await self.musicPlayer.play()
.frame(width: 24.0, height: 12.0)

Slider(width: .flexible(min: 320.0, ideal: 320.0, max: 500.0), percentage: self.$playbackTimePercentage)
.onDrag {
self.musicPlayer.pause()
}
.onChange { requestedPercentage in
guard let duration = self.musicPlayer.currentSong?.duration else { return }

self.playbackTimePercentage = requestedPercentage

self.musicPlayer.seek(to: requestedPercentage * duration)

Task {
await self.musicPlayer.play()
}
}
.onHover { hovered in
self.isSliderHovered = hovered
}

Group {
if let duration = self.musicPlayer.currentSong?.duration, self.isSliderHovered {
Text(duration.minutesAndSeconds)
.font(.system(size: 10.0))
.foregroundStyle(Color.secondaryText)
} else {
Color.clear
}
}
}
.onChange(of: self.musicPlayer.playbackTime) { _, value in
guard let duration = self.musicPlayer.currentSong?.duration else { return }
self.playbackTimePercentage = value / duration
.frame(width: 24.0, height: 12.0)
}
.frame(height: 12.0)
.animation(.easeIn(duration: 0.2), value: self.isSliderHovered)
}
}
}
84 changes: 44 additions & 40 deletions mupl/Common/Components/Playbar/PlaybarSongPreview.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,56 @@
import SwiftUI
import MusicKit

struct PlaybarSongPreview: View {
@EnvironmentObject private var musicPlayer: MusicPlayer
@EnvironmentObject private var router: Router

var body: some View {
Group {
if let currentSong = self.musicPlayer.currentSong {
self.content(currentSong)
} else {
self.emptyContent
extension Playbar {
struct SongPreview: View {
@EnvironmentObject private var musicPlayer: MusicPlayer
@EnvironmentObject private var router: Router

var body: some View {
Group {
if let currentSong = self.musicPlayer.currentSong {
self.content(currentSong)
} else {
self.emptyContent
}
}
.frame(minWidth: 240.0)
}
.frame(minWidth: 240.0)
}

private var emptyContent: some View {
HStack(spacing: 12.0) {
Color.secondaryFill
.frame(width: 36.0, height: 36.0)
.clipShape(.rect(cornerRadius: 8.0))
.border(style: .quinaryFill, cornerRadius: 8.0)

Text("No song to play")
.font(.system(size: 12.0, weight: .semibold))
.foregroundStyle(Color.primaryText)
}
}

private func content(_ song: Song) -> some View {
HStack(spacing: 12.0) {
MusicArtworkImage(artwork: song.artwork, width: 36.0, height: 36.0)
.clipShape(.rect(cornerRadius: 8.0))
.border(style: .quinaryFill, cornerRadius: 8.0)

VStack(alignment: .leading, spacing: 0.0) {
Text(song.title)

// MARK: - Components

private var emptyContent: some View {
HStack(spacing: 12.0) {
Color.secondaryFill
.frame(width: 36.0, height: 36.0)
.clipShape(.rect(cornerRadius: 8.0))
.border(style: .quinaryFill, cornerRadius: 8.0)

Text("No song to play")
.font(.system(size: 12.0, weight: .semibold))
.foregroundStyle(Color.primaryText)

Text(song.artistName)
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.secondaryText)
}
}
.tappable(hoverStyle: .init(padding: .init(vertical: 8.0, horizontal: 12.0), cornerRadius: 8.0)) {
self.router.push(song)

private func content(_ song: Song) -> some View {
HStack(spacing: 12.0) {
MusicArtworkImage(artwork: song.artwork, width: 36.0, height: 36.0)
.clipShape(.rect(cornerRadius: 8.0))
.border(style: .quinaryFill, cornerRadius: 8.0)

VStack(alignment: .leading, spacing: 0.0) {
Text(song.title)
.font(.system(size: 12.0, weight: .semibold))
.foregroundStyle(Color.primaryText)

Text(song.artistName)
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.secondaryText)
}
}
.tappable(hoverStyle: .init(padding: .init(vertical: 8.0, horizontal: 12.0), cornerRadius: 8.0)) {
self.router.push(song)
}
}
}
}
74 changes: 38 additions & 36 deletions mupl/Common/Components/Playbar/PlaybarVolumeControls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,47 @@

import SwiftUI

struct PlaybarVolumeControls: View {
@EnvironmentObject private var musicPlayer: MusicPlayer

var body: some View {
Group {
if let volume = self.musicPlayer.volume {
self.slider(volume: volume)
} else {
self.unavailable
extension Playbar {
struct VolumeControls: View {
@EnvironmentObject private var musicPlayer: MusicPlayer

var body: some View {
Group {
if let volume = self.musicPlayer.volume {
self.slider(volume: volume)
} else {
self.unavailable
}
}
.frame(minWidth: 240.0)
}
.frame(minWidth: 240.0)
}

// MARK: - Components

private var unavailable: some View {
Image(systemName: "speaker.slash.fill")
.font(.system(size: 16.0, weight: .medium))
.foregroundStyle(Color.secondaryText)
}

private func slider(volume: Float) -> some View {
HStack(spacing: 8.0) {
Image(systemName: "speaker.fill")
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.primaryText)

Slider(
width: .constant(64.0),
percentage: .init(
get: { CGFloat(volume) },
set: { self.musicPlayer.volume = Float($0) }

// MARK: - Components

private var unavailable: some View {
Image(systemName: "speaker.slash.fill")
.font(.system(size: 16.0, weight: .medium))
.foregroundStyle(Color.secondaryText)
}

private func slider(volume: Float) -> some View {
HStack(spacing: 8.0) {
Image(systemName: "speaker.fill")
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.primaryText)

Slider(
width: .constant(64.0),
percentage: .init(
get: { CGFloat(volume) },
set: { self.musicPlayer.volume = Float($0) }
)
)
)

Image(systemName: "speaker.wave.3.fill")
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.primaryText)
Image(systemName: "speaker.wave.3.fill")
.font(.system(size: 10.0, weight: .medium))
.foregroundStyle(Color.primaryText)
}
}
}
}
0 ...tionPrompt/MusicAuthorizationPrompt.swift → ...tionPrompt/MusicAuthorizationPrompt.swift
View file
Open in desktop
File renamed without changes.
0 ...ptionPrompt/MusicSubscriptionPrompt.swift → ...ptionPrompt/MusicSubscriptionPrompt.swift
View file
Open in desktop
File renamed without changes.
Loading