Add marqueeWithFadedEdges, move marquee.kt and linkify.kt and t…

…o `:compose-utils`. Move `designsystem` and `common-ui` to `foundation`.
ReactiveCircus · Jan 7, 2024 · 873d885 · 873d885
1 parent fadf590
commit 873d885
Show file tree

Hide file tree

Showing 55 changed files with 358 additions and 202 deletions.
diff --git a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt
@@ -24,10 +24,10 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import dagger.hilt.android.AndroidEntryPoint
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
 import io.github.reactivecircus.kstreamlined.android.feature.contentviewer.ContentViewerScreen
 import io.github.reactivecircus.kstreamlined.android.feature.kotlinweeklyissue.KotlinWeeklyIssueScreen
 import io.github.reactivecircus.kstreamlined.android.feature.talkingkotlinepisode.TalkingKotlinEpisodeScreen
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import kotlinx.parcelize.Parcelize
 

diff --git a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/MainScreen.kt b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/MainScreen.kt
@@ -21,14 +21,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.lerp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.NavigationIsland
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.NavigationIslandDivider
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.NavigationIslandItem
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.Bookmarks
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.Kotlin
 import io.github.reactivecircus.kstreamlined.android.feature.home.HomeScreen
 import io.github.reactivecircus.kstreamlined.android.feature.savedforlater.SavedForLaterScreen
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.NavigationIsland
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.NavigationIslandDivider
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.NavigationIslandItem
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.Bookmarks
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.Kotlin
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import kotlin.math.absoluteValue
 

