From cd35889acbe17362a92175be2b39d78535c8fc22 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Fri, 10 Jun 2022 01:03:37 +0430 Subject: [PATCH] rebase --- core-common/src/main/AndroidManifest.xml | 3 +-- core-data-test/src/main/AndroidManifest.xml | 3 +-- .../samples/apps/nowinandroid/core/data/SyncUtilities.kt | 2 +- .../core/data/repository/OfflineFirstAuthorsRepository.kt | 2 +- .../core/data/repository/OfflineFirstNewsRepository.kt | 2 +- .../core/data/repository/OfflineFirstTopicsRepository.kt | 2 +- .../core/data/repository/fake/FakeAuthorsRepository.kt | 2 +- .../core/data/repository/fake/FakeNewsRepository.kt | 2 +- .../core/data/repository/fake/FakeTopicsRepository.kt | 2 +- core-database/src/main/AndroidManifest.xml | 3 +-- core-datastore-test/src/main/AndroidManifest.xml | 3 +-- .../nowinandroid/core/datastore/test/TestDataStoreModule.kt | 2 +- core-datastore/src/main/AndroidManifest.xml | 3 +-- .../nowinandroid/core/datastore/NiaPreferencesDataSource.kt | 4 ++-- .../apps/nowinandroid/core/datastore/di/DataStoreModule.kt | 2 +- .../core/datastore/UserPreferencesSerializerTest.kt | 4 ++-- core-navigation/src/main/AndroidManifest.xml | 3 +-- .../apps/nowinandroid/core/network/di/NetworkModule.kt | 2 +- .../core/network/fake/FakeNiaNetworkDataSource.kt | 2 +- .../nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt | 4 ++-- core-testing/src/main/AndroidManifest.xml | 3 +-- .../apps/nowinandroid/core/testing/di/TestDispatcherModule.kt | 2 +- .../samples/apps/nowinandroid/core/ui/NewsResourceCard.kt | 4 ++-- feature-author/src/main/AndroidManifest.xml | 3 +-- .../apps/nowinandroid/feature/author/AuthorViewModel.kt | 2 +- feature-foryou/src/main/AndroidManifest.xml | 3 +-- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 1 + .../apps/nowinandroid/feature/foryou/ForYouViewModel.kt | 2 +- feature-interests/src/main/AndroidManifest.xml | 3 +-- .../apps/nowinandroid/feature/interests/InterestsViewModel.kt | 2 +- feature-topic/src/main/AndroidManifest.xml | 3 +-- .../samples/apps/nowinandroid/feature/topic/TopicViewModel.kt | 2 +- 32 files changed, 36 insertions(+), 46 deletions(-) diff --git a/core-common/src/main/AndroidManifest.xml b/core-common/src/main/AndroidManifest.xml index a0b613a7b..890d12fd6 100644 --- a/core-common/src/main/AndroidManifest.xml +++ b/core-common/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/core-data-test/src/main/AndroidManifest.xml b/core-data-test/src/main/AndroidManifest.xml index 2ce7621ac..bc894ba5b 100644 --- a/core-data-test/src/main/AndroidManifest.xml +++ b/core-data-test/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt index 0f2a592de..6f2795e06 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt @@ -19,9 +19,9 @@ package com.google.samples.apps.nowinandroid.core.data import android.util.Log import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList -import kotlin.coroutines.cancellation.CancellationException import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine +import kotlin.coroutines.cancellation.CancellationException /** * Interface marker for a class that manages synchronization between local data and a remote diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt index 5344810f3..00dd1300a 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt @@ -27,9 +27,9 @@ import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSou import com.google.samples.apps.nowinandroid.core.model.data.Author import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import javax.inject.Inject /** * Disk storage backed implementation of the [AuthorsRepository]. diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt index 4588fd404..34d0335df 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt @@ -37,9 +37,9 @@ import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions import com.google.samples.apps.nowinandroid.core.model.data.NewsResource import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import javax.inject.Inject /** * Disk storage backed implementation of the [NewsRepository]. diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt index 4e2c64c9d..6121bf290 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt @@ -27,9 +27,9 @@ import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSou import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import javax.inject.Inject /** * Disk storage backed implementation of the [TopicsRepository]. diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt index 4a0ebf0ba..d4f57a371 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt @@ -24,7 +24,6 @@ import com.google.samples.apps.nowinandroid.core.network.Dispatcher import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor -import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -32,6 +31,7 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import javax.inject.Inject /** * Fake implementation of the [AuthorsRepository] that returns hardcoded authors. diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt index cfbd3cb98..7ecbe94b2 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt @@ -26,13 +26,13 @@ import com.google.samples.apps.nowinandroid.core.network.Dispatcher import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource -import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import javax.inject.Inject /** * Fake implementation of the [NewsRepository] that retrieves the news resources from a JSON String. diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt index ec18600f0..8fe1d471e 100644 --- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt +++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt @@ -24,7 +24,6 @@ import com.google.samples.apps.nowinandroid.core.network.Dispatcher import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic -import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -32,6 +31,7 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import javax.inject.Inject /** * Fake implementation of the [TopicsRepository] that retrieves the topics from a JSON String, and diff --git a/core-database/src/main/AndroidManifest.xml b/core-database/src/main/AndroidManifest.xml index ae6d3fe50..8bc1e7842 100644 --- a/core-database/src/main/AndroidManifest.xml +++ b/core-database/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/core-datastore-test/src/main/AndroidManifest.xml b/core-datastore-test/src/main/AndroidManifest.xml index e0d63ea27..83b99d657 100644 --- a/core-datastore-test/src/main/AndroidManifest.xml +++ b/core-datastore-test/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt b/core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt index 62b3abc34..142084787 100644 --- a/core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt +++ b/core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt @@ -25,8 +25,8 @@ import dagger.Module import dagger.Provides import dagger.hilt.components.SingletonComponent import dagger.hilt.testing.TestInstallIn -import javax.inject.Singleton import org.junit.rules.TemporaryFolder +import javax.inject.Singleton @Module @TestInstallIn( diff --git a/core-datastore/src/main/AndroidManifest.xml b/core-datastore/src/main/AndroidManifest.xml index d07c935fa..70dd8c774 100644 --- a/core-datastore/src/main/AndroidManifest.xml +++ b/core-datastore/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file 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.kt index 938e85af6..ed9cb290d 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 @@ -18,12 +18,12 @@ package com.google.samples.apps.nowinandroid.core.datastore import android.util.Log import androidx.datastore.core.DataStore -import java.io.IOException -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.retry +import java.io.IOException +import javax.inject.Inject class NiaPreferencesDataSource @Inject constructor( private val userPreferences: DataStore diff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt b/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt index f4eb8f848..e007f14e5 100644 --- a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt +++ b/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt @@ -30,10 +30,10 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob +import javax.inject.Singleton @Module @InstallIn(SingletonComponent::class) diff --git a/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt b/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt index 3b4015495..5901b4b4a 100644 --- a/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt +++ b/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt @@ -17,11 +17,11 @@ package com.google.samples.apps.nowinandroid.core.datastore import androidx.datastore.core.CorruptionException -import java.io.ByteArrayInputStream -import java.io.ByteArrayOutputStream import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals import org.junit.Test +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream class UserPreferencesSerializerTest { private val userPreferencesSerializer = UserPreferencesSerializer() diff --git a/core-navigation/src/main/AndroidManifest.xml b/core-navigation/src/main/AndroidManifest.xml index 915676f9b..9bd082d91 100644 --- a/core-navigation/src/main/AndroidManifest.xml +++ b/core-navigation/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt index 4689fdbe2..e54171d04 100644 --- a/core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt +++ b/core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt @@ -23,8 +23,8 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton import kotlinx.serialization.json.Json +import javax.inject.Singleton @Module @InstallIn(SingletonComponent::class) diff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt index 9bbe0bed3..0805e45a1 100644 --- a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt +++ b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt @@ -23,11 +23,11 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic -import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import javax.inject.Inject /** * [NiaNetworkDataSource] implementation that provides static news resources to aid development diff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt index 351db55ed..edd3c190c 100644 --- a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt +++ b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt @@ -23,8 +23,6 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory -import javax.inject.Inject -import javax.inject.Singleton import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType @@ -33,6 +31,8 @@ import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.http.GET import retrofit2.http.Query +import javax.inject.Inject +import javax.inject.Singleton /** * Retrofit API declaration for NIA Network API diff --git a/core-testing/src/main/AndroidManifest.xml b/core-testing/src/main/AndroidManifest.xml index 42486709c..176a0ac4c 100644 --- a/core-testing/src/main/AndroidManifest.xml +++ b/core-testing/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt index d0af32893..66d52dabe 100644 --- a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt +++ b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt @@ -20,9 +20,9 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.UnconfinedTestDispatcher +import javax.inject.Singleton @Module @InstallIn(SingletonComponent::class) 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.kt index 4ceb90c14..242902bef 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 @@ -66,10 +66,10 @@ import com.google.samples.apps.nowinandroid.core.model.data.NewsResource import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme -import java.time.ZoneId -import java.time.format.DateTimeFormatter import kotlinx.datetime.Instant import kotlinx.datetime.toJavaInstant +import java.time.ZoneId +import java.time.format.DateTimeFormatter /** * [NewsResource] card used on the following screens: For You, Episodes, Saved diff --git a/feature-author/src/main/AndroidManifest.xml b/feature-author/src/main/AndroidManifest.xml index bd1b40b71..5b260bd42 100644 --- a/feature-author/src/main/AndroidManifest.xml +++ b/feature-author/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt b/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt index 61329570c..952c04611 100644 --- a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt +++ b/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt @@ -28,13 +28,13 @@ import com.google.samples.apps.nowinandroid.core.result.Result import com.google.samples.apps.nowinandroid.core.result.asResult import com.google.samples.apps.nowinandroid.feature.author.navigation.AuthorDestination import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import javax.inject.Inject @HiltViewModel class AuthorViewModel @Inject constructor( diff --git a/feature-foryou/src/main/AndroidManifest.xml b/feature-foryou/src/main/AndroidManifest.xml index f72fbc540..81e3a04b5 100644 --- a/feature-foryou/src/main/AndroidManifest.xml +++ b/feature-foryou/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 0825f0305..449fc99e6 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -94,6 +94,7 @@ import com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBar import com.google.samples.apps.nowinandroid.core.ui.icon.NiaIcons import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTypography +import kotlinx.datetime.Instant import kotlin.math.floor @Composable diff --git 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 index f7e36c430..1ed5251d1 100644 --- 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 @@ -35,7 +35,6 @@ import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsStat import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsState.None import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsState.Unknown import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow @@ -47,6 +46,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import javax.inject.Inject @OptIn(SavedStateHandleSaveableApi::class) @HiltViewModel diff --git a/feature-interests/src/main/AndroidManifest.xml b/feature-interests/src/main/AndroidManifest.xml index 13505caf9..32818c141 100644 --- a/feature-interests/src/main/AndroidManifest.xml +++ b/feature-interests/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + \ No newline at end of file diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt index f2e419d53..69ee544e6 100644 --- a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt +++ b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt @@ -23,7 +23,6 @@ import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositor import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow @@ -32,6 +31,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import javax.inject.Inject @HiltViewModel class InterestsViewModel @Inject constructor( diff --git a/feature-topic/src/main/AndroidManifest.xml b/feature-topic/src/main/AndroidManifest.xml index be0731035..fd83a554d 100644 --- a/feature-topic/src/main/AndroidManifest.xml +++ b/feature-topic/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt index 9e1bba01b..90c43727b 100644 --- a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt +++ b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt @@ -28,13 +28,13 @@ import com.google.samples.apps.nowinandroid.core.result.Result import com.google.samples.apps.nowinandroid.core.result.asResult import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicDestination import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import javax.inject.Inject @HiltViewModel class TopicViewModel @Inject constructor(