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

Audio Player Gestures #329

Merged
merged 13 commits into from
Jul 30, 2020
+766 −268
Merged

Audio Player Gestures #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3f0d34f
music player gestures
Jul 21, 2020
1151346
Merge branch 'beta' of https://github.com/amahi/ios into music_player…
Jul 21, 2020
ad4873d
resolved offline song issue
Jul 21, 2020
6f560f7
update cocoapod version
Jul 21, 2020
2af9e38
gestures and prefetching of songs
Jul 26, 2020
76455fd
prefetching bug fixes
Jul 26, 2020
8551b88
fixes
Jul 27, 2020
b3416cf
final commit
Jul 27, 2020
208b31a
Merge branch 'beta' of https://github.com/amahi/ios into audio_player…
Jul 27, 2020
e8f5b78
pulled changes
Jul 27, 2020
bcab03f
implemented suggested changes in repeat mode
Jul 28, 2020
2e48e7c
thumbnail aspect ratio fix
Jul 30, 2020
1b6c2db
resolved merge conflicts
Jul 30, 2020
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
Prev Previous commit
Next Next commit
resolved offline song issue
  • Loading branch information
Shresth Pratap Singh authored and Shresth Pratap Singh committed Jul 21, 2020
commit ad4873ddad334f98ab0dadbe06cb12c487ddc993
18 changes: 9 additions & 9 deletions ...here/AmahiAnywhere/Presentation/MediaPlayers/Audio Player/AudioPlayerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,7 @@ class AudioPlayerViewController: UIViewController {
playerQueueContainer.header.arrowHead.addTarget(self, action: #selector(handleArrowHeadTap), for: .touchDown)
playerQueueContainer.header.tapDelegate = self
layoutPlayerQueue()

if offlineMode{
loadSong()
playPlayer()
observer = player.addPeriodicTimeObserver(forInterval: CMTimeMakeWithSeconds(1, preferredTimescale: 1), queue: DispatchQueue.main, using: { [weak self] (time) in
self?.updatePlayingSong(time)
})
}


let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:)))
self.playerContainer.addGestureRecognizer(panRecognizer)
panRecognizer.cancelsTouchesInView = true
Expand All @@ -89,6 +81,14 @@ class AudioPlayerViewController: UIViewController {
setupPlayer()
setupRemoteCommandCenter()

if offlineMode{
loadSong()
playPlayer()
observer = player.addPeriodicTimeObserver(forInterval: CMTimeMakeWithSeconds(1, preferredTimescale: 1), queue: DispatchQueue.main, using: { [weak self] (time) in
self?.updatePlayingSong(time)
})
}

}

func setupPlayer(){
Expand Down
3 changes: 1 addition & 2 deletions AmahiAnywhere/AmahiAnywhere/Presentation/Offline/OfflineFilesViewController+FilesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ extension OfflineFilesViewController : OfflineFilesView {

let audioPlayerVc = self.viewController(viewControllerClass: AudioPlayerViewController.self,
from: StoryBoardIdentifiers.videoPlayer)
AudioPlayerDataModel.shared.configure(items: items,URLs, with: currentIndex)
audioPlayerVc.offlineMode = true
AudioPlayerDataModel.shared.setupQueueMetadata()
AudioPlayerDataModel.shared.configure(items: items,URLs, with: currentIndex)
if #available(iOS 13.0, *) {
audioPlayerVc.isModalInPresentation = true
}
Expand Down
2 changes: 1 addition & 1 deletion AmahiAnywhere/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 61f513bfe95231a9fec4a3a23bc3a645bf8f94a6

COCOAPODS: 1.9.3
COCOAPODS: 1.9.1