Clear form when launching AddSubscriptionScreen (#705)

Signed-off-by: Arnau Mora <[email protected]>

Author: ArnyminerZ

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

@@ -98,6 +98,24 @@ 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

@@ -78,11 +78,10 @@ fun AddSubscriptionScreen(
         }
     }
 
-    LaunchedEffect(Unit) {
-        title?.let(model.subscriptionSettingsUseCase::setTitle)
-        color?.let(model.subscriptionSettingsUseCase::setColor)
-        url?.let {
-            model.subscriptionSettingsUseCase.setUrl(it)
+    LaunchedEffect(title, color, url) {
+        model.subscriptionSettingsUseCase.setInitialValues(title, color, url)
+
+        if (url != null) {
             model.checkUrlIntroductionPage()
         }
     }
@@ -110,28 +109,26 @@ fun AddSubscriptionScreen(
 
     Box(modifier = Modifier.imePadding()) {
         AddSubscriptionScreen(
+            model = model,
             onPickFileRequested = { pickFile.launch(arrayOf("text/calendar")) },
-            finish = onBackRequested,
-            checkUrlIntroductionPage = model::checkUrlIntroductionPage
+            finish = onBackRequested
         )
     }
 }
 
 @Composable
 fun AddSubscriptionScreen(
+    model: AddSubscriptionModel,
     onPickFileRequested: () -> Unit,
-    checkUrlIntroductionPage: () -> Unit,
     finish: () -> Unit
 ) {
     val scope = rememberCoroutineScope()
     val pagerState = rememberPagerState { 2 }
 
-    val model: AddSubscriptionModel = hiltViewModel()
-
     // Receive updates for the URL introduction page
     with(model.subscriptionSettingsUseCase.uiState) {
         LaunchedEffect(url, requiresAuth, username, password) {
-            checkUrlIntroductionPage()
+            model.checkUrlIntroductionPage()
         }
     }