change base url

Author: hoc081098

app/src/main/java/com/hoc/flowmvi/data/remote/UserResponse.kt

@@ -3,7 +3,7 @@ package com.hoc.flowmvi.data.remote
 import com.squareup.moshi.Json
 
 data class UserResponse(
-    @Json(name = "id")
+    @Json(name = "_id")
     val id: String,
     @Json(name = "email")
     val email: String,

app/src/main/java/com/hoc/flowmvi/koin/DataModule.kt

@@ -19,21 +19,27 @@ import java.util.concurrent.TimeUnit
 private const val BASE_URL = "BASE_URL"
 
 val dataModule = module {
-  single { UserApiService(get()) }
+  single { UserApiService(retrofit = get()) }
 
-  single { UserResponseToUserDomainMapper() }
+  single {
+    provideRetrofit(
+        baseUrl = get(named(BASE_URL)),
+        moshi = get(),
+        client = get()
+    )
+  }
 
-  single { UserDomainToUserResponseMapper() }
+  single { provideMoshi() }
 
-  single { UserDomainToUserBodyMapper() }
+  single { provideOkHttpClient() }
 
-  single { provideRetrofit(get(named(BASE_URL)), get(), get()) }
+  factory(named(BASE_URL)) { "https://mvi-coroutines-flow-server.herokuapp.com/" }
 
-  single { provideMoshi() }
+  factory { UserResponseToUserDomainMapper() }
 
-  single { provideOkHttpClient() }
+  factory { UserDomainToUserResponseMapper() }
 
-  single(named(BASE_URL)) { "https://5caad70369c15c001484956a.mockapi.io/hoc081098/" }
+  factory { UserDomainToUserBodyMapper() }
 }
 
 private fun provideMoshi(): Moshi {

app/src/main/java/com/hoc/flowmvi/koin/DomainModule.kt

@@ -22,19 +22,19 @@ val domainModule = module {
 
   single<UserRepository> {
     UserRepositoryImpl(
-        get(),
-        get(),
+        userApiService = get(),
+        dispatchers = get(),
         responseToDomain = get<UserResponseToUserDomainMapper>(),
         domainToResponse = get<UserDomainToUserResponseMapper>(),
         domainToBody = get<UserDomainToUserBodyMapper>()
     )
   }
 
-  factory { GetUsersUseCase(get()) }
+  factory { GetUsersUseCase(userRepository = get()) }
 
-  factory { RefreshGetUsersUseCase(get()) }
+  factory { RefreshGetUsersUseCase(userRepository = get()) }
 
-  factory { RemoveUserUseCase(get()) }
+  factory { RemoveUserUseCase(userRepository = get()) }
 
-  factory { AddUserUseCase(get()) }
+  factory { AddUserUseCase(userRepository = get()) }
 }

app/src/main/java/com/hoc/flowmvi/ui/add/AddActivity.kt

@@ -70,7 +70,10 @@ class AddActivity : AppCompatActivity(), View {
         toast("Add success")
         finish()
       }
-      is SingleEvent.AddUserFailure -> toast("Add failure")
+      is SingleEvent.AddUserFailure -> {
+        Log.d("###", event.toString())
+        toast("Add failure")
+      }
     }
   }
 

app/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt

@@ -124,7 +124,9 @@ class MainActivity : AppCompatActivity(), View {
       progressBar.isVisible = viewState.isLoading
 
       if (viewState.isRefreshing) {
-        swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+        if (!swipeRefreshLayout.isRefreshing) {
+          swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+        }
       } else {
         swipeRefreshLayout.isRefreshing = false
       }