Remove dependency on Lyricist processor

common/ui/compose/build.gradle.kts

@@ -20,6 +20,7 @@ kotlin {
                 api(libs.circuit.foundation)
 
                 api(projects.common.ui.resources)
+                api(libs.lyricist.library)
 
                 implementation(compose.foundation)
                 implementation(compose.material)

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/EntryGrid.kt

@@ -51,7 +51,6 @@ import app.tivi.common.compose.ui.PlaceholderPosterCard
 import app.tivi.common.compose.ui.PosterCard
 import app.tivi.common.compose.ui.RefreshButton
 import app.tivi.common.compose.ui.plus
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.compoundmodels.EntryWithShow
 import app.tivi.data.models.Entry
 import com.moriatsushi.insetsx.systemBars

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/Strings.kt

@@ -0,0 +1,30 @@
+// Copyright 2023, Christopher Banes and the Tivi project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package app.tivi.common.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.compositionLocalOf
+import app.tivi.common.ui.resources.EnTiviStrings
+import app.tivi.common.ui.resources.Strings
+import app.tivi.common.ui.resources.TiviStrings
+import cafe.adriel.lyricist.LanguageTag
+import cafe.adriel.lyricist.Lyricist
+import cafe.adriel.lyricist.ProvideStrings
+import cafe.adriel.lyricist.rememberStrings
+
+val LocalStrings: ProvidableCompositionLocal<TiviStrings> = compositionLocalOf { EnTiviStrings }
+
+@Composable
+fun rememberStrings(
+    languageTag: LanguageTag = "en",
+): Lyricist<TiviStrings> = rememberStrings(Strings, languageTag)
+
+@Composable
+fun ProvideStrings(
+    lyricist: Lyricist<TiviStrings> = rememberStrings(),
+    content: @Composable () -> Unit,
+) {
+    ProvideStrings(lyricist, LocalStrings, content)
+}

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/Backdrop.kt

@@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.layout.ContentScale
 import app.tivi.common.compose.Layout
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 
 @Composable
 fun Backdrop(

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/DateTimeDialogs.kt

@@ -5,7 +5,7 @@ package app.tivi.common.compose.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/DateTimeTextFields.kt

@@ -23,8 +23,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.dp
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviDateFormatter
-import app.tivi.common.ui.resources.LocalStrings
 import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/PosterCard.kt

@@ -15,7 +15,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.data.imagemodels.asImageModel
 import app.tivi.data.models.ImageType
 import app.tivi.data.models.TiviShow

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/RefreshButton.kt

@@ -13,7 +13,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 
 @Composable
 fun RefreshButton(

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/SearchTextField.kt

@@ -18,7 +18,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.input.TextFieldValue
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/SortChip.kt

@@ -21,7 +21,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.data.models.SortOption
 
 @OptIn(ExperimentalMaterial3Api::class)

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/SortMenuPopup.kt

@@ -9,7 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.ui.resources.TiviStrings
 import app.tivi.data.models.SortOption
 

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/UserProfileButton.kt

@@ -14,7 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.data.models.TraktUser
 
 @Composable

common/ui/resources/build.gradle.kts

@@ -22,6 +22,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(libs.assertk)
+                implementation(libs.lyricist.library)
             }
         }
 

common/ui/strings/build.gradle.kts

@@ -2,27 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-import app.tivi.gradle.addKspDependencyForCommon
-
 plugins {
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.ksp)
 }
 
 kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(libs.lyricist.library)
-                api(compose.foundation)
+                api(libs.lyricist.core)
             }
         }
     }
 }
-
-ksp {
-    arg("lyricist.packageName", "app.tivi.common.ui.resources")
-}
-
-addKspDependencyForCommon(libs.lyricist.processor)

common/ui/strings/src/commonMain/kotlin/app/tivi/common/ui/resources/TiviStrings.kt

@@ -3,6 +3,14 @@
 
 package app.tivi.common.ui.resources
 
