refactor: standardize article calls

Author: jvsena42

…ava/to/bitkit/models/widget/NewsModel.kt …/to/bitkit/models/widget/ArticleModel.ktapp/src/main/java/to/bitkit/models/widget/NewsModel.kt renamed to app/src/main/java/to/bitkit/models/widget/ArticleModel.kt app/src/main/java/to/bitkit/models/widget/NewsModel.kt renamed to app/src/main/java/to/bitkit/models/widget/ArticleModel.kt

@@ -10,14 +10,14 @@ import java.time.temporal.ChronoUnit
 import java.util.Locale
 
 @Serializable
-data class NewsModel(
+data class ArticleModel(
     val title: String,
     val timeAgo: String,
     val link: String,
     val publisher: String
 )
 
-fun ArticleDTO.toNewsModel() = NewsModel(
+fun ArticleDTO.toArticleModel() = ArticleModel(
     title = this.title,
     timeAgo = timeAgo(this.publishedDate),
     link = this.link,
@@ -47,7 +47,7 @@ private fun timeAgo(dateString: String): String {
         }
 
         if (parsedDateTime == null) {
-            Logger.debug("Failed to parse date: Unparseable date: \"$dateString\" [NewsModel.kt:46]")
+            Logger.debug("Failed to parse date: Unparseable date: $dateString")
             return ""
         }
 
@@ -66,7 +66,7 @@ private fun timeAgo(dateString: String): String {
             else -> "$diffMonths months ago"
         }
     } catch (e: Exception) {
-        Logger.debug("An unexpected error occurred while parsing date: ${e.message}")
+        Logger.warn("An unexpected error occurred while parsing date: ${e.message}")
         ""
     }
 }

app/src/main/java/to/bitkit/repositories/WidgetsRepo.kt

@@ -2,12 +2,10 @@ package to.bitkit.repositories
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import to.bitkit.data.WidgetsStore
 import to.bitkit.data.widgets.NewsService
 import to.bitkit.di.BgDispatcher
-import to.bitkit.models.widget.toNewsModel
 import to.bitkit.utils.Logger
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,13 +21,13 @@ class WidgetsRepo @Inject constructor(
 
     val articlesFlow = widgetsStore.data
 
-    suspend fun updateNewsInLoop() {
-        updateNews()
+    suspend fun updateArticlesInLoop() {
+        updateArticles()
         delay(refreshInterval)
-        updateNewsInLoop()
+        updateArticlesInLoop()
     }
 
-    suspend fun updateNews(): Result<Unit> = withContext(bgDispatcher) {
+    suspend fun updateArticles(): Result<Unit> = withContext(bgDispatcher) {
         return@withContext try {
             val news = newsService.fetchLatestNews().take(10)
             widgetsStore.updateArticles(news)

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -56,7 +56,7 @@ import to.bitkit.R
 import to.bitkit.env.Env
 import to.bitkit.ext.requiresPermission
 import to.bitkit.models.Suggestion
-import to.bitkit.models.widget.NewsModel
+import to.bitkit.models.widget.ArticleModel
 import to.bitkit.ui.LocalBalances
 import to.bitkit.ui.Routes
 import to.bitkit.ui.activityListViewModel
@@ -324,7 +324,7 @@ fun HomeScreen(
 @Composable
 private fun HomeContentView(
     uiState: MainUiState,
-    article: NewsModel?,
+    article: ArticleModel?,
     suggestions: List<Suggestion>,
     onRemoveSuggestion: (Suggestion) -> Unit,
     onClickSuggestion: (Suggestion) -> Unit,

app/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt

@@ -10,18 +10,16 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import to.bitkit.data.AppStorage
 import to.bitkit.data.SettingsStore
 import to.bitkit.models.Suggestion
-import to.bitkit.models.WidgetType
 import to.bitkit.models.toSuggestionOrNull
-import to.bitkit.models.widget.NewsModel
-import to.bitkit.models.widget.toNewsModel
+import to.bitkit.models.widget.ArticleModel
+import to.bitkit.models.widget.toArticleModel
 import to.bitkit.repositories.WalletRepo
 import to.bitkit.repositories.WidgetsRepo
 import javax.inject.Inject
@@ -36,9 +34,9 @@ class HomeViewModel @Inject constructor(
 ) : ViewModel() {
 
     val suggestions: StateFlow<List<Suggestion>> = createSuggestionsFlow()
-    private val articles: StateFlow<List<NewsModel>> = createArticlesFlow()
+    private val articles: StateFlow<List<ArticleModel>> = createArticlesFlow()
     private val _currentArticle = MutableStateFlow(articles.value.firstOrNull())
-    val currentArticle: StateFlow<NewsModel?> = _currentArticle.asStateFlow()
+    val currentArticle: StateFlow<ArticleModel?> = _currentArticle.asStateFlow()
 
     init {
         setupArticles()
@@ -101,15 +99,16 @@ class HomeViewModel @Inject constructor(
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
     }
 
-    private fun createArticlesFlow(): StateFlow<List<NewsModel>> {
-        val articles = widgetsRepo.articlesFlow.map { it.articles.map { article -> article.toNewsModel() } }
+    private fun createArticlesFlow(): StateFlow<List<ArticleModel>> {
+        val articles = widgetsRepo.articlesFlow.map { it.articles.map { article -> article.toArticleModel() } }
         return articles.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
     }
 
     private fun setupArticles() {
         viewModelScope.launch {
             val settings = settingsStore.data.first()
             if (!settings.showWidgets) return@launch //TODO also filter !settings.widgets.map { it.type }.contains(WidgetType.NEWS) when implement drag and drop
+            widgetsRepo.updateArticles()
             articles.first { it.isNotEmpty() }
             getRandomArticle()
         }