Migrate EditSubscriptionActivity to Nav3 (#662)

* Migrate EditSubscriptionActivity to Nav3

* Add BackHandler for dialog

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

* Fixed going back being called twice

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

* Cleanup

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

* Updated comments

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

* Fix missing comment

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

---------

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

Author: ArnyminerZ

app/src/main/AndroidManifest.xml

@@ -114,11 +114,6 @@
                 <data android:mimeType="text/calendar" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.views.EditSubscriptionActivity"
-            android:label="@string/activity_edit_calendar"
-            android:parentActivityName=".MainActivity"
-            android:windowSoftInputMode="stateAlwaysHidden" />
 
     </application>
 

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

@@ -6,9 +6,8 @@ package at.bitfire.icsdroid.model
 
 import android.content.Context
 import android.util.Log
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import at.bitfire.icsdroid.Constants
@@ -25,6 +24,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @HiltViewModel(assistedFactory = EditSubscriptionModel.EditSubscriptionModelFactory::class)
 class EditSubscriptionModel @AssistedInject constructor(
@@ -78,9 +78,6 @@ class EditSubscriptionModel @AssistedInject constructor(
             credentialsDirty || subscriptionsDirty
         }
 
-    var successMessage: String? by mutableStateOf(null)
-        private set
-
     var subscriptionWithCredential: SubscriptionsDao.SubscriptionWithCredential? = null
         private set
 
@@ -107,6 +104,10 @@ class EditSubscriptionModel @AssistedInject constructor(
         subscriptionSettingsUseCase.update(subscription, credential)
     }
 
+    private suspend fun showMessage(@StringRes message: Int) = withContext(Dispatchers.Main) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+    }
+
     /**
      * Updates the loaded subscription from the data provided by the view models.
      */
@@ -131,7 +132,7 @@ class EditSubscriptionModel @AssistedInject constructor(
                     db.credentialsDao().removeBySubscriptionId(subscriptionId)
 
                 // notify UI about success
-                successMessage = context.getString(R.string.edit_calendar_saved)
+                showMessage(R.string.edit_calendar_saved)
 
                 // sync the subscription to reflect the changes in the calendar provider
                 SyncWorker.run(context, forceResync = true)
@@ -151,7 +152,7 @@ class EditSubscriptionModel @AssistedInject constructor(
                 SyncWorker.run(context)
 
                 // notify UI about success
-                successMessage = context.getString(R.string.edit_calendar_deleted)
+                showMessage(R.string.edit_calendar_deleted)
             } ?: Log.w(Constants.TAG, "There's no subscription to remove")
         }
     }

app/src/main/java/at/bitfire/icsdroid/ui/nav/Destination.kt

@@ -22,4 +22,9 @@ sealed interface Destination : NavKey {
         @param:ColorInt val color: Int? = null,
         val url: String? = null,
     ): Destination
+
+    @Serializable
+    data class EditSubscription(
+        val subscriptionId: Long
+    ): Destination
 }

app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt

@@ -14,6 +14,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.core.content.IntentCompat
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.app.ShareCompat
 import androidx.core.os.BundleCompat
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.entry
@@ -25,10 +27,12 @@ import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
 import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_ERROR_MESSAGE
 import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_REQUEST_CALENDAR_PERMISSION
 import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_THROWABLE
+import at.bitfire.icsdroid.R
 import at.bitfire.icsdroid.service.ComposableStartupService
 import at.bitfire.icsdroid.ui.partials.AlertDialog
 import at.bitfire.icsdroid.ui.screen.AddSubscriptionScreen
 import at.bitfire.icsdroid.ui.screen.InfoScreen
+import at.bitfire.icsdroid.ui.screen.EditSubscriptionScreen
 import at.bitfire.icsdroid.ui.screen.SubscriptionsScreen
 import java.util.ServiceLoader
 
@@ -110,8 +114,9 @@ fun MainApp(
             entry(Destination.SubscriptionList) {
                 SubscriptionsScreen(
                     requestPermissions,
+                    onAddRequested = { backStack.add(Destination.AddSubscription()) },
+                    onItemSelected = { backStack.add(Destination.EditSubscription(it.id)) },
                     onAboutRequested = { backStack.add(Destination.Info) },
-                    onAddRequested = { backStack.add(Destination.AddSubscription()) }
                 )
             }
             entry(Destination.Info) {
@@ -128,6 +133,21 @@ fun MainApp(
                     onBackRequested = { goBack() }
                 )
             }
+            entry<Destination.EditSubscription> { destination ->
+                val context = LocalContext.current
+                EditSubscriptionScreen(
+                    subscriptionId = destination.subscriptionId,
+                    onShare = { subscription ->
+                        ShareCompat.IntentBuilder(context)
+                            .setSubject(subscription.displayName)
+                            .setText(subscription.url.toString())
+                            .setType("text/plain")
+                            .setChooserTitle(R.string.edit_calendar_send_url)
+                            .startChooser()
+                    },
+                    onExit = ::goBack
+                )
+            }
         }
     )
 }

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

@@ -4,7 +4,7 @@
 
 package at.bitfire.icsdroid.ui.screen
 
