Skip to content

Commit e30d40a

Browse files
committed
refactor: move getTracksByAlbum from albums to tracks directory
1 parent 463c85c commit e30d40a

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

android/src/main/java/com/musiclibrary/MusicLibraryModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import com.musiclibrary.utils.ReadableMapMapper.toAssetsOptions
99
import com.musiclibrary.utils.ModuleUtils.throwUnlessPermissionsGranted
1010
import com.musiclibrary.utils.ModuleUtils.withModuleScope
1111
import com.musiclibrary.tracks.GetTracks
12+
import com.musiclibrary.tracks.GetTracksByAlbum
1213
import com.musiclibrary.albums.GetAlbums
1314
import com.musiclibrary.artists.GetArtists
1415
import com.musiclibrary.genres.GetGenres
1516
import com.musiclibrary.tracks.GetTrackMetadataQuery
16-
import com.musiclibrary.albums.GetTracksByAlbum
1717

1818
@ReactModule(name = MusicLibraryModule.NAME)
1919
class MusicLibraryModule(reactContext: ReactApplicationContext) :

android/src/main/java/com/musiclibrary/artists/GetArtists.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ internal class GetArtists(
1818
promise.reject("QUERY_ERROR", "Failed to query artists: ${e.message}", e)
1919
}
2020
}
21-
}
21+
}

android/src/main/java/com/musiclibrary/albums/GetTracksByAlbum.kt renamed to android/src/main/java/com/musiclibrary/tracks/GetTracksByAlbum.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.musiclibrary.albums
1+
package com.musiclibrary.tracks
22

33
import android.content.Context
44
import com.facebook.react.bridge.Promise

android/src/main/java/com/musiclibrary/albums/GetTracksByAlbumQuery.kt renamed to android/src/main/java/com/musiclibrary/tracks/GetTracksByAlbumQuery.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.musiclibrary.albums
1+
package com.musiclibrary.tracks
22

33
import android.content.ContentResolver
44
import android.provider.MediaStore

src/NativeMusicLibrary.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,18 @@ export type AlbumResult = PaginatedResult<Album>;
227227
export type ArtistResult = PaginatedResult<Artist>;
228228
export type GenreResult = PaginatedResult<Genre>;
229229

230+
export interface ArtistWithAlbumsAndTracks {
231+
albums: Album[];
232+
tracks: Track[];
233+
}
234+
230235
export interface Spec extends TurboModule {
231236
getTracksAsync(options: InternalAssetsOptions): Promise<TrackResult>;
237+
getTrackMetadataAsync(trackId: string): Promise<TrackMetadata>;
232238
getAlbumsAsync(options: InternalAssetsOptions): Promise<AlbumResult>;
239+
getTracksByAlbumAsync(albumId: string): Promise<Track[]>;
233240
getArtistsAsync(options: InternalAssetsOptions): Promise<ArtistResult>;
234241
getGenresAsync(options: InternalAssetsOptions): Promise<GenreResult>;
235-
getTrackMetadataAsync(trackId: string): Promise<TrackMetadata>;
236-
getTracksByAlbumAsync(albumId: string): Promise<Track[]>;
237242
}
238243

239244
export default TurboModuleRegistry.getEnforcing<Spec>('MusicLibrary');

0 commit comments

Comments
 (0)