Add UI for OPML imports/exports

.gitignore

@@ -8,6 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
 .DS_Store
 /build
 /captures

app/src/main/AndroidManifest.xml

@@ -2,17 +2,22 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".MainApplication"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.CapyReader"
-        android:enableOnBackInvokedCallback="true"
         tools:targetApi="33">
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
@@ -48,5 +53,10 @@
                 android:value="androidx.startup"
                 tools:node="remove" />
         </provider>
+
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
     </application>
 </manifest>

app/src/main/java/com/jocmp/capyreader/Notifications.kt

@@ -0,0 +1,5 @@
+package com.jocmp.capyreader
+
+enum class Notifications(val channelID: String, val notificationID: Int) {
+    OPML_IMPORT(channelID = "opml_import", notificationID = 6170000)
+}

app/src/main/java/com/jocmp/capyreader/transfers/OPMLImportWorker.kt

@@ -0,0 +1,158 @@
+package com.jocmp.capyreader.transfers
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.net.Uri
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.Data
+import androidx.work.ExistingWorkPolicy
+import androidx.work.ForegroundInfo
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import androidx.work.workDataOf
+import com.jocmp.capy.Account
+import com.jocmp.capyreader.Notifications
+import com.jocmp.capyreader.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.util.UUID
+import kotlin.math.roundToInt
+
+
+class OPMLImportWorker(
+    context: Context,
+    parameters: WorkerParameters
+) : CoroutineWorker(context, parameters), KoinComponent {
+    private val account by inject<Account>()
+
+    private val channelID = Notifications.OPML_IMPORT.channelID
+    private val notificationsID = Notifications.OPML_IMPORT.notificationID
+
+    private val notificationManager =
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as
+                NotificationManager
+
+    override suspend fun doWork(): Result {
+        val uriValue = inputData.getString(OPML_URI_KEY) ?: return Result.failure()
+        val opmlURI = Uri.parse(uriValue)
+
+        setForeground(createForegroundInfo())
+        import(opmlURI)
+
+        showCompleteToast()
+
+        return Result.success()
+    }
+
+    private suspend fun import(opmlUri: Uri) {
+        val inputStream = applicationContext.contentResolver.openInputStream(opmlUri)!!
+
+        account.import(inputStream) { progress ->
+            val notification = buildNotification(
+                percentProgress = (progress.percent * 100f).roundToInt(),
+            )
+
+            setProgressAsync(
+                workDataOf(
+                    PROGRESS_CURRENT_COUNT to progress.currentCount,
+                    PROGRESS_TOTAL to progress.total
+                )
+            )
+
+            setForegroundAsync(
+                ForegroundInfo(
+                    notificationsID,
+                    notification,
+                    FOREGROUND_SERVICE_TYPE_DATA_SYNC
+                )
+            )
+        }
+    }
+
+    private fun createForegroundInfo(): ForegroundInfo {
+        createChannel()
+
+        val notification = buildNotification(
+            percentProgress = 0,
+            applicationContext.getString(R.string.opml_import_progress_content_text_start)
+        )
+
+        return ForegroundInfo(notificationsID, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+    }
+
+    private fun buildNotification(
+        percentProgress: Int,
+        contentText: String? = null
+    ): Notification {
+        val title = applicationContext.getString(R.string.opml_import_notification_title)
+
+        return NotificationCompat.Builder(applicationContext, channelID)
+            .setContentTitle(title)
+            .setOnlyAlertOnce(true)
+            .setContentText(contentText)
+            .setProgress(100, percentProgress, false)
+            .setSmallIcon(R.drawable.ic_rounded_sync)
+            .setTicker(title)
+            .setOngoing(true)
+            .build()
+    }
+
+    private fun createChannel() {
+        val name = applicationContext.getString(R.string.notifications_channel_title)
+        val channel = NotificationChannel(channelID, name, NotificationManager.IMPORTANCE_DEFAULT)
+
+        notificationManager.createNotificationChannel(channel)
+    }
+
+    private suspend fun showCompleteToast() = withContext(Dispatchers.Main) {
+        Toast.makeText(
+            applicationContext,
+            applicationContext.getString(R.string.opml_import_toast_complete),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+    companion object {
+        const val PROGRESS_CURRENT_COUNT = "PROGRESS_CURRENT_COUNT"
+
+        const val PROGRESS_TOTAL = "PROGRESS_TOTAL"
+
+        private const val OPML_URI_KEY = "OPML_URI_KEY"
+
+        private const val WORK_NAME = "OPML_IMPORT"
+
+        fun performAsync(context: Context, uri: Uri): UUID {
+            val request = OneTimeWorkRequestBuilder<OPMLImportWorker>()
+                .setConstraints(
+                    Constraints.Builder()
+                        .setRequiredNetworkType(NetworkType.CONNECTED)
+                        .build()
+                )
+                .setInputData(
+                    Data
+                        .Builder()
+                        .putString(OPML_URI_KEY, uri.toString())
+                        .build()
+                )
+                .build()
+
+            WorkManager.getInstance(context).enqueueUniqueWork(
+                WORK_NAME,
+                ExistingWorkPolicy.REPLACE,
+                request
+            )
+
+            return request.id
+        }
+    }
+}

app/src/main/java/com/jocmp/capyreader/ui/App.kt

@@ -32,18 +32,20 @@ fun App(
                 accountsGraph(
                     isCompactWidth = compactWidth,
                     onNavigateToLogin = {
-                        navController.navigate(Route.Login)
+                        navController.navigate(Route.Login.path)
                     },
                     onAddSuccess = {
-                        navController.navigate(Route.Articles) {
+                        navController.navigate(Route.Articles.path) {
+                            launchSingleTop = true
+
                             popUpTo(Route.AddAccount.path) {
                                 inclusive = true
                             }
                         }
                     },
-                    onLogout = {
-                        navController.navigate(Route.Login) {
-                            popUpTo(navController.graph.startDestinationId) {
+                    onRemoveAccount = {
+                        navController.navigate(Route.AddAccount.path) {
+                            popUpTo(Route.Articles.path) {
                                 inclusive = true
                             }
                         }

app/src/main/java/com/jocmp/capyreader/ui/CurrentWindowSizeClass.kt

@@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable
 import androidx.window.core.layout.WindowWidthSizeClass.Companion.EXPANDED
 
 @Composable
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 fun currentWindowSizeClass() = currentWindowAdaptiveInfo().windowSizeClass
 
 @Composable

app/src/main/java/com/jocmp/capyreader/ui/Route.kt

@@ -13,9 +13,3 @@ sealed class Route(val path: String) {
 
     data object Articles : Route("articles")
 }
-
-fun NavController.navigate(route: Route) = navigate(route.path)
-
-fun NavController.navigate(route: Route, builder: NavOptionsBuilder.() -> Unit) {
-    navigate(route.path, navOptions(builder))
-}

app/src/main/java/com/jocmp/capyreader/ui/accounts/AccountNavigation.kt

@@ -13,7 +13,7 @@ import com.jocmp.capyreader.ui.settings.SettingsScreen
 fun NavGraphBuilder.accountsGraph(
     onAddSuccess: () -> Unit,
     onNavigateToLogin: () -> Unit,
-    onLogout: () -> Unit,
+    onRemoveAccount: () -> Unit,
     onNavigateBackFromSettings: () -> Unit,
     isCompactWidth: Boolean,
 ) {
@@ -30,7 +30,7 @@ fun NavGraphBuilder.accountsGraph(
     }
     dynamicLayout(isCompactWidth) {
         SettingsScreen(
-            onLogout = onLogout,
+            onRemoveAccount = onRemoveAccount,
             onNavigateBack = onNavigateBackFromSettings
         )
     }

app/src/main/java/com/jocmp/capyreader/ui/accounts/AddAccountScreen.kt

@@ -1,5 +1,6 @@
 package com.jocmp.capyreader.ui.accounts
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import org.koin.compose.koinInject
 

app/src/main/java/com/jocmp/capyreader/ui/accounts/LoginView.kt

@@ -3,10 +3,8 @@ package com.jocmp.capyreader.ui.accounts
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -19,7 +17,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.jocmp.capyreader.R
 import com.jocmp.capyreader.setupCommonModules
-import com.jocmp.capyreader.ui.components.CrashReportingCheckbox
 import com.jocmp.capyreader.ui.components.widthMaxSingleColumn
 import org.koin.android.ext.koin.androidContext
 import org.koin.compose.KoinApplication
@@ -68,9 +65,6 @@ fun LoginView(
                         errorMessage = errorMessage
                     )
                 }
-                Row(Modifier.padding(horizontal = 8.dp)) {
-                    CrashReportingCheckbox()
-                }
             }
         }
     }

app/src/main/java/com/jocmp/capyreader/ui/articles/AddFeedView.kt

@@ -84,7 +84,7 @@ fun AddFeedView(
                         Text(stringResource(resource))
                     }
                 },
-                maxLines = 1,
+                singleLine = true,
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),

app/src/main/java/com/jocmp/capyreader/ui/articles/ArticleNavigation.kt

@@ -1,11 +1,9 @@
 package com.jocmp.capyreader.ui.articles
 
-import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.jocmp.capyreader.ui.Route
-import com.jocmp.capyreader.ui.navigate
 
 fun NavGraphBuilder.articleGraph(
     navController: NavController,
@@ -15,18 +13,10 @@ fun NavGraphBuilder.articleGraph(
     ) {
         ArticleScreen(
             onNavigateToSettings = {
-                navController.navigate(Route.Settings)
+                navController.navigate(Route.Settings.path) {
+                    launchSingleTop = true
+                }
             }
         )
     }
 }
-
-internal class EditFeedArgs(val feedID: String) {
-    constructor(savedStateHandle: SavedStateHandle) :
-            this(checkNotNull(savedStateHandle["id"]) as String)
-}
-
-internal class EditFolderArgs(val folderTitle: String) {
-    constructor(savedStateHandle: SavedStateHandle) :
-            this(checkNotNull(savedStateHandle["title"]) as String)
-}