Going back to Result (as KMMResult is no longer needed in iOS)

paug · Mar 20, 2024 · 4fa0a7a · 4fa0a7a
1 parent f128435
commit 4fa0a7a
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 60 deletions.
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/agenda/AgendaLayoutViewModel.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/agenda/AgendaLayoutViewModel.kt
@@ -28,7 +28,7 @@ class AgendaLayoutViewModel(
   val state: StateFlow<AgendaLayoutState> = combine(
       roomsRepository.getRooms()
           .map { rooms ->
-            rooms/*.recover { emptyList() }*/
+            rooms.recover { emptyList() }
                 .getOrThrow()
           },
       sessionFilters,

diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/agenda/AgendaPagerViewModel.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/agenda/AgendaPagerViewModel.kt
@@ -1,6 +1,5 @@
 package fr.paug.androidmakers.ui.components.agenda
 
-import at.asitplus.KmmResult
 import com.androidmakers.ui.common.LceViewModel
 import fr.androidmakers.domain.interactor.GetAgendaUseCase
 import fr.androidmakers.domain.interactor.GetFavoriteSessionsUseCase
@@ -16,7 +15,7 @@ class AgendaPagerViewModel(
     private val setSessionBookmarkUseCase: SetSessionBookmarkUseCase,
     private val getFavoriteSessionsUseCase: GetFavoriteSessionsUseCase
 ) : LceViewModel<Agenda>() {
-  override fun produce(): Flow<KmmResult<Agenda>> {
+  override fun produce(): Flow<Result<Agenda>> {
     return getAgendaUseCase()
   }
 

diff --git a/...idApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailViewModel.kt b/...idApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailViewModel.kt
@@ -67,7 +67,7 @@ class SessionDetailViewModel(
 
   private suspend fun getSpeakers(session: Session): List<Speaker> {
     val allSpeakers = speakersRepository.getSpeakers().firstOrNull()
-        //?.recover { emptyList() }
+        ?.recover { emptyList() }
         ?.getOrThrow()
         ?: return emptyList()
 

diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/FlowExtensions.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/FlowExtensions.kt
@@ -1,12 +1,11 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
 
-internal fun <T> Flow<T>.toResultFlow(): Flow<KmmResult<T>> = this.map {
-  KmmResult.success(it)
+internal fun <T> Flow<T>.toResultFlow(): Flow<Result<T>> = this.map {
+  Result.success(it)
 }.catch {
-  emit(KmmResult.failure<T>(it))
+  emit(Result.failure(it))
 }
diff --git a/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/PartnersGraphQLRepository.kt b/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/PartnersGraphQLRepository.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
@@ -12,7 +11,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 class PartnersGraphQLRepository(private val apolloClient: ApolloClient): PartnersRepository {
-  override fun getPartners(): Flow<KmmResult<List<PartnerGroup>>> {
+  override fun getPartners(): Flow<Result<List<PartnerGroup>>> {
     return apolloClient.query(GetPartnerGroupsQuery())
         .fetchPolicy(FetchPolicy.CacheAndNetwork)
         .watch().map {

diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/RoomsGraphQLRepository.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/RoomsGraphQLRepository.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
@@ -11,13 +10,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 class RoomsGraphQLRepository(private val apolloClient: ApolloClient): RoomsRepository {
-  override fun getRoom(id: String): Flow<KmmResult<Room>> {
+  override fun getRoom(id: String): Flow<Result<Room>> {
     return getRooms().map {
       it.map { it.singleOrNull { it.id == id } ?: error("Not Room") }
     }
   }
 
-  override fun getRooms(): Flow<KmmResult<List<Room>>> {
+  override fun getRooms(): Flow<Result<List<Room>>> {
     return apolloClient.query(GetRoomsQuery())
         .fetchPolicy(FetchPolicy.NetworkFirst)
         .watch()

diff --git a/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/SessionsGraphQLRepository.kt b/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/SessionsGraphQLRepository.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.Mutation
 import com.apollographql.apollo3.cache.normalized.FetchPolicy
@@ -51,7 +50,7 @@ class SessionsGraphQLRepository(private val apolloClient: ApolloClient): Session
     }
   }
 
-  override fun getSession(id: String): Flow<KmmResult<Session>> {
+  override fun getSession(id: String): Flow<Result<Session>> {
     return apolloClient.query(GetSessionQuery(id))
         .fetchPolicy(FetchPolicy.CacheAndNetwork)
         .watch().map {
@@ -60,7 +59,7 @@ class SessionsGraphQLRepository(private val apolloClient: ApolloClient): Session
         .toResultFlow()
   }
 
-  override fun getBookmarks(uid: String): Flow<KmmResult<Set<String>>> {
+  override fun getBookmarks(uid: String): Flow<Result<Set<String>>> {
     return apolloClient.query(BookmarksQuery())
         .fetchPolicy(FetchPolicy.NetworkOnly)
         .refetchPolicy(FetchPolicy.CacheOnly)
@@ -91,7 +90,7 @@ class SessionsGraphQLRepository(private val apolloClient: ApolloClient): Session
     return response.data != null
   }
 
-  override fun getSessions(): Flow<KmmResult<List<Session>>> {
+  override fun getSessions(): Flow<Result<List<Session>>> {
     return apolloClient.query(GetSessionsQuery())
         .fetchPolicy(FetchPolicy.CacheAndNetwork)
         .watch()

diff --git a/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/SpeakersGraphQLRepository.kt b/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/SpeakersGraphQLRepository.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
@@ -12,13 +11,13 @@ import kotlinx.coroutines.flow.map
 
 class SpeakersGraphQLRepository(private val apolloClient: ApolloClient): SpeakersRepository {
 
-  override fun getSpeakers(): Flow<KmmResult<List<Speaker>>> {
+  override fun getSpeakers(): Flow<Result<List<Speaker>>> {
     return apolloClient.query(GetSpeakersQuery()).watch().map {
       it.dataAssertNoErrors.speakers.map { it.speakerDetails.toSpeaker() }
     }.toResultFlow()
   }
 
-  override fun getSpeaker(id: String): Flow<KmmResult<Speaker>> {
+  override fun getSpeaker(id: String): Flow<Result<Speaker>> {
     return apolloClient.query(GetSpeakersQuery())
         .fetchPolicy(FetchPolicy.CacheAndNetwork)
         .watch().map {

diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/VenueGraphQLRepository.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/VenueGraphQLRepository.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.store.graphql
 
-import at.asitplus.KmmResult
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.cache.normalized.FetchPolicy
 import com.apollographql.apollo3.cache.normalized.fetchPolicy
@@ -11,7 +10,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 class VenueGraphQLRepository(private val apolloClient: ApolloClient): VenueRepository {
-  override fun getVenue(id: String): Flow<KmmResult<Venue>> {
+  override fun getVenue(id: String): Flow<Result<Venue>> {
     return apolloClient.query(GetVenueQuery(id))
         .fetchPolicy(FetchPolicy.CacheAndNetwork)
         .watch().map {

diff --git a/shared/domain/build.gradle.kts b/shared/domain/build.gradle.kts
@@ -20,10 +20,6 @@ kotlin {
     commonMain.dependencies {
       implementation(libs.kotlinx.coroutines.core)
       api(libs.kotlinx.datetime)
-
-      // Temporary dependency to handle the fact that swift doesnt support Kotlin Result
-      // It will be removed when we will merge the viewmodels or go for Compose MP
-      api("at.asitplus:kmmresult:1.5.4")
     }
   }
 }

diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/interactor/GetAgendaUseCase.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/interactor/GetAgendaUseCase.kt
@@ -1,6 +1,5 @@
 package fr.androidmakers.domain.interactor
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.Agenda
 import fr.androidmakers.domain.repo.RoomsRepository
 import fr.androidmakers.domain.repo.SessionsRepository
@@ -13,7 +12,7 @@ class GetAgendaUseCase(
     private val speakersRepository: SpeakersRepository,
     private val roomsRepository: RoomsRepository,
 ) {
-  operator fun invoke(): Flow<KmmResult<Agenda>> {
+  operator fun invoke(): Flow<Result<Agenda>> {
     return combine(
         sessionsRepository.getSessions(),
         roomsRepository.getRooms(),
@@ -22,18 +21,18 @@ class GetAgendaUseCase(
 
       sessions.exceptionOrNull()?.let {
         it.printStackTrace()
-        return@combine KmmResult.failure(it)
+        return@combine Result.failure(it)
       }
       rooms.exceptionOrNull()?.let {
         it.printStackTrace()
-        return@combine KmmResult.failure(it)
+        return@combine Result.failure(it)
       }
       speakers.exceptionOrNull()?.let {
         it.printStackTrace()
-        return@combine KmmResult.failure(it)
+        return@combine Result.failure(it)
       }
 
-      KmmResult.success(
+      Result.success(
           Agenda(
               sessions = sessions.getOrThrow().associateBy { it.id },
               rooms = rooms.getOrThrow().associateBy { it.id },

diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/PartnersRepository.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/PartnersRepository.kt
@@ -1,9 +1,8 @@
 package fr.androidmakers.domain.repo
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.PartnerGroup
 import kotlinx.coroutines.flow.Flow
 
 interface PartnersRepository {
-  fun getPartners(): Flow<KmmResult<List<PartnerGroup>>>
+  fun getPartners(): Flow<Result<List<PartnerGroup>>>
 }
diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/RoomsRepository.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/RoomsRepository.kt
@@ -1,12 +1,11 @@
 package fr.androidmakers.domain.repo
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.Room
 import kotlinx.coroutines.flow.Flow
 
 interface RoomsRepository {
 
-  fun getRoom(id: String): Flow<KmmResult<Room>>
+  fun getRoom(id: String): Flow<Result<Room>>
 
-  fun getRooms(): Flow<KmmResult<List<Room>>>
+  fun getRooms(): Flow<Result<List<Room>>>
 }
diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/SessionsRepository.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/SessionsRepository.kt
@@ -1,15 +1,14 @@
 package fr.androidmakers.domain.repo
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.Session
 import kotlinx.coroutines.flow.Flow
 
 interface SessionsRepository {
-  fun getSession(id: String): Flow<KmmResult<Session>>
+  fun getSession(id: String): Flow<Result<Session>>
 
-  fun getSessions(): Flow<KmmResult<List<Session>>>
+  fun getSessions(): Flow<Result<List<Session>>>
 
-  fun getBookmarks(userId: String): Flow<KmmResult<Set<String>>>
+  fun getBookmarks(userId: String): Flow<Result<Set<String>>>
 
   suspend fun setBookmark(userId: String, sessionId: String, value: Boolean)
 }
diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/SpeakersRepository.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/SpeakersRepository.kt
@@ -1,12 +1,11 @@
 package fr.androidmakers.domain.repo
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.Speaker
 import kotlinx.coroutines.flow.Flow
 
 interface SpeakersRepository {
 
-  fun getSpeaker(id: String): Flow<KmmResult<Speaker>>
+  fun getSpeaker(id: String): Flow<Result<Speaker>>
 
-  fun getSpeakers(): Flow<KmmResult<List<Speaker>>>
+  fun getSpeakers(): Flow<Result<List<Speaker>>>
 }
diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/VenueRepository.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/repo/VenueRepository.kt
@@ -1,9 +1,8 @@
 package fr.androidmakers.domain.repo
 
-import at.asitplus.KmmResult
 import fr.androidmakers.domain.model.Venue
 import kotlinx.coroutines.flow.Flow
 
 interface VenueRepository {
-  fun getVenue(id: String): Flow<KmmResult<Venue>>
+  fun getVenue(id: String): Flow<Result<Venue>>
 }
diff --git a/shared/src/commonMain/kotlin/TestCla.kt b/shared/src/commonMain/kotlin/TestCla.kt
diff --git a/shared/src/commonMain/kotlin/TestClass.kt b/shared/src/commonMain/kotlin/TestClass.kt
@@ -0,0 +1,5 @@
+class TestClass {
+  // TODO find a solution to remove this class
+  // It is necessary to build the iOS Framework
+  // Maybe by configuring src sets on iOS?
+}
diff --git a/shared/ui/build.gradle.kts b/shared/ui/build.gradle.kts
@@ -29,7 +29,6 @@ kotlin {
       implementation(compose.ui)
       implementation(compose.components.resources)
       implementation(compose.components.uiToolingPreview)
-      api("at.asitplus:kmmresult:1.5.4")
       implementation(project(":shared:domain"))
       implementation(project(":shared:di"))
       api("io.github.qdsfdhvh:image-loader:1.7.8")

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/LceViewModel.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/LceViewModel.kt
@@ -1,6 +1,5 @@
 package com.androidmakers.ui.common
 
-import at.asitplus.KmmResult
 import com.androidmakers.ui.model.Lce
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
@@ -14,7 +13,7 @@ import moe.tlaster.precompose.viewmodel.viewModelScope
 
 
 abstract class LceViewModel<T> : ViewModel() {
-  abstract fun produce(): Flow<KmmResult<T>>
+  abstract fun produce(): Flow<Result<T>>
 
   private val _mutableSharedState = MutableStateFlow<Lce<T>>(Lce.Loading)
   val values = _mutableSharedState.asStateFlow()

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/model/Lce.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/model/Lce.kt
@@ -1,14 +1,13 @@
 package com.androidmakers.ui.model
 
-import at.asitplus.KmmResult
 
 sealed interface Lce<out T> {
   object Loading : Lce<Nothing>
   class Content<T>(val content: T) : Lce<T>
   object Error : Lce<Nothing>
 }
 
-fun <T> KmmResult<T>.toLce(): Lce<T> = if (isSuccess) {
+fun <T> Result<T>.toLce(): Lce<T> = if (isSuccess) {
   Lce.Content(getOrThrow())
 } else {
   Lce.Error

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorsViewModel.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorsViewModel.kt
@@ -1,6 +1,5 @@
 package com.androidmakers.ui.sponsors
 
-import at.asitplus.KmmResult
 import com.androidmakers.ui.common.LceViewModel
 import fr.androidmakers.domain.interactor.GetPartnersUseCase
 import fr.androidmakers.domain.model.PartnerGroup
@@ -9,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 class SponsorsViewModel(
     private val getPartnersUseCase: GetPartnersUseCase
 ) : LceViewModel<List<PartnerGroup>>() {
-  override fun produce(): Flow<KmmResult<List<PartnerGroup>>> {
+  override fun produce(): Flow<Result<List<PartnerGroup>>> {
     return getPartnersUseCase()
   }
 

diff --git a/shared/ui/src/iosMain/kotlin/com/androidmakers/ui/sponsors/SponsorViewController.kt b/shared/ui/src/iosMain/kotlin/com/androidmakers/ui/sponsors/SponsorViewController.kt
@@ -1,10 +1,6 @@
 package com.androidmakers.ui.sponsors
 
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.window.ComposeUIViewController
-import at.asitplus.KmmResult
-import com.androidmakers.ui.model.Lce
 import com.androidmakers.ui.theme.AndroidMakersTheme
 import fr.androidmakers.di.DepContainer
 import platform.UIKit.UIViewController