refactor(di): replace Tangle with Whetstone

android/src/main/kotlin/dev/msfjarvis/claw/android/AppComponent.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android
-
-import android.app.Application
-import com.squareup.anvil.annotations.MergeComponent
-import dagger.BindsInstance
-import dagger.Component
-import dev.msfjarvis.claw.injection.scopes.AppScope
-import javax.inject.Singleton
-
-@Singleton
-@MergeComponent(AppScope::class)
-interface AppComponent {
-  @Component.Factory
-  interface Factory {
-    fun create(@BindsInstance application: Application): AppComponent
-  }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt

@@ -7,24 +7,23 @@
 package dev.msfjarvis.claw.android
 
 import android.app.Application
+import com.deliveryhero.whetstone.Whetstone
+import com.deliveryhero.whetstone.app.ApplicationComponentOwner
+import com.deliveryhero.whetstone.app.ContributesAppInjector
 import dev.msfjarvis.claw.core.injection.AppPlugin
-import dev.msfjarvis.claw.injection.Components
-import dev.msfjarvis.claw.injection.scopes.AppScope
 import javax.inject.Inject
-import tangle.inject.TangleGraph
-import tangle.inject.TangleScope
 
-@TangleScope(AppScope::class)
-class ClawApplication : Application() {
+@ContributesAppInjector(generateAppComponent = true)
+class ClawApplication : Application(), ApplicationComponentOwner {
+
+  override val applicationComponent by
+    lazy(LazyThreadSafetyMode.NONE) { GeneratedApplicationComponent.create(this) }
 
   @Inject lateinit var plugins: Set<@JvmSuppressWildcards AppPlugin>
 
   override fun onCreate() {
+    Whetstone.inject(this)
     super.onCreate()
-    val component = DaggerAppComponent.factory().create(this)
-    Components.add(component)
-    TangleGraph.add(component)
-    TangleGraph.inject(this)
     plugins.forEach { plugin -> plugin.apply(this) }
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt

@@ -17,17 +17,16 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import com.deliveryhero.whetstone.Whetstone
+import com.deliveryhero.whetstone.activity.ContributesActivityInjector
 import dev.msfjarvis.claw.android.ui.LobstersApp
 import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
 import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import dev.msfjarvis.claw.injection.scopes.AppScope
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
-import tangle.inject.TangleGraph
-import tangle.inject.TangleScope
 
-@TangleScope(AppScope::class)
+@ContributesActivityInjector
 class MainActivity : ComponentActivity() {
 
   @Inject lateinit var urlLauncher: UrlLauncher
@@ -36,8 +35,8 @@ class MainActivity : ComponentActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    TangleGraph.inject(this)
     installSplashScreen()
+    Whetstone.inject(this)
     setContent {
       LobstersApp(
         urlLauncher = urlLauncher,

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/UrlLauncherModule.kt

@@ -7,17 +7,18 @@
 package dev.msfjarvis.claw.android.injection
 
 import android.content.Context
+import com.deliveryhero.whetstone.ForScope
+import com.deliveryhero.whetstone.activity.ActivityScope
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import dev.msfjarvis.claw.injection.scopes.AppScope
 
 @Module
-@ContributesTo(AppScope::class)
+@ContributesTo(ActivityScope::class)
 object UrlLauncherModule {
   @Provides
-  fun provideUrlLauncher(context: Context): UrlLauncher {
+  fun provideUrlLauncher(@ForScope(ActivityScope::class) context: Context): UrlLauncher {
     return UrlLauncher(context)
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt

@@ -32,6 +32,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.deliveryhero.whetstone.compose.injectedViewModel
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dev.msfjarvis.claw.android.R
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
@@ -53,7 +54,6 @@ import kotlinx.coroutines.launch
 import soup.compose.material.motion.navigation.MaterialMotionNavHost
 import soup.compose.material.motion.navigation.composable
 import soup.compose.material.motion.navigation.rememberMaterialMotionNavController
-import tangle.viewmodel.compose.tangleViewModel
 
 @Suppress("ModifierMissing") // Top-level composable, will never have a modifier supplied.
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
@@ -62,7 +62,7 @@ fun LobstersApp(
   urlLauncher: UrlLauncher,
   htmlConverter: HTMLConverter,
   setWebUri: (String?) -> Unit,
-  viewModel: ClawViewModel = tangleViewModel(),
+  viewModel: ClawViewModel = injectedViewModel(),
 ) {
   val systemUiController = rememberSystemUiController()
   val hottestListState = rememberLazyListState()

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
+import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
 import com.slack.eithernet.ApiResult.Failure
 import com.slack.eithernet.ApiResult.Success
 import dev.msfjarvis.claw.android.injection.IODispatcher
@@ -19,15 +20,16 @@ import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.database.local.SavedPost
 import java.io.IOException
 import java.time.Month
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import tangle.viewmodel.VMInject
 
+@ContributesViewModel
 class ClawViewModel
-@VMInject
+@Inject
 constructor(
   private val api: LobstersApi,
   private val savedPostsRepository: SavedPostsRepository,

android/src/main/kotlin/dev/msfjarvis/claw/android/work/SavedPostUpdaterWorker.kt

@@ -9,17 +9,18 @@ package dev.msfjarvis.claw.android.work
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import com.deliveryhero.whetstone.ForScope
+import com.deliveryhero.whetstone.worker.ContributesWorker
+import com.deliveryhero.whetstone.worker.WorkerScope
 import com.slack.eithernet.ApiResult
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.posts.toDbModel
+import javax.inject.Inject
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.supervisorScope
-import tangle.work.TangleWorker
 
 /**
  * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository], fetches
@@ -27,14 +28,14 @@ import tangle.work.TangleWorker
  * saved posts that were saved before comment counts were added to be able to show a comment count
  * and for new-enough posts that are still getting comments to have an accurate one.
  */
-@TangleWorker
+@ContributesWorker
 class SavedPostUpdaterWorker
-@AssistedInject
+@Inject
 constructor(
+  @ForScope(WorkerScope::class) appContext: Context,
+  workerParams: WorkerParameters,
   private val savedPostsRepository: SavedPostsRepository,
   private val lobstersApi: LobstersApi,
-  @Assisted appContext: Context,
-  @Assisted workerParams: WorkerParameters,
 ) : CoroutineWorker(appContext, workerParams) {
   override suspend fun doWork(): Result {
     val posts = savedPostsRepository.savedPosts.first()

android/src/main/kotlin/dev/msfjarvis/claw/android/work/WorkManagerPlugin.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.work
-
-import android.app.Application
-import android.util.Log
-import androidx.work.Configuration
-import androidx.work.WorkManager
-import com.squareup.anvil.annotations.ContributesMultibinding
-import dev.msfjarvis.claw.core.injection.AppPlugin
-import dev.msfjarvis.claw.injection.scopes.AppScope
-import javax.inject.Inject
-import tangle.work.TangleWorkerFactory
-
-@ContributesMultibinding(AppScope::class)
-class WorkManagerPlugin
-@Inject
-constructor(
-  private val workerFactory: TangleWorkerFactory,
-) : AppPlugin {
-  override fun apply(application: Application) {
-    WorkManager.initialize(
-      application,
-      Configuration.Builder()
-        .setWorkerFactory(workerFactory)
-        .setMinimumLoggingLevel(Log.DEBUG)
-        .build()
-    )
-  }
-}