FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Be less strict with feed and folder names (#206)

This commit is contained in:
Shinokuni 2024-09-20 13:07:12 +02:00
parent bf3c654a25
commit 81dc80d19a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/readrops/app/feeds/FeedItem.kt
View File

@ -64,14 +64,14 @@ fun FeedItem(
FeedIcon( FeedIcon(
iconUrl = feed.iconUrl, iconUrl = feed.iconUrl,
name = feed.name!!, name = feed.name.orEmpty(),
size = 16.dp size = 16.dp
) )
ShortSpacer() ShortSpacer()
Text( Text(
text = feed.name!!, text = feed.name.orEmpty(),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis

2
app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt
View File

@ -84,7 +84,7 @@ fun FolderExpandableItem(
MediumSpacer() MediumSpacer()
Text( Text(
text = folder.name!!, text = folder.name.orEmpty(),
style = MaterialTheme.typography.bodyLarge, style = MaterialTheme.typography.bodyLarge,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,

4
app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt
View File

@ -113,7 +113,7 @@ fun DrawerFolderItem(
DrawerFeedItem( DrawerFeedItem(
label = { label = {
Text( Text(
text = feed.name!!, text = feed.name.orEmpty(),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
@ -121,7 +121,7 @@ fun DrawerFolderItem(
icon = { icon = {
FeedIcon( FeedIcon(
iconUrl = feed.iconUrl, iconUrl = feed.iconUrl,
name = feed.name!! name = feed.name.orEmpty()
) )
}, },
badge = { Text(feed.unreadCount.toString()) }, badge = { Text(feed.unreadCount.toString()) },

6
app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
View File

@ -63,7 +63,7 @@ fun TimelineDrawer(
DrawerFolderItem( DrawerFolderItem(
label = { label = {
Text( Text(
text = folder.name!!, text = folder.name.orEmpty(),
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
@ -92,7 +92,7 @@ fun TimelineDrawer(
DrawerFeedItem( DrawerFeedItem(
label = { label = {
Text( Text(
text = feed.name!!, text = feed.name.orEmpty(),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
@ -100,7 +100,7 @@ fun TimelineDrawer(
icon = { icon = {
FeedIcon( FeedIcon(
iconUrl = feed.iconUrl, iconUrl = feed.iconUrl,
name = feed.name!! name = feed.name.orEmpty()
) )
}, },
badge = { Text(feed.unreadCount.toString()) }, badge = { Text(feed.unreadCount.toString()) },