FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix no feed placeholder not appearing in FeedTab

Browse Source
This commit is contained in:
Shinokuni 2024-02-19 22:59:19 +01:00
parent 5a0affdf3b
commit 40accbc8b4
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
appcompose/src/main/java/com/readrops/app/compose/repositories/GetFoldersWithFeeds.kt
View File

@ -18,7 +18,13 @@ class GetFoldersWithFeeds(
.selectFeedsWithoutFolder(accountId) .selectFeedsWithoutFolder(accountId)
) { folders, feedsWithoutFolder -> ) { folders, feedsWithoutFolder ->
val foldersWithFeeds = folders.groupBy( val foldersWithFeeds = folders.groupBy(
keySelector = { Folder(id = it.folderId, name = it.folderName, accountId = it.accountId) }, keySelector = {
Folder(
id = it.folderId,
name = it.folderName,
accountId = it.accountId
) as Folder?
},
valueTransform = { valueTransform = {
Feed( Feed(
id = it.feedId, id = it.feedId,
@ -37,11 +43,15 @@ class GetFoldersWithFeeds(
} }
} }
foldersWithFeeds + mapOf( if (feedsWithoutFolder.isNotEmpty()) {
Pair( foldersWithFeeds + mapOf(
null, Pair(
feedsWithoutFolder.map { it.feed.apply { unreadCount = it.unreadCount } }) null,
) feedsWithoutFolder.map { it.feed.apply { unreadCount = it.unreadCount } })
)
}
foldersWithFeeds
} }
} }
} }

5
appcompose/src/main/java/com/readrops/app/compose/util/components/Placeholder.kt
View File

@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import com.readrops.app.compose.util.theme.ShortSpacer
import com.readrops.app.compose.util.toDp import com.readrops.app.compose.util.toDp
@ -39,9 +40,11 @@ fun Placeholder(
modifier = Modifier.size(MaterialTheme.typography.displayMedium.toDp() * 1.5f) modifier = Modifier.size(MaterialTheme.typography.displayMedium.toDp() * 1.5f)
) )
ShortSpacer()
Text( Text(
text = text, text = text,
style = MaterialTheme.typography.displayMedium style = MaterialTheme.typography.displaySmall
) )
} }
} }