[#617] Replace log with timber, rename callback, remove serializable from home, and move destination to screens

Author: eeeeaa

sample-compose/app/src/androidTest/java/co/nimblehq/sample/compose/ui/screens/main/home/HomeScreenTest.kt

@@ -15,7 +15,7 @@ import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.test.TestDispatchersProvider
 import co.nimblehq.sample.compose.ui.screens.FakeNavigator
 import co.nimblehq.sample.compose.ui.screens.MainActivity
-import co.nimblehq.sample.compose.ui.screens.main.MainDestination
+import co.nimblehq.sample.compose.ui.screens.main.second.Second
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 import io.mockk.every
 import io.mockk.mockk
@@ -74,7 +74,7 @@ class HomeScreenTest {
     fun when_clicking_on_a_list_item__it_navigates_to_Second_screen() = initComposable {
         onNodeWithText("1").performClick()
 
-        assertEquals("1", (fakeNavigator.currentScreen() as? MainDestination.Second)?.id)
+        assertEquals("1", (fakeNavigator.currentScreen() as? Second)?.id)
     }
 
     private fun initComposable(

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/main/MainActivityModule.kt

@@ -7,9 +7,11 @@ import co.nimblehq.sample.compose.extensions.showToast
 import co.nimblehq.sample.compose.navigation.EntryProviderInstaller
 import co.nimblehq.sample.compose.navigation.Navigator
 import co.nimblehq.sample.compose.navigation.NavigatorImpl
-import co.nimblehq.sample.compose.ui.screens.main.MainDestination
+import co.nimblehq.sample.compose.ui.screens.main.home.Home
 import co.nimblehq.sample.compose.ui.screens.main.home.HomeScreen
+import co.nimblehq.sample.compose.ui.screens.main.second.Second
 import co.nimblehq.sample.compose.ui.screens.main.second.SecondScreen
+import co.nimblehq.sample.compose.ui.screens.main.third.Third
 import co.nimblehq.sample.compose.ui.screens.main.third.ThirdScreen
 import co.nimblehq.sample.compose.util.LocalResultEventBus
 import co.nimblehq.sample.compose.util.ResultEffect
@@ -26,13 +28,13 @@ object MainActivityModule {
 
     @Provides
     @ActivityRetainedScoped
-    fun provideNavigator(): Navigator = NavigatorImpl(startDestination = MainDestination.Home)
+    fun provideNavigator(): Navigator = NavigatorImpl(startDestination = Home)
 
     @IntoSet
     @Provides
     fun provideEntryProviderInstaller(navigator: Navigator): EntryProviderInstaller =
         {
-            entry<MainDestination.Home> {
+            entry<Home> {
                 val eventBus = LocalResultEventBus.current
                 val context = LocalContext.current
 
@@ -49,21 +51,21 @@ object MainActivityModule {
                 )
             }
 
-            entry<MainDestination.Second> { key ->
+            entry<Second> { key ->
                 val eventBus = LocalResultEventBus.current
 
                 SecondScreen(
                     id = key.id,
                     navigator = navigator,
                     viewModel = hiltViewModel(),
-                    onUpdate = {
+                    onUpdateClick = {
                         eventBus.sendResult<Boolean>(result = true)
                         navigator.goBack()
                     }
                 )
             }
 
-            entry<MainDestination.Third> { key ->
+            entry<Third> { key ->
                 ThirdScreen(
                     model = key.model,
                     navigator = navigator,

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/MainActivity.kt

@@ -20,7 +20,7 @@ import co.nimblehq.sample.compose.extensions.setEdgeToEdgeConfig
 import co.nimblehq.sample.compose.navigation.EntryProviderInstaller
 import co.nimblehq.sample.compose.navigation.Navigator
 import co.nimblehq.sample.compose.ui.common.URL_SECOND_SCREEN
-import co.nimblehq.sample.compose.ui.screens.main.MainDestination
+import co.nimblehq.sample.compose.ui.screens.main.second.Second
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 import co.nimblehq.sample.compose.util.DeepLinkMatcher
 import co.nimblehq.sample.compose.util.DeepLinkPattern
@@ -43,7 +43,7 @@ class MainActivity : ComponentActivity() {
     lateinit var entryProviderScopes: Set<@JvmSuppressWildcards EntryProviderInstaller>
 
     internal val deepLinkPatterns: List<DeepLinkPattern<out Any>> = listOf(
-        DeepLinkPattern(MainDestination.Second.serializer(), URL_SECOND_SCREEN.toUri()),
+        DeepLinkPattern(Second.serializer(), URL_SECOND_SCREEN.toUri()),
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/main/MainDestination.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.NavKey
 import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.extensions.collectAsEffect
 import co.nimblehq.sample.compose.extensions.showToast
@@ -32,6 +33,8 @@ import com.google.accompanist.permissions.shouldShowRationale
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
+data object Home : NavKey
+
 @Composable
 fun HomeScreen(
     navigator: Navigator,

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/main/home/HomeScreen.kt

@@ -7,7 +7,8 @@ import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferenc
 import co.nimblehq.sample.compose.ui.base.BaseViewModel
 import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.models.toUiModel
-import co.nimblehq.sample.compose.ui.screens.main.MainDestination
+import co.nimblehq.sample.compose.ui.screens.main.second.Second
+import co.nimblehq.sample.compose.ui.screens.main.third.Third
 import co.nimblehq.sample.compose.util.DispatchersProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.ImmutableList
@@ -63,10 +64,10 @@ class HomeViewModel @Inject constructor(
     }
 
     fun navigateToSecond(uiModel: UiModel) {
-        launch { _navigator.emit(MainDestination.Second(uiModel.id)) }
+        launch { _navigator.emit(Second(uiModel.id)) }
     }
 
     fun navigateToThird(uiModel: UiModel) {
-        launch { _navigator.emit(MainDestination.Third(uiModel)) }
+        launch { _navigator.emit(Third(uiModel)) }
     }
 }

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/main/home/HomeViewModel.kt

@@ -13,26 +13,31 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.navigation3.runtime.NavKey
 import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.navigation.Navigator
 import co.nimblehq.sample.compose.ui.base.BaseScreen
 import co.nimblehq.sample.compose.ui.common.AppBar
 import co.nimblehq.sample.compose.ui.theme.AppTheme.dimensions
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Second(val id: String) : NavKey
 
 @Suppress("UnusedPrivateMember")
 @Composable
 fun SecondScreen(
     id: String,
     navigator: Navigator,
     viewModel: SecondViewModel = hiltViewModel(),
-    onUpdate: () -> Unit = {},
+    onUpdateClick: () -> Unit = {},
 ) = BaseScreen(
     isDarkStatusBarIcons = false,
 ) {
     SecondScreenContent(
         id = id,
-        onUpdateClick = onUpdate,
+        onUpdateClick = onUpdateClick,
     )
 }
 

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/main/second/SecondScreen.kt

@@ -12,12 +12,17 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.navigation3.runtime.NavKey
 import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.navigation.Navigator
 import co.nimblehq.sample.compose.ui.base.BaseScreen
 import co.nimblehq.sample.compose.ui.common.AppBar
 import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Third(val model: UiModel) : NavKey
 
 @Suppress("UnusedPrivateMember")
 @Composable

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/main/third/ThirdScreen.kt

@@ -1,7 +1,7 @@
 package co.nimblehq.sample.compose.util
 
-import android.util.Log
 import kotlinx.serialization.KSerializer
+import timber.log.Timber
 
 internal class DeepLinkMatcher<T : Any>(
     val request: DeepLinkRequest,
@@ -35,7 +35,7 @@ internal class DeepLinkMatcher<T : Any>(
                     val parsedValue = try {
                         candidateSegment.typeParser.invoke(requestedSegment)
                     } catch (e: IllegalArgumentException) {
-                        Log.e(TAG_LOG_ERROR, "Failed to parse path value:[$requestedSegment].", e)
+                        Timber.e(e, "Failed to parse path value:[$requestedSegment].")
                         return null
                     }
                     args[candidateSegment.stringValue] = parsedValue
@@ -52,7 +52,7 @@ internal class DeepLinkMatcher<T : Any>(
                 val queryParsedValue = try {
                     queryStringParser.invoke(query.value)
                 } catch (e: IllegalArgumentException) {
-                    Log.e(TAG_LOG_ERROR, "Failed to parse query name:[$name] value:[${query.value}].", e)
+                    Timber.e(e, "Failed to parse query name:[$name] value:[${query.value}].")
                     return null
                 }
                 args[name] = queryParsedValue
@@ -77,5 +77,3 @@ internal data class DeepLinkMatchResult<T : Any>(
     val serializer: KSerializer<T>,
     val args: Map<String, Any>,
 )
-
-const val TAG_LOG_ERROR = "SampleComposeDeepLink"

sample-compose/app/src/main/java/co/nimblehq/sample/compose/util/DeepLinkMatcher.kt

@@ -1,25 +1,35 @@
 package co.nimblehq.sample.compose.ui.screens.main.home
 
 import androidx.activity.compose.setContent
-import androidx.compose.ui.test.*
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.rule.GrantPermissionRule
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.domain.usecases.*
+import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
+import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
+import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
 import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.ui.screens.BaseScreenTest
 import co.nimblehq.sample.compose.ui.screens.FakeNavigator
 import co.nimblehq.sample.compose.ui.screens.MainActivity
-import co.nimblehq.sample.compose.ui.screens.main.MainDestination
+import co.nimblehq.sample.compose.ui.screens.main.second.Second
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 import io.kotest.matchers.shouldBe
-import io.mockk.*
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
-import org.junit.*
 import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.shadows.ShadowToast
@@ -106,7 +116,7 @@ class HomeScreenTest : BaseScreenTest() {
     fun `When clicking on a list item, it navigates to Second screen`() = initComposable {
         onNodeWithText("1").performClick()
 
-        assertEquals("1", (fakeNavigator.currentScreen() as? MainDestination.Second)?.id)
+        assertEquals("1", (fakeNavigator.currentScreen() as? Second)?.id)
     }
 
     private fun initComposable(