diff options
Diffstat (limited to 'app/src/main/java/org/terst/feedreader/data/Daos.kt')
| -rw-r--r-- | app/src/main/java/org/terst/feedreader/data/Daos.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/java/org/terst/feedreader/data/Daos.kt b/app/src/main/java/org/terst/feedreader/data/Daos.kt index 22f1d22..0b763e1 100644 --- a/app/src/main/java/org/terst/feedreader/data/Daos.kt +++ b/app/src/main/java/org/terst/feedreader/data/Daos.kt @@ -10,10 +10,10 @@ import kotlinx.coroutines.flow.Flow @Dao interface FeedDao { - @Query("SELECT * FROM feeds ORDER BY title ASC") + @Query("SELECT * FROM feeds ORDER BY title COLLATE NOCASE ASC") fun observeAll(): Flow<List<FeedEntity>> - @Query("SELECT * FROM feeds ORDER BY title ASC") + @Query("SELECT * FROM feeds ORDER BY title COLLATE NOCASE ASC") suspend fun getAll(): List<FeedEntity> @Query("SELECT * FROM feeds WHERE id = :id") @@ -98,6 +98,11 @@ interface ArticleDao { @Query("SELECT $ARTICLE_LIST_COLUMNS FROM $ARTICLE_LIST_FROM WHERE articles.isSaved = 1 ORDER BY articles.createdAt DESC") fun observeSaved(): Flow<List<ArticleListItem>> + // The Saved count is a "how much is on my shelf" total, not an unread badge -- + // includes already-read articles, unlike every other count in this DAO. + @Query("SELECT COUNT(*) FROM articles WHERE isSaved = 1") + fun observeSavedCount(): Flow<Int> + @Query("SELECT * FROM articles WHERE id = :id") suspend fun getById(id: String): ArticleEntity? |