davidoskky/ReaderForSelfoss-multiplatform
1
0
Fork 0
forked from Louvorg/ReaderForSelfoss-multiplatform
Code Issues Pull Requests Projects Releases Wiki Activity

Make the author field nullable

Browse Source
This commit is contained in:
davidoskky 2022-12-28 11:02:43 +01:00
parent 27eafe4ff4
commit 5227751dca
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt
View File

@ -46,7 +46,7 @@ data class ParecelableItem(
val link: String, val link: String,
val sourcetitle: String, val sourcetitle: String,
val tags: String, val tags: String,
val author: String val author: String?
) : Parcelable { ) : Parcelable {
companion object { companion object {

4
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
View File

@ -73,7 +73,7 @@ class SelfossModel {
val sourcetitle: String, val sourcetitle: String,
@Serializable(with = TagsListSerializer::class) @Serializable(with = TagsListSerializer::class)
val tags: List<String>, val tags: List<String>,
val author: String val author: String?
) { ) {
// TODO: maybe find a better way to handle these kind of urls // TODO: maybe find a better way to handle these kind of urls
fun getLinkDecoded(): String { fun getLinkDecoded(): String {
@ -104,7 +104,7 @@ class SelfossModel {
fun sourceAuthorAndDate(): String { fun sourceAuthorAndDate(): String {
var txt = this.sourcetitle.getHtmlDecoded() var txt = this.sourcetitle.getHtmlDecoded()
if (this.author.isNotEmpty()) { if (!this.author.isNullOrBlank()) {
txt += " (by ${this.author}) " txt += " (by ${this.author}) "
} }
txt += DateUtils.parseRelativeDate(this.datetime) txt += DateUtils.parseRelativeDate(this.datetime)

2
shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm
View File

@ -1 +1 @@
ALTER TABLE ITEM ADD COLUMN `author` TEXT NOT NULL; ALTER TABLE ITEM ADD COLUMN `author` TEXT;

2
shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq
View File

@ -10,7 +10,7 @@ CREATE TABLE ITEM (
`link` TEXT NOT NULL, `link` TEXT NOT NULL,
`sourcetitle` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL,
`tags` TEXT NOT NULL, `tags` TEXT NOT NULL,
`author` TEXT NOT NULL, `author` TEXT,
PRIMARY KEY(`id`) PRIMARY KEY(`id`)
); );