Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package fr.androidmakers.di

import fr.androidmakers.domain.interactor.AndroidOpenMapUseCase
import fr.androidmakers.domain.interactor.AndroidShareSessionUseCase
import fr.androidmakers.domain.interactor.OpenMapUseCase
import fr.androidmakers.domain.interactor.ShareSessionUseCase
import org.koin.core.module.dsl.factoryOf
import org.koin.dsl.module

actual val domainPlatformModule = module {
factoryOf(::OpenMapUseCase)
factoryOf(::ShareSessionUseCase)
factory<OpenMapUseCase> { AndroidOpenMapUseCase() }
factory<ShareSessionUseCase> { AndroidShareSessionUseCase() }
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.koin.core.context.startKoin
import org.koin.core.logger.Level
import org.koin.core.module.Module

actual class DependenciesBuilder(private val context: Context) {
actual fun inject(platformModules: List<Module>) {
class DependenciesBuilder(private val context: Context) {
fun inject(platformModules: List<Module>) {
startKoin {
if (BuildConfig.DEBUG) {
androidLogger(Level.DEBUG)
Expand Down
6 changes: 0 additions & 6 deletions shared/di/src/commonMain/kotlin/fr/androidmakers/di/Inject.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package fr.androidmakers.di

import org.koin.core.module.Module

expect class DependenciesBuilder {
fun inject(platformModules: List<Module>)
}

val sharedModules = listOf(
dataModule,
domainModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package fr.androidmakers.di

import fr.androidmakers.domain.interactor.IosOpenMapUseCase
import fr.androidmakers.domain.interactor.IosShareSessionUseCase
import fr.androidmakers.domain.interactor.OpenMapUseCase
import fr.androidmakers.domain.interactor.ShareSessionUseCase
import org.koin.core.module.dsl.factoryOf
import org.koin.dsl.module

actual val domainPlatformModule = module {
factoryOf(::OpenMapUseCase)
factoryOf(::ShareSessionUseCase)
factory<OpenMapUseCase> { IosOpenMapUseCase() }
factory<ShareSessionUseCase> { IosShareSessionUseCase() }
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package fr.androidmakers.di
import org.koin.core.context.startKoin
import org.koin.core.module.Module

actual class DependenciesBuilder {
actual fun inject(platformModules: List<Module>) {
class DependenciesBuilder {
fun inject(platformModules: List<Module>) {
startKoin {
modules(
platformModules +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import android.content.Intent
import android.net.Uri
import androidx.core.net.toUri

actual class OpenMapUseCase() {
actual operator fun invoke(context: Context, coordinates: String, name: String) {
class AndroidOpenMapUseCase : OpenMapUseCase {
override operator fun invoke(context: Context, coordinates: String, name: String) {
val venueCoordinatesUri = Uri.Builder()
.scheme("geo")
.encodedAuthority(coordinates)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import androidx.core.app.ShareCompat
import fr.androidmakers.domain.model.Session
import fr.androidmakers.domain.model.Speaker

actual class ShareSessionUseCase {
actual operator fun invoke(
class AndroidShareSessionUseCase : ShareSessionUseCase {
override operator fun invoke(
context: Context,
session: Session,
speakers: List<Speaker>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package fr.androidmakers.domain.interactor

import fr.androidmakers.domain.PlatformContext

expect class OpenMapUseCase {
interface OpenMapUseCase {
operator fun invoke(context: PlatformContext, coordinates: String, name: String)
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import fr.androidmakers.domain.model.Session
import fr.androidmakers.domain.model.Speaker

// TODO to be improved
expect class ShareSessionUseCase {
interface ShareSessionUseCase {
operator fun invoke(
context: PlatformContext,
session: Session,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import platform.CoreLocation.CLLocationCoordinate2DMake
import platform.MapKit.MKMapItem
import platform.MapKit.MKPlacemark

actual class OpenMapUseCase {
class IosOpenMapUseCase : OpenMapUseCase {
@OptIn(ExperimentalForeignApi::class)
actual operator fun invoke(context: PlatformContext, coordinates: String, name: String) {
override operator fun invoke(context: PlatformContext, coordinates: String, name: String) {
val coordinateArray = coordinates.split(",")
if (coordinateArray.size == 2) {
val latitude = coordinateArray[0].toDoubleOrNull()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import platform.Foundation.stringWithFormat
import platform.UIKit.UIActivityViewController
import platform.UIKit.UIApplication

actual class ShareSessionUseCase {
actual operator fun invoke(
class IosShareSessionUseCase : ShareSessionUseCase {
override operator fun invoke(
context: PlatformContext,
session: Session,
speakers: List<Speaker>,
Expand Down