Skip to content

Commit 5094d0c

Browse files
filipkrayemfilipkrayem
committed
Add play song functionality
1 parent 8eb1897 commit 5094d0c

File tree

11 files changed

+151
-86
lines changed

11 files changed

+151
-86
lines changed

‎sketch-elements.xcodeproj/project.pbxproj

+12-8
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@
9696
DCA90EAA26A87204006880A5 /* Albums in Resources */ = {isa = PBXBuildFile; fileRef = DCA90EA926A87204006880A5 /* Albums */; };
9797
DCA90EAC26A8800B006880A5 /* albums.json in Resources */ = {isa = PBXBuildFile; fileRef = DCA90EAB26A8800B006880A5 /* albums.json */; };
9898
DCA90EB026AAAB51006880A5 /* Picture.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA90EAF26AAAB51006880A5 /* Picture.swift */; };
99-
DCA90EB226AAB6D4006880A5 /* getAlbumSongs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA90EB126AAB6D4006880A5 /* getAlbumSongs.swift */; };
99+
DCA90EB226AAB6D4006880A5 /* GetAlbumSongs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA90EB126AAB6D4006880A5 /* GetAlbumSongs.swift */; };
100100
DCAAB520266CB5870037A38E /* PhotoStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAB51F266CB5870037A38E /* PhotoStack.swift */; };
101101
DCAAB524266CEC1F0037A38E /* PhotoDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAB523266CEC1F0037A38E /* PhotoDetail.swift */; };
102-
DCAAD9D926AC4ACC00B8B334 /* CustomSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAD9D826AC4ACC00B8B334 /* CustomSlider.swift */; };
102+
DCAAD9D926AC4ACC00B8B334 /* SongProgressSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAD9D826AC4ACC00B8B334 /* SongProgressSlider.swift */; };
103+
DCAAD9DD26ADBAE100B8B334 /* TimeFromSeconds.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAD9DC26ADBAE100B8B334 /* TimeFromSeconds.swift */; };
103104
DCE62CDB266A70FC0002CAD4 /* Places.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE62CD7266A70FC0002CAD4 /* Places.swift */; };
104105
DCE62CDD266A70FC0002CAD4 /* Photography.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE62CD9266A70FC0002CAD4 /* Photography.swift */; };
105106
DCE62CDE266A70FC0002CAD4 /* Albums.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE62CDA266A70FC0002CAD4 /* Albums.swift */; };
@@ -225,10 +226,11 @@
225226
DCA90EA926A87204006880A5 /* Albums */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Albums; sourceTree = "<group>"; };
226227
DCA90EAB26A8800B006880A5 /* albums.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = albums.json; sourceTree = "<group>"; };
227228
DCA90EAF26AAAB51006880A5 /* Picture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Picture.swift; sourceTree = "<group>"; };
228-
DCA90EB126AAB6D4006880A5 /* getAlbumSongs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getAlbumSongs.swift; sourceTree = "<group>"; };
229+
DCA90EB126AAB6D4006880A5 /* GetAlbumSongs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetAlbumSongs.swift; sourceTree = "<group>"; };
229230
DCAAB51F266CB5870037A38E /* PhotoStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoStack.swift; sourceTree = "<group>"; };
230231
DCAAB523266CEC1F0037A38E /* PhotoDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoDetail.swift; sourceTree = "<group>"; };
231-
DCAAD9D826AC4ACC00B8B334 /* CustomSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSlider.swift; sourceTree = "<group>"; };
232+
DCAAD9D826AC4ACC00B8B334 /* SongProgressSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongProgressSlider.swift; sourceTree = "<group>"; };
233+
DCAAD9DC26ADBAE100B8B334 /* TimeFromSeconds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeFromSeconds.swift; sourceTree = "<group>"; };
232234
DCE62CD7266A70FC0002CAD4 /* Places.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Places.swift; sourceTree = "<group>"; };
233235
DCE62CD9266A70FC0002CAD4 /* Photography.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Photography.swift; sourceTree = "<group>"; };
234236
DCE62CDA266A70FC0002CAD4 /* Albums.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Albums.swift; sourceTree = "<group>"; };
@@ -490,7 +492,7 @@
490492
DCFE3925266F63070064FD56 /* PhotoPicker.swift */,
491493
DCFE3929266F6C0D0064FD56 /* ImageEditor.swift */,
492494
DC32455E2670061A00FC86ED /* PhotoPreview.swift */,
493-
DCAAD9D826AC4ACC00B8B334 /* CustomSlider.swift */,
495+
DCAAD9D826AC4ACC00B8B334 /* SongProgressSlider.swift */,
494496
);
495497
path = Elements;
496498
sourceTree = "<group>";
@@ -534,7 +536,8 @@
534536
isa = PBXGroup;
535537
children = (
536538
DCE62CE8266C38740002CAD4 /* GroupBy.swift */,
537-
DCA90EB126AAB6D4006880A5 /* getAlbumSongs.swift */,
539+
DCA90EB126AAB6D4006880A5 /* GetAlbumSongs.swift */,
540+
DCAAD9DC26ADBAE100B8B334 /* TimeFromSeconds.swift */,
538541
);
539542
path = Utils;
540543
sourceTree = "<group>";
@@ -669,7 +672,7 @@
669672
34AD61DD240BD093005943F9 /* RecipeDetail.swift in Sources */,
670673
34F1215E2587962C00BBB7DB /* Cities.swift in Sources */,
671674
DCE62CDE266A70FC0002CAD4 /* Albums.swift in Sources */,
672-
DCA90EB226AAB6D4006880A5 /* getAlbumSongs.swift in Sources */,
675+
DCA90EB226AAB6D4006880A5 /* GetAlbumSongs.swift in Sources */,
673676
34B4B12724AB6B0500B092A8 /* CardWithAttachment.swift in Sources */,
674677
344723CB24AC7B80003B9F50 /* SegmentedPicker.swift in Sources */,
675678
34785354258666ED0023A217 /* Guides.swift in Sources */,
@@ -737,12 +740,13 @@
737740
DC32455F2670061A00FC86ED /* PhotoPreview.swift in Sources */,
738741
344723C124ABB098003B9F50 /* TabItem.swift in Sources */,
739742
3403A31D240809E700D7B040 /* UserData.swift in Sources */,
740-
DCAAD9D926AC4ACC00B8B334 /* CustomSlider.swift in Sources */,
743+
DCAAD9D926AC4ACC00B8B334 /* SongProgressSlider.swift in Sources */,
741744
344723BD24ABA9CD003B9F50 /* RestaurantDetail.swift in Sources */,
742745
34B4B12524AB668100B092A8 /* Card.swift in Sources */,
743746
345AE3B0241A7ABD004EBE8C /* ContentView.swift in Sources */,
744747
E6AF7A6C25CD31DB002F752E /* MusicHeader.swift in Sources */,
745748
E609DE8B2657E9A0007A7DBA /* ButtonPlayer.swift in Sources */,
749+
DCAAD9DD26ADBAE100B8B334 /* TimeFromSeconds.swift in Sources */,
746750
345AE3AB241A7A8E004EBE8C /* Modal.swift in Sources */,
747751
349524CC258A35BC0077F145 /* Place.swift in Sources */,
748752
345D2E1E2458413B00201DD0 /* TableRow.swift in Sources */,

