update download settings to use new library version

Update CI dependencies (jellyfin#1332) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update eps1lon/actions-label-merge-conflict action to v3 (jellyfin#1336) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency org.chromium.net:cronet-embedded to v119 (jellyfin#1335) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency org.jellyfin.sdk:jellyfin-core to v1.4.7 (jellyfin#1333) * Update dependency org.jellyfin.sdk:jellyfin-core to v1.4.7 * 🐛 Fix build error due to new enum --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Maxr1998 <[email protected]> Update dependency de.maxr1998:modernandroidpreferences to v2.4.0-beta2 Update Kotlin (jellyfin#1254) * Update Kotlin * Update dependency androidx.compose.compiler:compiler to v1.5.11 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update compose to v1.6.5 (jellyfin#1320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency androidx.compose.foundation:foundation to v1.6.5 (jellyfin#1322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update compose.material to v1.6.5 (jellyfin#1321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency androidx.mediarouter:mediarouter to v1.7.0 (jellyfin#1328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency androidx.webkit:webkit to v1.10.0 (jellyfin#1338) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency androidx.activity:activity-ktx to v1.8.2 Update koin to v3.5.4 Update dependency io.coil-kt:coil-base to v2.6.0 Update gradle/gradle-build-action action to v3.2.1 Update dependency com.google.android.material:material to v1.11.0
taitsmith · Apr 9, 2024 · f055712 · f055712
1 parent 7fb0a86
commit f055712
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 37 deletions.
diff --git a/.github/workflows/app-build.yaml b/.github/workflows/app-build.yaml
@@ -22,7 +22,7 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3.2.1
       - name: Assemble debug APKs
         run: ./gradlew assembleDebug
       - name: Create publish bundle

diff --git a/.github/workflows/app-lint.yaml b/.github/workflows/app-lint.yaml
@@ -28,11 +28,11 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3.2.1
       - name: Run ${{ matrix.task }} task
         run: ./gradlew ${{ matrix.task }}
       - name: Upload SARIF files
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         if: ${{ always() }}
         with:
           sarif_file: .
diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
@@ -19,7 +19,7 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3.2.1
       - name: Set JELLYFIN_VERSION
         run: echo "JELLYFIN_VERSION=$(echo ${GITHUB_REF#refs/tags/v} | tr / -)" >> $GITHUB_ENV
       - name: Assemble release files

diff --git a/.github/workflows/app-test.yaml b/.github/workflows/app-test.yaml
@@ -23,6 +23,6 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3.2.1
       - name: Run test task
         run: ./gradlew test
diff --git a/.github/workflows/repo-merge-conflict.yaml b/.github/workflows/repo-merge-conflict.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
+      - uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
         with:
           dirtyLabel: merge conflict
           repoToken: ${{ secrets.JF_BOT_TOKEN }}
diff --git a/app/src/main/java/org/jellyfin/mobile/player/source/JellyfinMediaSource.kt b/app/src/main/java/org/jellyfin/mobile/player/source/JellyfinMediaSource.kt
@@ -100,8 +100,9 @@ class JellyfinMediaSource(
                         }
                     }
                 }
-                MediaStreamType.DATA,
                 MediaStreamType.EMBEDDED_IMAGE,
+                MediaStreamType.DATA,
+                MediaStreamType.LYRIC,
                 -> Unit // ignore
             }
         }

diff --git a/app/src/main/java/org/jellyfin/mobile/settings/SettingsFragment.kt b/app/src/main/java/org/jellyfin/mobile/settings/SettingsFragment.kt
@@ -196,34 +196,28 @@ class SettingsFragment : Fragment(), BackPressInterceptor {
 
         val downloadMethods = listOf(
             SelectionItem(
-                "wifi_only",
+                DownloadMethod.WIFI_ONLY,
                 R.string.wifi_only,
                 R.string.wifi_only_summary,
             ),
             SelectionItem(
-                "mobile_data",
+                DownloadMethod.MOBILE_DATA,
                 R.string.mobile_data,
                 R.string.mobile_data_summary,
             ),
             SelectionItem(
-                "mobile_and_roaming",
+                DownloadMethod.MOBILE_AND_ROAMING,
                 R.string.mobile_data_and_roaming,
                 R.string.mobile_data_and_roaming_summary,
             ),
         )
-        singleChoice("download_method", downloadMethods) {
-            titleRes = R.string.network_title
 
-            defaultOnSelectionChange {
-                appPreferences.downloadMethod = when (it) {
-                    "wifi_only" -> DownloadMethod.WIFI_ONLY
-                    "mobile_data" -> DownloadMethod.MOBILE_DATA
-                    else -> DownloadMethod.MOBILE_AND_ROAMING
-                }
-            }
+        singleChoice(Constants.PREF_DOWNLOAD_METHOD, downloadMethods) {
+            titleRes = R.string.network_title
+            initialSelection = appPreferences.downloadMethod
         }
 
-        val downloadsDirs: List<SelectionItem> = requireContext().getDownloadsPaths().map { path ->
+        val downloadsDirs = requireContext().getDownloadsPaths().map { path ->
             SelectionItem(path, path, null)
         }
         singleChoice(Constants.PREF_DOWNLOAD_LOCATION, downloadsDirs) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
 # Plugins
 android-plugin = "8.3.1"
-kotlin = "1.9.21"
-kotlin-ksp = "1.9.21-1.0.15"
+kotlin = "1.9.23"
+kotlin-ksp = "1.9.23-1.0.20"
 detekt = "1.22.0"
 android-junit5 = "1.10.0.0"
 
 # KotlinX
-coroutines = "1.7.3"
+coroutines = "1.8.0"
 
 # Core
-koin = "3.5.0"
-koin-compose = "3.5.0"
+koin = "3.5.4"
+koin-compose = "3.5.4"
 androidx-core = "1.12.0"
 androidx-core-splashscreen = "1.0.1"
 androidx-appcompat = "1.6.1"
-androidx-activity = "1.8.1"
+androidx-activity = "1.8.2"
 androidx-fragment = "1.6.2"
 androiddesugarlibs = "2.0.4"
 
@@ -24,25 +24,25 @@ androidx-lifecycle = "2.7.0"
 
 # UI
 androidx-constraintlayout = "2.1.4"
-google-material = "1.10.0"
-androidx-webkit = "1.9.0"
-modernandroidpreferences = "2.3.2"
+google-material = "1.11.0"
+androidx-webkit = "1.10.0"
+modernandroidpreferences = "2.4.0-beta2"
 
 # Compose
-compose = "1.5.4"
-compose-foundation = "1.5.4"
-compose-material = "1.5.4"
-compose-compiler = "1.5.6"
+compose = "1.6.5"
+compose-foundation = "1.6.5"
+compose-material = "1.6.5"
+compose-compiler = "1.5.11"
 
 # Network
-jellyfin-sdk = "1.4.6"
+jellyfin-sdk = "1.4.7"
 okhttp = "4.12.0"
-coil = "2.5.0"
-cronet-embedded = "113.5672.61"
+coil = "2.6.0"
+cronet-embedded = "119.6045.31"
 
 # Media
 androidx-media = "1.7.0"
-androidx-mediarouter = "1.6.0"
+androidx-mediarouter = "1.7.0"
 exoplayer = "2.19.1"
 jellyfin-exoplayer-ffmpegextension = "2.19.1+1"
 playservices = "21.4.0"