javier/jellyfin-audio-player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Upgrade to latest react-native

Browse Source
This commit is contained in:
Lei Nelissen
2022-11-12 16:22:39 +01:00
parent c19b9d8920
commit c7aec30e39
24 changed files with 6835 additions and 8383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.node-version Normal file
View File

@@ -0,0 +1 @@
16

1
.npmrc Normal file
View File

@@ -0,0 +1 @@
legacy-peer-deps=true

7
android/app/src/main/jni/CMakeLists.txt Normal file
View File

@@ -0,0 +1,7 @@
cmake_minimum_required(VERSION 3.13)
# Define the library name here.
project(rndiffapp_appmodules)
# This file includes all the necessary to let you build your application with the New Architecture.
include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
android/settings.gradle
View File

@@ -6,4 +6,6 @@ includeBuild('../node_modules/react-native-gradle-plugin')
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
include(":ReactAndroid") include(":ReactAndroid")
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
include(":ReactAndroid:hermes-engine")
project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
} }

6
index.js
View File

@@ -1,5 +1,5 @@
import 'react-native-gesture-handler'; import 'react-native-gesture-handler';
import { AppRegistry, LogBox } from 'react-native'; import { AppRegistry } from 'react-native';
import TrackPlayer from 'react-native-track-player'; import TrackPlayer from 'react-native-track-player';
import App from './src/components/App'; import App from './src/components/App';
import { name as appName } from './app.json'; import { name as appName } from './app.json';
@@ -8,10 +8,6 @@ import { setupSentry } from 'utility/Sentry';
import { enableScreens } from 'react-native-screens'; import { enableScreens } from 'react-native-screens';
import { patchTrackPlayer } from 'utility/AddedTrackEvents'; import { patchTrackPlayer } from 'utility/AddedTrackEvents';
LogBox.ignoreLogs([
'ViewPropTypes will be removed from React Native',
]);
setupSentry(); setupSentry();
enableScreens(); enableScreens();
patchTrackPlayer(); patchTrackPlayer();

11
ios/.xcode.env Normal file
View File

@@ -0,0 +1,11 @@
# This `.xcode.env` file is versioned and is used to source the environment
# used when running script phases inside Xcode.
# To customize your local environment, you can create an `.xcode.env.local`
# file that is not versioned.
# NODE_BINARY variable contains the PATH to the node executable.
#
# Customize the NODE_BINARY variable here.
# For example, to use nvm with brew, add the following line
# . "$(brew --prefix nvm)/nvm.sh" --no-use
export NODE_BINARY=$(command -v node)

14
ios/Fintunes.xcodeproj/project.pbxproj
View File

@@ -346,12 +346,14 @@
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
@@ -368,12 +370,14 @@
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
@@ -668,7 +672,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
@@ -696,7 +700,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@@ -722,6 +726,7 @@
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = Fintunes; PRODUCT_NAME = Fintunes;
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos; SDKROOT = iphoneos;
}; };
name = Debug; name = Debug;
@@ -731,7 +736,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
@@ -759,7 +764,7 @@
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -777,6 +782,7 @@
); );
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = Fintunes; PRODUCT_NAME = Fintunes;
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };

29
ios/Podfile
View File

@@ -1,7 +1,8 @@
require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/react-native/node_modules/@react-native-community/cli-platform-ios/native_modules' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
platform :ios, '12.0' platform :ios, '12.4'
install! 'cocoapods', :deterministic_uuids => false
target 'Fintunes' do target 'Fintunes' do
config = use_native_modules! config = use_native_modules!
@@ -11,9 +12,16 @@ target 'Fintunes' do
use_react_native!( use_react_native!(
:path => config[:reactNativePath], :path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods # Hermes is now enabled by default. Disable by setting this flag to false.
:hermes_enabled => flags[:hermes_enabled], # Upcoming versions of React Native may rely on get_default_flags(), but
# we make it explicit here to aid in the React Native upgrade process.
:hermes_enabled => true,
:fabric_enabled => flags[:fabric_enabled], :fabric_enabled => flags[:fabric_enabled],
# Enables Flipper.
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
:flipper_configuration => FlipperConfiguration.enabled,
# An absolute path to your application root. # An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.." :app_path => "#{Pod::Config.instance.installation_root}/.."
) )
@@ -23,14 +31,13 @@ target 'Fintunes' do
# Pods for testing # Pods for testing
end end
# Enables Flipper.
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
use_flipper!()
post_install do |installer| post_install do |installer|
react_native_post_install(installer) react_native_post_install(
installer,
# Set `mac_catalyst_enabled` to `true` in order to apply patches
# necessary for Mac Catalyst builds
:mac_catalyst_enabled => false
)
__apply_Xcode_12_5_M1_post_install_workaround(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer)
end end
end end

668
ios/Podfile.lock
View File

