fix expand more or expand less not working correctly.

IReaderorg · Feb 10, 2022 · 6aa3dde · 6aa3dde
1 parent b291f6c
commit 6aa3dde
Show file tree

Hide file tree

Showing 73 changed files with 670 additions and 371 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -94,6 +94,7 @@ dependencies {
     implementation(AndroidX.browser)
     implementation(AndroidX.material)
     implementation(AndroidX.activity)
+    implementation(AndroidX.appStartUpRuntime)
 
     testImplementation(Testing.junit4)
     androidTestImplementation(Testing.extJunit)

diff --git a/app/src/main/java/org/ireader/infinity/MyApplication.kt b/app/src/main/java/org/ireader/infinity/MyApplication.kt
@@ -1,10 +1,14 @@
 package org.ireader.infinity
 
 import android.app.Application
+import android.content.Context
 import android.webkit.WebView
 import androidx.hilt.work.HiltWorkerFactory
+import androidx.startup.Initializer
 import androidx.work.Configuration
+import androidx.work.WorkManager
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.HiltAndroidApp
 import okhttp3.OkHttpClient
 import org.ireader.domain.feature_services.notification.Notifications
@@ -46,7 +50,7 @@ class MyApplication : Application(), Configuration.Provider {
             Timber.plant(Timber.DebugTree())
         }
         mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
-
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG)
 
         val appModule = module {
             single<NetworkHelper> { networkHelper }
@@ -60,8 +64,6 @@ class MyApplication : Application(), Configuration.Provider {
         startKoin {
             modules(appModule)
         }
-
-
         setupNotificationChannels()
     }
 
@@ -78,7 +80,19 @@ class MyApplication : Application(), Configuration.Provider {
             .setWorkerFactory(workerFactory)
             .build()
 
+
 }
 
+class WorkManagerInitializer : Initializer<WorkManager> {
+    override fun create(context: Context): WorkManager {
+        val configuration = Configuration.Builder().build()
+        WorkManager.initialize(context, configuration)
+        return WorkManager.getInstance(context)
+    }
+
+    override fun dependencies(): List<Class<out Initializer<*>>> {
+        return emptyList()
+    }
+}
 
 
diff --git a/app/src/main/java/org/ireader/infinity/di/AppModule.kt b/app/src/main/java/org/ireader/infinity/di/AppModule.kt
@@ -15,11 +15,7 @@ import org.ireader.domain.local.dao.LibraryBookDao
 import org.ireader.domain.local.dao.LibraryChapterDao
 import org.ireader.domain.local.dao.RemoteKeysDao
 import org.ireader.domain.local.dao.SourceTowerDao
-import org.ireader.domain.repository.LocalChapterRepository
-import org.ireader.domain.repository.LocalSourceRepository
-import org.ireader.domain.repository.PreferencesHelper
-import org.ireader.domain.repository.Repository
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.*
 import org.ireader.infinity.core.domain.repository.RemoteRepository
 import javax.inject.Singleton
 

diff --git a/app/src/main/java/org/ireader/infinity/di/LocalModule.kt b/app/src/main/java/org/ireader/infinity/di/LocalModule.kt
@@ -15,16 +15,13 @@ import org.ireader.domain.local.dao.LibraryBookDao
 import org.ireader.domain.local.dao.LibraryChapterDao
 import org.ireader.domain.local.dao.RemoteKeysDao
 import org.ireader.domain.local.dao.SourceTowerDao
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.repository.LocalChapterRepository
 import org.ireader.domain.source.Extensions
 import org.ireader.domain.use_cases.local.LocalGetBookUseCases
 import org.ireader.domain.use_cases.local.LocalGetChapterUseCase
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInDownloadsPagingData
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInLibraryBooks
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInLibraryPagingSource
-import org.ireader.domain.use_cases.local.book_usecases.GetBookById
+import org.ireader.domain.use_cases.local.book_usecases.*
 import org.ireader.domain.use_cases.local.chapter_usecases.GetLastReadChapter
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import org.ireader.infinity.core.domain.use_cases.local.DeleteUseCase
 import org.ireader.infinity.core.domain.use_cases.local.LocalInsertUseCases
 import org.ireader.infinity.core.domain.use_cases.local.book_usecases.*
@@ -149,7 +146,8 @@ class LocalModule {
             GetInLibraryBooksPagingData = GetInLibraryBooksPagingData(localBookRepository),
             getAllExploredBookPagingData = GetAllExploredBookPagingData(localBookRepository = localBookRepository),
             getAllInDownloadsPagingData = GetAllInDownloadsPagingData(
-                localBookRepository = localBookRepository)
+                localBookRepository = localBookRepository),
+            getBookByIdDirectly = GetBookByIdDirectly(localBookRepository)
         )
     }
 