-import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -28,7 +28,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -58,9 +57,10 @@ fun EditSubscriptionScreen(
         EditSubscriptionScreen(
             inputValid = model.inputValid,
             modelsDirty = model.modelsDirty,
-            successMessage = model.successMessage,
             onDelete = model::removeSubscription,
-            onSave = model::updateSubscription,
+            onSave = {
+                model.updateSubscription().invokeOnCompletion { onExit() }
+            },
             onShare = {
                 model.subscriptionWithCredential?.let { (subscription) ->
                     onShare(subscription)
@@ -100,7 +100,6 @@ fun EditSubscriptionScreen(
 fun EditSubscriptionScreen(
     inputValid: Boolean,
     modelsDirty: Boolean,
-    successMessage: String?,
     onDelete: () -> Unit,
     onSave: () -> Unit,
     onShare: () -> Unit,
@@ -131,12 +130,6 @@ fun EditSubscriptionScreen(
     onUsernameChange: (String) -> Unit,
     onPasswordChange: (String) -> Unit
 ) {
-    // show success message
-    successMessage?.let {
-        Toast.makeText(LocalContext.current, successMessage, Toast.LENGTH_LONG).show()
-        onExit()
-    }
-
     Scaffold(
         topBar = {
             AppBarComposable(
@@ -236,6 +229,11 @@ private fun AppBarComposable(
             dismissButton = stringResource(R.string.edit_calendar_dismiss) to onExit
         ) { openSaveDismissDialog = false }
     }
+
+    BackHandler(enabled = modelsDirty) {
+        openSaveDismissDialog = true
+    }
+
     ExtendedTopAppBar(
         navigationIcon = {
             IconButton(
@@ -276,7 +274,6 @@ fun EditSubscriptionScreen_Preview() {
         EditSubscriptionScreen(
             inputValid = true,
             modelsDirty = false,
-            successMessage = "yay!",
             onDelete = {},
             onSave = {},
             onShare = {},

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

@@ -62,13 +62,13 @@ import at.bitfire.icsdroid.ui.partials.CalendarListItem
 import at.bitfire.icsdroid.ui.partials.ExtendedTopAppBar
 import at.bitfire.icsdroid.ui.partials.GenericAlertDialog
 import at.bitfire.icsdroid.ui.partials.SyncIntervalDialog
-import at.bitfire.icsdroid.ui.views.EditSubscriptionActivity
 
 @Composable
 fun SubscriptionsScreen(
     requestPermissions: Boolean,
     onAboutRequested: () -> Unit,
     onAddRequested: () -> Unit,
+    onItemSelected: (Subscription) -> Unit,
     model: SubscriptionsModel = hiltViewModel()
 ) {
     val activity = LocalActivity.current
@@ -100,12 +100,7 @@ fun SubscriptionsScreen(
         onAddRequested = onAddRequested,
         onRequestCalendarPermissions = requestCalendarPermissions,
         onRequestNotificationPermission = requestNotificationPermission,
-        onItemSelected = { subscription ->
-            activity?.startActivity(
-                Intent(context, EditSubscriptionActivity::class.java)
-                    .putExtra(EditSubscriptionActivity.EXTRA_SUBSCRIPTION_ID, subscription.id)
-            )
-        }
+        onItemSelected = onItemSelected
     )
 }
 

app/src/main/java/at/bitfire/icsdroid/ui/views/EditSubscriptionActivity.kt

@@ -17,7 +17,7 @@
     <string name="install_browser">Please install a Web browser</string>
     <string name="required_annotation">Required</string>
 
-    <!-- CalendarListActivity -->
+    <!-- SubscriptionScreen -->
     <string name="title_activity_calendar_list">My subscriptions</string>
     <string name="calendar_list_empty_info">To subscribe to a Webcal feed, use the + button or open a Webcal URL.</string>
     <string name="calendar_list_info">About ICSx⁵</string>
@@ -33,7 +33,7 @@
     <string name="calendar_list_autorevoke_permissions_title">Auto-Revoke Permissions</string>
     <string name="calendar_list_autorevoke_permissions_text">Android revokes permissions of rarely opened apps. Please disable for %s.</string>
     <string name="calendar_list_autorevoke_permissions_instruction">Click Permissions > uncheck \"Remove permissions if app isn\'t used\"</string>
-    <!-- settings, currently in CalendarListActivity -->
+    <!-- settings, currently in SubscriptionsScreen -->
     <string name="calendar_list_privacy_policy">Privacy policy</string>
     <string name="set_sync_interval_title">Set sync. interval:</string>
     <string-array name="set_sync_interval_seconds" translatable="false">
@@ -56,7 +56,7 @@
     </string-array>
     <string name="settings_force_dark_theme">Force dark theme</string>
 
-    <!-- AddCalendarActivity -->
+    <!-- AddSubscriptionScreen -->
     <string name="activity_add_calendar">Subscribe to calendar</string>
     <string name="activity_add_calendar_subscribe">Subscribe</string>
     <string name="add_calendar_subscribe_url">Subscribe to URL</string>
@@ -92,10 +92,10 @@
     <string name="add_calendar_custom_user_agent_label">Custom user agent string</string>
     <string name="add_calendar_custom_user_agent_description">Replace the default user agent with a custom one.</string>
 
-    <!-- AlertFragment -->
+    <!-- AlertDialog -->
     <string name="alert_share_details">Share details</string>
 
-    <!-- EditCalendarActivity -->
+    <!-- EditSubscriptionScreen -->
     <string name="activity_edit_calendar">Edit subscription</string>
     <string name="edit_calendar_cancel">Cancel</string>
     <string name="edit_calendar_delete">Unsubscribe</string>
@@ -117,7 +117,7 @@
     <string name="sync_permission_required_sync_calendar">Needing permission to sync your calendar</string>
     <string name="could_not_open_storage_file">Couldn\'t open file from storage</string>
 
-    <!-- InfoActivity -->
+    <!-- InfoScreen -->
     <string name="activity_app_info">App info</string>
     <string name="app_info_version">Version %1$s-%2$s</string>
     <string name="app_info_copyright">© Ricki Hirner, Bernhard Stockmann (bitfire web engineering GmbH) and contributors</string>