diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt index 8c44d610e..17e9835bc 100644 --- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt +++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt @@ -18,13 +18,11 @@ package com.google.samples.apps.nowinandroid.navigation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraph -import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsGraph import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen @@ -56,7 +54,7 @@ fun NiaNavHost( searchScreen( onBackClick = navController::popBackStack, onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) }, - onTopicClick = {} + onTopicClick = {}, ) interestsGraph( onTopicClick = { topicId -> diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt index b546a7286..cbcbae3f1 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt @@ -133,4 +133,4 @@ object PreviewParameterData { userData = userData, ), ) -} \ No newline at end of file +} diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt index a45399626..55cbc75b3 100644 --- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt +++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt @@ -35,7 +35,7 @@ fun TopicsTabContent( onTopicClick: (String) -> Unit, onFollowButtonClick: (String, Boolean) -> Unit, modifier: Modifier = Modifier, - withBottomSpacer: Boolean = true + withBottomSpacer: Boolean = true, ) { LazyColumn( modifier = modifier diff --git a/feature/search/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt b/feature/search/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt index 685562079..9834418d9 100644 --- a/feature/search/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt +++ b/feature/search/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt @@ -93,7 +93,7 @@ class SearchScreenTest { fun emptySearchResult_emptyScreenIsDisplayed() { composeTestRule.setContent { SearchScreen( - uiState = SearchResultUiState.Success() + uiState = SearchResultUiState.Success(), ) } @@ -135,11 +135,14 @@ class SearchScreenTest { fun searchResultWithNewsResources_firstNewsResourcesIsVisible() { composeTestRule.setContent { SearchScreen( - uiState = SearchResultUiState.Success(newsResources = newsResourcesTestData.map { - UserNewsResource( - newsResource = it, - userData = userData) - }), + uiState = SearchResultUiState.Success( + newsResources = newsResourcesTestData.map { + UserNewsResource( + newsResource = it, + userData = userData, + ) + }, + ), ) } diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt index e3343b726..dddd3c4b2 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt @@ -1,17 +1,17 @@ /* * Copyright 2023 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.google.samples.apps.nowinandroid.feature.search @@ -28,4 +28,4 @@ sealed interface SearchResultUiState { ) : SearchResultUiState { fun isEmpty(): Boolean = topics.isEmpty() && newsResources.isEmpty() } -} \ No newline at end of file +} diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt index 4860d6b92..355e0a2b5 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt @@ -95,7 +95,7 @@ internal fun SearchRoute( onInterestsClick = onInterestsClick, onSearchQueryChanged = searchViewModel::onSearchQueryChanged, onTopicClick = onTopicClick, - onNewsResourcesCheckedChanged = forYouViewModel::updateNewsResourceSaved + onNewsResourcesCheckedChanged = forYouViewModel::updateNewsResourceSaved, ) } @@ -103,9 +103,9 @@ internal fun SearchRoute( internal fun SearchScreen( modifier: Modifier = Modifier, onBackClick: () -> Unit = {}, - onFollowButtonClick: (String, Boolean) -> Unit = {_, _ -> }, + onFollowButtonClick: (String, Boolean) -> Unit = { _, _ -> }, onInterestsClick: () -> Unit = {}, - onNewsResourcesCheckedChanged: (String, Boolean) -> Unit = {_, _ -> }, + onNewsResourcesCheckedChanged: (String, Boolean) -> Unit = { _, _ -> }, onSearchQueryChanged: (String) -> Unit = {}, onTopicClick: (String) -> Unit = {}, uiState: SearchResultUiState = SearchResultUiState.Loading, @@ -192,7 +192,6 @@ fun EmptySearchResultBody( onInterestsClick() } } - } } @@ -201,8 +200,8 @@ private fun SearchResultBody( topics: List, newsResources: List, onFollowButtonClick: (String, Boolean) -> Unit, - onNewsResourcesCheckedChanged: (String, Boolean) -> Unit = {_, _ -> }, - onTopicClick: (String) -> Unit = {} + onNewsResourcesCheckedChanged: (String, Boolean) -> Unit = { _, _ -> }, + onTopicClick: (String) -> Unit = {}, ) { if (topics.isNotEmpty()) { Text( @@ -217,7 +216,7 @@ private fun SearchResultBody( topics = topics, onTopicClick = onTopicClick, onFollowButtonClick = onFollowButtonClick, - withBottomSpacer = false + withBottomSpacer = false, ) } @@ -246,7 +245,7 @@ private fun SearchResultBody( newsFeed( feedState = NewsFeedUiState.Success(feed = newsResources), onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged, - onTopicClick = onTopicClick + onTopicClick = onTopicClick, ) } } @@ -347,7 +346,7 @@ private fun EmptySearchResultColumnPreview() { @DevicePreviews @Composable private fun SearchScreenPreview( - @PreviewParameter(SearchResultUiStatePreviewParameterProvider::class) + @PreviewParameter(SearchUiStatePreviewParameterProvider::class) searchResultUiState: SearchResultUiState, ) { NiaTheme { diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt index 044428e07..06dac9bb2 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt @@ -26,11 +26,13 @@ import com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.topics * This [PreviewParameterProvider](https://developer.android.com/reference/kotlin/androidx/compose/ui/tooling/preview/PreviewParameterProvider) * provides list of [SearchResultUiState] for Composable previews. */ -class SearchResultUiStatePreviewParameterProvider : PreviewParameterProvider { - override val values: Sequence = sequenceOf(SearchResultUiState.Success( - topics = topics.mapIndexed { i, topic -> - FollowableTopic(topic = topic, isFollowed = i % 2 == 0) - }, - newsResources = newsResources, - )) -} \ No newline at end of file +class SearchUiStatePreviewParameterProvider : PreviewParameterProvider { + override val values: Sequence = sequenceOf( + SearchResultUiState.Success( + topics = topics.mapIndexed { i, topic -> + FollowableTopic(topic = topic, isFollowed = i % 2 == 0) + }, + newsResources = newsResources, + ), + ) +} diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt index 79e504852..dafe45cc0 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt @@ -31,7 +31,7 @@ fun NavController.navigateToSearch(navOptions: NavOptions? = null) { fun NavGraphBuilder.searchScreen( onBackClick: () -> Unit, onInterestsClick: () -> Unit, - onTopicClick: (String) -> Unit = {} + onTopicClick: (String) -> Unit = {}, ) { // TODO: Handle back stack for each top-level destination. At the moment each top-level // destination may have own search screen's back stack. @@ -39,7 +39,7 @@ fun NavGraphBuilder.searchScreen( SearchRoute( onBackClick = onBackClick, onInterestsClick = onInterestsClick, - onTopicClick = onTopicClick + onTopicClick = onTopicClick, ) } }