Louvorg/ReaderForSelfoss-multiplatform
Louvorg/ReaderForSelfoss-multiplatform
3
2
Fork 2
Code Issues 18 Pull Requests Actions Projects 1 Releases 65 Wiki Activity

feature/api_timeout_and_settings_cleaning #45

Merged
AmineB merged 8 commits from feature/api_timeout_and_settings_cleaning into master 2022-08-27 12:20:55 +00:00
Conversation 0 Commits 8 Files Changed 59 +7 -6
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 109050d0cf - Show all commits

5
shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
View File

@ -8,14 +8,13 @@ import java.time.OffsetDateTime
import java.time.ZoneOffset
import java.time.format.DateTimeFormatter
actual class DateUtils actual constructor(appSettingsService: AppSettingsService) {
val ads: AppSettingsService = appSettingsService // TODO: why is this needed now ?
actual class DateUtils actual constructor(actual val appSettingsService: AppSettingsService) {
davidoskky commented 2022-08-27 09:35:31 +00:00
Outdated
Review
Copy Link

I think you have to declare it's a val in the class constructor in order to make it a class variable and use it within functions.

I think you have to declare it's a val in the class constructor in order to make it a class variable and use it within functions.
AmineB commented 2022-08-27 11:06:53 +00:00
Outdated
Review
Copy Link

I couldn't. I had to do as mentionned here to "fix" this.

I couldn't. I had to do as mentionned [here](https://stackoverflow.com/a/65249085) to "fix" this.
actual fun parseDate(dateString: String): Long {
val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
return if (ads.getApiVersion() >= 4) {
return if (appSettingsService.getApiVersion() >= 4) {
OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
} else {
LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(

4
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
View File

@ -7,7 +7,9 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
fun SelfossModel.Item.parseDate(dateUtils: DateUtils): Long =
dateUtils.parseDate(this.datetime)
expect class DateUtils(appSettingsService: AppSettingsService) {
expect class DateUtils constructor(appSettingsService: AppSettingsService) {
val appSettingsService: AppSettingsService // This is needed because of https://stackoverflow.com/a/65249085
fun parseDate(dateString: String): Long
fun parseRelativeDate(dateString: String): String

2
shared/src/iosArm64Main/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
View File

@ -2,7 +2,7 @@ package bou.amine.apps.readerforselfossv2.utils
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
actual class DateUtils actual constructor(appSettingsService: AppSettingsService) {
actual class DateUtils actual constructor(actual val appSettingsService: AppSettingsService) {
actual fun parseDate(dateString: String): Long {
TODO("Not yet implemented")
}

2
shared/src/iosX64Main/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
View File

@ -2,7 +2,7 @@ package bou.amine.apps.readerforselfossv2.utils
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
actual class DateUtils actual constructor(appSettingsService: AppSettingsService) {
actual class DateUtils actual constructor(actual val appSettingsService: AppSettingsService) {
actual fun parseDate(dateString: String): Long {
TODO("Not yet implemented")
}