A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into jr/track-viewed
James Rose050db2cb7273
diff --cc core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.ktindex 412266034,aab3ea3d1..981de26f9--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt@@@ -68,12 -69,9 +70,11 @@@ fun LazyGridScope.newsFeedonClick = {analyticsHelper.logNewsResourceOpened(newsResourceId = userNewsResource.id,- newsResourceTitle = userNewsResource.title,)launchCustomChromeTab(context, resourceUrl, backgroundColor)+ onNewsResourceViewed(userNewsResource.id)},+ hasBeenViewed = userNewsResource.hasBeenViewed,onToggleBookmark = {onNewsResourcesCheckedChanged(userNewsResource.id,diff --cc core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex f74fb48ca,a09b2e94a..a6a7aafc9--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@@ -328,16 -297,19 +329,20 @@@ private fun ExpandedNewsResourcePreview@PreviewParameter(UserNewsResourcePreviewParameterProvider::class)userNewsResources: List<UserNewsResource>,) {- NiaTheme {- Surface {- NewsResourceCardExpanded(- userNewsResource = userNewsResources[0],- isBookmarked = true,- hasBeenViewed = false,- onToggleBookmark = {},- onClick = {},- onTopicClick = {},- )+ CompositionLocalProvider(+ LocalInspectionMode provides true,+ ) {+ NiaTheme {+ Surface {+ NewsResourceCardExpanded(+ userNewsResource = userNewsResources[0],+ isBookmarked = true,++ hasBeenViewed = false,+ onToggleBookmark = {},+ onClick = {},+ onTopicClick = {},+ )+ }}}}diff --cc feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktindex 84638c55e,376624376..18d24118b--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt@@@ -18,10 -18,13 +18,10 @@@ package com.google.samples.apps.nowinanimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope-import com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQueryimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository+import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository- import com.google.samples.apps.nowinandroid.core.data.util.SyncStatusMonitor+ import com.google.samples.apps.nowinandroid.core.data.util.SyncManagerimport com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCase-import com.google.samples.apps.nowinandroid.core.domain.GetUserNewsResourcesUseCase-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource-import com.google.samples.apps.nowinandroid.core.model.data.UserDataimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.Flow@@@ -35,9 -41,9 +35,9 @@@ import javax.inject.Injec@HiltViewModelclass ForYouViewModel @Inject constructor(- syncStatusMonitor: SyncStatusMonitor,+ syncManager: SyncManager,private val userDataRepository: UserDataRepository,- getUserNewsResources: GetUserNewsResourcesUseCase,+ userNewsResourceRepository: UserNewsResourceRepository,getFollowableTopics: GetFollowableTopicsUseCase,) : ViewModel() {@@@ -52,7 -58,7 +52,7 @@@)val feedState: StateFlow<NewsFeedUiState> =- userNewsResourceRepository.getUserNewsResourcesForFollowedTopics()- userDataRepository.getFollowedUserNewsResources(getUserNewsResources)++ userNewsResourceRepository.observeAllForFollowedTopics().map(NewsFeedUiState::Success).stateIn(scope = viewModelScope,diff --cc feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktindex 16c593aa0,db8178b89..62993dc9f--- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt+++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt@@@ -70,9 -70,9 +70,9 @@@ class ForYouViewModelTest@Beforefun setup() {viewModel = ForYouViewModel(- syncStatusMonitor = syncStatusMonitor,+ syncManager = syncManager,userDataRepository = userDataRepository,- getUserNewsResources = getUserNewsResourcesUseCase,+ userNewsResourceRepository = userNewsResourceRepository,getFollowableTopics = getFollowableTopicsUseCase,)}