imcarlost/Acronyms
1
0
Fork 0
mirror of https://github.com/imcarlost/Acronyms.git synced 2026-04-10 02:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change: rename acronyms classes to shortform

Browse Source
This commit is contained in:
Carlos Martinez
2021-06-17 12:12:55 -04:00
parent 3a29504fd2
commit 4e53225a2f
13 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shortform/src/main/java/dev/carlos/shortform/data/AcronymsDataRepository.kt
View File

@@ -1,16 +0,0 @@
package dev.carlos.shortform.data
import dev.carlos.shortform.data.cloud.AcronymsRemoteSource
import dev.carlos.shortform.data.models.ShortformModel
import dev.carlos.shortform.data.models.toShortformModel
import dev.carlos.shortform.domain.AcronymsRepository
import io.reactivex.Single
class AcronymsDataRepository(
private val remoteDatasource: AcronymsRemoteSource
) : AcronymsRepository {
override fun getAcronymDefinition(acronym: String): Single<ShortformModel> {
return remoteDatasource.getAcronymDefinition(acronym).map { it.single().toShortformModel() }
}
}

16
shortform/src/main/java/dev/carlos/shortform/data/ShortformDataRepository.kt Normal file
View File

@@ -0,0 +1,16 @@
package dev.carlos.shortform.data
import dev.carlos.shortform.data.cloud.ShortformRemoteSource
import dev.carlos.shortform.data.models.ShortformModel
import dev.carlos.shortform.data.models.toShortformModel
import dev.carlos.shortform.domain.ShortformRepository
import io.reactivex.Single
class ShortformDataRepository(
private val remoteDatasource: ShortformRemoteSource
) : ShortformRepository {
override fun getShortformDefinition(acronym: String): Single<ShortformModel> {
return remoteDatasource.getShortformDefinition(acronym).map { it.single().toShortformModel() }
}
}

4
shortform/src/main/java/dev/carlos/shortform/data/cloud/AcronymsRemoteSource.kt → shortform/src/main/java/dev/carlos/shortform/data/cloud/ShortformRemoteSource.kt
View File