@@ -2,19 +2,19 @@ PODS:
- boost (1.76.0) - boost (1.76.0)
- CocoaAsyncSocket (7.6.5) - CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6) - DoubleConversion (1.1.6)
- FBLazyVector (0.68.2) - FBLazyVector (0.70.5)
- FBReactNativeSpec (0.68.2): - FBReactNativeSpec (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTRequired (= 0.68.2) - RCTRequired (= 0.70.5)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Core (= 0.68.2) - React-Core (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- Flipper (0.125.0): - Flipper (0.125.0):
- Flipper-Folly (~> 2.6) - Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4) - Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11) - Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.2.0) - Flipper-DoubleConversion (3.2.0.1)
- Flipper-Fmt (7.1.7) - Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.10): - Flipper-Folly (2.6.10):
- Flipper-Boost-iOSX - Flipper-Boost-iOSX
@@ -23,7 +23,7 @@ PODS:
- Flipper-Glog - Flipper-Glog
- libevent (~> 2.1.12) - libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100) - OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.5.0.4) - Flipper-Glog (0.5.0.5)
- Flipper-PeerTalk (0.0.4) - Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3): - Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6) - Flipper-Folly (~> 2.6)
@@ -73,350 +73,371 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1) - fmt (6.2.1)
- glog (0.3.5) - glog (0.3.5)
- hermes-engine (0.70.5)
- libevent (2.1.12) - libevent (2.1.12)
- libwebp (1.2.1): - libwebp (1.2.4):
- libwebp/demux (= 1.2.1) - libwebp/demux (= 1.2.4)
- libwebp/mux (= 1.2.1) - libwebp/mux (= 1.2.4)
- libwebp/webp (= 1.2.1) - libwebp/webp (= 1.2.4)
- libwebp/demux (1.2.1): - libwebp/demux (1.2.4):
- libwebp/webp - libwebp/webp
- libwebp/mux (1.2.1): - libwebp/mux (1.2.4):
- libwebp/demux - libwebp/demux
- libwebp/webp (1.2.1) - libwebp/webp (1.2.4)
- OpenSSL-Universal (1.1.1100) - OpenSSL-Universal (1.1.1100)
- RCT-Folly (2021.06.28.00-v2): - RCT-Folly (2021.07.22.00):
- boost - boost
- DoubleConversion - DoubleConversion
- fmt (~> 6.2.1) - fmt (~> 6.2.1)
- glog - glog
- RCT-Folly/Default (= 2021.06.28.00-v2) - RCT-Folly/Default (= 2021.07.22.00)
- RCT-Folly/Default (2021.06.28.00-v2): - RCT-Folly/Default (2021.07.22.00):
- boost - boost
- DoubleConversion - DoubleConversion
- fmt (~> 6.2.1) - fmt (~> 6.2.1)
- glog - glog
- RCTRequired (0.68.2) - RCT-Folly/Futures (2021.07.22.00):
- RCTTypeSafety (0.68.2): - boost
- FBLazyVector (= 0.68.2) - DoubleConversion
- RCT-Folly (= 2021.06.28.00-v2) - fmt (~> 6.2.1)
- RCTRequired (= 0.68.2) - glog
- React-Core (= 0.68.2) - libevent
- React (0.68.2): - RCTRequired (0.70.5)
- React-Core (= 0.68.2) - RCTTypeSafety (0.70.5):
- React-Core/DevSupport (= 0.68.2) - FBLazyVector (= 0.70.5)
- React-Core/RCTWebSocket (= 0.68.2) - RCTRequired (= 0.70.5)
- React-RCTActionSheet (= 0.68.2) - React-Core (= 0.70.5)
- React-RCTAnimation (= 0.68.2) - React (0.70.5):
- React-RCTBlob (= 0.68.2) - React-Core (= 0.70.5)
- React-RCTImage (= 0.68.2) - React-Core/DevSupport (= 0.70.5)
- React-RCTLinking (= 0.68.2) - React-Core/RCTWebSocket (= 0.70.5)
- React-RCTNetwork (= 0.68.2) - React-RCTActionSheet (= 0.70.5)
- React-RCTSettings (= 0.68.2) - React-RCTAnimation (= 0.70.5)
- React-RCTText (= 0.68.2) - React-RCTBlob (= 0.70.5)
- React-RCTVibration (= 0.68.2) - React-RCTImage (= 0.70.5)
- React-RCTLinking (= 0.70.5)
- React-RCTNetwork (= 0.70.5)
- React-RCTSettings (= 0.70.5)
- React-RCTText (= 0.70.5)
- React-RCTVibration (= 0.70.5)
- react-airplay (1.2.0): - react-airplay (1.2.0):
- React-Core - React-Core
- React-callinvoker (0.68.2) - React-bridging (0.70.5):
- React-Codegen (0.68.2): - RCT-Folly (= 2021.07.22.00)
- FBReactNativeSpec (= 0.68.2) - React-jsi (= 0.70.5)
- RCT-Folly (= 2021.06.28.00-v2) - React-callinvoker (0.70.5)
- RCTRequired (= 0.68.2) - React-Codegen (0.70.5):
- RCTTypeSafety (= 0.68.2) - FBReactNativeSpec (= 0.70.5)
- React-Core (= 0.68.2) - RCT-Folly (= 2021.07.22.00)
- React-jsi (= 0.68.2) - RCTRequired (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - React-Core (= 0.70.5)
- React-Core (0.68.2): - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.70.5)
- React-Core (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.68.2) - React-Core/Default (= 0.70.5)
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/CoreModulesHeaders (0.68.2): - React-Core/CoreModulesHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/Default (0.68.2): - React-Core/Default (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/DevSupport (0.68.2): - React-Core/DevSupport (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.68.2) - React-Core/Default (= 0.70.5)
- React-Core/RCTWebSocket (= 0.68.2) - React-Core/RCTWebSocket (= 0.70.5)
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-jsinspector (= 0.68.2) - React-jsinspector (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTActionSheetHeaders (0.68.2): - React-Core/RCTActionSheetHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTAnimationHeaders (0.68.2): - React-Core/RCTAnimationHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTBlobHeaders (0.68.2): - React-Core/RCTBlobHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTImageHeaders (0.68.2): - React-Core/RCTImageHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTLinkingHeaders (0.68.2): - React-Core/RCTLinkingHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTNetworkHeaders (0.68.2): - React-Core/RCTNetworkHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTSettingsHeaders (0.68.2): - React-Core/RCTSettingsHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTTextHeaders (0.68.2): - React-Core/RCTTextHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTVibrationHeaders (0.68.2): - React-Core/RCTVibrationHeaders (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-Core/RCTWebSocket (0.68.2): - React-Core/RCTWebSocket (0.70.5):
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.68.2) - React-Core/Default (= 0.70.5)
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.68.2) - React-jsiexecutor (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- Yoga - Yoga
- React-CoreModules (0.68.2): - React-CoreModules (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/CoreModulesHeaders (= 0.68.2) - React-Core/CoreModulesHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-RCTImage (= 0.68.2) - React-RCTImage (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-cxxreact (0.68.2): - React-cxxreact (0.70.5):
- boost (= 1.76.0) - boost (= 1.76.0)
- DoubleConversion - DoubleConversion
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-callinvoker (= 0.68.2) - React-callinvoker (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-jsinspector (= 0.68.2) - React-jsinspector (= 0.70.5)
- React-logger (= 0.68.2) - React-logger (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- React-runtimeexecutor (= 0.68.2) - React-runtimeexecutor (= 0.70.5)
- React-jsi (0.68.2): - React-hermes (0.70.5):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- RCT-Folly/Futures (= 2021.07.22.00)
- React-cxxreact (= 0.70.5)
- React-jsi (= 0.70.5)
- React-jsiexecutor (= 0.70.5)
- React-jsinspector (= 0.70.5)
- React-perflogger (= 0.70.5)
- React-jsi (0.70.5):
- boost (= 1.76.0) - boost (= 1.76.0)
- DoubleConversion - DoubleConversion
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-jsi/Default (= 0.68.2) - React-jsi/Default (= 0.70.5)
- React-jsi/Default (0.68.2): - React-jsi/Default (0.70.5):
- boost (= 1.76.0) - boost (= 1.76.0)
- DoubleConversion - DoubleConversion
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-jsiexecutor (0.68.2): - React-jsiexecutor (0.70.5):
- DoubleConversion - DoubleConversion
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-cxxreact (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-perflogger (= 0.68.2) - React-perflogger (= 0.70.5)
- React-jsinspector (0.68.2) - React-jsinspector (0.70.5)
- React-logger (0.68.2): - React-logger (0.70.5):
- glog - glog
- react-native-blur (0.8.0): - react-native-blur (4.3.0):
- React
- react-native-flipper (0.146.0):
- React-Core - React-Core
- react-native-netinfo (8.3.0): - react-native-flipper (0.174.0):
- React-Core - React-Core
- react-native-safe-area-context (4.2.5): - react-native-netinfo (9.3.6):
- React-Core
- react-native-safe-area-context (4.4.1):
- RCT-Folly - RCT-Folly
- RCTRequired - RCTRequired
- RCTTypeSafety - RCTTypeSafety
- React - React-Core
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- react-native-skia (0.1.124): - react-native-skia (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-skia/Api (= 0.1.124) - react-native-skia/Api (= 0.1.157)
- react-native-skia/Jsi (= 0.1.124) - react-native-skia/Jsi (= 0.1.157)
- react-native-skia/RNSkia (= 0.1.124) - react-native-skia/RNSkia (= 0.1.157)
- react-native-skia/SkiaHeaders (= 0.1.124) - react-native-skia/SkiaHeaders (= 0.1.157)
- react-native-skia/Utils (= 0.1.124) - react-native-skia/Utils (= 0.1.157)
- react-native-skia/Api (0.1.124): - react-native-skia/Api (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-skia/Jsi (0.1.124): - react-native-skia/Jsi (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-skia/RNSkia (0.1.124): - react-native-skia/RNSkia (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-skia/SkiaHeaders (0.1.124): - react-native-skia/SkiaHeaders (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-skia/Utils (0.1.124): - react-native-skia/Utils (0.1.157):
- React - React
- React-callinvoker - React-callinvoker
- React-Core - React-Core
- react-native-track-player (2.2.0-rc3): - react-native-track-player (3.2.0):
- React-Core - React-Core
- SwiftAudioEx (= 0.14.7) - SwiftAudioEx (= 0.15.3)
- react-native-webview (11.18.2): - react-native-webview (11.23.1):
- React-Core - React-Core
- React-perflogger (0.68.2) - React-perflogger (0.70.5)
- React-RCTActionSheet (0.68.2): - React-RCTActionSheet (0.70.5):
- React-Core/RCTActionSheetHeaders (= 0.68.2) - React-Core/RCTActionSheetHeaders (= 0.70.5)
- React-RCTAnimation (0.68.2): - React-RCTAnimation (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTAnimationHeaders (= 0.68.2) - React-Core/RCTAnimationHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTBlob (0.68.2): - React-RCTBlob (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTBlobHeaders (= 0.68.2) - React-Core/RCTBlobHeaders (= 0.70.5)
- React-Core/RCTWebSocket (= 0.68.2) - React-Core/RCTWebSocket (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-RCTNetwork (= 0.68.2) - React-RCTNetwork (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTImage (0.68.2): - React-RCTImage (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTImageHeaders (= 0.68.2) - React-Core/RCTImageHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- React-RCTNetwork (= 0.68.2) - React-RCTNetwork (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTLinking (0.68.2): - React-RCTLinking (0.70.5):
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTLinkingHeaders (= 0.68.2) - React-Core/RCTLinkingHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTNetwork (0.68.2): - React-RCTNetwork (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTNetworkHeaders (= 0.68.2) - React-Core/RCTNetworkHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTSettings (0.68.2): - React-RCTSettings (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.68.2) - RCTTypeSafety (= 0.70.5)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTSettingsHeaders (= 0.68.2) - React-Core/RCTSettingsHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-RCTText (0.68.2): - React-RCTText (0.70.5):
- React-Core/RCTTextHeaders (= 0.68.2) - React-Core/RCTTextHeaders (= 0.70.5)
- React-RCTVibration (0.68.2): - React-RCTVibration (0.70.5):
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-Codegen (= 0.68.2) - React-Codegen (= 0.70.5)
- React-Core/RCTVibrationHeaders (= 0.68.2) - React-Core/RCTVibrationHeaders (= 0.70.5)
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (= 0.68.2) - ReactCommon/turbomodule/core (= 0.70.5)
- React-runtimeexecutor (0.68.2): - React-runtimeexecutor (0.70.5):
- React-jsi (= 0.68.2) - React-jsi (= 0.70.5)
- ReactCommon/turbomodule/core (0.68.2): - ReactCommon/turbomodule/core (0.70.5):
- DoubleConversion - DoubleConversion
- glog - glog
- RCT-Folly (= 2021.06.28.00-v2) - RCT-Folly (= 2021.07.22.00)
- React-callinvoker (= 0.68.2) - React-bridging (= 0.70.5)
- React-Core (= 0.68.2) - React-callinvoker (= 0.70.5)
- React-cxxreact (= 0.68.2) - React-Core (= 0.70.5)
- React-jsi (= 0.68.2) - React-cxxreact (= 0.70.5)
- React-logger (= 0.68.2) - React-jsi (= 0.70.5)
- React-perflogger (= 0.68.2) - React-logger (= 0.70.5)
- RNCAsyncStorage (1.17.6): - React-perflogger (= 0.70.5)
- RNCAsyncStorage (1.17.11):
- React-Core - React-Core
- RNFastImage (8.5.11): - RNFastImage (8.6.3):
- React-Core - React-Core
- SDWebImage (~> 5.11.1) - SDWebImage (~> 5.11.1)
- SDWebImageWebPCoder (~> 0.8.4) - SDWebImageWebPCoder (~> 0.8.4)
- RNFS (2.20.0): - RNFS (2.20.0):
- React-Core - React-Core
- RNGestureHandler (2.4.2): - RNGestureHandler (2.8.0):
- React-Core - React-Core
- RNLocalize (2.2.1): - RNLocalize (2.2.4):
- React-Core - React-Core
- RNReanimated (2.8.0): - RNReanimated (2.12.0):
- DoubleConversion - DoubleConversion
- FBLazyVector - FBLazyVector
- FBReactNativeSpec - FBReactNativeSpec
@@ -443,25 +464,25 @@ PODS:
- React-RCTText - React-RCTText
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- Yoga - Yoga
- RNScreens (3.13.1): - RNScreens (3.18.2):
- React-Core - React-Core
- React-RCTImage - React-RCTImage
- RNSentry (3.4.2): - RNSentry (4.8.0):
- React-Core - React-Core
- Sentry (= 7.11.0) - Sentry (= 7.29.0)
- RNSVG (12.3.0): - RNSVG (13.5.0):
- React-Core - React-Core
- SDWebImage (5.11.1): - SDWebImage (5.11.1):
- SDWebImage/Core (= 5.11.1) - SDWebImage/Core (= 5.11.1)
- SDWebImage/Core (5.11.1) - SDWebImage/Core (5.11.1)
- SDWebImageWebPCoder (0.8.4): - SDWebImageWebPCoder (0.8.5):
- libwebp (~> 1.0) - libwebp (~> 1.0)
- SDWebImage/Core (~> 5.10) - SDWebImage/Core (~> 5.10)
- Sentry (7.11.0): - Sentry (7.29.0):
- Sentry/Core (= 7.11.0) - Sentry/Core (= 7.29.0)
- Sentry/Core (7.11.0) - Sentry/Core (7.29.0)
- SocketRocket (0.6.0) - SocketRocket (0.6.0)
- SwiftAudioEx (0.14.7) - SwiftAudioEx (0.15.3)
- Yoga (1.14.0) - Yoga (1.14.0)
- YogaKit (1.18.1): - YogaKit (1.18.1):
- Yoga (~> 1.14) - Yoga (~> 1.14)
@@ -473,10 +494,10 @@ DEPENDENCIES:
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (= 0.125.0) - Flipper (= 0.125.0)
- Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-Boost-iOSX (= 1.76.0.1.11)
- Flipper-DoubleConversion (= 3.2.0) - Flipper-DoubleConversion (= 3.2.0.1)
- Flipper-Fmt (= 7.1.7) - Flipper-Fmt (= 7.1.7)
- Flipper-Folly (= 2.6.10) - Flipper-Folly (= 2.6.10)
- Flipper-Glog (= 0.5.0.4) - Flipper-Glog (= 0.5.0.5)
- Flipper-PeerTalk (= 0.0.4) - Flipper-PeerTalk (= 0.0.4)
- Flipper-RSocket (= 1.4.3) - Flipper-RSocket (= 1.4.3)
- FlipperKit (= 0.125.0) - FlipperKit (= 0.125.0)
@@ -493,12 +514,15 @@ DEPENDENCIES:
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100) - OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`) - React (from `../node_modules/react-native/`)
- react-airplay (from `../node_modules/react-airplay`) - react-airplay (from `../node_modules/react-airplay`)
- React-bridging (from `../node_modules/react-native/ReactCommon`)
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
- React-Codegen (from `build/generated/ios`) - React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`) - React-Core (from `../node_modules/react-native/`)
@@ -506,6 +530,7 @@ DEPENDENCIES:
- React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
- React-hermes (from `../node_modules/react-native/ReactCommon/hermes`)
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
@@ -574,6 +599,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/React/FBReactNativeSpec" :path: "../node_modules/react-native/React/FBReactNativeSpec"
glog: glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
hermes-engine:
:podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec"
RCT-Folly: RCT-Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
RCTRequired: RCTRequired:
@@ -584,6 +611,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/" :path: "../node_modules/react-native/"
react-airplay: react-airplay:
:path: "../node_modules/react-airplay" :path: "../node_modules/react-airplay"
React-bridging:
:path: "../node_modules/react-native/ReactCommon"
React-callinvoker: React-callinvoker:
:path: "../node_modules/react-native/ReactCommon/callinvoker" :path: "../node_modules/react-native/ReactCommon/callinvoker"
React-Codegen: React-Codegen:
@@ -594,6 +623,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/React/CoreModules" :path: "../node_modules/react-native/React/CoreModules"
React-cxxreact: React-cxxreact:
:path: "../node_modules/react-native/ReactCommon/cxxreact" :path: "../node_modules/react-native/ReactCommon/cxxreact"
React-hermes:
:path: "../node_modules/react-native/ReactCommon/hermes"
React-jsi: React-jsi:
:path: "../node_modules/react-native/ReactCommon/jsi" :path: "../node_modules/react-native/ReactCommon/jsi"
React-jsiexecutor: React-jsiexecutor:
@@ -664,73 +695,76 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
boost: a7c83b31436843459a1961bfd74b96033dc77234 boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBLazyVector: a7a655862f6b09625d11c772296b01cd5164b648 FBLazyVector: affa4ba1bfdaac110a789192f4d452b053a86624
FBReactNativeSpec: 81ce99032d5b586fddd6a38d450f8595f7e04be4 FBReactNativeSpec: fe8b5f1429cfe83a8d72dc8ed61dc7704cac8745
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4 Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 87bc98ff48de90cb5b0b5114ed3da79d85ee2dd4 Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 476ee3e89abb49e07f822b48323c51c57124b572 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: 7fe5fc6ef707b7fdcb161b63898ec500e285653d
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 RCTRequired: 21229f84411088e5d8538f21212de49e46cc83e2
RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e RCTTypeSafety: 62eed57a32924b09edaaf170a548d1fc96223086
React: 176dd882de001854ced260fad41bb68a31aa4bd0 React: f0254ccddeeef1defe66c6b1bb9133a4f040792b
react-airplay: 8197767f12cae11a7623b1507d29a89482a720ad react-airplay: 8197767f12cae11a7623b1507d29a89482a720ad
React-callinvoker: c2864d1818d6e64928d2faf774a3800dfc38fe1f React-bridging: e46911666b7ec19538a620a221d6396cd293d687
React-Codegen: 98b6f97f0a7abf7d67e4ce435c77c05b7a95cf05 React-callinvoker: 66b62e2c34546546b2f21ab0b7670346410a2b53
React-Core: fdaa2916b1c893f39f02cff0476d1fb0cab1e352 React-Codegen: b6999435966df3bdf82afa3f319ba0d6f9a8532a
React-CoreModules: fd8705b80699ec36c2cdd635c2ce9d874b9cfdfc React-Core: dabbc9d1fe0a11d884e6ee1599789cf8eb1058a5
React-cxxreact: 1832d971f7b0cb2c7b943dc0ec962762c90c906e React-CoreModules: 5b6b7668f156f73a56420df9ec68ca2ec8f2e818
React-jsi: 72af715135abe8c3f0dcf3b2548b71d048b69a7e React-cxxreact: c7ca2baee46db22a30fce9e639277add3c3f6ad1
React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6 React-hermes: c93e1d759ad5560dfea54d233013d7d2c725c286
React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 React-jsi: a565dcb49130ed20877a9bb1105ffeecbb93d02d
React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 React-jsiexecutor: 31564fa6912459921568e8b0e49024285a4d584b
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c React-jsinspector: badd81696361249893a80477983e697aab3c1a34
react-native-flipper: 5b0191d194d8581f1a25efd07fd6048323dc9c04 React-logger: fdda34dd285bdb0232e059b19d9606fa0ec3bb9c
react-native-netinfo: 3671b091c4843fda5e153612866ef4024b8f5d62 react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
react-native-safe-area-context: ebf8c413eb8b5f7c392a036a315eb7b46b96845f react-native-flipper: b269b4d4e1ec04f7f443f5edf15100a13e760bf0
react-native-skia: 69a2b9b42999325db20e18ef459bf4dfc1b51a69 react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
react-native-track-player: c4a4c5ec8090aec5b97a3f634dab8bdb657491a0 react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-webview: 8ec7ddf9eb4ddcd92b32cee7907efec19a9ec7cb react-native-skia: 7f9a3bd36c4247005e87005d912dcf6db76a6289
React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6 react-native-track-player: 0c26d981b5097910486cbbeb6d8f5352d41be069
React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162 react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034 React-perflogger: e68d3795cf5d247a0379735cbac7309adf2fb931
React-RCTBlob: a1295c8e183756d7ef30ba6e8f8144dfe8a19215 React-RCTActionSheet: 05452c3b281edb27850253db13ecd4c5a65bc247
React-RCTImage: a30d1ee09b1334067fbb6f30789aae2d7ac150c9 React-RCTAnimation: 578eebac706428e68466118e84aeacf3a282b4da
React-RCTLinking: ffc6d5b88d1cb9aca13c54c2ec6507fbf07f2ac4 React-RCTBlob: f47a0aa61e7d1fb1a0e13da832b0da934939d71a
React-RCTNetwork: f807a2facab6cf5cf36d592e634611de9cf12d81 React-RCTImage: 60f54b66eed65d86b6dffaf4733d09161d44929d
React-RCTSettings: 861806819226ed8332e6a8f90df2951a34bb3e7f React-RCTLinking: 91073205aeec4b29450ca79b709277319368ac9e
React-RCTText: f3fb464cc41a50fc7a1aba4deeb76a9ad8282cb9 React-RCTNetwork: ca91f2c9465a7e335c8a5fae731fd7f10572213b
React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374 React-RCTSettings: 1a9a5d01337d55c18168c1abe0f4a589167d134a
React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23 React-RCTText: c591e8bd9347a294d8416357ca12d779afec01d5
ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2 React-RCTVibration: 8e5c8c5d17af641f306d7380d8d0fe9b3c142c48
RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673 React-runtimeexecutor: 7401c4a40f8728fd89df4a56104541b760876117
RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 ReactCommon: c9246996e73bf75a2c6c3ff15f1e16707cdc2da9
RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 61628a2c859172551aa2100d3e73d1e57878392f RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
RNLocalize: cbcb55d0e19c78086ea4eea20e03fe8000bbbced RNLocalize: 0df7970cfc60389f00eb62fd7c097dc75af3fb4f
RNReanimated: 64573e25e078ae6bec03b891586d50b9ec284393 RNReanimated: 2a91e85fcd343f8af3c58d3425b99fdd285590a5
RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
RNSentry: 2cd1daa124b0d9fd0dfc2cb6094fdd168cb579bc RNSentry: db7fd7b66efda28885e4e904a8b5e7349aec61c1
RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 RNSVG: 38ca962c970dbce1ca38991a5aebf26d163f9efb
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815 SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341 Sentry: 4272663eb0eda312024d795ca3f5a562a8ce5e18
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
SwiftAudioEx: 3a4024e48f3b3e45dac6bf2668d7adbe7b83f50e SwiftAudioEx: 83eabba2940924fc1c0d5cb0896049921365229c
Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 Yoga: eca980a5771bf114c41a754098cd85e6e0d90ed7
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: d85525c8d2984ee1566f371aa5eb0ce9a99a5132 PODFILE CHECKSUM: 9735b44bd285aab03d16f4b0a062c94bf98c573c
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

14318
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

105
package.json
View File

@@ -12,74 +12,73 @@
"build:ios": "react-native bundle --entry-file='index.ts' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios'" "build:ios": "react-native bundle --entry-file='index.ts' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios'"
}, },
"dependencies": { "dependencies": {
"@react-native-async-storage/async-storage": "^1.17.6", "@react-native-async-storage/async-storage": "^1.17.11",
"@react-native-community/blur": "^3.6.0", "@react-native-community/blur": "^4.3.0",
"@react-native-community/netinfo": "^8.3.0", "@react-native-community/netinfo": "^9.3.6",
"@react-navigation/bottom-tabs": "^6.3.1", "@react-navigation/bottom-tabs": "^6.4.0",
"@react-navigation/native": "^6.0.10", "@react-navigation/native": "^6.0.13",
"@react-navigation/native-stack": "^6.6.2", "@react-navigation/native-stack": "^6.9.1",
"@react-navigation/stack": "^6.2.1", "@react-navigation/stack": "^6.3.4",
"@reduxjs/toolkit": "^1.8.1", "@reduxjs/toolkit": "^1.9.0",
"@sentry/react-native": "^3.4.2", "@sentry/react-native": "^4.8.0",
"@shopify/react-native-skia": "^0.1.124", "@shopify/react-native-skia": "^0.1.157",
"@types/lodash": "^4.14.182", "@types/lodash": "^4.14.188",
"date-fns": "^2.28.0", "date-fns": "^2.29.3",
"events": "^3.3.0", "events": "^3.3.0",
"fuse.js": "^6.6.2", "fuse.js": "^6.6.2",
"hermes-engine": "^0.11.0", "hermes-engine": "^0.11.0",
"i18n-js": "^3.9.2", "i18n-js": "^3.9.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"react": "^17.0.2", "react": "18.2.0",
"react-airplay": "^1.2.0", "react-airplay": "^1.2.0",
"react-native": "^0.68.2", "react-native": "0.70.5",
"react-native-collapsible": "^1.6.0", "react-native-collapsible": "^1.6.0",
"react-native-dotenv": "^3.3.1", "react-native-dotenv": "^3.4.2",
"react-native-fast-image": "^8.5.11", "react-native-fast-image": "^8.6.3",
"react-native-flipper": "^0.146.0", "react-native-flipper": "^0.174.0",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.4.2", "react-native-gesture-handler": "^2.8.0",
"react-native-localize": "^2.2.1", "react-native-localize": "^2.2.4",
"react-native-reanimated": "^2.8.0", "react-native-reanimated": "^2.12.0",
"react-native-safe-area-context": "^4.2.5", "react-native-safe-area-context": "^4.4.1",
"react-native-screens": "^3.13.1", "react-native-screens": "^3.18.2",
"react-native-shadow-2": "^6.0.5", "react-native-shadow-2": "^7.0.6",
"react-native-svg": "^12.3.0", "react-native-svg": "^13.5.0",
"react-native-svg-transformer": "^1.0.0", "react-native-svg-transformer": "^1.0.0",
"react-native-track-player": "^2.2.0-rc3", "react-native-track-player": "^3.2.0",
"react-native-webview": "^11.18.2", "react-native-webview": "^11.23.1",
"react-redux": "^8.0.1", "react-redux": "^8.0.5",
"redux": "^4.2.0", "redux": "^4.2.0",
"redux-flipper": "^2.0.1", "redux-flipper": "^2.0.2",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"styled-components": "^5.3.5" "styled-components": "^5.3.6"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.17.12", "@babel/core": "^7.20.2",
"@babel/runtime": "^7.17.9", "@babel/runtime": "^7.20.1",
"@react-native-community/eslint-config": "^3.0.2", "@react-native-community/eslint-config": "^3.2.0",
"@sentry/cli": "^2.0.4", "@sentry/cli": "^2.8.1",
"@types/i18n-js": "^3.8.2", "@types/i18n-js": "^3.8.3",
"@types/jest": "^27.5.1", "@types/jest": "^29.2.2",
"@types/react-native": "^0.67.7", "@types/react-native": "^0.70.6",
"@types/react-test-renderer": "^17.0.1", "@types/react-test-renderer": "^18.0.0",
"@types/redux-logger": "^3.0.9", "@types/redux-logger": "^3.0.9",
"@types/styled-components": "^5.1.25", "@types/styled-components": "^5.1.26",
"@types/styled-components-react-native": "^5.1.3", "@types/styled-components-react-native": "^5.2.0",
"@typescript-eslint/eslint-plugin": "^5.25.0", "@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.25.0", "@typescript-eslint/parser": "^5.42.1",
"babel-jest": "^28.1.0", "babel-jest": "^29.3.1",
"babel-plugin-module-resolver": "^4.1.0", "babel-plugin-module-resolver": "^4.1.0",
"eslint": "^8.15.0", "eslint": "^8.27.0",
"eslint-plugin-react-hooks": "^4.5.0", "eslint-plugin-react-hooks": "^4.6.0",
"jest": "^28.1.0", "jest": "^29.3.1",
"metro-config": "^0.70.3", "metro-config": "^0.73.3",
"metro-react-native-babel-preset": "^0.70.3", "metro-react-native-babel-preset": "^0.73.3",
"metro-react-native-babel-transformer": "^0.70.3", "metro-react-native-babel-transformer": "^0.73.3",
"react-dom": "^17.0.2", "react-native-codegen": "^0.72.0",
"react-native-codegen": "^0.69.1", "react-test-renderer": "^18.2.0",
"react-test-renderer": "^17.0.2", "typescript": "^4.8.4"
"typescript": "^4.6.4"
}, },
"jest": { "jest": {
"preset": "react-native", "preset": "react-native",
@@ -93,6 +92,6 @@
] ]
}, },
"overrides": { "overrides": {
"@types/react-native": "^0.67.7" "@types/react-native": "^0.70.6"
} }
} }

1
src/components/App.tsx
View File

@@ -47,7 +47,6 @@ export default function App(): JSX.Element {
Capability.Stop, Capability.Stop,
Capability.SeekTo, Capability.SeekTo,
], ],
stopWithApp: true
}); });
} }
setupTrackPlayer(); setupTrackPlayer();

4
src/components/Colors.tsx
View File

@@ -1,4 +1,4 @@
import { BlurView, BlurViewProperties } from '@react-native-community/blur'; import { BlurView, BlurViewProps } from '@react-native-community/blur';
import { THEME_COLOR } from 'CONSTANTS'; import { THEME_COLOR } from 'CONSTANTS';
import React, { PropsWithChildren } from 'react'; import React, { PropsWithChildren } from 'react';
import { useContext } from 'react'; import { useContext } from 'react';
@@ -97,7 +97,7 @@ export function DefaultStylesProvider(props: DefaultStylesProviderProps) {
return props.children(defaultStyles); return props.children(defaultStyles);
} }
export function ColoredBlurView(props: PropsWithChildren<BlurViewProperties>) { export function ColoredBlurView(props: PropsWithChildren<BlurViewProps>) {
const scheme = useColorScheme(); const scheme = useColorScheme();
return Platform.OS === 'ios' ? ( return Platform.OS === 'ios' ? (

2
src/components/DownloadIcon.tsx
View File

@@ -58,7 +58,6 @@ function DownloadIcon({ trackId, size = 16, fill }: DownloadIconProps) {
// apply them to the circle using native props // apply them to the circle using native props
useEffect(() => { useEffect(() => {
const subscription = offsetAnimation.addListener((offset) => { const subscription = offsetAnimation.addListener((offset) => {
// @ts-expect-error undocumented functionality
const setNativeProps = circleRef.current?.setNativeProps as (props: CircleProps) => void | undefined; const setNativeProps = circleRef.current?.setNativeProps as (props: CircleProps) => void | undefined;
setNativeProps?.({ strokeDashoffset: offset.value }); setNativeProps?.({ strokeDashoffset: offset.value });
}); });
@@ -93,7 +92,6 @@ function DownloadIcon({ trackId, size = 16, fill }: DownloadIconProps) {
cy={radius} cy={radius}
r={radius - 1} r={radius - 1}
stroke={iconFill} stroke={iconFill}
// @ts-expect-error react-native-svg has outdated react-native typings
ref={circleRef} ref={circleRef}
strokeWidth={1.5} strokeWidth={1.5}
strokeDasharray={[ circumference, circumference ]} strokeDasharray={[ circumference, circumference ]}

9
src/components/Progresstrack.tsx
View File

@@ -19,7 +19,14 @@ export function calculateProgressTranslation(
) { ) {
'worklet'; 'worklet';
const completion = position / reference; const completion = position / reference;
const output = (1 - (completion || 0)) * -1 * width;
// GUARD: Check whether the calculated number is valid and not infinite
if (Number.isNaN(completion) || !Number.isFinite(completion)) {
return 0;
}
const output = (1 - completion) * -1 * width;
return output; return output;
} }

13
src/screens/Music/overlays/NowPlaying/index.tsx
View File

@@ -95,12 +95,10 @@ function SelectActionButton() {
<PlayIcon fill={defaultStyles.text.color} height={18} width={18} /> <PlayIcon fill={defaultStyles.text.color} height={18} width={18} />
</Pressable> </Pressable>
); );
// @ts-expect-error For some reason buffering isn't stated right in the types
case 'buffering':
case State.Buffering: case State.Buffering:
case State.Connecting: case State.Connecting:
return ( return (
<Pressable onPress={TrackPlayer.stop}> <Pressable onPress={TrackPlayer.pause}>
<ActivityIndicator /> <ActivityIndicator />
</Pressable> </Pressable>
); );
@@ -111,7 +109,7 @@ function SelectActionButton() {
function NowPlaying() { function NowPlaying() {
const { index, track } = useCurrentTrack(); const { index, track } = useCurrentTrack();
const { buffered, duration, position } = useProgress(); const { buffered, position } = useProgress();
const defaultStyles = useDefaultStyles(); const defaultStyles = useDefaultStyles();
const previousIndex = usePrevious(index); const previousIndex = usePrevious(index);
const navigation = useNavigation<MusicNavigationProp>(); const navigation = useNavigation<MusicNavigationProp>();
@@ -124,7 +122,8 @@ function NowPlaying() {
}, [navigation]); }, [navigation]);
useEffect(() => { useEffect(() => {
const hasChangedTrack = previousIndex !== index || duration === 0; const hasChangedTrack = previousIndex !== index || track?.duration === 0;
const duration = (track?.duration || 0) / 10_000_000;
Animated.timing(bufferAnimation.current, { Animated.timing(bufferAnimation.current, {
toValue: calculateProgressTranslation(buffered, duration, NOW_PLAYING_POPOVER_WIDTH), toValue: calculateProgressTranslation(buffered, duration, NOW_PLAYING_POPOVER_WIDTH),
@@ -137,7 +136,7 @@ function NowPlaying() {
duration: hasChangedTrack ? 0 : 500, duration: hasChangedTrack ? 0 : 500,
useNativeDriver: true, useNativeDriver: true,
}).start(); }).start();
}, [buffered, duration, position, index, previousIndex]); }, [buffered, track?.duration, position, index, previousIndex]);
if (!track) { if (!track) {
return null; return null;
@@ -146,7 +145,7 @@ function NowPlaying() {
return ( return (
<Container> <Container>
<ShadowOverlay pointerEvents='none'> <ShadowOverlay pointerEvents='none'>
<Shadow distance={30} viewStyle={{ alignSelf: 'stretch', flexBasis: '100%' }} startColor="#00000017"> <Shadow distance={30} style={{ alignSelf: 'stretch', flexBasis: '100%' }} startColor="#00000017">
<View style={{ flex: 1, borderRadius: 8 }} /> <View style={{ flex: 1, borderRadius: 8 }} />
</Shadow> </Shadow>
</ShadowOverlay> </ShadowOverlay>

8
src/screens/modals/Player/components/ProgressBar.tsx
View File

@@ -18,6 +18,7 @@ import Reanimated, {
runOnJS, runOnJS,
} from 'react-native-reanimated'; } from 'react-native-reanimated';
import ReText from 'components/ReText'; import ReText from 'components/ReText';
import useCurrentTrack from 'utility/useCurrentTrack';
const DRAG_HANDLE_SIZE = 20; const DRAG_HANDLE_SIZE = 20;
const PADDING_TOP = 12; const PADDING_TOP = 12;
@@ -50,7 +51,8 @@ const DragHandle = styled(Reanimated.View)`
`; `;
function ProgressBar() { function ProgressBar() {
const { position, buffered, duration } = useProgress(); const { position, buffered } = useProgress();
const { track } = useCurrentTrack();
const width = useSharedValue(0); const width = useSharedValue(0);
const pos = useSharedValue(0); const pos = useSharedValue(0);
@@ -120,9 +122,9 @@ function ProgressBar() {
useEffect(() => { useEffect(() => {
pos.value = position; pos.value = position;
buf.value = buffered; buf.value = buffered;
dur.value = duration; dur.value = (track?.duration || 0) / 10_000_000;
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [position, buffered, duration]); }, [position, buffered, track?.duration]);
const dragHandleStyles = useAnimatedStyle(() => { const dragHandleStyles = useAnimatedStyle(() => {
return { return {

1
src/store/downloads/actions.ts
View File

@@ -49,6 +49,7 @@ export const downloadTrack = createAsyncThunk(
dispatch(initializeDownload({ id, jobId, size: contentLength, location })); dispatch(initializeDownload({ id, jobId, size: contentLength, location }));
}, },
progress: (result) => { progress: (result) => {
console.log('PROGRESS', result, url);
// Dispatch a progress update // Dispatch a progress update
dispatch(progressDownload({ id, progress: result.bytesWritten / result.contentLength })); dispatch(progressDownload({ id, progress: result.bytesWritten / result.contentLength }));
}, },

3
src/utility/JellyfinApi.ts
View File

@@ -20,7 +20,6 @@ const baseTrackOptions: Record<string, string> = {
static: 'true', static: 'true',
}; };
/** /**
* Generate a track object from a Jellyfin ItemId so that * Generate a track object from a Jellyfin ItemId so that
* react-native-track-player can easily consume it. * react-native-track-player can easily consume it.
@@ -54,7 +53,7 @@ export function generateTrackUrl(trackId: string, credentials: Credentials) {
}; };
const trackParams = new URLSearchParams(trackOptions).toString(); const trackParams = new URLSearchParams(trackOptions).toString();
const url = encodeURI(`${credentials?.uri}/Audio/${trackId}/universal?${trackParams}`); const url = encodeURI(`${credentials?.uri}/Audio/${trackId}/universal?`) + trackParams;
return url; return url;
} }

1
src/utility/MimeTypes.ts
View File

@@ -9,6 +9,7 @@ const MimeTypes = {
'audio/dsp': '.dsp', 'audio/dsp': '.dsp',
'audio/flac': '.flac', 'audio/flac': '.flac',
'audio/m4b': '.m4b', 'audio/m4b': '.m4b',
'audio/mpeg': '.mp3',
'audio/vorbis': '.vorbis', 'audio/vorbis': '.vorbis',
'audio/x-ape': '.ape', 'audio/x-ape': '.ape',
'audio/xsp': '.xsp', 'audio/xsp': '.xsp',

2
src/utility/PlaybackService.ts
View File

@@ -27,7 +27,7 @@ export default async function() {
}); });
TrackPlayer.addEventListener(Event.RemoteStop, () => { TrackPlayer.addEventListener(Event.RemoteStop, () => {
TrackPlayer.destroy(); TrackPlayer.reset();
}); });
TrackPlayer.addEventListener(Event.RemoteSeek, (event) => { TrackPlayer.addEventListener(Event.RemoteSeek, (event) => {

6
src/utility/useCurrentTrack.ts
View File

@@ -17,8 +17,10 @@ export default function useCurrentTrack(): CurrentTrackResponse {
const retrieveCurrentTrack = useCallback(async () => { const retrieveCurrentTrack = useCallback(async () => {
const queue = await TrackPlayer.getQueue(); const queue = await TrackPlayer.getQueue();
const currentTrackIndex = await TrackPlayer.getCurrentTrack(); const currentTrackIndex = await TrackPlayer.getCurrentTrack();
setTrack(queue[currentTrackIndex]); if (currentTrackIndex !== null) {
setIndex(currentTrackIndex); setTrack(queue[currentTrackIndex]);
setIndex(currentTrackIndex);
}
}, [setTrack, setIndex]); }, [setTrack, setIndex]);
// Then execute the function on component mount and track changes // Then execute the function on component mount and track changes

4
src/utility/usePlayTracks.ts
View File

@@ -82,6 +82,10 @@ export default function usePlayTracks() {
case 'add-after-currently-playing': { case 'add-after-currently-playing': {
// Try and locate the current track // Try and locate the current track
const currentTrackIndex = await TrackPlayer.getCurrentTrack(); const currentTrackIndex = await TrackPlayer.getCurrentTrack();
if (currentTrackIndex === null) {
break;
}
// Since the argument is the id to insert the track BEFORE, we need // Since the argument is the id to insert the track BEFORE, we need
// to get the current track + 1 // to get the current track + 1