mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-02-15 06:58:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 5-implement-carplay-android-auto-new

Browse Source
This commit is contained in:
Violet Caulfield
2025-04-20 07:05:59 -05:00
committed by GitHub
parent 614f11d971 a104158985
commit 37883ccf96
8 changed files with 112 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@@ -92,8 +92,8 @@ android {
applicationId "com.jellify"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 12
versionName "0.10.99"
versionCode 13
versionName "0.10.100"
}
signingConfigs {
debug {

8
components/Player/helpers/buttons.tsx
View File

@@ -1,6 +1,6 @@
import { State } from 'react-native-track-player'
import { Colors } from 'react-native/Libraries/NewAppScreen'
import { Spinner, View } from 'tamagui'
import { Circle, Spinner, View } from 'tamagui'
import { usePlayerContext } from '../../../player/provider'
import IconButton from '../../../components/Global/helpers/icon-button'
@@ -29,7 +29,11 @@ export default function PlayPauseButton({
case State.Buffering:
case State.Loading: {
button = <Spinner marginHorizontal={10} size='small' color={Colors.Primary} />
button = (
<Circle size={size} disabled>
<Spinner marginHorizontal={10} size='small' color={Colors.Primary} />
</Circle>
)
break
}

1
components/Player/helpers/scrubber.tsx
View File

@@ -62,7 +62,6 @@ export default function Scrubber(): React.JSX.Element {
onSlideStart: (event, value) => {
setSeeking(true)
trigger('impactLight')
setPosition(value)
},
onSlideMove: (event, value) => {
trigger('clockTick')

8
ios/Jellify.xcodeproj/project.pbxproj
View File

@@ -718,7 +718,7 @@
CODE_SIGN_IDENTITY = "Apple Development: Jack Caulfield (66Z9J9NX2X)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Jack Caulfield (66Z9J9NX2X)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 124;
CURRENT_PROJECT_VERSION = 125;
DEVELOPMENT_TEAM = WAH9CZ8BPG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG;
ENABLE_BITCODE = NO;
@@ -728,7 +728,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.10.99;
MARKETING_VERSION = 0.10.100;
NEW_SETTING = "";
OTHER_LDFLAGS = (
"$(inherited)",
@@ -759,7 +759,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 124;
CURRENT_PROJECT_VERSION = 125;
DEVELOPMENT_TEAM = WAH9CZ8BPG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WAH9CZ8BPG;
INFOPLIST_FILE = Jellify/Info.plist;
@@ -768,7 +768,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.10.99;
MARKETING_VERSION = 0.10.100;
NEW_SETTING = "";
OTHER_LDFLAGS = (
"$(inherited)",

113
ios/Podfile.lock
View File

@@ -5,15 +5,15 @@ PODS:
- SPAlert (~> 4.2)
- SPIndicator (~> 1.6)
- DoubleConversion (1.1.6)
- EXConstants (17.0.5):
- EXConstants (17.0.8):
- ExpoModulesCore
- Expo (52.0.33):
- Expo (52.0.44):
- ExpoModulesCore
- ExpoAsset (11.0.3):
- ExpoAsset (11.0.5):
- ExpoModulesCore
- ExpoFileSystem (18.0.10):
- ExpoFileSystem (18.0.12):
- ExpoModulesCore
- ExpoFont (13.0.3):
- ExpoFont (13.0.4):
- ExpoModulesCore
- ExpoImage (2.0.7):
- ExpoModulesCore
@@ -21,9 +21,9 @@ PODS:
- SDWebImage (~> 5.19.1)
- SDWebImageAVIFCoder (~> 0.11.0)
- SDWebImageSVGCoder (~> 1.7.0)
- ExpoKeepAwake (14.0.2):
- ExpoKeepAwake (14.0.3):
- ExpoModulesCore
- ExpoModulesCore (2.2.1):
- ExpoModulesCore (2.2.3):
- DoubleConversion
- glog
- hermes-engine
@@ -1332,7 +1332,28 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context (5.2.0):
- react-native-pager-view (6.7.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context (5.3.0):
- React-Core
- react-native-track-player (4.1.1):
- React-Core
@@ -1652,7 +1673,7 @@ PODS:
- Yoga
- RNDeviceInfo (14.0.4):
- React-Core
- RNGestureHandler (2.23.0):
- RNGestureHandler (2.25.0):
- DoubleConversion
- glog
- hermes-engine
@@ -1694,7 +1715,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated (3.16.7):
- RNReanimated (3.17.3):
- DoubleConversion
- glog
- hermes-engine
@@ -1706,7 +1727,9 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
@@ -1714,10 +1737,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.16.7)
- RNReanimated/worklets (= 3.16.7)
- RNReanimated/reanimated (= 3.17.3)
- RNReanimated/worklets (= 3.17.3)
- Yoga
- RNReanimated/reanimated (3.16.7):
- RNReanimated/reanimated (3.17.3):
- DoubleConversion
- glog
- hermes-engine
@@ -1729,7 +1752,9 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
@@ -1737,9 +1762,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.16.7)
- RNReanimated/reanimated/apple (= 3.17.3)
- Yoga
- RNReanimated/reanimated/apple (3.16.7):
- RNReanimated/reanimated/apple (3.17.3):
- DoubleConversion
- glog
- hermes-engine
@@ -1751,7 +1776,9 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
@@ -1760,7 +1787,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated/worklets (3.16.7):
- RNReanimated/worklets (3.17.3):
- DoubleConversion
- glog
- hermes-engine
@@ -1772,7 +1799,33 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/worklets/apple (= 3.17.3)
- Yoga
- RNReanimated/worklets/apple (3.17.3):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
@@ -1781,7 +1834,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (4.6.0):
- RNScreens (4.10.0):
- DoubleConversion
- glog
- hermes-engine
@@ -1892,6 +1945,7 @@ DEPENDENCIES:
- react-native-blurhash (from `../node_modules/react-native-blurhash`)
- react-native-carplay (from `../node_modules/react-native-carplay`)
- react-native-mmkv (from `../node_modules/react-native-mmkv`)
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-track-player (from `../node_modules/react-native-track-player`)
- React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
@@ -2050,6 +2104,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-carplay"
react-native-mmkv:
:path: "../node_modules/react-native-mmkv"
react-native-pager-view:
:path: "../node_modules/react-native-pager-view"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
react-native-track-player:
@@ -2135,14 +2191,14 @@ SPEC CHECKSUMS:
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
Burnt: e3a3397e26172fca31a59bb27421475a58068836
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
EXConstants: e25c3f3ef5d1cf7a6ef911ebf7a3ab94d8d06d82
Expo: ad550eed41b5b0013d2a1b793fd33b6958a1b16f
ExpoAsset: 715ce37a36951fee71c32773b3be50f2285e2fbe
ExpoFileSystem: 5df53001901f76b493bd5deb75ac506871cc9b2e
ExpoFont: 38656978c2a4022fb7e0c43e4968d66340f5e2f3
EXConstants: fcfc75800824ac2d5c592b5bc74130bad17b146b
Expo: 75e002fc29a18a72aa3db967b41b29c2b206875d
ExpoAsset: 48386d40d53a8c1738929b3ed509bcad595b5516
ExpoFileSystem: 42d363d3b96f9afab980dcef60d5657a4443c655
ExpoFont: f354e926f8feae5e831ec8087f36652b44a0b188
ExpoImage: d840b256050f4428d2942bc2b6e9251f9e0d7021
ExpoKeepAwake: 62ff49bbc3bff90d8ee28329190f9ba371bf88e7
ExpoModulesCore: 14c66407085fc85e3dad83f8b47750fe5e8bba96
ExpoKeepAwake: b0171a73665bfcefcfcc311742a72a956e6aa680
ExpoModulesCore: 7cbb8499aa4f46aeefcf332922d4ab3d4b203fa8
fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
FBLazyVector: 2bc03a5cf64e29c611bbc5d7eb9d9f7431f37ee6
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
@@ -2186,7 +2242,8 @@ SPEC CHECKSUMS:
react-native-blurhash: bab22da783c13c6fa5004a56559c287f56f0c7a1
react-native-carplay: 8f388f6f73e5e0f73ed154ad8794371343ee20c0
react-native-mmkv: a6e08ad1b51b84af075f91798f8a92c878472265
react-native-safe-area-context: 3e33e7c43c8b74dba436a5a32651cb8d7064c740
react-native-pager-view: 635012e81cfcb8beefd569fff756abec9124a4cf
react-native-safe-area-context: fdb0a66feac038cb6eb1edafcf2ccee2b5cf0284
react-native-track-player: 6dc2e2633265704b8ab6d8124b80239d4ed1f911
React-nativeconfig: cd0fbb40987a9658c24dab5812c14e5522a64929
React-NativeModulesApple: 4a9c304aa4fb086af32e8758ba892386d895b4d3
@@ -2220,10 +2277,10 @@ SPEC CHECKSUMS:
ReactNativeFileAccess: 921d1223be7b739158410e6bc7199b4a9463a261
RNCMaskedView: 2a1adda250c1b71134fa097ae7fc56e0b41ca01e
RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047
RNGestureHandler: 720ec66534bee0cd17556f4c75e26ebaf7eeec53
RNGestureHandler: 92e89a04cd0d1c77f383a55d14c15e7f423f4c00
RNReactNativeHapticFeedback: f9cfb40676f21a52e9e172648d033f539156a5ec
RNReanimated: 9821995bd24f989b2618eac9510dc86c14d0a5df
RNScreens: 86e5c168cdd055a8feead28eb756ca7103918b6a
RNReanimated: 96899306ebcf78adc928eb4ff47809ca9ab050b5
RNScreens: cfb34cc4609bb92bd4fad6583be815075705a912
RNVectorIcons: f7a99433a71f4b38891c14c64b21fc521d064392
SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90

24
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "jellify",
"version": "0.10.98",
"version": "0.10.99",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "jellify",
"version": "0.10.98",
"version": "0.10.99",
"hasInstallScript": true,
"dependencies": {
"@jellyfin/sdk": "^0.11.0",
@@ -48,7 +48,7 @@
"react-native-haptic-feedback": "^2.3.3",
"react-native-mmkv": "^2.12.2",
"react-native-pager-view": "^6.7.0",
"react-native-reanimated": "^3.17.2",
"react-native-reanimated": "^3.17.4",
"react-native-safe-area-context": "^5.2.0",
"react-native-screens": "^4.6.0",
"react-native-swipeable-item": "^2.0.9",
@@ -18565,13 +18565,13 @@
}
},
"node_modules/react-native-is-edge-to-edge": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.1.6.tgz",
"integrity": "sha512-1pHnFTlBahins6UAajXUqeCOHew9l9C2C8tErnpGC3IyLJzvxD+TpYAixnCbrVS52f7+NvMttbiSI290XfwN0w==",
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.1.7.tgz",
"integrity": "sha512-EH6i7E8epJGIcu7KpfXYXiV2JFIYITtq+rVS8uEb+92naMRBdxhTuS8Wn2Q7j9sqyO0B+Xbaaf9VdipIAmGW4w==",
"license": "MIT",
"peerDependencies": {
"react": ">=18.2.0",
"react-native": ">=0.73.0"
"react": "*",
"react-native": "*"
}
},
"node_modules/react-native-mmkv": {
@@ -18595,9 +18595,9 @@
}
},
"node_modules/react-native-reanimated": {
"version": "3.17.2",
"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.17.2.tgz",
"integrity": "sha512-8z4o8/qZRM02oI3qzVh48417/AXDx+aKl95X8qn+vqQx+s7Z1sGI8GPah645vYDB/DrPDRkoJOp0tAhrJdXs9w==",
"version": "3.17.4",
"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.17.4.tgz",
"integrity": "sha512-vmkG/N5KZrexHr4v0rZB7ohPVseGVNaCXjGxoRo+NYKgC9+mIZAkg/QIfy9xxfJ73FfTrryO9iYUrxks3ZfKbA==",
"license": "MIT",
"dependencies": {
"@babel/plugin-transform-arrow-functions": "^7.0.0-0",
@@ -18611,7 +18611,7 @@
"@babel/preset-typescript": "^7.16.7",
"convert-source-map": "^2.0.0",
"invariant": "^2.2.4",
"react-native-is-edge-to-edge": "1.1.6"
"react-native-is-edge-to-edge": "1.1.7"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0",

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "jellify",
"version": "0.10.99",
"version": "0.10.100",
"private": true,
"scripts": {
"init": "npm i",
@@ -64,7 +64,7 @@
"react-native-haptic-feedback": "^2.3.3",
"react-native-mmkv": "^2.12.2",
"react-native-pager-view": "^6.7.0",
"react-native-reanimated": "^3.17.2",
"react-native-reanimated": "^3.17.4",
"react-native-safe-area-context": "^5.2.0",
"react-native-screens": "^4.6.0",
"react-native-swipeable-item": "^2.0.9",

2
player/config.ts
View File

@@ -1 +1 @@
export const UPDATE_INTERVAL: number = 7 // 8 milliseconds
export const UPDATE_INTERVAL: number = 50 // 8 milliseconds