Merge branch 'develop' into BOOK-161-feature/#64

# Conflicts:
#	feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchUi.kt

Author: seoyoon513

app/build.gradle.kts

@@ -49,17 +49,19 @@ dependencies {
 
         projects.feature.home,
         projects.feature.library,
-        projects.feature.main,
         projects.feature.login,
+        projects.feature.main,
+        projects.feature.screens,
         projects.feature.search,
         projects.feature.settings,
         projects.feature.webview,
         projects.feature.detail,
 
         libs.androidx.activity.compose,
         libs.androidx.startup,
-        libs.logger,
+        libs.coil.compose,
         libs.kakao.auth,
+        libs.logger,
 
         libs.bundles.circuit,
     )

app/src/main/kotlin/com/ninecraft/booket/BooketApplication.kt

@@ -1,7 +1,24 @@
 package com.ninecraft.booket
 
 import android.app.Application
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class BooketApplication : Application()
+class BooketApplication : Application(), ImageLoaderFactory {
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this)
+            .diskCache {
+                DiskCache.Builder()
+                    .directory(cacheDir.resolve("image_cache"))
+                    .maxSizeBytes(10 * 1024 * 1024)
+                    .build()
+            }
+            .logger(DebugLogger())
+            .respectCacheHeaders(false)
+            .build()
+    }
+}

core/data/api/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementations(
         projects.core.model,
 
+        libs.kotlinx.coroutines.core,
         libs.logger,
     )
 }

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/BookRepository.kt

@@ -3,14 +3,19 @@ package com.ninecraft.booket.core.data.api.repository
 import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookUpsertModel
+import kotlinx.coroutines.flow.Flow
 import com.ninecraft.booket.core.model.LibraryModel
 
 interface BookRepository {
+    val recentSearches: Flow<List<String>>
+
     suspend fun searchBook(
         query: String,
         start: Int,
     ): Result<BookSearchModel>
 
+    suspend fun removeRecentSearch(query: String)
+
     suspend fun getBookDetail(itemId: String): Result<BookDetailModel>
 
     suspend fun upsertBook(

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

@@ -2,7 +2,7 @@ package com.ninecraft.booket.core.data.impl.repository
 
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
@@ -11,7 +11,7 @@ private const val KAKAO_PROVIDER_TYPE = "KAKAO"
 
 internal class DefaultAuthRepository @Inject constructor(
     private val service: ReedService,
-    private val tokenDatasource: TokenPreferencesDataSource,
+    private val tokenDatasource: TokenDataSource,
 ) : AuthRepository {
     override suspend fun login(accessToken: String) = runSuspendCatching {
         val response = service.login(

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultBookRepository.kt

@@ -3,21 +3,32 @@ package com.ninecraft.booket.core.data.impl.repository
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.BookRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
+import com.ninecraft.booket.core.datastore.api.datasource.RecentSearchDataSource
 import com.ninecraft.booket.core.network.request.BookUpsertRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
 internal class DefaultBookRepository @Inject constructor(
     private val service: ReedService,
+    private val dataSource: RecentSearchDataSource,
 ) : BookRepository {
+    override val recentSearches = dataSource.recentSearches
+
     override suspend fun searchBook(
         query: String,
         start: Int,
     ) = runSuspendCatching {
-        service.searchBook(
+        val result = service.searchBook(
             query = query,
             start = start,
         ).toModel()
+
+        dataSource.addRecentSearch(query)
+        result
+    }
+
+    override suspend fun removeRecentSearch(query: String) {
+        dataSource.removeRecentSearch(query)
     }
 
     override suspend fun getBookDetail(itemId: String) = runSuspendCatching {

core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/RecentSearchDataSource.kt

@@ -0,0 +1,10 @@
+package com.ninecraft.booket.core.datastore.api.datasource
+
+import kotlinx.coroutines.flow.Flow
+
+interface RecentSearchDataSource {
+    val recentSearches: Flow<List<String>>
+    suspend fun addRecentSearch(query: String)
+    suspend fun removeRecentSearch(query: String)
+    suspend fun clearRecentSearches()
+}

…datasource/TokenPreferencesDataSource.kt …astore/api/datasource/TokenDataSource.ktcore/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenPreferencesDataSource.kt renamed to core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenDataSource.kt core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenPreferencesDataSource.kt renamed to core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenDataSource.kt

@@ -2,7 +2,7 @@ package com.ninecraft.booket.core.datastore.api.datasource
 
 import kotlinx.coroutines.flow.Flow
 
-interface TokenPreferencesDataSource {
+interface TokenDataSource {
     val accessToken: Flow<String>
     val refreshToken: Flow<String>
     suspend fun getAccessToken(): String

core/datastore/impl/build.gradle.kts

@@ -3,6 +3,7 @@
 plugins {
     alias(libs.plugins.booket.android.library)
     alias(libs.plugins.booket.android.hilt)
+    alias(libs.plugins.booket.kotlin.library.serialization)
 }
 
 android {

core/datastore/impl/src/androidTest/java/com/ninecraft/booket/core/datastore/impl/TokenPreferenceDataSourceTest.kt

@@ -5,7 +5,7 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenDataSource
 import com.ninecraft.booket.core.datastore.impl.security.CryptoManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -26,7 +26,7 @@ import kotlin.io.path.createTempDirectory
 @RunWith(AndroidJUnit4::class)
 class TokenPreferenceDataSourceTest {
     private lateinit var dataStore: DataStore<Preferences>
-    private lateinit var dataSource: DefaultTokenPreferencesDataSource
+    private lateinit var dataSource: DefaultTokenDataSource
     private lateinit var cryptoManager: CryptoManager
     private lateinit var tempFile: File
 
@@ -41,7 +41,7 @@ class TokenPreferenceDataSourceTest {
         )
 
         cryptoManager = CryptoManager()
-        dataSource = DefaultTokenPreferencesDataSource(dataStore, cryptoManager)
+        dataSource = DefaultTokenDataSource(dataStore, cryptoManager)
     }
 
     @After