-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #157 from ryanw-mobile/refactor/130-koin
[refactor] (#130) introduce koin
- Loading branch information
Showing
115 changed files
with
652 additions
and
514 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module version="4"> | ||
| <component name="CheckStyle-IDEA-Module" serialisationVersion="2"> | ||
| <option name="activeLocationsIds" /> | ||
| </component> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/app/models/timeline/TimelineEntry.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/di/AppModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright (c) 2024. Ryan Wong (hello@ryanwebmail.com) | ||
| */ | ||
|
|
||
| package uk.ryanwong.gmap2ics.di | ||
|
|
||
| import org.koin.dsl.module | ||
| import uk.ryanwong.gmap2ics.app.utils.timezonemap.TimeZoneMapImpl | ||
| import uk.ryanwong.gmap2ics.app.utils.timezonemap.TimeZoneMapWrapper | ||
| import us.dustinj.timezonemap.TimeZoneMap | ||
|
|
||
| val appModule = module { | ||
| single<TimeZoneMapWrapper> { | ||
| TimeZoneMapImpl(timeZoneMap = TimeZoneMap.forEverywhere()) | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/di/NetworkModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright (c) 2024. Ryan Wong (hello@ryanwebmail.com) | ||
| */ | ||
|
|
||
| package uk.ryanwong.gmap2ics.di | ||
|
|
||
| import io.ktor.client.engine.cio.CIO | ||
| import org.koin.core.qualifier.named | ||
| import org.koin.dsl.module | ||
| import uk.ryanwong.gmap2ics.data.datasources.googleapi.GoogleApiDataSource | ||
| import uk.ryanwong.gmap2ics.data.datasources.googleapi.ktor.GoogleMapsApiClient | ||
| import uk.ryanwong.gmap2ics.data.datasources.googleapi.ktor.KtorGoogleApiDataSource | ||
| import uk.ryanwong.gmap2ics.data.datasources.googleapi.ktor.impl.GoogleMapsApiClientImpl | ||
| import uk.ryanwong.gmap2ics.data.datasources.googleapi.retrofit.RetrofitGoogleApiDataSource | ||
|
|
||
| val networkModule = module { | ||
| single { CIO.create() } | ||
| single<GoogleMapsApiClient> { GoogleMapsApiClientImpl(engine = get()) } | ||
| single<GoogleApiDataSource>(named("ktor")) { KtorGoogleApiDataSource(googleMapsApiClient = get()) } | ||
| single<GoogleApiDataSource>(named("retrofit")) { RetrofitGoogleApiDataSource() } | ||
| } |
39 changes: 39 additions & 0 deletions
39
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/di/RepositoryModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (c) 2024. Ryan Wong (hello@ryanwebmail.com) | ||
| */ | ||
|
|
||
| package uk.ryanwong.gmap2ics.di | ||
|
|
||
| import kotlinx.serialization.json.Json | ||
| import org.koin.core.qualifier.named | ||
| import org.koin.dsl.module | ||
| import uk.ryanwong.gmap2ics.app.configs.ProvideConfig | ||
| import uk.ryanwong.gmap2ics.data.repositories.LocalFileRepositoryImpl | ||
| import uk.ryanwong.gmap2ics.data.repositories.PlaceDetailsRepositoryImpl | ||
| import uk.ryanwong.gmap2ics.data.repositories.TimelineRepositoryImpl | ||
| import uk.ryanwong.gmap2ics.domain.repositories.LocalFileRepository | ||
| import uk.ryanwong.gmap2ics.domain.repositories.PlaceDetailsRepository | ||
| import uk.ryanwong.gmap2ics.domain.repositories.TimelineRepository | ||
|
|
||
| const val USE_KTOR = true | ||
|
|
||
| val repositoryModule = module { | ||
| single<PlaceDetailsRepository> { | ||
| PlaceDetailsRepositoryImpl( | ||
| networkDataSource = get(named(if (USE_KTOR) "ktor" else "retrofit")), | ||
| placesApiKey = ProvideConfig.getConfig().placesApiKey, | ||
| apiLanguageOverride = ProvideConfig.getConfig().apiLanguageOverride, | ||
| ) | ||
| } | ||
|
|
||
| single<LocalFileRepository> { | ||
| LocalFileRepositoryImpl() | ||
| } | ||
|
|
||
| single<TimelineRepository> { | ||
| TimelineRepositoryImpl( | ||
| timeZoneMap = get(), | ||
| kotlinJson = Json { ignoreUnknownKeys = true }, | ||
| ) | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/di/UseCaseModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright (c) 2024. Ryan Wong (hello@ryanwebmail.com) | ||
| */ | ||
|
|
||
| package uk.ryanwong.gmap2ics.di | ||
|
|
||
| import org.koin.dsl.module | ||
| import uk.ryanwong.gmap2ics.domain.usecases.GetActivitySegmentVEventUseCase | ||
| import uk.ryanwong.gmap2ics.domain.usecases.GetOutputFilenameUseCase | ||
| import uk.ryanwong.gmap2ics.domain.usecases.GetPlaceVisitVEventUseCase | ||
| import uk.ryanwong.gmap2ics.domain.usecases.VEventFromActivitySegmentUseCase | ||
| import uk.ryanwong.gmap2ics.usecases.GetActivitySegmentVEventUseCaseImpl | ||
| import uk.ryanwong.gmap2ics.usecases.GetOutputFilenameUseCaseImpl | ||
| import uk.ryanwong.gmap2ics.usecases.GetPlaceVisitVEventUseCaseImpl | ||
| import uk.ryanwong.gmap2ics.usecases.VEventFromActivitySegmentUseCaseImpl | ||
| import uk.ryanwong.gmap2ics.usecases.VEventFromChildVisitUseCaseImpl | ||
| import uk.ryanwong.gmap2ics.usecases.VEventFromPlaceVisitUseCaseImpl | ||
|
|
||
| val useCaseModule = module { | ||
| factory<GetPlaceVisitVEventUseCase> { | ||
| GetPlaceVisitVEventUseCaseImpl( | ||
| vEventFromChildVisitUseCase = VEventFromChildVisitUseCaseImpl(placeDetailsRepository = get()), | ||
| vEventFromPlaceVisitUseCase = VEventFromPlaceVisitUseCaseImpl(placeDetailsRepository = get()), | ||
| ) | ||
| } | ||
|
|
||
| factory<GetOutputFilenameUseCase> { | ||
| GetOutputFilenameUseCaseImpl() | ||
| } | ||
|
|
||
| factory<VEventFromActivitySegmentUseCase> { | ||
| VEventFromActivitySegmentUseCaseImpl(placeDetailsRepository = get()) | ||
| } | ||
|
|
||
| factory<GetActivitySegmentVEventUseCase> { | ||
| GetActivitySegmentVEventUseCaseImpl(vEventFromActivitySegmentUseCase = get()) | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
composeApp/src/commonMain/kotlin/uk/ryanwong/gmap2ics/di/ViewModelModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright (c) 2024. Ryan Wong (hello@ryanwebmail.com) | ||
| */ | ||
|
|
||
| package uk.ryanwong.gmap2ics.di | ||
|
|
||
| import org.koin.dsl.module | ||
| import uk.ryanwong.gmap2ics.app.configs.ProvideConfig | ||
| import uk.ryanwong.gmap2ics.ui.viewmodels.MainScreenViewModel | ||
| import java.util.Locale | ||
| import java.util.ResourceBundle | ||
|
|
||
| val viewModelModule = module { | ||
| single { | ||
| MainScreenViewModel( | ||
| configFile = ProvideConfig.getConfig(), | ||
| resourceBundle = ResourceBundle.getBundle("resources", Locale.ENGLISH), | ||
| timelineRepository = get(), | ||
| localFileRepository = get(), | ||
| getActivitySegmentVEventUseCase = get(), | ||
| getOutputFilenameUseCase = get(), | ||
| getPlaceVisitVEventUseCase = get(), | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.