diff --git a/android/feature/common/build.gradle.kts b/android/feature/common/build.gradle.kts
@@ -21,7 +21,7 @@ androidComponents {
 }
 
 dependencies {
-    api(project(":designsystem"))
+    api(project(":foundation:designsystem"))
 
     // AndroidX
     api(libs.androidx.core)

diff --git a/...o/github/reactivecircus/kstreamlined/android/feature/contentviewer/ContentViewerScreen.kt b/...o/github/reactivecircus/kstreamlined/android/feature/contentviewer/ContentViewerScreen.kt
@@ -26,14 +26,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.FilledIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.LargeIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.LinearProgressIndicator
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.TopNavBar
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.BookmarkAdd
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.BookmarkFill
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.FilledIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.LargeIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.LinearProgressIndicator
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.TopNavBar
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.BookmarkAdd
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.BookmarkFill
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
 
 @Composable
 public fun ContentViewerScreen(

diff --git a/android/feature/home/build.gradle.kts b/android/feature/home/build.gradle.kts
@@ -12,7 +12,7 @@ android {
 
 dependencies {
     implementation(project(":feature:common"))
-    implementation(project(":common-ui:feed"))
+    implementation(project(":foundation:common-ui:feed"))
     implementation(project(":kmp:data"))
     implementation(project(":kmp:presentation:home"))
 }
diff --git a/...me/src/main/java/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreen.kt b/...me/src/main/java/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreen.kt
@@ -35,19 +35,19 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinBlogCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinWeeklyCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinYouTubeCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.TalkingKotlinCard
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Button
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.FilledIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.TopNavBar
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.android.feature.home.component.FeedFilterChip
 import io.github.reactivecircus.kstreamlined.android.feature.home.component.SyncButton
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinBlogCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinWeeklyCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinYouTubeCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.TalkingKotlinCard
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Button
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.FilledIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.TopNavBar
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
 import io.github.reactivecircus.kstreamlined.kmp.presentation.home.FakeHomeFeedItems

diff --git a/...va/io/github/reactivecircus/kstreamlined/android/feature/home/component/FeedFilterChip.kt b/...va/io/github/reactivecircus/kstreamlined/android/feature/home/component/FeedFilterChip.kt
@@ -8,13 +8,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Chip
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Icon
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.android.feature.home.R
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Chip
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Icon
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
 
 @Composable
 internal fun FeedFilterChip(

diff --git a/...n/java/io/github/reactivecircus/kstreamlined/android/feature/home/component/SyncButton.kt b/...n/java/io/github/reactivecircus/kstreamlined/android/feature/home/component/SyncButton.kt
@@ -19,14 +19,14 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Chip
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Icon
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.Sync
 import io.github.reactivecircus.kstreamlined.android.feature.home.R
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Chip
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Icon
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.Sync
 
 @Composable
 internal fun SyncButton(

diff --git a/.../reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/KotlinWeeklyIssueScreen.kt b/.../reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/KotlinWeeklyIssueScreen.kt
@@ -37,20 +37,20 @@ import androidx.compose.ui.zIndex
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil3.compose.AsyncImage
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Button
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.FilledIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.LargeIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.TopNavBar
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.BookmarkAdd
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.BookmarkFill
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.android.feature.common.openCustomTab
 import io.github.reactivecircus.kstreamlined.android.feature.common.openShareSheet
 import io.github.reactivecircus.kstreamlined.android.feature.kotlinweeklyissue.component.IssueGroupUi
 import io.github.reactivecircus.kstreamlined.android.feature.kotlinweeklyissue.component.IssueItemUi
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Button
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.FilledIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.LargeIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.TopNavBar
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.BookmarkAdd
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.BookmarkFill
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.KotlinWeeklyIssueItem
 import io.github.reactivecircus.kstreamlined.kmp.presentation.kotlinweeklyissue.KotlinWeeklyIssueUiState
 import io.github.reactivecircus.kstreamlined.android.feature.common.R as CommonR

diff --git a/...b/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/component/IssueGroupUi.kt b/...b/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/component/IssueGroupUi.kt
@@ -15,9 +15,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.KotlinWeeklyIssueItem
 
 @Composable

diff --git a/...ub/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/component/IssueItemUi.kt b/...ub/reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/component/IssueItemUi.kt
@@ -9,9 +9,9 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Surface
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Surface
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.KotlinWeeklyIssueItem
 
 @Composable

diff --git a/android/feature/saved-for-later/build.gradle.kts b/android/feature/saved-for-later/build.gradle.kts
@@ -12,7 +12,7 @@ android {
 
 dependencies {
     implementation(project(":feature:common"))
-    implementation(project(":common-ui:feed"))
+    implementation(project(":foundation:common-ui:feed"))
     implementation(project(":kmp:data"))
     implementation(project(":kmp:presentation:saved-for-later"))
 }
diff --git a/...o/github/reactivecircus/kstreamlined/android/feature/savedforlater/SavedForLaterScreen.kt b/...o/github/reactivecircus/kstreamlined/android/feature/savedforlater/SavedForLaterScreen.kt
@@ -24,15 +24,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinBlogCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinWeeklyCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.KotlinYouTubeCard
-import io.github.reactivecircus.kstreamlined.android.common.ui.feed.TalkingKotlinCard
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.FilledIconButton
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.Text
-import io.github.reactivecircus.kstreamlined.android.designsystem.component.TopNavBar
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.KSTheme
-import io.github.reactivecircus.kstreamlined.android.designsystem.foundation.icon.KSIcons
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinBlogCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinWeeklyCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.KotlinYouTubeCard
+import io.github.reactivecircus.kstreamlined.android.foundation.commonui.feed.TalkingKotlinCard
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.FilledIconButton
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.Text
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.component.TopNavBar
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.KSTheme
+import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.foundation.icon.KSIcons
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.toDisplayable
 import kotlinx.datetime.toInstant

diff --git a/android/feature/talking-kotlin-episode/build.gradle.kts b/android/feature/talking-kotlin-episode/build.gradle.kts
@@ -13,6 +13,7 @@ android {
 
 dependencies {
     implementation(project(":feature:common"))
+    implementation(project(":foundation:compose-utils"))
     implementation(project(":kmp:data"))
     implementation(project(":kmp:presentation:talking-kotlin-episode"))