Removed forced casting. (#371)

Author: EranBoudjnah

app/src/main/java/com/mitteloupe/whoami/di/HomeUiModule.kt

@@ -3,8 +3,8 @@ package com.mitteloupe.whoami.di
 import android.content.Context
 import android.content.res.Resources
 import com.mitteloupe.whoami.analytics.Analytics
-import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent
 import com.mitteloupe.whoami.architecture.ui.navigation.mapper.NavigationEventDestinationMapper
+import com.mitteloupe.whoami.home.presentation.navigation.HomePresentationNavigationEvent
 import com.mitteloupe.whoami.home.presentation.viewmodel.HomeViewModel
 import com.mitteloupe.whoami.home.ui.di.HomeDependencies
 import com.mitteloupe.whoami.home.ui.mapper.ConnectionDetailsUiMapper
@@ -25,10 +25,12 @@ object HomeUiModule {
     fun providesHomeViewStateUiMapper() = HomeViewStateUiMapper()
 
     @Provides
+    @JvmSuppressWildcards
     fun providesHomeNavigationEventDestinationMapper(
         analytics: Analytics,
         @ActivityContext context: Context
-    ) = HomeNavigationEventDestinationMapper(analytics, context)
+    ): NavigationEventDestinationMapper<HomePresentationNavigationEvent> =
+        HomeNavigationEventDestinationMapper(analytics, context)
 
     @Provides
     fun providesHomeNotificationUiMapper(@ActivityContext context: Context) =
@@ -41,20 +43,20 @@ object HomeUiModule {
     fun providesConnectionDetailsUiMapper() = ConnectionDetailsUiMapper()
 
     @Provides
-    @Suppress("UNCHECKED_CAST")
     fun providesHomeDependencies(
         homeViewModel: HomeViewModel,
         homeViewStateUiMapper: HomeViewStateUiMapper,
         connectionDetailsUiMapper: ConnectionDetailsUiMapper,
-        homeNavigationMapper: HomeNavigationEventDestinationMapper,
+        homeNavigationMapper: @JvmSuppressWildcards
+        NavigationEventDestinationMapper<HomePresentationNavigationEvent>,
         homeNotificationMapper: HomeNotificationUiMapper,
         errorUiMapper: ErrorUiMapper,
         analytics: Analytics
     ) = HomeDependencies(
         homeViewModel,
         homeViewStateUiMapper,
         connectionDetailsUiMapper,
-        homeNavigationMapper as NavigationEventDestinationMapper<PresentationNavigationEvent>,
+        homeNavigationMapper,
         homeNotificationMapper,
         errorUiMapper,
         analytics

architecture/ui/src/main/java/com/mitteloupe/whoami/architecture/ui/view/BaseComposeHolder.kt

@@ -12,7 +12,7 @@ import com.mitteloupe.whoami.architecture.ui.notification.mapper.NotificationUiM
 
 abstract class BaseComposeHolder<VIEW_STATE : Any, NOTIFICATION : PresentationNotification>(
     private val viewModel: BaseViewModel<VIEW_STATE, NOTIFICATION>,
-    private val navigationMapper: NavigationEventDestinationMapper<PresentationNavigationEvent>,
+    private val navigationMapper: NavigationEventDestinationMapper<*>,
     private val notificationMapper: NotificationUiMapper<NOTIFICATION>
 ) {
     @Composable

home/ui/src/main/java/com/mitteloupe/whoami/home/ui/di/HomeDependencies.kt

@@ -1,12 +1,12 @@
 package com.mitteloupe.whoami.home.ui.di
 
 import com.mitteloupe.whoami.analytics.Analytics
-import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent
 import com.mitteloupe.whoami.architecture.ui.navigation.mapper.NavigationEventDestinationMapper
 import com.mitteloupe.whoami.architecture.ui.notification.mapper.NotificationUiMapper
 import com.mitteloupe.whoami.architecture.ui.view.BaseComposeHolder
 import com.mitteloupe.whoami.home.presentation.model.HomePresentationNotification
 import com.mitteloupe.whoami.home.presentation.model.HomeViewState
+import com.mitteloupe.whoami.home.presentation.navigation.HomePresentationNavigationEvent
 import com.mitteloupe.whoami.home.presentation.viewmodel.HomeViewModel
 import com.mitteloupe.whoami.home.ui.mapper.ConnectionDetailsUiMapper
 import com.mitteloupe.whoami.home.ui.mapper.ErrorUiMapper
@@ -16,7 +16,8 @@ data class HomeDependencies(
     val homeViewModel: HomeViewModel,
     val homeViewStateUiMapper: HomeViewStateUiMapper,
     val connectionDetailsUiMapper: ConnectionDetailsUiMapper,
-    private val homeNavigationMapper: NavigationEventDestinationMapper<PresentationNavigationEvent>,
+    private val homeNavigationMapper:
+    NavigationEventDestinationMapper<HomePresentationNavigationEvent>,
     private val homeNotificationMapper: NotificationUiMapper<HomePresentationNotification>,
     val errorUiMapper: ErrorUiMapper,
     val analytics: Analytics