diff --git a/buildSrc/build/classes/kotlin/main/AndroidX.class b/buildSrc/build/classes/kotlin/main/AndroidX.class
diff --git a/buildSrc/build/classes/kotlin/main/Datastore.class b/buildSrc/build/classes/kotlin/main/Datastore.class
diff --git a/buildSrc/build/classes/kotlin/main/FlowPreferences.class b/buildSrc/build/classes/kotlin/main/FlowPreferences.class
diff --git a/buildSrc/build/kotlin/compileKotlin/build-history.bin b/buildSrc/build/kotlin/compileKotlin/build-history.bin
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-24
+26
 0
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/buildSrc/build/kotlin/compileKotlin/last-build.bin b/buildSrc/build/kotlin/compileKotlin/last-build.bin
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
diff --git a/buildSrc/src/main/kotlin/AndroidX.kt b/buildSrc/src/main/kotlin/AndroidX.kt
@@ -9,4 +9,5 @@ object AndroidX {
     const val browser = "androidx.browser:browser:1.4.0"
     const val material = "com.google.android.material:material:1.5.0"
     const val activity = "androidx.activity:activity-ktx:1.4.0"
+    const val appStartUpRuntime = "androidx.startup:startup-runtime:1.1.1"
 }
diff --git a/buildSrc/src/main/kotlin/Datastore.kt b/buildSrc/src/main/kotlin/Datastore.kt
@@ -1,6 +1,12 @@
 object Datastore {
     const val datastore = "androidx.datastore:datastore-preferences:1.0.0"
     const val core = "androidx.datastore:datastore-preferences-core:1.0.0"
+
+    private const val preference_version = "1.2.0"
+
+    // Java language implementation
+    // Kotlin
+    const val preferenceKtx = "androidx.preference:preference-ktx:$preference_version"
 }
 
 object FlowPreferences {

diff --git a/core-ui/src/main/java/org/ireader/core_ui/ui/PreferenceMutableState.kt b/core-ui/src/main/java/org/ireader/core_ui/ui/PreferenceMutableState.kt
@@ -0,0 +1,41 @@
+package org.ireader.core_ui.ui
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.ireader.core.prefs.Preference
+
+class PreferenceMutableState<T>(
+    private val preference: Preference<T>,
+    scope: CoroutineScope,
+) : MutableState<T> {
+
+    private val state = mutableStateOf(preference.get())
+
+    init {
+        preference.changes()
+            .onEach { state.value = it }
+            .launchIn(scope)
+    }
+
+    override var value: T
+        get() = state.value
+        set(value) {
+            preference.set(value)
+        }
+
+    override fun component1(): T {
+        return state.value
+    }
+
+    override fun component2(): (T) -> Unit {
+        return { preference.set(it) }
+    }
+
+}
+
+fun <T> Preference<T>.asStateIn(scope: CoroutineScope): PreferenceMutableState<T> {
+    return PreferenceMutableState(this, scope)
+}
diff --git a/data/src/main/java/org/ireader/data/repository/LocalBookRepositoryImpl.kt b/data/src/main/java/org/ireader/data/repository/LocalBookRepositoryImpl.kt
@@ -12,8 +12,8 @@ import org.ireader.domain.local.dao.LibraryChapterDao
 import org.ireader.domain.local.dao.RemoteKeysDao
 import org.ireader.domain.models.SortType
 import org.ireader.domain.models.entities.Book
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.utils.Resource
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import timber.log.Timber
 
 class LocalBookRepositoryImpl(
@@ -41,6 +41,20 @@ class LocalBookRepositoryImpl(
 
     }
 
+    override fun getBookByIdDirectly(id: Int): Flow<Book?> = flow {
+        bookDao.getBookById(bookId = id)
+            .first { book ->
+                if (book != null) {
+                    emit(book)
+                    true
+                } else {
+                    emit(null)
+                    true
+                }
+            }
+        Timber.d("Timber: GetExploreBookByIdUseCase was Finished Successfully")
+    }
+
     override fun getAllInLibraryPagingSource(
         sortType: SortType,
         isAsc: Boolean,

diff --git a/data/src/main/java/org/ireader/data/repository/RepositoryImpl.kt b/data/src/main/java/org/ireader/data/repository/RepositoryImpl.kt
@@ -1,10 +1,10 @@
 package org.ireader.data.repository
 
 import org.ireader.domain.local.BookDatabase
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.repository.LocalChapterRepository
 import org.ireader.domain.repository.PreferencesHelper
 import org.ireader.domain.repository.Repository
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import org.ireader.infinity.core.domain.repository.RemoteRepository
 import javax.inject.Inject
 

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     "implementation"(project(Modules.source))
 
     "implementation"(Compose.ui)
+    "implementation"(Compose.runtime)
     "implementation"(Compose.navigation)
     "implementation"(Worker.runtimeKtx)
     "implementation"(DaggerHilt.worker)
@@ -40,5 +41,7 @@ dependencies {
     "implementation"(Compose.paging)
     "implementation"(Jsoup.jsoup)
     "implementation"(Jsonpathkt.jsonpathkt)
+    "implementation"(Datastore.datastore)
+    "implementation"(Datastore.preferenceKtx)
 
 }
diff --git a/.../src/main/java/org/ireader/domain/feature_services/DownloaderService/DownloaderService.kt b/.../src/main/java/org/ireader/domain/feature_services/DownloaderService/DownloaderService.kt
@@ -23,9 +23,9 @@ import org.ireader.domain.feature_services.notification.Notifications.CHANNEL_DO
 import org.ireader.domain.feature_services.notification.Notifications.ID_DOWNLOAD_CHAPTER_COMPLETE
 import org.ireader.domain.feature_services.notification.Notifications.ID_DOWNLOAD_CHAPTER_ERROR
 import org.ireader.domain.feature_services.notification.Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.repository.LocalChapterRepository
 import org.ireader.domain.source.Extensions
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import org.ireader.infinity.core.domain.use_cases.local.LocalInsertUseCases
 import org.ireader.use_cases.remote.RemoteUseCases
 import timber.log.Timber

diff --git a/domain/src/main/java/org/ireader/domain/feature_services/notification/NotificatonWoker.kt b/domain/src/main/java/org/ireader/domain/feature_services/notification/NotificatonWoker.kt
@@ -18,8 +18,8 @@ import kotlinx.coroutines.flow.flowOn
 import org.ireader.domain.R
 import org.ireader.domain.models.entities.Book
 import org.ireader.domain.models.entities.Chapter
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.repository.LocalChapterRepository
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import org.ireader.infinity.feature_services.flags
 import timber.log.Timber
 

diff --git a/domain/src/main/java/org/ireader/domain/repository/LocalBookRepository.kt b/domain/src/main/java/org/ireader/domain/repository/LocalBookRepository.kt
@@ -1,4 +1,4 @@
-package org.ireader.infinity.core.domain.repository
+package org.ireader.domain.repository
 
 import androidx.paging.PagingSource
 import kotlinx.coroutines.flow.Flow
@@ -13,6 +13,8 @@ interface LocalBookRepository {
 
     fun getBookById(id: Int): Flow<Resource<Book>>
 
+    fun getBookByIdDirectly(id: Int): Flow<Book?>
+
     fun getAllInLibraryBooks(): Flow<List<Book>?>
 
     fun getBooksByQueryByPagingSource(query: String): PagingSource<Int, Book>

diff --git a/domain/src/main/java/org/ireader/domain/repository/Repository.kt b/domain/src/main/java/org/ireader/domain/repository/Repository.kt
@@ -1,7 +1,6 @@
 package org.ireader.domain.repository
 
 import org.ireader.domain.local.BookDatabase
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import org.ireader.infinity.core.domain.repository.RemoteRepository
 
 interface Repository {

diff --git a/domain/src/main/java/org/ireader/domain/use_cases/local/LocalGetBookUseCases.kt b/domain/src/main/java/org/ireader/domain/use_cases/local/LocalGetBookUseCases.kt
@@ -1,13 +1,11 @@
 package org.ireader.domain.use_cases.local
 
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInDownloadsPagingData
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInLibraryBooks
-import org.ireader.domain.use_cases.local.book_usecases.GetAllInLibraryPagingSource
-import org.ireader.domain.use_cases.local.book_usecases.GetBookById
+import org.ireader.domain.use_cases.local.book_usecases.*
 import org.ireader.infinity.core.domain.use_cases.local.book_usecases.*
 
 data class LocalGetBookUseCases(
     val getBookById: GetBookById,
+    val getBookByIdDirectly: GetBookByIdDirectly,
     val GetInLibraryBooksPagingData: GetInLibraryBooksPagingData,
     val getAllInLibraryPagingSource: GetAllInLibraryPagingSource,
     val getAllInLibraryBooks: GetAllInLibraryBooks,

diff --git a/...n/java/org/ireader/domain/use_cases/local/book_usecases/GetAllExploredBookPagingSource.kt b/...n/java/org/ireader/domain/use_cases/local/book_usecases/GetAllExploredBookPagingSource.kt
@@ -7,7 +7,7 @@ import androidx.paging.PagingSource
 import kotlinx.coroutines.flow.Flow
 import org.ireader.core.utils.Constants
 import org.ireader.domain.models.entities.Book
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 class GetAllExploredBookPagingSource(private val localBookRepository: LocalBookRepository) {
     operator fun invoke(

diff --git a/...in/src/main/java/org/ireader/domain/use_cases/local/book_usecases/GetAllInLibraryBooks.kt b/...in/src/main/java/org/ireader/domain/use_cases/local/book_usecases/GetAllInLibraryBooks.kt
@@ -7,8 +7,8 @@ import kotlinx.coroutines.flow.flow
 import org.ireader.core.utils.UiText
 import org.ireader.domain.R
 import org.ireader.domain.models.entities.Book
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.utils.Resource
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 import retrofit2.HttpException
 import java.io.IOException
 

diff --git a/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetAllInLibraryPagingSource.kt b/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetAllInLibraryPagingSource.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 import org.ireader.core.utils.Constants
 import org.ireader.domain.models.SortType
 import org.ireader.domain.models.entities.Book
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 
 class GetAllInLibraryPagingSource(private val localBookRepository: LocalBookRepository) {

diff --git a/domain/src/main/java/org/ireader/domain/use_cases/local/book_usecases/GetBookById.kt b/domain/src/main/java/org/ireader/domain/use_cases/local/book_usecases/GetBookById.kt
@@ -2,8 +2,8 @@ package org.ireader.domain.use_cases.local.book_usecases
 
 import kotlinx.coroutines.flow.Flow
 import org.ireader.domain.models.entities.Book
+import org.ireader.domain.repository.LocalBookRepository
 import org.ireader.domain.utils.Resource
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
 
 /**
  * return a book from id
@@ -14,3 +14,10 @@ class GetBookById(private val localBookRepository: LocalBookRepository) {
     }
 }
 
+class GetBookByIdDirectly(private val localBookRepository: LocalBookRepository) {
+    operator fun invoke(id: Int): Flow<Book?> {
+        return localBookRepository.getBookByIdDirectly(id = id)
+    }
+}
+
+
diff --git a/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetBooksByQueryByPagination.kt b/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetBooksByQueryByPagination.kt
@@ -6,7 +6,7 @@ import androidx.paging.PagingData
 import kotlinx.coroutines.flow.Flow
 import org.ireader.core.utils.Constants
 import org.ireader.domain.models.entities.Book
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 /**
  * get a paging data that is used in library screen

diff --git a/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetBooksByQueryPagingSource.kt b/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetBooksByQueryPagingSource.kt
@@ -2,7 +2,7 @@ package org.ireader.infinity.core.domain.use_cases.local.book_usecases
 
 import androidx.paging.PagingSource
 import org.ireader.domain.models.entities.Book
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 class GetBooksByQueryPagingSource(private val localBookRepository: LocalBookRepository) {
     operator fun invoke(

diff --git a/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetInLibraryBooksPagingData.kt b/...main/java/org/ireader/domain/use_cases/local/book_usecases/GetInLibraryBooksPagingData.kt
@@ -8,7 +8,7 @@ import org.ireader.core.utils.Constants
 import org.ireader.domain.models.FilterType
 import org.ireader.domain.models.SortType
 import org.ireader.domain.models.entities.Book
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 /**
  * Get Books that are in library and explore mode is false.

diff --git a/...n/src/main/java/org/ireader/domain/use_cases/local/delete_usecases/book/DeleteAllBooks.kt b/...n/src/main/java/org/ireader/domain/use_cases/local/delete_usecases/book/DeleteAllBooks.kt
@@ -1,6 +1,6 @@
 package org.ireader.infinity.core.domain.use_cases.local.delete_usecases.book
 
-import org.ireader.infinity.core.domain.repository.LocalBookRepository
+import org.ireader.domain.repository.LocalBookRepository
 
 /**
  * Delete All Book from database