androidApp/build.gradle.kts

@@ -188,7 +188,7 @@ dependencies {
      implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
 
     // SQLDELIGHT
-    implementation("com.squareup.sqldelight:android-driver:1.5.4")
+    implementation("com.squareup.sqldelight:android-driver:1.5.3")
 
     //test
     testImplementation("junit:junit:4.13.2")

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt

@@ -63,6 +63,13 @@ class SourcesActivity : AppCompatActivity(), DIAware {
                 )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
+                if (items.isEmpty()) {
+                    Toast.makeText(
+                        this@SourcesActivity,
+                        R.string.nothing_here,
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
             } else {
                 Toast.makeText(
                     this@SourcesActivity,

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt

@@ -10,12 +10,9 @@ import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
 import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.utils.*
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
-import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
-import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -62,7 +59,7 @@ class ItemCardAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt

@@ -51,7 +51,7 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
 

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt

@@ -61,13 +61,9 @@ class SourcesListAdapter(
         binding.sourceTitle.text = itm.title.getHtmlDecoded()
     }
 
-    override fun getItemId(position: Int) = position.toLong()
-
-    override fun getItemViewType(position: Int) = position
-
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(private val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
 
         init {
             handleClickListeners()
@@ -78,13 +74,13 @@ class SourcesListAdapter(
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
-                val (id) = items[bindingAdapterPosition]
+                val (id) = items[adapterPosition]
                 CoroutineScope(Dispatchers.IO).launch {
                     val successfullyDeletedSource = repository.deleteSource(id)
                     if (successfullyDeletedSource) {
-                        items.removeAt(bindingAdapterPosition)
+                        items.removeAt(adapterPosition)
-                        notifyItemRemoved(bindingAdapterPosition)
+                        notifyItemRemoved(adapterPosition)
-                        notifyItemRangeChanged(bindingAdapterPosition, itemCount)
+                        notifyItemRangeChanged(adapterPosition, itemCount)
                     } else {
                         Toast.makeText(
                             app,

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -101,7 +101,7 @@ class ArticleFragment : Fragment(), DIAware {
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = item.sourceAndDateText()
+            contentSource = item.sourceAndDateText(repository.dateUtils)
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()

androidApp/src/test/kotlin/DatesTest.kt

@@ -1,6 +1,8 @@
 package bou.amine.apps.readerforselfossv2.repository
 
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.DateUtils
+import io.mockk.mockk
 import junit.framework.TestCase.assertEquals
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
@@ -8,13 +10,14 @@ import kotlinx.datetime.toInstant
 import org.junit.Test
 
 class DatesTest {
+    private val dateUtils: DateUtils = DateUtils()
 
     private val v3Date = "2013-04-07T13:43:00+01:00"
     private val v4Date = "2013-04-07 13:43:00"
 
     @Test
     fun v3_date_should_be_parsed() {
-        val date = DateUtils.parseDate(v3Date)
+        val date = dateUtils.parseDate(v3Date)
         val expected = LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.of("UTC+1")) .toEpochMilliseconds()
 
         assertEquals(date, expected)
@@ -22,7 +25,7 @@ class DatesTest {
 
     @Test
     fun v4_date_should_be_parsed() {
-        val date = DateUtils.parseDate(v4Date)
+        val date = dateUtils.parseDate(v4Date)
         val expected =
             LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()

build.gradle.kts

@@ -1,7 +1,7 @@
 buildscript {
     dependencies {
         // SqlDelight
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.4")
+        classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
     }
 }
 

shared/build.gradle.kts

@@ -1,7 +1,7 @@
 object SqlDelight {
-    const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
+    const val runtime = "com.squareup.sqldelight:runtime:1.5.3"
-    const val android = "com.squareup.sqldelight:android-driver:1.5.4"
+    const val android = "com.squareup.sqldelight:android-driver:1.5.3"
-    const val native = "com.squareup.sqldelight:native-driver:1.5.4"
+    const val native = "com.squareup.sqldelight:native-driver:1.5.3"
 
 }
 

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

@@ -5,25 +5,24 @@ import kotlinx.datetime.*
 
 
 actual class DateUtils {
-    actual companion object {
-        actual fun parseDate(dateString: String): Long {
-            return try {
-                Instant.parse(dateString).toEpochMilliseconds()
-            } catch (e: Exception) {
-                LocalDateTime.parse(dateString.replace(" ", "T")).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
-            }
-        }
 
-        actual fun parseRelativeDate(dateString: String): String {
+    actual fun parseDate(dateString: String): Long {
-
+        return try {
-            val date = parseDate(dateString)
+            Instant.parse(dateString).toEpochMilliseconds()
-
+        } catch (e: Exception) {
-            return " " + DateUtils.getRelativeTimeSpanString(
+            LocalDateTime.parse(dateString.replace(" ", "T")).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
-                date,
-                Clock.System.now().toEpochMilliseconds(),
-                DateUtils.MINUTE_IN_MILLIS,
-                DateUtils.FORMAT_ABBREV_RELATIVE
-            )
         }
     }
+
+    actual fun parseRelativeDate(dateString: String): String {
+
+        val date = parseDate(dateString)
+
+        return " " + DateUtils.getRelativeTimeSpanString(
+            date,
+            Clock.System.now().toEpochMilliseconds(),
+            DateUtils.MINUTE_IN_MILLIS,
+            DateUtils.FORMAT_ABBREV_RELATIVE
+        )
+    }
 }

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

@@ -108,8 +108,8 @@ class SelfossModel {
             return stringUrl
         }
 
-        fun sourceAndDateText(): String =
+        fun sourceAndDateText(dateUtils: DateUtils): String =
-            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
+            this.sourcetitle.getHtmlDecoded() + dateUtils.parseRelativeDate(this.datetime)
 
         fun toggleStar(): Item {
             this.starred = !this.starred

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -18,6 +18,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     var connectionMonitored = false
 
     var baseUrl = appSettingsService.getBaseUrl()
+    var dateUtils: DateUtils = DateUtils()
 
     var displayedItems = ItemType.UNREAD
 
@@ -73,7 +74,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
             if (fromDB) {
-                items.sortByDescending { DateUtils.parseDate(it.datetime) }
+                items.sortByDescending { dateUtils.parseDate(it.datetime) }
             }
         }
         return items

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/SearchService.kt

@@ -0,0 +1,27 @@
+package bou.amine.apps.readerforselfossv2.service
+
+import bou.amine.apps.readerforselfossv2.utils.DateUtils
+
+class SearchService(val dateUtils: DateUtils) {
+    var displayedItems: String = "unread"
+        set(value) {
+            field = when (value) {
+                "all" -> "all"
+                "unread" -> "unread"
+                "read" -> "read"
+                "starred" -> "starred"
+                else -> "all"
+            }
+        }
+
+    var position = 0
+    var searchFilter: String? = null
+    var sourceIDFilter: Long? = null
+    var sourceFilter: String? = null
+    var tagFilter: String? = null
+    var itemsCaching = false
+
+    var badgeUnread = -1
+    var badgeAll = -1
+    var badgeStarred = -1
+}

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

@@ -1,9 +1,14 @@
 package bou.amine.apps.readerforselfossv2.utils
 
-expect class DateUtils() {
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
-    companion object {
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-        fun parseDate(dateString: String): Long
 
-        fun parseRelativeDate(dateString: String): String
+
-    }
+fun SelfossModel.Item.parseDate(dateUtils: DateUtils): Long =
+    dateUtils.parseDate(this.datetime)
+
+expect class DateUtils() {
+    fun parseDate(dateString: String): Long
+
+    fun parseRelativeDate(dateString: String): String
 }

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

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

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

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