‎sketch-elements.xcodeproj/project.xcworkspace/xcuserdata/filip.xcuserdatad/UserInterfaceState.xcuserstate

1.98 KB
Binary file not shown.

‎sketch-elements/Elements/MiniPlayer.swift

+6-10
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ import URLImage
1313
struct MiniPlayer: View {
1414
@EnvironmentObject var modalManager: ModalManager
1515

16-
var song: Song
17-
18-
init(song: Song) {
19-
self.song = song
20-
}
16+
@Binding var song: Song?
2117

2218
var body: some View {
2319
HStack {
@@ -28,16 +24,16 @@ struct MiniPlayer: View {
2824
Button(action: { self.modalManager.openModal(position: .partiallyRevealed) }) {
2925
Spacer()
3026
VStack {
31-
Text(song.name)
27+
Text(song!.name)
3228
.font(.headline)
33-
Text(song.album!.artist)
29+
Text(song!.album!.artist)
3430
.font(.subheadline)
3531
}
3632
Spacer()
3733

3834
}.padding([.top])
3935

40-
URLImage((song.album?.picture.uri)!, content: {
36+
URLImage(song!.album!.picture.uri, content: {
4137
image in image
4238
.renderingMode(.original)
4339
.resizable()
@@ -49,14 +45,14 @@ struct MiniPlayer: View {
4945
.background(Color.white)
5046
.onAppear {
5147
self.modalManager.newModal(position: .closed) {
52-
PlayerModal(action: self.modalManager.closeModal, song: getAlbumSongs(musicData[0])[0])
48+
PlayerModal(action: self.modalManager.closeModal, song: $song)
5349
}
5450
}
5551
}
5652
}
5753

5854
struct MiniPlayer_Previews: PreviewProvider {
5955
static var previews: some View {
60-
MiniPlayer(song: getAlbumSongs(musicData[0])[0])
56+
MiniPlayer(song: .constant(getAlbumSongs(musicData[0])[0]))
6157
}
6258
}

‎sketch-elements/Elements/CustomSlider.swift ‎sketch-elements/Elements/SongProgressSlider.swift

+11-8
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,34 @@
88

99
import SwiftUI
1010

11-
struct CustomSlider: View {
12-
13-
@Binding var percentage: Float // or some value binded
11+
struct SongProgressSlider: View {
1412

13+
@Binding var seconds: Int // or some value binded
14+
var songTime: Int
15+
var color: Color
16+
1517
var body: some View {
1618
GeometryReader { geometry in
1719
ZStack(alignment: .leading) {
1820
Rectangle()
1921
.foregroundColor(.gray.opacity(0.06))
2022

2123
Rectangle()
22-
.foregroundColor(.accentColor)
23-
.frame(width: geometry.size.width * CGFloat(self.percentage / 100))
24+
.foregroundColor(color)
25+
.frame(width: geometry.size.width * CGFloat(self.seconds / songTime))
2426
}
2527
.cornerRadius(12, antialiased: true)
2628
.gesture(DragGesture(minimumDistance: 0)
2729
.onChanged({ value in
28-
self.percentage = min(max(0, Float(value.location.x / geometry.size.width * 100)), 100)
30+
self.seconds = Int(min(max(0, Float(value.location.x / geometry.size.width * CGFloat(songTime))), Float(songTime)))
2931
}))
3032
}
3133
}
3234
}
33-
struct Slider_Previews: PreviewProvider {
35+
36+
struct SongProgressSlider_Previews: PreviewProvider {
3437
static var previews: some View {
35-
CustomSlider(percentage: .constant(20))
38+
SongProgressSlider(seconds: .constant(20), songTime: 120, color: .accentColor)
3639
.frame(width: 200, height: 10)
3740
}
3841
}

‎sketch-elements/Elements/Table/SongTableRow.swift

+23-16
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,30 @@ struct SongTableRow: View {
1414
var content: String
1515
var description: String?
1616
var right: String
17+
var action: () -> Void
1718

1819
var body: some View {
19-
TableRow(
20-
left: left,
21-
divider: divider,
22-
top: AnyView(Text(content)),
23-
bottom: description != nil ?
24-
AnyView(Text(description ?? "")
25-
.font(.footnote)
26-
.foregroundColor(Color.gray)) :
27-
AnyView(EmptyView()),
20+
VStack {
21+
TableRow(
22+
left: left,
23+
divider: divider,
24+
top: AnyView(Text(content)),
25+
bottom: description != nil ?
26+
AnyView(Text(description ?? "")
27+
.font(.footnote)
28+
.foregroundColor(Color.gray)) :
29+
AnyView(EmptyView()),
2830

29-
right: AnyView(
30-
HStack(alignment: .center) {
31-
Image(systemName: right)
32-
.foregroundColor(Constant.color.musicPrimary)
33-
})
34-
)
31+
right: AnyView(
32+
HStack(alignment: .center) {
33+
Image(systemName: right)
34+
.foregroundColor(Constant.color.musicPrimary)
35+
})
36+
)
37+
}
38+
.background(Color.white)
39+
.animation(/*@START_MENU_TOKEN@*/.easeIn/*@END_MENU_TOKEN@*/)
40+
.onTapGesture(perform: action)
3541
}
3642
}
3743

@@ -42,7 +48,8 @@ struct SongTableRow_Previews: PreviewProvider {
4248
divider: true,
4349
content: "content",
4450
description: "description",
45-
right: Constant.icon.dots
51+
right: Constant.icon.dots,
52+
action: {}
4653
)
4754
}
4855
}

‎sketch-elements/Music/AlbumDetail.swift

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct AlbumDetail: View {
1818
init(_ album: Album, selectedSong: Binding<Song?>) {
1919
self.album = album
2020
songs = getAlbumSongs(album)
21-
self._selectedSong = selectedSong
21+
_selectedSong = selectedSong
2222
}
2323

2424
var body: some View {
@@ -31,10 +31,9 @@ struct AlbumDetail: View {
3131
left: AnyView(Text("\(index + 1)").foregroundColor(Color.gray)),
3232
divider: index < self.songs.count - 1,
3333
content: songs[index].name,
34-
right: Constant.icon.dots
35-
).onTapGesture {
36-
selectedSong = songs[index]
37-
}
34+
right: Constant.icon.dots,
35+
action: { selectedSong = songs[index] }
36+
)
3837
}
3938
}.padding([.top, .bottom])
4039
.frame(maxWidth: .infinity)
@@ -55,7 +54,7 @@ struct AlbumDetail: View {
5554

5655
struct LibraryDetail_Previews: PreviewProvider {
5756
static var previews: some View {
58-
AlbumDetail(musicData[0], selectedSong:.constant(getAlbumSongs(musicData[0])[0]))
57+
AlbumDetail(musicData[0], selectedSong: .constant(getAlbumSongs(musicData[0])[0]))
5958
.environmentObject(UserData())
6059
.environment(\.colorScheme, .light)
6160
}

‎sketch-elements/Music/Library.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct Library: View {
3737
}
3838

3939
if selectedSong != nil {
40-
MiniPlayer(song: selectedSong!)
40+
MiniPlayer(song: $selectedSong)
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)