Cleaning still.

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

@@ -10,9 +10,12 @@ 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.*
+import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 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
@@ -59,7 +62,7 @@ class ItemCardAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
             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(repository.dateUtils)
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
 

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(repository.dateUtils)
+            contentSource = item.sourceAndDateText()
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()

androidApp/src/test/kotlin/DatesTest.kt

@@ -1,8 +1,6 @@
 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
@@ -10,14 +8,13 @@ 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)
@@ -25,7 +22,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()

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

@@ -5,7 +5,7 @@ import kotlinx.datetime.*
 
 
 actual class DateUtils {
-
+    actual companion object {
         actual fun parseDate(dateString: String): Long {
             return try {
                 Instant.parse(dateString).toEpochMilliseconds()
@@ -26,3 +26,4 @@ actual class DateUtils {
             )
         }
     }
+}

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

@@ -108,8 +108,8 @@ class SelfossModel {
             return stringUrl
         }
 
-        fun sourceAndDateText(dateUtils: DateUtils): String =
-            this.sourcetitle.getHtmlDecoded() + dateUtils.parseRelativeDate(this.datetime)
+        fun sourceAndDateText(): String =
+            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,7 +18,6 @@ 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
 
@@ -74,7 +73,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

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

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.utils
 
 actual class DateUtils {
+    actual companion object {
         actual fun parseDate(dateString: String): Long {
             TODO("Not yet implemented")
         }
@@ -8,5 +9,5 @@ actual class DateUtils {
         actual fun parseRelativeDate(dateString: String): String {
             TODO("Not yet implemented")
         }
-
+    }
 }

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

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.utils
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 
 actual class DateUtils {
+    actual companion object {
         actual fun parseDate(dateString: String): Long {
             TODO("Not yet implemented")
         }
@@ -10,5 +11,6 @@ actual class DateUtils {
         actual fun parseRelativeDate(dateString: String): String {
             TODO("Not yet implemented")
         }
+    }
 
 }