diff --git a/MusicPlayer.xcodeproj/project.pbxproj b/MusicPlayer.xcodeproj/project.pbxproj index a56880a..852660e 100644 --- a/MusicPlayer.xcodeproj/project.pbxproj +++ b/MusicPlayer.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ CBB5D31D2BDF4E9600CC333D /* MPPositive_MusicItemShowTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB5D31C2BDF4E9600CC333D /* MPPositive_MusicItemShowTableViewCell.swift */; }; CBB5D31F2BDF711600CC333D /* MPPositive_SongItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB5D31E2BDF711600CC333D /* MPPositive_SongItemModel.swift */; }; CBB5D3222BDF80C800CC333D /* MPPositive_PlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB5D3212BDF80C800CC333D /* MPPositive_PlayerViewController.swift */; }; + CBB75B0B2BEF0BC400B3FF9A /* MPPositive_DownloadItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB75B0A2BEF0BC400B3FF9A /* MPPositive_DownloadItemModel.swift */; }; CBB9F9DD2BEDCFEE008338DE /* MPPositive_JsonLyrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB9F9DC2BEDCFEE008338DE /* MPPositive_JsonLyrics.swift */; }; CBB9F9DF2BEDDCC5008338DE /* MP_PlayerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBB9F9DE2BEDDCC5008338DE /* MP_PlayerManager.swift */; }; CBBFA9182BBA83BA00057FD5 /* MP_CoreDataHandlerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBBFA9172BBA83BA00057FD5 /* MP_CoreDataHandlerManager.swift */; }; @@ -177,6 +178,7 @@ CBB5D31C2BDF4E9600CC333D /* MPPositive_MusicItemShowTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_MusicItemShowTableViewCell.swift; sourceTree = ""; }; CBB5D31E2BDF711600CC333D /* MPPositive_SongItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_SongItemModel.swift; sourceTree = ""; }; CBB5D3212BDF80C800CC333D /* MPPositive_PlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_PlayerViewController.swift; sourceTree = ""; }; + CBB75B0A2BEF0BC400B3FF9A /* MPPositive_DownloadItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_DownloadItemModel.swift; sourceTree = ""; }; CBB9F9DC2BEDCFEE008338DE /* MPPositive_JsonLyrics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_JsonLyrics.swift; sourceTree = ""; }; CBB9F9DE2BEDDCC5008338DE /* MP_PlayerManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MP_PlayerManager.swift; sourceTree = ""; }; CBBFA9172BBA83BA00057FD5 /* MP_CoreDataHandlerManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MP_CoreDataHandlerManager.swift; sourceTree = ""; }; @@ -643,6 +645,7 @@ CBC32A522BD8D9F300687171 /* MPPositive_BrowseItemModel.swift */, CBE1CB4B2BDE440E00701D57 /* MPPositive_ListHeaderModel.swift */, CBB5D31E2BDF711600CC333D /* MPPositive_SongItemModel.swift */, + CBB75B0A2BEF0BC400B3FF9A /* MPPositive_DownloadItemModel.swift */, ); path = Models; sourceTree = ""; @@ -1098,6 +1101,7 @@ 0096622D2BB14A5A00FCA65F /* AppDelegate.swift in Sources */, CBC32A532BD8D9F300687171 /* MPPositive_BrowseItemModel.swift in Sources */, CBCB4FEC2BD11402009760B3 /* MPSideA_AddViewController.swift in Sources */, + CBB75B0B2BEF0BC400B3FF9A /* MPPositive_DownloadItemModel.swift in Sources */, CBCB50172BD11402009760B3 /* MPSideA_Home_RowListsTableViewCell.swift in Sources */, CBCB4F982BD11054009760B3 /* MP_BaseViewController.swift in Sources */, CBD0CC5E2BDA260500C4B64D /* MPPositive_BrowseItemViewModel.swift in Sources */, diff --git a/MusicPlayer/Assets.xcassets/Center/About'Icon.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/About'Icon.imageset/Contents.json deleted file mode 100644 index 2f7f153..0000000 --- a/MusicPlayer/Assets.xcassets/Center/About'Icon.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1597880400@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1597880400@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/About.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/About.imageset/Contents.json deleted file mode 100644 index 5c4d3b1..0000000 --- a/MusicPlayer/Assets.xcassets/Center/About.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@2x.png b/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@2x.png deleted file mode 100644 index 2245f64..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@3x.png b/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@3x.png deleted file mode 100644 index 669c4b8..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/About.imageset/Frame@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Contents.json deleted file mode 100644 index 63ccbc5..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275560@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275560@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@2x.png b/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@2x.png deleted file mode 100644 index 5603061..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@3x.png b/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@3x.png deleted file mode 100644 index 5e77053..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Add'logo.imageset/Group_1171275560@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Contents.json deleted file mode 100644 index 401fabb..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 22@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 22@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@2x.png b/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@2x.png deleted file mode 100644 index 6cc75e7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@3x.png b/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@3x.png deleted file mode 100644 index 14e9266..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Cancel'bg.imageset/Group 22@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Contents.json deleted file mode 100644 index 90946c9..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275540@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275540@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@2x.png b/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@2x.png deleted file mode 100644 index 17742c4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@3x.png b/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@3x.png deleted file mode 100644 index 401942b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Center'bg.imageset/Group_1171275540@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/Contents.json deleted file mode 100644 index b7d065d..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "base@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "base@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@2x.png b/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@2x.png deleted file mode 100644 index e8459e6..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@3x.png b/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@3x.png deleted file mode 100644 index 5bf88f3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Click to import'bg.imageset/base@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Contents.json deleted file mode 100644 index 8ddc620..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 23@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 23@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@2x.png b/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@2x.png deleted file mode 100644 index 3747c19..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@3x.png b/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@3x.png deleted file mode 100644 index 606a074..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Confirm'bg.imageset/Group 23@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Contents.json b/MusicPlayer/Assets.xcassets/Center/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Contents.json deleted file mode 100644 index 8ddc620..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 23@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 23@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@2x.png b/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@2x.png deleted file mode 100644 index 585b148..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@3x.png b/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@3x.png deleted file mode 100644 index 27ac16b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Delete'bg.imageset/Group 23@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Contents.json deleted file mode 100644 index 5e88ec1..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame_1@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame_1@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@2x.png b/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@2x.png deleted file mode 100644 index 4e924dd..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@3x.png b/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@3x.png deleted file mode 100644 index ffe1095..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Feedback.imageset/Frame_1@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/Contents.json deleted file mode 100644 index 599f113..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_arrow-left@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_arrow-left@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@2x.png b/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@2x.png deleted file mode 100644 index 7205be3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@3x.png b/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@3x.png deleted file mode 100644 index 59f2e36..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Go'logo.imageset/icon_arrow-left@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/Contents.json deleted file mode 100644 index 320c9ff..0000000 --- a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "MUSICOO@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "MUSICOO@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@2x.png b/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@2x.png deleted file mode 100644 index 89acfc1..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@3x.png b/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@3x.png deleted file mode 100644 index fa72ce7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/MUSICOO'logo.imageset/MUSICOO@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Contents.json deleted file mode 100644 index f66fa84..0000000 --- a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275539@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275539@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@2x.png b/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@2x.png deleted file mode 100644 index d3f641c..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@3x.png b/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@3x.png deleted file mode 100644 index dc17be7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/More'logo.imageset/Group_1171275539@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/Contents.json deleted file mode 100644 index 3ee24a1..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "btn_square@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "btn_square@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@2x.png b/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@2x.png deleted file mode 100644 index b0acad2..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@3x.png b/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@3x.png deleted file mode 100644 index f497fab..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Pop‘logo.imageset/btn_square@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Contents.json deleted file mode 100644 index 12f94d4..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame_3@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame_3@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@2x.png b/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@2x.png deleted file mode 100644 index 08e04c6..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@3x.png b/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@3x.png deleted file mode 100644 index 255c9fe..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Privacy Policy.imageset/Frame_3@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@2x.png b/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@2x.png deleted file mode 100644 index 08e2385..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@3x.png b/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@3x.png deleted file mode 100644 index 793032a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Category@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Contents.json deleted file mode 100644 index 869398c..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Set'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Category@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Category@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Contents.json deleted file mode 100644 index 73ff453..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Elements@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Elements@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@2x.png b/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@2x.png deleted file mode 100644 index 004eea2..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@3x.png b/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@3x.png deleted file mode 100644 index 8d423d0..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Set'mask.imageset/Elements@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Share.imageset/Contents.json deleted file mode 100644 index bec1dcc..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame_2@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame_2@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@2x.png b/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@2x.png deleted file mode 100644 index 6a32b0f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@3x.png b/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@3x.png deleted file mode 100644 index 50ed16a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Share.imageset/Frame_2@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Contents.json deleted file mode 100644 index 2d5bf9c..0000000 --- a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame_4@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame_4@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@2x.png b/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@2x.png deleted file mode 100644 index ce5cf3a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@3x.png b/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@3x.png deleted file mode 100644 index 612a071..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/Terms of Use.imageset/Frame_4@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Center/empty.imageset/Contents.json deleted file mode 100644 index 61de948..0000000 --- a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1597880408@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1597880408@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@2x.png b/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@2x.png deleted file mode 100644 index ee8c976..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@3x.png b/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@3x.png deleted file mode 100644 index c10e2b3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Center/empty.imageset/Group_1597880408@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Contents.json b/MusicPlayer/Assets.xcassets/Home/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Contents.json deleted file mode 100644 index 1fbd3d9..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275452_1@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275452_1@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@2x.png b/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@2x.png deleted file mode 100644 index 2831694..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@3x.png b/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@3x.png deleted file mode 100644 index 7858f3b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'pause.imageset/Group_1171275452_1@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Contents.json deleted file mode 100644 index 5b983e4..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_40101@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_40101@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@2x.png b/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@2x.png deleted file mode 100644 index 1c036e7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@3x.png b/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@3x.png deleted file mode 100644 index 16bcab7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'placeholder.imageset/Rectangle_40101@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Contents.json deleted file mode 100644 index 940c4bd..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275452@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275452@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@2x.png b/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@2x.png deleted file mode 100644 index 9067e6b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@3x.png b/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@3x.png deleted file mode 100644 index ae59a01..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home First'play.imageset/Group_1171275452@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Contents.json deleted file mode 100644 index 5c4d3b1..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@2x.png deleted file mode 100644 index 26968fc..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@3x.png deleted file mode 100644 index e5a5769..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'pause.imageset/Frame@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Contents.json deleted file mode 100644 index 8e69084..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_40109@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_40109@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@2x.png deleted file mode 100644 index a73b6ab..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@3x.png deleted file mode 100644 index d1093f3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'placeholder.imageset/Rectangle_40109@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Contents.json deleted file mode 100644 index 1ab8c19..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275513@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275513@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@2x.png deleted file mode 100644 index 64a6f25..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@3x.png deleted file mode 100644 index 8ff4a8b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play 1.imageset/Group_1171275513@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Contents.json deleted file mode 100644 index 6a4d508..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@2x.png deleted file mode 100644 index f12c195..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@3x.png deleted file mode 100644 index f22087e..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Fourth'play.imageset/Vector@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Contents.json deleted file mode 100644 index a0aac2f..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_40105@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_40105@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@2x.png deleted file mode 100644 index d20956c..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@3x.png deleted file mode 100644 index 0860cb3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Second'placeholder.imageset/Rectangle_40105@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Contents.json deleted file mode 100644 index a6e3ffd..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector_1@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector_1@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@2x.png b/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@2x.png deleted file mode 100644 index 5ec4566..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@3x.png b/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@3x.png deleted file mode 100644 index 6337f31..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home Second'play.imageset/Vector_1@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Contents.json deleted file mode 100644 index dc6c167..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275509@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275509@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@2x.png b/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@2x.png deleted file mode 100644 index 545d1dd..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@3x.png b/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@3x.png deleted file mode 100644 index 959abde..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home'banner.imageset/Group_1171275509@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/Contents.json deleted file mode 100644 index 1057d71..0000000 --- a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "背景@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "背景@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@2x.png b/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@2x.png deleted file mode 100644 index e00fc3e..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@3x.png b/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@3x.png deleted file mode 100644 index 67a3141..0000000 Binary files a/MusicPlayer/Assets.xcassets/Home/Home'bg.imageset/背景@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Contents.json deleted file mode 100644 index e2f920e..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275591@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275591@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@2x.png b/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@2x.png deleted file mode 100644 index 6fe7f66..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@3x.png b/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@3x.png deleted file mode 100644 index 07fa7ce..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto dark'logo.imageset/Group_1171275591@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Contents.json deleted file mode 100644 index 96bd0ba..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275591_1@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275591_1@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@2x.png b/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@2x.png deleted file mode 100644 index 4396c4a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@3x.png b/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@3x.png deleted file mode 100644 index eac5ee8..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto light'logo.imageset/Group_1171275591_1@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Contents.json deleted file mode 100644 index e2f920e..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275591@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275591@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@2x.png b/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@2x.png deleted file mode 100644 index b834084..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@3x.png b/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@3x.png deleted file mode 100644 index 811af69..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Auto playing'logo.imageset/Group_1171275591@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Contents.json b/MusicPlayer/Assets.xcassets/Player/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Contents.json deleted file mode 100644 index 5c4d3b1..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@2x.png b/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@2x.png deleted file mode 100644 index 93047c4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@3x.png b/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@3x.png deleted file mode 100644 index 9a63c2e..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Dismiss dark'logo.imageset/Frame@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Contents.json deleted file mode 100644 index 5c4d3b1..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@2x.png b/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@2x.png deleted file mode 100644 index e61eefe..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@3x.png b/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@3x.png deleted file mode 100644 index 5088bbe..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Dismiss light'logo.imageset/Frame@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Contents.json deleted file mode 100644 index 8755efe..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275592@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275592@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@2x.png b/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@2x.png deleted file mode 100644 index defc42a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@3x.png b/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@3x.png deleted file mode 100644 index ff01d99..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Lamp dark'logo.imageset/Group_1171275592@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Contents.json deleted file mode 100644 index 3c59bd7..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275592_2@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275592_2@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@2x.png b/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@2x.png deleted file mode 100644 index ebb69d6..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@3x.png b/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@3x.png deleted file mode 100644 index 8af954a..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Lamp light'logo.imageset/Group_1171275592_2@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Contents.json deleted file mode 100644 index 569cad8..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275566@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275566@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@2x.png b/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@2x.png deleted file mode 100644 index 349da62..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@3x.png b/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@3x.png deleted file mode 100644 index 16c830d..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player State'Play.imageset/Group_1171275566@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Contents.json deleted file mode 100644 index 2f9086d..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275600@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275600@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@2x.png b/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@2x.png deleted file mode 100644 index 55bccdf..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@3x.png b/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@3x.png deleted file mode 100644 index 8d38818..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player State'pause.imageset/Group_1171275600@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/Contents.json deleted file mode 100644 index d3b9116..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "image_294@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "image_294@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@2x.png b/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@2x.png deleted file mode 100644 index f0263e5..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@3x.png b/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@3x.png deleted file mode 100644 index c3fa556..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player'bg.imageset/image_294@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Contents.json deleted file mode 100644 index f88f5bc..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_40118@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_40118@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@2x.png b/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@2x.png deleted file mode 100644 index cc111bc..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@3x.png b/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@3x.png deleted file mode 100644 index f664ed8..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Player'mask.imageset/Rectangle_40118@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/Contents.json deleted file mode 100644 index 0aa8122..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "image_293@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "image_293@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@2x.png b/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@2x.png deleted file mode 100644 index 6eff9e9..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@3x.png b/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@3x.png deleted file mode 100644 index f58b947..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Pointer'logo.imageset/image_293@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Contents.json deleted file mode 100644 index 17198bb..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Ellipse_1176@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Ellipse_1176@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@2x.png b/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@2x.png deleted file mode 100644 index 45a98ff..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@3x.png b/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@3x.png deleted file mode 100644 index 37c1aaa..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Thumb dark'logo.imageset/Ellipse_1176@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Contents.json deleted file mode 100644 index 17198bb..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Ellipse_1176@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Ellipse_1176@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@2x.png b/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@2x.png deleted file mode 100644 index b8f5844..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@3x.png b/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@3x.png deleted file mode 100644 index b301222..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Thumb light'logo.imageset/Ellipse_1176@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Contents.json deleted file mode 100644 index 8af6046..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275590@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275590@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@2x.png b/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@2x.png deleted file mode 100644 index 91fe40b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@3x.png b/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@3x.png deleted file mode 100644 index 1c4d558..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer dark'logo.imageset/Group_1171275590@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Contents.json deleted file mode 100644 index 68dd719..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275591_3@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275591_3@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@2x.png b/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@2x.png deleted file mode 100644 index 6573b38..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@3x.png b/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@3x.png deleted file mode 100644 index 1869f31..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer light'logo.imageset/Group_1171275591_3@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Contents.json deleted file mode 100644 index ad389ff..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275599@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275599@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@2x.png b/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@2x.png deleted file mode 100644 index 8535fdd..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@3x.png b/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@3x.png deleted file mode 100644 index 3632081..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer playing'logo.imageset/Group_1171275599@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Contents.json deleted file mode 100644 index 79d4d9d..0000000 --- a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275576@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275576@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@2x.png b/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@2x.png deleted file mode 100644 index c7a2a10..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@3x.png b/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@3x.png deleted file mode 100644 index e9bb05b..0000000 Binary files a/MusicPlayer/Assets.xcassets/Player/Timer'bg.imageset/Group_1171275576@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach 1.png b/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach 1.png deleted file mode 100644 index dd010c3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach.png b/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach.png deleted file mode 100644 index dd010c3..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Beach.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Contents.json deleted file mode 100644 index dfd0ed3..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Beach.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Beach.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Beach 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe 1.png b/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe 1.png deleted file mode 100644 index 5fe6b72..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe.png b/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe.png deleted file mode 100644 index 5fe6b72..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Breathe.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Contents.json deleted file mode 100644 index 89d3046..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Breathe.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Breathe.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Breathe 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls 1.png b/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls 1.png deleted file mode 100644 index 0df8682..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls.png b/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls.png deleted file mode 100644 index 0df8682..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Call of Seagulls.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Contents.json deleted file mode 100644 index 6fee98f..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Call of Seagulls.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Call of Seagulls.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Call of Seagulls 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds 1.png b/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds 1.png deleted file mode 100644 index c76f631..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds.png b/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds.png deleted file mode 100644 index c76f631..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Chirping of Birds.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Contents.json deleted file mode 100644 index 1718270..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Chirping of Birds.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Chirping of Birds.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Chirping of Birds 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping 1.png b/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping 1.png deleted file mode 100644 index e51164f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping.png b/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping.png deleted file mode 100644 index e51164f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Cicada Chirping.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Contents.json deleted file mode 100644 index d650f09..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Cicada Chirping.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Cicada Chirping.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Cicada Chirping 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Contents.json b/MusicPlayer/Assets.xcassets/Source/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/Contents.json deleted file mode 100644 index 367e7b2..0000000 --- a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "组 14 拷贝@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "组 14 拷贝@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@2x.png b/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@2x.png deleted file mode 100644 index 42c01c7..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@3x.png b/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@3x.png deleted file mode 100644 index fa8dfcd..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/End Of Days.imageset/组 14 拷贝@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Contents.json deleted file mode 100644 index 2546bdd..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Fireplace.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Fireplace 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace 1.png b/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace 1.png deleted file mode 100644 index a4bf56c..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace.png b/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace.png deleted file mode 100644 index a4bf56c..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Fireplace.imageset/Fireplace.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Contents.json deleted file mode 100644 index 326bdef..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Howling Wind.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Howling Wind 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind 1.png b/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind 1.png deleted file mode 100644 index cc94f0f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind.png b/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind.png deleted file mode 100644 index cc94f0f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Howling Wind.imageset/Howling Wind.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Contents.json deleted file mode 100644 index 110fd58..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Mountain stream.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mountain stream 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream 1.png b/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream 1.png deleted file mode 100644 index 1779274..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream.png b/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream.png deleted file mode 100644 index 1779274..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Mountain stream.imageset/Mountain stream.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Contents.json deleted file mode 100644 index 3b438e6..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Nocturnal Insects.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Nocturnal Insects 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects 1.png b/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects 1.png deleted file mode 100644 index 061d682..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects.png b/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects.png deleted file mode 100644 index 061d682..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Nocturnal Insects.imageset/Nocturnal Insects.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Contents.json deleted file mode 100644 index 0141474..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Seawater Surging.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Seawater Surging 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging 1.png b/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging 1.png deleted file mode 100644 index 9979362..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging.png b/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging.png deleted file mode 100644 index 9979362..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Seawater Surging.imageset/Seawater Surging.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Contents.json deleted file mode 100644 index 0b88947..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Shh Shh 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Shh Shh.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh 1.png b/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh 1.png deleted file mode 100644 index bfc8bb4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh.png b/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh.png deleted file mode 100644 index bfc8bb4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Shh Shh.imageset/Shh Shh.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Contents.json deleted file mode 100644 index 12ff753..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Shhh….png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Shhh… 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh… 1.png b/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh… 1.png deleted file mode 100644 index ac41ed4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh… 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh….png b/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh….png deleted file mode 100644 index ac41ed4..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Shhh….imageset/Shhh….png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Contents.json deleted file mode 100644 index 9516109..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Summer Insects.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Summer Insects 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects 1.png b/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects 1.png deleted file mode 100644 index 8d6235f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects.png b/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects.png deleted file mode 100644 index 8d6235f..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Summer Insects.imageset/Summer Insects.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/TV.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/TV.imageset/Contents.json deleted file mode 100644 index 8e86021..0000000 --- a/MusicPlayer/Assets.xcassets/Source/TV.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "TV.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "TV 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV 1.png b/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV 1.png deleted file mode 100644 index 8a4f123..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV.png b/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV.png deleted file mode 100644 index 8a4f123..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/TV.imageset/TV.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Contents.json deleted file mode 100644 index 0b94aff..0000000 --- a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Water droplet.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Water droplet 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet 1.png b/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet 1.png deleted file mode 100644 index b101213..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet.png b/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet.png deleted file mode 100644 index b101213..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/Water droplet.imageset/Water droplet.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/Contents.json b/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/Contents.json deleted file mode 100644 index c8d28a2..0000000 --- a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "waterfall.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "waterfall 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall 1.png b/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall 1.png deleted file mode 100644 index ad776a1..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall 1.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall.png b/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall.png deleted file mode 100644 index ad776a1..0000000 Binary files a/MusicPlayer/Assets.xcassets/Source/waterfall.imageset/waterfall.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Contents.json deleted file mode 100644 index 5c4d3b1..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@2x.png deleted file mode 100644 index 6bec3de..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@3x.png deleted file mode 100644 index 60156f7..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'pause.imageset/Frame@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Contents.json deleted file mode 100644 index 98f6b5f..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275512@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275512@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@2x.png deleted file mode 100644 index 9f70573..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@3x.png deleted file mode 100644 index d7cfde5..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'play.imageset/Group_1171275512@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Contents.json deleted file mode 100644 index bdba09e..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275505@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275505@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@2x.png deleted file mode 100644 index 7195d13..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@3x.png deleted file mode 100644 index e7f6e1a..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Bottom'timer.imageset/Group_1171275505@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Contents.json deleted file mode 100644 index 2a190de..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_12@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_12@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@2x.png b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@2x.png deleted file mode 100644 index a66c42c..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@3x.png b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@3x.png deleted file mode 100644 index f9f300e..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'bg.imageset/Rectangle_12@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Contents.json deleted file mode 100644 index 4d305b3..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Ellipse_2@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Ellipse_2@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@2x.png b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@2x.png deleted file mode 100644 index f6b73d4..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@3x.png b/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@3x.png deleted file mode 100644 index 05364fc..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/BottomShow'logo.imageset/Ellipse_2@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Contents.json deleted file mode 100644 index d9195ce..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275511@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275511@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@2x.png deleted file mode 100644 index d12b716..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@3x.png deleted file mode 100644 index 7ecc03a..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Center 1.imageset/Group_1171275511@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Contents.json deleted file mode 100644 index d9195ce..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275511@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275511@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@2x.png deleted file mode 100644 index b6b517a..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@3x.png deleted file mode 100644 index cb40fd1..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Center.imageset/Group_1171275511@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Contents.json deleted file mode 100644 index dda42ab..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275514@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275514@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@2x.png deleted file mode 100644 index db621b3..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@3x.png deleted file mode 100644 index 76f74a8..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Home 1.imageset/Group_1171275514@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Contents.json deleted file mode 100644 index 2cdd1c3..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group_1171275510@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group_1171275510@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@2x.png b/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@2x.png deleted file mode 100644 index 39ce5dd..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@3x.png b/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@3x.png deleted file mode 100644 index 88f7abf..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/Home.imageset/Group_1171275510@3x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Contents.json b/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Contents.json deleted file mode 100644 index 33b1008..0000000 --- a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle_161123843@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle_161123843@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@2x.png b/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@2x.png deleted file mode 100644 index 94e75ba..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@2x.png and /dev/null differ diff --git a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@3x.png b/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@3x.png deleted file mode 100644 index 5e9d984..0000000 Binary files a/MusicPlayer/Assets.xcassets/TabBar/TabBar'bg.imageset/Rectangle_161123843@3x.png and /dev/null differ diff --git a/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents b/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents index db396b0..a28d037 100644 --- a/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents +++ b/MusicPlayer/MP/Common/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/MusicPlayer/MP/Common/Macro(宏定义与全局量)/Macro.swift b/MusicPlayer/MP/Common/Macro(宏定义与全局量)/Macro.swift index 74279a6..b5dab02 100644 --- a/MusicPlayer/MP/Common/Macro(宏定义与全局量)/Macro.swift +++ b/MusicPlayer/MP/Common/Macro(宏定义与全局量)/Macro.swift @@ -112,3 +112,4 @@ func createLabel(_ text:String? = nil, font:UIFont, textColor:UIColor, textAlign label.numberOfLines = lines return label } + diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MPCoreDataHandlerManager.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MPCoreDataHandlerManager.swift deleted file mode 100644 index 04da1b9..0000000 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MPCoreDataHandlerManager.swift +++ /dev/null @@ -1,48 +0,0 @@ -// -// MPCoreDataHandlerManager.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/1. -// - -import Foundation -import CoreData - -///CoreData数据库处理器 -class MPCoreDataHandlerManager { - //单例工具 - static let shared = MPCoreDataHandlerManager() - //数据仓库 - private lazy var persistentContainer: NSPersistentContainer = { - //数据仓库名为XXX.cdatamodeld中的XXX - let container = NSPersistentContainer(name: "MusicPlayer") - container.loadPersistentStores { (_, error) in - if let error = error { - //加载数据仓库失败 - fatalError("Failed to load persistent stores: \(error)") - }else { - //加载数据仓库成功 - print("Successfully to load persistent stores") - } - } - return container - }() - //托管（映射）对象空间 - var context: NSManagedObjectContext { - return persistentContainer.viewContext - } - //保存对象空间 - func saveContext() { - //检索对象空间是否进行了更新 - if context.hasChanges { - do { - //保存对象空间 - try context.save() - } catch { - //保存失败 - let nserror = error as NSError - fatalError("Unresolved error \(nserror), \(nserror.userInfo)") - } - } - } -} diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MPHUD.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MPHUD.swift deleted file mode 100644 index 3a1da77..0000000 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MPHUD.swift +++ /dev/null @@ -1,84 +0,0 @@ -// -// MPHUD.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/11. -// - -import UIKit -import SVProgressHUD -///二次封装hud -class MPHUD: NSObject { - //HUD输出状态 - enum status { - ///成功 - case success - ///失败 - case error - ///只显示文字 - case onlyText - ///过程 - case progress - ///加载数据 - case loading - } - ///文本HUD - static func text(_ text:String?,delay:TimeInterval,completion:(() -> Void)?){ - showWithStatus(hudStatus: .onlyText, text: text, delay: delay, completion: completion) - } - - ///等待HUD - static func progress(_ text:String?,delay:TimeInterval,completion:(() -> Void)?){ - showWithStatus(hudStatus: .progress, text: text, delay: delay, completion: completion) - } - ///数据HUD - static func loading(_ delay:TimeInterval,completion:(() -> Void)?){ - showWithStatus(hudStatus: .loading, text: nil, delay: delay, completion: completion) - } - ///成功HUD - static func success(_ text:String?,delay:TimeInterval,completion:(() -> Void)?){ - showWithStatus(hudStatus: .success, text: text, delay: delay, completion: completion) - } - ///错误HUD - static func error(_ text:String?,delay:TimeInterval,completion:(() -> Void)?){ - showWithStatus(hudStatus: .error, text: text, delay: delay, completion: completion) - } - //立刻隐藏当前HUD - static func hideNow() { - SVProgressHUD.dismiss() - } - - /// 展示HUD - /// - Parameters: - /// - status: HUD状态 - /// - text: 显示文本 - /// - delay: 显示时常 - static func showWithStatus(hudStatus status: status, text: String?, delay: TimeInterval ,completion:(() -> Void)?) { - SVProgressHUD.setDefaultStyle(.light) - SVProgressHUD.setDefaultMaskType(.clear) - SVProgressHUD.setBackgroundColor(.white) - SVProgressHUD.setOffsetFromCenter(.init(horizontal: 0, vertical: 0)) - switch status { - case .success: - SVProgressHUD.showSuccess(withStatus: text) - SVProgressHUD.setMinimumSize(CGSize(width: 100 * width, height: 80 * width)) - case .error: - SVProgressHUD.showError(withStatus: text) - case .onlyText: - SVProgressHUD.setOffsetFromCenter(.init(horizontal: 0, vertical: (screen_Height / 2) - 85 * width)) - SVProgressHUD.setMinimumSize(CGSize(width: 100 * width, height: 40 * width)) - SVProgressHUD.show(UIImage(), status: text) - case .loading: - SVProgressHUD.setBackgroundColor(.white) - SVProgressHUD.show() - default: - SVProgressHUD.show(withStatus: text) - } - SVProgressHUD.dismiss(withDelay: delay) { - guard let completion = completion else{ - return - } - completion() - } - } -} diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MPMediaCenterManager.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MPMediaCenterManager.swift deleted file mode 100644 index 464e81c..0000000 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MPMediaCenterManager.swift +++ /dev/null @@ -1,620 +0,0 @@ -// -// MPMediaCenterManager.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/11. -// - -import Foundation -import AVFoundation -import MediaPlayer -///播放器播放事件类型 -enum MPPlayerPlayActionType:Int { - ///正常播放 - case Normal = 0 - ///倒计时播放(用户添加倒计时) - case CountTime = 1 -} -///播放器播放状态 -enum MPPlayerStateType:Int { - ///未播放 - case Null = 0 - ///播放中 - case Playing = 1 - ///暂停 - case Pause = 2 -} -///倒计时状态 -enum MPTimerType:Int { - ///未启动 - case UnActivity = 0 - ///运行中 - case Playing = 1 - ///暂停中 - case Suspend = 2 -} -///倒计时规格等级 -enum MPCountTimerLevel:Int, CaseIterable { - case OFF = 0 - case _10 = 1 - case _20 = 2 - case _30 = 3 - case _60 = 4 - case _90 = 5 - ///标题 - var title:String{ - switch self { - case .OFF: - return "OFF" - case ._10: - return "10" - case ._20: - return "20" - case ._30: - return "30" - case ._60: - return "60" - case ._90: - return "90" - } - } - ///实际数值（分） - var mins:Int{ - switch self { - case .OFF: - return 0 - case ._10: - return 10 - case ._20: - return 20 - case ._30: - return 30 - case ._60: - return 60 - case ._90: - return 90 - } - } -} - - -///多媒体控制器（播放控制器，倒计时控制器，麦克风管理器） -class MPMediaCenterManager { - ///控制器单例 - static let shared = MPMediaCenterManager() - //MARK: - 各项工具 - //音乐播放器 - private var player:AVPlayer? - //远程控制中心 - private var center:MPRemoteCommandCenter? - //GCD倒计时器 - private var countTimer: DispatchSourceTimer? - //监听器(需要获取麦克风权限)，通过监听器实时获取周遭分贝 - private var monitor:AVAudioRecorder? - //监听器设置参数字典 - private var monitorSetingsDic:[String : Any]? - //GCD监听计时器 - private var monitorTimer: DispatchSourceTimer? - - //MARK: - 实体与状态值 - ///音乐实体 - private var music:MusicModel? - ///获取音乐实体 - func getMusic() -> MusicModel?{ - return music - } - ///更改音乐实体 - func setMusic(_ music:MusicModel?) { - self.music = music - } - ///播放器播放方法 - private var playActionType:MPPlayerPlayActionType = .Normal - ///播放器播放状态（默认未播放） - private var playerState:MPPlayerStateType = .Null - ///获取播放器播放状态 - func getPlayerState() -> MPPlayerStateType { - return playerState - } - ///倒计时运行状态（默认未启动） - private var countTimeType:MPTimerType = .UnActivity - ///倒计时规格 （默认为OFF） - private var countTimerLevel:MPCountTimerLevel = .OFF - ///获取倒计时规格值 - func getCountTimerLevel() -> MPCountTimerLevel { - return countTimerLevel - } - ///监听器计时状态 - private var monitorTimerType:MPTimerType = .UnActivity - ///监听器是否活跃 - private var isMonitorActivity:Bool = false - //隐藏管理器初始化方法 - private init() { - //初始化时获取上次运行app时存入的最后一首音乐（保存的内容为音乐实体的identifier，具备唯一性） - let lastTitle = UserDefaults.standard.string(forKey: "Last") ?? "" - let last = MusicModel.fetch(.init(format: "identifier==%@", lastTitle)).first - //更新音乐实体（可选性） - music = last - // 添加观察者，监听播放结束事件 - NotificationCenter.default.addObserver(self, selector: #selector(playerDidFinishPlaying), name: .AVPlayerItemDidPlayToEndTime, object: player?.currentItem) - - //初始化监听器字典并添加设置参数 - monitorSetingsDic = - [ - //音频格式 - AVFormatIDKey:NSNumber(value: kAudioFormatLinearPCM), - //录音的声道数，立体声为双声道 - AVNumberOfChannelsKey: 2, - //录音质量 - AVEncoderAudioQualityKey : AVAudioQuality.max.rawValue, - //采样位数 - AVLinearPCMBitDepthKey:NSNumber(value:16), - AVEncoderBitRateKey : 320000, - //录音器每秒采集的录音样本数 - AVSampleRateKey : 44100.0 - ] - } - - //管理器销毁时 - deinit { - //解除监听 - NotificationCenter.default.removeObserver(self) - //释放播放器 - player = nil - //释放倒计时器 - countTimer?.cancel() - countTimer = nil - //释放监听器 - monitor = nil - monitorTimer?.cancel() - monitorTimer = nil - } - //MARK: - 播放器与倒计时器 - /// 启动播放器 - /// - Parameters: - /// - music: 音乐实体 - /// - actionType: 播放方法（正常播放/倒计时播发） - /// - countLevel: 如果倒计时播放则填入倒计时规格 - func playerStart(_ music:MusicModel, actionType:MPPlayerPlayActionType, countLevel: MPCountTimerLevel = .OFF) { - //检索倒计时器状态 - switch countTimeType { - case .UnActivity://未启动计时器 - break - case .Playing://计时器运行中 - if countTimer != nil { - //倒计时器具备实例，处于rsume中，可以直接销毁 - countTimer!.cancel() - countTimer = nil - } - case .Suspend://计时器暂停中，销毁计时器 - if countTimer != nil { - //倒计时器具备实例，处于suspend中，可以直接销毁 - countTimer!.resume() - countTimer!.cancel() - countTimer = nil - } - } - //检索当前音乐播放器状态 - switch playerState { - case .Null://未播放,跳过 - break - case .Playing://播放中 - //销毁播放器 - if player != nil { - player!.pause() - player = nil - } - //发送停止音乐播放通知 - NotificationCenter.notificationKey.post(notificationName: .stop_music) - case .Pause://暂停中 - //销毁播放器 - if player != nil { - player = nil - } - //发送停止音乐播放通知 - NotificationCenter.notificationKey.post(notificationName: .stop_music) - } - //更新播放方法 - playActionType = actionType - //检索播放方法 - switch playActionType { - case .Normal://正常播放 - playMusic(music) - case .CountTime://倒计时播放 - //更新倒计时规格 - countTimerLevel = countLevel - countTimerStart(Double(countLevel.mins*60), music: music) - } - } - //倒计时播放时触发 - private func countTimerStart(_ totalTimes:TimeInterval, music:MusicModel) { -// //检索倒计时器状态 -// switch countTimeType { -// case .UnActivity://未启动计时器 -// break -// case .Playing://计时器运行中 -// if countTimer != nil { -// //倒计时器具备实例，处于rsume中，可以直接销毁 -// countTimer!.cancel() -// countTimer = nil -// } -// case .Suspend://计时器暂停中，销毁计时器 -// if countTimer != nil { -// //倒计时器具备实例，处于suspend中，可以直接销毁 -// countTimer!.resume() -// countTimer!.cancel() -// countTimer = nil -// } -// } - //创建倒计时器队列 - let queue = DispatchQueue(label: "com.MPCountTimer.queue") - //创建倒计时器 - countTimer = DispatchSource.makeTimerSource(queue: queue) - //设置计时器的起始时间以及触发事件频率为一秒一次 - countTimer!.schedule(deadline: .now(), repeating: .seconds(1)) - //将总时间值赋予times - var times = totalTimes - //计时器设置触发事件 - countTimer!.setEventHandler(handler: { - [weak self] in - //判断时间值是否归零 - if times > 0 { - //未归0，倒计时-1 - times -= 1 - //打印倒计时 - print(setTimesToMinSeconds(times)) - //发布时间值变化通知 - NotificationCenter.notificationKey.post(notificationName: .time_times, object: times) - }else { - //执行结束事件 - self?.playerStop() - } - }) - //启动倒计时器 - countTimeType = .Playing - countTimer!.resume() - print("The CountTimer has started.") - //调用音乐播放器 - playMusic(music) - } - - //启动播放器 - private func playMusic(_ music:MusicModel) { - //根据音乐实体类型 - self.music = music - player_play(self.music!.isLocal ? musicLocal():musicDocument()) - } - //音乐为本地文件 - private func musicLocal() -> URL { - //本地文件，mp3格式 - let url:URL = .init(fileURLWithPath: Bundle.main.path(forResource: music!.path, ofType: "mp3")!) - return url - } - //音乐为沙盒文件 - private func musicDocument() -> URL { - var url:URL! - //用户上传文件，文件路径设置为沙盒 - let directory = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first! - //获取沙盒中的数据 - let vedioUrl = URL(fileURLWithPath:URL(fileURLWithPath: directory).appendingPathComponent((music!.path)).path) - //检索路径是否安全授权 - let authozied = vedioUrl.startAccessingSecurityScopedResource() - if authozied == true { - //允许安全访问路径，调出文件协调器解码并获取真实文件地址 - let fileCoordinator = NSFileCoordinator() - fileCoordinator.coordinate(readingItemAt: vedioUrl, options: .withoutChanges, error: nil) { (newUrl) in - url = newUrl - } - }else { - //未能获取安全授权，强制获取 - url = vedioUrl - } - //停止安全访问权限 - vedioUrl.stopAccessingSecurityScopedResource() - return url - } - //播放音乐 - private func player_play(_ url:URL) { - //检索真实路径对应的文件是否存在 - if FileManager.default.fileExists(atPath: url.path) == true { - //当前路径的文件正式存在 - //初始化播放器 - let playerItem = AVPlayerItem(url: url) - //创建AVPlayer - player = AVPlayer(playerItem: playerItem) - //正式播放 - player?.play() - playerState = .Playing - //启动远程中心并配置相关内容 - setCommandCenter(music!) - //发送播放器启动通知 - NotificationCenter.notificationKey.post(notificationName: .play_music) - //更新最后一次播放内容 - music!.lastTime = Date().timeZone() - MusicModel.save() - UserDefaults.standard.set(music!.identifier, forKey: "Last") - }else { - //文件不存在，通知用户删除该音乐实体 - print("Couldn't find the file.") - playerState = .Null - music = nil - //发送音乐缺失通知 - NotificationCenter.notificationKey.post(notificationName: .null_music) - } - } - ///暂停播放器 - func playerPause() { - //检索播放状态，是否进行中 - guard playerState == .Playing, let player = player else { - //未处于播放中 - print("Player is not in playing") - return - } - //处于播放中,检索播放方法 - switch playActionType { - case .Normal://正常播放 - player_pause(player) - case .CountTime://倒计时播放 - //检索倒计时器状态，是否进行中 - guard countTimeType == .Playing, let countTimer = countTimer else { - //倒计时器未运行 - print("CountTimer is not playing") - return - } - //倒计时运行中,暂停倒计时 - countTimer.suspend() - countTimeType = .Suspend - //暂停播放 - player_pause(player) - } - } - //暂停播放 - private func player_pause(_ player:AVPlayer) { - //暂停播放器 - player.pause() - //切换播放器状态 - playerState = .Pause - //发布音乐暂停公告 - NotificationCenter.notificationKey.post(notificationName: .pause_music) - } - ///继续播放器 - func playerResume() { - //检索播放状态，是否暂停中 - guard playerState == .Pause, let player = player else { - //未处于暂停中 - print("Player is not paused") - return - } - //处于暂停中,检索播放方法 - switch playActionType { - case .Normal://正常播放 - player_resume(player) - case .CountTime://倒计时播放 - //检索倒计时器状态，是否暂停中 - guard countTimeType == .Suspend, let countTimer = countTimer else { - //倒计时器未暂停 - print("CountTimer is not paused") - return - } - //倒计时暂停中，运行倒计时 - countTimer.resume() - countTimeType = .Playing - //继续播放 - player_resume(player) - } - } - //继续播放 - private func player_resume(_ player:AVPlayer) { - //继续播放器 - player.play() - //切换播放器状态 - playerState = .Playing - //发布音乐继续公告 - NotificationCenter.notificationKey.post(notificationName: .resume_music) - } - ///停止播放器 - func playerStop() { - //检索播放状态，是否已启动 - guard playerState != .Null, let player = player else { - //未启动 - print("Player is not started") - return - } - //处于启动中,检索播放方法 - switch playActionType { - case .Normal://正常播放 - player_stop(player) - case .CountTime://倒计时播放 - //检索倒计时器状态，是否已启动 - guard countTimeType != .UnActivity, let countTimer = countTimer else { - //倒计时器未启动 - print("CountTimer is not started") - return - } - //倒计时器已启动，终止倒计时 - if countTimeType == .Suspend { - countTimer.resume() - } - countTimer.cancel() - self.countTimer = nil - //当计时器终止后，将计时等级回正为off - countTimerLevel = .OFF - //停止音乐播放 - player_stop(player) - } - } - //停止播放 - private func player_stop(_ player:AVPlayer) { - player.pause() - self.player = nil - playerState = .Null - //回正播放类型 - playActionType = .Normal - //发送停止音乐播放通知 - NotificationCenter.notificationKey.post(notificationName: .stop_music) - } - //播放器停止 - @objc private func playerDidFinishPlaying() { - guard playerState == .Playing, let player = player else { - return - } - // 重置播放时间到开始 - player.seek(to: CMTime.zero) - // 继续播放 - player.play() - } - //MARK: - 远程中心 - private func setCommandCenter(_ music:MusicModel) { - // 实例化远程控制中心 - center = MPRemoteCommandCenter.shared() - - //设置控制中心各项操作 - //播放 - center!.playCommand.addTarget(handler: { [weak self] (event) in - guard let self = self else { return .noActionableNowPlayingItem} - if self.music != nil { - - return .success - }else { - return .noActionableNowPlayingItem - } - }) - //暂停 - center!.pauseCommand.addTarget(handler: { [weak self] (event) in - guard let self = self else { return .noActionableNowPlayingItem} - if self.music != nil { - - return .success - }else { - return .noActionableNowPlayingItem - } - }) - //设置info字典信息 - var info = [String:Any]() - //展示标题 - info[MPMediaItemPropertyTitle] = music.title ?? "" - //设置艺术家 -// info[MPMediaItemPropertyArtist] = "" - //设置专辑 -// info[MPMediaItemPropertyAlbumTitle] = "" - //设置歌曲时长 -// info[MPMediaItemPropertyPlaybackDuration] = 0 - //设置歌曲封面 - if let image = UIImage(data: music.cover) { - info[MPMediaItemPropertyArtwork] = MPMediaItemArtwork(boundsSize: image.size, requestHandler: { size in - return image - }) - } - //更新远程中心 - MPNowPlayingInfoCenter.default().nowPlayingInfo = info - } - //MARK: - 麦克风监听器 - ///开启监听器 - func openMonitor(_ decibels:Double) { - //优先检索倒计时器和播放器状态 - if countTimeType != .UnActivity || playerState != .Null { - //有一项处于启动中，终止该事件 - playerStop() - } - //检索监听器计时状态 - switch monitorTimerType { - case .UnActivity://未启动监听器计时 - break - case .Playing://监听器计时运行中 - if monitorTimer != nil { - //倒计时器具备实例，处于rsume中，可以直接销毁 - monitorTimer!.cancel() - monitorTimer = nil - } - case .Suspend://监听器计时暂停中 - if monitorTimer != nil { - //倒计时器具备实例，处于suspend中，可以直接销毁 - monitorTimer!.resume() - monitorTimer!.cancel() - monitorTimer = nil - } - } - //创建计时器队列 - let queue = DispatchQueue(label: "com.MPMonitorTimer.queue") - //实例化监听器计时 - monitorTimer = DispatchSource.makeTimerSource(queue: queue) - //设置计时器的起始时间以及触发事件频率为一秒一次 - monitorTimer!.schedule(deadline: .now(), repeating: .seconds(1)) - //计时器设置触发事件 - monitorTimer!.setEventHandler(handler: { - [weak self] in - guard let self = self else { return } - //每秒触发一次监听器，获取当前麦克风分贝值 - let currentDecibels = checkDecibels() - //根据分贝值大小，判断是否启动音乐播放器 - if currentDecibels > decibels { - guard let music = self.music else { - return - } - //启动十分钟计时器 - playerStart(music, actionType: .CountTime, countLevel: ._10) - //停止监听器 - stopMonitor() - } - }) - //先删除监听器缓存内容，并释放监听器 - monitor?.deleteRecording() - monitor = nil - var url:URL? - let path = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] + "/play" - //生成空路径 - if #available(iOS 16.0, *) { - url = URL(filePath: path) - } else { - url = URL(fileURLWithPath: path) - } - //重新实例化监听器 - do { - //初始化监听器 - monitor = try AVAudioRecorder(url: url!, settings: monitorSetingsDic!) - //开启仪表计数功能 - monitor!.isMeteringEnabled = true - //准备监听 - monitor!.prepareToRecord() - //开始监听 - monitor!.record() - //启动监听器计时 - monitorTimerType = .Playing - isMonitorActivity = true - monitorTimer!.resume() - //发送开启监听通知 - NotificationCenter.notificationKey.post(notificationName: .open_monitor) - print("The monitor has open.") - } catch let error { - print("Monitor initialization failure:\(error.localizedDescription)") - } - } - ///终止监听器运行 - func stopMonitor() { - guard let timer = monitorTimer, let monitor = monitor else { return } - //停止并销毁计时器和监听器 - if monitorTimerType == .Suspend { - timer.resume() - } - timer.cancel() - self.monitorTimer = nil - monitorTimerType = .UnActivity - isMonitorActivity = false - monitor.stop() - self.monitor = nil - //发送关闭监听通知 - NotificationCenter.notificationKey.post(notificationName: .stop_monitor) - print("The monitor has stoped") - - } - //检测麦克风音量 - private func checkDecibels() -> Double{ - // 刷新音量数据 - monitor!.updateMeters() - let power = monitor!.peakPower(forChannel: 0) - //获取分贝 基本在0-1之间 可能超过1 - let decibels:Double = pow(Double(10), Double(0.05*power)) - print("Current decibels: \(decibels)") - return decibels - } -} - diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MPNetWorkManager.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MPNetWorkManager.swift deleted file mode 100644 index bf6ef76..0000000 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MPNetWorkManager.swift +++ /dev/null @@ -1,57 +0,0 @@ -// -// MPNetWorkManager.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/11. -// - -import UIKit -import Network -///网络状况管理器 -class MPNetWorkManager: NSObject { - //单例工具 - static let shared = MPNetWorkManager() - //私有初始化 - private override init() { - super.init() - } - ///检查网络状况 - func requestNetworkPermission(oberve:UIViewController, completeHanlder:ActionBlock?) { - let monitor = NWPathMonitor() - monitor.pathUpdateHandler = { path in - switch path.status { - case .satisfied: - DispatchQueue.main.async { - guard completeHanlder != nil else { - return - } - completeHanlder!() - } - default://网络权限出现问题 - DispatchQueue.main.async { - //次要处理 - let alertController = UIAlertController(title: "Access network request", message: "”Musicoo“ needs to be loaded via a network request. Please click “Settings” to allow this application to gain access to the network.", preferredStyle: .alert) - let CancelAction = UIAlertAction(title:"Cancel", style: .cancel) { (Cancel) in - - } - let OKAction = UIAlertAction(title: "Settings", style: .default) { (action) in - let url = URL(string: UIApplication.openSettingsURLString) - if let url = url,UIApplication.shared.canOpenURL(url){ - if #available(iOS 10, *) { - UIApplication.shared.open(url, options: [:]) { (success) in - } - }else{ - UIApplication.shared.canOpenURL(url) - } - } - } - alertController.addAction(CancelAction) - alertController.addAction(OKAction) - oberve.present(alertController, animated: true, completion: nil) - } - } - } - let queue = DispatchQueue(label: "MPNetWorkManager") - monitor.start(queue: queue) - } -} diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MPVolumeManager.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MPVolumeManager.swift deleted file mode 100644 index 2dca603..0000000 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MPVolumeManager.swift +++ /dev/null @@ -1,81 +0,0 @@ -// -// MPVolumeManager.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/29. -// - -import Foundation -import UIKit -import MediaPlayer -import AVFoundation -///音量控制器（获取修改系统音量） -class MPVolumeManager:NSObject { - static let shared = MPVolumeManager() - //系统音量控制View - private var volumeView:MPVolumeView? - //自定义渐变色Slider - private var systemVolumeSlider: UISlider? - private override init() { - super.init() - //为音频会话添加KVO监听 - AVAudioSession.sharedInstance().addObserver(self, forKeyPath: "outputVolume", options: [.old, .new], context: nil) - } - deinit { - //移除所有监听 - AVAudioSession.sharedInstance().removeObserver(self, forKeyPath: "outputVolume") - } - //重新持有系统volum控制器 - func createVolume() { - volumeView = .init() - // 添加音量视图到界面，但隐藏它 - volumeView!.frame = CGRect(x: -100, y: -100, width: 0, height: 0) - UIApplication.shared.windows.first?.addSubview(volumeView!) - // 查找系统音量滑块 - for view in volumeView!.subviews { - if let slider = view as? UISlider { - systemVolumeSlider = slider - break - } - } - } - //销毁系统volum控制器 - func destroyVolume() { - guard volumeView != nil else { - return - } - volumeView!.removeFromSuperview() - systemVolumeSlider = nil - volumeView = nil - } - //设置系统音量 - func setVolume(_ volume: Float) { - systemVolumeSlider?.setValue(volume, animated: false) - } - //获取系统音量 - func getVolume() -> Float { - //获取AVAudioSession - getSystemVolume() - } - //获取系统音量 - private func getSystemVolume() -> Float{ - let audioSession = AVAudioSession.sharedInstance() - do { - try audioSession.setActive(true) - return audioSession.outputVolume - } catch { - print("Error getting system volume: \(error.localizedDescription)") - return 0.0 - } - } - //KVO - override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { - if keyPath == "outputVolume" { - if let volume = change?[.newKey] as? Float { - - //将获得volume值通知传出 - NotificationCenter.notificationKey.post(notificationName: .volume_change, object: volume) - } - } - } -} diff --git a/MusicPlayer/MP/MPPositive/Models/Models/MPPositive_DownloadItemModel.swift b/MusicPlayer/MP/MPPositive/Models/Models/MPPositive_DownloadItemModel.swift new file mode 100644 index 0000000..a3b1ff6 --- /dev/null +++ b/MusicPlayer/MP/MPPositive/Models/Models/MPPositive_DownloadItemModel.swift @@ -0,0 +1,35 @@ +// +// MPPositive_DownloadItemModel.swift +// MusicPlayer +// +// Created by Mr.Zhou on 2024/5/11. +// + +import UIKit +import CoreData +///音乐Model +@objc(MPPositive_DownloadItemModel) +///音乐资源下载模型 +class MPPositive_DownloadItemModel: NSManagedObject, MP_CoreDataManageableDelegate, MP_CoreDataOperationDelegate { + typealias ManagedObject = MPSideA_MusicModel + ///资源存储地址（沙盒路径后缀名） + var resourcePath:String! + ///封面 + var coverImage:Data! + ///预览图片 + var reviewImage:Data! + ///标题（单曲标题） + var title:String? + ///长文本标题（作者/播放次数/点赞次数） + var longBylineText:String? + ///单曲长度文本(歌曲长度) + var lengthText:String? + ///署名文本（歌手） + var shortBylineText:String? + ///歌词 + var lyrics:String? + ///播放的VideoID + var videoId:String! + ///相关内容ID + var relatedID:String! +} diff --git a/MusicPlayer/MP/MPPositive/ViewControllers/Base（基类，导航栏，标签栏）/MPPositive_TabBarController.swift b/MusicPlayer/MP/MPPositive/ViewControllers/Base（基类，导航栏，标签栏）/MPPositive_TabBarController.swift index 557aeb6..a1d249d 100644 --- a/MusicPlayer/MP/MPPositive/ViewControllers/Base（基类，导航栏，标签栏）/MPPositive_TabBarController.swift +++ b/MusicPlayer/MP/MPPositive/ViewControllers/Base（基类，导航栏，标签栏）/MPPositive_TabBarController.swift @@ -42,6 +42,8 @@ class MPPositive_TabBarController: UITabBarController { private func addNotification() { //监听标签切换 NotificationCenter.notificationKey.add(observer: self, selector: #selector(switchAction(_:)), notificationName: .switch_tabBarItem) + //监听控制器弹出 + NotificationCenter.notificationKey.add(observer: self, selector: #selector(pupPlayerAction(_:)), notificationName: .pup_player_vc) } deinit { //移除所有监听 @@ -57,6 +59,11 @@ extension MPPositive_TabBarController { } //弹出player控制器 @objc private func pupPlayerAction(_ sender:Notification) { - + //检索播放器中是否存在load模型 + if MP_PlayerManager.shared.loadPlayer != nil { + let playerVC = MPPositive_PlayerViewController() + playerVC.modalPresentationStyle = .fullScreen + present(playerVC, animated: true) + } } } diff --git a/MusicPlayer/MP/MPPositive/ViewControllers/Home（首页，各项列表页，播放器页）/MPPositive_HomeViewController.swift b/MusicPlayer/MP/MPPositive/ViewControllers/Home（首页，各项列表页，播放器页）/MPPositive_HomeViewController.swift index 6f5f499..ba0b98a 100644 --- a/MusicPlayer/MP/MPPositive/ViewControllers/Home（首页，各项列表页，播放器页）/MPPositive_HomeViewController.swift +++ b/MusicPlayer/MP/MPPositive/ViewControllers/Home（首页，各项列表页，播放器页）/MPPositive_HomeViewController.swift @@ -115,10 +115,7 @@ extension MPPositive_HomeViewController: UITableViewDataSource, UITableViewDeleg let lodaViewModel = MPPositive_PlayerLoadViewModel(listSongs, currentVideoId: item.browseItem.musicVideo.videoId ?? "") lodaViewModel.improveData(item.browseItem.musicVideo.videoId ?? "") MP_PlayerManager.shared.loadPlayer = lodaViewModel - //创建player播放器 - let playerVC = MPPositive_PlayerViewController() - playerVC.modalPresentationStyle = .fullScreen - present(playerVC, animated: true) + NotificationCenter.notificationKey.post(notificationName: .pup_player_vc) } }else { //列表/专辑跳转 diff --git a/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift b/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift index 9205a08..91edf2c 100644 --- a/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift +++ b/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift @@ -137,6 +137,13 @@ class MPPositive_PlayerCoverView: UIView { } //点击下载 @objc private func loadActionClick(_ sender:UIButton) { - + //下载，检索当前播放音乐是否存在 + if MP_PlayerManager.shared.loadPlayer.currentVideo != nil { + //当前音乐存在，执行音乐下载 + //处理完成 + let item = MPPositive_DownloadItemModel.create() + + MPPositive_DownloadItemModel.save() + } } } diff --git a/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/.xccurrentversion b/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/.xccurrentversion deleted file mode 100644 index e1ab6c2..0000000 --- a/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,8 +0,0 @@ - - - - - _XCCurrentVersionName - MusicPlayer.xcdatamodel - - diff --git a/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents b/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents deleted file mode 100644 index 91b9118..0000000 --- a/MusicPlayer/MP/Models/DataBase/MusicPlayer.xcdatamodeld/MusicPlayer.xcdatamodel/contents +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MusicPlayer/MP/Models/Load/LoadDataMusic.swift b/MusicPlayer/MP/Models/Load/LoadDataMusic.swift deleted file mode 100644 index 742c0dc..0000000 --- a/MusicPlayer/MP/Models/Load/LoadDataMusic.swift +++ /dev/null @@ -1,107 +0,0 @@ -// -// LoadDataMusic.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/1. -// - -import UIKit -///音乐数据集合控制器 -class LoadDataMusic: NSObject { - static let shared = LoadDataMusic() - ///全部音乐资源 - var alllistMusics:[MusicViewModel] = [] - ///用户上传资源 - var userlistMusics:[MusicViewModel] = [] - ///本地全部资源 - var locallistMusics:[MusicViewModel] = [] - ///首页展示-第0层（本地三条加一条用户最后播放数据） - var homeZeroMusics:[MusicViewModel] = [] - ///首页展示-第1层（本地数据，ablum为1） - var homeFirstMusics:[MusicViewModel] = [] - ///首页展示-第2层（本地数据，ablum为2） - var homeSecondMusics:[MusicViewModel] = [] - ///首页展示-第3层（本地数据，ablum为3） - var homeThirdMusics:[[MusicViewModel]] = [] - private override init() { - super.init() - if (UserDefaults.standard.bool(forKey: "FirstBulid")) == false { - //配置本地数据 - plistDatatoModel() - UserDefaults.standard.set(true, forKey: "FirstBulid") - print("Create data successfully") - } - } - - /// 数据配置 - /// - Parameter complete: 当模型组配置完成后执行该事件 - public func reloadListData() { - //清空各项数组内容 - alllistMusics = [] - userlistMusics = [] - locallistMusics = [] - homeZeroMusics = [] - homeFirstMusics = [] - homeSecondMusics = [] - homeThirdMusics = [] - //重新装填数据 - let all = MusicModel.fetchAll() - all.forEach { item in - //筛选本地与用户上传数据 - if item.isLocal == true { - locallistMusics.append(.init(item)) - - }else { - userlistMusics.append(.init(item)) - } - //全部数据 - alllistMusics.append(.init(item)) - } - //分类展示数据 - homeFirstMusics = locallistMusics.filter{($0.type == .First)} - homeSecondMusics = locallistMusics.filter{($0.type == .Second)} - homeThirdMusics = convertToTwoArray(locallistMusics.filter{($0.type == .Third)}, raw: 3) - //取出固定内容 - homeZeroMusics.append(homeThirdMusics.last!.last!) - homeZeroMusics.append(homeSecondMusics.last!) - homeZeroMusics.append(homeFirstMusics.last!) - if userlistMusics.count != 0 { - homeZeroMusics.append(userlistMusics.last!) - } - } - //获取本地资源Plist，并转化为音乐模型数组 - private func plistDatatoModel() { - let plistPath = Bundle.main.path(forResource: "Resource", ofType: "plist")! - let dictArray = NSArray(contentsOfFile: plistPath) - dictArray?.forEach({ (item) in - let dict = item as! [String : AnyObject] - let music = MusicModel.create() - music.identifier = dict["identifier"] as? String - music.title = dict["title"] as? String - music.duration = dict["duration"] as! Double - music.cover = UIImage(named: dict["cover"] as! String)!.pngData()! - music.author = dict["author"] as? String - music.album = dict["album"] as! Int16 - music.isLocal = dict["isLocal"] as! Bool - music.path = dict["path"] as! String - music.creationTime = Date().timeZone() - }) - MusicModel.save() - } - - /// 将一维音乐数组转为二维音乐数组 - /// - Parameters: - /// - array: 原音乐数组 - /// - raw: 分割个数 - /// - Returns: 返回的二维数组 - private func convertToTwoArray(_ array:[MusicViewModel], raw:Int) -> [[MusicViewModel]] { - let twoDArray = stride(from: 0, to: array.count, by: raw).map { (index) -> [MusicViewModel] in - if (index + raw) > array.count { - return Array(array[index...]) - } else { - return Array(array[index.. (TimeInterval,UIImage,String){ - //长度 - var duration:TimeInterval = 0 - let time = asset.duration -// if #available(iOS 16, *) { -// do { -// time = try await asset.load(.duration) -// } catch { -// print("Conversion to time failed") -// } -// }else { -// time = asset.duration -// } - duration = CMTimeGetSeconds(time) - //获取第一帧 - let gen = AVAssetImageGenerator(asset: asset) - gen.appliesPreferredTrackTransform = true - //获取时间点 - let firstTime = CMTimeMakeWithSeconds(0.0, preferredTimescale: 1) - var actualTime:CMTime = CMTimeMakeWithSeconds(0, preferredTimescale: 0) - var firstImage:UIImage! - do { - //获取第一帧作为封面 - let image = try gen.copyCGImage(at: firstTime, actualTime: &actualTime) - firstImage = UIImage(cgImage: image) - } catch { - //获取失败 - print("Failed to get file the first image") - //给予初始值 - firstImage = .init(named: "End Of Days") - } - //获取地址最后一组内容作为标题 - let title:String = url.lastPathComponent - return (duration,firstImage,title) - } -} diff --git a/MusicPlayer/MP/ViewControllers/Add(新增资源)/AddViewController.xib b/MusicPlayer/MP/ViewControllers/Add(新增资源)/AddViewController.xib deleted file mode 100644 index 7c3e980..0000000 --- a/MusicPlayer/MP/ViewControllers/Add(新增资源)/AddViewController.xib +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.swift b/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.swift deleted file mode 100644 index 3ae2211..0000000 --- a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.swift +++ /dev/null @@ -1,106 +0,0 @@ -// -// CountTimerViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/28. -// - -import UIKit - -class CountTimerViewController: UIViewController { - @IBOutlet weak var timesLabel: UILabel! - @IBOutlet weak var contentView: UIView! - //多项选择器 - private lazy var segmentedView:UISegmentedControl = { - //获取需要展示的内容 - let titles:[String] = timeLevels.map{($0.title)} - //创建一个SegmentedControl - let segmentedView:UISegmentedControl = .init(items: titles) - //设置选中Item颜色块 - if #available(iOS 13.0, *) { - segmentedView.selectedSegmentTintColor = .init(hex: "#80F988") - } else { - segmentedView.tintColor = .init(hex: "#80F988") - } - //设置分割线颜色 - segmentedView.setDividerImage(UIImage(), forLeftSegmentState: .normal, rightSegmentState: .normal, barMetrics: .default) - //设置文字颜色 - segmentedView.setTitleTextAttributes([.foregroundColor:UIColor(hex: "#FFFFFF", alpha: 0.8), .font:UIFont.systemFont(ofSize: 14, weight: .medium)], for: .normal) - segmentedView.setTitleTextAttributes([.foregroundColor:UIColor(hex: "#000000"), .font:UIFont.systemFont(ofSize: 14, weight: .heavy)], for: .selected) - //添加点击事件 - segmentedView.addTarget(self, action: #selector(switchTimesAction(_ :)), for: .valueChanged) - return segmentedView - }() - //倒计时规模组 - private lazy var timeLevels:[MPCountTimerLevel] = { - var array:[MPCountTimerLevel] = [] - for item in MPCountTimerLevel.allCases { - array.append(item) - } - return array - }() - override func viewDidLoad() { - super.viewDidLoad() - //设置圆角 - view.layer.masksToBounds = true - view.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner] - view.layer.cornerRadius = 18*width - //添加多项选择器 - contentView.addSubview(segmentedView) - segmentedView.snp.makeConstraints { make in - make.width.equalTo(330*width) - make.height.equalTo(38*width) - make.center.equalToSuperview() - } - //根据当前倒计时器设置选中项 - segmentedView.selectedSegmentIndex = MPMediaCenterManager.shared.getCountTimerLevel().rawValue - } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - //添加通知 - NotificationCenter.notificationKey.add(observer: self, selector: #selector(timesAction(_ :)), notificationName: .time_times) - NotificationCenter.notificationKey.add(observer: self, selector: #selector(completeAction(_ :)), notificationName: .stop_music) - } - deinit { - //移除所有通知 - NotificationCenter.default.removeObserver(self) - } - //切换计时值 - @objc private func switchTimesAction(_ sender: UISegmentedControl) { - //获取切换后的倒计时规模 - let selectedIndex = sender.selectedSegmentIndex - let value = timeLevels[selectedIndex] - //判断该倒计时规模是否成立 - if value != .OFF { - guard let music = MPMediaCenterManager.shared.getMusic() else { - //没有音乐实体，取消倒计时 - print("No Data Music") - return - } - //启动倒计时器 - MPMediaCenterManager.shared.playerStart(music, actionType: .CountTime, countLevel: value) - }else { - //停止倒计时，数值归0 - MPMediaCenterManager.shared.playerStop() - } - } - - - //计时值变化事件 - @objc private func timesAction(_ sender:Notification) { - DispatchQueue.main.async { - [weak self] in - guard let self = self else { return } - let time = sender.object as! TimeInterval - timesLabel.text = "Count down "+setTimesToMinSeconds(time) - } - } - //计时结束事件 - @objc private func completeAction(_ sender:Notification) { - DispatchQueue.main.async { - [weak self] in - guard let self = self else { return } - timesLabel.text = "Timing off" - } - } -} diff --git a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.xib b/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.xib deleted file mode 100644 index 5b280ba..0000000 --- a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/CountTimerViewController.xib +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/MPPresentationController.swift b/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/MPPresentationController.swift deleted file mode 100644 index 7790a81..0000000 --- a/MusicPlayer/MP/ViewControllers/Base(基类-导航栏-标签栏-计时器-播放器)/MPPresentationController.swift +++ /dev/null @@ -1,73 +0,0 @@ -// -// MPPresentationController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///自定义模态弹出类型 -enum MPPresentModal{ - ///倒计时选择框 - case Timer - ///新增选项框 - case Choice - ///重命名 - case Rename - ///删除 - case Delete -} - -///自定义模态弹出控制器 -class MPPresentationController: UIPresentationController { - //蒙板 - fileprivate lazy var maskView: UIView = { - let corverView = UIView() - return corverView - }() - // MARK: - 系统回调(重载) - override func containerViewWillLayoutSubviews() { - super.containerViewWillLayoutSubviews() - //根据模态状态确定弹出控制器的布局 - switch MPModalType { - case .Timer: - presentedView?.snp.makeConstraints({ (make) in - make.left.right.bottom.equalToSuperview() - make.height.equalTo(180*width) - }) - case .Choice: - presentedView?.snp.makeConstraints({ (make) in - make.bottom.left.right.equalToSuperview() - make.height.equalTo(165*width) - }) - case .Rename: - presentedView?.snp.makeConstraints({ (make) in - make.center.equalToSuperview() - make.width.equalTo(270*width) - make.height.equalTo(178*width) - }) - case .Delete: - presentedView?.snp.makeConstraints({ (make) in - make.center.equalToSuperview() - make.width.equalTo(270*width) - make.height.equalTo(122*width) - }) - } - //添加蒙版 - setMask() - } - // 添加蒙版 - fileprivate func setMask() -> Void { - // 添加蒙版 - containerView?.insertSubview(maskView, at: 0) - //设置蒙版的属性 - maskView.backgroundColor = UIColor(white: 0.0, alpha: 0.8) - maskView.frame = containerView!.bounds - let tap = UITapGestureRecognizer(target: self, action: #selector(maskClick(_:))) - maskView.addGestureRecognizer(tap) - } - //蒙板点击事件 - @objc fileprivate func maskClick(_ sender:UITapGestureRecognizer){ - presentedViewController.dismiss(animated: true, completion: nil) - } -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.swift deleted file mode 100644 index 1369589..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// AboutViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/10. -// - -import UIKit - -class AboutViewController: BaseViewController { - @IBOutlet weak var versionView: UIView!{ - didSet{ - let tap = UITapGestureRecognizer(target: self, action: #selector(versionClick)) - versionView.addGestureRecognizer(tap) - versionView.isUserInteractionEnabled = true - } - } - override func viewDidLoad() { - super.viewDidLoad() - - } - @objc private func versionClick(){ - let eventAlert = UIAlertController(title: "Version Update", message: "is the latest Version", preferredStyle: .alert) - let canelAction = UIAlertAction(title: "Cancel", style: .cancel,handler: nil) - eventAlert.addAction(canelAction) - self.present(eventAlert, animated: true, completion: nil) - } - @IBAction func popClick(_ sender: UIButton) { - navigationController?.popViewController(animated: true) - } - -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.xib deleted file mode 100644 index d22771e..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/AboutViewController.xib +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/CenterViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/CenterViewController.xib deleted file mode 100644 index 9076108..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/CenterViewController.xib +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.swift deleted file mode 100644 index 2b043c6..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// DeleteViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/7. -// - -import UIKit - -class DeleteViewController: UIViewController { - var deleteBlock:ActionBlock? - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - @IBAction func deleteClick(_ sender: UIButton) { - dismiss(animated: true) { - [weak self] in - if self?.deleteBlock != nil { - self?.deleteBlock!() - } - } - } - @IBAction func cancelClick(_ sender: UIButton) { - dismiss(animated: true) - } - -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.xib deleted file mode 100644 index fff8f3b..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/DeleteViewController.xib +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.swift deleted file mode 100644 index 8d9d1c7..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// MoreViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/7. -// - -import UIKit -///更多操作 -class MoreViewController: UIViewController { - var renameBlock:ActionBlock? - var deleteBlock:ActionBlock? - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - //对音乐重命名 - @IBAction func renameClick(_ sender: UIButton) { - dismiss(animated: true) { - [weak self] in - guard let self = self else { return } - guard renameBlock != nil else { - return - } - renameBlock!() - } - } - //删除音乐 - @IBAction func deleteClick(_ sender: UIButton) { - dismiss(animated: true) { - [weak self] in - guard let self = self else { return } - guard deleteBlock != nil else { - return - } - deleteBlock!() - } - } - -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.xib deleted file mode 100644 index b9c3f1a..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/MoreViewController.xib +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.swift deleted file mode 100644 index d91fc3d..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// PrivacyViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/10. -// - -import UIKit -import WebKit -///隐私政策 -class PrivacyViewController: BaseViewController { - @IBOutlet weak var webView: WKWebView! - - override func viewDidLoad() { - super.viewDidLoad() - //创建一个请求 - let request = URLRequest(url: privacyUrl) - webView.load(request) - } - @IBAction func popClick(_ sender: UIButton) { - navigationController?.popViewController(animated: true) - } - -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.xib deleted file mode 100644 index 3e7f13e..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/PrivacyViewController.xib +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.swift deleted file mode 100644 index 509c554..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// RenameViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/7. -// - -import UIKit - -class RenameViewController: UIViewController, UITextFieldDelegate { - @IBOutlet weak var textField: UITextField!{ - didSet{ - textField.attributedPlaceholder = NSAttributedString(string: "Placeholder", attributes: [NSAttributedString.Key.foregroundColor:UIColor.init(hex: "#EBEBF5"), NSAttributedString.Key.font : UIFont.systemFont(ofSize: 13, weight: .regular)]) - textField.delegate = self - } - } - var renameBlock:((String) -> Void)? - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - let text = (textField.text! as NSString).replacingCharacters(in: range, with: string) - guard text.count <= 60 else { - return false - } - return true - } - @IBAction func confirmClick(_ sender: UIButton) { - guard let text = textField.text, text != "" else { - return - } - dismiss(animated: true) { - [weak self] in - if self?.renameBlock != nil { - self?.renameBlock!(text) - } - } - } - @IBAction func cancelClick(_ sender: UIButton) { - dismiss(animated: true) - } - -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.xib deleted file mode 100644 index 0028f4c..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/RenameViewController.xib +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.swift b/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.swift deleted file mode 100644 index 389a020..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// ServiceViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/10. -// - -import UIKit -import WebKit -///用户服务协议 -class ServiceViewController: BaseViewController { - @IBOutlet weak var webView: WKWebView! - - override func viewDidLoad() { - super.viewDidLoad() - //创建一个请求 - let request = URLRequest(url: serviceUrl) - webView.load(request) - } - @IBAction func popClick(_ sender: UIButton) { - navigationController?.popViewController(animated: true) - } -} diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.xib deleted file mode 100644 index df08831..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/ServiceViewController.xib +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Center（个人资源）/SettingViewController.xib b/MusicPlayer/MP/ViewControllers/Center（个人资源）/SettingViewController.xib deleted file mode 100644 index 0912f4e..0000000 --- a/MusicPlayer/MP/ViewControllers/Center（个人资源）/SettingViewController.xib +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Home(音乐资源列表)/HomeViewController.xib b/MusicPlayer/MP/ViewControllers/Home(音乐资源列表)/HomeViewController.xib deleted file mode 100644 index b522ab4..0000000 --- a/MusicPlayer/MP/ViewControllers/Home(音乐资源列表)/HomeViewController.xib +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.swift b/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.swift deleted file mode 100644 index ba0796b..0000000 --- a/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.swift +++ /dev/null @@ -1,61 +0,0 @@ -// -// LunchViewController.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///启动页 -class LunchViewController: UIViewController { - @IBOutlet weak var progressView: Lunch_ProgressView!{ - didSet{ - progressView.layer.masksToBounds = true - } - } - //帧计时器 - private var timer:CADisplayLink! - //最大计时值 - private lazy var maxTimes:TimeInterval = 5 - //当前计时值 - private lazy var currentTimes:TimeInterval = 0 - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .init(hex: "#000000") - timer = CADisplayLink(target: self, selector: #selector(timerActionClick(_ :))) - //一秒执行多少次 - timer.preferredFramesPerSecond = 20 - //开辟线程 - timer.add(to: RunLoop.current, forMode: .common) - //启动计时器 - timer.isPaused = false - } - deinit { - //销毁计时器 - timer.invalidate() - timer = nil - } - //计时器执行事件 - @objc fileprivate func timerActionClick(_ link:CADisplayLink) { - if maxTimes > currentTimes { - //未加载完 - currentTimes += 0.05 - let value = currentTimes/maxTimes - DispatchQueue.main.async { - [weak self] in - guard let self = self else {return} - //设置进度条 - progressView.setProgress(value) - } - }else { - DispatchQueue.main.async { - [weak self] in - guard let self = self else {return} - //停止计时器 - timer.isPaused = true - //加载完毕，判断并跳转 - accessAppdelegate.switch_aSide() - } - } - } -} diff --git a/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.xib b/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.xib deleted file mode 100644 index befa3a1..0000000 --- a/MusicPlayer/MP/ViewControllers/Lunch（启动页）/LunchViewController.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.swift b/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.swift deleted file mode 100644 index 3f13703..0000000 --- a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.swift +++ /dev/null @@ -1,73 +0,0 @@ -// -// MPBottomShowView.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/8. -// - -import UIKit -///底部当前播放音乐展示View（播放器音乐存在时显现） -class MPBottomShowView: UIView, instanceFromNibDelegate { - @IBOutlet weak var backImageView: UIImageView!{ - didSet{ - backImageView.isUserInteractionEnabled = true - backImageView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(pushPlayerActionClick(_ :)))) - } - } - @IBOutlet weak var coverImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var subtitleLabel: UILabel! - //播放器状态 - @IBOutlet weak var stateBtn: UIButton! - //倒计时按钮（常态显示，倒计时隐藏） - @IBOutlet weak var timerBtn: UIButton! - //倒计时View（常态隐藏，倒计时显示） - @IBOutlet weak var timerView: UIView!{ - didSet{ - timerView.layer.masksToBounds = false - timerView.isUserInteractionEnabled = true - timerView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(timerActionClick(_ :)))) - } - } - //倒计时Label（常态隐藏，倒计时显示） - @IBOutlet weak var timerLabel: UILabel! - //弹出计时器闭包 - var modalTimerBlock:ActionBlock? - //前往播放器页面闭包 - var pushPlayerBlock:ActionBlock? - //切换播放器状态包 - var switchPlayerBlock:ActionBlock? - override func awakeFromNib() { - super.awakeFromNib() - - } - //MARK: - 交互事件 - //弹出计时器 - @IBAction func timerClick(_ sender: UIButton) { - guard modalTimerBlock != nil else { - return - } - modalTimerBlock!() - } - //启动播放/暂停播放 - @IBAction func switchStateClick(_ sender: UIButton) { - guard switchPlayerBlock != nil else { - return - } - switchPlayerBlock!() - } - //弹出计时选择器 - @objc private func timerActionClick(_ sender:UITapGestureRecognizer) { - guard modalTimerBlock != nil else { - return - } - modalTimerBlock!() - } - //前往播放器页面 - @objc private func pushPlayerActionClick(_ sender:UITapGestureRecognizer) { - guard pushPlayerBlock != nil else { - return - } - pushPlayerBlock!() - } -} diff --git a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.xib b/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.xib deleted file mode 100644 index 54a3ea3..0000000 --- a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPBottomShowView.xib +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPCustomTabBarItem.swift b/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPCustomTabBarItem.swift deleted file mode 100644 index eb84cef..0000000 --- a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/MPCustomTabBarItem.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// MPCustomTabBarItem.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///自定义tabBarItem -class MPCustomTabBarItem: UIView { - //icon图片 - fileprivate lazy var iconImageView:UIImageView = { - let imageView:UIImageView = .init() - imageView.contentMode = .scaleAspectFill - return imageView - }() - //展示的内容 - var title:String!{ - didSet{ - iconImageView.image = UIImage(named: title) - } - } - ///选中状态 - var isSelected:Bool = false{ - didSet{ - if isSelected { - //选中 - iconImageView.image = UIImage(named: title + " 1") - }else{ - //未选中 - iconImageView.image = UIImage(named: title) - } - } - } - override init(frame: CGRect) { - super.init(frame: frame) - setUpLayout() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - setUpLayout() - } - //MARK: - 布局实现 - fileprivate func setUpLayout() { - backgroundColor = .clear - addSubview(iconImageView) - iconImageView.snp.makeConstraints { make in - make.width.height.equalToSuperview() - make.center.equalToSuperview() - } - } -} diff --git a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/PlayerActionView.swift b/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/PlayerActionView.swift deleted file mode 100644 index c9d0de1..0000000 --- a/MusicPlayer/MP/Views/Base(基类-导航栏-标签栏)/PlayerActionView.swift +++ /dev/null @@ -1,79 +0,0 @@ -// -// PlayerActionView.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/10. -// - -import UIKit -///播放器各事项View -class PlayerActionView: UIView { - //常规图片（展示dark和light状态的图片） - private lazy var normalImageView:UIImageView = { - let imageView:UIImageView = .init() - imageView.contentMode = .scaleAspectFill - return imageView - }() - //运行时图片（当功能运行时图片，视图最上层） - private lazy var playingImageView:UIImageView = { - let imageView:UIImageView = .init() - imageView.contentMode = .scaleAspectFill - return imageView - }() - //dark状态下图片 - var darkImage:UIImage! - //light状态下图片 - var lightImage:UIImage! - //playing状态下图片 - var playingImage:UIImage! - //是dark还是light？ - var isDark:Bool = true{ - didSet{ - normalImageView.image = isDark ? darkImage:lightImage - } - } - //是否运行时 - var isPlaying:Bool = false{ - didSet{ - playingImageView.image = playingImage - normalImageView.isHidden = isPlaying - playingImageView.isHidden = !isPlaying - } - } - override init(frame: CGRect) { - super.init(frame: frame) - setUpLayout() - } - override func awakeFromNib() { - super.awakeFromNib() - setUpLayout() - } - required init?(coder: NSCoder) { - super.init(coder: coder) -// setUpLayout() - } - override func layoutSubviews() { - super.layoutSubviews() - //xib加载完成后，设置圆角 - layer.masksToBounds = true - layer.cornerRadius = frame.size.width/2 - } - - //约束加载 - private func setUpLayout() { - isUserInteractionEnabled = true - addSubview(normalImageView) - normalImageView.snp.makeConstraints { make in - make.center.equalToSuperview() - make.width.height.equalTo(26*width) - } - normalImageView.isHidden = false - addSubview(playingImageView) - playingImageView.snp.makeConstraints { make in - make.center.equalToSuperview() - make.width.height.equalTo(26*width) - } - playingImageView.isHidden = true - } - -} diff --git a/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.swift b/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.swift deleted file mode 100644 index 175edac..0000000 --- a/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.swift +++ /dev/null @@ -1,50 +0,0 @@ -// -// CenterTableViewCell.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/2. -// - -import UIKit - -class CenterTableViewCell: UITableViewCell { - @IBOutlet weak var coverImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var durationLabel: UILabel! - var musicView:MusicViewModel!{ - didSet{ - coverImageView.image = musicView.cover - titleLabel.text = musicView.title - durationLabel.text = musicView.duration - //判断当前音乐是否播放中,是不是这首音乐 - guard MPMediaCenterManager.shared.getPlayerState() == .Playing, MPMediaCenterManager.shared.getMusic()?.identifier == musicView.music.identifier else { - //展示未播放状态 - titleLabel.textColor = .init(hex: "#FFFFFF") - durationLabel.textColor = .init(hex: "#FFFFFF") - return - } - //展示播放状态 - titleLabel.textColor = .init(hex: "#80F988") - durationLabel.textColor = .init(hex: "#80F988") - } - } - var moreBlock:((UIButton) -> Void)? - override func awakeFromNib() { - super.awakeFromNib() - selectionStyle = .none - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - //更多操作 - @IBAction func moreClick(_ sender: UIButton) { - guard moreBlock != nil else { - return - } - moreBlock!(sender) - } - -} diff --git a/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.xib b/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.xib deleted file mode 100644 index 0cc576d..0000000 --- a/MusicPlayer/MP/Views/Center（个人资源）/CenterTableViewCell.xib +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.swift b/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.swift deleted file mode 100644 index 408e482..0000000 --- a/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// SettingTableViewCell.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/4/10. -// - -import UIKit - -class SettingTableViewCell: UITableViewCell { - @IBOutlet weak var iconImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - var title:String!{ - didSet{ - iconImageView.image = UIImage(named: title) - titleLabel.text = title - } - } - override func awakeFromNib() { - super.awakeFromNib() - selectionStyle = .none - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - -} diff --git a/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.xib b/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.xib deleted file mode 100644 index e32ecef..0000000 --- a/MusicPlayer/MP/Views/Center（个人资源）/SettingTableViewCell.xib +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.swift b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.swift deleted file mode 100644 index 3b9ca98..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.swift +++ /dev/null @@ -1,38 +0,0 @@ -// -// Home_FirstListCollectionViewCell.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///首页音乐第一行展示列表Cell -class Home_FirstListCollectionViewCell: UICollectionViewCell { - @IBOutlet weak var coverImageView: UIImageView! - @IBOutlet weak var stateBtn: UIButton! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var subtitleLabel: UILabel! - var musicView:MusicViewModel!{ - didSet{ - coverImageView.image = musicView.cover - titleLabel.text = musicView.title - subtitleLabel.text = musicView.duration - //判断当前音乐是否播放中,是不是这首音乐 - guard MPMediaCenterManager.shared.getPlayerState() == .Playing, MPMediaCenterManager.shared.getMusic()?.identifier == musicView.music.identifier else { - //展示未播放状态 - titleLabel.textColor = .init(hex: "#FFFFFF") - subtitleLabel.textColor = .init(hex: "#FFFFFF") - stateBtn.isSelected = false - return - } - //展示播放状态 - titleLabel.textColor = .init(hex: "#80F988") - subtitleLabel.textColor = .init(hex: "#80F988") - stateBtn.isSelected = true - } - } - override func awakeFromNib() { - super.awakeFromNib() - } - -} diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.xib b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.xib deleted file mode 100644 index 483b625..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FirstListCollectionViewCell.xib +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.swift b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.swift deleted file mode 100644 index 0d9b507..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// Home_FourthListCollectionViewCell.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///首页音乐第四行展示列表Cell -class Home_FourthListCollectionViewCell: UICollectionViewCell { - @IBOutlet weak var coverImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var subtitleLabel: UILabel! - @IBOutlet weak var shieldView: UIView! - @IBOutlet weak var stateBtn: UIButton! - var musicView:MusicViewModel!{ - didSet{ - coverImageView.image = musicView.cover - titleLabel.text = musicView.title - subtitleLabel.text = musicView.duration - //判断当前音乐是否播放中,是不是这首音乐 - guard MPMediaCenterManager.shared.getPlayerState() == .Playing, MPMediaCenterManager.shared.getMusic()?.identifier == musicView.music.identifier else { - //展示未播放状态 - titleLabel.textColor = .init(hex: "#FFFFFF") - subtitleLabel.textColor = .init(hex: "#FFFFFF") - stateBtn.isSelected = false - shieldView.isHidden = true - return - } - //展示播放状态 - titleLabel.textColor = .init(hex: "#80F988") - subtitleLabel.textColor = .init(hex: "#80F988") - stateBtn.isSelected = true - shieldView.isHidden = false - } - } - override func awakeFromNib() { - super.awakeFromNib() - - } -} diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.xib b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.xib deleted file mode 100644 index 6590dbc..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_FourthListCollectionViewCell.xib +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_HeadBannerView.swift b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_HeadBannerView.swift deleted file mode 100644 index 8eb72c4..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_HeadBannerView.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// Home_HeadBannerView.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///首页顶部标题View -class Home_HeadBannerView: UIView { - //banner - private lazy var bannerImageView:UIImageView = { - let imageView:UIImageView = .init(image: .init(named: "Home'banner")) - imageView.contentMode = .scaleAspectFill - return imageView - }() - override init(frame: CGRect) { - super.init(frame: frame) - setUpLayout() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - setUpLayout() - } - //约束加载 - private func setUpLayout() { - addSubview(bannerImageView) - bannerImageView.snp.makeConstraints { make in - make.left.equalToSuperview().offset(16*width) - make.height.equalTo(78*width) - make.width.equalTo(324*width) - make.top.equalToSuperview().offset(20*width) - } - } -} diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_RowListsTableViewCell.xib b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_RowListsTableViewCell.xib deleted file mode 100644 index bd7ce1c..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_RowListsTableViewCell.xib +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.swift b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.swift deleted file mode 100644 index 6f8dad5..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.swift +++ /dev/null @@ -1,38 +0,0 @@ -// -// Home_SecondListCollectionViewCell.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit -///首页音乐第二/三行展示列表Cell -class Home_SecondListCollectionViewCell: UICollectionViewCell { - @IBOutlet weak var coverImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var subtitleLabel: UILabel! - @IBOutlet weak var shieldView: UIView! - var musicView:MusicViewModel!{ - didSet{ - coverImageView.image = musicView.cover - titleLabel.text = musicView.title - subtitleLabel.text = musicView.duration - //判断当前音乐是否播放中,是不是这首音乐 - guard MPMediaCenterManager.shared.getPlayerState() == .Playing, MPMediaCenterManager.shared.getMusic()?.identifier == musicView.music.identifier else { - //展示未播放状态 - titleLabel.textColor = .init(hex: "#FFFFFF") - subtitleLabel.textColor = .init(hex: "#FFFFFF") - shieldView.isHidden = true - return - } - //展示播放状态 - titleLabel.textColor = .init(hex: "#80F988") - subtitleLabel.textColor = .init(hex: "#80F988") - shieldView.isHidden = false - } - } - override func awakeFromNib() { - super.awakeFromNib() - layer.masksToBounds = false - } -} diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.xib b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.xib deleted file mode 100644 index 5a0cde8..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Home_SecondListCollectionViewCell.xib +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Player_Slider.swift b/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Player_Slider.swift deleted file mode 100644 index 6deb551..0000000 --- a/MusicPlayer/MP/Views/Home(音乐资源列表-播放器)/Player_Slider.swift +++ /dev/null @@ -1,143 +0,0 @@ -// -// Player_Slider.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/29. -// - -import UIKit - -///音量控制Slider -class Player_Slider: UISlider { - //滑块图片 - var thumbImage:UIImage! - //滑轨槽高度 - var trackHeight: CGFloat = 5 - //进度渐变色 - var minTrackColors: [UIColor]! - //槽位渐变色 - var maxTrackColors:[UIColor]! - //进度渐变色定位列表(与渐变色数量保持一致) - var minTrackLocations:[CGFloat]! - //槽位渐变色定位列表(与渐变色数量保持一致) - var maxTrackLocations:[CGFloat]! - - //初始化 - init(frame:CGRect, trackHeight: CGFloat, minTrackColors: [UIColor]!, maxTrackColors: [UIColor]!, minTrackLocations: [CGFloat]!, maxTrackLocations: [CGFloat]!) { - super.init(frame: frame) - self.trackHeight = trackHeight - self.minTrackColors = minTrackColors - self.maxTrackColors = maxTrackColors - self.minTrackLocations = minTrackLocations - self.maxTrackLocations = maxTrackLocations - setUpLayout() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - } - override func awakeFromNib() { - super.awakeFromNib() - trackHeight = bounds.size.height - setUpLayout() - } - private func setUpLayout() { - layer.masksToBounds = false - - } - //重写绘制方法 - override func draw(_ rect: CGRect) { - //设置滑块图片 - if thumbImage != nil { - setThumbImage(thumbImage, for: .normal) - } - //设置进度图片 - let minTrackImg = makeTrackImage(rect: rect, colors: minTrackColors, locations: minTrackLocations) - setMinimumTrackImage(minTrackImg, for: .normal) - // 设置槽位 - let maxTrackImg = makeTrackImage(rect: rect, colors: maxTrackColors, locations: maxTrackLocations) - setMaximumTrackImage(maxTrackImg, for: .normal) - } - - /// 滑块设置 - /// - Parameters: - /// - rect: 滑块大小 - /// - color: 滑块颜色 - /// - Returns: 返回的滑块图片 - private func makeThumbImage(rect: CGRect, color:UIColor) -> UIImage { - let lineWidth: CGFloat = 2 - //开始绘制 - UIGraphicsBeginImageContextWithOptions(rect.size, false, 0) - //填充内部颜色 - color.setFill() - //曲线路径 - let oval = UIBezierPath(ovalIn: rect) - //填充路径 - oval.fill() - //设置路径颜色为白色 - UIColor.white.setStroke() - //路径宽度 - oval.lineWidth = lineWidth - oval.stroke() - //转为图片 - let thumbImg = UIGraphicsGetImageFromCurrentImageContext()! - //转化结束 - UIGraphicsEndImageContext() - return thumbImg - } - - - /// 生成滑轨图片 - /// - Parameters: - /// - rect: 滑轨大小 - /// - colors: 颜色列表 - /// - locations: 位置分布列表 - /// - Returns: 生成的图片 - private func makeTrackImage(rect: CGRect, colors:[UIColor], locations:[CGFloat]) -> UIImage { - let rect = CGRect(x: rect.minX, y: rect.minY, width: rect.width, height: self.trackHeight) - //开始绘制 - UIGraphicsBeginImageContextWithOptions(rect.size, false, 0) - let ctx = UIGraphicsGetCurrentContext()! - // 创建并设置路径 - let cornerRadius: CGFloat = rect.height * 0.5 - let path = UIBezierPath(roundedRect: rect, cornerRadius: cornerRadius).cgPath - // 添加路径到图形上下文 - ctx.addPath(path) - ctx.clip() - // 使用rgb颜色空间 - let colorSpace = CGColorSpaceCreateDeviceRGB() - //获取cgcolors - var cgColors:[CGColor] = [] - colors.forEach { item in - cgColors.append(item.cgColor) - } - // 定义渐变色 - let gradient:CGGradient = CGGradient(colorsSpace: colorSpace, colors: cgColors as CFArray, locations: locations)! - // 渐变开始位置 - let start = CGPoint(x: self.bounds.minX, y: self.bounds.minY) - // 渐变结束位置 - let end = CGPoint(x: self.bounds.maxX, y: self.bounds.minY) - // 绘制渐变 - ctx.drawLinearGradient(gradient, start: start, end: end, options: .drawsBeforeStartLocation) - //转为图片 - let trackImg = UIGraphicsGetImageFromCurrentImageContext()! - UIGraphicsEndImageContext() - return trackImg - } - // 重写【thumb】显示区域 方法 - override func thumbRect(forBounds bounds: CGRect, trackRect rect: CGRect, value: Float) -> CGRect { - let rect = super.thumbRect(forBounds: bounds, trackRect: rect, value: value) - // 设置thumb投影效果 - // (这样设置的投影效果，如果调用setValue(_:animated:)的时候，animated参数为true，会有阴影和thumb不同步的问题，目前还不知到怎么解决) - self.layer.shadowColor = UIColor.black.cgColor - self.layer.shadowOffset = CGSize(width: 0, height: 0) - self.layer.shadowOpacity = 0.15 - self.layer.shadowRadius = 3 - self.layer.shadowPath = UIBezierPath(cgPath: CGPath(ellipseIn: rect.insetBy(dx: 3, dy: 3), transform: nil)).cgPath - return rect - } - // 重写【track】显示区域 方法 - override func trackRect(forBounds bounds: CGRect) -> CGRect { - return CGRect(x: 0, y: 0, width: bounds.width, height: self.trackHeight) - } -} diff --git a/MusicPlayer/MP/Views/Lunch（启动页）/Lunch_ProgressView.swift b/MusicPlayer/MP/Views/Lunch（启动页）/Lunch_ProgressView.swift deleted file mode 100644 index 997dbf6..0000000 --- a/MusicPlayer/MP/Views/Lunch（启动页）/Lunch_ProgressView.swift +++ /dev/null @@ -1,94 +0,0 @@ -// -// Lunch_ProgressView.swift -// MusicPlayer -// -// Created by Mr.Zhou on 2024/3/27. -// - -import UIKit - -class Lunch_ProgressView: UIView { - struct Constant { - //进度条宽度 - static let lineWidth: CGFloat = 6*width - //进度槽颜色 - static let trackColor:UIColor = .init(hex: "#FFFFFF") - //进度条颜色 - static let progressColors:[CGColor] = [ - UIColor(red: 0.109, green: 0.784, blue: 0.932, alpha: 1).cgColor, - UIColor(red: 0.412, green: 0.996, blue: 0.451, alpha: 1).cgColor, - UIColor(red: 0.796, green: 0.839, blue: 0.294, alpha: 1).cgColor - ] - } - //渐变层 - private var gradientLayer:CAGradientLayer! - //进度槽 - private var trackLayer:CAShapeLayer! - //进度条路径（水平线） - private var path:UIBezierPath! - override init(frame: CGRect) { - super.init(frame: frame) - setUpLayers() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - setUpLayers() - } - override func layoutSubviews() { - super.layoutSubviews() - } - override func draw(_ rect: CGRect) { - //初始化圆角矩形路径 - path = UIBezierPath() - //获取起点 - let startPoint = CGPoint(x: bounds.minX, y: bounds.maxY) - //获取终点 - let endPoint = CGPoint(x: bounds.maxX, y: bounds.maxY) - //路径起始点 - path.move(to: startPoint) - //增加路线 - path.addLine(to: endPoint) - //初始化进度槽 - trackLayer = .init() - //路径宽 - trackLayer.lineWidth = bounds.height - trackLayer.fillColor = UIColor.clear.cgColor - //路径颜色 - trackLayer.strokeColor = Constant.trackColor.cgColor - //设置起始点 - trackLayer.strokeStart = 0 - //设置当前点 - trackLayer.strokeEnd = 0 - //路径端口为圆形 - trackLayer.lineCap = .round - trackLayer.path = path.cgPath - layer.addSublayer(trackLayer) - //初始化渐变色进度条 - gradientLayer = .init() - //渐变层大小 - gradientLayer.frame = .init(x: 0, y: -2, width: bounds.size.width, height: bounds.size.height+1) -// gradientLayer.shadowPath = trackLayer.path - //渐变层颜色 - gradientLayer.colors = Constant.progressColors - //渐变层起始点 - gradientLayer.startPoint = .init(x: 0, y: 1) - //渐变层终点 - gradientLayer.endPoint = .init(x: 1, y: 1) - layer.addSublayer(gradientLayer) - //渐变层遮罩 - gradientLayer.mask = trackLayer - } - //layer添加 - private func setUpLayers() { - backgroundColor = .init(hex: "#FFFFFF", alpha: 0.15) - } - /// 渐变色执行方法 - /// - Parameter progress: 进度值 - func setProgress(_ progress: CGFloat) { - if progress <= 1 { - //进度条动画 - trackLayer.strokeEnd = progress - } - } -}