A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove redundant statements
Miłosz Moczkowski5bf66739bd04
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.ktsindex 320d66647..48a6687e4 100644--- a/benchmarks/build.gradle.kts+++ b/benchmarks/build.gradle.kts@@ -13,7 +13,6 @@* See the License for the specific language governing permissions and* limitations under the License.*/-import com.android.build.api.dsl.ManagedVirtualDeviceimport com.google.samples.apps.nowinandroid.NiaBuildTypeimport com.google.samples.apps.nowinandroid.configureFlavorsdiff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.ktindex 3dfafd647..5abf7db4a 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt@@ -52,8 +52,6 @@ class BaselineProfileGenerator {// Navigate to saved screengoToBookmarksScreen()- // TODO: we need to implement adding stuff to bookmarks before able to scroll it- // bookmarksScrollFeedDownUp()// Navigate to interests screengoToInterestsScreen()diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.ktindex 3dce5b313..f66fa27a2 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.bookmarksimport androidx.benchmark.macro.MacrobenchmarkScopeimport androidx.test.uiautomator.Byimport androidx.test.uiautomator.Until-import com.google.samples.apps.nowinandroid.flingElementDownUpfun MacrobenchmarkScope.goToBookmarksScreen() {device.findObject(By.text("Saved")).click()@@ -29,8 +28,3 @@ fun MacrobenchmarkScope.goToBookmarksScreen() {val topAppBar = device.findObject(By.res("niaTopAppBar"))topAppBar.wait(Until.hasObject(By.text("Saved")), 2_000)}--fun MacrobenchmarkScope.bookmarksScrollFeedDownUp() {- val feedList = device.findObject(By.res("bookmarks:feed"))- device.flingElementDownUp(feedList)-}diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex 43edd53ec..976183aa4 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@ -16,20 +16,16 @@package com.google.samples.apps.nowinandroid-import com.android.build.api.dsl.ApplicationExtensionimport com.android.build.api.dsl.CommonExtensionimport org.gradle.api.JavaVersionimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtension-import org.gradle.api.plugins.ExtensionAwareimport org.gradle.api.plugins.JavaPluginExtensionimport org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByTypeimport org.gradle.kotlin.dsl.provideDelegateimport org.gradle.kotlin.dsl.withType-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptionsimport org.jetbrains.kotlin.gradle.tasks.KotlinCompile/**diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.ktindex dec592542..ef55024e2 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt@@ -4,7 +4,6 @@ import com.android.build.api.dsl.ApplicationExtensionimport com.android.build.api.dsl.ApplicationProductFlavorimport com.android.build.api.dsl.CommonExtensionimport com.android.build.api.dsl.ProductFlavor-import org.gradle.api.Project@Suppress("EnumEntryName")enum class FlavorDimension {@@ -17,10 +16,10 @@ enum class FlavorDimension {@Suppress("EnumEntryName")enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) {demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"),- prod(FlavorDimension.contentType, )+ prod(FlavorDimension.contentType)}-fun Project.configureFlavors(+fun configureFlavors(commonExtension: CommonExtension<*, *, *, *>,flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}) {@@ -33,7 +32,7 @@ fun Project.configureFlavors(flavorConfigurationBlock(this, it)if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {if (it.applicationIdSuffix != null) {- this.applicationIdSuffix = it.applicationIdSuffix+ applicationIdSuffix = it.applicationIdSuffix}}}diff --git a/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt b/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.ktindex 3e0650eed..97ae76b56 100644--- a/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt+++ b/core/analytics/src/main/java/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsEvent.kt@@ -34,7 +34,6 @@ data class AnalyticsEvent(class Types {companion object {const val SCREEN_VIEW = "screen_view" // (extras: SCREEN_NAME)- const val VIEW_SEARCH_RESULTS = "view_search_results" // (extras: SEARCH_TERM)}}@@ -54,7 +53,6 @@ data class AnalyticsEvent(class ParamKeys {companion object {const val SCREEN_NAME = "screen_name"- const val SEARCH_TERM = "search_term"}}}diff --git a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.ktindex 0ef9333c1..0ba625024 100644--- a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt+++ b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt@@ -36,9 +36,3 @@ data class NewsResourceFtsEntity(@ColumnInfo(name = "content")val content: String,)--fun NewsResourceEntity.asFtsEntity() = NewsResourceFtsEntity(- newsResourceId = id,- title = title,- content = content,-)diff --git a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktindex 6d585ebd4..6e2be2808 100644--- a/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt+++ b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt@@ -143,13 +143,13 @@ class NiaPreferencesDataSource @Inject constructor(}suspend fun setNewsResourcesViewed(newsResourceIds: List<String>, viewed: Boolean) {- userPreferences.updateData {- it.copy {- newsResourceIds.forEach {+ userPreferences.updateData { prefs ->+ prefs.copy {+ newsResourceIds.forEach { id ->if (viewed) {- viewedNewsResourceIds.put(it, true)+ viewedNewsResourceIds.put(id, true)} else {- viewedNewsResourceIds.remove(it)+ viewedNewsResourceIds.remove(id)}}}diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktindex 5646f088a..ac31fbcdb 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt@@ -18,19 +18,13 @@ package com.google.samples.apps.nowinandroid.core.designsystem.iconimport androidx.annotation.DrawableResimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.ArrowDropDown-import androidx.compose.material.icons.filled.ArrowDropUpimport androidx.compose.material.icons.filled.MoreVert-import androidx.compose.material.icons.outlined.AccountCircleimport androidx.compose.material.icons.rounded.Addimport androidx.compose.material.icons.rounded.ArrowBackimport androidx.compose.material.icons.rounded.Checkimport androidx.compose.material.icons.rounded.Close-import androidx.compose.material.icons.rounded.ExpandLess-import androidx.compose.material.icons.rounded.Fullscreenimport androidx.compose.material.icons.rounded.Grid3x3import androidx.compose.material.icons.rounded.Person-import androidx.compose.material.icons.rounded.PlayArrowimport androidx.compose.material.icons.rounded.Searchimport androidx.compose.material.icons.rounded.Settingsimport androidx.compose.material.icons.rounded.ShortText@@ -45,25 +39,19 @@ import com.google.samples.apps.nowinandroid.core.designsystem.R* Now in Android icons. Material icons are [ImageVector]s, custom icons are drawable resource IDs.*/object NiaIcons {- val AccountCircle = Icons.Outlined.AccountCircleval Add = Icons.Rounded.Addval ArrowBack = Icons.Rounded.ArrowBack- val ArrowDropDown = Icons.Default.ArrowDropDown- val ArrowDropUp = Icons.Default.ArrowDropUpval Bookmark = R.drawable.ic_bookmarkval BookmarkBorder = R.drawable.ic_bookmark_borderval Bookmarks = R.drawable.ic_bookmarksval BookmarksBorder = R.drawable.ic_bookmarks_borderval Check = Icons.Rounded.Checkval Close = Icons.Rounded.Close- val ExpandLess = Icons.Rounded.ExpandLess- val Fullscreen = Icons.Rounded.Fullscreenval Grid3x3 = Icons.Rounded.Grid3x3val MenuBook = R.drawable.ic_menu_bookval MenuBookBorder = R.drawable.ic_menu_book_borderval MoreVert = Icons.Default.MoreVertval Person = Icons.Rounded.Person- val PlayArrow = Icons.Rounded.PlayArrowval Search = Icons.Rounded.Searchval Settings = Icons.Rounded.Settingsval ShortText = Icons.Rounded.ShortTextdiff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.ktindex ec4fa76b7..103457b08 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt@@ -27,7 +27,6 @@ internal val Blue30 = Color(0xFF004D61)internal val Blue40 = Color(0xFF006780)internal val Blue80 = Color(0xFF5DD5FC)internal val Blue90 = Color(0xFFB8EAFF)-internal val Blue95 = Color(0xFFDDF4FF)internal val DarkGreen10 = Color(0xFF0D1F12)internal val DarkGreen20 = Color(0xFF223526)internal val DarkGreen30 = Color(0xFF394B3C)@@ -61,14 +60,12 @@ internal val Orange30 = Color(0xFF812800)internal val Orange40 = Color(0xFFA23F16)internal val Orange80 = Color(0xFFFFB59B)internal val Orange90 = Color(0xFFFFDBCF)-internal val Orange95 = Color(0xFFFFEDE8)internal val Purple10 = Color(0xFF36003C)internal val Purple20 = Color(0xFF560A5D)internal val Purple30 = Color(0xFF702776)internal val Purple40 = Color(0xFF8B418F)internal val Purple80 = Color(0xFFFFA9FE)internal val Purple90 = Color(0xFFFFD6FA)-internal val Purple95 = Color(0xFFFFEBFA)internal val PurpleGray30 = Color(0xFF4D444C)internal val PurpleGray50 = Color(0xFF7F747C)internal val PurpleGray60 = Color(0xFF998D96)diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.ktindex 66ac80868..9d1650c98 100644--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt@@ -112,22 +112,6 @@ class TestUserDataRepository : UserDataRepository {}}- /**- * A test-only API to allow setting/unsetting of bookmarks.- *- */- fun setNewsResourceBookmarks(newsResourceIds: Set<String>) {- currentUserData.let { current ->- _userData.tryEmit(current.copy(bookmarkedNewsResources = newsResourceIds))- }- }-- /**- * A test-only API to allow querying the current followed topics.- */- fun getCurrentFollowedTopics(): Set<String>? =- _userData.replayCache.firstOrNull()?.followedTopics-/*** A test-only API to allow setting of user data directly.*/diff --git 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.ktindex a6a7aafc9..46521a320 100644--- 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@@ -250,14 +250,6 @@ fun NewsResourceMetaData()}-@Composable-fun NewsResourceLink(- @Suppress("UNUSED_PARAMETER")- newsResource: NewsResource,-) {- TODO()-}-@Composablefun NewsResourceShortDescription(newsResourceShortDescription: String,diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.ktsindex 6cd5216d6..bd633e3d2 100644--- a/feature/foryou/build.gradle.kts+++ b/feature/foryou/build.gradle.kts@@ -14,8 +14,6 @@* limitations under the License.*/-import com.android.build.api.dsl.ManagedVirtualDevice-plugins {id("nowinandroid.android.feature")id("nowinandroid.android.library.compose")diff --git a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktindex b138cba06..38961a918 100644--- a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt+++ b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt@@ -112,7 +112,7 @@ class ForYouScreenTest {@Testfun topicSelector_whenNoTopicsSelected_showsTopicChipsAndDisabledDoneButton() {- val testData = followableTopicTestData.map { it -> it.copy(isFollowed = false) }+ val testData = followableTopicTestData.map { it.copy(isFollowed = false) }composeTestRule.setContent {BoxWithConstraints {diff --git 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.ktindex e99cfb74d..6a2ea4a02 100644--- 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@@ -30,7 +30,6 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsReimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.emptyUserDataimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule-import com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitorimport com.google.samples.apps.nowinandroid.core.testing.util.TestSyncManagerimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.LINKED_NEWS_RESOURCE_ID@@ -54,7 +53,6 @@ class ForYouViewModelTest {@get:Ruleval mainDispatcherRule = MainDispatcherRule()- private val networkMonitor = TestNetworkMonitor()private val syncManager = TestSyncManager()private val userDataRepository = TestUserDataRepository()private val topicsRepository = TestTopicsRepository()diff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.ktsindex 12b3074e4..5c4b0360a 100644--- a/feature/interests/build.gradle.kts+++ b/feature/interests/build.gradle.kts@@ -14,8 +14,6 @@* limitations under the License.*/-import com.android.build.api.dsl.ManagedVirtualDevice-plugins {id("nowinandroid.android.feature")id("nowinandroid.android.library.compose")diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.ktsindex 3229c350f..ef367d612 100644--- a/feature/settings/build.gradle.kts+++ b/feature/settings/build.gradle.kts@@ -14,8 +14,6 @@* limitations under the License.*/-import com.android.build.api.dsl.ManagedVirtualDevice-plugins {id("nowinandroid.android.feature")id("nowinandroid.android.library.compose")diff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.ktsindex 6bacd8343..ecb0630ce 100644--- a/feature/topic/build.gradle.kts+++ b/feature/topic/build.gradle.kts@@ -14,8 +14,6 @@* limitations under the License.*/-import com.android.build.api.dsl.ManagedVirtualDevice-plugins {id("nowinandroid.android.feature")id("nowinandroid.android.library.compose")diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktindex fd408f9cf..b987a2752 100644--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt@@ -59,7 +59,6 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJankimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItemsimport com.google.samples.apps.nowinandroid.feature.topic.R.string-import com.google.samples.apps.nowinandroid.feature.topic.TopicUiState.Loading@Composableinternal fun TopicRoute(@@ -107,7 +106,7 @@ internal fun TopicScreen(Spacer(Modifier.windowInsetsTopHeight(WindowInsets.safeDrawing))}when (topicUiState) {- Loading -> item {+ TopicUiState.Loading -> item {NiaLoadingWheel(modifier = modifier,contentDesc = stringResource(id = string.topic_loading),