Move some models from :domain to :api module

SIKV · Jun 28, 2024 · 1ae9856 · 1ae9856
1 parent 8949b18
commit 1ae9856
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 30 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     alias libs.plugins.android.library
     alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.parcelize
     alias libs.plugins.kotlin.kapt
     alias libs.plugins.hilt
 }

diff --git a/api/src/main/java/com/github/sikv/photos/api/PexelsApi.kt b/api/src/main/java/com/github/sikv/photos/api/PexelsApi.kt
@@ -1,8 +1,8 @@
 package com.github.sikv.photos.api
 
-import com.github.sikv.photos.domain.pexels.PexelsCuratedPhotosResponse
-import com.github.sikv.photos.domain.pexels.PexelsPhoto
-import com.github.sikv.photos.domain.pexels.PexelsSearchResponse
+import com.github.sikv.photos.api.domain.pexels.PexelsCuratedPhotosResponse
+import com.github.sikv.photos.api.domain.pexels.PexelsPhoto
+import com.github.sikv.photos.api.domain.pexels.PexelsSearchResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query

diff --git a/api/src/main/java/com/github/sikv/photos/api/PixabayApi.kt b/api/src/main/java/com/github/sikv/photos/api/PixabayApi.kt
@@ -1,6 +1,6 @@
 package com.github.sikv.photos.api
 
-import com.github.sikv.photos.domain.pixabay.PixabaySearchResponse
+import com.github.sikv.photos.api.domain.pixabay.PixabaySearchResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 

diff --git a/api/src/main/java/com/github/sikv/photos/api/UnsplashApi.kt b/api/src/main/java/com/github/sikv/photos/api/UnsplashApi.kt
@@ -1,7 +1,7 @@
 package com.github.sikv.photos.api
 
-import com.github.sikv.photos.domain.unsplash.UnsplashPhoto
-import com.github.sikv.photos.domain.unsplash.UnsplashSearchResponse
+import com.github.sikv.photos.api.domain.unsplash.UnsplashPhoto
+import com.github.sikv.photos.api.domain.unsplash.UnsplashSearchResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query

diff --git a/api/src/main/java/com/github/sikv/photos/api/client/PexelsClient.kt b/api/src/main/java/com/github/sikv/photos/api/client/PexelsClient.kt
@@ -1,9 +1,9 @@
 package com.github.sikv.photos.api.client
 
 import com.github.sikv.photos.api.PexelsApi
-import com.github.sikv.photos.domain.pexels.PexelsCuratedPhotosResponse
-import com.github.sikv.photos.domain.pexels.PexelsPhoto
-import com.github.sikv.photos.domain.pexels.PexelsSearchResponse
+import com.github.sikv.photos.api.domain.pexels.PexelsCuratedPhotosResponse
+import com.github.sikv.photos.api.domain.pexels.PexelsPhoto
+import com.github.sikv.photos.api.domain.pexels.PexelsSearchResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/api/src/main/java/com/github/sikv/photos/api/client/PixabayClient.kt b/api/src/main/java/com/github/sikv/photos/api/client/PixabayClient.kt
@@ -1,7 +1,7 @@
 package com.github.sikv.photos.api.client
 
 import com.github.sikv.photos.api.PixabayApi
-import com.github.sikv.photos.domain.pixabay.PixabaySearchResponse
+import com.github.sikv.photos.api.domain.pixabay.PixabaySearchResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/api/src/main/java/com/github/sikv/photos/api/client/UnsplashClient.kt b/api/src/main/java/com/github/sikv/photos/api/client/UnsplashClient.kt
@@ -1,8 +1,8 @@
 package com.github.sikv.photos.api.client
 
 import com.github.sikv.photos.api.UnsplashApi
-import com.github.sikv.photos.domain.unsplash.UnsplashPhoto
-import com.github.sikv.photos.domain.unsplash.UnsplashSearchResponse
+import com.github.sikv.photos.api.domain.unsplash.UnsplashPhoto
+import com.github.sikv.photos.api.domain.unsplash.UnsplashSearchResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/...ain/pexels/PexelsCuratedPhotosResponse.kt → ...ain/pexels/PexelsCuratedPhotosResponse.kt b/...ain/pexels/PexelsCuratedPhotosResponse.kt → ...ain/pexels/PexelsCuratedPhotosResponse.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pexels
+package com.github.sikv.photos.api.domain.pexels
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/.../sikv/photos/domain/pexels/PexelsPhoto.kt → ...v/photos/api/domain/pexels/PexelsPhoto.kt b/.../sikv/photos/domain/pexels/PexelsPhoto.kt → ...v/photos/api/domain/pexels/PexelsPhoto.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pexels
+package com.github.sikv.photos.api.domain.pexels
 
 import com.github.sikv.photos.domain.Photo
 import com.github.sikv.photos.domain.PhotoSource
@@ -34,5 +34,4 @@ class PexelsPhoto(
     override fun getPhotoPhotographerUrl(): String = photographerUrl
 
     override fun getPhotoSource(): PhotoSource = PhotoSource.PEXELS
-    override fun isLocalPhoto(): Boolean = false
 }
