Split entities into packages

asrovnov · Jan 19, 2021 · 5711d83 · 5711d83
1 parent 0e044b6
commit 5711d83
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 16 deletions.
diff --git a/app/src/main/java/ru/app/incredible/pets/data/backend/dto/CatDto.kt b/app/src/main/java/ru/app/incredible/pets/data/backend/dto/CatDto.kt
@@ -1,7 +1,7 @@
 package ru.app.incredible.pets.data.backend.dto
 
 import com.squareup.moshi.Json
-import ru.app.incredible.pets.domain.Cat
+import ru.app.incredible.pets.domain.cat.Cat
 
 data class CatDto(
     @Json(name = "url") val url: String

diff --git a/app/src/main/java/ru/app/incredible/pets/data/backend/dto/DogDto.kt b/app/src/main/java/ru/app/incredible/pets/data/backend/dto/DogDto.kt
@@ -1,7 +1,7 @@
 package ru.app.incredible.pets.data.backend.dto
 
 import com.squareup.moshi.Json
-import ru.app.incredible.pets.domain.Dog
+import ru.app.incredible.pets.domain.dog.Dog
 
 data class DogDto(
     @Json(name = "message") val message: String,

diff --git a/app/src/main/java/ru/app/incredible/pets/data/gateway/RandomCatGateway.kt b/app/src/main/java/ru/app/incredible/pets/data/gateway/RandomCatGateway.kt
@@ -5,7 +5,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import ru.app.incredible.pets.data.backend.CatApi
 import ru.app.incredible.pets.data.backend.mapToEntity
-import ru.app.incredible.pets.domain.Cat
+import ru.app.incredible.pets.domain.cat.Cat
 
 class RandomCatGateway(
     private val api: CatApi

diff --git a/app/src/main/java/ru/app/incredible/pets/data/gateway/RandomDogGateway.kt b/app/src/main/java/ru/app/incredible/pets/data/gateway/RandomDogGateway.kt
@@ -5,7 +5,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import ru.app.incredible.pets.data.backend.DogApi
 import ru.app.incredible.pets.data.backend.mapToEntity
-import ru.app.incredible.pets.domain.Dog
+import ru.app.incredible.pets.domain.dog.Dog
 
 class RandomDogGateway(
     private val api: DogApi

diff --git a/app/src/main/java/ru/app/incredible/pets/di/InteractorModule.kt b/app/src/main/java/ru/app/incredible/pets/di/InteractorModule.kt
@@ -2,6 +2,10 @@ package ru.app.incredible.pets.di
 
 import org.koin.dsl.module
 import ru.app.incredible.pets.domain.*
+import ru.app.incredible.pets.domain.cat.RandomCatInteractor
+import ru.app.incredible.pets.domain.dog.RandomDogInteractor
+import ru.app.incredible.pets.domain.DownloadImageInteractor
+import ru.app.incredible.pets.domain.GetDownloadStateInteractor
 
 object InteractorModule {
 

diff --git a/app/src/main/java/ru/app/incredible/pets/domain/Cat.kt b/app/src/main/java/ru/app/incredible/pets/domain/Cat.kt
diff --git a/app/src/main/java/ru/app/incredible/pets/domain/GalleryInteractor.kt b/app/src/main/java/ru/app/incredible/pets/domain/GalleryInteractor.kt
@@ -2,7 +2,6 @@ package ru.app.incredible.pets.domain
 
 import io.reactivex.Observable
 import ru.app.incredible.pets.data.gateway.DownloadImageGateway
-import ru.app.incredible.pets.data.gateway.DownloadImageGateway.Companion.FILE_DELETED
 import ru.app.incredible.pets.data.gateway.GetDownloadedImageGateway
 import java.io.File
 
@@ -15,10 +14,10 @@ class GalleryInteractor(
         return getDownloadedImageGateway.getAllImage()
             .concatMap { imageList ->
                 downloadImageGateway.getImageDownloaded()
-                    .map {
-                        if (it.exists()) {
-                            imageList.add(it)
-                        } else if (it.name == FILE_DELETED) {
+                    .map { file ->
+                        if (file.exists()) {
+                            imageList.add(file)
+                        } else if (file.name == DownloadImageGateway.FILE_DELETED) {
                             imageList.removeAt(imageList.lastIndex)
                         }
                         imageList

diff --git a/app/src/main/java/ru/app/incredible/pets/domain/cat/Cat.kt b/app/src/main/java/ru/app/incredible/pets/domain/cat/Cat.kt
@@ -0,0 +1,3 @@
+package ru.app.incredible.pets.domain.cat
+
+data class Cat(val catImageUrl: String)
diff --git a/...edible/pets/domain/RandomCatInteractor.kt → ...le/pets/domain/cat/RandomCatInteractor.kt b/...edible/pets/domain/RandomCatInteractor.kt → ...le/pets/domain/cat/RandomCatInteractor.kt
@@ -1,8 +1,9 @@
-package ru.app.incredible.pets.domain
+package ru.app.incredible.pets.domain.cat
 
 import io.reactivex.Single
 import ru.app.incredible.pets.data.gateway.NetworkStateGateway
 import ru.app.incredible.pets.data.gateway.RandomCatGateway
+import ru.app.incredible.pets.domain.cat.Cat
 import ru.app.incredible.pets.domain.exceptions.InternetUnavailableException
 
 class RandomCatInteractor(

diff --git a/...java/ru/app/incredible/pets/domain/Dog.kt → .../ru/app/incredible/pets/domain/dog/Dog.kt b/...java/ru/app/incredible/pets/domain/Dog.kt → .../ru/app/incredible/pets/domain/dog/Dog.kt
@@ -1,4 +1,4 @@
-package ru.app.incredible.pets.domain
+package ru.app.incredible.pets.domain.dog
 
 data class Dog(
     val dogImageUrl: String,

diff --git a/...edible/pets/domain/RandomDogInteractor.kt → ...le/pets/domain/dog/RandomDogInteractor.kt b/...edible/pets/domain/RandomDogInteractor.kt → ...le/pets/domain/dog/RandomDogInteractor.kt
@@ -1,8 +1,9 @@
-package ru.app.incredible.pets.domain
+package ru.app.incredible.pets.domain.dog
 
 import io.reactivex.Single
 import ru.app.incredible.pets.data.gateway.NetworkStateGateway
 import ru.app.incredible.pets.data.gateway.RandomDogGateway
+import ru.app.incredible.pets.domain.dog.Dog
 import ru.app.incredible.pets.domain.exceptions.InternetUnavailableException
 
 class RandomDogInteractor(

diff --git a/app/src/main/java/ru/app/incredible/pets/ui/pets/PetsPm.kt b/app/src/main/java/ru/app/incredible/pets/ui/pets/PetsPm.kt
@@ -7,6 +7,13 @@ import me.dmdev.rxpm.state
 import me.dmdev.rxpm.widget.dialogControl
 import ru.app.incredible.pets.R
 import ru.app.incredible.pets.domain.*
+import ru.app.incredible.pets.domain.cat.Cat
+import ru.app.incredible.pets.domain.cat.RandomCatInteractor
+import ru.app.incredible.pets.domain.dog.Dog
+import ru.app.incredible.pets.domain.dog.RandomDogInteractor
+import ru.app.incredible.pets.domain.DownloadImageInteractor
+import ru.app.incredible.pets.domain.GetDownloadStateInteractor
+import ru.app.incredible.pets.domain.ImageDownloadState
 import ru.app.incredible.pets.system.ResourceHelper
 import ru.app.incredible.pets.ui.common.BasePm
 

diff --git a/app/src/main/java/ru/app/incredible/pets/ui/pets/PetsScreen.kt b/app/src/main/java/ru/app/incredible/pets/ui/pets/PetsScreen.kt
@@ -1,7 +1,6 @@
 package ru.app.incredible.pets.ui.pets
 
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isVisible
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.jakewharton.rxbinding3.view.clicks
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package ru.app.incredible.pets.domain.cat

		data class Cat(val catImageUrl: String)