Release 0.1.33

IReaderorg · Dec 7, 2022 · 5fb0b5b · 5fb0b5b
1 parent eee47a2
commit 5fb0b5b
Show file tree

Hide file tree

Showing 61 changed files with 231 additions and 255 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" package="org.ireader.app">
 
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <!-- Storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

diff --git a/buildSrc/src/main/kotlin/ProjectConfig.kt b/buildSrc/src/main/kotlin/ProjectConfig.kt
@@ -3,7 +3,7 @@ object ProjectConfig {
     const val targetSdk = 29
     const val compileSdk = 33
     const val ndk = "21.3.6528147"
-    const val versionName = "0.1.32"
-    const val versionCode = 39
+    const val versionName = "0.1.33"
+    const val versionCode = 40
     const val applicationId = "ir.kazemcodes.infinityreader"
 }
diff --git a/core/src/commonMain/kotlin/di/ISingleton.kt b/core/src/commonMain/kotlin/di/ISingleton.kt
diff --git a/core/src/commonMain/kotlin/di/IViewModel.kt b/core/src/commonMain/kotlin/di/IViewModel.kt
diff --git a/core/src/commonMain/kotlin/source/CatalogSource.kt b/core/src/commonMain/kotlin/source/CatalogSource.kt
@@ -10,6 +10,12 @@ import ireader.core.source.model.MangasPageInfo
 @Keep
 interface CatalogSource : ireader.core.source.Source {
 
+    companion object {
+        const val TYPE_NOVEL = 0
+        const val TYPE_MANGA = 1
+        const val TYPE_MOVIE = 2
+    }
+
     override val lang: String
 
     suspend fun getMangaList(sort: Listing?, page: Int): MangasPageInfo

diff --git a/core/src/commonMain/kotlin/source/HttpSource.kt b/core/src/commonMain/kotlin/source/HttpSource.kt
@@ -4,6 +4,7 @@ import androidx.annotation.Keep
 import io.ktor.client.HttpClient
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.url
+import ireader.core.source.CatalogSource.Companion.TYPE_NOVEL
 import ireader.core.source.model.Command
 import ireader.core.source.model.CommandList
 import ireader.core.source.model.ImageUrl
@@ -36,6 +37,8 @@ abstract class HttpSource(private val dependencies: ireader.core.source.Dependen
     open val client: HttpClient
         get() = dependencies.httpClients.default
 
+    open val type: Int = TYPE_NOVEL
+
     /**
      * Visible name of the source.
      */

diff --git a/core/src/commonMain/kotlin/source/model/Page.kt b/core/src/commonMain/kotlin/source/model/Page.kt
@@ -42,22 +42,17 @@ data class ImageBase64(val data: String) : PageComplete()
 @Serializable
 data class Text(val text: String) : PageComplete()
 
-@Serializable
-data class MovieUrl(val url: String) : PageComplete()
 
-//@Serializable
-//data class MovieUrl(
-//    val url: String,
-//    val name: String? = null,
-//    val quality: Int = Quality.UNSPECIFIC
-//) : PageComplete()
 
 @Serializable
-data class Subtitle(val url: String) : PageComplete()
+data class MovieUrl(
+    val url: String,
+) : PageComplete()
+
 
-//@Serializable
-//data class Subtitle(val url: String, val language: String? = null, val name: String? = null) :
-//    PageComplete()
+@Serializable
+data class Subtitle(val url: String, val language: String? = null, val name: String? = null) :
+    PageComplete()
 
 // creating a customized encoding and decoding because kotlin serialization may cause some problem in future.
 // Unlike tachiyomi, right now ireader is using saving files in app db

diff --git a/core/src/jvmMain/kotlin/di/ISingleton.kt b/core/src/jvmMain/kotlin/di/ISingleton.kt
diff --git a/core/src/jvmMain/kotlin/di/IViewModel.kt b/core/src/jvmMain/kotlin/di/IViewModel.kt
diff --git a/data/src/main/java/ireader/data/book/BookRepositoryImpl.kt b/data/src/main/java/ireader/data/book/BookRepositoryImpl.kt
@@ -1,7 +1,7 @@
 package ireader.data.book
 
 import ireader.common.models.entities.Book
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.common.models.entities.LibraryBook
 import ireader.common.models.library.LibrarySort
 import ireader.data.local.DatabaseHandler

diff --git a/data/src/main/java/ireader/data/book/bookMapper.kt b/data/src/main/java/ireader/data/book/bookMapper.kt
@@ -1,7 +1,7 @@
 package ireader.data.book
 
 import ireader.common.models.entities.Book
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.common.models.entities.LibraryBook
 import ireader.core.source.model.MangaInfo
 

diff --git a/data/src/main/java/ireader/data/catalog/impl/CatalogGithubApi.kt b/data/src/main/java/ireader/data/catalog/impl/CatalogGithubApi.kt
@@ -19,6 +19,9 @@ class CatalogGithubApi(
     private val httpClient: HttpClients,
     private val getDefaultRepo: GetDefaultRepo
 ) : CatalogRemoteApi {
+    private val json = Json {
+        ignoreUnknownKeys = true
+    }
 
     override suspend fun fetchCatalogs(): List<CatalogRemote> {
         val repo = getDefaultRepo()
@@ -27,7 +30,7 @@ class CatalogGithubApi(
                 .get(repo.key)
                 .bodyAsText()
 
-        val catalogs = Json.Default.decodeFromString<List<CatalogRemoteApiModel>>(response)
+        val catalogs = json.decodeFromString<List<CatalogRemoteApiModel>>(response)
         if (catalogs.isEmpty()) {
             throw CatalogNotFoundException()
         }

diff --git a/data/src/main/java/ireader/data/chapter/ChapterRepositoryImpl.kt b/data/src/main/java/ireader/data/chapter/ChapterRepositoryImpl.kt
@@ -1,6 +1,6 @@
 package ireader.data.chapter
 
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.data.local.DatabaseHandler
 import ireader.data.util.toDB
 import ireader.domain.data.repository.ChapterRepository

diff --git a/data/src/main/java/ireader/data/chapter/chapterMapper.kt b/data/src/main/java/ireader/data/chapter/chapterMapper.kt
@@ -1,6 +1,6 @@
 package ireader.data.chapter
 
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.source.model.Page
 
 val chapterMapper = {_id: Long, book_id: Long, url: String, name: String, scanlator: String?, read: Boolean, bookmark: Boolean, last_page_read: Long, chapter_number: Float, source_order: Long, date_fetch: Long, date_upload: Long, content: List<Page> ,type: Long->

diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 </manifest>
diff --git a/domain/src/main/java/ireader/domain/data/repository/BookRepository.kt b/domain/src/main/java/ireader/domain/data/repository/BookRepository.kt
@@ -1,7 +1,7 @@
 package ireader.domain.data.repository
 
 import ireader.common.models.entities.Book
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.common.models.entities.LibraryBook
 import ireader.common.models.library.LibrarySort
 import kotlinx.coroutines.flow.Flow

diff --git a/domain/src/main/java/ireader/domain/data/repository/ChapterRepository.kt b/domain/src/main/java/ireader/domain/data/repository/ChapterRepository.kt
@@ -1,6 +1,6 @@
 package ireader.domain.data.repository
 
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import kotlinx.coroutines.flow.Flow
 
 interface ChapterRepository {
@@ -30,7 +30,7 @@ interface ChapterRepository {
     suspend fun insertChapter(chapter: Chapter): Long
 
     suspend fun insertChapters(
-        chapters: List<Chapter>,
+            chapters: List<Chapter>,
     ): List<Long>
 
     suspend fun deleteChaptersByBookId(
@@ -40,7 +40,7 @@ interface ChapterRepository {
     suspend fun deleteChapters(chapters: List<Chapter>)
 
     suspend fun deleteChapter(
-        chapter: Chapter,
+            chapter: Chapter,
     )
 
     suspend fun deleteAllChapters()

diff --git a/domain/src/main/java/ireader/domain/models/BackUpBook.kt b/domain/src/main/java/ireader/domain/models/BackUpBook.kt
@@ -2,13 +2,13 @@ package ireader.domain.models
 
 import androidx.annotation.Keep
 import ireader.common.models.entities.Book
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import kotlinx.serialization.Serializable
 
 
 @Keep
 @Serializable
 data class BackUpBook(
-    val book: Book,
-    val chapters: List<Chapter>,
+        val book: Book,
+        val chapters: List<Chapter>,
 )
diff --git a/domain/src/main/java/ireader/domain/models/entities/Chapter.kt b/domain/src/main/java/ireader/domain/models/entities/Chapter.kt
@@ -1,13 +1,16 @@
 
 
-package ireader.common.models.entities
+package ireader.domain.models.entities
 
 
 
 import ireader.core.source.model.ChapterInfo
 import ireader.core.source.model.Page
 import kotlinx.serialization.Serializable
 
+/**
+ * @param number it's number of current chapter
+ */
 @Serializable
 data class Chapter(
     val id: Long = 0,

diff --git a/domain/src/main/java/ireader/domain/models/entities/SavedDownload.kt b/domain/src/main/java/ireader/domain/models/entities/SavedDownload.kt
@@ -2,6 +2,8 @@
 
 package ireader.common.models.entities
 
+import ireader.domain.models.entities.Chapter
+
 data class Download(
     val chapterId: Long,
     val bookId: Long,

diff --git a/domain/src/main/java/ireader/domain/services/downloaderService/DefaultNotificationHelper.kt b/domain/src/main/java/ireader/domain/services/downloaderService/DefaultNotificationHelper.kt
@@ -13,7 +13,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
 import androidx.work.WorkManager
 import ireader.common.models.entities.Book
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.domain.R
 import ireader.domain.notification.Notifications
 import ireader.domain.notification.flags
@@ -99,8 +99,8 @@ class DefaultNotificationHelper(
     }
 
     fun baseNotificationDownloader(
-        chapter: Chapter? = null,
-        workManagerId: UUID,
+            chapter: Chapter? = null,
+            workManagerId: UUID,
     ): NotificationCompat.Builder {
         val cancelDownloadIntent = WorkManager.getInstance(context)
             .createCancelPendingIntent(workManagerId)
@@ -262,13 +262,13 @@ class DefaultNotificationHelper(
     )
 
     suspend fun basicPlayingTextReaderNotification(
-        chapter: Chapter,
-        book: Book,
-        playing: Boolean,
-        progress: Int,
-        mediaSessionCompat: MediaSessionCompat,
-        isLoading: Boolean = false,
-        isError: Boolean = false,
+            chapter: Chapter,
+            book: Book,
+            playing: Boolean,
+            progress: Int,
+            mediaSessionCompat: MediaSessionCompat,
+            isLoading: Boolean = false,
+            isError: Boolean = false,
     ): NotificationCompat.Builder {
         val contentText =
             when {
@@ -362,9 +362,9 @@ class DefaultNotificationHelper(
     }
 
     private fun openReaderScreenIntent(
-        chapter: Chapter,
-        book: Book,
-        currentReadingParagraph: Int = 0,
+            chapter: Chapter,
+            book: Book,
+            currentReadingParagraph: Int = 0,
     ): PendingIntent = PendingIntent.getActivity(
         context.applicationContext,
         5,

diff --git a/domain/src/main/java/ireader/domain/services/downloaderService/DownloaderService.kt b/domain/src/main/java/ireader/domain/services/downloaderService/DownloaderService.kt
@@ -7,8 +7,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import ireader.domain.data.repository.BookRepository
 import ireader.domain.data.repository.ChapterRepository
-import ireader.domain.utils.extensions.launchIO
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.common.models.entities.SavedDownload
 import ireader.common.models.entities.buildSavedDownload
 import ireader.i18n.asString

diff --git a/domain/src/main/java/ireader/domain/services/library_update_service/LibraryUpdatesService.kt b/domain/src/main/java/ireader/domain/services/library_update_service/LibraryUpdatesService.kt
@@ -6,7 +6,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.log.Log
 import ireader.domain.catalogs.interactor.GetLocalCatalog
 import ireader.domain.R

diff --git a/domain/src/main/java/ireader/domain/services/tts_service/TTSState.kt b/domain/src/main/java/ireader/domain/services/tts_service/TTSState.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.setValue
 import kotlinx.datetime.Instant
 import ireader.common.models.entities.Book
 import ireader.domain.models.entities.CatalogLocal
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.source.Source
 import ireader.core.source.model.Text
 import ireader.domain.preferences.models.prefs.IReaderVoice

diff --git a/domain/src/main/java/ireader/domain/services/tts_service/media_player/TTSService.kt b/domain/src/main/java/ireader/domain/services/tts_service/media_player/TTSService.kt
@@ -32,7 +32,7 @@ import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import ireader.common.models.entities.Book
 import ireader.domain.models.entities.CatalogLocal
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.log.Log
 import ireader.domain.catalogs.CatalogStore
 import ireader.domain.data.repository.BookRepository
@@ -420,10 +420,10 @@ class TTSService : MediaBrowserServiceCompat(), AudioManager.OnAudioFocusChangeL
      * in notifications
      */
     private fun setBundle(
-        book: Book? = state.ttsBook,
-        chapter: Chapter? = state.ttsChapter,
-        isLoading: Boolean = false,
-        error: Boolean = false
+            book: Book? = state.ttsBook,
+            chapter: Chapter? = state.ttsChapter,
+            isLoading: Boolean = false,
+            error: Boolean = false
     ) {
         val data = metadata
             .apply {

diff --git a/domain/src/main/java/ireader/domain/usecases/backup/RestoreBackup.kt b/domain/src/main/java/ireader/domain/usecases/backup/RestoreBackup.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.net.Uri
 import ireader.common.models.entities.Book
 import ireader.common.models.entities.BookCategory
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.db.Transactions
 import ireader.domain.data.repository.BookCategoryRepository
 import ireader.domain.data.repository.BookRepository

diff --git a/domain/src/main/java/ireader/domain/usecases/backup/backup/ChapterProto.kt b/domain/src/main/java/ireader/domain/usecases/backup/backup/ChapterProto.kt
@@ -2,7 +2,7 @@
 
 package ireader.domain.usecases.backup.backup
 
-import ireader.common.models.entities.Chapter
+import ireader.domain.models.entities.Chapter
 import ireader.core.source.model.decode
 import ireader.core.source.model.encode
 import kotlinx.serialization.Serializable

diff --git a/domain/src/main/java/ireader/domain/usecases/epub/ImportEpub.kt b/domain/src/main/java/ireader/domain/usecases/epub/ImportEpub.kt
@@ -7,7 +7,7 @@
 // import org.ireader.common_data.repository.BookRepository
 // import org.ireader.common_data.repository.ChapterRepository
 // import ireader.common.models.entities.Book
-// import ireader.common.models.entities.Chapter
+// import ireader.domain.models.entities.Chapter
 // import ireader.core.source.LocalSource
 // import ir.kazemcodes.epub.model.EpubBook
 // import java.io.File