Minor improvements and fixes

Author: lucasdillmann

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/MainActivity.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import br.com.dillmann.fireflycompanion.android.core.activity.PreconfiguredActivity
 import br.com.dillmann.fireflycompanion.android.core.compose.persistent
-import br.com.dillmann.fireflycompanion.android.core.koin.KoinManager.koin
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.router.Route
 import br.com.dillmann.fireflycompanion.android.core.router.Router
 import br.com.dillmann.fireflycompanion.business.serverconfig.usecase.GetConfigUseCase
@@ -14,7 +14,7 @@ class MainActivity : PreconfiguredActivity() {
     @Composable
     override fun Content(padding: PaddingValues) {
         val initialRoute by persistent {
-            val serverConfig = koin().get<GetConfigUseCase>().getConfig()
+            val serverConfig = get<GetConfigUseCase>().getConfig()
             if (serverConfig == null)
                 Route.ONBOARDING_START_SCREEN
             else

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/accounts/AccountForm.kt

@@ -23,11 +23,11 @@ import br.com.dillmann.fireflycompanion.android.core.refresh.OnRefreshEvent
 import br.com.dillmann.fireflycompanion.android.core.refresh.RefreshDispatcher
 import br.com.dillmann.fireflycompanion.android.core.router.NavigationContext
 import br.com.dillmann.fireflycompanion.android.core.components.textfield.AppTextFieldDefaults
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.business.account.Account
 import br.com.dillmann.fireflycompanion.business.account.usecase.GetAccountUseCase
 import br.com.dillmann.fireflycompanion.business.account.usecase.UpdateAccountBalanceUseCase
 import br.com.dillmann.fireflycompanion.business.transaction.usecase.ListTransactionsUseCase
-import org.koin.java.KoinJavaComponent.getKoin
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -36,9 +36,9 @@ fun NavigationContext.AccountForm() {
     var account by volatile(requireBagValue<Account>())
     var balance by volatile(account.currentBalance)
     var showLoading by volatile(false)
-    val listTransactionsUseCase = getKoin().get<ListTransactionsUseCase>()
-    val updateBalanceUseCase = getKoin().get<UpdateAccountBalanceUseCase>()
-    val getAccountUseCase = getKoin().get<GetAccountUseCase>()
+    val listTransactionsUseCase = get<ListTransactionsUseCase>()
+    val updateBalanceUseCase = get<UpdateAccountBalanceUseCase>()
+    val getAccountUseCase = get<GetAccountUseCase>()
 
     fun updateBalance() {
         showLoading = true

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/biometric/Biometrics.kt

@@ -7,8 +7,8 @@ import android.os.CancellationSignal
 import br.com.dillmann.fireflycompanion.android.R
 import br.com.dillmann.fireflycompanion.android.core.compose.async
 import br.com.dillmann.fireflycompanion.android.core.i18n.i18n
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.business.preferences.usecase.GetPreferencesUseCase
-import org.koin.java.KoinJavaComponent.getKoin
 import java.time.LocalDateTime
 import java.util.concurrent.Executors
 
@@ -52,7 +52,7 @@ object Biometrics {
         if (lockedAt == null)
             return false
 
-        val preferences = async { getKoin().get<GetPreferencesUseCase>().getPreferences() }.get()
+        val preferences = async { get<GetPreferencesUseCase>().getPreferences() }.get()
         val skewSeconds = preferences.lockTimeout.seconds
 
         return lockedAt!!.plusSeconds(skewSeconds) > LocalDateTime.now()

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/core/activity/PreconfiguredActivity.kt

@@ -19,7 +19,7 @@ import br.com.dillmann.fireflycompanion.android.biometric.BiometricUnlockActivit
 import br.com.dillmann.fireflycompanion.android.biometric.Biometrics
 import br.com.dillmann.fireflycompanion.android.core.compose.async
 import br.com.dillmann.fireflycompanion.android.core.context.AppContext
-import br.com.dillmann.fireflycompanion.android.core.koin.KoinManager.koin
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.theme.AppTheme
 import br.com.dillmann.fireflycompanion.android.core.theme.AppThemeContext
 import br.com.dillmann.fireflycompanion.business.preferences.Preferences
@@ -90,7 +90,7 @@ abstract class PreconfiguredActivity(
     }
 
     private fun getPreferences(): Preferences =
-        async { koin().get<GetPreferencesUseCase>().getPreferences() }.get()
+        async { get<GetPreferencesUseCase>().getPreferences() }.get()
 
     @Composable
     abstract fun Content(padding: PaddingValues)

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/core/i18n/i18n.kt

@@ -1,8 +1,8 @@
 package br.com.dillmann.fireflycompanion.android.core.i18n
 
-import br.com.dillmann.fireflycompanion.android.core.koin.KoinManager.koin
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.database.context.ContextProvider
 import kotlinx.coroutines.runBlocking
 
 fun i18n(key: Int): String =
-    runBlocking { koin().get<ContextProvider>().resolve() }.getString(key)
+    runBlocking { get<ContextProvider>().resolve() }.getString(key)

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/core/koin/KoinExtensions.kt

@@ -0,0 +1,4 @@
+package br.com.dillmann.fireflycompanion.android.core.koin
+
+inline fun <reified T: Any> get() =
+    KoinManager.koin().get<T>()

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/home/accounts/HomeAccountsTab.kt

@@ -24,7 +24,7 @@ import br.com.dillmann.fireflycompanion.android.core.components.section.Section
 import br.com.dillmann.fireflycompanion.android.core.compose.persistent
 import br.com.dillmann.fireflycompanion.android.core.compose.volatile
 import br.com.dillmann.fireflycompanion.android.core.i18n.i18n
-import br.com.dillmann.fireflycompanion.android.core.koin.KoinManager.koin
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.queue.ActionQueue
 import br.com.dillmann.fireflycompanion.android.core.refresh.OnRefreshEvent
 import br.com.dillmann.fireflycompanion.android.core.router.Route
@@ -40,7 +40,7 @@ fun HomeAccountsTab(
     modifier: Modifier = Modifier,
 ) {
     val queue by persistent(ActionQueue())
-    val listUseCase = koin().get<ListAccountsUseCase>()
+    val listUseCase = get<ListAccountsUseCase>()
     var accounts by persistent(emptyList<Account>())
     var currentPage by persistent(0)
     var hasMorePages by persistent(true)

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/home/assistant/HomeAssistantTab.kt

@@ -29,21 +29,21 @@ import br.com.dillmann.fireflycompanion.android.core.compose.persistent
 import br.com.dillmann.fireflycompanion.android.core.compose.volatile
 import br.com.dillmann.fireflycompanion.android.core.context.AppContext
 import br.com.dillmann.fireflycompanion.android.core.i18n.i18n
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.queue.ActionQueue
 import br.com.dillmann.fireflycompanion.business.assistant.AssistantSession
 import br.com.dillmann.fireflycompanion.business.assistant.AssistantSession.State
 import br.com.dillmann.fireflycompanion.business.assistant.model.AssistantMessage
 import br.com.dillmann.fireflycompanion.business.assistant.usecase.StartAssistantSessionUseCase
 import kotlinx.coroutines.launch
-import org.koin.java.KoinJavaComponent.getKoin
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun HomeAssistantTab() {
-    val useCase = getKoin().get<StartAssistantSessionUseCase>()
+    val useCase = get<StartAssistantSessionUseCase>()
     var messages by persistent(emptyList<AssistantMessage>())
     val session by volatile { useCase.startSession(AppContext.currentLocale().toLanguageTag()) }
 

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/home/main/HomeAccountsOverview.kt

@@ -22,6 +22,7 @@ import br.com.dillmann.fireflycompanion.android.core.components.section.SectionC
 import br.com.dillmann.fireflycompanion.android.core.compose.persistent
 import br.com.dillmann.fireflycompanion.android.core.compose.volatile
 import br.com.dillmann.fireflycompanion.android.core.i18n.i18n
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.queue.ActionQueue
 import br.com.dillmann.fireflycompanion.android.core.refresh.OnRefreshEvent
 import br.com.dillmann.fireflycompanion.android.core.theme.AppColors
@@ -32,7 +33,6 @@ import br.com.dillmann.fireflycompanion.business.account.usecase.GetAccountOverv
 import br.com.dillmann.fireflycompanion.business.preferences.usecase.GetPreferencesUseCase
 import ir.ehsannarmani.compose_charts.LineChart
 import ir.ehsannarmani.compose_charts.models.*
-import org.koin.mp.KoinPlatform.getKoin
 
 @Composable
 fun HomeAccountsOverview() {
@@ -131,8 +131,8 @@ private fun Graph(overview: List<AccountOverview>) {
 }
 
 private suspend fun fetchOverview(): List<AccountOverview> {
-    val overviewUseCase = getKoin().get<GetAccountOverviewUseCase>()
-    val preferencesUseCase = getKoin().get<GetPreferencesUseCase>()
+    val overviewUseCase = get<GetAccountOverviewUseCase>()
+    val preferencesUseCase = get<GetPreferencesUseCase>()
     val (startDate, endDate) = preferencesUseCase.getPreferences().homePeriod.toDateRange()
     return overviewUseCase.getOverview(startDate, endDate)
 }

android/src/main/kotlin/br/com/dillmann/fireflycompanion/android/home/main/HomeCreditCards.kt

@@ -25,6 +25,7 @@ import br.com.dillmann.fireflycompanion.android.core.components.money.MoneyText
 import br.com.dillmann.fireflycompanion.android.core.components.section.SectionCard
 import br.com.dillmann.fireflycompanion.android.core.compose.persistent
 import br.com.dillmann.fireflycompanion.android.core.i18n.i18n
+import br.com.dillmann.fireflycompanion.android.core.koin.get
 import br.com.dillmann.fireflycompanion.android.core.queue.ActionQueue
 import br.com.dillmann.fireflycompanion.android.core.refresh.OnRefreshEvent
 import br.com.dillmann.fireflycompanion.android.core.router.Route
@@ -34,7 +35,6 @@ import br.com.dillmann.fireflycompanion.business.account.Account
 import br.com.dillmann.fireflycompanion.business.account.usecase.ListAccountsUseCase
 import br.com.dillmann.fireflycompanion.business.transaction.Transaction
 import br.com.dillmann.fireflycompanion.core.pagination.fetchAllPages
-import org.koin.java.KoinJavaComponent.getKoin
 import java.math.BigDecimal
 import java.time.OffsetDateTime
 
@@ -172,7 +172,7 @@ private fun openAccountForm(account: Account) {
 }
 
 private suspend fun fetchCreditCards(): List<Account> {
-    val useCase = getKoin().get<ListAccountsUseCase>()
+    val useCase = get<ListAccountsUseCase>()
     return fetchAllPages { useCase.listAccounts(it) }
         .filter { it.role == Account.Role.CREDIT_CARD }
 }