diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f86634 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +xcuserdata +Demo/Pods diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj new file mode 100644 index 0000000..7f6a78b --- /dev/null +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -0,0 +1,425 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXBuildFile section */ + 9474C3AC24AE2A2E00B19CC8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474C3AB24AE2A2E00B19CC8 /* AppDelegate.swift */; }; + 9474C3BA24AE2A3100B19CC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3B824AE2A3100B19CC8 /* LaunchScreen.storyboard */; }; + 9474C3C924AE2F2A00B19CC8 /* pop_v2.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C124AE2F2900B19CC8 /* pop_v2.mp3 */; }; + 9474C3CA24AE2F2A00B19CC8 /* they_left_call_v2.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C224AE2F2900B19CC8 /* they_left_call_v2.mp3 */; }; + 9474C3CB24AE2F2A00B19CC8 /* they_joined_call_9cb0d.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C324AE2F2900B19CC8 /* they_joined_call_9cb0d.mp3 */; }; + 9474C3CC24AE2F2A00B19CC8 /* they_joined_call_v2.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C424AE2F2900B19CC8 /* they_joined_call_v2.mp3 */; }; + 9474C3CD24AE2F2A00B19CC8 /* they_left_call_9cb0d.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C524AE2F2900B19CC8 /* they_left_call_9cb0d.mp3 */; }; + 9474C3CE24AE2F2A00B19CC8 /* pop_9cb0d.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C624AE2F2900B19CC8 /* pop_9cb0d.mp3 */; }; + 9474C3CF24AE2F2A00B19CC8 /* pop.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C724AE2F2A00B19CC8 /* pop.mp3 */; }; + 9474C3D024AE2F2A00B19CC8 /* pickup_star.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3C824AE2F2A00B19CC8 /* pickup_star.mp3 */; }; + 9474C3D424AE3AA900B19CC8 /* RAINDOWN_15.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9474C3D324AE3AA900B19CC8 /* RAINDOWN_15.mp3 */; }; + 9EDAF79E9066FE239F24A5C9 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D254D93D1027D720605413F /* Pods_Demo.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 9474C3A824AE2A2E00B19CC8 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 9474C3AB24AE2A2E00B19CC8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 9474C3B924AE2A3100B19CC8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 9474C3BB24AE2A3100B19CC8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9474C3C124AE2F2900B19CC8 /* pop_v2.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = pop_v2.mp3; sourceTree = ""; }; + 9474C3C224AE2F2900B19CC8 /* they_left_call_v2.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = they_left_call_v2.mp3; sourceTree = ""; }; + 9474C3C324AE2F2900B19CC8 /* they_joined_call_9cb0d.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = they_joined_call_9cb0d.mp3; sourceTree = ""; }; + 9474C3C424AE2F2900B19CC8 /* they_joined_call_v2.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = they_joined_call_v2.mp3; sourceTree = ""; }; + 9474C3C524AE2F2900B19CC8 /* they_left_call_9cb0d.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = they_left_call_9cb0d.mp3; sourceTree = ""; }; + 9474C3C624AE2F2900B19CC8 /* pop_9cb0d.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = pop_9cb0d.mp3; sourceTree = ""; }; + 9474C3C724AE2F2A00B19CC8 /* pop.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = pop.mp3; sourceTree = ""; }; + 9474C3C824AE2F2A00B19CC8 /* pickup_star.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = pickup_star.mp3; sourceTree = ""; }; + 9474C3D324AE3AA900B19CC8 /* RAINDOWN_15.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = RAINDOWN_15.mp3; sourceTree = ""; }; + 9BD17D7BF32712A13F29DF58 /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = ""; }; + 9D254D93D1027D720605413F /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A659485FBF6B6A46D8089F34 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 9474C3A524AE2A2E00B19CC8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9EDAF79E9066FE239F24A5C9 /* Pods_Demo.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9474C39F24AE2A2E00B19CC8 = { + isa = PBXGroup; + children = ( + 9474C3AA24AE2A2E00B19CC8 /* Demo */, + 9474C3A924AE2A2E00B19CC8 /* Products */, + 99C95A394F1FF20A7F41F72E /* Pods */, + F6DA1907ADBA09D2F2043D52 /* Frameworks */, + ); + sourceTree = ""; + }; + 9474C3A924AE2A2E00B19CC8 /* Products */ = { + isa = PBXGroup; + children = ( + 9474C3A824AE2A2E00B19CC8 /* Demo.app */, + ); + name = Products; + sourceTree = ""; + }; + 9474C3AA24AE2A2E00B19CC8 /* Demo */ = { + isa = PBXGroup; + children = ( + 9474C3AB24AE2A2E00B19CC8 /* AppDelegate.swift */, + 9474C3B824AE2A3100B19CC8 /* LaunchScreen.storyboard */, + 9474C3BB24AE2A3100B19CC8 /* Info.plist */, + 9474C3D324AE3AA900B19CC8 /* RAINDOWN_15.mp3 */, + 9474C3C824AE2F2A00B19CC8 /* pickup_star.mp3 */, + 9474C3C624AE2F2900B19CC8 /* pop_9cb0d.mp3 */, + 9474C3C124AE2F2900B19CC8 /* pop_v2.mp3 */, + 9474C3C724AE2F2A00B19CC8 /* pop.mp3 */, + 9474C3C324AE2F2900B19CC8 /* they_joined_call_9cb0d.mp3 */, + 9474C3C424AE2F2900B19CC8 /* they_joined_call_v2.mp3 */, + 9474C3C524AE2F2900B19CC8 /* they_left_call_9cb0d.mp3 */, + 9474C3C224AE2F2900B19CC8 /* they_left_call_v2.mp3 */, + ); + path = Demo; + sourceTree = ""; + }; + 99C95A394F1FF20A7F41F72E /* Pods */ = { + isa = PBXGroup; + children = ( + A659485FBF6B6A46D8089F34 /* Pods-Demo.debug.xcconfig */, + 9BD17D7BF32712A13F29DF58 /* Pods-Demo.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + F6DA1907ADBA09D2F2043D52 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 9D254D93D1027D720605413F /* Pods_Demo.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 9474C3A724AE2A2E00B19CC8 /* Demo */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9474C3BE24AE2A3100B19CC8 /* Build configuration list for PBXNativeTarget "Demo" */; + buildPhases = ( + 70CEB0FE6CC2FD13600EB0B1 /* [CP] Check Pods Manifest.lock */, + 9474C3A424AE2A2E00B19CC8 /* Sources */, + 9474C3A524AE2A2E00B19CC8 /* Frameworks */, + 9474C3A624AE2A2E00B19CC8 /* Resources */, + 3FD15ED4751E339FED8983F0 /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Demo; + productName = Demo; + productReference = 9474C3A824AE2A2E00B19CC8 /* Demo.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 9474C3A024AE2A2E00B19CC8 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1150; + LastUpgradeCheck = 1150; + ORGANIZATIONNAME = "Applikey Solutions"; + TargetAttributes = { + 9474C3A724AE2A2E00B19CC8 = { + CreatedOnToolsVersion = 11.5; + }; + }; + }; + buildConfigurationList = 9474C3A324AE2A2E00B19CC8 /* Build configuration list for PBXProject "Demo" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 9474C39F24AE2A2E00B19CC8; + productRefGroup = 9474C3A924AE2A2E00B19CC8 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 9474C3A724AE2A2E00B19CC8 /* Demo */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 9474C3A624AE2A2E00B19CC8 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9474C3CE24AE2F2A00B19CC8 /* pop_9cb0d.mp3 in Resources */, + 9474C3CD24AE2F2A00B19CC8 /* they_left_call_9cb0d.mp3 in Resources */, + 9474C3D424AE3AA900B19CC8 /* RAINDOWN_15.mp3 in Resources */, + 9474C3CC24AE2F2A00B19CC8 /* they_joined_call_v2.mp3 in Resources */, + 9474C3C924AE2F2A00B19CC8 /* pop_v2.mp3 in Resources */, + 9474C3CF24AE2F2A00B19CC8 /* pop.mp3 in Resources */, + 9474C3CA24AE2F2A00B19CC8 /* they_left_call_v2.mp3 in Resources */, + 9474C3CB24AE2F2A00B19CC8 /* they_joined_call_9cb0d.mp3 in Resources */, + 9474C3D024AE2F2A00B19CC8 /* pickup_star.mp3 in Resources */, + 9474C3BA24AE2A3100B19CC8 /* LaunchScreen.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3FD15ED4751E339FED8983F0 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 70CEB0FE6CC2FD13600EB0B1 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Demo-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 9474C3A424AE2A2E00B19CC8 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9474C3AC24AE2A2E00B19CC8 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 9474C3B824AE2A3100B19CC8 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 9474C3B924AE2A3100B19CC8 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 9474C3BC24AE2A3100B19CC8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 9474C3BD24AE2A3100B19CC8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 9474C3BF24AE2A3100B19CC8 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = A659485FBF6B6A46D8089F34 /* Pods-Demo.debug.xcconfig */; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = NY2B63T68P; + INFOPLIST_FILE = Demo/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player.Demo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 9474C3C024AE2A3100B19CC8 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9BD17D7BF32712A13F29DF58 /* Pods-Demo.release.xcconfig */; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = NY2B63T68P; + INFOPLIST_FILE = Demo/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player.Demo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 9474C3A324AE2A2E00B19CC8 /* Build configuration list for PBXProject "Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9474C3BC24AE2A3100B19CC8 /* Debug */, + 9474C3BD24AE2A3100B19CC8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9474C3BE24AE2A3100B19CC8 /* Build configuration list for PBXNativeTarget "Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9474C3BF24AE2A3100B19CC8 /* Debug */, + 9474C3C024AE2A3100B19CC8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 9474C3A024AE2A2E00B19CC8 /* Project object */; +} diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..02a6973 --- /dev/null +++ b/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/Demo.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1f14019 --- /dev/null +++ b/Demo/Demo.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift new file mode 100644 index 0000000..31cdb5e --- /dev/null +++ b/Demo/Demo/AppDelegate.swift @@ -0,0 +1,28 @@ +// +// AppDelegate.swift +// Demo +// +// Created by Ernesto Rivera on 7/2/20. +// Copyright © 2020 Applikey Solutions. All rights reserved. +// + +import UIKit +import PandoraPlayer + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate +{ + var window: UIWindow? + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool + { + let player = PandoraPlayer.configure(withPaths: ["RAINDOWN_15", "pop"]) + self.window = UIWindow() + self.window?.rootViewController = player + self.window?.makeKeyAndVisible() + + return true + } + +} + diff --git a/Demo/Demo/Base.lproj/LaunchScreen.storyboard b/Demo/Demo/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..865e932 --- /dev/null +++ b/Demo/Demo/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demo/Demo/Info.plist b/Demo/Demo/Info.plist new file mode 100644 index 0000000..53f446b --- /dev/null +++ b/Demo/Demo/Info.plist @@ -0,0 +1,53 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarTintParameters + + UINavigationBar + + Style + UIBarStyleDefault + Translucent + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Demo/Demo/RAINDOWN_15.mp3 b/Demo/Demo/RAINDOWN_15.mp3 new file mode 100644 index 0000000..79627ab Binary files /dev/null and b/Demo/Demo/RAINDOWN_15.mp3 differ diff --git a/Demo/Demo/pickup_star.mp3 b/Demo/Demo/pickup_star.mp3 new file mode 100644 index 0000000..4b7a368 Binary files /dev/null and b/Demo/Demo/pickup_star.mp3 differ diff --git a/Demo/Demo/pop.mp3 b/Demo/Demo/pop.mp3 new file mode 100644 index 0000000..957ada7 Binary files /dev/null and b/Demo/Demo/pop.mp3 differ diff --git a/Demo/Demo/pop_9cb0d.mp3 b/Demo/Demo/pop_9cb0d.mp3 new file mode 100644 index 0000000..2932427 Binary files /dev/null and b/Demo/Demo/pop_9cb0d.mp3 differ diff --git a/Demo/Demo/pop_v2.mp3 b/Demo/Demo/pop_v2.mp3 new file mode 100644 index 0000000..2932427 Binary files /dev/null and b/Demo/Demo/pop_v2.mp3 differ diff --git a/Demo/Demo/they_joined_call_9cb0d.mp3 b/Demo/Demo/they_joined_call_9cb0d.mp3 new file mode 100644 index 0000000..05c4106 Binary files /dev/null and b/Demo/Demo/they_joined_call_9cb0d.mp3 differ diff --git a/Demo/Demo/they_joined_call_v2.mp3 b/Demo/Demo/they_joined_call_v2.mp3 new file mode 100644 index 0000000..05c4106 Binary files /dev/null and b/Demo/Demo/they_joined_call_v2.mp3 differ diff --git a/Demo/Demo/they_left_call_9cb0d.mp3 b/Demo/Demo/they_left_call_9cb0d.mp3 new file mode 100644 index 0000000..5bf302f Binary files /dev/null and b/Demo/Demo/they_left_call_9cb0d.mp3 differ diff --git a/Demo/Demo/they_left_call_v2.mp3 b/Demo/Demo/they_left_call_v2.mp3 new file mode 100644 index 0000000..5bf302f Binary files /dev/null and b/Demo/Demo/they_left_call_v2.mp3 differ diff --git a/Demo/Podfile b/Demo/Podfile new file mode 100644 index 0000000..ff9f6ea --- /dev/null +++ b/Demo/Podfile @@ -0,0 +1,9 @@ + +platform :ios, '9.0' +use_frameworks! + +target 'Demo' do + + pod 'PandoraPlayer', :path => '..' + +end diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock new file mode 100644 index 0000000..496e5da --- /dev/null +++ b/Demo/Podfile.lock @@ -0,0 +1,28 @@ +PODS: + - AudioKit (4.10.1): + - AudioKit/Core (= 4.10.1) + - AudioKit/UI (= 4.10.1) + - AudioKit/Core (4.10.1) + - AudioKit/UI (4.10.1): + - AudioKit/Core + - PandoraPlayer (1.3): + - AudioKit (~> 4.5) + +DEPENDENCIES: + - PandoraPlayer (from `..`) + +SPEC REPOS: + trunk: + - AudioKit + +EXTERNAL SOURCES: + PandoraPlayer: + :path: ".." + +SPEC CHECKSUMS: + AudioKit: b8e508a0af3dc7d53caf0ca1002b187a662f949e + PandoraPlayer: 83e5993169f43f67c9d35960055675df81575703 + +PODFILE CHECKSUM: bbcfa087c0e05b35ea9f1d2184ff4ecfcaf641d1 + +COCOAPODS: 1.9.3 diff --git a/PandoraPlayer.podspec b/PandoraPlayer.podspec index eb14e3c..698af43 100644 --- a/PandoraPlayer.podspec +++ b/PandoraPlayer.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "PandoraPlayer" - s.version = "1.2" + s.version = "1.3" s.summary = "Music Player for iOS" s.description = "A simple iOS music player library written in Swift" @@ -10,6 +10,7 @@ Pod::Spec.new do |s| s.author = { "Applikey Solutions" => "welcome@applikeysolutions.com" } s.platform = :ios, "9.0" + s.static_framework = true s.source = { :git => "https://github.com/AppliKeySolutions/PandoraPlayer.git", :tag => "#{s.version}" } @@ -18,6 +19,6 @@ Pod::Spec.new do |s| s.resources = "Player/**/*.{storyboard,xib,xcassets}" - s.dependency "AudioKit", "4.0.3" + s.dependency "AudioKit", "~> 4.5" end diff --git a/Player.xcodeproj/project.pbxproj b/Player.xcodeproj/project.pbxproj index f09cdda..699bd93 100644 --- a/Player.xcodeproj/project.pbxproj +++ b/Player.xcodeproj/project.pbxproj @@ -106,7 +106,6 @@ children = ( F519AE031F2B26870067FE47 /* Classes */, F519AE291F2B26870067FE47 /* Resources */, - F519AE2D1F2B26870067FE47 /* Supporting Files */, ); path = Player; sourceTree = ""; @@ -255,13 +254,6 @@ path = Resources; sourceTree = ""; }; - F519AE2D1F2B26870067FE47 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - path = "Supporting Files"; - sourceTree = ""; - }; F519B7921F2B371D0067FE47 /* Storyboards */ = { isa = PBXGroup; children = ( @@ -324,6 +316,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -540,7 +533,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -561,7 +554,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 1; }; name = Release; diff --git a/Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Player.xcodeproj/project.xcworkspace/xcuserdata/mac-1.xcuserdatad/UserInterfaceState.xcuserstate b/Player.xcodeproj/project.xcworkspace/xcuserdata/mac-1.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..406229f Binary files /dev/null and b/Player.xcodeproj/project.xcworkspace/xcuserdata/mac-1.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Player.xcodeproj/xcuserdata/mac-1.xcuserdatad/xcschemes/xcschememanagement.plist b/Player.xcodeproj/xcuserdata/mac-1.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..1fd8fd7 --- /dev/null +++ b/Player.xcodeproj/xcuserdata/mac-1.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + Player.xcscheme + + orderHint + 0 + + + + diff --git a/Player/Classes/Controllers/PandoraPlayer.swift b/Player/Classes/Controllers/PandoraPlayer.swift index 49e916e..b393e9d 100644 --- a/Player/Classes/Controllers/PandoraPlayer.swift +++ b/Player/Classes/Controllers/PandoraPlayer.swift @@ -127,7 +127,7 @@ open class PandoraPlayer: UIViewController { */ public static func configure(withPaths paths: [String]) -> PandoraPlayer { let playerVC = pandoraPlayerInstance() - let songItems = paths.flatMap({ return Song(path: $0) }) + let songItems = paths.compactMap({ return Song(path: $0) }) playerVC.library = songItems playerVC.readyForPlay() return playerVC @@ -153,7 +153,7 @@ open class PandoraPlayer: UIViewController { */ public static func configure(withAVItems items: [AVPlayerItem]) -> PandoraPlayer { let playerVC = pandoraPlayerInstance() - let songItems = items.flatMap({ return Song(withAVPlayerItem: $0) }) + let songItems = items.compactMap({ return Song(withAVPlayerItem: $0) }) playerVC.library = songItems playerVC.readyForPlay() return playerVC @@ -201,7 +201,6 @@ open class PandoraPlayer: UIViewController { playerVC.library = outputItems group.notify(queue: DispatchQueue.main) { - assert(outputItems.count > 0) playerVC.library = outputItems playerVC.readyForPlay() } @@ -232,6 +231,7 @@ open class PandoraPlayer: UIViewController { configureNavigationBar() configurePlayer() configurePlayerSongListView() + configureBackgroundImage() } private func configurePlayerSongListView() { @@ -243,7 +243,7 @@ open class PandoraPlayer: UIViewController { navigationController?.navigationBar.shadowImage = UIImage() navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default) - navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white] + navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white] navigationController?.navigationBar.tintColor = UIColor.white title = nowPlaying } @@ -335,6 +335,9 @@ open class PandoraPlayer: UIViewController { } private func configurePlayer() { + if !self.isViewLoaded { + _ = self.view // Make sure to load views first + } configurePlayerControls() configurePlayerTimeSlider() player = EZAudioPlayer() @@ -506,7 +509,7 @@ extension PandoraPlayer: PlayerSongListDelegate { guard library[index].colors == nil else { continue } guard tasks[index] == nil else { continue } var item: DispatchWorkItem! - item = DispatchWorkItem(block: { + item = DispatchWorkItem(block: {[unowned self] in guard !item.isCancelled else { return } guard let image = self.library[index].metadata?.artwork else { return } guard !item.isCancelled else { return } @@ -555,6 +558,10 @@ extension PandoraPlayer: PlayerControlsDelegate { extension PandoraPlayer: PlayerSliderProtocol { func onValueChanged(progress: Float, timePast: TimeInterval) { + guard player.audioFile != nil else { + sliderView.progress = 0 + return + } beeingSeek = true let frame = Int64(Float(player.audioFile.totalFrames) * progress) self.player.seek(toFrame: frame) diff --git a/Player/Classes/Extensions/CommonExtensions.swift b/Player/Classes/Extensions/CommonExtensions.swift index e15d206..c41d075 100644 --- a/Player/Classes/Extensions/CommonExtensions.swift +++ b/Player/Classes/Extensions/CommonExtensions.swift @@ -46,8 +46,8 @@ extension UILabel { if layer.animation(forKey: animation) == nil { let transition = CATransition() transition.duration = duration - transition.type = kCATransitionFade - transition.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + transition.type = CATransitionType.fade + transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) layer.add(transition, forKey: animation) } self.text = text @@ -60,8 +60,8 @@ extension CATransition { static func fading(_ duration: TimeInterval) -> CATransition { let transition = CATransition() transition.duration = duration - transition.type = kCATransitionFade - transition.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + transition.type = CATransitionType.fade + transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) return transition } } diff --git a/Player/Classes/Vendors/UIImageColors.swift b/Player/Classes/Vendors/UIImageColors.swift index aa0074b..6b9e45e 100644 --- a/Player/Classes/Vendors/UIImageColors.swift +++ b/Player/Classes/Vendors/UIImageColors.swift @@ -54,9 +54,9 @@ extension UIColor { let fg = compareColor.cgColor.components let threshold: CGFloat = 0.25 - if fabs(bg[0] - fg[0]) > threshold || fabs(bg[1] - fg[1]) > threshold || fabs(bg[2] - fg[2]) > threshold { - if fabs(bg[0] - bg[1]) < 0.03 && fabs(bg[0] - bg[2]) < 0.03 { - if fabs(fg[0] - fg[1]) < 0.03 && fabs(fg[0] - fg[2]) < 0.03 { + if abs(bg[0] - fg[0]) > threshold || abs(bg[1] - fg[1]) > threshold || abs(bg[2] - fg[2]) > threshold { + if abs(bg[0] - bg[1]) < 0.03 && abs(bg[0] - bg[2]) < 0.03 { + if abs(fg[0] - fg[1]) < 0.03 && abs(fg[0] - fg[2]) < 0.03 { return false } } diff --git a/Player/Classes/Vendors/UIImageEffects.swift b/Player/Classes/Vendors/UIImageEffects.swift index 457c103..f155c11 100644 --- a/Player/Classes/Vendors/UIImageEffects.swift +++ b/Player/Classes/Vendors/UIImageEffects.swift @@ -162,7 +162,7 @@ extension UIImage { var effectImage = self let hasBlur = blurRadius > __FLT_EPSILON__ - let hasSaturationChange = fabs(saturationDeltaFactor - 1.0) > __FLT_EPSILON__ + let hasSaturationChange = abs(saturationDeltaFactor - 1.0) > __FLT_EPSILON__ if hasBlur || hasSaturationChange { func createEffectBuffer(_ context: CGContext) -> vImage_Buffer { diff --git a/Player/Classes/Views/Cells/RoundedPictureCollectionViewCell/RoundedPictureCollectionViewCell.xib b/Player/Classes/Views/Cells/RoundedPictureCollectionViewCell/RoundedPictureCollectionViewCell.xib index 69e3614..78619a5 100644 --- a/Player/Classes/Views/Cells/RoundedPictureCollectionViewCell/RoundedPictureCollectionViewCell.xib +++ b/Player/Classes/Views/Cells/RoundedPictureCollectionViewCell/RoundedPictureCollectionViewCell.xib @@ -1,25 +1,24 @@ - + - - + - + - + diff --git a/Player/Classes/Views/PlayerControls/PlayerControls.swift b/Player/Classes/Views/PlayerControls/PlayerControls.swift index dc9a6b4..b4911ec 100644 --- a/Player/Classes/Views/PlayerControls/PlayerControls.swift +++ b/Player/Classes/Views/PlayerControls/PlayerControls.swift @@ -105,15 +105,15 @@ class PlayerControls: ViewWithXib { let image = UIImage(named: Images.playLoading, in: Bundle(for: self.classForCoder), compatibleWith: nil) playButton.setImage(image, for: .normal) - let activityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .gray) + let activityIndicatorView = UIActivityIndicatorView(style: .gray) activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false playButton.addSubview(activityIndicatorView) - let xCenterConstraint = NSLayoutConstraint(item: playButton, attribute: .centerX, relatedBy: .equal, toItem: activityIndicatorView, attribute: .centerX, multiplier: 1, constant: 0) + let xCenterConstraint = NSLayoutConstraint(item: playButton!, attribute: .centerX, relatedBy: .equal, toItem: activityIndicatorView, attribute: .centerX, multiplier: 1, constant: 0) playButton.addConstraint(xCenterConstraint) - let yCenterConstraint = NSLayoutConstraint(item: playButton, attribute: .centerY, relatedBy: .equal, toItem: activityIndicatorView, attribute: .centerY, multiplier: 1, constant: 0) + let yCenterConstraint = NSLayoutConstraint(item: playButton!, attribute: .centerY, relatedBy: .equal, toItem: activityIndicatorView, attribute: .centerY, multiplier: 1, constant: 0) playButton.addConstraint(yCenterConstraint) diff --git a/Player/Classes/Views/PlayerSlider/PlayerSlider.swift b/Player/Classes/Views/PlayerSlider/PlayerSlider.swift index 09d2849..0f6fd3b 100644 --- a/Player/Classes/Views/PlayerSlider/PlayerSlider.swift +++ b/Player/Classes/Views/PlayerSlider/PlayerSlider.swift @@ -22,7 +22,7 @@ class PlayerSlider: ViewWithXib { // MARK: Properties - var delegate: PlayerSliderProtocol? + weak var delegate: PlayerSliderProtocol? var duration: TimeInterval = TimeInterval() { didSet { updateProgress(self.progress) diff --git a/Player/Classes/Views/PlayerSongList/CenterCellCollectionViewFlowLayout.swift b/Player/Classes/Views/PlayerSongList/CenterCellCollectionViewFlowLayout.swift index 13d2ba2..c495b82 100644 --- a/Player/Classes/Views/PlayerSongList/CenterCellCollectionViewFlowLayout.swift +++ b/Player/Classes/Views/PlayerSongList/CenterCellCollectionViewFlowLayout.swift @@ -27,7 +27,7 @@ class CenterCellCollectionViewFlowLayout: UICollectionViewFlowLayout { var candidateAttributes : UICollectionViewLayoutAttributes? for attributes in attributesForVisibleCells { - if attributes.representedElementCategory == UICollectionElementCategory.cell { + if attributes.representedElementCategory == UICollectionView.ElementCategory.cell { candidateAttributes = attributes } } @@ -37,7 +37,7 @@ class CenterCellCollectionViewFlowLayout: UICollectionViewFlowLayout { } let w : CGFloat = attributes.frame.width - let targetColumn = floor(proposedContentOffset.x/w + 1)//(velocity.x > 0 ? 1 : 0)) + let targetColumn = floor(proposedContentOffset.x/(w + self.minimumLineSpacing) + 1)//(velocity.x > 0 ? 1 : 0)) let pX = targetColumn * w - cv.contentInset.left + targetColumn * self.minimumLineSpacing mostRecentOffset = CGPoint(x: CGFloat(pX), y: attributes.center.y) diff --git a/Player/Classes/Views/PlayerSongList/PlayerSongList.swift b/Player/Classes/Views/PlayerSongList/PlayerSongList.swift index 69329c0..ca98d59 100644 --- a/Player/Classes/Views/PlayerSongList/PlayerSongList.swift +++ b/Player/Classes/Views/PlayerSongList/PlayerSongList.swift @@ -55,7 +55,7 @@ class PlayerSongList: ViewWithXib { insets.left = self.frame.size.width * leftInsetCoefficient insets.right = insets.left self.collectionView.contentInset = insets - self.collectionView.decelerationRate = UIScrollViewDecelerationRateFast + self.collectionView.decelerationRate = UIScrollView.DecelerationRate.fast DispatchQueue.main.async { self.updateCellSizes() } @@ -71,7 +71,7 @@ class PlayerSongList: ViewWithXib { collectionView.backgroundColor = UIColor.clear collectionView.backgroundView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: 0)) collectionView.register(UINib(nibName: RoundedPictureCollectionViewCell.className, bundle: Bundle(for: self.classForCoder)), forCellWithReuseIdentifier: RoundedPictureCollectionViewCell.className) - collectionView.decelerationRate = decelerationRate + collectionView.decelerationRate = UIScrollView.DecelerationRate(rawValue: decelerationRate) let tap = UITapGestureRecognizer(target: self, action: #selector(doubleTapped)) tap.numberOfTapsRequired = numberOfTapsRequired diff --git a/Player/Classes/Views/ViewWithXib.swift b/Player/Classes/Views/ViewWithXib.swift index 00d2664..d31eee9 100644 --- a/Player/Classes/Views/ViewWithXib.swift +++ b/Player/Classes/Views/ViewWithXib.swift @@ -15,7 +15,7 @@ class ViewWithXib: UIView { private func xibSetup() { let view = loadViewFromNib() view.frame = bounds - view.autoresizingMask = [UIViewAutoresizing.flexibleWidth, UIViewAutoresizing.flexibleHeight] + view.autoresizingMask = [UIView.AutoresizingMask.flexibleWidth, UIView.AutoresizingMask.flexibleHeight] addSubview(view) initUI() } diff --git a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Player/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index cc4017e..0000000 --- a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-40.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-60.png", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png deleted file mode 100644 index 935de58..0000000 Binary files a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png and /dev/null differ diff --git a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60.png deleted file mode 100644 index e974492..0000000 Binary files a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60.png and /dev/null differ diff --git a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png deleted file mode 100644 index 919056f..0000000 Binary files a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ diff --git a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png deleted file mode 100644 index 8acf3fb..0000000 Binary files a/Player/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ diff --git a/Player/Resources/Storyboards/Base.lproj/PandoraPlayer.storyboard b/Player/Resources/Storyboards/Base.lproj/PandoraPlayer.storyboard index fa93321..560934b 100644 --- a/Player/Resources/Storyboards/Base.lproj/PandoraPlayer.storyboard +++ b/Player/Resources/Storyboards/Base.lproj/PandoraPlayer.storyboard @@ -1,17 +1,18 @@ - + - + + - + @@ -34,7 +35,7 @@ - + @@ -66,19 +67,19 @@ - + - + - + @@ -87,8 +88,14 @@ + - @@ -175,6 +176,6 @@ - +