Update rest of Dagger modules to follow best practices.

dydxprotocol · Mar 15, 2024 · 09964c8 · 09964c8
1 parent a6adc3b
commit 09964c8
Show file tree

Hide file tree

Showing 23 changed files with 239 additions and 432 deletions.
diff --git a/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRouter.kt b/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRouter.kt
@@ -1,6 +1,5 @@
 package exchange.dydx.trading.common.navigation
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.navigation.NavController
@@ -17,8 +16,6 @@ import kotlinx.coroutines.flow.StateFlow
  */
 interface DydxRouter {
 
-    var androidContext: Context?
-
     enum class Presentation {
         Push,
         Modal,

diff --git a/v4/core/src/main/java/exchange/dydx/trading/TradingActivity.kt b/v4/core/src/main/java/exchange/dydx/trading/TradingActivity.kt
@@ -47,8 +47,6 @@ class TradingActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        viewModel.router.androidContext = this
-
         Timber.tag(TAG).i("TradingActivity#onCreate")
 
         CarteraSetup.run(this)

diff --git a/v4/core/src/main/java/exchange/dydx/trading/core/DydxRouterImpl.kt b/v4/core/src/main/java/exchange/dydx/trading/core/DydxRouterImpl.kt
@@ -1,6 +1,6 @@
 package exchange.dydx.trading.core
 
-import android.content.Context
+import android.app.Application
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.net.toUri
@@ -10,13 +10,15 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.navDeepLink
+import dagger.hilt.android.scopes.ActivityRetainedScoped
 import exchange.dydx.trading.common.AppConfig
 import exchange.dydx.trading.common.navigation.DydxRouter
 import exchange.dydx.trading.common.navigation.DydxRouter.Destination
 import exchange.dydx.trading.common.navigation.MarketRoutes
 import exchange.dydx.trading.integration.analytics.Tracking
 import kotlinx.coroutines.flow.MutableStateFlow
 import timber.log.Timber
+import javax.inject.Inject
 
 private const val TAG = "DydxRouterImpl"
 
@@ -27,10 +29,11 @@ private const val TAG = "DydxRouterImpl"
  *
  * So this is a very powerful class in terms of, bridging the dependency tree.
  */
-class DydxRouterImpl(
-    override var androidContext: Context?,
-    private val appConfig: AppConfig,
+@ActivityRetainedScoped
+class DydxRouterImpl @Inject constructor(
+    private val application: Application,
     private val tracker: Tracking,
+    appConfig: AppConfig,
 ) : DydxRouter {
 
     private lateinit var navHostController: NavHostController
@@ -118,7 +121,7 @@ class DydxRouterImpl(
         val routePath = routePath(route)
         if (routePath.startsWith("http://") || routePath.startsWith("https://")) {
             val intent = Intent(Intent.ACTION_VIEW, routePath.toUri())
-            androidContext?.startActivity(intent)
+            application.startActivity(intent)
         } else {
             pendingPresentation =
                 presentation // Let destinationChangedListener handle the presentation state change

diff --git a/v4/core/src/main/java/exchange/dydx/trading/core/di/CoreModule.kt b/v4/core/src/main/java/exchange/dydx/trading/core/di/CoreModule.kt
@@ -1,32 +1,16 @@
 package exchange.dydx.trading.core.di
 
-import android.content.Context
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.scopes.ActivityRetainedScoped
-import exchange.dydx.trading.common.AppConfig
 import exchange.dydx.trading.common.navigation.DydxRouter
 import exchange.dydx.trading.core.DydxRouterImpl
-import exchange.dydx.trading.integration.analytics.Tracking
 
 @Module
 @InstallIn(ActivityRetainedComponent::class)
-object CoreModule {
+interface CoreModule {
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideApplicationRouter(
-        @ApplicationContext androidContext: Context,
-        appConfig: AppConfig,
-        tracker: Tracking,
-    ): DydxRouter {
-        return DydxRouterImpl(
-            androidContext = androidContext,
-            appConfig = appConfig,
-            tracker = tracker,
-        )
-    }
+    @Binds
+    fun bindDydxRouter(dydxRouterImpl: DydxRouterImpl): DydxRouter
 }
diff --git a/v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/di/MarketModule.kt b/v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/di/MarketModule.kt
@@ -1,14 +1,11 @@
 package exchange.dydx.trading.feature.market.di
 
+import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.hilt.android.scopes.ActivityRetainedScoped
-import exchange.dydx.abacus.protocols.LocalizerProtocol
-import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
-import exchange.dydx.dydxstatemanager.clientState.favorite.DydxFavoriteStoreProtocol
-import exchange.dydx.trading.common.formatter.DydxFormatter
 import exchange.dydx.trading.feature.market.marketinfo.components.tabs.DydxMarketAccountTabView
 import exchange.dydx.trading.feature.market.marketinfo.components.tabs.DydxMarketStatsTabView
 import exchange.dydx.trading.feature.market.marketinfo.components.tiles.DydxMarketTilesView
@@ -20,106 +17,79 @@ import exchange.dydx.trading.feature.market.marketlist.components.SortAction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 
-// @InstallIn(ViewModelComponent::class)
 @Module
 @InstallIn(ActivityRetainedComponent::class)
-object MarketListModule {
+interface MarketListModule {
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideFilterActionFlow(
+    @Binds fun bindFilterActionFlow(
         mutableFlow: MutableStateFlow<FilterAction?>,
-    ): Flow<FilterAction?> {
-        return mutableFlow
-    }
-
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableFilterActionFlow(): MutableStateFlow<FilterAction?> {
-        return MutableStateFlow(null)
-    }
+    ): Flow<FilterAction?>
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideSortActionFlow(
+    @Binds fun bindSortActionFlow(
         mutableFlow: MutableStateFlow<SortAction?>,
-    ): Flow<SortAction?> {
-        return mutableFlow
-    }
+    ): Flow<SortAction?>
+
+    companion object {
+        @Provides
+        @ActivityRetainedScoped
+        fun provideMutableFilterActionFlow(): MutableStateFlow<FilterAction?> {
+            return MutableStateFlow(null)
+        }
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableSortActionFlow(): MutableStateFlow<SortAction?> {
-        return MutableStateFlow(null)
+        @Provides
+        @ActivityRetainedScoped
+        fun provideMutableSortActionFlow(): MutableStateFlow<SortAction?> {
+            return MutableStateFlow(null)
+        }
     }
 }
 
 @Module
 @InstallIn(ActivityRetainedComponent::class)
-object MarketIfoModule {
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableMarketInfoStream(
-        abacusStateManager: AbacusStateManagerProtocol,
-        formatter: DydxFormatter,
-        localizer: LocalizerProtocol,
-        favoriteStore: DydxFavoriteStoreProtocol,
-    ): MutableMarketInfoStreaming {
-        return MarketInfoStream(
-            abacusStateManager = abacusStateManager,
-            formatter = formatter,
-            localizer = localizer,
-            favoriteStore = favoriteStore,
-        )
-    }
+interface MarketInfoModule {
+
+    @Binds
+    fun bindMutableMarketInfoStreaming(
+        marketInfoStream: MarketInfoStream,
+    ): MutableMarketInfoStreaming
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMarketInfoStream(
+    @Binds
+    fun bindMarketInfoStreaming(
         mutableMarketInfoStream: MutableMarketInfoStreaming,
-    ): MarketInfoStreaming {
-        return mutableMarketInfoStream
-    }
+    ): MarketInfoStreaming
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideStatsTabSelection(
+    @Binds
+    fun bindStatsTabSelection(
         mutableStatsTabFlow: MutableStateFlow<DydxMarketStatsTabView.Selection>,
-    ): Flow<DydxMarketStatsTabView.Selection> {
-        return mutableStatsTabFlow
-    }
+    ): Flow<DydxMarketStatsTabView.Selection>
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableStatsTabSelection(): MutableStateFlow<DydxMarketStatsTabView.Selection> {
-        return MutableStateFlow(DydxMarketStatsTabView.Selection.Statistics)
-    }
-
-    @Provides
-    @ActivityRetainedScoped
-    fun provideAccountTabSelection(
+    @Binds
+    fun bindAccountTabSelection(
         mutableAccountTabFlow: MutableStateFlow<DydxMarketAccountTabView.Selection>,
-    ): Flow<DydxMarketAccountTabView.Selection> {
-        return mutableAccountTabFlow
-    }
-
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableAccountTabSelection(): MutableStateFlow<DydxMarketAccountTabView.Selection> {
-        return MutableStateFlow(DydxMarketAccountTabView.Selection.Position)
-    }
+    ): Flow<DydxMarketAccountTabView.Selection>
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideTileSelection(
+    @Binds
+    fun bindTileSelection(
         mutableTileFlow: MutableStateFlow<DydxMarketTilesView.Tile>,
-    ): Flow<DydxMarketTilesView.Tile> {
-        return mutableTileFlow
-    }
+    ): Flow<DydxMarketTilesView.Tile>
+
+    companion object {
+        @Provides
+        @ActivityRetainedScoped
+        fun provideMutableStatsTabSelection(): MutableStateFlow<DydxMarketStatsTabView.Selection> {
+            return MutableStateFlow(DydxMarketStatsTabView.Selection.Statistics)
+        }
+
+        @Provides
+        @ActivityRetainedScoped
+        fun provideMutableAccountTabSelection(): MutableStateFlow<DydxMarketAccountTabView.Selection> {
+            return MutableStateFlow(DydxMarketAccountTabView.Selection.Position)
+        }
 
-    @Provides
-    @ActivityRetainedScoped
-    fun provideMutableTileSelection(): MutableStateFlow<DydxMarketTilesView.Tile> {
-        return MutableStateFlow(DydxMarketTilesView.Tile(DydxMarketTilesView.TileType.PRICE))
+        @Provides
+        @ActivityRetainedScoped
+        fun provideMutableTileSelection(): MutableStateFlow<DydxMarketTilesView.Tile> {
+            return MutableStateFlow(DydxMarketTilesView.Tile(DydxMarketTilesView.TileType.PRICE))
+        }
     }
 }
diff --git a/...src/main/java/exchange/dydx/trading/feature/market/marketinfo/streams/MarketInfoStream.kt b/...src/main/java/exchange/dydx/trading/feature/market/marketinfo/streams/MarketInfoStream.kt
@@ -1,5 +1,6 @@
 package exchange.dydx.trading.feature.market.marketinfo.streams
 
+import dagger.hilt.android.scopes.ActivityRetainedScoped
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
 import exchange.dydx.abacus.output.PositionSide
@@ -20,6 +21,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.newSingleThreadContext
+import javax.inject.Inject
 
 interface MarketInfoStreaming {
     val market: Flow<PerpetualMarket?>
@@ -32,7 +34,8 @@ interface MutableMarketInfoStreaming : MarketInfoStreaming {
     fun update(marketId: String?)
 }
 
-class MarketInfoStream(
+@ActivityRetainedScoped
+class MarketInfoStream @Inject constructor(
     val abacusStateManager: AbacusStateManagerProtocol,
     val formatter: DydxFormatter,
     val localizer: LocalizerProtocol,

diff --git a/.../java/exchange/dydx/trading/feature/newsalerts/alerts/alertprovider/DydxAlertsProvider.kt b/.../java/exchange/dydx/trading/feature/newsalerts/alerts/alertprovider/DydxAlertsProvider.kt
@@ -5,8 +5,9 @@ import exchange.dydx.trading.feature.newsalerts.alerts.alertprovider.providers.D
 import exchange.dydx.trading.feature.newsalerts.alerts.alertprovider.providers.DydxTransferAlertsProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import javax.inject.Inject
 
-class DydxAlertsProvider(
+class DydxAlertsProvider @Inject constructor(
     val dydxSystemAlertsProvider: DydxSystemAlertsProvider,
     val dydxTransferAlertsProvider: DydxTransferAlertsProvider,
     val dydxFrontEndAlertsProvider: DydxFrontendAlertsProvider,

diff --git a/...x/trading/feature/newsalerts/alerts/alertprovider/providers/DydxFrontendAlertsProvider.kt b/...x/trading/feature/newsalerts/alerts/alertprovider/providers/DydxFrontendAlertsProvider.kt
@@ -11,8 +11,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import java.util.Date
+import javax.inject.Inject
 
-class DydxFrontendAlertsProvider(
+class DydxFrontendAlertsProvider @Inject constructor(
     private val abacusStateManger: AbacusStateManagerProtocol,
     private val router: DydxRouter,
 ) : DydxCustomAlertsProviderProtocol {

diff --git a/...ydx/trading/feature/newsalerts/alerts/alertprovider/providers/DydxSystemAlertsProvider.kt b/...ydx/trading/feature/newsalerts/alerts/alertprovider/providers/DydxSystemAlertsProvider.kt
@@ -1,5 +1,6 @@
 package exchange.dydx.trading.feature.newsalerts.alerts.alertprovider.providers
 
+import dagger.hilt.android.scopes.ActivityRetainedScoped
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.abacus.state.manager.ApiState
 import exchange.dydx.abacus.state.manager.ApiStatus
@@ -16,8 +17,10 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import java.util.Date
+import javax.inject.Inject
 
-class DydxSystemAlertsProvider(
+@ActivityRetainedScoped
+class DydxSystemAlertsProvider @Inject constructor(
     private val abacusStateManger: AbacusStateManagerProtocol,
     private val router: DydxRouter,
     private val localizer: LocalizerProtocol,

diff --git a/...x/trading/feature/newsalerts/alerts/alertprovider/providers/DydxTransferAlertsProvider.kt b/...x/trading/feature/newsalerts/alerts/alertprovider/providers/DydxTransferAlertsProvider.kt
@@ -19,8 +19,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import java.util.Date
+import javax.inject.Inject
 
-class DydxTransferAlertsProvider(
+class DydxTransferAlertsProvider @Inject constructor(
     private val abacusStateManger: AbacusStateManagerProtocol,
     private val router: DydxRouter,
     private val localizer: LocalizerProtocol,