diff --git a/...tos/domain/pexels/PexelsSearchResponse.kt → ...api/domain/pexels/PexelsSearchResponse.kt b/...tos/domain/pexels/PexelsSearchResponse.kt → ...api/domain/pexels/PexelsSearchResponse.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pexels
+package com.github.sikv.photos.api.domain.pexels
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ub/sikv/photos/domain/pexels/PexelsSrc.kt → ...ikv/photos/api/domain/pexels/PexelsSrc.kt b/...ub/sikv/photos/domain/pexels/PexelsSrc.kt → ...ikv/photos/api/domain/pexels/PexelsSrc.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pexels
+package com.github.sikv.photos.api.domain.pexels
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName

diff --git a/...ikv/photos/domain/pixabay/PixabayPhoto.kt → ...photos/api/domain/pixabay/PixabayPhoto.kt b/...ikv/photos/domain/pixabay/PixabayPhoto.kt → ...photos/api/domain/pixabay/PixabayPhoto.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pixabay
+package com.github.sikv.photos.api.domain.pixabay
 
 import com.github.sikv.photos.domain.Photo
 import com.github.sikv.photos.domain.PhotoSource
@@ -40,5 +40,4 @@ class PixabayPhoto(
     override fun getPhotoPhotographerImageUrl(): String = userImageUrl
 
     override fun getPhotoSource(): PhotoSource = PhotoSource.PIXABAY
-    override fun isLocalPhoto(): Boolean = false
 }
diff --git a/...s/domain/pixabay/PixabaySearchResponse.kt → ...i/domain/pixabay/PixabaySearchResponse.kt b/...s/domain/pixabay/PixabaySearchResponse.kt → ...i/domain/pixabay/PixabaySearchResponse.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.pixabay
+package com.github.sikv.photos.api.domain.pixabay
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...v/photos/domain/unsplash/UnsplashLinks.kt → ...otos/api/domain/unsplash/UnsplashLinks.kt b/...v/photos/domain/unsplash/UnsplashLinks.kt → ...otos/api/domain/unsplash/UnsplashLinks.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName

diff --git a/...v/photos/domain/unsplash/UnsplashPhoto.kt → ...otos/api/domain/unsplash/UnsplashPhoto.kt b/...v/photos/domain/unsplash/UnsplashPhoto.kt → ...otos/api/domain/unsplash/UnsplashPhoto.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import com.github.sikv.photos.domain.Photo
 import com.github.sikv.photos.domain.PhotoSource
@@ -32,5 +32,4 @@ class UnsplashPhoto(
     override fun getPhotoPhotographerUrl(): String? = user.portfolioUrl
 
     override fun getPhotoSource(): PhotoSource = PhotoSource.UNSPLASH
-    override fun isLocalPhoto(): Boolean = false
 }
diff --git a/...s/domain/unsplash/UnsplashProfileImage.kt → ...i/domain/unsplash/UnsplashProfileImage.kt b/...s/domain/unsplash/UnsplashProfileImage.kt → ...i/domain/unsplash/UnsplashProfileImage.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName

diff --git a/...domain/unsplash/UnsplashSearchResponse.kt → ...domain/unsplash/UnsplashSearchResponse.kt b/...domain/unsplash/UnsplashSearchResponse.kt → ...domain/unsplash/UnsplashSearchResponse.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...kv/photos/domain/unsplash/UnsplashUrls.kt → ...hotos/api/domain/unsplash/UnsplashUrls.kt b/...kv/photos/domain/unsplash/UnsplashUrls.kt → ...hotos/api/domain/unsplash/UnsplashUrls.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName

diff --git a/...kv/photos/domain/unsplash/UnsplashUser.kt → ...hotos/api/domain/unsplash/UnsplashUser.kt b/...kv/photos/domain/unsplash/UnsplashUser.kt → ...hotos/api/domain/unsplash/UnsplashUser.kt
@@ -1,4 +1,4 @@
-package com.github.sikv.photos.domain.unsplash
+package com.github.sikv.photos.api.domain.unsplash
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName

diff --git a/data/src/main/java/com/github/sikv/photos/data/persistence/FavoritePhotoEntity.kt b/data/src/main/java/com/github/sikv/photos/data/persistence/FavoritePhotoEntity.kt
@@ -58,5 +58,4 @@ class FavoritePhotoEntity(
     override fun getPhotoPhotographerUrl(): String? = photographerUrl
 
     override fun getPhotoSource(): PhotoSource = source
-    override fun isLocalPhoto(): Boolean = true
 }
diff --git a/domain/src/main/java/com/github/sikv/photos/domain/Photo.kt b/domain/src/main/java/com/github/sikv/photos/domain/Photo.kt
@@ -22,8 +22,6 @@ abstract class Photo : Parcelable {
 
     open fun getPhotoSource(): PhotoSource = PhotoSource.UNSPECIFIED
 
-    abstract fun isLocalPhoto(): Boolean
-
     override fun equals(other: Any?): Boolean {
         return if (other !is Photo) {
             false