Merge branch 'migrate-main-activity' into migrate-intro-about

# Conflicts:
#	app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt
#	app/src/ose/kotlin/at/bitfire/davdroid/OseFlavorModule.kt

Author: ArnyminerZ

app/src/main/AndroidManifest.xml

@@ -69,6 +69,14 @@
             </intent-filter>
         </activity>
 
+        <!--
+        Left here for external apps.
+        Automatically redirects to MainActivity.
+        Should be removed in the future.
+        -->
+        <!--suppress DeprecatedClassUsageInspection -->
+        <activity android:name=".ui.AccountsActivity" android:exported="true" />
+
         <activity
             android:name=".ui.AppSettingsActivity"
             android:label="@string/app_settings"

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsActivity.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+@Deprecated("Automatically redirects to MainActivity. Should be removed in the future.")
+class AccountsActivity: AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        startActivity(
+            Intent(this, MainActivity::class.java).apply {
+                action = intent.action
+            }
+        )
+    }
+}

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsModel.kt

@@ -54,8 +54,7 @@ class AccountsModel @AssistedInject constructor(
     private val db: AppDatabase,
     introPageFactory: IntroPageFactory,
     private val logger: Logger,
-    private val syncWorkerManager: SyncWorkerManager,
-    val accountsDrawerHandler: AccountsDrawerHandler
+    private val syncWorkerManager: SyncWorkerManager
 ): ViewModel() {
 
     @AssistedFactory

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt

@@ -91,7 +91,10 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @Composable
-fun AccountsScreen(backStackEntry: NavBackStackEntry) {
+fun AccountsScreen(
+    backStackEntry: NavBackStackEntry,
+    accountsDrawerHandler: AccountsDrawerHandler
+) {
     val route = backStackEntry.toRoute<Routes.Accounts>()
     val navController = LocalNavController.current
     val context = LocalContext.current
@@ -107,6 +110,7 @@ fun AccountsScreen(backStackEntry: NavBackStackEntry) {
     }
 
     AccountsScreen(
+        accountsDrawerHandler = accountsDrawerHandler,
         initialSyncAccounts = route.syncAccounts,
         onShowAppIntro = { navController.navigate(Routes.Intro) },
         onAddAccount = {
@@ -128,6 +132,7 @@ fun AccountsScreen(backStackEntry: NavBackStackEntry) {
 
 @Composable
 fun AccountsScreen(
+    accountsDrawerHandler: AccountsDrawerHandler,
     initialSyncAccounts: Boolean,
     onShowAppIntro: () -> Unit,
     onAddAccount: () -> Unit,
@@ -154,7 +159,7 @@ fun AccountsScreen(
     }
 
     AccountsScreen(
-        accountsDrawerHandler = model.accountsDrawerHandler,
+        accountsDrawerHandler = accountsDrawerHandler,
         accounts = accounts,
         showSyncAll = showSyncAll,
         onSyncAll = { model.syncAllAccounts() },

app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt

@@ -17,11 +17,15 @@ import at.bitfire.davdroid.ui.intro.IntroScreen
 import at.bitfire.davdroid.ui.navigation.LocalNavController
 import at.bitfire.davdroid.ui.navigation.Routes
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 
 @AndroidEntryPoint
 class MainActivity: AppCompatActivity() {
 
+    @Inject
+    lateinit var accountsDrawerHandler: AccountsDrawerHandler
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -33,7 +37,7 @@ class MainActivity: AppCompatActivity() {
                     navController = navController,
                     startDestination = accountsFromIntent()
                 ) {
-                    composable<Routes.Accounts> { AccountsScreen(it) }
+                    composable<Routes.Accounts> { AccountsScreen(it, accountsDrawerHandler) }
                     composable<Routes.Intro> { IntroScreen() }
                     composable<Routes.About> { AboutScreen() }
                 }

app/src/ose/kotlin/at/bitfire/davdroid/OseFlavorModule.kt

@@ -23,16 +23,16 @@ interface OseFlavorModules {
     @Module
     @InstallIn(ActivityComponent::class)
     interface ForActivities {
+        @Binds
+        fun accountsDrawerHandler(impl: OseAccountsDrawerHandler): AccountsDrawerHandler
+
         @Binds
         fun loginTypesProvider(impl: StandardLoginTypesProvider): LoginTypesProvider
     }
 
     @Module
     @InstallIn(ViewModelComponent::class)
     interface ForViewModels {
-        @Binds
-        fun accountsDrawerHandler(impl: OseAccountsDrawerHandler): AccountsDrawerHandler
-
         @Binds
         fun appLicenseInfoProvider(impl: OpenSourceLicenseInfoProvider): AppLicenseInfoProvider