Merge pull request #214 from mende273/refactor-packages

refactor packages

Author: mende273

…e/data/repository/LocalRepositoryImpl.kt …/repository/local/LocalRepositoryImpl.ktapp/src/main/java/com/jumrukovski/quotescompose/data/repository/LocalRepositoryImpl.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/repository/local/LocalRepositoryImpl.kt app/src/main/java/com/jumrukovski/quotescompose/data/repository/LocalRepositoryImpl.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/repository/local/LocalRepositoryImpl.kt

@@ -1,44 +1,44 @@
-package com.jumrukovski.quotescompose.data.repository
+package com.jumrukovski.quotescompose.data.repository.local
 
-import com.jumrukovski.quotescompose.data.db.LocalDB
 import com.jumrukovski.quotescompose.data.mapper.mapToQuote
 import com.jumrukovski.quotescompose.data.mapper.mapToQuoteEntity
 import com.jumrukovski.quotescompose.data.mapper.mapToQuotes
+import com.jumrukovski.quotescompose.data.source.local.LocalDataSource
 import com.jumrukovski.quotescompose.di.Dispatcher
 import com.jumrukovski.quotescompose.di.QuotesDispatchers
 import com.jumrukovski.quotescompose.domain.model.Quote
-import com.jumrukovski.quotescompose.domain.repository.LocalRepository
+import com.jumrukovski.quotescompose.domain.repository.local.LocalRepository
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
 
 class LocalRepositoryImpl @Inject constructor(
-    private val localDB: LocalDB,
+    private val localDataSource: LocalDataSource,
     @Dispatcher(QuotesDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
 ) : LocalRepository {
 
     override suspend fun getAllFavouriteQuotes(): Flow<List<Quote>> =
         withContext(ioDispatcher) {
-            localDB.quoteDao().getAllFavouriteQuotes().mapToQuotes()
+            localDataSource.quoteDao().getAllFavouriteQuotes().mapToQuotes()
         }
 
     override suspend fun getFavouriteQuote(id: Int): Flow<Quote?> =
         withContext(ioDispatcher) {
-            localDB.quoteDao().getFavouriteQuote(id).mapToQuote()
+            localDataSource.quoteDao().getFavouriteQuote(id).mapToQuote()
         }
 
     override suspend fun addFavouriteQuote(quote: Quote) {
         withContext(ioDispatcher) {
             val entity = quote.mapToQuoteEntity()
-            localDB.quoteDao().addFavouriteQuote(entity)
+            localDataSource.quoteDao().addFavouriteQuote(entity)
         }
     }
 
     override suspend fun removeFavouriteQuote(quote: Quote) {
         withContext(ioDispatcher) {
             val entity = quote.mapToQuoteEntity()
-            localDB.quoteDao().deleteFavouriteQuote(entity)
+            localDataSource.quoteDao().deleteFavouriteQuote(entity)
         }
     }
 }

…/data/repository/RemoteRepositoryImpl.kt …epository/remote/RemoteRepositoryImpl.ktapp/src/main/java/com/jumrukovski/quotescompose/data/repository/RemoteRepositoryImpl.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/repository/remote/RemoteRepositoryImpl.kt app/src/main/java/com/jumrukovski/quotescompose/data/repository/RemoteRepositoryImpl.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/repository/remote/RemoteRepositoryImpl.kt

@@ -1,39 +1,39 @@
-package com.jumrukovski.quotescompose.data.repository
+package com.jumrukovski.quotescompose.data.repository.remote
 
 import com.jumrukovski.quotescompose.data.mapper.mapToQuotesList
-import com.jumrukovski.quotescompose.data.network.ApiService
+import com.jumrukovski.quotescompose.data.source.remote.RemoteDataSource
 import com.jumrukovski.quotescompose.di.Dispatcher
 import com.jumrukovski.quotescompose.di.QuotesDispatchers
 import com.jumrukovski.quotescompose.domain.model.Quote
-import com.jumrukovski.quotescompose.domain.repository.RemoteRepository
+import com.jumrukovski.quotescompose.domain.repository.remote.RemoteRepository
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
 class RemoteRepositoryImpl @Inject constructor(
-    private val apiService: ApiService,
+    private val remoteDataSource: RemoteDataSource,
     @Dispatcher(QuotesDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
 ) :
     RemoteRepository {
 
     override suspend fun getQuotes(): Result<List<Quote>> =
         withContext(ioDispatcher) {
             runCatching {
-                apiService.getQuotes().mapToQuotesList()
+                remoteDataSource.getQuotes().mapToQuotesList()
             }
         }
 
     override suspend fun getRandomQuote(): Result<Quote> =
         withContext(ioDispatcher) {
             runCatching {
-                apiService.getRandomQuote().mapToQuotesList().first()
+                remoteDataSource.getRandomQuote().mapToQuotesList().first()
             }
         }
 
     override suspend fun getQuoteOfTheDay(): Result<Quote> =
         withContext(ioDispatcher) {
             runCatching {
-                apiService.getQuoteOfTheDay().mapToQuotesList().first()
+                remoteDataSource.getQuoteOfTheDay().mapToQuotesList().first()
             }
         }
 }

…ukovski/quotescompose/data/db/LocalDB.kt …ose/data/source/local/LocalDataSource.ktapp/src/main/java/com/jumrukovski/quotescompose/data/db/LocalDB.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/local/LocalDataSource.kt app/src/main/java/com/jumrukovski/quotescompose/data/db/LocalDB.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/local/LocalDataSource.kt

@@ -1,11 +1,11 @@
-package com.jumrukovski.quotescompose.data.db
+package com.jumrukovski.quotescompose.data.source.local
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import com.jumrukovski.quotescompose.data.model.entity.QuoteEntity
 
 @Database(entities = [QuoteEntity::class], version = 1)
-abstract class LocalDB : RoomDatabase() {
+abstract class LocalDataSource : RoomDatabase() {
 
     abstract fun quoteDao(): QuoteDao
 }

…kovski/quotescompose/data/db/QuoteDao.kt …tescompose/data/source/local/QuoteDao.ktapp/src/main/java/com/jumrukovski/quotescompose/data/db/QuoteDao.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/local/QuoteDao.kt app/src/main/java/com/jumrukovski/quotescompose/data/db/QuoteDao.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/local/QuoteDao.kt

@@ -1,4 +1,4 @@
-package com.jumrukovski.quotescompose.data.db
+package com.jumrukovski.quotescompose.data.source.local
 
 import androidx.room.Dao
 import androidx.room.Delete

…compose/data/network/CacheInterceptor.kt …e/data/source/remote/CacheInterceptor.ktapp/src/main/java/com/jumrukovski/quotescompose/data/network/CacheInterceptor.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/CacheInterceptor.kt app/src/main/java/com/jumrukovski/quotescompose/data/network/CacheInterceptor.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/CacheInterceptor.kt

@@ -1,4 +1,4 @@
-package com.jumrukovski.quotescompose.data.network
+package com.jumrukovski.quotescompose.data.source.remote
 
 import java.util.concurrent.TimeUnit
 import okhttp3.CacheControl

…/data/network/NoConnectionInterceptor.kt …source/remote/NoConnectionInterceptor.ktapp/src/main/java/com/jumrukovski/quotescompose/data/network/NoConnectionInterceptor.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/NoConnectionInterceptor.kt app/src/main/java/com/jumrukovski/quotescompose/data/network/NoConnectionInterceptor.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/NoConnectionInterceptor.kt

@@ -1,4 +1,4 @@
-package com.jumrukovski.quotescompose.data.network
+package com.jumrukovski.quotescompose.data.source.remote
 
 import java.net.UnknownHostException
 import okhttp3.Interceptor

…quotescompose/data/network/ApiService.kt …e/data/source/remote/RemoteDataSource.ktapp/src/main/java/com/jumrukovski/quotescompose/data/network/ApiService.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/RemoteDataSource.kt app/src/main/java/com/jumrukovski/quotescompose/data/network/ApiService.kt renamed to app/src/main/java/com/jumrukovski/quotescompose/data/source/remote/RemoteDataSource.kt

@@ -1,10 +1,10 @@
-package com.jumrukovski.quotescompose.data.network
+package com.jumrukovski.quotescompose.data.source.remote
 
 import com.jumrukovski.quotescompose.data.model.dto.QuoteDTO
 import retrofit2.Response
 import retrofit2.http.GET
 
-interface ApiService {
+interface RemoteDataSource {
 
     @GET("quotes")
     suspend fun getQuotes(): Response<List<QuoteDTO>>

app/src/main/java/com/jumrukovski/quotescompose/di/DatabaseModule.kt

@@ -2,7 +2,7 @@ package com.jumrukovski.quotescompose.di
 
 import android.content.Context
 import androidx.room.Room
-import com.jumrukovski.quotescompose.data.db.LocalDB
+import com.jumrukovski.quotescompose.data.source.local.LocalDataSource
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -15,11 +15,11 @@ object DatabaseModule {
 
     @Singleton
     @Provides
-    fun provideDatabase(context: Context): LocalDB {
-        return Room.databaseBuilder(context, LocalDB::class.java, "QuotesDB").build()
+    fun provideDatabase(context: Context): LocalDataSource {
+        return Room.databaseBuilder(context, LocalDataSource::class.java, "QuotesDB").build()
     }
 
     @Singleton
     @Provides
-    fun provideYourDao(db: LocalDB) = db.quoteDao()
+    fun provideYourDao(db: LocalDataSource) = db.quoteDao()
 }

app/src/main/java/com/jumrukovski/quotescompose/di/RepositoryModule.kt

@@ -1,9 +1,9 @@
 package com.jumrukovski.quotescompose.di
 
-import com.jumrukovski.quotescompose.data.repository.LocalRepositoryImpl
-import com.jumrukovski.quotescompose.data.repository.RemoteRepositoryImpl
-import com.jumrukovski.quotescompose.domain.repository.LocalRepository
-import com.jumrukovski.quotescompose.domain.repository.RemoteRepository
+import com.jumrukovski.quotescompose.data.repository.local.LocalRepositoryImpl
+import com.jumrukovski.quotescompose.data.repository.remote.RemoteRepositoryImpl
+import com.jumrukovski.quotescompose.domain.repository.local.LocalRepository
+import com.jumrukovski.quotescompose.domain.repository.remote.RemoteRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

app/src/main/java/com/jumrukovski/quotescompose/di/RetrofitModule.kt

@@ -1,9 +1,9 @@
 package com.jumrukovski.quotescompose.di
 
 import com.jumrukovski.quotescompose.BuildConfig
-import com.jumrukovski.quotescompose.data.network.ApiService
-import com.jumrukovski.quotescompose.data.network.CacheInterceptor
-import com.jumrukovski.quotescompose.data.network.NoConnectionInterceptor
+import com.jumrukovski.quotescompose.data.source.remote.CacheInterceptor
+import com.jumrukovski.quotescompose.data.source.remote.NoConnectionInterceptor
+import com.jumrukovski.quotescompose.data.source.remote.RemoteDataSource
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
@@ -22,8 +22,8 @@ object RetrofitModule {
 
     @Provides
     @Singleton
-    fun provideService(retrofit: Retrofit): ApiService {
-        return retrofit.create(ApiService::class.java)
+    fun provideService(retrofit: Retrofit): RemoteDataSource {
+        return retrofit.create(RemoteDataSource::class.java)
     }
 
     @Provides