Add UI for OPML imports/exports

jocmp · Jul 2, 2024 · 9b4ea75 · 9b4ea75
1 parent 544896a
commit 9b4ea75
Show file tree

Hide file tree

Showing 11 changed files with 220 additions and 51 deletions.
diff --git a/app/src/main/java/com/jocmp/capyreader/ui/accounts/AccountNavigation.kt b/app/src/main/java/com/jocmp/capyreader/ui/accounts/AccountNavigation.kt
@@ -30,7 +30,7 @@ fun NavGraphBuilder.accountsGraph(
     }
     dynamicLayout(isCompactWidth) {
         SettingsScreen(
-            onLogout = onLogout,
+            onRemoveAccount = onLogout,
             onNavigateBack = onNavigateBackFromSettings
         )
     }

diff --git a/app/src/main/java/com/jocmp/capyreader/ui/articles/AddFeedView.kt b/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),

diff --git a/app/src/main/java/com/jocmp/capyreader/ui/components/CrashReportingCheckbox.kt b/app/src/main/java/com/jocmp/capyreader/ui/components/CrashReportingCheckbox.kt
@@ -1,12 +1,17 @@
 package com.jocmp.capyreader.ui.components
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -35,10 +40,12 @@ fun CrashReportingCheckbox(
     }
 
     Row(
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = Modifier.fillMaxWidth()
     ) {
-        Checkbox(checked = enableCrashReporting, onCheckedChange = updateCrashReporting)
         Text(text = stringResource(R.string.crash_reporting_checkbox_title))
+        Switch(checked = enableCrashReporting, onCheckedChange = updateCrashReporting)
     }
 }
 

diff --git a/app/src/main/java/com/jocmp/capyreader/ui/settings/AccountSettingsStrings.kt b/app/src/main/java/com/jocmp/capyreader/ui/settings/AccountSettingsStrings.kt
@@ -0,0 +1,32 @@
+package com.jocmp.capyreader.ui.settings
+
+import androidx.annotation.StringRes
+import com.jocmp.capy.accounts.Source
+import com.jocmp.capyreader.R
+
+data class AccountSettingsStrings(
+    @StringRes val dialogTitle: Int,
+    @StringRes val dialogMessage: Int,
+    @StringRes val dialogConfirmText: Int,
+    @StringRes val requestRemoveText: Int
+) {
+    companion object {
+        fun find(source: Source): AccountSettingsStrings {
+            return when (source) {
+                Source.LOCAL -> AccountSettingsStrings(
+                    dialogTitle = R.string.settings_remove_account_title_local,
+                    dialogMessage = R.string.settings_remove_account_message_local,
+                    dialogConfirmText = R.string.settings_remove_account_confirm_local,
+                    requestRemoveText = R.string.settings_remove_account_button_local,
+                )
+
+                Source.FEEDBIN -> AccountSettingsStrings(
+                    dialogTitle = R.string.settings_remove_account_title_feedbin,
+                    dialogMessage = R.string.settings_remove_account_message_feedbin,
+                    dialogConfirmText = R.string.settings_remove_account_confirm_feedbin,
+                    requestRemoveText = R.string.settings_remove_account_button_feedbin,
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/jocmp/capyreader/ui/settings/OPMLExportButton.kt b/app/src/main/java/com/jocmp/capyreader/ui/settings/OPMLExportButton.kt
@@ -0,0 +1,26 @@
+package com.jocmp.capyreader.ui.settings
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+@Composable
+fun OPMLExportButton() {
+    Column {
+        Button(
+            onClick = {},
+            colors = ButtonDefaults.buttonColors(
+                containerColor = colorScheme.secondary,
+                contentColor = colorScheme.onSecondary
+            ),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Export to OPML")
+        }
+    }
+}
diff --git a/app/src/main/java/com/jocmp/capyreader/ui/settings/OPMLImportButton.kt b/app/src/main/java/com/jocmp/capyreader/ui/settings/OPMLImportButton.kt
@@ -0,0 +1,23 @@
+package com.jocmp.capyreader.ui.settings
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+@Composable
+fun OPMLImportButton() {
+    Button(
+        onClick = {},
+        colors = ButtonDefaults.buttonColors(
+            containerColor = colorScheme.secondary,
+            contentColor = colorScheme.onSecondary
+        ),
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Text("Import from File")
+    }
+}
diff --git a/app/src/main/java/com/jocmp/capyreader/ui/settings/SettingsScreen.kt b/app/src/main/java/com/jocmp/capyreader/ui/settings/SettingsScreen.kt
@@ -6,17 +6,18 @@ import org.koin.androidx.compose.koinViewModel
 @Composable
 fun SettingsScreen(
     viewModel: SettingsViewModel = koinViewModel(),
-    onLogout: () -> Unit,
+    onRemoveAccount: () -> Unit,
     onNavigateBack: () -> Unit,
 ) {
     SettingsView(
         refreshInterval = viewModel.refreshInterval,
         updateRefreshInterval = viewModel::updateRefreshInterval,
         accountName = viewModel.accountName,
         onNavigateBack = { onNavigateBack() },
-        onRequestLogout = {
-            viewModel.logOut()
-            onLogout()
+        accountSource = viewModel.accountSource,
+        onRequestRemoveAccount = {
+            viewModel.removeAccount()
+            onRemoveAccount()
         },
     )
 }