A fully functional Android app built entirely with Kotlin and Jetpack Compose
Replace StringDecoder injection with simpler API
Simon Marquise8449112b4c6
diff --git a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/StringDecoder.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/StringDecoder.ktdeleted file mode 100644index 29437cc71..000000000--- a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/StringDecoder.kt+++ /dev/null@@ -1,21 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.core.decoder--interface StringDecoder {- fun decodeString(encodedString: String): String-}diff --git a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/UriDecoder.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/UriDecoder.ktdeleted file mode 100644index b114bdab6..000000000--- a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/UriDecoder.kt+++ /dev/null@@ -1,24 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.core.decoder--import android.net.Uri-import javax.inject.Inject--class UriDecoder @Inject constructor() : StringDecoder {- override fun decodeString(encodedString: String): String = Uri.decode(encodedString)-}diff --git a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/di/StringDecoderModule.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/di/StringDecoderModule.ktdeleted file mode 100644index e39b0e1f8..000000000--- a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/decoder/di/StringDecoderModule.kt+++ /dev/null@@ -1,31 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.core.decoder.di--import com.google.samples.apps.nowinandroid.core.decoder.StringDecoder-import com.google.samples.apps.nowinandroid.core.decoder.UriDecoder-import dagger.Binds-import dagger.Module-import dagger.hilt.InstallIn-import dagger.hilt.components.SingletonComponent--@Module-@InstallIn(SingletonComponent::class)-abstract class StringDecoderModule {- @Binds- abstract fun bindStringDecoder(uriDecoder: UriDecoder): StringDecoder-}diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/decoder/FakeStringDecoder.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/decoder/FakeStringDecoder.ktdeleted file mode 100644index 7282661cc..000000000--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/decoder/FakeStringDecoder.kt+++ /dev/null@@ -1,24 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.core.testing.decoder--import com.google.samples.apps.nowinandroid.core.decoder.StringDecoder-import javax.inject.Inject--class FakeStringDecoder @Inject constructor() : StringDecoder {- override fun decodeString(encodedString: String): String = encodedString-}diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestStringDecoderModule.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestStringDecoderModule.ktdeleted file mode 100644index 0873ee546..000000000--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestStringDecoderModule.kt+++ /dev/null@@ -1,35 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.core.testing.di--import com.google.samples.apps.nowinandroid.core.decoder.StringDecoder-import com.google.samples.apps.nowinandroid.core.decoder.di.StringDecoderModule-import com.google.samples.apps.nowinandroid.core.testing.decoder.FakeStringDecoder-import dagger.Binds-import dagger.Module-import dagger.hilt.components.SingletonComponent-import dagger.hilt.testing.TestInstallIn--@Module-@TestInstallIn(- components = [SingletonComponent::class],- replaces = [StringDecoderModule::class],-)-abstract class TestStringDecoderModule {- @Binds- abstract fun bindsStringDecoder(fakeStringDecoder: FakeStringDecoder): StringDecoder-}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.ktindex 2b2565f9e..7f8c6067e 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@@ -23,7 +23,6 @@ import com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQueimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository-import com.google.samples.apps.nowinandroid.core.decoder.StringDecoderimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource@@ -43,13 +42,12 @@ import javax.inject.Inject@HiltViewModelclass TopicViewModel @Inject constructor(savedStateHandle: SavedStateHandle,- stringDecoder: StringDecoder,private val userDataRepository: UserDataRepository,topicsRepository: TopicsRepository,userNewsResourceRepository: UserNewsResourceRepository,) : ViewModel() {- private val topicArgs: TopicArgs = TopicArgs(savedStateHandle, stringDecoder)+ private val topicArgs: TopicArgs = TopicArgs(savedStateHandle)val topicId = topicArgs.topicIddiff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktindex 0954a52ac..b012b12b1 100644--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt@@ -16,7 +16,6 @@package com.google.samples.apps.nowinandroid.feature.topic.navigation-import android.net.Uriimport androidx.annotation.VisibleForTestingimport androidx.lifecycle.SavedStateHandleimport androidx.navigation.NavController@@ -24,19 +23,20 @@ import androidx.navigation.NavGraphBuilderimport androidx.navigation.NavTypeimport androidx.navigation.compose.composableimport androidx.navigation.navArgument-import com.google.samples.apps.nowinandroid.core.decoder.StringDecoderimport com.google.samples.apps.nowinandroid.feature.topic.TopicRoute+import java.net.URLDecoder+import java.net.URLEncoder@VisibleForTestinginternal const val topicIdArg = "topicId"internal class TopicArgs(val topicId: String) {- constructor(savedStateHandle: SavedStateHandle, stringDecoder: StringDecoder) :- this(stringDecoder.decodeString(checkNotNull(savedStateHandle[topicIdArg])))+ constructor(savedStateHandle: SavedStateHandle) :+ this(URLDecoder.decode(checkNotNull(savedStateHandle[topicIdArg]), "UTF-8"))}fun NavController.navigateToTopic(topicId: String) {- val encodedId = Uri.encode(topicId)+ val encodedId = URLEncoder.encode(topicId, "UTF-8")this.navigate("topic_route/$encodedId") {launchSingleTop = true}diff --git a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktindex ff7a88160..d365232d7 100644--- a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt+++ b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt@@ -22,7 +22,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Videoimport com.google.samples.apps.nowinandroid.core.model.data.Topic-import com.google.samples.apps.nowinandroid.core.testing.decoder.FakeStringDecoderimport com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository@@ -63,7 +62,6 @@ class TopicViewModelTest {fun setup() {viewModel = TopicViewModel(savedStateHandle = SavedStateHandle(mapOf(topicIdArg to testInputTopics[0].topic.id)),- stringDecoder = FakeStringDecoder(),userDataRepository = userDataRepository,topicsRepository = topicsRepository,userNewsResourceRepository = userNewsResourceRepository,