A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix Bug #41
Sudhanshuea1114a33755
diff --git a/app-nia-catalog/src/main/AndroidManifest.xml b/app-nia-catalog/src/main/AndroidManifest.xmlindex cd0b1e371..0d74ce017 100644--- a/app-nia-catalog/src/main/AndroidManifest.xml+++ b/app-nia-catalog/src/main/AndroidManifest.xml@@ -23,12 +23,12 @@android:label="@string/app_name"android:roundIcon="@mipmap/ic_launcher_round"android:supportsRtl="true"- android:theme="@style/Theme.NiACatalog">+ android:theme="@style/Theme.NiaCatalog"><activityandroid:name="com.google.samples.apps.niacatalog.NiaCatalogActivity"android:exported="true"android:label="@string/app_name"- android:theme="@style/Theme.NiACatalog">+ android:theme="@style/Theme.NiaCatalog"><intent-filter><action android:name="android.intent.action.MAIN" />diff --git a/app-nia-catalog/src/main/res/values/themes.xml b/app-nia-catalog/src/main/res/values/themes.xmlindex 6e88adc0b..9aeeb83a6 100644--- a/app-nia-catalog/src/main/res/values/themes.xml+++ b/app-nia-catalog/src/main/res/values/themes.xml@@ -15,5 +15,5 @@limitations under the License.--><resources>- <style name="Theme.NiACatalog" parent="android:Theme.Material.Light.NoActionBar" />+ <style name="Theme.NiaCatalog" parent="android:Theme.Material.Light.NoActionBar" /></resources>\ No newline at end of filediff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex ae56af758..6d452a83e 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -21,7 +21,7 @@<uses-permission android:name="android.permission.INTERNET" /><application- android:name=".NiAApp"+ android:name=".NiaApp"android:allowBackup="true"android:icon="@mipmap/ic_launcher"android:label="@string/app_name"diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/NiAApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/NiaApp.ktsimilarity index 97%rename from app/src/main/java/com/google/samples/apps/nowinandroid/NiAApp.ktrename to app/src/main/java/com/google/samples/apps/nowinandroid/NiaApp.ktindex 3db60f128..920a588c6 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/NiAApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/NiaApp.kt@@ -27,7 +27,7 @@ import dagger.hilt.android.HiltAndroidApp* [Application] class for NiA*/@HiltAndroidApp-class NiAApp : Application(), ImageLoaderFactory {+class NiaApp : Application(), ImageLoaderFactory {override fun onCreate() {super.onCreate()// Initialize Sync; the system responsible for keeping data in the app up to date.diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex 3a3e25b66..d905975e0 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -79,7 +79,7 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {contentColor = MaterialTheme.colorScheme.onBackground,bottomBar = {if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact) {- NiABottomBar(+ NiaBottomBar(onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,currentDestination = currentDestination)@@ -96,7 +96,7 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {)) {if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact) {- NiANavRail(+ NiaNavRail(onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,currentDestination = currentDestination,modifier = Modifier.safeDrawingPadding()@@ -117,7 +117,7 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {}@Composable-private fun NiANavRail(+private fun NiaNavRail(onNavigateToTopLevelDestination: (TopLevelDestination) -> Unit,currentDestination: NavDestination?,modifier: Modifier = Modifier,@@ -142,7 +142,7 @@ private fun NiANavRail(}@Composable-private fun NiABottomBar(+private fun NiaBottomBar(onNavigateToTopLevelDestination: (TopLevelDestination) -> Unit,currentDestination: NavDestination?) {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.ktindex 9dc1f1eef..57385cca4 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@@ -25,7 +25,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersionsimport com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesimport com.google.samples.apps.nowinandroid.core.model.data.Author-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthorimport javax.inject.Injectimport kotlinx.coroutines.flow.Flow@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.map*/class OfflineFirstAuthorsRepository @Inject constructor(private val authorDao: AuthorDao,- private val network: NiANetwork,+ private val network: NiaNetwork,private val niaPreferences: NiaPreferences,) : 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.ktindex 896c6e5d2..0f60de3ff 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@@ -35,7 +35,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersionsimport com.google.samples.apps.nowinandroid.core.model.data.NewsResource-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceimport javax.inject.Injectimport kotlinx.coroutines.flow.Flow@@ -50,7 +50,7 @@ class OfflineFirstNewsRepository @Inject constructor(private val episodeDao: EpisodeDao,private val authorDao: AuthorDao,private val topicDao: TopicDao,- private val network: NiANetwork,+ private val network: NiaNetwork,) : NewsRepository {override fun getNewsResourcesStream(): Flow<List<NewsResource>> =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.ktindex 95fdfc139..c41725cfd 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@@ -25,7 +25,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersionsimport com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesimport com.google.samples.apps.nowinandroid.core.model.data.Topic-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopicimport javax.inject.Injectimport kotlinx.coroutines.flow.Flow@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.map*/class OfflineFirstTopicsRepository @Inject constructor(private val topicDao: TopicDao,- private val network: NiANetwork,+ private val network: NiaNetwork,private val niaPreferences: NiaPreferences,) : TopicsRepository {diff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.ktindex 0a3a8f2af..923a0bca7 100644--- a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt@@ -16,7 +16,7 @@package com.google.samples.apps.nowinandroid.core.data.testdoubles-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthorimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList@@ -33,9 +33,9 @@ enum class CollectionType {}/**- * Test double for [NiANetwork]+ * Test double for [NiaNetwork]*/-class TestNiaNetwork : NiANetwork {+class TestNiaNetwork : NiaNetwork {private val networkJson = Jsondiff --git a/core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt b/core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.ktindex d692ba6f8..cb45bd00a 100644--- a/core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt+++ b/core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt@@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid.core.database.daoimport android.content.Contextimport androidx.room.Roomimport androidx.test.core.app.ApplicationProvider-import com.google.samples.apps.nowinandroid.core.database.NiADatabase+import com.google.samples.apps.nowinandroid.core.database.NiaDatabaseimport com.google.samples.apps.nowinandroid.core.database.model.AuthorEntityimport com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntityimport com.google.samples.apps.nowinandroid.core.database.model.NewsResourceAuthorCrossRef@@ -41,14 +41,14 @@ class NewsResourceDaoTest {private lateinit var episodeDao: EpisodeDaoprivate lateinit var topicDao: TopicDaoprivate lateinit var authorDao: AuthorDao- private lateinit var db: NiADatabase+ private lateinit var db: NiaDatabase@Beforefun createDb() {val context = ApplicationProvider.getApplicationContext<Context>()db = Room.inMemoryDatabaseBuilder(context,- NiADatabase::class.java+ NiaDatabase::class.java).build()newsResourceDao = db.newsResourceDao()episodeDao = db.episodeDao()diff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.ktindex ea97a12e3..ae5a2bd3d 100644--- a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt+++ b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt@@ -30,21 +30,21 @@ import dagger.hilt.components.SingletonComponentobject DaosModule {@Providesfun providesAuthorDao(- database: NiADatabase,+ database: NiaDatabase,): AuthorDao = database.authorDao()@Providesfun providesTopicsDao(- database: NiADatabase,+ database: NiaDatabase,): TopicDao = database.topicDao()@Providesfun providesEpisodeDao(- database: NiADatabase,+ database: NiaDatabase,): EpisodeDao = database.episodeDao()@Providesfun providesNewsResourceDao(- database: NiADatabase,+ database: NiaDatabase,): NewsResourceDao = database.newsResourceDao()}diff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.ktindex a97e70bee..b159079c2 100644--- a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt+++ b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt@@ -32,9 +32,9 @@ object DatabaseModule {@Singletonfun providesNiADatabase(@ApplicationContext context: Context,- ): NiADatabase = Room.databaseBuilder(+ ): NiaDatabase = Room.databaseBuilder(context,- NiADatabase::class.java,+ NiaDatabase::class.java,"nia-database").build()}diff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiADatabase.kt b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.ktsimilarity index 98%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiADatabase.ktrename to core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.ktindex 5cae4d36f..ebc7a075a 100644--- a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiADatabase.kt+++ b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.kt@@ -61,7 +61,7 @@ import com.google.samples.apps.nowinandroid.core.database.util.NewsResourceTypeCInstantConverter::class,NewsResourceTypeConverter::class,)-abstract class NiADatabase : RoomDatabase() {+abstract class NiaDatabase : RoomDatabase() {abstract fun topicDao(): TopicDaoabstract fun authorDao(): AuthorDaoabstract fun episodeDao(): EpisodeDaodiff --git a/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktindex 2b906063c..86940c651 100644--- a/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt+++ b/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt@@ -16,8 +16,8 @@package com.google.samples.apps.nowinandroid.core.network.di-import com.google.samples.apps.nowinandroid.core.network.NiANetwork-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetwork+import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkimport dagger.Bindsimport dagger.Moduleimport dagger.Provides@@ -32,8 +32,8 @@ interface NetworkModule {@Bindsfun bindsNiANetwork(- niANetwork: FakeNiANetwork- ): NiANetwork+ niANetwork: FakeNiaNetwork+ ): NiaNetworkcompanion object {@Providesdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiANetwork.kt b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetwork.ktsimilarity index 98%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiANetwork.ktrename to core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetwork.ktindex 20ecae4cc..925a744e1 100644--- a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiANetwork.kt+++ b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetwork.kt@@ -24,7 +24,7 @@ import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic/*** Interface representing network calls to the NIA backend*/-interface NiANetwork {+interface NiaNetwork {suspend fun getTopics(ids: List<String>? = null): List<NetworkTopic>suspend fun getAuthors(ids: List<String>? = null): List<NetworkAuthor>diff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetwork.kt b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetwork.ktsimilarity index 93%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetwork.ktrename to core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetwork.ktindex afabacbeb..afd6bb954 100644--- a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetwork.kt+++ b/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetwork.kt@@ -17,7 +17,7 @@package com.google.samples.apps.nowinandroid.core.network.fakeimport com.google.samples.apps.nowinandroid.core.network.Dispatcher-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IOimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthorimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList@@ -30,12 +30,12 @@ import kotlinx.serialization.decodeFromStringimport kotlinx.serialization.json.Json/**- * [NiANetwork] implementation that provides static news resources to aid development+ * [NiaNetwork] implementation that provides static news resources to aid development*/-class FakeNiANetwork @Inject constructor(+class FakeNiaNetwork @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,private val networkJson: Json-) : NiANetwork {+) : NiaNetwork {override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =withContext(ioDispatcher) {networkJson.decodeFromString(FakeDataSource.topicsData)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.ktsimilarity index 90%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiANetwork.ktrename to core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.ktindex e6837f5bc..396a2281d 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@@ -17,7 +17,7 @@package com.google.samples.apps.nowinandroid.core.network.retrofitimport com.google.samples.apps.nowinandroid.core.network.BuildConfig-import com.google.samples.apps.nowinandroid.core.network.NiANetwork+import com.google.samples.apps.nowinandroid.core.network.NiaNetworkimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthorimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeListimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource@@ -37,7 +37,7 @@ import retrofit2.http.Query/*** Retrofit API declaration for NIA Network API*/-private interface RetrofitNiANetworkApi {+private interface RetrofitNiaNetworkApi {@GET(value = "topics")suspend fun getTopics(@Query("id") ids: List<String>?,@@ -69,10 +69,10 @@ private interface RetrofitNiANetworkApi {): List<NetworkChangeList>}-private const val NiABaseUrl = BuildConfig.BACKEND_URL+private const val NiaBaseUrl = BuildConfig.BACKEND_URL/**- * Wrapper for data provided from the [NiABaseUrl]+ * Wrapper for data provided from the [NiaBaseUrl]*/@Serializableprivate data class NetworkResponse<T>(@@ -80,15 +80,15 @@ private data class NetworkResponse<T>()/**- * [Retrofit] backed [NiANetwork]+ * [Retrofit] backed [NiaNetwork]*/@Singleton-class RetrofitNiANetwork @Inject constructor(+class RetrofitNiaNetwork @Inject constructor(networkJson: Json-) : NiANetwork {+) : NiaNetwork {private val networkApi = Retrofit.Builder()- .baseUrl(NiABaseUrl)+ .baseUrl(NiaBaseUrl).client(OkHttpClient.Builder().addInterceptor(@@ -101,7 +101,7 @@ class RetrofitNiANetwork @Inject constructor().addConverterFactory(networkJson.asConverterFactory("application/json".toMediaType())).build()- .create(RetrofitNiANetworkApi::class.java)+ .create(RetrofitNiaNetworkApi::class.java)override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =networkApi.getTopics(ids = ids).datadiff --git a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetworkTest.kt b/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.ktsimilarity index 93%rename from core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetworkTest.ktrename to core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.ktindex c7fedbd6f..c172c7da5 100644--- a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiANetworkTest.kt+++ b/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.kt@@ -23,15 +23,15 @@ import org.junit.Assert.assertEqualsimport org.junit.Beforeimport org.junit.Test-class FakeNiANetworkTest {+class FakeNiaNetworkTest {- private lateinit var subject: FakeNiANetwork+ private lateinit var subject: FakeNiaNetworkprivate val testDispatcher = StandardTestDispatcher()@Beforefun setUp() {- subject = com.google.samples.apps.nowinandroid.core.network.fake.FakeNiANetwork(+ subject = com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetwork(ioDispatcher = testDispatcher,networkJson = Json { ignoreUnknownKeys = true })