From 94b14e7279fe4c3eb979f3ffbf4e3a88e3a28a1b Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 12 Mar 2024 15:45:15 -0700 Subject: [PATCH] spotlessApply --- .../apps/nowinandroid/core/database/dao/NewsResourceDao.kt | 2 +- .../core/database/dao/NewsResourceDaoInterface.kt | 4 ++-- .../apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt | 2 +- .../nowinandroid/core/database/dao/RecentSearchQueryDao.kt | 2 +- .../samples/apps/nowinandroid/core/database/dao/TopicDao.kt | 2 +- .../apps/nowinandroid/core/database/dao/TopicFtsDao.kt | 2 +- .../core/designsystem/TopAppBarScreenshotTests.kt | 1 - .../nowinandroid/core/designsystem/component/Background.kt | 4 ++-- .../apps/nowinandroid/core/designsystem/component/Chip.kt | 2 -- .../core/designsystem/component/DynamicAsyncImage.kt | 2 +- .../apps/nowinandroid/core/designsystem/theme/Theme.kt | 4 ++-- .../nowinandroid/core/testing/di/TestDispatchersModule.kt | 1 - 12 files changed, 12 insertions(+), 16 deletions(-) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt index ff16b11cc..164cd908d 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt @@ -30,7 +30,7 @@ import kotlinx.datetime.Instant /** * DAO for [NewsResource] and [NewsResourceEntity] access */ -class NewsResourceDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher): NewsResourceDaoInterface { +class NewsResourceDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher) : NewsResourceDaoInterface { private val query = db.newsResourceQueries /** diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoInterface.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoInterface.kt index 1dbff1ad0..6951900d3 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoInterface.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoInterface.kt @@ -26,14 +26,14 @@ interface NewsResourceDaoInterface { useFilterTopicIds: Boolean = false, filterTopicIds: Set = emptySet(), useFilterNewsIds: Boolean = false, - filterNewsIds: Set = emptySet() + filterNewsIds: Set = emptySet(), ): Flow> fun getNewsResourceIds( useFilterTopicIds: Boolean = false, filterTopicIds: Set = emptySet(), useFilterNewsIds: Boolean = false, - filterNewsIds: Set = emptySet() + filterNewsIds: Set = emptySet(), ): Flow> suspend fun insertOrIgnoreNewsResources(entities: List): List diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt index 752fa637f..9b6b5e5ca 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceFtsDao.kt @@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.map /** * DAO for [NewsResourceFtsEntity] access. */ -class NewsResourceFtsDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher): NewsResourceFtsDaoInterface { +class NewsResourceFtsDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher) : NewsResourceFtsDaoInterface { private val dbQuery = db.newsResourceFtsQueries override suspend fun insertAll(newsResources: List) { newsResources.forEach { diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt index 692095d9b..b1b005a2c 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt @@ -28,7 +28,7 @@ import kotlinx.datetime.Instant /** * DAO for [RecentSearchQueryEntity] access */ -class RecentSearchQueryDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher): RecentSearchQueryDaoInterface { +class RecentSearchQueryDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher) : RecentSearchQueryDaoInterface { private val query = db.recentSearchQueryQueries diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt index c794fff7c..24b946b3e 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt @@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.map * DAO for [TopicEntity] access */ -class TopicDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher): TopicDaoInterface { +class TopicDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher) : TopicDaoInterface { private val query = db.topicsQueries diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicFtsDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicFtsDao.kt index 5165815cd..de96556a0 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicFtsDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/TopicFtsDao.kt @@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.map /** * DAO for [TopicFtsEntity] access. */ -class TopicFtsDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher): TopicFtsDaoInterface { +class TopicFtsDao(db: NiaDatabase, private val dispatcher: CoroutineDispatcher) : TopicFtsDaoInterface { private val dbQuery = db.topicFtsQueries diff --git a/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt index a016f911b..1b8c131f0 100644 --- a/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem -import android.R.string import androidx.activity.ComponentActivity import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable diff --git a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt index e25fd08f3..e616cef62 100644 --- a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt @@ -143,8 +143,8 @@ fun NiaGradientBackground( * Multipreview annotation that represents light and dark themes. Add this annotation to a * composable to render the both themes. */ -//@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme") -//@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme") +// @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme") +// @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme") @Preview annotation class ThemePreviews diff --git a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt index 26ac80633..fe34cfaed 100644 --- a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt @@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon @@ -31,7 +30,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme -import org.jetbrains.compose.ui.tooling.preview.Preview /** * Now in Android filter chip with included leading checked icon as well as text content slot. diff --git a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt index c0e88b81b..4b8b62eaf 100644 --- a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt @@ -49,7 +49,7 @@ fun DynamicAsyncImage( imageLoader: ImageLoader, contentDescription: String?, modifier: Modifier = Modifier, - //TODO Use Compose resources to present a placeholder + // TODO Use Compose resources to present a placeholder // placeholder: Painter = painterResource(R.drawable.core_designsystem_ic_placeholder_default), ) { val iconTint = LocalTintTheme.current.iconTint diff --git a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt index 205713879..9cb0a47bc 100644 --- a/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt +++ b/core/designsystem/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt @@ -236,7 +236,7 @@ fun NiaTheme( } } -//@ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S) -//fun supportsDynamicTheming() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S +// @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S) +// fun supportsDynamicTheming() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S // A workaround for the dynamic theming support in Compose Multiplatform fun supportsDynamicTheming() = false diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt index 167e71237..2f59d907f 100644 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt +++ b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.testing.di -import com.google.samples.apps.nowinandroid.core.di.DispatchersComponent import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.test.TestDispatcher import me.tatarka.inject.annotations.Component