+val Strings: Map<String, TiviStrings> = mapOf(
+    "en" to EnTiviStrings,
+)
+
+object Locales {
+    const val EN = "en"
+}
+
 data class TiviStrings(
     val accountNameUnknown: String,
     val accountTitle: String,
@@ -157,8 +165,4 @@ data class TiviStrings(
     val watchedShowsTitle: String,
 )
 
-object Locales {
-    const val EN = "en"
-}
-
 expect fun String.fmt(vararg args: Any?): String

gradle/libs.versions.toml

@@ -107,8 +107,8 @@ ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
 
 leakCanary = "com.squareup.leakcanary:leakcanary-android:2.12"
 
+lyricist-core = { module = "cafe.adriel.lyricist:lyricist-core", version.ref = "lyricist" }
 lyricist-library = { module = "cafe.adriel.lyricist:lyricist", version.ref = "lyricist" }
-lyricist-processor = { module = "cafe.adriel.lyricist:lyricist-processor", version.ref = "lyricist" }
 
 multiplatformsettings-core = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformsettings" }
 multiplatformsettings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatformsettings" }

ui/account/src/commonMain/kotlin/app/tivi/account/AccountUi.kt

@@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.ui.AsyncImage
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.models.TraktUser
 import app.tivi.data.traktauth.TraktAuthState
 import app.tivi.overlays.LocalNavigator

ui/discover/src/commonMain/kotlin/app/tivi/home/discover/Discover.kt

@@ -53,6 +53,7 @@ import androidx.compose.ui.layout.FirstBaseline
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.ReportDrawnWhen
 import app.tivi.common.compose.bodyWidth
@@ -62,7 +63,6 @@ import app.tivi.common.compose.rememberTiviSnapFlingBehavior
 import app.tivi.common.compose.ui.AutoSizedCircularProgressIndicator
 import app.tivi.common.compose.ui.PosterCard
 import app.tivi.common.compose.ui.TiviRootScreenAppBar
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.compoundmodels.EntryWithShow
 import app.tivi.data.models.Episode
 import app.tivi.data.models.Season

ui/episode/details/src/commonMain/kotlin/app/tivi/episodedetails/EpisodeDetails.kt

@@ -64,6 +64,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviDateFormatter
 import app.tivi.common.compose.rememberCoroutineScope
 import app.tivi.common.compose.theme.TiviTheme
@@ -73,7 +74,6 @@ import app.tivi.common.compose.ui.Backdrop
 import app.tivi.common.compose.ui.ExpandingText
 import app.tivi.common.compose.ui.ScrimmedIconButton
 import app.tivi.common.compose.ui.none
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.imagemodels.asImageModel
 import app.tivi.data.models.Episode
 import app.tivi.data.models.EpisodeWatchEntry

ui/episode/track/src/commonMain/kotlin/app/tivi/episode/track/EpisodeTrack.kt

@@ -34,12 +34,12 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.ui.AsyncImage
 import app.tivi.common.compose.ui.DateTextField
 import app.tivi.common.compose.ui.LoadingButton
 import app.tivi.common.compose.ui.TimeTextField
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.imagemodels.asImageModel
 import app.tivi.data.models.Episode
 import app.tivi.data.models.Season

ui/library/src/commonMain/kotlin/app/tivi/home/library/Library.kt

@@ -63,6 +63,7 @@ import androidx.compose.ui.unit.dp
 import app.cash.paging.LoadStateLoading
 import app.cash.paging.compose.LazyPagingItems
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviDateFormatter
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.bodyWidth
@@ -77,7 +78,6 @@ import app.tivi.common.compose.ui.SearchTextField
 import app.tivi.common.compose.ui.SortChip
 import app.tivi.common.compose.ui.TiviRootScreenAppBar
 import app.tivi.common.compose.ui.plus
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.compoundmodels.LibraryShow
 import app.tivi.data.models.SortOption
 import app.tivi.data.models.TiviShow

ui/popular/src/commonMain/kotlin/app/tivi/home/popular/PopularShows.kt

@@ -6,7 +6,7 @@ package app.tivi.home.popular
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import app.tivi.common.compose.EntryGrid
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.screens.PopularShowsScreen
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Screen

ui/recommended/src/commonMain/kotlin/app/tivi/home/recommended/Recommended.kt

@@ -6,7 +6,7 @@ package app.tivi.home.recommended
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import app.tivi.common.compose.EntryGrid
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.screens.RecommendedShowsScreen
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Screen

ui/root/src/commonMain/kotlin/app/tivi/home/Home.kt

@@ -44,8 +44,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalWindowSizeClass
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.common.ui.resources.TiviStrings
 import app.tivi.screens.DiscoverScreen
 import app.tivi.screens.LibraryScreen

ui/root/src/commonMain/kotlin/app/tivi/home/TiviContent.kt

@@ -13,11 +13,11 @@ import androidx.compose.ui.Modifier
 import app.tivi.common.compose.LocalTiviDateFormatter
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.LocalWindowSizeClass
+import app.tivi.common.compose.ProvideStrings
 import app.tivi.common.compose.rememberCoroutineScope
 import app.tivi.common.compose.shouldUseDarkColors
 import app.tivi.common.compose.shouldUseDynamicColors
 import app.tivi.common.compose.theme.TiviTheme
-import app.tivi.common.ui.resources.ProvideStrings
 import app.tivi.core.analytics.Analytics
 import app.tivi.overlays.LocalNavigator
 import app.tivi.screens.TiviScreen

ui/search/src/commonMain/kotlin/app/tivi/home/search/Search.kt

@@ -44,13 +44,13 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.bodyWidth
 import app.tivi.common.compose.rememberTiviFlingBehavior
 import app.tivi.common.compose.ui.EmptyContent
 import app.tivi.common.compose.ui.PosterCard
 import app.tivi.common.compose.ui.SearchTextField
 import app.tivi.common.compose.ui.plus
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.models.TiviShow
 import app.tivi.screens.SearchScreen
 import com.moriatsushi.insetsx.statusBarsPadding

ui/settings/src/commonMain/kotlin/app/tivi/settings/Settings.kt

@@ -39,8 +39,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.itemSpacer
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.screens.SettingsScreen
 import com.moriatsushi.insetsx.systemBars
 import com.slack.circuit.runtime.CircuitContext

ui/show/details/src/commonMain/kotlin/app/tivi/showdetails/details/ShowDetails.kt

@@ -84,6 +84,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.max
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.bodyWidth
 import app.tivi.common.compose.gutterSpacer
@@ -95,7 +96,6 @@ import app.tivi.common.compose.ui.Backdrop
 import app.tivi.common.compose.ui.ExpandingText
 import app.tivi.common.compose.ui.PosterCard
 import app.tivi.common.compose.ui.RefreshButton
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.compoundmodels.EpisodeWithSeason
 import app.tivi.data.compoundmodels.RelatedShowEntryWithShow
 import app.tivi.data.compoundmodels.SeasonWithEpisodesAndWatches

ui/show/seasons/src/commonMain/kotlin/app/tivi/showdetails/seasons/ShowSeasons.kt

@@ -63,14 +63,14 @@ import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.lerp
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.bodyWidth
 import app.tivi.common.compose.rememberCoroutineScope
 import app.tivi.common.compose.rememberTiviDecayAnimationSpec
 import app.tivi.common.compose.rememberTiviFlingBehavior
 import app.tivi.common.compose.ui.RefreshButton
 import app.tivi.common.compose.ui.TopAppBarWithBottomContent
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.compoundmodels.EpisodeWithWatches
 import app.tivi.data.compoundmodels.SeasonWithEpisodesAndWatches
 import app.tivi.data.models.Episode

ui/trending/src/commonMain/kotlin/app/tivi/home/trending/Trending.kt

@@ -6,7 +6,7 @@ package app.tivi.home.trending
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import app.tivi.common.compose.EntryGrid
-import app.tivi.common.ui.resources.LocalStrings
+import app.tivi.common.compose.LocalStrings
 import app.tivi.screens.TrendingShowsScreen
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Screen

ui/upnext/src/commonMain/kotlin/app/tivi/home/upnext/UpNext.kt

@@ -59,6 +59,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import app.cash.paging.LoadStateLoading
 import app.tivi.common.compose.Layout
+import app.tivi.common.compose.LocalStrings
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.bodyWidth
 import app.tivi.common.compose.fullSpanItem
@@ -71,7 +72,6 @@ import app.tivi.common.compose.ui.EmptyContent
 import app.tivi.common.compose.ui.SortChip
 import app.tivi.common.compose.ui.TiviRootScreenAppBar
 import app.tivi.common.compose.ui.plus
-import app.tivi.common.ui.resources.LocalStrings
 import app.tivi.data.imagemodels.EpisodeImageModel
 import app.tivi.data.imagemodels.asImageModel
 import app.tivi.data.models.Episode