A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into kotlinify
Don Turner9d41ffa31856
diff --cc feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktindex aa8237da4,81fa114e2..a62b2c5d1--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt@@@ -22,10 -22,10 +22,10 @@@ import androidx.navigation.NavOptionimport androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute- const val bookmarksRoute = "bookmarks_route"+ const val BOOKMARKS_ROUTE = "bookmarks_route"-fun NavController.navigateToBookmarks(navOptions: NavOptions? = null) {+fun NavController.navigateToBookmarks(navOptions: NavOptions) {- this.navigate(bookmarksRoute, navOptions)+ this.navigate(BOOKMARKS_ROUTE, navOptions)}fun NavGraphBuilder.bookmarksScreen(diff --cc feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktindex ca606161d,154b0f83b..efbe67859--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt@@@ -30,8 -30,8 +30,8 @@@ const val FOR_YOU_ROUTE = "for_you_routprivate const val DEEP_LINK_URI_PATTERN ="https://www.nowinandroid.apps.samples.google.com/foryou/{$LINKED_NEWS_RESOURCE_ID}"-fun NavController.navigateToForYou(navOptions: NavOptions? = null) {+fun NavController.navigateToForYou(navOptions: NavOptions) {- this.navigate(forYouNavigationRoute, navOptions)+ this.navigate(FOR_YOU_ROUTE, navOptions)}fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {diff --cc feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktindex 3bc0ad770,831247e27..d6ebaeeb7--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt@@@ -24,9 -24,9 +24,9 @@@ import androidx.navigation.navigatioimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteprivate const val INTERESTS_GRAPH_ROUTE_PATTERN = "interests_graph"- const val interestsRoute = "interests_route"+ const val INTERESTS_ROUTE = "interests_route"-fun NavController.navigateToInterestsGraph(navOptions: NavOptions? = null) {+fun NavController.navigateToInterestsGraph(navOptions: NavOptions) {this.navigate(INTERESTS_GRAPH_ROUTE_PATTERN, navOptions)}