Use account configuration in FeedTab

app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersActivity.java

@@ -59,7 +59,7 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (account.getAccountType().getAccountConfig().isFolderCreation())
+        if (account.getAccountType().getAccountConfig().getCanCreateFolder())
             getMenuInflater().inflate(R.menu.feeds_menu, menu);
 
         return super.onCreateOptionsMenu(menu);

app/src/main/java/com/readrops/app/feedsfolders/feeds/EditFeedDialogFragment.java

@@ -116,7 +116,7 @@ public class EditFeedDialogFragment extends DialogFragment implements AdapterVie
         feedUrl = v.findViewById(R.id.edit_feed_url_edit_text);
         folder = v.findViewById(R.id.edit_feed_folder_spinner);
 
-        if (!account.getAccountType().getAccountConfig().isFeedUrlEditable())
+        if (!account.getAccountType().getAccountConfig().isFeedUrlReadOnly())
             feedUrl.setEnabled(false);
 
         feedName.setText(feedWithFolder.getFeed().getName());

appcompose/src/main/java/com/readrops/app/compose/ComposeAppModule.kt

@@ -23,7 +23,7 @@ val composeAppModule = module {
 
     factory { TimelineScreenModel(get(), get()) }
 
-    factory { FeedScreenModel(get(), get(), get()) }
+    factory { FeedScreenModel(get(), get(), get(), androidContext()) }
 
     factory { AccountSelectionScreenModel(get()) }
 

appcompose/src/main/java/com/readrops/app/compose/feeds/FeedScreenModel.kt

@@ -1,9 +1,11 @@
 package com.readrops.app.compose.feeds
 
+import android.content.Context
 import android.util.Patterns
 import cafe.adriel.voyager.core.model.screenModelScope
 import com.readrops.api.localfeed.LocalRSSDataSource
 import com.readrops.api.utils.HtmlParser
+import com.readrops.app.compose.R
 import com.readrops.app.compose.base.TabScreenModel
 import com.readrops.app.compose.repositories.GetFoldersWithFeeds
 import com.readrops.app.compose.util.components.TextFieldError
@@ -29,6 +31,7 @@ class FeedScreenModel(
     database: Database,
     private val getFoldersWithFeeds: GetFoldersWithFeeds,
     private val localRSSDataSource: LocalRSSDataSource,
+    private val context: Context
 ) : TabScreenModel(database), KoinComponent {
 
     private val _feedState = MutableStateFlow(FeedState())
@@ -47,6 +50,14 @@ class FeedScreenModel(
         screenModelScope.launch(context = Dispatchers.IO) {
             accountEvent
                 .flatMapConcat { account ->
+                    _feedState.update { it.copy(displayFolderCreationButton = account.config.canCreateFolder) }
+                    _updateFeedDialogState.update {
+                        it.copy(
+                            isFeedUrlReadOnly = account.config.isFeedUrlReadOnly,
+                            isNoFolderCase = account.config.isNoFolderCase
+                        )
+                    }
+
                     getFoldersWithFeeds.get(account.id, MainFilter.ALL)
                 }
                 .catch { throwable ->
@@ -77,14 +88,24 @@ class FeedScreenModel(
         screenModelScope.launch(context = Dispatchers.IO) {
             accountEvent
                 .flatMapConcat { account ->
+                    _updateFeedDialogState.update {
+                        it.copy(
+                            isFeedUrlReadOnly = account.config.isFeedUrlReadOnly,
+                            isNoFolderCase = account.config.isNoFolderCase
+                        )
+                    }
+
                     database.newFolderDao()
                         .selectFolders(account.id)
                 }
                 .collect { folders ->
                     _updateFeedDialogState.update {
                         it.copy(
-                            folders = folders,
+                            folders = if (!it.isNoFolderCase) { // TODO implement no folder case properly
-                            accountType = currentAccount!!.accountType
+                                folders + listOf(Folder(id = 0, name = context.resources.getString(R.string.no_folder)))
+                            } else {
+                                folders
+                            }
                         )
                     }
                 }

appcompose/src/main/java/com/readrops/app/compose/feeds/FeedState.kt

@@ -4,12 +4,12 @@ import com.readrops.app.compose.util.components.TextFieldError
 import com.readrops.db.entities.Feed
 import com.readrops.db.entities.Folder
 import com.readrops.db.entities.account.Account
-import com.readrops.db.entities.account.AccountType
 
 data class FeedState(
     val foldersAndFeeds: FolderAndFeedsState = FolderAndFeedsState.InitialState,
     val dialog: DialogState? = null,
-    val areFoldersExpanded: Boolean = false
+    val areFoldersExpanded: Boolean = false,
+    val displayFolderCreationButton: Boolean = false
 )
 
 sealed interface DialogState {
@@ -43,10 +43,11 @@ data class UpdateFeedDialogState(
     val feedNameError: TextFieldError? = null,
     val feedUrl: String = "",
     val feedUrlError: TextFieldError? = null,
-    val accountType: AccountType? = null,
     val selectedFolder: Folder? = null,
     val folders: List<Folder> = listOf(),
     val isAccountDropDownExpanded: Boolean = false,
+    val isFeedUrlReadOnly: Boolean = true,
+    val isNoFolderCase: Boolean = false
 ) {
     val isFeedNameError
         get() = feedNameError != null
@@ -54,9 +55,6 @@ data class UpdateFeedDialogState(
     val isFeedUrlError
         get() = feedUrlError != null
 
-    val isFeedUrlReadOnly: Boolean
-        get() = accountType != null && !accountType.accountConfig!!.isFeedUrlEditable
-
     val hasFolders = folders.isNotEmpty()
 }
 

appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt

@@ -178,19 +178,21 @@ object FeedTab : Tab {
             },
             floatingActionButton = {
                 Column {
-                    SmallFloatingActionButton(
+                    if (state.displayFolderCreationButton) {
-                        modifier = Modifier
+                        SmallFloatingActionButton(
-                            .padding(
+                            modifier = Modifier
-                                start = MaterialTheme.spacing.veryShortSpacing,
+                                .padding(
-                                bottom = MaterialTheme.spacing.shortSpacing
+                                    start = MaterialTheme.spacing.veryShortSpacing,
-                            ),
+                                    bottom = MaterialTheme.spacing.shortSpacing
-                        onClick = { viewModel.openDialog(DialogState.AddFolder) }
+                                ),
-                    ) {
+                            onClick = { viewModel.openDialog(DialogState.AddFolder) }
-                        Icon(
+                        ) {
-                            painter = painterResource(id = R.drawable.ic_new_folder),
+                            Icon(
-                            contentDescription = null,
+                                painter = painterResource(id = R.drawable.ic_new_folder),
-                            modifier = Modifier.size(16.dp)
+                                contentDescription = null,
-                        )
+                                modifier = Modifier.size(16.dp)
+                            )
+                        }
                     }
 
                     FloatingActionButton(

appcompose/src/main/java/com/readrops/app/compose/feeds/dialogs/UpdateFeedDialog.kt

@@ -57,6 +57,7 @@ fun UpdateFeedDialog(
             label = { Text(text = stringResource(R.string.feed_url)) },
             singleLine = true,
             readOnly = state.isFeedUrlReadOnly,
+            enabled = !state.isFeedUrlReadOnly,
             isError = state.isFeedUrlError,
             supportingText = {
                 if (state.isFeedUrlError) {

db/src/main/java/com/readrops/db/entities/account/AccountConfig.kt

@@ -5,35 +5,35 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class AccountConfig(
-        val isFeedUrlEditable: Boolean, // Enables or disables feed url modification in management screen
+    val isFeedUrlReadOnly: Boolean, // Enable or disable feed url modification in Feed Tab
-        val isFolderCreation: Boolean, // Enables or disables folder creation in management screen
+    val canCreateFolder: Boolean, // Enable or disable folder creation in Feed Tab
-        val isNoFolderCase: Boolean, // Add a "No folder" option when modifying a feed's folder
+    val isNoFolderCase: Boolean, // Add a "No folder" option when modifying a feed's folder TODO add better name
-        val useSeparateState: Boolean, // Let knows if it uses ItemState table to synchronize state
+    val useSeparateState: Boolean, // Let know if it uses ItemState table to synchronize read/star state
 ) : Parcelable {
 
     companion object {
         @JvmField
         val LOCAL = AccountConfig(
-                isFeedUrlEditable = true,
+            isFeedUrlReadOnly = false,
-                isFolderCreation = true,
+            canCreateFolder = true,
-                isNoFolderCase = false,
+            isNoFolderCase = false,
-                useSeparateState = false,
+            useSeparateState = false,
         )
 
         @JvmField
         val NEXTCLOUD_NEWS = AccountConfig(
-                isFeedUrlEditable = false,
+            isFeedUrlReadOnly = false,
-                isFolderCreation = true,
+            canCreateFolder = true,
-                isNoFolderCase = false,
+            isNoFolderCase = false,
-                useSeparateState = false,
+            useSeparateState = false,
         )
 
         @JvmField
         val FRESHRSS = AccountConfig(
-                isFeedUrlEditable = false,
+            isFeedUrlReadOnly = true,
-                isFolderCreation = false,
+            canCreateFolder = false,
-                isNoFolderCase = true,
+            isNoFolderCase = true,
-                useSeparateState = true,
+            useSeparateState = true,
         )
     }
 }