Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: "support/scripts/unit-test"

- name: "Unit Test Results"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/continuous_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: "support/scripts/unit-test"

- name: "Unit Test Results"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand All @@ -61,7 +61,7 @@ jobs:
CONFIGURATION: Release

- name: "Upload App Bundle"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: app-bundle
path: |
Expand Down
7 changes: 6 additions & 1 deletion .idea/detekt.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {
id("com.google.firebase.crashlytics")
id("com.google.devtools.ksp")
alias(libs.plugins.compose.compiler)
alias(libs.plugins.detekt)
}

android {
Expand Down Expand Up @@ -268,6 +269,10 @@ android {
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.androidx.hilt.work)
ksp(libs.androidx.hilt.compiler)

detektPlugins(libs.detekt.formatting)

lintChecks(libs.compose.lint.checks)
}

buildFeatures.buildConfig = true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.simplecityapps.shuttle.ui.screens.library.genres

import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.simplecityapps.shuttle.R
import com.simplecityapps.shuttle.model.Genre
import com.simplecityapps.shuttle.model.Playlist
import com.simplecityapps.shuttle.ui.screens.playlistmenu.PlaylistData

@Composable
fun AddToPlaylistSubmenu(
modifier: Modifier = Modifier,
genre: Genre,
expanded: Boolean = false,
onDismiss: () -> Unit = {},
playlists: List<Playlist>,
onAddToPlaylist: (playlist: Playlist, playlistData: PlaylistData) -> Unit,
onShowCreatePlaylistDialog: (genre: Genre) -> Unit
) {
val playlistData = PlaylistData.Genres(genre)

DropdownMenu(
modifier = modifier,
expanded = expanded,
onDismissRequest = onDismiss
) {
DropdownMenuItem(
text = { Text(stringResource(id = R.string.playlist_menu_create_playlist)) },
onClick = {
onShowCreatePlaylistDialog(genre)
onDismiss()
}
)

for (playlist in playlists) {
DropdownMenuItem(
text = { Text(playlist.name) },
onClick = {
onAddToPlaylist(playlist, playlistData)
onDismiss()
}
)
}
}
}
Loading