@@ -3,6 +3,6 @@ package dev.carlos.shortform.data.cloud
import dev.carlos.shortform.data.cloud.model.ShortformRemote
import io.reactivex.Single
interface AcronymsRemoteSource {
fun getAcronymDefinition(acronym: String): Single<List<ShortformRemote>>
interface ShortformRemoteSource {
fun getShortformDefinition(acronym: String): Single<List<ShortformRemote>>
}

11
shortform/src/main/java/dev/carlos/shortform/data/cloud/retrofit/AcronymsRemoteDatasource.kt
View File

@@ -1,11 +0,0 @@
package dev.carlos.shortform.data.cloud.retrofit
import dev.carlos.shortform.data.cloud.AcronymsRemoteSource
import dev.carlos.shortform.data.cloud.model.ShortformRemote
import io.reactivex.Single
class AcronymsRemoteDatasource(private val acronymsService: AcronymsService) : AcronymsRemoteSource {
override fun getAcronymDefinition(acronym: String): Single<List<ShortformRemote>> {
return acronymsService.getAcronymDefinition(acronym)
}
}

11
shortform/src/main/java/dev/carlos/shortform/data/cloud/retrofit/ShortformRemoteDatasource.kt Normal file
View File

@@ -0,0 +1,11 @@
package dev.carlos.shortform.data.cloud.retrofit
import dev.carlos.shortform.data.cloud.ShortformRemoteSource
import dev.carlos.shortform.data.cloud.model.ShortformRemote
import io.reactivex.Single
class ShortformRemoteDatasource(private val shortformService: ShortformService) : ShortformRemoteSource {
override fun getShortformDefinition(acronym: String): Single<List<ShortformRemote>> {
return shortformService.getShortformDefinition(acronym)
}
}

4
shortform/src/main/java/dev/carlos/shortform/data/cloud/retrofit/AcronymsService.kt → shortform/src/main/java/dev/carlos/shortform/data/cloud/retrofit/ShortformService.kt
View File

@@ -5,7 +5,7 @@ import io.reactivex.Single
import retrofit2.http.GET
import retrofit2.http.Query
interface AcronymsService {
interface ShortformService {
@GET("/software/acromine/dictionary.py")
fun getAcronymDefinition(@Query("sf") acronym: String): Single<List<ShortformRemote>>
fun getShortformDefinition(@Query("sf") acronym: String): Single<List<ShortformRemote>>
}

29
shortform/src/main/java/dev/carlos/shortform/di/AcronymsModule.kt
View File

@@ -1,29 +0,0 @@
package dev.carlos.shortform.di
import dev.carlos.core.domain.network.RemoteClient
import dev.carlos.core.scheduler.Scheduler
import dev.carlos.core.scheduler.SchedulerProvider
import dev.carlos.shortform.data.AcronymsDataRepository
import dev.carlos.shortform.data.cloud.AcronymsRemoteSource
import dev.carlos.shortform.data.cloud.retrofit.AcronymsRemoteDatasource
import dev.carlos.shortform.data.cloud.retrofit.AcronymsService
import dev.carlos.shortform.domain.AcronymsRepository
import dev.carlos.shortform.domain.GetAcronymDefinition
import dev.carlos.shortform.viewmodels.AcronymsViewmodel
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module
val acronymsModule = module {
single<Scheduler> { SchedulerProvider() }
single {
get<RemoteClient>().getClient(AcronymsService::class.java)
}
factory<AcronymsRemoteSource> { AcronymsRemoteDatasource(get()) }
factory<AcronymsRepository> { AcronymsDataRepository(get()) }
factory { GetAcronymDefinition(get(), get()) }
viewModel { AcronymsViewmodel(get()) }
}

29
shortform/src/main/java/dev/carlos/shortform/di/ShortformModule.kt Normal file
View File

@@ -0,0 +1,29 @@
package dev.carlos.shortform.di
import dev.carlos.core.domain.network.RemoteClient
import dev.carlos.core.scheduler.Scheduler
import dev.carlos.core.scheduler.SchedulerProvider
import dev.carlos.shortform.data.ShortformDataRepository
import dev.carlos.shortform.data.cloud.ShortformRemoteSource
import dev.carlos.shortform.data.cloud.retrofit.ShortformRemoteDatasource
import dev.carlos.shortform.data.cloud.retrofit.ShortformService
import dev.carlos.shortform.domain.ShortformRepository
import dev.carlos.shortform.domain.GetShortformDefinition
import dev.carlos.shortform.viewmodels.ShortformViewmodel
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module
val shortformModule = module {
single<Scheduler> { SchedulerProvider() }
single {
get<RemoteClient>().getClient(ShortformService::class.java)
}
factory<ShortformRemoteSource> { ShortformRemoteDatasource(get()) }
factory<ShortformRepository> { ShortformDataRepository(get()) }
factory { GetShortformDefinition(get(), get()) }
viewModel { ShortformViewmodel(get()) }
}

8
shortform/src/main/java/dev/carlos/shortform/domain/GetAcronymDefinition.kt → shortform/src/main/java/dev/carlos/shortform/domain/GetShortformDefinition.kt
View File

@@ -5,11 +5,11 @@ import dev.carlos.core.extensions.runOnIo
import dev.carlos.core.scheduler.Scheduler
import io.reactivex.Single
class GetAcronymDefinition(
private val acronymsRepository: AcronymsRepository,
class GetShortformDefinition(
private val shortformRepository: ShortformRepository,
private val scheduler: Scheduler
) {
fun getAcronymDefinition(acronym: String): Single<ShortformModel> {
return acronymsRepository.getAcronymDefinition(acronym).runOnIo(scheduler)
fun getShortformDefinition(shortform: String): Single<ShortformModel> {
return shortformRepository.getShortformDefinition(shortform).runOnIo(scheduler)
}
}

4
shortform/src/main/java/dev/carlos/shortform/domain/AcronymsRepository.kt → shortform/src/main/java/dev/carlos/shortform/domain/ShortformRepository.kt
View File

@@ -4,6 +4,6 @@ import dev.carlos.shortform.data.models.ShortformModel
import io.reactivex.Flowable
import io.reactivex.Single
interface AcronymsRepository {
fun getAcronymDefinition(acronym: String): Single<ShortformModel>
interface ShortformRepository {
fun getShortformDefinition(acronym: String): Single<ShortformModel>
}

4
shortform/src/main/java/dev/carlos/shortform/feature/ShortformFragment.kt Normal file
View File

@@ -0,0 +1,4 @@
package dev.carlos.shortform.feature
class ShortformFragment {
}

8
shortform/src/main/java/dev/carlos/shortform/viewmodels/AcronymsViewmodel.kt → shortform/src/main/java/dev/carlos/shortform/viewmodels/ShortformViewmodel.kt
View File

@@ -5,18 +5,18 @@ import dev.carlos.core.domain.network.RequestError
import dev.carlos.core.domain.network.RequestState
import dev.carlos.core.viewmodel.RxViewModel
import dev.carlos.shortform.data.models.ShortformModel
import dev.carlos.shortform.domain.GetAcronymDefinition
import dev.carlos.shortform.domain.GetShortformDefinition
import retrofit2.HttpException
import java.net.UnknownHostException
class AcronymsViewmodel(
private val GetAcronymsDefinition: GetAcronymDefinition
class ShortformViewmodel(
private val getAcronymsDefinition: GetShortformDefinition
) : RxViewModel() {
val acronymDefinition = MutableLiveData<RequestState>()
fun fetchAcronymDefinition(acronym: String) {
val disposable = GetAcronymsDefinition.getAcronymDefinition(acronym)
val disposable = getAcronymsDefinition.getShortformDefinition(acronym)
.doOnSubscribe { acronymDefinition.postValue(RequestState.Loading) }
.subscribe(::handleSuccess, ::handleError)
compositeDisposable.add(disposable)