Customize read/unread icons by account type

Author: christophehenry

app/src/main/java/com/readrops/app/item/ItemScreen.kt

@@ -124,6 +124,7 @@ class ItemScreen(
 
                         ItemScreenPage(
                             itemWithFeed = itemWithFeed,
+                            accountType = screenModel.account.type!!,
                             snackbarHostState = snackbarHostState,
                             onOpenUrl = { url ->
                                 if (state.openInExternalBrowser) {

app/src/main/java/com/readrops/app/item/ItemScreenPage.kt

@@ -34,11 +34,13 @@ import com.readrops.app.item.components.SimpleTitle
 import com.readrops.app.item.components.rememberBottomBarNestedScrollConnection
 import com.readrops.app.item.view.ItemNestedScrollView
 import com.readrops.app.item.view.ItemWebView
+import com.readrops.db.entities.account.AccountType
 import com.readrops.db.pojo.ItemWithFeed
 
 @Composable
 fun ItemScreenPage(
     itemWithFeed: ItemWithFeed,
+    accountType: AccountType,
     snackbarHostState: SnackbarHostState,
     onOpenUrl: (String) -> Unit,
     onShareItem: () -> Unit,
@@ -72,7 +74,8 @@ fun ItemScreenPage(
             ItemScreenBottomBar(
                 state = BottomBarState(
                     isRead = itemWithFeed.item.isRead,
-                    isStarred = itemWithFeed.item.isStarred
+                    isStarred = itemWithFeed.item.isStarred,
+                    accountType = accountType,
                 ),
                 accentColor = accentColor,
                 modifier = Modifier

app/src/main/java/com/readrops/app/item/components/ItemScreenBottomBar.kt

@@ -20,10 +20,12 @@ import com.readrops.app.util.DefaultPreview
 import com.readrops.app.util.FeedColors
 import com.readrops.app.util.theme.ReadropsTheme
 import com.readrops.app.util.theme.spacing
+import com.readrops.db.entities.account.AccountType
 
 data class BottomBarState(
     val isRead: Boolean = false,
-    val isStarred: Boolean = false
+    val isStarred: Boolean = false,
+    val accountType: AccountType,
 )
 
 @Composable
@@ -54,9 +56,12 @@ fun ItemScreenBottomBar(
             ) {
                 Icon(
                     painter = painterResource(
-                        id = if (state.isRead)
-                            R.drawable.ic_read
-                        else R.drawable.ic_unread
+                        id = if (state.isRead) {
+                            state.accountType.readIcon
+                        }
+                        else {
+                            state.accountType.unreadIcon
+                        }
                     ),
                     tint = tint,
                     contentDescription = null
@@ -107,7 +112,8 @@ private fun ItemScreenBottomBarPreview() {
         ItemScreenBottomBar(
             state = BottomBarState(
                 isRead = false,
-                isStarred = false
+                isStarred = false,
+                accountType = AccountType.GREADER
             ),
             accentColor = MaterialTheme.colorScheme.primary,
             onShare = {},

app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt

@@ -1,7 +1,6 @@
 package com.readrops.app.timelime
 
 import android.content.Context
-import android.content.Intent
 import androidx.compose.runtime.Stable
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
@@ -18,7 +17,6 @@ import com.readrops.app.util.PAGING_INITIAL_SIZE
 import com.readrops.app.util.PAGING_PAGE_SIZE
 import com.readrops.app.util.PAGING_PREFETCH_DISTANCE
 import com.readrops.app.util.Preferences
-import com.readrops.app.util.ShareIntentTextRenderer
 import com.readrops.app.util.Utils
 import com.readrops.app.util.extensions.clearSerializables
 import com.readrops.app.util.extensions.getSerializable
@@ -27,6 +25,8 @@ import com.readrops.db.entities.Feed
 import com.readrops.db.entities.Folder
 import com.readrops.db.entities.Item
 import com.readrops.db.entities.OpenIn
+import com.readrops.db.entities.account.AccountConfig
+import com.readrops.db.entities.account.AccountType
 import com.readrops.db.filters.MainFilter
 import com.readrops.db.filters.OrderField
 import com.readrops.db.filters.OrderType
@@ -61,7 +61,7 @@ class TimelineScreenModel(
     private val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : TabScreenModel(database, context) {
 
-    private val _timelineState = MutableStateFlow(TimelineState())
+    private val _timelineState = MutableStateFlow(TimelineState(AccountType.LOCAL))
     val timelineState = _timelineState.asStateFlow()
 
     // separate this from main Timeline state for performances
@@ -94,6 +94,7 @@ class TimelineScreenModel(
             }.collectLatest { (account, filters, timelinePreferences) ->
                 _timelineState.update {
                     it.copy(
+                        accountType = account.type!!,
                         preferences = timelinePreferences,
                         filters = filters.copy(
                             showReadItems = timelinePreferences.showReadItems,
@@ -479,6 +480,7 @@ class TimelineScreenModel(
 
 @Stable
 data class TimelineState(
+    val accountType: AccountType,
     val isRefreshing: Boolean = false,
     val isDrawerOpen: Boolean = false,
     val currentFeed: String = "",
@@ -496,7 +498,7 @@ data class TimelineState(
     val dialog: DialogState? = null,
     val isAccountLocal: Boolean = false,
     val hideReadAllFAB: Boolean = false,
-    val preferences: TimelinePreferences = TimelinePreferences()
+    val preferences: TimelinePreferences = TimelinePreferences(),
 ) {
 
     val showSubtitle = filters.subFilter != SubFilter.ALL

app/src/main/java/com/readrops/app/timelime/TimelineTab.kt

@@ -318,6 +318,7 @@ object TimelineTab : Tab {
                                             if (itemWithFeed != null) {
                                                 TimelineItem(
                                                     itemWithFeed = itemWithFeed,
+                                                    accoutType = state.accountType,
                                                     onClick = {
                                                         if (itemWithFeed.openInAsk && preferences.openInAsk) {
                                                             screenModel.openDialog(

app/src/main/java/com/readrops/app/timelime/components/TimelineItem.kt

@@ -21,12 +21,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.readrops.app.R
 import com.readrops.app.util.DefaultPreview
 import com.readrops.app.util.theme.ReadropsTheme
 import com.readrops.app.util.theme.spacing
 import com.readrops.db.entities.Folder
 import com.readrops.db.entities.OpenIn
+import com.readrops.db.entities.account.AccountType
 import com.readrops.db.pojo.ItemWithFeed
 import java.time.LocalDateTime
 
@@ -41,6 +41,7 @@ const val readAlpha = 0.6f
 @Composable
 fun TimelineItem(
     itemWithFeed: ItemWithFeed,
+    accoutType: AccountType,
     onClick: () -> Unit,
     onFavorite: () -> Unit,
     onShare: () -> Unit,
@@ -102,9 +103,9 @@ fun TimelineItem(
                     Icon(
                         painter = painterResource(
                             id = if (itemWithFeed.item.isRead) {
-                                R.drawable.ic_read
+                                accoutType.readIcon
                             } else {
-                                R.drawable.ic_unread
+                                accoutType.unreadIcon
                             }
                         ),
                         contentDescription = null,

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

@@ -10,7 +10,7 @@ data class AccountConfig(
     val canUpdateFeed: Boolean = true,
     val canDeleteFeed: Boolean = true,
     val canDeleteFolder: Boolean = true,
-    val canMarkAllItemsAsRead: Boolean = true
+    val canMarkAllItemsAsRead: Boolean = true,
 ) {
 
     companion object {

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

@@ -7,7 +7,9 @@ import com.readrops.db.R
 enum class AccountType(
     @DrawableRes val iconRes: Int,
     @StringRes val nameRes: Int,
-    val config: AccountConfig
+    val config: AccountConfig,
+    @DrawableRes val readIcon: Int = R.drawable.ic_read,
+    @DrawableRes val unreadIcon: Int = R.drawable.ic_unread,
 ) {
     LOCAL(R.mipmap.ic_launcher, R.string.local_account, AccountConfig.LOCAL),
     NEXTCLOUD_NEWS(R.drawable.ic_nextcloud_news, R.string.nextcloud_news, AccountConfig.NEXTCLOUD_NEWS),