Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2fbe438 authored by cketti's avatar cketti
Browse files

Update Koin components to version 3.3.2

parent 54128718

app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ import com.fsck.k9.ui.observeNotNull 
import com.fsck.k9.ui.settings.import.SettingsImportResultViewModel

import com.fsck.k9.ui.settings.import.SettingsImportSuccess

import org.koin.android.ext.android.inject

import org.koin.androidx.viewmodel.ext.android.sharedViewModel

import org.koin.androidx.viewmodel.ext.android.activityViewModel



class WelcomeFragment : Fragment() {

    private val htmlToSpanned: HtmlToSpanned by inject()

    private val importResultViewModel: SettingsImportResultViewModel by sharedViewModel()

    private val importResultViewModel: SettingsImportResultViewModel by activityViewModel()



    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        return inflater.inflate(R.layout.fragment_welcome_message, container, false)

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ import com.fsck.k9.ui.settings.removeEntry 
import com.fsck.k9.ui.withArguments

import com.takisoft.preferencex.PreferenceFragmentCompat

import org.koin.android.ext.android.inject

import org.koin.androidx.viewmodel.ext.android.sharedViewModel

import org.koin.androidx.viewmodel.ext.android.activityViewModel

import org.koin.core.parameter.parametersOf

import org.openintents.openpgp.OpenPgpApiManager

import org.openintents.openpgp.util.OpenPgpKeyPreference

import org.openintents.openpgp.util.OpenPgpProviderUtil



class AccountSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFragmentListener {

    private val viewModel: AccountSettingsViewModel by sharedViewModel()

    private val viewModel: AccountSettingsViewModel by activityViewModel()

    private val dataStoreFactory: AccountSettingsDataStoreFactory by inject()

    private val openPgpApiManager: OpenPgpApiManager by inject { parametersOf(this) }

    private val messagingController: MessagingController by inject()

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ import com.fsck.k9.ui.R 
import com.fsck.k9.ui.observeNotNull

import com.mikepenz.fastadapter.FastAdapter

import com.mikepenz.fastadapter.adapters.ItemAdapter

import org.koin.androidx.viewmodel.ext.android.sharedViewModel

import org.koin.androidx.viewmodel.ext.android.activityViewModel

import org.koin.androidx.viewmodel.ext.android.viewModel



class SettingsImportFragment : Fragment() {

    private val viewModel: SettingsImportViewModel by viewModel()

    private val resultViewModel: SettingsImportResultViewModel by sharedViewModel()

    private val resultViewModel: SettingsImportResultViewModel by activityViewModel()



    private lateinit var settingsImportAdapter: FastAdapter<ImportListItem<*>>

    private lateinit var itemAdapter: ItemAdapter<ImportListItem<*>>

gradle/libs.versions.toml

+6 −5
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ androidxTransition = "1.4.1" 
fastAdapter = "5.7.0"

preferencesFix = "1.1.0"

timber = "5.0.1"

koin = "3.2.2"

koinCore = "3.3.2"

koinAndroid = "3.3.2"

mime4j = "0.8.6"

okhttp = "4.10.0"

glide = "4.14.2"
@@ -82,10 +83,10 @@ okio = "com.squareup.okio:okio:3.3.0" 
moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }

timber = "com.jakewharton.timber:timber:5.0.1"

koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }

koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }

koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }

koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }

koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinCore" }

koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" }

koin-test = { module = "io.insert-koin:koin-test", version.ref = "koinCore" }

koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koinCore" }



# We can't upgrade Commons IO beyond this version because starting with 2.7 it is using Java 8 API

# that is not available until Android API 26 (even with desugaring enabled).