Use VM factory

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

Author: ArnyminerZ

app/src/main/java/at/bitfire/icsdroid/model/AddSubscriptionModel.kt

@@ -18,6 +18,9 @@ import at.bitfire.icsdroid.db.AppDatabase
 import at.bitfire.icsdroid.db.entity.Credential
 import at.bitfire.icsdroid.db.entity.Subscription
 import at.bitfire.icsdroid.ui.ResourceInfo
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -26,16 +29,34 @@ import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.net.URI
 import java.net.URISyntaxException
-import javax.inject.Inject
 
-@HiltViewModel
-class AddSubscriptionModel @Inject constructor(
+@HiltViewModel(assistedFactory = AddSubscriptionModel.Factory::class)
+class AddSubscriptionModel @AssistedInject constructor(
+    @Assisted("title") initialTitle: String?,
+    @Assisted("color") initialColor: Int?,
+    @Assisted("url") initialUrl: String?,
     @param:ApplicationContext private val context: Context,
     private val db: AppDatabase,
-    val validator: Validator,
-    val subscriptionSettingsUseCase: SubscriptionSettingsUseCase
+    val validator: Validator
 ) : ViewModel() {
 
+    @AssistedFactory
+    interface Factory {
+        fun create(
+            @Assisted("title") title: String? = null,
+            @Assisted("color") color: Int? = null,
+            @Assisted("url") url: String? = null
+        ): AddSubscriptionModel
+    }
+
+    val subscriptionSettingsUseCase: SubscriptionSettingsUseCase = SubscriptionSettingsUseCase(
+        SubscriptionSettingsUseCase.UiState(
+            title = initialTitle,
+            color = initialColor,
+            url = initialUrl
+        )
+    )
+
     data class UiState(
         val errorMessage: String? = null,
         val isCreating: Boolean = false,
@@ -225,15 +246,6 @@ class AddSubscriptionModel @Inject constructor(
         return uri
     }
 
-    fun initialize(title: String?, color: Int?, url: String?,) {
-        if (subscriptionSettingsUseCase.uiState.isInitialized()) return
-        subscriptionSettingsUseCase.setInitialValues(title, color, url)
-
-        if (url != null) {
-            checkUrlIntroductionPage()
-        }
-    }
-
     fun onFilePicked(uri: Uri?) {
         if (uri == null) return
 

app/src/main/java/at/bitfire/icsdroid/model/SubscriptionSettingsUseCase.kt

@@ -9,7 +9,11 @@ import at.bitfire.icsdroid.db.entity.Credential
 import at.bitfire.icsdroid.db.entity.Subscription
 import javax.inject.Inject
 
-class SubscriptionSettingsUseCase @Inject constructor() {
+class SubscriptionSettingsUseCase(initialUiState: UiState = UiState()) {
+
+    @Deprecated("Do not inject constructor. Manually initialize with initial state.")
+    @Inject constructor(): this(UiState())
+
     data class UiState(
         val url: String? = null,
         val fileName: String? = null,
@@ -33,11 +37,9 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         val validUrlInput: Boolean = url?.let { url ->
             HttpUtils.acceptedProtocol(url.toUri())
         } ?: false
-
-        fun isInitialized() = url != null || title != null || color != null
     }
 
-    var uiState by mutableStateOf(UiState())
+    var uiState by mutableStateOf(initialUiState)
         private set
 
     fun setUrl(value: String?) {
@@ -98,24 +100,6 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         )
     }
 
-    /**
-     * Set initial values when creating a new subscription.
-     *
-     * Note that all values will be overwritten, so call this method before changing any individual
-     * value, or when you want to reset the form to an initial state.
-     */
-    fun setInitialValues(
-        title: String?,
-        color: Int?,
-        url: String?,
-    ) {
-        uiState = UiState(
-            title = title,
-            color = color,
-            url = url,
-        )
-    }
-
     fun equalsSubscription(subscription: Subscription) =
         uiState.url == subscription.url.toString()
             && uiState.title == subscription.displayName

app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt

@@ -54,7 +54,9 @@ fun AddSubscriptionScreen(
     title: String?,
     color: Int?,
     url: String?,
-    model: AddSubscriptionModel = hiltViewModel(),
+    model: AddSubscriptionModel = hiltViewModel<AddSubscriptionModel, AddSubscriptionModel.Factory> {
+        it.create(title, color, url)
+    },
     onBackRequested: () -> Unit
 ) {
     val scope = rememberCoroutineScope()
@@ -64,10 +66,6 @@ fun AddSubscriptionScreen(
         ActivityResultContracts.OpenDocument()
     ) { uri: Uri? -> model.onFilePicked(uri) }
 
-    LaunchedEffect(title, color, url) {
-        model.initialize(title, color, url)
-    }
-
     // Receive updates for the URL introduction page
     with(model.subscriptionSettingsUseCase.uiState) {
         LaunchedEffect(url, requiresAuth, username, password) {