Move AccountsDrawerHandler injection back to model

bitfireAT · Jan 15, 2025 · e1ea78e · e1ea78e
1 parent 811338d
commit e1ea78e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsModel.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsModel.kt
@@ -50,6 +50,7 @@ import java.util.logging.Logger
 class AccountsModel @AssistedInject constructor(
     @Assisted val syncAccountsOnInit: Boolean,
     private val accountRepository: AccountRepository,
+    internal val accountsDrawerHandler: AccountsDrawerHandler,
     @ApplicationContext val context: Context,
     private val db: AppDatabase,
     introPageFactory: IntroPageFactory,

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt
@@ -89,8 +89,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun AccountsScreen(
-    initialSyncAccounts: Boolean,
-    accountsDrawerHandler: AccountsDrawerHandler
+    initialSyncAccounts: Boolean
 ) {
     val context = LocalContext.current
     val activity = context as? Activity
@@ -100,7 +99,6 @@ fun AccountsScreen(
     }
 
     AccountsScreen(
-        accountsDrawerHandler = accountsDrawerHandler,
         initialSyncAccounts = initialSyncAccounts,
         onShowAppIntro = {
             introActivityLauncher.launch(null)
@@ -124,7 +122,6 @@ fun AccountsScreen(
 
 @Composable
 fun AccountsScreen(
-    accountsDrawerHandler: AccountsDrawerHandler,
     initialSyncAccounts: Boolean,
     onShowAppIntro: () -> Unit,
     onAddAccount: () -> Unit,
@@ -151,7 +148,7 @@ fun AccountsScreen(
     }
 
     AccountsScreen(
-        accountsDrawerHandler = accountsDrawerHandler,
+        accountsDrawerHandler = model.accountsDrawerHandler,
         accounts = accounts,
         showSyncAll = showSyncAll,
         onSyncAll = { model.syncAllAccounts() },

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt
@@ -15,16 +15,22 @@ import androidx.appcompat.app.AppCompatActivity
 import at.bitfire.davdroid.ui.navigation.Destination
 import at.bitfire.davdroid.ui.navigation.Navigation
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.logging.Logger
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity: AppCompatActivity() {
 
+    @Inject
+    lateinit var logger: Logger
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
             Navigation(
-                deepLinkUri = intent.data
+                deepLinkUri = intent.data,
+                logger = logger
             )
         }
     }

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/navigation/Navigation.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/navigation/Navigation.kt
@@ -7,35 +7,16 @@ package at.bitfire.davdroid.ui.navigation
 import android.net.Uri
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.ViewModel
 import androidx.navigation.NavDeepLinkRequest
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import at.bitfire.davdroid.ui.AccountsDrawerHandler
 import at.bitfire.davdroid.ui.AccountsScreen
-import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.logging.Logger
-import javax.inject.Inject
 
 @Composable
-fun Navigation(deepLinkUri: Uri?) {
-    val model = hiltViewModel<NavigationModel>()
-    Navigation_WithModel(
-        deepLinkUri = deepLinkUri,
-        accountsDrawerHandler = model.accountsDrawerHandler,
-        logger = model.logger,
-    )
-}
-
-@Composable
-private fun Navigation_WithModel(
-    deepLinkUri: Uri?,
-    accountsDrawerHandler: AccountsDrawerHandler,
-    logger: Logger
-) {
+fun Navigation(deepLinkUri: Uri?, logger: Logger) {
     val navController = rememberNavController()
 
     LaunchedEffect(Unit) {
@@ -55,16 +36,8 @@ private fun Navigation_WithModel(
         ) { backStackEntry ->
             val route = backStackEntry.toRoute<Destination.Accounts>()
             AccountsScreen(
-                initialSyncAccounts = route.syncAccounts,
-                accountsDrawerHandler = accountsDrawerHandler
+                initialSyncAccounts = route.syncAccounts
             )
         }
     }
-}
-
-// only for dependency injection
-@HiltViewModel
-class NavigationModel @Inject constructor(
-    val accountsDrawerHandler: AccountsDrawerHandler,
-    val logger: Logger
-): ViewModel()
+}