diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 0000000..6f0bc26 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,76 @@ +# Book Reader — Episteme fork + bookshelf-api/ABS + +> Форк `Aryan-Raj3112/episteme` под bookshelf-api + Audiobookshelf + Material You 3 (Myne-style UI). + +## Stack + +- **Язык:** Kotlin 100% +- **UI:** Jetpack Compose + Material3 (Myne-style: round cards, dynamic color, minimal) +- **DI:** Dagger Hilt +- **БД:** Room +- **Настройки:** DataStore +- **Сеть:** Retrofit + OkHttp + Kotlinx Serialization +- **Аудио:** ExoPlayer (Media3) + MediaSession +- **Фоновые задачи:** WorkManager +- **Читалка:** Episteme paginatedreader (CSS-движок, ContentBlock/Page модель) +- **Форматы:** EPUB, FB2, PDF, MOBI/AZW3, DOCX, ODT, TXT, Markdown, HTML, comics +- **minSdk:** 26 (Episteme default) +- **compileSdk/targetSdk:** 36 + +## Origin + +- **upstream:** `https://github.com/Aryan-Raj3112/episteme.git` (AGPL-3.0) +- **origin:** `https://git.dueattendant149.org/Atte149/book-reader.git` (Forgejo) +- **Лицензия:** AGPL-3.0 (наследуется от Episteme) + +## Goal + +- Взять зрелый reader engine из Episteme (пагинация, все форматы, TTS, annotations) +- Redesign UI под Myne-стиль (Material You 3, round cards, dynamic color) +- Заменить backend (OPDS/Gutenberg/LocalFolder) на bookshelf-api + ABS +- Добавить фичи из Book's Story: audio player, RSVP, Librarr search, TTS jobs, cache, progress sync, upload + +## Layout + +- `app/src/main/` — Android app (после KMP→Android упрощения) +- `app/src/oss/` — OSS flavor (без проприетарных ML Kit/cloud) +- `app/src/releaseOffline/` — offline-only flavor +- ~~`desktopApp/`~~ — удалён (Android-only) +- ~~`shared/`~~ — слит в `app/src/main/` (после Этапа 1) + +## Backend + +- **bookshelf-api:** `https://books.dueattendant149.org/api/v1/*` + - `GET /api/v1/books/libraries` + - `GET /api/v1/books/{item_id}` + - `GET /api/v1/books/library/{id}/items` + - `POST /api/v1/search` + - `POST /api/v1/tts`, `GET /api/v1/tts/{job_id}` + - `POST /api/v1/download`, `GET /api/v1/download/list` +- **Audiobookshelf (напрямую):** + - `GET /api/items/{id}/file/{ino}` + - `GET /api/items/{id}/cover` + - `GET /api/items/{id}/download` + +## WARNs + +- **Не пушить в `upstream` (Aryan-Raj3112/episteme).** Только в `origin` (Forgejo). +- **AGPL-3.0** — если публикуем, исходный код должен быть открыт (включая server-side modifications если есть network use). +- **`pro` flavor** содержит проприетарные компоненты (ML Kit OCR, cloud sync) — не использовать, только `oss`. +- **Секреты** (ABS token, API keys) — только в `.env` / DataStore, никогда в коде. + +## Build + +```bash +./gradlew :app:assembleOssDebug +``` + +## Status + +- Phase 0: clone + package rename — completed +- Phase 1: KMP → Android-only — pending +- Phase 2: backend swap (bookshelf-api + ABS) — pending +- Phase 3: UI redesign (Myne-style) — pending +- Phase 4: features from Book's Story (audio/RSVP/search/TTS/cache) — pending +- Phase 5: reader engine integration — pending +- Phase 6: build, test, deploy — pending \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9d1920a..0c234e9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -50,11 +50,11 @@ kotlin { } android { - namespace = "com.aryan.reader" + namespace = "org.dueattendant149.bookreader" compileSdk = 36 defaultConfig { - applicationId = "com.aryan.reader" + applicationId = "org.dueattendant149.bookreader" minSdk = 26 targetSdk = 35 versionCode = 54 diff --git a/app/src/androidTest/java/com/aryan/reader/AppNavigationTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/AppNavigationTest.kt similarity index 93% rename from app/src/androidTest/java/com/aryan/reader/AppNavigationTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/AppNavigationTest.kt index e966b22..6c41fd6 100644 --- a/app/src/androidTest/java/com/aryan/reader/AppNavigationTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/AppNavigationTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/com/aryan/reader/HomeRecentFileCardTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/HomeRecentFileCardTest.kt similarity index 97% rename from app/src/androidTest/java/com/aryan/reader/HomeRecentFileCardTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/HomeRecentFileCardTest.kt index 5422300..d32e298 100644 --- a/app/src/androidTest/java/com/aryan/reader/HomeRecentFileCardTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/HomeRecentFileCardTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.compose.material3.MaterialTheme @@ -11,7 +11,7 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTouchInput import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test diff --git a/app/src/androidTest/java/com/aryan/reader/LibraryScreenContentTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/LibraryScreenContentTest.kt similarity index 99% rename from app/src/androidTest/java/com/aryan/reader/LibraryScreenContentTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/LibraryScreenContentTest.kt index a660a71..1321a82 100644 --- a/app/src/androidTest/java/com/aryan/reader/LibraryScreenContentTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/LibraryScreenContentTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.compose.foundation.ExperimentalFoundationApi @@ -17,8 +17,8 @@ import androidx.compose.ui.test.performTextInput import androidx.compose.ui.test.performTouchInput import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test diff --git a/app/src/androidTest/java/com/aryan/reader/MainDispatcherRule.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/MainDispatcherRule.kt similarity index 95% rename from app/src/androidTest/java/com/aryan/reader/MainDispatcherRule.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/MainDispatcherRule.kt index 1cf2f5b..f45fabe 100644 --- a/app/src/androidTest/java/com/aryan/reader/MainDispatcherRule.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/MainDispatcherRule.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/epubreader/ChapterWebViewBridgeTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewBridgeTest.kt similarity index 99% rename from app/src/androidTest/java/com/aryan/reader/epubreader/ChapterWebViewBridgeTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewBridgeTest.kt index 68e6283..9586e38 100644 --- a/app/src/androidTest/java/com/aryan/reader/epubreader/ChapterWebViewBridgeTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewBridgeTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.CoroutineScope diff --git a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderBookmarkTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBookmarkTest.kt similarity index 97% rename from app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderBookmarkTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBookmarkTest.kt index 36e67ca..2788375 100644 --- a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderBookmarkTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBookmarkTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubChapter import com.google.common.truth.Truth.assertThat import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderLogicTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderLogicTest.kt similarity index 95% rename from app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderLogicTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderLogicTest.kt index 28d8d05..131d3bd 100644 --- a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderLogicTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderLogicTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontWeight import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest import org.junit.After diff --git a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderScreenTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreenTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderScreenTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreenTest.kt index b4402e6..499bfc3 100644 --- a/app/src/androidTest/java/com/aryan/reader/epubreader/EpubReaderScreenTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreenTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import android.content.Intent @@ -23,15 +23,15 @@ import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.aryan.reader.FileType -import com.aryan.reader.FileHasher -import com.aryan.reader.MainActivity -import com.aryan.reader.R -import com.aryan.reader.RenderMode -import com.aryan.reader.data.AppDatabase -import com.aryan.reader.data.RecentFileEntity -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.FileHasher +import org.dueattendant149.bookreader.MainActivity +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.data.AppDatabase +import org.dueattendant149.bookreader.data.RecentFileEntity +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.ReaderLocator import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.runBlocking import org.junit.After diff --git a/app/src/androidTest/java/com/aryan/reader/tts/MainDispatcherRule.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/MainDispatcherRule.kt similarity index 94% rename from app/src/androidTest/java/com/aryan/reader/tts/MainDispatcherRule.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/MainDispatcherRule.kt index 1b2d937..0545722 100644 --- a/app/src/androidTest/java/com/aryan/reader/tts/MainDispatcherRule.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/epubreader/MainDispatcherRule.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.epubreader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/CssParserTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserTest.kt similarity index 99% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/CssParserTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserTest.kt index f7fe15e..cab1c9e 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/CssParserTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserTest.kt @@ -1,5 +1,5 @@ // CssParserTest.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/HtmlParserTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserTest.kt similarity index 99% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/HtmlParserTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserTest.kt index 9b4d9d7..16c3f9b 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/HtmlParserTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserTest.kt @@ -1,5 +1,5 @@ // HtmlParserTest.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle diff --git a/app/src/androidTest/java/com/aryan/reader/pdf/MainDispatcherRule.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/MainDispatcherRule.kt similarity index 95% rename from app/src/androidTest/java/com/aryan/reader/pdf/MainDispatcherRule.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/MainDispatcherRule.kt index afbbc75..aa3941d 100644 --- a/app/src/androidTest/java/com/aryan/reader/pdf/MainDispatcherRule.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/MainDispatcherRule.kt @@ -1,5 +1,5 @@ // MainDispatcherRule.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.paginatedreader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderDataTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderDataTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderDataTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderDataTest.kt index 7bfe520..59935bb 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderDataTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderDataTest.kt @@ -1,5 +1,5 @@ // PaginatedReaderDataTest.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.ParagraphStyle diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModelTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModelTest.kt similarity index 97% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModelTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModelTest.kt index 27f1a52..bde9ccc 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModelTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModelTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.content.Context import android.os.Build @@ -15,8 +15,8 @@ import androidx.compose.ui.unit.Density import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SdkSuppress -import com.aryan.reader.SearchResult -import com.aryan.reader.epub.EpubBook +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.epub.EpubBook import com.google.common.truth.Truth.assertThat import io.mockk.mockk import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatorTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorTest.kt similarity index 99% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatorTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorTest.kt index 985b996..c74943c 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/PaginatorTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorTest.kt @@ -1,5 +1,5 @@ // PaginatorTest.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.os.Build import androidx.compose.ui.text.AnnotatedString diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/ReaderLinkHitTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkHitTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/ReaderLinkHitTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkHitTest.kt index cc27087..11e4cc1 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/ReaderLinkHitTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkHitTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.geometry.Offset import androidx.compose.ui.test.junit4.createComposeRule diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/StyleUtilsTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtilsTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/StyleUtilsTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtilsTest.kt index 9fddc60..c108d87 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/StyleUtilsTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtilsTest.kt @@ -1,5 +1,5 @@ // StyleUtilsTest.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isUnspecified diff --git a/app/src/androidTest/java/com/aryan/reader/paginatedreader/MainDispatcherRule.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/MainDispatcherRule.kt similarity index 96% rename from app/src/androidTest/java/com/aryan/reader/paginatedreader/MainDispatcherRule.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/MainDispatcherRule.kt index a6d31f8..d773bbe 100644 --- a/app/src/androidTest/java/com/aryan/reader/paginatedreader/MainDispatcherRule.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/MainDispatcherRule.kt @@ -1,5 +1,5 @@ // MainDispatcherRule.kt -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.pdf import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/pdf/PdfAnnotationTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/pdf/PdfAnnotationTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationTest.kt index af02911..985a186 100644 --- a/app/src/androidTest/java/com/aryan/reader/pdf/PdfAnnotationTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationTest.kt @@ -1,5 +1,5 @@ // PdfAnnotationTest.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.content.Intent @@ -20,8 +20,8 @@ import androidx.core.content.FileProvider import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.aryan.reader.MainActivity -import com.aryan.reader.R +import org.dueattendant149.bookreader.MainActivity +import org.dueattendant149.bookreader.R import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/com/aryan/reader/pdf/PdfCoverGeneratorTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGeneratorTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/pdf/PdfCoverGeneratorTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGeneratorTest.kt index 137dad8..074b0c9 100644 --- a/app/src/androidTest/java/com/aryan/reader/pdf/PdfCoverGeneratorTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGeneratorTest.kt @@ -1,5 +1,5 @@ // app/src/androidTest/java/com/aryan/reader/pdf/PdfCoverGeneratorTest.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.net.Uri diff --git a/app/src/androidTest/java/com/aryan/reader/pdf/PdfHelperTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfHelperTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/pdf/PdfHelperTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfHelperTest.kt index 376c1d1..ade8317 100644 --- a/app/src/androidTest/java/com/aryan/reader/pdf/PdfHelperTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfHelperTest.kt @@ -1,5 +1,5 @@ // app/src/androidTest/java/com/aryan/reader/pdf/PdfHelperTest.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Rect import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/androidTest/java/com/aryan/reader/pdf/PdfViewerScreenTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreenTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/pdf/PdfViewerScreenTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreenTest.kt index 5238627..99c3931 100644 --- a/app/src/androidTest/java/com/aryan/reader/pdf/PdfViewerScreenTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreenTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.Manifest import android.content.Context @@ -21,8 +21,8 @@ import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.GrantPermissionRule -import com.aryan.reader.MainActivity -import com.aryan.reader.R +import org.dueattendant149.bookreader.MainActivity +import org.dueattendant149.bookreader.R import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/com/aryan/reader/tts/BaseTtsSynthesizerTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizerTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/tts/BaseTtsSynthesizerTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizerTest.kt index 9b97fdc..d5f7292 100644 --- a/app/src/androidTest/java/com/aryan/reader/tts/BaseTtsSynthesizerTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizerTest.kt @@ -1,5 +1,5 @@ // BaseTtsSynthesizerTest.kt -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.speech.tts.TextToSpeech import androidx.test.core.app.ApplicationProvider diff --git a/app/src/androidTest/java/com/aryan/reader/epubreader/MainDispatcherRule.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/MainDispatcherRule.kt similarity index 95% rename from app/src/androidTest/java/com/aryan/reader/epubreader/MainDispatcherRule.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/MainDispatcherRule.kt index 1f804a0..e46b599 100644 --- a/app/src/androidTest/java/com/aryan/reader/epubreader/MainDispatcherRule.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/MainDispatcherRule.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.tts import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/androidTest/java/com/aryan/reader/tts/TtsUtilsTest.kt b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/TtsUtilsTest.kt similarity index 98% rename from app/src/androidTest/java/com/aryan/reader/tts/TtsUtilsTest.kt rename to app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/TtsUtilsTest.kt index a338488..6749d89 100644 --- a/app/src/androidTest/java/com/aryan/reader/tts/TtsUtilsTest.kt +++ b/app/src/androidTest/java/com/dueattendant149/bookreader/reader/tts/TtsUtilsTest.kt @@ -1,5 +1,5 @@ // TtsUtilsTest.kt -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import com.google.common.truth.Truth.assertThat import org.junit.Test diff --git a/app/src/debug/java/com/aryan/reader/epubreader/EpubTestActivity.kt b/app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/EpubTestActivity.kt similarity index 88% rename from app/src/debug/java/com/aryan/reader/epubreader/EpubTestActivity.kt rename to app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/EpubTestActivity.kt index 0cefee3..9596429 100644 --- a/app/src/debug/java/com/aryan/reader/epubreader/EpubTestActivity.kt +++ b/app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/EpubTestActivity.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.os.Build import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.annotation.RequiresApi -import com.aryan.reader.RenderMode -import com.aryan.reader.epub.EpubBook +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.epub.EpubBook import kotlinx.serialization.json.Json class EpubTestActivity : ComponentActivity() { diff --git a/app/src/debug/java/com/aryan/reader/epubreader/HiltTestActivity.kt b/app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/HiltTestActivity.kt similarity index 89% rename from app/src/debug/java/com/aryan/reader/epubreader/HiltTestActivity.kt rename to app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/HiltTestActivity.kt index 99f56ed..1f512af 100644 --- a/app/src/debug/java/com/aryan/reader/epubreader/HiltTestActivity.kt +++ b/app/src/debug/java/com/dueattendant149/bookreader/reader/epubreader/HiltTestActivity.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import androidx.activity.ComponentActivity diff --git a/app/src/debug/java/com/aryan/reader/ml/ComicPanelDetector.kt b/app/src/debug/java/com/dueattendant149/bookreader/reader/ml/ComicPanelDetector.kt similarity index 99% rename from app/src/debug/java/com/aryan/reader/ml/ComicPanelDetector.kt rename to app/src/debug/java/com/dueattendant149/bookreader/reader/ml/ComicPanelDetector.kt index c2a0e3a..4e21c85 100644 --- a/app/src/debug/java/com/aryan/reader/ml/ComicPanelDetector.kt +++ b/app/src/debug/java/com/dueattendant149/bookreader/reader/ml/ComicPanelDetector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.ml +package org.dueattendant149.bookreader.ml import android.graphics.Bitmap import android.graphics.RectF diff --git a/app/src/main/java/com/aryan/reader/LibraryModels.kt b/app/src/main/java/com/aryan/reader/LibraryModels.kt deleted file mode 100644 index 690462e..0000000 --- a/app/src/main/java/com/aryan/reader/LibraryModels.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.aryan.reader - -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities - -typealias AddBooksSource = com.aryan.reader.shared.AddBooksSource -typealias FileType = com.aryan.reader.shared.FileType -typealias RenderMode = com.aryan.reader.shared.RenderMode -typealias SortOrder = com.aryan.reader.shared.SortOrder -typealias ReadStatusFilter = com.aryan.reader.shared.ReadStatusFilter -typealias LibraryFilters = com.aryan.reader.shared.LibraryFilters -typealias SyncedFolder = com.aryan.reader.shared.SyncedFolder -typealias ShelfType = com.aryan.reader.shared.ShelfType - -internal val ANDROID_READABLE_FILE_TYPES = SharedFileCapabilities.readableTypesFor(ReaderPlatform.ANDROID) -internal val ANDROID_SYNCABLE_FILE_TYPES = SharedFileCapabilities.syncableTypesFor(ReaderPlatform.ANDROID) -internal val COMIC_ARCHIVE_FILE_TYPES = SharedFileCapabilities.comicArchiveTypes -internal val PDF_VIEWER_FILE_TYPES = com.aryan.reader.shared.PDF_VIEWER_FILE_TYPES -internal val EPUB_READER_FILE_TYPES = com.aryan.reader.shared.EPUB_READER_FILE_TYPES - -internal fun FileType.readerSurfaceOnAndroid(): ReaderFeatureSurface? { - return SharedFileCapabilities.surfaceFor(this, ReaderPlatform.ANDROID) -} - -data class Shelf( - val id: String, - val name: String, - val type: ShelfType, - val books: List, - val directBooks: List = books, - val parentShelfId: String? = null, - val childShelfIds: List = emptyList(), - val depth: Int = 0, - val sortKey: String = name.lowercase() -) { - val bookCount: Int get() = books.size - val topBook: RecentFileItem? by lazy(LazyThreadSafetyMode.NONE) { books.maxByOrNull { it.timestamp } } - val directBookCount: Int get() = directBooks.size - val childShelfCount: Int get() = childShelfIds.size -} diff --git a/app/src/main/java/com/aryan/reader/data/SmartCollectionEngine.kt b/app/src/main/java/com/aryan/reader/data/SmartCollectionEngine.kt deleted file mode 100644 index 41d0b80..0000000 --- a/app/src/main/java/com/aryan/reader/data/SmartCollectionEngine.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.aryan.reader.data - -import com.aryan.reader.toSharedBookItem -import com.aryan.reader.shared.SmartCollectionEngine as SharedSmartCollectionEngine - -typealias SmartField = com.aryan.reader.shared.SmartField -typealias SmartOperator = com.aryan.reader.shared.SmartOperator -typealias SmartRule = com.aryan.reader.shared.SmartRule -typealias SmartCollectionDefinition = com.aryan.reader.shared.SmartCollectionDefinition - -object SmartCollectionEngine { - fun toJson(definition: SmartCollectionDefinition): String = - SharedSmartCollectionEngine.toJson(definition) - - fun fromJson(json: String?): SmartCollectionDefinition? = - SharedSmartCollectionEngine.fromJson(json) - - fun evaluate(book: RecentFileItem, definition: SmartCollectionDefinition): Boolean = - SharedSmartCollectionEngine.evaluate(book.toSharedBookItem(), definition) -} diff --git a/app/src/main/java/com/aryan/reader/opds/OpdsModels.kt b/app/src/main/java/com/aryan/reader/opds/OpdsModels.kt deleted file mode 100644 index ca5807e..0000000 --- a/app/src/main/java/com/aryan/reader/opds/OpdsModels.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.aryan.reader.opds - -typealias OpdsCatalog = com.aryan.reader.shared.opds.OpdsCatalog -typealias OpdsFacet = com.aryan.reader.shared.opds.OpdsFacet -typealias OpdsFeed = com.aryan.reader.shared.opds.OpdsFeed -typealias OpdsAuthor = com.aryan.reader.shared.opds.OpdsAuthor -typealias OpdsAcquisition = com.aryan.reader.shared.opds.OpdsAcquisition -typealias OpdsEntry = com.aryan.reader.shared.opds.OpdsEntry -typealias OpdsDownloadState = com.aryan.reader.shared.opds.SharedOpdsDownloadState -typealias OpdsScreenState = com.aryan.reader.shared.opds.SharedOpdsScreenState diff --git a/app/src/main/java/com/aryan/reader/opds/OpdsParser.kt b/app/src/main/java/com/aryan/reader/opds/OpdsParser.kt deleted file mode 100644 index 4f911c5..0000000 --- a/app/src/main/java/com/aryan/reader/opds/OpdsParser.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.aryan.reader.opds - -typealias OpdsParser = com.aryan.reader.shared.opds.SharedOpdsParser diff --git a/app/src/main/java/com/aryan/reader/tts/TtsNotificationIntent.kt b/app/src/main/java/com/aryan/reader/tts/TtsNotificationIntent.kt deleted file mode 100644 index 9e828c5..0000000 --- a/app/src/main/java/com/aryan/reader/tts/TtsNotificationIntent.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.aryan.reader.tts - -const val ACTION_OPEN_TTS_SESSION = "com.aryan.reader.tts.OPEN_SESSION" -const val EXTRA_TTS_BOOK_ID = "com.aryan.reader.tts.extra.BOOK_ID" -const val EXTRA_TTS_CHAPTER_INDEX = "com.aryan.reader.tts.extra.CHAPTER_INDEX" -const val EXTRA_TTS_SOURCE_CFI = "com.aryan.reader.tts.extra.SOURCE_CFI" -const val EXTRA_TTS_START_OFFSET = "com.aryan.reader.tts.extra.START_OFFSET" -const val EXTRA_TTS_PAGE_INDEX = "com.aryan.reader.tts.extra.PAGE_INDEX" diff --git a/app/src/main/java/com/aryan/reader/AiSettingsScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AiSettingsScreen.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/AiSettingsScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AiSettingsScreen.kt index ecf9c61..1a95ac5 100644 --- a/app/src/main/java/com/aryan/reader/AiSettingsScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AiSettingsScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/aryan/reader/AndroidFolderPathResolver.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidFolderPathResolver.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/AndroidFolderPathResolver.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AndroidFolderPathResolver.kt index c03bdeb..197ffef 100644 --- a/app/src/main/java/com/aryan/reader/AndroidFolderPathResolver.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidFolderPathResolver.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.net.Uri import androidx.core.net.toUri -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem import timber.log.Timber class AndroidFolderPathResolver : FolderPathResolver { diff --git a/app/src/main/java/com/aryan/reader/AndroidSettingsHubModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModels.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/AndroidSettingsHubModels.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModels.kt index d46c3d5..7cb6a84 100644 --- a/app/src/main/java/com/aryan/reader/AndroidSettingsHubModels.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModels.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SharedSettingsHubInput -import com.aryan.reader.shared.SharedSettingsPlatform +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SharedSettingsHubInput +import org.dueattendant149.bookreader.shared.SharedSettingsPlatform fun androidSettingsHubInput( uiState: ReaderScreenState, diff --git a/app/src/main/java/com/aryan/reader/AndroidSharedStateBridge.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridge.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/AndroidSharedStateBridge.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridge.kt index b97a93e..65a002e 100644 --- a/app/src/main/java/com/aryan/reader/AndroidSharedStateBridge.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridge.kt @@ -1,14 +1,14 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity -import com.aryan.reader.shared.AppAction as SharedAppAction -import com.aryan.reader.shared.LibraryAction as SharedLibraryAction -import com.aryan.reader.shared.SharedFolderPathResolver -import com.aryan.reader.shared.SharedLibraryProjectionInput -import com.aryan.reader.shared.SharedLibraryStateProjector -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.reduce +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.shared.AppAction as SharedAppAction +import org.dueattendant149.bookreader.shared.LibraryAction as SharedLibraryAction +import org.dueattendant149.bookreader.shared.SharedFolderPathResolver +import org.dueattendant149.bookreader.shared.SharedLibraryProjectionInput +import org.dueattendant149.bookreader.shared.SharedLibraryStateProjector +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.reduce internal object AndroidSharedStateBridge { fun prepareLibraryProjection( diff --git a/app/src/main/java/com/aryan/reader/AppFontResolver.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AppFontResolver.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/AppFontResolver.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AppFontResolver.kt index 597c650..eab48dc 100644 --- a/app/src/main/java/com/aryan/reader/AppFontResolver.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AppFontResolver.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily -import com.aryan.reader.data.CustomFontEntity +import org.dueattendant149.bookreader.data.CustomFontEntity import java.io.File fun AppFontPreference.toAndroidAppFontFamily(customFonts: List): FontFamily? { diff --git a/app/src/main/java/com/aryan/reader/AppNavigation.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AppNavigation.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/AppNavigation.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AppNavigation.kt index 479330b..dd9963e 100644 --- a/app/src/main/java/com/aryan/reader/AppNavigation.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AppNavigation.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import android.os.Build import timber.log.Timber @@ -59,14 +59,14 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.currentBackStackEntryAsState -import com.aryan.reader.epubreader.EpubReaderScreen -import com.aryan.reader.feedback.FeedbackScreen -import com.aryan.reader.feedback.SupportProjectScreen -import com.aryan.reader.pdf.PdfViewerScreen -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.tts.ReaderTtsMiniBar -import com.aryan.reader.tts.readerTtsMiniBarBottomPaddingDp -import com.aryan.reader.tts.shouldShowReaderTtsMiniBar +import org.dueattendant149.bookreader.epubreader.EpubReaderScreen +import org.dueattendant149.bookreader.feedback.FeedbackScreen +import org.dueattendant149.bookreader.feedback.SupportProjectScreen +import org.dueattendant149.bookreader.pdf.PdfViewerScreen +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.tts.ReaderTtsMiniBar +import org.dueattendant149.bookreader.tts.readerTtsMiniBarBottomPaddingDp +import org.dueattendant149.bookreader.tts.shouldShowReaderTtsMiniBar import kotlinx.coroutines.delay object AppDestinations { diff --git a/app/src/main/java/com/aryan/reader/AppUiModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/AppUiModels.kt similarity index 82% rename from app/src/main/java/com/aryan/reader/AppUiModels.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/AppUiModels.kt index d4e06bd..b69de1b 100644 --- a/app/src/main/java/com/aryan/reader/AppUiModels.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/AppUiModels.kt @@ -1,20 +1,20 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.net.Uri -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity -import com.aryan.reader.epub.CalibreBundleResult -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.paginatedreader.Locator +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.epub.CalibreBundleResult +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.paginatedreader.Locator import java.util.Date -typealias BannerMessage = com.aryan.reader.shared.BannerMessage -typealias UserData = com.aryan.reader.shared.UserData -typealias AppThemeMode = com.aryan.reader.shared.AppThemeMode -typealias AppContrastOption = com.aryan.reader.shared.AppContrastOption -typealias AppFontPreference = com.aryan.reader.shared.AppFontPreference -typealias AppFontPreferenceKind = com.aryan.reader.shared.AppFontPreferenceKind -typealias CustomAppTheme = com.aryan.reader.shared.CustomAppTheme +typealias BannerMessage = org.dueattendant149.bookreader.shared.BannerMessage +typealias UserData = org.dueattendant149.bookreader.shared.UserData +typealias AppThemeMode = org.dueattendant149.bookreader.shared.AppThemeMode +typealias AppContrastOption = org.dueattendant149.bookreader.shared.AppContrastOption +typealias AppFontPreference = org.dueattendant149.bookreader.shared.AppFontPreference +typealias AppFontPreferenceKind = org.dueattendant149.bookreader.shared.AppFontPreferenceKind +typealias CustomAppTheme = org.dueattendant149.bookreader.shared.CustomAppTheme data class ImportResult( val internalUri: Uri, diff --git a/app/src/main/java/com/aryan/reader/BookImporter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/BookImporter.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/BookImporter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/BookImporter.kt index 5aae54b..3c25a9e 100644 --- a/app/src/main/java/com/aryan/reader/BookImporter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/BookImporter.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.net.Uri @@ -29,7 +29,7 @@ import java.io.FileOutputStream import java.io.InputStream import java.util.UUID import androidx.core.net.toUri -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedFileCapabilities private const val BOOKS_DIR = "books" diff --git a/app/src/main/java/com/aryan/reader/BookReplacementStore.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/BookReplacementStore.kt similarity index 86% rename from app/src/main/java/com/aryan/reader/BookReplacementStore.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/BookReplacementStore.kt index 9252f54..36fd4ce 100644 --- a/app/src/main/java/com/aryan/reader/BookReplacementStore.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/BookReplacementStore.kt @@ -1,11 +1,11 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.core.content.edit -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderBookReplacementPreferencesJson -import com.aryan.reader.shared.ReaderWordReplacementEngine -import com.aryan.reader.shared.ReaderWordReplacementRule +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferencesJson +import org.dueattendant149.bookreader.shared.ReaderWordReplacementEngine +import org.dueattendant149.bookreader.shared.ReaderWordReplacementRule import org.jsoup.nodes.Document import org.jsoup.nodes.Node import org.jsoup.nodes.TextNode diff --git a/app/src/main/java/com/aryan/reader/BookWordReplacementsSheet.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/BookWordReplacementsSheet.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/BookWordReplacementsSheet.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/BookWordReplacementsSheet.kt index 7e127fa..5420a63 100644 --- a/app/src/main/java/com/aryan/reader/BookWordReplacementsSheet.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/BookWordReplacementsSheet.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement @@ -50,9 +50,9 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ReaderBookReplacementEngine -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderWordReplacementRule +import org.dueattendant149.bookreader.shared.ReaderBookReplacementEngine +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderWordReplacementRule private data class BookRuleEditTarget( val ruleId: String? = null, diff --git a/app/src/main/java/com/aryan/reader/ClipboardUtils.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ClipboardUtils.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/ClipboardUtils.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ClipboardUtils.kt index d86d89a..b045235 100644 --- a/app/src/main/java/com/aryan/reader/ClipboardUtils.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ClipboardUtils.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/java/com/aryan/reader/CloudEpubAnnotationMetadata.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadata.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/CloudEpubAnnotationMetadata.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadata.kt index 8b92be3..4dac732 100644 --- a/app/src/main/java/com/aryan/reader/CloudEpubAnnotationMetadata.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadata.kt @@ -1,7 +1,7 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookMetadata -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.BookMetadata +import org.dueattendant149.bookreader.data.RecentFileItem internal fun RecentFileItem.needsRemoteEpubAnnotationMetadataGuard(): Boolean { return type in EPUB_READER_FILE_TYPES && diff --git a/app/src/main/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisions.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisions.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisions.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisions.kt index 2976b8c..3b326c5 100644 --- a/app/src/main/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisions.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisions.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import java.io.File diff --git a/app/src/main/java/com/aryan/reader/CloudSyncTrace.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudSyncTrace.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/CloudSyncTrace.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/CloudSyncTrace.kt index 8702480..198c806 100644 --- a/app/src/main/java/com/aryan/reader/CloudSyncTrace.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/CloudSyncTrace.kt @@ -1,10 +1,10 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.util.Log -import com.aryan.reader.data.BookMetadata -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.effectiveAnnotationModifiedTimestamp -import com.aryan.reader.data.effectiveReadingPositionModifiedTimestamp +import org.dueattendant149.bookreader.data.BookMetadata +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.effectiveAnnotationModifiedTimestamp +import org.dueattendant149.bookreader.data.effectiveReadingPositionModifiedTimestamp import timber.log.Timber internal const val CloudSyncTraceTag = "EpistemeCloudSync" diff --git a/app/src/main/java/com/aryan/reader/Common.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/Common.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/Common.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/Common.kt index c42019a..0f459cd 100644 --- a/app/src/main/java/com/aryan/reader/Common.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/Common.kt @@ -1,7 +1,7 @@ // Common.kt @file:OptIn(ExperimentalMaterial3Api::class) @file:Suppress("KotlinConstantConditions") -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.graphics.Bitmap @@ -166,23 +166,23 @@ import androidx.compose.ui.window.PopupProperties import androidx.core.content.edit import androidx.core.graphics.toColorInt import androidx.media3.common.util.UnstableApi -import com.aryan.reader.epubreader.PREF_CUSTOM_THEMES -import com.aryan.reader.epubreader.PREF_READER_THEME -import com.aryan.reader.paginatedreader.TtsChunk -import com.aryan.reader.pdf.PdfHighlightColor -import com.aryan.reader.shared.BuiltInReaderThemes -import com.aryan.reader.shared.ReaderTextureFilePrefix -import com.aryan.reader.shared.normalizeReaderTextureExtension -import com.aryan.reader.shared.readerTextureDisplayName as sharedReaderTextureDisplayName -import com.aryan.reader.shared.readerTextureMimeTypeForExtension -import com.aryan.reader.tts.GEMINI_TTS_SPEAKERS -import com.aryan.reader.tts.SpeakerSamplePlayer -import com.aryan.reader.tts.TtsCacheManager -import com.aryan.reader.tts.TtsPlaybackManager -import com.aryan.reader.tts.formatBytes -import com.aryan.reader.tts.loadTtsMode -import com.aryan.reader.tts.rememberTtsController -import com.aryan.reader.tts.splitTextIntoChunks +import org.dueattendant149.bookreader.epubreader.PREF_CUSTOM_THEMES +import org.dueattendant149.bookreader.epubreader.PREF_READER_THEME +import org.dueattendant149.bookreader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.pdf.PdfHighlightColor +import org.dueattendant149.bookreader.shared.BuiltInReaderThemes +import org.dueattendant149.bookreader.shared.ReaderTextureFilePrefix +import org.dueattendant149.bookreader.shared.normalizeReaderTextureExtension +import org.dueattendant149.bookreader.shared.readerTextureDisplayName as sharedReaderTextureDisplayName +import org.dueattendant149.bookreader.shared.readerTextureMimeTypeForExtension +import org.dueattendant149.bookreader.tts.GEMINI_TTS_SPEAKERS +import org.dueattendant149.bookreader.tts.SpeakerSamplePlayer +import org.dueattendant149.bookreader.tts.TtsCacheManager +import org.dueattendant149.bookreader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.tts.formatBytes +import org.dueattendant149.bookreader.tts.loadTtsMode +import org.dueattendant149.bookreader.tts.rememberTtsController +import org.dueattendant149.bookreader.tts.splitTextIntoChunks import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -218,8 +218,8 @@ import kotlin.math.min import kotlin.math.roundToInt import kotlin.math.sqrt -typealias ReaderTexture = com.aryan.reader.shared.ReaderTexture -typealias ReaderTheme = com.aryan.reader.shared.ReaderTheme +typealias ReaderTexture = org.dueattendant149.bookreader.shared.ReaderTexture +typealias ReaderTheme = org.dueattendant149.bookreader.shared.ReaderTheme const val aiServerBasePath = BuildConfig.AI_WORKER_URL const val summarizeEndpoint = "/summarize" @@ -474,9 +474,9 @@ data class SearchResult( val chunkIndex: Int ) -typealias AiDefinitionResult = com.aryan.reader.shared.AiDefinitionResult +typealias AiDefinitionResult = org.dueattendant149.bookreader.shared.AiDefinitionResult -typealias SummarizationResult = com.aryan.reader.shared.SummarizationResult +typealias SummarizationResult = org.dueattendant149.bookreader.shared.SummarizationResult data class CachedSummaryItem( val chapterIndex: Int, @@ -3845,7 +3845,7 @@ fun AiResultContentView( result: SummarizationResult?, isLoading: Boolean, isMainTtsActive: Boolean, - ttsController: com.aryan.reader.tts.TtsController, + ttsController: org.dueattendant149.bookreader.tts.TtsController, ttsState: TtsPlaybackManager.TtsState, getAuthToken: suspend () -> String?, onRegenerate: (() -> Unit)? = null, diff --git a/app/src/main/java/com/aryan/reader/EmbeddedEbookMetadataExtractor.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractor.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/EmbeddedEbookMetadataExtractor.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractor.kt index 36c2574..70fec74 100644 --- a/app/src/main/java/com/aryan/reader/EmbeddedEbookMetadataExtractor.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractor.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.util.Xml import org.xmlpull.v1.XmlPullParser diff --git a/app/src/main/java/com/aryan/reader/EpubMetadataFileEditor.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/EpubMetadataFileEditor.kt similarity index 91% rename from app/src/main/java/com/aryan/reader/EpubMetadataFileEditor.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/EpubMetadataFileEditor.kt index f8f1d8e..9ec9140 100644 --- a/app/src/main/java/com/aryan/reader/EpubMetadataFileEditor.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/EpubMetadataFileEditor.kt @@ -1,14 +1,14 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.net.Uri import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile -import com.aryan.reader.data.BookMetadataEdit -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.shared.reader.SharedEpubMetadataEditor -import com.aryan.reader.shared.reader.SharedEpubMetadataSnapshot -import com.aryan.reader.shared.reader.SharedEpubMetadataUpdate +import org.dueattendant149.bookreader.data.BookMetadataEdit +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.shared.reader.SharedEpubMetadataEditor +import org.dueattendant149.bookreader.shared.reader.SharedEpubMetadataSnapshot +import org.dueattendant149.bookreader.shared.reader.SharedEpubMetadataUpdate import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/app/src/main/java/com/aryan/reader/ExternalFileOpenRouter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouter.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/ExternalFileOpenRouter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouter.kt index dd3508d..4fb489d 100644 --- a/app/src/main/java/com/aryan/reader/ExternalFileOpenRouter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouter.kt @@ -1,11 +1,11 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -const val EXTRA_TEMPORARY_EXTERNAL_OPEN = "com.aryan.reader.extra.TEMPORARY_EXTERNAL_OPEN" +const val EXTRA_TEMPORARY_EXTERNAL_OPEN = "org.dueattendant149.bookreader.extra.TEMPORARY_EXTERNAL_OPEN" object ExternalFileOpenRouteDecider { const val BEHAVIOR_TEMPORARY = "TEMPORARY" diff --git a/app/src/main/java/com/aryan/reader/FileHasher.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/FileHasher.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/FileHasher.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/FileHasher.kt index 2142093..fa76ef3 100644 --- a/app/src/main/java/com/aryan/reader/FileHasher.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/FileHasher.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/aryan/reader/FileTypeResolver.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/FileTypeResolver.kt similarity index 90% rename from app/src/main/java/com/aryan/reader/FileTypeResolver.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/FileTypeResolver.kt index adb94da..fecd802 100644 --- a/app/src/main/java/com/aryan/reader/FileTypeResolver.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/FileTypeResolver.kt @@ -1,6 +1,6 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedFileCapabilities internal fun resolveFileTypeFromName(fileName: String?): FileType? { return SharedFileCapabilities.resolveFileTypeForName(fileName) diff --git a/app/src/main/java/com/aryan/reader/FolderSyncWorker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/FolderSyncWorker.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/FolderSyncWorker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/FolderSyncWorker.kt index 7d68558..e4e67cd 100644 --- a/app/src/main/java/com/aryan/reader/FolderSyncWorker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/FolderSyncWorker.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ // FolderSyncWorker.kt -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import timber.log.Timber @@ -29,25 +29,25 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkerParameters import androidx.work.WorkManager -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.RecentFilesRepository +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFilesRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import androidx.core.content.edit -import com.aryan.reader.data.LocalSyncUtils -import com.aryan.reader.data.FolderBookMetadata -import com.aryan.reader.data.toSharedFolderBookMetadata -import com.aryan.reader.shared.BookItem as SharedBookItem -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.EpubBookmark -import com.aryan.reader.shared.LOCAL_FOLDER_SYNC_DATA_DIR -import com.aryan.reader.shared.LocalFolderSyncEngine -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.SharedFolderScannedFile -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.data.LocalSyncUtils +import org.dueattendant149.bookreader.data.FolderBookMetadata +import org.dueattendant149.bookreader.data.toSharedFolderBookMetadata +import org.dueattendant149.bookreader.shared.BookItem as SharedBookItem +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.EpubBookmark +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SYNC_DATA_DIR +import org.dueattendant149.bookreader.shared.LocalFolderSyncEngine +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.SharedFolderScannedFile +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark import java.io.File import android.provider.DocumentsContract diff --git a/app/src/main/java/com/aryan/reader/FontsScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/FontsScreen.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/FontsScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/FontsScreen.kt index ebdd5d7..c34ffa5 100644 --- a/app/src/main/java/com/aryan/reader/FontsScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/FontsScreen.kt @@ -1,7 +1,7 @@ // FontsScreen.kt @file:Suppress("KotlinConstantConditions") -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.activity.compose.BackHandler import androidx.compose.foundation.ExperimentalFoundationApi @@ -68,17 +68,17 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.CustomFontFamilyItem -import com.aryan.reader.shared.CustomFontVariantItem -import com.aryan.reader.shared.fontFaceLabel -import com.aryan.reader.shared.fontFaceSummary -import com.aryan.reader.shared.groupByFamily -import com.aryan.reader.shared.hasVariableWeightFace -import com.aryan.reader.shared.ui.SharedAppFontSelector -import com.aryan.reader.shared.ui.SharedFontSettingsSection -import com.aryan.reader.shared.ui.SharedFontSettingsTabs -import com.aryan.reader.data.CustomFontEntity +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.CustomFontFamilyItem +import org.dueattendant149.bookreader.shared.CustomFontVariantItem +import org.dueattendant149.bookreader.shared.fontFaceLabel +import org.dueattendant149.bookreader.shared.fontFaceSummary +import org.dueattendant149.bookreader.shared.groupByFamily +import org.dueattendant149.bookreader.shared.hasVariableWeightFace +import org.dueattendant149.bookreader.shared.ui.SharedAppFontSelector +import org.dueattendant149.bookreader.shared.ui.SharedFontSettingsSection +import org.dueattendant149.bookreader.shared.ui.SharedFontSettingsTabs +import org.dueattendant149.bookreader.data.CustomFontEntity import java.io.File @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/aryan/reader/HomeScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/HomeScreen.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/HomeScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/HomeScreen.kt index 8b24157..612c96b 100644 --- a/app/src/main/java/com/aryan/reader/HomeScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/HomeScreen.kt @@ -20,7 +20,7 @@ // HomeScreen @file:Suppress("DEPRECATION") -package com.aryan.reader +package org.dueattendant149.bookreader import android.annotation.SuppressLint import android.app.Activity @@ -145,7 +145,7 @@ import androidx.media3.common.util.UnstableApi import androidx.navigation.NavHostController import coil.compose.AsyncImage import coil.request.ImageRequest -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem import kotlinx.coroutines.launch import timber.log.Timber import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryModels.kt new file mode 100644 index 0000000..8439f4c --- /dev/null +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryModels.kt @@ -0,0 +1,42 @@ +package org.dueattendant149.bookreader + +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities + +typealias AddBooksSource = org.dueattendant149.bookreader.shared.AddBooksSource +typealias FileType = org.dueattendant149.bookreader.shared.FileType +typealias RenderMode = org.dueattendant149.bookreader.shared.RenderMode +typealias SortOrder = org.dueattendant149.bookreader.shared.SortOrder +typealias ReadStatusFilter = org.dueattendant149.bookreader.shared.ReadStatusFilter +typealias LibraryFilters = org.dueattendant149.bookreader.shared.LibraryFilters +typealias SyncedFolder = org.dueattendant149.bookreader.shared.SyncedFolder +typealias ShelfType = org.dueattendant149.bookreader.shared.ShelfType + +internal val ANDROID_READABLE_FILE_TYPES = SharedFileCapabilities.readableTypesFor(ReaderPlatform.ANDROID) +internal val ANDROID_SYNCABLE_FILE_TYPES = SharedFileCapabilities.syncableTypesFor(ReaderPlatform.ANDROID) +internal val COMIC_ARCHIVE_FILE_TYPES = SharedFileCapabilities.comicArchiveTypes +internal val PDF_VIEWER_FILE_TYPES = org.dueattendant149.bookreader.shared.PDF_VIEWER_FILE_TYPES +internal val EPUB_READER_FILE_TYPES = org.dueattendant149.bookreader.shared.EPUB_READER_FILE_TYPES + +internal fun FileType.readerSurfaceOnAndroid(): ReaderFeatureSurface? { + return SharedFileCapabilities.surfaceFor(this, ReaderPlatform.ANDROID) +} + +data class Shelf( + val id: String, + val name: String, + val type: ShelfType, + val books: List, + val directBooks: List = books, + val parentShelfId: String? = null, + val childShelfIds: List = emptyList(), + val depth: Int = 0, + val sortKey: String = name.lowercase() +) { + val bookCount: Int get() = books.size + val topBook: RecentFileItem? by lazy(LazyThreadSafetyMode.NONE) { books.maxByOrNull { it.timestamp } } + val directBookCount: Int get() = directBooks.size + val childShelfCount: Int get() = childShelfIds.size +} diff --git a/app/src/main/java/com/aryan/reader/LibraryScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryScreen.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/LibraryScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/LibraryScreen.kt index 342b624..fa79d21 100644 --- a/app/src/main/java/com/aryan/reader/LibraryScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryScreen.kt @@ -20,7 +20,7 @@ // LibraryScreen.kt @file:Suppress("KotlinConstantConditions") -package com.aryan.reader +package org.dueattendant149.bookreader import android.annotation.SuppressLint import android.net.Uri @@ -141,16 +141,16 @@ import androidx.navigation.NavHostController import coil.ImageLoader import coil.compose.AsyncImage import coil.decode.SvgDecoder -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity -import com.aryan.reader.opds.OpdsAcquisition -import com.aryan.reader.opds.OpdsCatalog -import com.aryan.reader.opds.OpdsDownloadState -import com.aryan.reader.opds.OpdsEntry -import com.aryan.reader.opds.OpdsRepository -import com.aryan.reader.opds.OpdsViewModel -import com.aryan.reader.shared.LOCAL_FOLDER_SYNC_DATA_DIR -import com.aryan.reader.shared.opds.SharedOpdsLocalBookMatcher +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.opds.OpdsAcquisition +import org.dueattendant149.bookreader.opds.OpdsCatalog +import org.dueattendant149.bookreader.opds.OpdsDownloadState +import org.dueattendant149.bookreader.opds.OpdsEntry +import org.dueattendant149.bookreader.opds.OpdsRepository +import org.dueattendant149.bookreader.opds.OpdsViewModel +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SYNC_DATA_DIR +import org.dueattendant149.bookreader.shared.opds.SharedOpdsLocalBookMatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/java/com/aryan/reader/LibraryStateProjector.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryStateProjector.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/LibraryStateProjector.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/LibraryStateProjector.kt index 586f036..61f1df1 100644 --- a/app/src/main/java/com/aryan/reader/LibraryStateProjector.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/LibraryStateProjector.kt @@ -1,14 +1,14 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookShelfCrossRef -import com.aryan.reader.data.BookTagCrossRef -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.ShelfEntity -import com.aryan.reader.data.TagEntity -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.applyLibraryFilters as sharedApplyLibraryFilters -import com.aryan.reader.shared.filterBySearch as sharedFilterBySearch -import com.aryan.reader.shared.sortBooks as sharedSortBooks +import org.dueattendant149.bookreader.data.BookShelfCrossRef +import org.dueattendant149.bookreader.data.BookTagCrossRef +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.ShelfEntity +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.applyLibraryFilters as sharedApplyLibraryFilters +import org.dueattendant149.bookreader.shared.filterBySearch as sharedFilterBySearch +import org.dueattendant149.bookreader.shared.sortBooks as sharedSortBooks fun interface FolderPathResolver { fun relativeFolderSegments(item: RecentFileItem): List @@ -151,7 +151,7 @@ fun sortFiles(files: List, sortOrder: SortOrder): List.mapSharedResults(sharedBooks: List): List { +private fun List.mapSharedResults(sharedBooks: List): List { val byId = associateBy { it.bookId } return sharedBooks.mapNotNull { byId[it.id] } } diff --git a/app/src/main/java/com/aryan/reader/MainActivity.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MainActivity.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/MainActivity.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MainActivity.kt index 382c1ad..fd5823e 100644 --- a/app/src/main/java/com/aryan/reader/MainActivity.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MainActivity.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Intent import android.os.Build @@ -41,8 +41,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.lifecycle.lifecycleScope import androidx.navigation.compose.rememberNavController -import com.aryan.reader.data.PlatformFeaturesRepository -import com.aryan.reader.ui.theme.AppTheme +import org.dueattendant149.bookreader.data.PlatformFeaturesRepository +import org.dueattendant149.bookreader.ui.theme.AppTheme import kotlinx.coroutines.launch import timber.log.Timber import androidx.compose.foundation.isSystemInDarkTheme @@ -50,12 +50,12 @@ import androidx.compose.runtime.getValue import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.media3.common.util.UnstableApi -import com.aryan.reader.tts.ACTION_OPEN_TTS_SESSION -import com.aryan.reader.tts.EXTRA_TTS_BOOK_ID -import com.aryan.reader.tts.EXTRA_TTS_CHAPTER_INDEX -import com.aryan.reader.tts.EXTRA_TTS_PAGE_INDEX -import com.aryan.reader.tts.EXTRA_TTS_SOURCE_CFI -import com.aryan.reader.tts.EXTRA_TTS_START_OFFSET +import org.dueattendant149.bookreader.tts.ACTION_OPEN_TTS_SESSION +import org.dueattendant149.bookreader.tts.EXTRA_TTS_BOOK_ID +import org.dueattendant149.bookreader.tts.EXTRA_TTS_CHAPTER_INDEX +import org.dueattendant149.bookreader.tts.EXTRA_TTS_PAGE_INDEX +import org.dueattendant149.bookreader.tts.EXTRA_TTS_SOURCE_CFI +import org.dueattendant149.bookreader.tts.EXTRA_TTS_START_OFFSET @UnstableApi open class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/aryan/reader/MainPreferenceKeys.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MainPreferenceKeys.kt similarity index 94% rename from app/src/main/java/com/aryan/reader/MainPreferenceKeys.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MainPreferenceKeys.kt index e12fd41..881ba33 100644 --- a/app/src/main/java/com/aryan/reader/MainPreferenceKeys.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MainPreferenceKeys.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader internal const val KEY_RENDER_MODE = "render_mode" internal const val KEY_FOLDER_SYNC_ENABLED = "folder_sync_enabled" diff --git a/app/src/main/java/com/aryan/reader/MainScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MainScreen.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/MainScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MainScreen.kt index c0c933d..fda939f 100644 --- a/app/src/main/java/com/aryan/reader/MainScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MainScreen.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ // MainScreen.kt -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.activity.ComponentActivity import androidx.activity.enableEdgeToEdge diff --git a/app/src/main/java/com/aryan/reader/MainViewModel.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MainViewModel.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/MainViewModel.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MainViewModel.kt index c5d96d9..a1e7069 100644 --- a/app/src/main/java/com/aryan/reader/MainViewModel.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MainViewModel.kt @@ -20,7 +20,7 @@ // MainViewModel.kt @file:Suppress("DEPRECATION", "ANNOTATION_WILL_BE_APPLIED_ALSO_TO_PROPERTY_OR_FIELD") -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Application import android.content.ClipData @@ -31,11 +31,11 @@ import android.database.Cursor import android.graphics.Bitmap import android.net.Uri import android.os.Build -import com.aryan.reader.tts.TtsController -import com.aryan.reader.tts.TtsPlaybackManager -import com.aryan.reader.paginatedreader.LocatorConverter +import org.dueattendant149.bookreader.tts.TtsController +import org.dueattendant149.bookreader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.paginatedreader.LocatorConverter import kotlinx.serialization.protobuf.ProtoBuf -import com.aryan.reader.paginatedreader.semanticBlockModule +import org.dueattendant149.bookreader.paginatedreader.semanticBlockModule import android.provider.DocumentsContract import android.provider.OpenableColumns import androidx.annotation.OptIn @@ -53,72 +53,72 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkInfo import androidx.work.WorkManager -import com.aryan.reader.data.BookMetadata -import com.aryan.reader.data.BookMetadataEdit -import com.aryan.reader.data.CloudflareRepository -import com.aryan.reader.data.CustomFontEntity -import com.aryan.reader.data.FeedbackRepository -import com.aryan.reader.data.FirestoreRepository -import com.aryan.reader.data.FontMetadata -import com.aryan.reader.data.FontsRepository -import com.aryan.reader.data.GoogleDriveRepository -import com.aryan.reader.data.LocalSyncUtils -import com.aryan.reader.data.PurchaseEntity -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.RecentFilesRepository -import com.aryan.reader.data.RemoteConfigRepository -import com.aryan.reader.data.ShelfMetadata -import com.aryan.reader.data.TagEntity -import com.aryan.reader.data.effectiveAnnotationModifiedTimestamp -import com.aryan.reader.data.effectiveReadingPositionModifiedTimestamp -import com.aryan.reader.data.getUri -import com.aryan.reader.data.toBookMetadata -import com.aryan.reader.data.toRecentFileItem -import com.aryan.reader.epub.CalibreBundleExtractor -import com.aryan.reader.epub.CalibreBundleResult -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubParser -import com.aryan.reader.epub.ImportedFileCache -import com.aryan.reader.epub.MobiParser -import com.aryan.reader.epub.SingleFileImporter -import com.aryan.reader.epub.hasReadableExtractedContent -import com.aryan.reader.ml.ISpeechBubbleDetector -import com.aryan.reader.ml.SpeechBubble -import com.aryan.reader.ml.SpeechBubbleDetector -import com.aryan.reader.paginatedreader.Locator -import com.aryan.reader.paginatedreader.data.BookCacheDatabase -import com.aryan.reader.paginatedreader.data.BookProcessingWorker -import com.aryan.reader.pdf.PdfCoverGenerator -import com.aryan.reader.pdf.PDF_BLANK_PAGE_PERSISTENCE_TAG -import com.aryan.reader.pdf.PdfUserHighlight -import com.aryan.reader.pdf.PdfiumCoreProvider -import com.aryan.reader.pdf.PdfiumEngineProvider -import com.aryan.reader.pdf.PdfiumAnnotationExporter -import com.aryan.reader.pdf.ReflowWorker -import com.aryan.reader.pdf.pdfLayoutDebugSummary -import com.aryan.reader.pdf.remapPdfAnnotationsForLayoutChange -import com.aryan.reader.pdf.remapPdfBookmarksJsonForLayoutChange -import com.aryan.reader.pdf.data.PageLayoutRepository -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfAnnotationRepository -import com.aryan.reader.pdf.data.PdfHighlightRepository -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.PdfTextBoxRepository -import com.aryan.reader.pdf.data.PdfTextRepository -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.pptx.PptxCoverGenerator -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedLibraryEditor -import com.aryan.reader.shared.SharedImportOutcomeCounts -import com.aryan.reader.shared.SharedImportPlanner -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec -import com.aryan.reader.shared.shouldApplyRemoteCloudBookMetadataUpdate -import com.aryan.reader.shared.shouldDownloadRemoteCloudBookContent -import com.aryan.reader.shared.shouldUploadLocalCloudBookContent -import com.aryan.reader.shared.shouldUploadLocalCloudBookMetadataUpdate -import com.aryan.reader.shared.sharedCloudBookContentFileName -import com.aryan.reader.shared.AppAction as SharedAppAction -import com.aryan.reader.shared.LibraryAction as SharedLibraryAction +import org.dueattendant149.bookreader.data.BookMetadata +import org.dueattendant149.bookreader.data.BookMetadataEdit +import org.dueattendant149.bookreader.data.CloudflareRepository +import org.dueattendant149.bookreader.data.CustomFontEntity +import org.dueattendant149.bookreader.data.FeedbackRepository +import org.dueattendant149.bookreader.data.FirestoreRepository +import org.dueattendant149.bookreader.data.FontMetadata +import org.dueattendant149.bookreader.data.FontsRepository +import org.dueattendant149.bookreader.data.GoogleDriveRepository +import org.dueattendant149.bookreader.data.LocalSyncUtils +import org.dueattendant149.bookreader.data.PurchaseEntity +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFilesRepository +import org.dueattendant149.bookreader.data.RemoteConfigRepository +import org.dueattendant149.bookreader.data.ShelfMetadata +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.data.effectiveAnnotationModifiedTimestamp +import org.dueattendant149.bookreader.data.effectiveReadingPositionModifiedTimestamp +import org.dueattendant149.bookreader.data.getUri +import org.dueattendant149.bookreader.data.toBookMetadata +import org.dueattendant149.bookreader.data.toRecentFileItem +import org.dueattendant149.bookreader.epub.CalibreBundleExtractor +import org.dueattendant149.bookreader.epub.CalibreBundleResult +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubParser +import org.dueattendant149.bookreader.epub.ImportedFileCache +import org.dueattendant149.bookreader.epub.MobiParser +import org.dueattendant149.bookreader.epub.SingleFileImporter +import org.dueattendant149.bookreader.epub.hasReadableExtractedContent +import org.dueattendant149.bookreader.ml.ISpeechBubbleDetector +import org.dueattendant149.bookreader.ml.SpeechBubble +import org.dueattendant149.bookreader.ml.SpeechBubbleDetector +import org.dueattendant149.bookreader.paginatedreader.Locator +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDatabase +import org.dueattendant149.bookreader.paginatedreader.data.BookProcessingWorker +import org.dueattendant149.bookreader.pdf.PdfCoverGenerator +import org.dueattendant149.bookreader.pdf.PDF_BLANK_PAGE_PERSISTENCE_TAG +import org.dueattendant149.bookreader.pdf.PdfUserHighlight +import org.dueattendant149.bookreader.pdf.PdfiumCoreProvider +import org.dueattendant149.bookreader.pdf.PdfiumEngineProvider +import org.dueattendant149.bookreader.pdf.PdfiumAnnotationExporter +import org.dueattendant149.bookreader.pdf.ReflowWorker +import org.dueattendant149.bookreader.pdf.pdfLayoutDebugSummary +import org.dueattendant149.bookreader.pdf.remapPdfAnnotationsForLayoutChange +import org.dueattendant149.bookreader.pdf.remapPdfBookmarksJsonForLayoutChange +import org.dueattendant149.bookreader.pdf.data.PageLayoutRepository +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotationRepository +import org.dueattendant149.bookreader.pdf.data.PdfHighlightRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.PdfTextBoxRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextRepository +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pptx.PptxCoverGenerator +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedLibraryEditor +import org.dueattendant149.bookreader.shared.SharedImportOutcomeCounts +import org.dueattendant149.bookreader.shared.SharedImportPlanner +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.shared.shouldApplyRemoteCloudBookMetadataUpdate +import org.dueattendant149.bookreader.shared.shouldDownloadRemoteCloudBookContent +import org.dueattendant149.bookreader.shared.shouldUploadLocalCloudBookContent +import org.dueattendant149.bookreader.shared.shouldUploadLocalCloudBookMetadataUpdate +import org.dueattendant149.bookreader.shared.sharedCloudBookContentFileName +import org.dueattendant149.bookreader.shared.AppAction as SharedAppAction +import org.dueattendant149.bookreader.shared.LibraryAction as SharedLibraryAction import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Deferred @@ -190,13 +190,13 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio private val bookCacheDao by lazy { BookCacheDatabase.getDatabase(application).bookCacheDao() } private val epubParser by lazy { EpubParser(appContext) } private val mobiParser by lazy { MobiParser(appContext) } - private val fb2Parser by lazy { com.aryan.reader.epub.Fb2Parser(appContext) } - private val odtParser by lazy { com.aryan.reader.epub.OdtParser(appContext) } + private val fb2Parser by lazy { org.dueattendant149.bookreader.epub.Fb2Parser(appContext) } + private val odtParser by lazy { org.dueattendant149.bookreader.epub.OdtParser(appContext) } private val singleFileImporter by lazy { SingleFileImporter(appContext) } private val bookImporter by lazy { BookImporter(appContext) } private val epubMetadataFileEditor by lazy { EpubMetadataFileEditor(appContext) } private val pageLayoutRepository by lazy { PageLayoutRepository(appContext) } - private val pdfRichTextRepository by lazy { com.aryan.reader.pdf.PdfRichTextRepository(appContext) } + private val pdfRichTextRepository by lazy { org.dueattendant149.bookreader.pdf.PdfRichTextRepository(appContext) } private val pdfTextBoxRepository by lazy { PdfTextBoxRepository(appContext) } private val pdfHighlightRepository by lazy { PdfHighlightRepository(appContext) } private val pdfAnnotationRepository by lazy { PdfAnnotationRepository(appContext) } @@ -232,7 +232,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio private var cloudContentRetryJob: Job? = null private val cloudMetadataUploadJobs = ConcurrentHashMap() - private var panelDetector: com.aryan.reader.ml.IPanelDetector? = null + private var panelDetector: org.dueattendant149.bookreader.ml.IPanelDetector? = null private var speechBubbleDetector: ISpeechBubbleDetector? = null private val mlDispatcher = newSingleThreadExecutor().asCoroutineDispatcher() @@ -240,17 +240,17 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio private val speechBubbleCache = ConcurrentHashMap>() private val speechBubbleDetectionJobs = ConcurrentHashMap>>() - private fun getOrInitDetector(context: Context): com.aryan.reader.ml.IPanelDetector? { + private fun getOrInitDetector(context: Context): org.dueattendant149.bookreader.ml.IPanelDetector? { if (panelDetector == null && BuildConfig.DEBUG) { val modelFile = File(context.getExternalFilesDir(null), "best_float16.tflite") if (modelFile.exists()) { try { val clazz = Class.forName( - "com.aryan.reader.ml.ComicPanelDetector", + "org.dueattendant149.bookreader.ml.ComicPanelDetector", false, context.classLoader ) - panelDetector = clazz.getConstructor(File::class.java).newInstance(modelFile) as com.aryan.reader.ml.IPanelDetector + panelDetector = clazz.getConstructor(File::class.java).newInstance(modelFile) as org.dueattendant149.bookreader.ml.IPanelDetector } catch (e: Exception) { Timber.e(e, "Failed to instantiate ComicPanelDetector via reflection") } @@ -364,7 +364,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio } Timber.d("CBZ copied to cache successfully. Opening archive...") - val archiveDoc = com.aryan.reader.pdf.ArchiveDocumentWrapper(cacheFile) + val archiveDoc = org.dueattendant149.bookreader.pdf.ArchiveDocumentWrapper(cacheFile) val totalPages = archiveDoc.getPageCount() Timber.d("Archive opened. Total pages: $totalPages") @@ -1944,24 +1944,24 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio when (val deviceStatus = firestoreRepository.getDeviceStatus(currentUser.uid, deviceId)) { - is com.aryan.reader.data.DeviceStatus.Active -> { + is org.dueattendant149.bookreader.data.DeviceStatus.Active -> { Timber.d("Device is active. Updating last seen.") firestoreRepository.updateDeviceLastSeen(currentUser.uid, deviceId) } - is com.aryan.reader.data.DeviceStatus.Revoked -> { + is org.dueattendant149.bookreader.data.DeviceStatus.Revoked -> { Timber.w("Device has been revoked. Signing out.") firestoreRepository.deleteDevice(currentUser.uid, deviceId) // Clean up signOut() showBanner(appContext.getString(R.string.banner_device_removed)) } - is com.aryan.reader.data.DeviceStatus.NotFound -> { + is org.dueattendant149.bookreader.data.DeviceStatus.NotFound -> { Timber.d("Device not found during verification. Triggering full registration.") registerOrUpdateDeviceOnSignIn(currentUser.uid) } - is com.aryan.reader.data.DeviceStatus.Error -> { + is org.dueattendant149.bookreader.data.DeviceStatus.Error -> { Timber.e(deviceStatus.exception, "Error checking device status.") _internalState.update { it.copy( @@ -2038,7 +2038,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio sourceUri: Uri, destUri: Uri, annotations: Map>, - richTextPageLayouts: List? = null, + richTextPageLayouts: List? = null, textBoxes: List? = null, highlights: List? = null, bookId: String @@ -2175,7 +2175,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio activityContext: Context, sourceUri: Uri, annotations: Map>, - richTextPageLayouts: List? = null, + richTextPageLayouts: List? = null, textBoxes: List? = null, highlights: List? = null, includeAnnotations: Boolean, @@ -4657,7 +4657,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio cacheFile.outputStream().use { output -> input.copyTo(output) } } } - val archiveDoc = com.aryan.reader.pdf.ArchiveDocumentWrapper(cacheFile) + val archiveDoc = org.dueattendant149.bookreader.pdf.ArchiveDocumentWrapper(cacheFile) if (archiveDoc.getPageCount() > 0) { val page = archiveDoc.openPage(0) if (page != null) { @@ -6430,7 +6430,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio val currentUser = uiState.value.currentUser ?: return viewModelScope.launch(Dispatchers.IO) { - val db = com.aryan.reader.data.AppDatabase.getDatabase(appContext) + val db = org.dueattendant149.bookreader.data.AppDatabase.getDatabase(appContext) val shelf = db.shelfDao().getShelfById(shelfId) ?: return@launch val crossRefs = db.shelfDao().getCrossRefsForShelf(shelfId) val manualOnlyBookIds = recentFilesRepository.getAllFilesForSync() @@ -7164,7 +7164,7 @@ open class MainViewModel(application: Application) : AndroidViewModel(applicatio val initDuration = System.currentTimeMillis() - initStartTime Timber.d(">>> [BATCH] Model Initialization: ${initDuration}ms") - val archiveDoc = com.aryan.reader.pdf.ArchiveDocumentWrapper(cacheFile) + val archiveDoc = org.dueattendant149.bookreader.pdf.ArchiveDocumentWrapper(cacheFile) val totalPages = archiveDoc.getPageCount() val startIndex = 3 diff --git a/app/src/main/java/com/aryan/reader/MetadataExtractionWorker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MetadataExtractionWorker.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/MetadataExtractionWorker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MetadataExtractionWorker.kt index de2d411..9e56c19 100644 --- a/app/src/main/java/com/aryan/reader/MetadataExtractionWorker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MetadataExtractionWorker.kt @@ -1,5 +1,5 @@ // MetadataExtractionWorker.kt -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.provider.OpenableColumns @@ -10,10 +10,10 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkerParameters import androidx.work.WorkManager -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.RecentFilesRepository -import com.aryan.reader.pdf.PdfiumCoreProvider -import com.aryan.reader.pdf.PdfiumEngineProvider +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFilesRepository +import org.dueattendant149.bookreader.pdf.PdfiumCoreProvider +import org.dueattendant149.bookreader.pdf.PdfiumEngineProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.xmlpull.v1.XmlPullParser diff --git a/app/src/main/java/com/aryan/reader/MyApplication.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/MyApplication.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/MyApplication.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/MyApplication.kt index 1a04905..20d419c 100644 --- a/app/src/main/java/com/aryan/reader/MyApplication.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/MyApplication.kt @@ -17,14 +17,14 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Application import android.webkit.WebView import coil.ImageLoader import coil.ImageLoaderFactory import coil.decode.SvgDecoder -import com.aryan.reader.paginatedreader.SvgStringFetcher +import org.dueattendant149.bookreader.paginatedreader.SvgStringFetcher import timber.log.Timber // Add this class MyApplication : Application(), ImageLoaderFactory { diff --git a/app/src/main/java/com/aryan/reader/ProScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ProScreen.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/ProScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ProScreen.kt index c92ac8b..fd8d1b5 100644 --- a/app/src/main/java/com/aryan/reader/ProScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ProScreen.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Activity import timber.log.Timber @@ -61,7 +61,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.data.ProductDetailsEntity +import org.dueattendant149.bookreader.data.ProductDetailsEntity import kotlinx.coroutines.launch import java.text.NumberFormat import java.util.Currency diff --git a/app/src/main/java/com/aryan/reader/PurchaseAccountObfuscator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscator.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/PurchaseAccountObfuscator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscator.kt index 9604ae6..ed91647 100644 --- a/app/src/main/java/com/aryan/reader/PurchaseAccountObfuscator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscator.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import java.security.MessageDigest import java.util.Base64 diff --git a/app/src/main/java/com/aryan/reader/ReaderBrightness.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderBrightness.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/ReaderBrightness.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderBrightness.kt index 0aca394..9fd9904 100644 --- a/app/src/main/java/com/aryan/reader/ReaderBrightness.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderBrightness.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.view.Window @@ -33,7 +33,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.core.content.edit -import com.aryan.reader.shared.ui.ReaderMinimalSlider +import org.dueattendant149.bookreader.shared.ui.ReaderMinimalSlider import kotlin.math.roundToInt private const val READER_PREFS_NAME = "reader_prefs" diff --git a/app/src/main/java/com/aryan/reader/ReaderFileInfoDialogs.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFileInfoDialogs.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/ReaderFileInfoDialogs.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFileInfoDialogs.kt index 0865865..75203b6 100644 --- a/app/src/main/java/com/aryan/reader/ReaderFileInfoDialogs.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFileInfoDialogs.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -6,7 +6,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem @Composable private fun rememberReaderFileInfoItem( diff --git a/app/src/main/java/com/aryan/reader/ReaderFontDiagnostics.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFontDiagnostics.kt similarity index 63% rename from app/src/main/java/com/aryan/reader/ReaderFontDiagnostics.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFontDiagnostics.kt index ec6c07c..1f1ba33 100644 --- a/app/src/main/java/com/aryan/reader/ReaderFontDiagnostics.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderFontDiagnostics.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.shared.detectFontVariant -import com.aryan.reader.shared.familyFilenameSignature -import com.aryan.reader.shared.supportsVariableWeightAxis +import org.dueattendant149.bookreader.shared.detectFontVariant +import org.dueattendant149.bookreader.shared.familyFilenameSignature +import org.dueattendant149.bookreader.shared.supportsVariableWeightAxis const val ReaderFontDiagnosticsTag = "ReaderFontDiag" diff --git a/app/src/main/java/com/aryan/reader/ReaderPaginationPreferences.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPaginationPreferences.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/ReaderPaginationPreferences.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPaginationPreferences.kt index 348153b..4d922e0 100644 --- a/app/src/main/java/com/aryan/reader/ReaderPaginationPreferences.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPaginationPreferences.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/com/aryan/reader/ReaderPerfLog.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPerfLog.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/ReaderPerfLog.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPerfLog.kt index da2db2f..dd1749f 100644 --- a/app/src/main/java/com/aryan/reader/ReaderPerfLog.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPerfLog.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/ReaderPopupSizing.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPopupSizing.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/ReaderPopupSizing.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPopupSizing.kt index ec2c327..756a436 100644 --- a/app/src/main/java/com/aryan/reader/ReaderPopupSizing.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderPopupSizing.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import kotlin.math.roundToInt diff --git a/app/src/main/java/com/aryan/reader/ReaderScreenOrientation.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientation.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/ReaderScreenOrientation.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientation.kt index ccb4f05..22ab18b 100644 --- a/app/src/main/java/com/aryan/reader/ReaderScreenOrientation.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientation.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Activity import android.content.Context diff --git a/app/src/main/java/com/aryan/reader/ReaderSliderChromeState.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeState.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/ReaderSliderChromeState.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeState.kt index df76113..5b51f8a 100644 --- a/app/src/main/java/com/aryan/reader/ReaderSliderChromeState.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeState.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/aryan/reader/SafeStringResources.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/SafeStringResources.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/SafeStringResources.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/SafeStringResources.kt index 4515a31..6f60bc9 100644 --- a/app/src/main/java/com/aryan/reader/SafeStringResources.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/SafeStringResources.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.content.res.Configuration diff --git a/app/src/main/java/com/aryan/reader/SettingsScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/SettingsScreen.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/SettingsScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/SettingsScreen.kt index f3c2c69..8aa395c 100644 --- a/app/src/main/java/com/aryan/reader/SettingsScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/SettingsScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.WindowInsets @@ -27,45 +27,45 @@ import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.media3.common.util.UnstableApi import androidx.navigation.NavHostController -import com.aryan.reader.data.CustomFontEntity -import com.aryan.reader.epubreader.FormatSettings as AndroidFormatSettings -import com.aryan.reader.epubreader.ReaderFont as AndroidReaderFont -import com.aryan.reader.epubreader.ReaderTextAlign as AndroidReaderTextAlign -import com.aryan.reader.epubreader.loadFormatSettings -import com.aryan.reader.epubreader.loadPageInfoMode -import com.aryan.reader.epubreader.loadPageInfoPosition -import com.aryan.reader.epubreader.loadPullToTurn -import com.aryan.reader.epubreader.loadPullToTurnMultiplier -import com.aryan.reader.epubreader.loadSystemUiMode -import com.aryan.reader.epubreader.savePageInfoMode -import com.aryan.reader.epubreader.savePageInfoPosition -import com.aryan.reader.epubreader.savePullToTurn -import com.aryan.reader.epubreader.savePullToTurnMultiplier -import com.aryan.reader.epubreader.saveReaderSettings -import com.aryan.reader.epubreader.saveSystemUiMode -import com.aryan.reader.pdf.savePdfSystemUiMode -import com.aryan.reader.pdf.savePdfThemeId -import com.aryan.reader.pdf.savePdfVerticalPageGapVisible -import com.aryan.reader.pdf.savePdfPageNumberOverlayVisible -import com.aryan.reader.pdf.loadPdfSystemUiMode -import com.aryan.reader.pdf.loadPdfThemeId -import com.aryan.reader.pdf.loadPdfVerticalPageGapVisible -import com.aryan.reader.pdf.loadPdfPageNumberOverlayVisible -import com.aryan.reader.shared.BuiltInPdfReaderThemes -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.SharedSettingsAction -import com.aryan.reader.shared.SharedSettingsDestination -import com.aryan.reader.shared.parentDestination -import com.aryan.reader.shared.toReaderSettingsFontFamily -import com.aryan.reader.shared.toSharedReaderTextAlign -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign -import com.aryan.reader.shared.readerThemeById -import com.aryan.reader.shared.sharedSettingsHubModel -import com.aryan.reader.shared.toReaderSettings -import com.aryan.reader.shared.ui.SharedSettingsHub -import com.aryan.reader.tts.loadTtsMode +import org.dueattendant149.bookreader.data.CustomFontEntity +import org.dueattendant149.bookreader.epubreader.FormatSettings as AndroidFormatSettings +import org.dueattendant149.bookreader.epubreader.ReaderFont as AndroidReaderFont +import org.dueattendant149.bookreader.epubreader.ReaderTextAlign as AndroidReaderTextAlign +import org.dueattendant149.bookreader.epubreader.loadFormatSettings +import org.dueattendant149.bookreader.epubreader.loadPageInfoMode +import org.dueattendant149.bookreader.epubreader.loadPageInfoPosition +import org.dueattendant149.bookreader.epubreader.loadPullToTurn +import org.dueattendant149.bookreader.epubreader.loadPullToTurnMultiplier +import org.dueattendant149.bookreader.epubreader.loadSystemUiMode +import org.dueattendant149.bookreader.epubreader.savePageInfoMode +import org.dueattendant149.bookreader.epubreader.savePageInfoPosition +import org.dueattendant149.bookreader.epubreader.savePullToTurn +import org.dueattendant149.bookreader.epubreader.savePullToTurnMultiplier +import org.dueattendant149.bookreader.epubreader.saveReaderSettings +import org.dueattendant149.bookreader.epubreader.saveSystemUiMode +import org.dueattendant149.bookreader.pdf.savePdfSystemUiMode +import org.dueattendant149.bookreader.pdf.savePdfThemeId +import org.dueattendant149.bookreader.pdf.savePdfVerticalPageGapVisible +import org.dueattendant149.bookreader.pdf.savePdfPageNumberOverlayVisible +import org.dueattendant149.bookreader.pdf.loadPdfSystemUiMode +import org.dueattendant149.bookreader.pdf.loadPdfThemeId +import org.dueattendant149.bookreader.pdf.loadPdfVerticalPageGapVisible +import org.dueattendant149.bookreader.pdf.loadPdfPageNumberOverlayVisible +import org.dueattendant149.bookreader.shared.BuiltInPdfReaderThemes +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.SharedSettingsAction +import org.dueattendant149.bookreader.shared.SharedSettingsDestination +import org.dueattendant149.bookreader.shared.parentDestination +import org.dueattendant149.bookreader.shared.toReaderSettingsFontFamily +import org.dueattendant149.bookreader.shared.toSharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.readerThemeById +import org.dueattendant149.bookreader.shared.sharedSettingsHubModel +import org.dueattendant149.bookreader.shared.toReaderSettings +import org.dueattendant149.bookreader.shared.ui.SharedSettingsHub +import org.dueattendant149.bookreader.tts.loadTtsMode import kotlinx.coroutines.launch import kotlin.math.max import kotlin.math.roundToInt diff --git a/app/src/main/java/com/aryan/reader/SharedComposables.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/SharedComposables.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/SharedComposables.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/SharedComposables.kt index 5be6d68..db27184 100644 --- a/app/src/main/java/com/aryan/reader/SharedComposables.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/SharedComposables.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ // SharedComposables.kt -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.content.Intent @@ -43,7 +43,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.rememberModalBottomSheetState -import com.aryan.reader.data.TagEntity +import org.dueattendant149.bookreader.data.TagEntity import androidx.compose.material.icons.filled.Search import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -143,14 +143,14 @@ import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.viewinterop.AndroidView import androidx.core.net.toUri import androidx.core.text.HtmlCompat -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedLegalLinks -import com.aryan.reader.shared.SharedLegalProfile -import com.aryan.reader.data.BookMetadataEdit -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.shared.SharedText -import com.aryan.reader.shared.sharedLegalLinksForProfile -import com.aryan.reader.shared.ui.SharedMarkdownText +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedLegalLinks +import org.dueattendant149.bookreader.shared.SharedLegalProfile +import org.dueattendant149.bookreader.data.BookMetadataEdit +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.shared.SharedText +import org.dueattendant149.bookreader.shared.sharedLegalLinksForProfile +import org.dueattendant149.bookreader.shared.ui.SharedMarkdownText import timber.log.Timber import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/com/aryan/reader/SharedModelMappers.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/SharedModelMappers.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/SharedModelMappers.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/SharedModelMappers.kt index 001cd8b..d0c5beb 100644 --- a/app/src/main/java/com/aryan/reader/SharedModelMappers.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/SharedModelMappers.kt @@ -1,22 +1,22 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookShelfCrossRef -import com.aryan.reader.data.BookTagCrossRef -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.ShelfEntity -import com.aryan.reader.data.TagEntity -import com.aryan.reader.shared.BookItem as SharedBookItem -import com.aryan.reader.shared.BookShelfRef as SharedBookShelfRef -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.FileType as SharedFileType -import com.aryan.reader.shared.LibraryFilters as SharedLibraryFilters -import com.aryan.reader.shared.ReaderLocator as SharedReaderLocator -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.Shelf as SharedShelf -import com.aryan.reader.shared.ShelfRecord -import com.aryan.reader.shared.SyncedFolder as SharedSyncedFolder -import com.aryan.reader.shared.Tag as SharedTag -import com.aryan.reader.shared.toStablePositionCfi +import org.dueattendant149.bookreader.data.BookShelfCrossRef +import org.dueattendant149.bookreader.data.BookTagCrossRef +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.ShelfEntity +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.shared.BookItem as SharedBookItem +import org.dueattendant149.bookreader.shared.BookShelfRef as SharedBookShelfRef +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.FileType as SharedFileType +import org.dueattendant149.bookreader.shared.LibraryFilters as SharedLibraryFilters +import org.dueattendant149.bookreader.shared.ReaderLocator as SharedReaderLocator +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.Shelf as SharedShelf +import org.dueattendant149.bookreader.shared.ShelfRecord +import org.dueattendant149.bookreader.shared.SyncedFolder as SharedSyncedFolder +import org.dueattendant149.bookreader.shared.Tag as SharedTag +import org.dueattendant149.bookreader.shared.toStablePositionCfi fun FileType.toSharedFileType(): SharedFileType = this diff --git a/app/src/main/java/com/aryan/reader/StorageTracker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/StorageTracker.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/StorageTracker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/StorageTracker.kt index 5ed62bd..4c8f990 100644 --- a/app/src/main/java/com/aryan/reader/StorageTracker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/StorageTracker.kt @@ -1,5 +1,5 @@ // StorageTracker.kt -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/SyncedFolderPrefs.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefs.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/SyncedFolderPrefs.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefs.kt index db4b379..65f4bda 100644 --- a/app/src/main/java/com/aryan/reader/SyncedFolderPrefs.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefs.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/com/aryan/reader/ThemedBookCover.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ThemedBookCover.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/ThemedBookCover.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ThemedBookCover.kt index 1cfbfcc..d4a73f4 100644 --- a/app/src/main/java/com/aryan/reader/ThemedBookCover.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ThemedBookCover.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -31,7 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem import java.io.File import kotlin.math.absoluteValue diff --git a/app/src/main/java/com/aryan/reader/TtsReplacementStore.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/TtsReplacementStore.kt similarity index 79% rename from app/src/main/java/com/aryan/reader/TtsReplacementStore.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/TtsReplacementStore.kt index 5167ba5..bbdff5c 100644 --- a/app/src/main/java/com/aryan/reader/TtsReplacementStore.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/TtsReplacementStore.kt @@ -1,11 +1,11 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import androidx.core.content.edit -import com.aryan.reader.paginatedreader.TtsChunk -import com.aryan.reader.shared.ReaderTtsReplacementEngine -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTtsReplacementPreferencesJson +import org.dueattendant149.bookreader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementEngine +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferencesJson private const val READER_PREFS_NAME = "reader_prefs" private const val TTS_REPLACEMENTS_KEY = "tts_word_replacements_json" diff --git a/app/src/main/java/com/aryan/reader/TtsWordReplacementsSheet.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/TtsWordReplacementsSheet.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/TtsWordReplacementsSheet.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/TtsWordReplacementsSheet.kt index 75d2c7e..47ec692 100644 --- a/app/src/main/java/com/aryan/reader/TtsWordReplacementsSheet.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/TtsWordReplacementsSheet.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -56,11 +56,11 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ReaderTtsReplacementBookSettings -import com.aryan.reader.shared.ReaderTtsReplacementEngine -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTtsReplacementRule -import com.aryan.reader.shared.ReaderTtsReplacementSuggestions +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementBookSettings +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementEngine +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementRule +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementSuggestions private enum class TtsReplacementScope { Global, diff --git a/app/src/main/java/com/aryan/reader/UiLabelResources.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/UiLabelResources.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/UiLabelResources.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/UiLabelResources.kt index c649619..9a280eb 100644 --- a/app/src/main/java/com/aryan/reader/UiLabelResources.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/UiLabelResources.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.annotation.StringRes import java.text.Normalizer diff --git a/app/src/main/java/com/aryan/reader/data/AppDatabase.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/AppDatabase.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/data/AppDatabase.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/AppDatabase.kt index 485929c..5767976 100644 --- a/app/src/main/java/com/aryan/reader/data/AppDatabase.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/AppDatabase.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import androidx.room.Database diff --git a/app/src/main/java/com/aryan/reader/data/BookMetadataEdit.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/BookMetadataEdit.kt similarity index 79% rename from app/src/main/java/com/aryan/reader/data/BookMetadataEdit.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/BookMetadataEdit.kt index 3e403fe..6d37ea6 100644 --- a/app/src/main/java/com/aryan/reader/data/BookMetadataEdit.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/BookMetadataEdit.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data data class BookMetadataEdit( val title: String?, diff --git a/app/src/main/java/com/aryan/reader/data/CustomFontDao.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontDao.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/data/CustomFontDao.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontDao.kt index 2ce7dc2..4d77445 100644 --- a/app/src/main/java/com/aryan/reader/data/CustomFontDao.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontDao.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Dao import androidx.room.Insert diff --git a/app/src/main/java/com/aryan/reader/data/CustomFontEntity.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontEntity.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/data/CustomFontEntity.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontEntity.kt index 6d1e77b..696a26b 100644 --- a/app/src/main/java/com/aryan/reader/data/CustomFontEntity.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/CustomFontEntity.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/aryan/reader/data/FileTypeConverter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FileTypeConverter.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/data/FileTypeConverter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/FileTypeConverter.kt index 8819888..3ce67d3 100644 --- a/app/src/main/java/com/aryan/reader/data/FileTypeConverter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FileTypeConverter.kt @@ -17,10 +17,10 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.TypeConverter -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType class FileTypeConverter { @TypeConverter diff --git a/app/src/main/java/com/aryan/reader/data/FolderBookMetadata.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadata.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/data/FolderBookMetadata.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadata.kt index 7d5a7a0..19b43a7 100644 --- a/app/src/main/java/com/aryan/reader/data/FolderBookMetadata.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadata.kt @@ -1,8 +1,8 @@ // FolderBookMetadata.kt -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType -import com.aryan.reader.shared.SharedFolderBookMetadata +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.shared.SharedFolderBookMetadata data class FolderBookMetadata( val bookId: String, diff --git a/app/src/main/java/com/aryan/reader/data/FontsRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FontsRepository.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/data/FontsRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/FontsRepository.kt index 9b1f0a9..cdee799 100644 --- a/app/src/main/java/com/aryan/reader/data/FontsRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/FontsRepository.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import android.net.Uri @@ -25,8 +25,8 @@ import android.provider.OpenableColumns import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext -import com.aryan.reader.ReaderFontDiagnosticsTag -import com.aryan.reader.readerFontDiagnosticSummary +import org.dueattendant149.bookreader.ReaderFontDiagnosticsTag +import org.dueattendant149.bookreader.readerFontDiagnosticSummary import timber.log.Timber import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/com/aryan/reader/data/LibraryDaos.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryDaos.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/data/LibraryDaos.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryDaos.kt index 8420722..8bdbefd 100644 --- a/app/src/main/java/com/aryan/reader/data/LibraryDaos.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryDaos.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Dao import androidx.room.Insert diff --git a/app/src/main/java/com/aryan/reader/data/LibraryEntities.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryEntities.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/data/LibraryEntities.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryEntities.kt index 322def1..b005dd6 100644 --- a/app/src/main/java/com/aryan/reader/data/LibraryEntities.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LibraryEntities.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Entity import androidx.room.ForeignKey diff --git a/app/src/main/java/com/aryan/reader/data/LocalSyncUtils.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LocalSyncUtils.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/data/LocalSyncUtils.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/LocalSyncUtils.kt index b077d3b..90ccae3 100644 --- a/app/src/main/java/com/aryan/reader/data/LocalSyncUtils.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/LocalSyncUtils.kt @@ -1,19 +1,19 @@ // LocalSyncUtils.kt -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import android.net.Uri import android.os.Environment import android.provider.DocumentsContract import androidx.documentfile.provider.DocumentFile -import com.aryan.reader.ReaderPerfLog -import com.aryan.reader.shared.LOCAL_FOLDER_SIDECAR_HASH_PREFIX -import com.aryan.reader.shared.LOCAL_FOLDER_SYNC_DATA_DIR -import com.aryan.reader.shared.localFolderSyncAnnotationFileName -import com.aryan.reader.shared.localFolderSyncAnnotationTempFileName -import com.aryan.reader.shared.localFolderSyncMetadataFileName -import com.aryan.reader.shared.localFolderSyncMetadataTempFileName -import com.aryan.reader.shared.localFolderSyncSidecarStem +import org.dueattendant149.bookreader.ReaderPerfLog +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SIDECAR_HASH_PREFIX +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SYNC_DATA_DIR +import org.dueattendant149.bookreader.shared.localFolderSyncAnnotationFileName +import org.dueattendant149.bookreader.shared.localFolderSyncAnnotationTempFileName +import org.dueattendant149.bookreader.shared.localFolderSyncMetadataFileName +import org.dueattendant149.bookreader.shared.localFolderSyncMetadataTempFileName +import org.dueattendant149.bookreader.shared.localFolderSyncSidecarStem import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONObject diff --git a/app/src/main/java/com/aryan/reader/data/PurchaseEntities.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/PurchaseEntities.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/data/PurchaseEntities.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/PurchaseEntities.kt index a3e41b6..4f3f49d 100644 --- a/app/src/main/java/com/aryan/reader/data/PurchaseEntities.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/PurchaseEntities.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data /** * Agnostic representation of a purchase to decouple MainViewModel from Billing Library. diff --git a/app/src/main/java/com/aryan/reader/data/RecentFileDao.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileDao.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/data/RecentFileDao.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileDao.kt index b42d72a..f1c45e7 100644 --- a/app/src/main/java/com/aryan/reader/data/RecentFileDao.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileDao.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ // RecentFileDao.kt -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Dao import androidx.room.Query diff --git a/app/src/main/java/com/aryan/reader/data/RecentFileEntity.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileEntity.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/data/RecentFileEntity.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileEntity.kt index 21be423..500398a 100644 --- a/app/src/main/java/com/aryan/reader/data/RecentFileEntity.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileEntity.kt @@ -17,13 +17,13 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import androidx.room.TypeConverters -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType @Entity(tableName = "recent_files") @TypeConverters(FileTypeConverter::class) diff --git a/app/src/main/java/com/aryan/reader/data/RecentFileItem.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItem.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/data/RecentFileItem.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItem.kt index a080409..3700fb1 100644 --- a/app/src/main/java/com/aryan/reader/data/RecentFileItem.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItem.kt @@ -17,9 +17,9 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType data class RecentFileItem( val bookId: String, diff --git a/app/src/main/java/com/aryan/reader/data/RecentFileItemAndroid.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItemAndroid.kt similarity index 71% rename from app/src/main/java/com/aryan/reader/data/RecentFileItemAndroid.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItemAndroid.kt index 76d5aae..d8b87c5 100644 --- a/app/src/main/java/com/aryan/reader/data/RecentFileItemAndroid.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFileItemAndroid.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.net.Uri import androidx.core.net.toUri diff --git a/app/src/main/java/com/aryan/reader/data/RecentFilesRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepository.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/data/RecentFilesRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepository.kt index 3fcdf45..dcbd7de 100644 --- a/app/src/main/java/com/aryan/reader/data/RecentFilesRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepository.kt @@ -18,27 +18,27 @@ * mail: epistemereader@gmail.com */ // RecentFilesRepository.kt -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri import androidx.core.net.toUri -import com.aryan.reader.FileType -import com.aryan.reader.ReaderPerfLog -import com.aryan.reader.SyncedFolderPrefs -import com.aryan.reader.cloudSyncPreview -import com.aryan.reader.cloudSyncTraceSummary -import com.aryan.reader.logCloudAnnotationSyncTrace -import com.aryan.reader.logCloudSyncTrace -import com.aryan.reader.scaledToCanvasLimit +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.ReaderPerfLog +import org.dueattendant149.bookreader.SyncedFolderPrefs +import org.dueattendant149.bookreader.cloudSyncPreview +import org.dueattendant149.bookreader.cloudSyncTraceSummary +import org.dueattendant149.bookreader.logCloudAnnotationSyncTrace +import org.dueattendant149.bookreader.logCloudSyncTrace +import org.dueattendant149.bookreader.scaledToCanvasLimit import timber.log.Timber -import com.aryan.reader.BookImporter -import com.aryan.reader.cloudSyncAnnotationSummary -import com.aryan.reader.paginatedreader.Locator -import com.aryan.reader.pdf.PdfRichTextRepository -import com.aryan.reader.epub.ImportedFileCache +import org.dueattendant149.bookreader.BookImporter +import org.dueattendant149.bookreader.cloudSyncAnnotationSummary +import org.dueattendant149.bookreader.paginatedreader.Locator +import org.dueattendant149.bookreader.pdf.PdfRichTextRepository +import org.dueattendant149.bookreader.epub.ImportedFileCache import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @@ -46,10 +46,10 @@ import kotlinx.coroutines.withContext import androidx.room.withTransaction import java.io.File import java.io.FileOutputStream -import com.aryan.reader.pdf.data.PdfAnnotationRepository -import com.aryan.reader.pdf.data.PageLayoutRepository -import com.aryan.reader.pdf.data.PdfTextBoxRepository -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.pdf.data.PdfAnnotationRepository +import org.dueattendant149.bookreader.pdf.data.PageLayoutRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextBoxRepository +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec import org.json.JSONObject import org.json.JSONArray import java.util.UUID @@ -71,7 +71,7 @@ class RecentFilesRepository(private val context: Context) { private val pdfRichTextRepository = PdfRichTextRepository(context) private val pageLayoutRepository = PageLayoutRepository(context) private val pdfTextBoxRepository = PdfTextBoxRepository(context) - private val pdfHighlightRepository = com.aryan.reader.pdf.data.PdfHighlightRepository(context) + private val pdfHighlightRepository = org.dueattendant149.bookreader.pdf.data.PdfHighlightRepository(context) val activeShelvesFlow = database.shelfDao().getAllActiveShelves() val shelfCrossRefsFlow = database.shelfDao().getAllBookShelfCrossRefs() diff --git a/app/src/main/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngine.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngine.kt new file mode 100644 index 0000000..270e3b0 --- /dev/null +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngine.kt @@ -0,0 +1,20 @@ +package org.dueattendant149.bookreader.data + +import org.dueattendant149.bookreader.toSharedBookItem +import org.dueattendant149.bookreader.shared.SmartCollectionEngine as SharedSmartCollectionEngine + +typealias SmartField = org.dueattendant149.bookreader.shared.SmartField +typealias SmartOperator = org.dueattendant149.bookreader.shared.SmartOperator +typealias SmartRule = org.dueattendant149.bookreader.shared.SmartRule +typealias SmartCollectionDefinition = org.dueattendant149.bookreader.shared.SmartCollectionDefinition + +object SmartCollectionEngine { + fun toJson(definition: SmartCollectionDefinition): String = + SharedSmartCollectionEngine.toJson(definition) + + fun fromJson(json: String?): SmartCollectionDefinition? = + SharedSmartCollectionEngine.fromJson(json) + + fun evaluate(book: RecentFileItem, definition: SmartCollectionDefinition): Boolean = + SharedSmartCollectionEngine.evaluate(book.toSharedBookItem(), definition) +} diff --git a/app/src/main/java/com/aryan/reader/epub/BitmapSerializer.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/BitmapSerializer.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/epub/BitmapSerializer.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/BitmapSerializer.kt index a94dd51..3a5e736 100644 --- a/app/src/main/java/com/aryan/reader/epub/BitmapSerializer.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/BitmapSerializer.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/aryan/reader/epub/CalibreBundleExtractor.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/CalibreBundleExtractor.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/epub/CalibreBundleExtractor.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/CalibreBundleExtractor.kt index 81a9bf9..5387a2e 100644 --- a/app/src/main/java/com/aryan/reader/epub/CalibreBundleExtractor.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/CalibreBundleExtractor.kt @@ -1,13 +1,13 @@ // CalibreBundleExtractor.kt -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import android.graphics.BitmapFactory import android.net.Uri import androidx.core.net.toUri -import com.aryan.reader.BookImporter -import com.aryan.reader.FileType -import com.aryan.reader.data.RecentFilesRepository +import org.dueattendant149.bookreader.BookImporter +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.data.RecentFilesRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.w3c.dom.Element diff --git a/app/src/main/java/com/aryan/reader/epub/EpubBook.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubBook.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/epub/EpubBook.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubBook.kt index ad07f81..1f2fe85 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubBook.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubBook.kt @@ -17,10 +17,10 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.graphics.Bitmap -import com.aryan.reader.epub.EpubParser.EpubPageTarget +import org.dueattendant149.bookreader.epub.EpubParser.EpubPageTarget import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import java.io.File diff --git a/app/src/main/java/com/aryan/reader/epub/EpubChapter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubChapter.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/epub/EpubChapter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubChapter.kt index c451ca8..8cf739c 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubChapter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubChapter.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/aryan/reader/epub/EpubImage.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubImage.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/epub/EpubImage.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubImage.kt index 2fd2802..bbe9990 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubImage.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubImage.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/aryan/reader/epub/EpubParser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParser.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epub/EpubParser.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParser.kt index 0ba2106..44ffc27 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubParser.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParser.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/aryan/reader/epub/EpubParserException.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParserException.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/epub/EpubParserException.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParserException.kt index b9b0d96..9ff63f3 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubParserException.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubParserException.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub /** diff --git a/app/src/main/java/com/aryan/reader/epub/EpubUtils.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubUtils.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epub/EpubUtils.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubUtils.kt index ff23961..2810710 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubUtils.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubUtils.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import org.w3c.dom.Document import org.w3c.dom.Element diff --git a/app/src/main/java/com/aryan/reader/epub/EpubXMLFileParser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubXMLFileParser.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epub/EpubXMLFileParser.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubXMLFileParser.kt index 0fb9764..532ad77 100644 --- a/app/src/main/java/com/aryan/reader/epub/EpubXMLFileParser.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/EpubXMLFileParser.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import org.jsoup.Jsoup import org.jsoup.nodes.Document diff --git a/app/src/main/java/com/aryan/reader/epub/Fb2Parser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/Fb2Parser.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epub/Fb2Parser.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/Fb2Parser.kt index 404467b..dfc2003 100644 --- a/app/src/main/java/com/aryan/reader/epub/Fb2Parser.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/Fb2Parser.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/aryan/reader/epub/ImportedFileCache.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCache.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epub/ImportedFileCache.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCache.kt index 5199091..a79104f 100644 --- a/app/src/main/java/com/aryan/reader/epub/ImportedFileCache.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCache.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import java.io.File diff --git a/app/src/main/java/com/aryan/reader/epub/MobiParser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/MobiParser.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epub/MobiParser.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/MobiParser.kt index 35fb60f..870d882 100644 --- a/app/src/main/java/com/aryan/reader/epub/MobiParser.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/MobiParser.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/aryan/reader/epub/OdtParser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/OdtParser.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epub/OdtParser.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/OdtParser.kt index 13a3c07..2dbb1d0 100644 --- a/app/src/main/java/com/aryan/reader/epub/OdtParser.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/OdtParser.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/aryan/reader/epub/SingleFileImporter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporter.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epub/SingleFileImporter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporter.kt index e86a0d1..ba109c9 100644 --- a/app/src/main/java/com/aryan/reader/epub/SingleFileImporter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporter.kt @@ -17,10 +17,10 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import com.vladsch.flexmark.ext.autolink.AutolinkExtension import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension @@ -137,7 +137,7 @@ class SingleFileImporter(private val context: Context) { val lowerHint = originalBookNameHint.lowercase() val isCsv = lowerHint.endsWith(".csv") || lowerHint.endsWith(".tsv") || lowerHint.endsWith(".csv.txt") || lowerHint.endsWith(".tsv.txt") - val isCodeOrData = com.aryan.reader.isCodeOrDataFileName(originalBookNameHint) + val isCodeOrData = org.dueattendant149.bookreader.isCodeOrDataFileName(originalBookNameHint) if (type == FileType.HTML && (isCsv || isCodeOrData)) { return parseDynamicContentToHtml(inputStream, originalBookNameHint, bookId, parseContent, isCsv) @@ -747,7 +747,7 @@ class SingleFileImporter(private val context: Context) { if (!originalBookNameHint.endsWith(".txt", ignoreCase = true)) return originalBookNameHint val innerName = originalBookNameHint.dropLast(4) - return if (innerName.contains('.') && com.aryan.reader.isCodeOrDataFileName(innerName)) { + return if (innerName.contains('.') && org.dueattendant149.bookreader.isCodeOrDataFileName(innerName)) { innerName } else { originalBookNameHint diff --git a/app/src/main/java/com/aryan/reader/epubreader/ChapterWebView.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebView.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epubreader/ChapterWebView.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebView.kt index 19fa399..4f20714 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/ChapterWebView.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebView.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ // ChapterWebView.kt -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.annotation.SuppressLint import android.content.ActivityNotFoundException @@ -84,18 +84,18 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.core.net.toUri -import com.aryan.reader.R -import com.aryan.reader.ReaderFontDiagnosticsTag -import com.aryan.reader.copyPlainTextToClipboard -import com.aryan.reader.getReaderTextureDataUri -import com.aryan.reader.readerFontDiagnosticSummary -import com.aryan.reader.shared.detectFontVariant -import com.aryan.reader.shared.familyFilenameSignature -import com.aryan.reader.shared.fontWeightCssDescriptor -import com.aryan.reader.shared.ui.SharedSelectionMenuRect -import com.aryan.reader.shared.ui.SharedSelectionMenuSize -import com.aryan.reader.shared.ui.SharedSelectionMenuViewport -import com.aryan.reader.shared.ui.sharedSelectionMenuPlacement +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.ReaderFontDiagnosticsTag +import org.dueattendant149.bookreader.copyPlainTextToClipboard +import org.dueattendant149.bookreader.getReaderTextureDataUri +import org.dueattendant149.bookreader.readerFontDiagnosticSummary +import org.dueattendant149.bookreader.shared.detectFontVariant +import org.dueattendant149.bookreader.shared.familyFilenameSignature +import org.dueattendant149.bookreader.shared.fontWeightCssDescriptor +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuRect +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuSize +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuViewport +import org.dueattendant149.bookreader.shared.ui.sharedSelectionMenuPlacement import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import org.json.JSONObject diff --git a/app/src/main/java/com/aryan/reader/epubreader/DictionarySettingsDialog.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/DictionarySettingsDialog.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epubreader/DictionarySettingsDialog.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/DictionarySettingsDialog.kt index 2475f83..6122f80 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/DictionarySettingsDialog.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/DictionarySettingsDialog.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -46,9 +46,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.core.graphics.drawable.toBitmap -import com.aryan.reader.R -import com.aryan.reader.areReaderAiFeaturesEnabled -import com.aryan.reader.readerModalMaxHeightDp +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.areReaderAiFeaturesEnabled +import org.dueattendant149.bookreader.readerModalMaxHeightDp @Suppress("KotlinConstantConditions") @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderAi.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAi.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderAi.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAi.kt index 176176e..ea332c6 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderAi.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAi.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import androidx.compose.foundation.layout.fillMaxWidth @@ -31,20 +31,20 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import com.aryan.reader.AiDefinitionPopup -import com.aryan.reader.AiFeature -import com.aryan.reader.AiDefinitionResult -import com.aryan.reader.AiHubBottomSheet -import com.aryan.reader.BuildConfig -import com.aryan.reader.R -import com.aryan.reader.SummarizationResult -import com.aryan.reader.SummaryCacheManager -import com.aryan.reader.callByokTextAi -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.contentFilePath -import com.aryan.reader.fetchRecap -import com.aryan.reader.paginatedreader.IPaginator -import com.aryan.reader.summarizationUrl +import org.dueattendant149.bookreader.AiDefinitionPopup +import org.dueattendant149.bookreader.AiFeature +import org.dueattendant149.bookreader.AiDefinitionResult +import org.dueattendant149.bookreader.AiHubBottomSheet +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.SummarizationResult +import org.dueattendant149.bookreader.SummaryCacheManager +import org.dueattendant149.bookreader.callByokTextAi +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.contentFilePath +import org.dueattendant149.bookreader.fetchRecap +import org.dueattendant149.bookreader.paginatedreader.IPaginator +import org.dueattendant149.bookreader.summarizationUrl import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderAnnotations.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAnnotations.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderAnnotations.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAnnotations.kt index 3390303..41fac2f 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderAnnotations.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderAnnotations.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import android.widget.TextView @@ -69,19 +69,19 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.content.edit import androidx.core.text.HtmlCompat -import com.aryan.reader.R -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.ReaderLocator private const val BOOKMARK_PREFS_NAME = "epub_reader_bookmarks" -typealias Bookmark = com.aryan.reader.shared.EpubBookmark -typealias HighlightColor = com.aryan.reader.shared.HighlightColor -typealias UserHighlight = com.aryan.reader.shared.UserHighlight +typealias Bookmark = org.dueattendant149.bookreader.shared.EpubBookmark +typealias HighlightColor = org.dueattendant149.bookreader.shared.HighlightColor +typealias UserHighlight = org.dueattendant149.bookreader.shared.UserHighlight fun escapeJsString(value: String): String { - return com.aryan.reader.shared.escapeJsString(value) + return org.dueattendant149.bookreader.shared.escapeJsString(value) } fun saveHighlightPalette(context: Context, palette: List) { diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderContent.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContent.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderContent.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContent.kt index e67e4e8..871bf32 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderContent.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContent.kt @@ -17,15 +17,15 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context -import com.aryan.reader.R -import com.aryan.reader.applyBookReplacementsToHtmlDocument -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.contentFilePath -import com.aryan.reader.paginatedreader.LocatorConverter -import com.aryan.reader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.applyBookReplacementsToHtmlDocument +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.contentFilePath +import org.dueattendant149.bookreader.paginatedreader.LocatorConverter +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jsoup.Jsoup diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderControls.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderControls.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderControls.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderControls.kt index 09ffe2c..3bb0ae3 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderControls.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderControls.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.os.Build import androidx.annotation.RequiresApi @@ -116,20 +116,20 @@ import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.zIndex import androidx.media3.common.util.UnstableApi -import com.aryan.reader.BuildConfig -import com.aryan.reader.R -import com.aryan.reader.RenderMode -import com.aryan.reader.SearchState -import com.aryan.reader.SearchTopBar -import com.aryan.reader.TooltipIconButton -import com.aryan.reader.areReaderAiFeaturesEnabled -import com.aryan.reader.loadNativeVoice -import com.aryan.reader.readerSliderStepPage -import com.aryan.reader.shared.ui.ReaderMinimalSlider -import com.aryan.reader.tts.GEMINI_TTS_SPEAKERS -import com.aryan.reader.tts.ReaderTtsOverlaySize -import com.aryan.reader.tts.TtsPlaybackManager.TtsState -import com.aryan.reader.tts.formatReaderTtsChunkLabel +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.SearchState +import org.dueattendant149.bookreader.SearchTopBar +import org.dueattendant149.bookreader.TooltipIconButton +import org.dueattendant149.bookreader.areReaderAiFeaturesEnabled +import org.dueattendant149.bookreader.loadNativeVoice +import org.dueattendant149.bookreader.readerSliderStepPage +import org.dueattendant149.bookreader.shared.ui.ReaderMinimalSlider +import org.dueattendant149.bookreader.tts.GEMINI_TTS_SPEAKERS +import org.dueattendant149.bookreader.tts.ReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsState +import org.dueattendant149.bookreader.tts.formatReaderTtsChunkLabel import kotlin.math.roundToInt enum class ReaderTool(@StringRes val titleRes: Int, val category: String) { @@ -1018,7 +1018,7 @@ fun EpubReaderBottomBar( isTtsSessionActive: Boolean, ttsState: TtsState, isProUser: Boolean, - currentTtsMode: com.aryan.reader.tts.TtsPlaybackManager.TtsMode, + currentTtsMode: org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode, isSliderActive: Boolean, onOpenSlider: () -> Unit, onOpenDrawer: () -> Unit, @@ -2097,9 +2097,9 @@ private fun HiddenEpubToolMenuItem( @OptIn(ExperimentalMaterial3Api::class) @Composable fun TtsOverlayControls( - ttsController: com.aryan.reader.tts.TtsController, + ttsController: org.dueattendant149.bookreader.tts.TtsController, ttsState: TtsState, - currentTtsMode: com.aryan.reader.tts.TtsPlaybackManager.TtsMode, + currentTtsMode: org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode, overlaySize: ReaderTtsOverlaySize, onOverlaySizeChange: (ReaderTtsOverlaySize) -> Unit, onLocateCurrentChunk: () -> Unit, @@ -2114,7 +2114,7 @@ fun TtsOverlayControls( var isDraggingRate by remember { mutableStateOf(false) } var isDraggingPitch by remember { mutableStateOf(false) } - val activeMode = try { com.aryan.reader.tts.TtsPlaybackManager.TtsMode.valueOf(ttsState.ttsMode) } catch(_: Exception) { com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD } + val activeMode = try { org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.valueOf(ttsState.ttsMode) } catch(_: Exception) { org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD } val progressPercent = ttsState.bookProgressPercent val cleanChapterTitle = remember(ttsState.chapterTitle) { ttsState.chapterTitle @@ -2163,7 +2163,7 @@ fun TtsOverlayControls( val saveAndApply = { saveTtsSpeechRate(context, rate) saveTtsPitch(context, pitch) - if (activeMode == com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + if (activeMode == org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { ttsController.setPlaybackParameters(rate, pitch) } else { ttsController.sliceAndRetainPosition() @@ -2357,7 +2357,7 @@ fun TtsOverlayControls( shape = RoundedCornerShape(8.dp) ) { Text( - if (activeMode == com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + if (activeMode == org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { stringResource(R.string.tts_mode_cloud_ai) } else { stringResource(R.string.tts_mode_device_native) @@ -2372,7 +2372,7 @@ fun TtsOverlayControls( color = MaterialTheme.colorScheme.secondaryContainer, shape = RoundedCornerShape(8.dp) ) { - val voiceName = if (activeMode == com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + val voiceName = if (activeMode == org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { GEMINI_TTS_SPEAKERS.find { it.id == ttsState.speakerId }?.name ?: ttsState.speakerId } else loadNativeVoice(context)?.split("-")?.lastOrNull() ?: stringResource(R.string.label_default) @@ -2386,7 +2386,7 @@ fun TtsOverlayControls( ) } - if (BuildConfig.FLAVOR != "oss" && activeMode == com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + if (BuildConfig.FLAVOR != "oss" && activeMode == org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { Surface( color = MaterialTheme.colorScheme.tertiaryContainer, shape = RoundedCornerShape(8.dp) @@ -2554,7 +2554,7 @@ fun TtsOverlayControls( Slider( value = rate, onValueChange = { - rate = it; if (!isDraggingRate && activeMode != com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + rate = it; if (!isDraggingRate && activeMode != org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { isDraggingRate = true; ttsController.pause() } }, @@ -2627,7 +2627,7 @@ fun TtsOverlayControls( Slider( value = pitch, onValueChange = { - pitch = it; if (!isDraggingPitch && activeMode != com.aryan.reader.tts.TtsPlaybackManager.TtsMode.CLOUD) { + pitch = it; if (!isDraggingPitch && activeMode != org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode.CLOUD) { isDraggingPitch = true; ttsController.pause() } }, diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderDrawer.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderDrawer.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderDrawer.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderDrawer.kt index 9cc33de..6efef74 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderDrawer.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderDrawer.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.graphics.BitmapFactory import androidx.compose.animation.animateColorAsState @@ -97,10 +97,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastSumBy -import com.aryan.reader.R -import com.aryan.reader.RenderMode -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.epub.EpubTocEntry +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubTocEntry import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderImages.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImages.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderImages.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImages.kt index cab8d29..d179398 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderImages.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImages.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.paginatedreader.AndroidHtmlResourceResolver +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.paginatedreader.AndroidHtmlResourceResolver import org.jsoup.Jsoup import org.jsoup.nodes.Element import java.io.File diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreen.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreen.kt index 9834106..cfbfd58 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderScreen.kt @@ -22,7 +22,7 @@ "UnusedVariable", "Unused", "SimplifyBooleanWithConstants", "KotlinConstantConditions" ) -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.Manifest import android.annotation.SuppressLint @@ -151,90 +151,90 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.media3.common.util.UnstableApi -import com.aryan.reader.AiDefinitionResult -import com.aryan.reader.BuildConfig -import com.aryan.reader.copyPlainTextToClipboard -import com.aryan.reader.BookWordReplacementsSheet -import com.aryan.reader.BuiltInThemes -import com.aryan.reader.MainViewModel -import com.aryan.reader.R -import com.aryan.reader.ReaderBrightnessEffect -import com.aryan.reader.ReaderFileInfoDialogs -import com.aryan.reader.ReaderBrightnessSheet -import com.aryan.reader.ReaderScreenOrientationEffect -import com.aryan.reader.ReaderScreenOrientationSheet -import com.aryan.reader.ReaderThemePanel -import com.aryan.reader.RenderMode -import com.aryan.reader.SearchResult -import com.aryan.reader.SummarizationResult -import com.aryan.reader.SummaryCacheManager -import com.aryan.reader.TtsSettingsSheet -import com.aryan.reader.TtsWordReplacementsSheet -import com.aryan.reader.areReaderAiFeaturesEnabled -import com.aryan.reader.countWords -import com.aryan.reader.isByokCloudTtsAvailable -import com.aryan.reader.data.CustomFontEntity -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.hasReadableExtractedContent -import com.aryan.reader.epub.plainTextCharacterCount -import com.aryan.reader.fetchAiDefinition -import com.aryan.reader.loadCustomThemes -import com.aryan.reader.loadGlobalTextureTransparency -import com.aryan.reader.loadBookReplacementPreferences -import com.aryan.reader.loadReaderBrightnessSettings -import com.aryan.reader.loadReaderScreenOrientationMode -import com.aryan.reader.loadEpubRightToLeftPagination -import com.aryan.reader.loadReaderThemeId -import com.aryan.reader.loadReaderSliderToggled -import com.aryan.reader.loadReaderTextureBitmap -import com.aryan.reader.loadTtsReplacementPreferences -import com.aryan.reader.readerSliderBookmarkPosition -import com.aryan.reader.readerSliderChromeColors -import com.aryan.reader.readerSliderToggleState -import com.aryan.reader.paginatedreader.CssParser -import com.aryan.reader.paginatedreader.BookPaginator -import com.aryan.reader.paginatedreader.HeaderBlock -import com.aryan.reader.paginatedreader.IPaginator -import com.aryan.reader.paginatedreader.ListItemBlock -import com.aryan.reader.paginatedreader.Locator -import com.aryan.reader.paginatedreader.LocatorConverter -import com.aryan.reader.paginatedreader.NativeVerticalLocation -import com.aryan.reader.paginatedreader.NativeVerticalReaderScreen -import com.aryan.reader.paginatedreader.PaginatedReaderScreen -import com.aryan.reader.paginatedreader.ParagraphBlock -import com.aryan.reader.paginatedreader.QuoteBlock -import com.aryan.reader.paginatedreader.TextContentBlock -import com.aryan.reader.paginatedreader.TtsChunk -import com.aryan.reader.paginatedreader.buildEpubFontFaceCss -import com.aryan.reader.paginatedreader.data.BookCacheDatabase -import com.aryan.reader.paginatedreader.locatorForPersistence -import com.aryan.reader.paginatedreader.nativeVerticalChapterPageInfo -import com.aryan.reader.paginatedreader.nativeVerticalProgressForCompatPage -import com.aryan.reader.paginatedreader.semanticBlockModule -import com.aryan.reader.rememberSearchState -import com.aryan.reader.saveCustomThemes -import com.aryan.reader.saveGlobalTextureTransparency -import com.aryan.reader.saveBookReplacementPreferences -import com.aryan.reader.saveReaderBrightnessSettings -import com.aryan.reader.saveReaderScreenOrientationMode -import com.aryan.reader.saveEpubRightToLeftPagination -import com.aryan.reader.saveReaderThemeId -import com.aryan.reader.saveReaderSliderToggled -import com.aryan.reader.saveTtsReplacementPreferences -import com.aryan.reader.shouldRenderReaderSlider -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderLocator as SharedReaderLocator -import com.aryan.reader.tts.ReaderTtsOverlaySize -import com.aryan.reader.tts.SpeakerSamplePlayer -import com.aryan.reader.tts.TtsPlaybackManager -import com.aryan.reader.tts.loadTtsMode -import com.aryan.reader.tts.loadReaderTtsOverlaySize -import com.aryan.reader.tts.readerTtsOverlayAlignmentBias -import com.aryan.reader.tts.saveReaderTtsOverlaySize -import com.aryan.reader.tts.splitTextIntoChunks -import com.aryan.reader.withTtsReplacements -import com.aryan.reader.shared.reader.ReaderJumpHistory +import org.dueattendant149.bookreader.AiDefinitionResult +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.copyPlainTextToClipboard +import org.dueattendant149.bookreader.BookWordReplacementsSheet +import org.dueattendant149.bookreader.BuiltInThemes +import org.dueattendant149.bookreader.MainViewModel +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.ReaderBrightnessEffect +import org.dueattendant149.bookreader.ReaderFileInfoDialogs +import org.dueattendant149.bookreader.ReaderBrightnessSheet +import org.dueattendant149.bookreader.ReaderScreenOrientationEffect +import org.dueattendant149.bookreader.ReaderScreenOrientationSheet +import org.dueattendant149.bookreader.ReaderThemePanel +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.SummarizationResult +import org.dueattendant149.bookreader.SummaryCacheManager +import org.dueattendant149.bookreader.TtsSettingsSheet +import org.dueattendant149.bookreader.TtsWordReplacementsSheet +import org.dueattendant149.bookreader.areReaderAiFeaturesEnabled +import org.dueattendant149.bookreader.countWords +import org.dueattendant149.bookreader.isByokCloudTtsAvailable +import org.dueattendant149.bookreader.data.CustomFontEntity +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.hasReadableExtractedContent +import org.dueattendant149.bookreader.epub.plainTextCharacterCount +import org.dueattendant149.bookreader.fetchAiDefinition +import org.dueattendant149.bookreader.loadCustomThemes +import org.dueattendant149.bookreader.loadGlobalTextureTransparency +import org.dueattendant149.bookreader.loadBookReplacementPreferences +import org.dueattendant149.bookreader.loadReaderBrightnessSettings +import org.dueattendant149.bookreader.loadReaderScreenOrientationMode +import org.dueattendant149.bookreader.loadEpubRightToLeftPagination +import org.dueattendant149.bookreader.loadReaderThemeId +import org.dueattendant149.bookreader.loadReaderSliderToggled +import org.dueattendant149.bookreader.loadReaderTextureBitmap +import org.dueattendant149.bookreader.loadTtsReplacementPreferences +import org.dueattendant149.bookreader.readerSliderBookmarkPosition +import org.dueattendant149.bookreader.readerSliderChromeColors +import org.dueattendant149.bookreader.readerSliderToggleState +import org.dueattendant149.bookreader.paginatedreader.CssParser +import org.dueattendant149.bookreader.paginatedreader.BookPaginator +import org.dueattendant149.bookreader.paginatedreader.HeaderBlock +import org.dueattendant149.bookreader.paginatedreader.IPaginator +import org.dueattendant149.bookreader.paginatedreader.ListItemBlock +import org.dueattendant149.bookreader.paginatedreader.Locator +import org.dueattendant149.bookreader.paginatedreader.LocatorConverter +import org.dueattendant149.bookreader.paginatedreader.NativeVerticalLocation +import org.dueattendant149.bookreader.paginatedreader.NativeVerticalReaderScreen +import org.dueattendant149.bookreader.paginatedreader.PaginatedReaderScreen +import org.dueattendant149.bookreader.paginatedreader.ParagraphBlock +import org.dueattendant149.bookreader.paginatedreader.QuoteBlock +import org.dueattendant149.bookreader.paginatedreader.TextContentBlock +import org.dueattendant149.bookreader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.paginatedreader.buildEpubFontFaceCss +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDatabase +import org.dueattendant149.bookreader.paginatedreader.locatorForPersistence +import org.dueattendant149.bookreader.paginatedreader.nativeVerticalChapterPageInfo +import org.dueattendant149.bookreader.paginatedreader.nativeVerticalProgressForCompatPage +import org.dueattendant149.bookreader.paginatedreader.semanticBlockModule +import org.dueattendant149.bookreader.rememberSearchState +import org.dueattendant149.bookreader.saveCustomThemes +import org.dueattendant149.bookreader.saveGlobalTextureTransparency +import org.dueattendant149.bookreader.saveBookReplacementPreferences +import org.dueattendant149.bookreader.saveReaderBrightnessSettings +import org.dueattendant149.bookreader.saveReaderScreenOrientationMode +import org.dueattendant149.bookreader.saveEpubRightToLeftPagination +import org.dueattendant149.bookreader.saveReaderThemeId +import org.dueattendant149.bookreader.saveReaderSliderToggled +import org.dueattendant149.bookreader.saveTtsReplacementPreferences +import org.dueattendant149.bookreader.shouldRenderReaderSlider +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderLocator as SharedReaderLocator +import org.dueattendant149.bookreader.tts.ReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.SpeakerSamplePlayer +import org.dueattendant149.bookreader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.tts.loadTtsMode +import org.dueattendant149.bookreader.tts.loadReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.readerTtsOverlayAlignmentBias +import org.dueattendant149.bookreader.tts.saveReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.splitTextIntoChunks +import org.dueattendant149.bookreader.withTtsReplacements +import org.dueattendant149.bookreader.shared.reader.ReaderJumpHistory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -707,7 +707,7 @@ fun EpubReaderHost( var showBrightnessSheet by remember { mutableStateOf(false) } ReaderBrightnessEffect(window, readerBrightnessSettings) - val updateReaderBrightness: (com.aryan.reader.ReaderBrightnessSettings) -> Unit = { settings -> + val updateReaderBrightness: (org.dueattendant149.bookreader.ReaderBrightnessSettings) -> Unit = { settings -> readerBrightnessSettings = settings saveReaderBrightnessSettings(context, settings) } diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSearch.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearch.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderSearch.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearch.kt index 674a4f0..a26e58b 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSearch.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearch.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import timber.log.Timber import android.webkit.WebView @@ -39,14 +39,14 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.aryan.reader.RenderMode -import com.aryan.reader.SearchNavigationControls -import com.aryan.reader.SearchResult -import com.aryan.reader.SearchResultsPanel -import com.aryan.reader.SearchState -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.contentFilePath -import com.aryan.reader.paginatedreader.IPaginator +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.SearchNavigationControls +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.SearchResultsPanel +import org.dueattendant149.bookreader.SearchState +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.contentFilePath +import org.dueattendant149.bookreader.paginatedreader.IPaginator import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSettings.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSettings.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderSettings.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSettings.kt index 6139344..1719297 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSettings.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSettings.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import android.net.Uri @@ -106,29 +106,29 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.edit -import com.aryan.reader.R -import com.aryan.reader.ReaderFontDiagnosticsTag -import com.aryan.reader.data.CustomFontEntity -import com.aryan.reader.readerModalMaxHeightDp -import com.aryan.reader.readerFontDiagnosticSummary -import com.aryan.reader.supportedFontMimeTypes -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.detectFontVariant -import com.aryan.reader.shared.fontFaceSummary -import com.aryan.reader.shared.familyFilenameSignature -import com.aryan.reader.shared.groupByFamily -import com.aryan.reader.shared.hasVariableWeightFace -import com.aryan.reader.shared.supportsVariableWeightAxis +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.ReaderFontDiagnosticsTag +import org.dueattendant149.bookreader.data.CustomFontEntity +import org.dueattendant149.bookreader.readerModalMaxHeightDp +import org.dueattendant149.bookreader.readerFontDiagnosticSummary +import org.dueattendant149.bookreader.supportedFontMimeTypes +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.detectFontVariant +import org.dueattendant149.bookreader.shared.fontFaceSummary +import org.dueattendant149.bookreader.shared.familyFilenameSignature +import org.dueattendant149.bookreader.shared.groupByFamily +import org.dueattendant149.bookreader.shared.hasVariableWeightFace +import org.dueattendant149.bookreader.shared.supportsVariableWeightAxis import timber.log.Timber import java.io.File import kotlin.math.roundToInt -typealias ReaderFont = com.aryan.reader.shared.ReaderFont -typealias ReaderTextAlign = com.aryan.reader.shared.ReaderTextAlign -typealias SystemUiMode = com.aryan.reader.shared.SystemUiMode -typealias PageInfoMode = com.aryan.reader.shared.PageInfoMode -typealias PageInfoPosition = com.aryan.reader.shared.PageInfoPosition -typealias FormatSettings = com.aryan.reader.shared.FormatSettings +typealias ReaderFont = org.dueattendant149.bookreader.shared.ReaderFont +typealias ReaderTextAlign = org.dueattendant149.bookreader.shared.ReaderTextAlign +typealias SystemUiMode = org.dueattendant149.bookreader.shared.SystemUiMode +typealias PageInfoMode = org.dueattendant149.bookreader.shared.PageInfoMode +typealias PageInfoPosition = org.dueattendant149.bookreader.shared.PageInfoPosition +typealias FormatSettings = org.dueattendant149.bookreader.shared.FormatSettings const val SETTINGS_PREFS_NAME = "epub_reader_settings" private const val TEXT_ALIGN_KEY = "reader_text_align" diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSystem.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSystem.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderSystem.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSystem.kt index d0d5e0c..024bbf2 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderSystem.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSystem.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import timber.log.Timber import android.graphics.Color @@ -34,9 +34,9 @@ import androidx.compose.ui.input.key.type import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat -import com.aryan.reader.paginatedreader.AndroidEpubKeyCommand -import com.aryan.reader.paginatedreader.androidEpubKeyCommandOrNull -import com.aryan.reader.RenderMode +import org.dueattendant149.bookreader.paginatedreader.AndroidEpubKeyCommand +import org.dueattendant149.bookreader.paginatedreader.androidEpubKeyCommandOrNull +import org.dueattendant149.bookreader.RenderMode @Composable fun EpubReaderSystemUiController( diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderTts.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTts.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderTts.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTts.kt index 2703448..03f7c6e 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderTts.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTts.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import android.net.Uri @@ -33,15 +33,15 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberUpdatedState import androidx.core.content.edit import androidx.media3.common.util.UnstableApi -import com.aryan.reader.RenderMode -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.paginatedreader.BookPaginator -import com.aryan.reader.paginatedreader.IPaginator -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.tts.TtsController -import com.aryan.reader.tts.TtsPlaybackManager -import com.aryan.reader.tts.TtsPlaybackManager.TtsMode -import com.aryan.reader.withTtsReplacements +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.paginatedreader.BookPaginator +import org.dueattendant149.bookreader.paginatedreader.IPaginator +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.tts.TtsController +import org.dueattendant149.bookreader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode +import org.dueattendant149.bookreader.withTtsReplacements import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -116,8 +116,8 @@ fun TtsSessionObserver( scope: CoroutineScope, currentTtsMode: TtsMode, getAuthToken: suspend () -> String?, - locatorConverter: com.aryan.reader.paginatedreader.LocatorConverter, // NEW - epubBook: com.aryan.reader.epub.EpubBook, // NEW + locatorConverter: org.dueattendant149.bookreader.paginatedreader.LocatorConverter, // NEW + epubBook: org.dueattendant149.bookreader.epub.EpubBook, // NEW ttsReplacementPreferences: ReaderTtsReplacementPreferences, ttsReplacementBookId: String? ) { @@ -312,8 +312,8 @@ private fun handleVerticalAutoAdvance( getAuthToken: suspend () -> String?, ttsController: TtsController, scope: CoroutineScope, - locatorConverter: com.aryan.reader.paginatedreader.LocatorConverter, - epubBook: com.aryan.reader.epub.EpubBook, + locatorConverter: org.dueattendant149.bookreader.paginatedreader.LocatorConverter, + epubBook: org.dueattendant149.bookreader.epub.EpubBook, ttsReplacementPreferences: ReaderTtsReplacementPreferences, ttsReplacementBookId: String? ) { diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderVertical.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVertical.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderVertical.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVertical.kt index 742f599..94506d9 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderVertical.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVertical.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import timber.log.Timber import android.webkit.JavascriptInterface diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsState.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsState.kt similarity index 72% rename from app/src/main/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsState.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsState.kt index febc5d1..e8f440e 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsState.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsState.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.shared.PageInfoMode +import org.dueattendant149.bookreader.shared.PageInfoMode internal fun shouldShowEpubPageInfoBar( pageInfoMode: PageInfoMode, diff --git a/app/src/main/java/com/aryan/reader/epubreader/EpubTtsChunkMatching.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatching.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/epubreader/EpubTtsChunkMatching.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatching.kt index 0fd123e..30cfdfe 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/EpubTtsChunkMatching.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatching.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.paginatedreader.CfiUtils -import com.aryan.reader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.paginatedreader.CfiUtils +import org.dueattendant149.bookreader.paginatedreader.TtsChunk import kotlin.math.abs private val TTS_WHITESPACE = Regex("\\s+") diff --git a/app/src/main/java/com/aryan/reader/epubreader/ExternalDictionaryHelper.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ExternalDictionaryHelper.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epubreader/ExternalDictionaryHelper.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ExternalDictionaryHelper.kt index 1c07dae..64ab62a 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/ExternalDictionaryHelper.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/ExternalDictionaryHelper.kt @@ -1,5 +1,5 @@ // ExternalDictionaryHelper.kt -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.app.SearchManager import android.content.Context @@ -11,7 +11,7 @@ import android.os.Build import android.widget.Toast import timber.log.Timber import androidx.core.net.toUri -import com.aryan.reader.R +import org.dueattendant149.bookreader.R data class ExternalDictionaryApp( val label: String, diff --git a/app/src/main/java/com/aryan/reader/epubreader/InteractiveWebView.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/InteractiveWebView.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/epubreader/InteractiveWebView.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/InteractiveWebView.kt index 6438001..6c21f6c 100644 --- a/app/src/main/java/com/aryan/reader/epubreader/InteractiveWebView.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/epubreader/InteractiveWebView.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/aryan/reader/feedback/FeedbackScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackScreen.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/feedback/FeedbackScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackScreen.kt index c1952fa..e81a80d 100644 --- a/app/src/main/java/com/aryan/reader/feedback/FeedbackScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackScreen.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.feedback +package org.dueattendant149.bookreader.feedback import android.content.Intent import androidx.compose.foundation.layout.Column @@ -56,7 +56,7 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.aryan.reader.R +import org.dueattendant149.bookreader.R import timber.log.Timber private fun launchEmailFeedback(context: android.content.Context) { diff --git a/app/src/main/java/com/aryan/reader/feedback/FeedbackViewModel.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackViewModel.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/feedback/FeedbackViewModel.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackViewModel.kt index 00d5541..d5784d8 100644 --- a/app/src/main/java/com/aryan/reader/feedback/FeedbackViewModel.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackViewModel.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.feedback +package org.dueattendant149.bookreader.feedback import android.app.Application import android.content.Context @@ -26,11 +26,11 @@ import androidx.annotation.StringRes import timber.log.Timber import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.aryan.reader.AuthRepository -import com.aryan.reader.R -import com.aryan.reader.data.FeedbackMessage -import com.aryan.reader.data.FeedbackRepository -import com.aryan.reader.data.FeedbackThread +import org.dueattendant149.bookreader.AuthRepository +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.data.FeedbackMessage +import org.dueattendant149.bookreader.data.FeedbackRepository +import org.dueattendant149.bookreader.data.FeedbackThread import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update diff --git a/app/src/main/java/com/aryan/reader/feedback/FeedbackWorker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackWorker.kt similarity index 91% rename from app/src/main/java/com/aryan/reader/feedback/FeedbackWorker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackWorker.kt index 0d0a702..ef402dd 100644 --- a/app/src/main/java/com/aryan/reader/feedback/FeedbackWorker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/FeedbackWorker.kt @@ -17,20 +17,20 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.feedback +package org.dueattendant149.bookreader.feedback import android.content.Context import android.os.Build import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import androidx.work.workDataOf -import com.aryan.reader.BuildConfig -import com.aryan.reader.data.FeedbackRepository -import com.aryan.reader.data.FeedbackTextPayload +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.data.FeedbackRepository +import org.dueattendant149.bookreader.data.FeedbackTextPayload import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.core.net.toUri -import com.aryan.reader.AuthRepository +import org.dueattendant149.bookreader.AuthRepository class FeedbackWorker( appContext: Context, diff --git a/app/src/main/java/com/aryan/reader/feedback/SupportProjectScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/SupportProjectScreen.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/feedback/SupportProjectScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/feedback/SupportProjectScreen.kt index bf71e09..bee681e 100644 --- a/app/src/main/java/com/aryan/reader/feedback/SupportProjectScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/feedback/SupportProjectScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.feedback +package org.dueattendant149.bookreader.feedback import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -32,7 +32,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController -import com.aryan.reader.R +import org.dueattendant149.bookreader.R @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/aryan/reader/ml/IPanelDetector.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ml/IPanelDetector.kt similarity index 84% rename from app/src/main/java/com/aryan/reader/ml/IPanelDetector.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ml/IPanelDetector.kt index fa3e86b..fe8dcd6 100644 --- a/app/src/main/java/com/aryan/reader/ml/IPanelDetector.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ml/IPanelDetector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.ml +package org.dueattendant149.bookreader.ml import android.graphics.Bitmap import android.graphics.RectF diff --git a/app/src/main/java/com/aryan/reader/ml/ISpeechBubbleDetector.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ml/ISpeechBubbleDetector.kt similarity index 87% rename from app/src/main/java/com/aryan/reader/ml/ISpeechBubbleDetector.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ml/ISpeechBubbleDetector.kt index 1f3dd9e..030cead 100644 --- a/app/src/main/java/com/aryan/reader/ml/ISpeechBubbleDetector.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ml/ISpeechBubbleDetector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.ml +package org.dueattendant149.bookreader.ml import android.graphics.Bitmap import android.graphics.RectF diff --git a/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsModels.kt new file mode 100644 index 0000000..2f53581 --- /dev/null +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsModels.kt @@ -0,0 +1,10 @@ +package org.dueattendant149.bookreader.opds + +typealias OpdsCatalog = org.dueattendant149.bookreader.shared.opds.OpdsCatalog +typealias OpdsFacet = org.dueattendant149.bookreader.shared.opds.OpdsFacet +typealias OpdsFeed = org.dueattendant149.bookreader.shared.opds.OpdsFeed +typealias OpdsAuthor = org.dueattendant149.bookreader.shared.opds.OpdsAuthor +typealias OpdsAcquisition = org.dueattendant149.bookreader.shared.opds.OpdsAcquisition +typealias OpdsEntry = org.dueattendant149.bookreader.shared.opds.OpdsEntry +typealias OpdsDownloadState = org.dueattendant149.bookreader.shared.opds.SharedOpdsDownloadState +typealias OpdsScreenState = org.dueattendant149.bookreader.shared.opds.SharedOpdsScreenState diff --git a/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsParser.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsParser.kt new file mode 100644 index 0000000..d8af46f --- /dev/null +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsParser.kt @@ -0,0 +1,3 @@ +package org.dueattendant149.bookreader.opds + +typealias OpdsParser = org.dueattendant149.bookreader.shared.opds.SharedOpdsParser diff --git a/app/src/main/java/com/aryan/reader/opds/OpdsRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsRepository.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/opds/OpdsRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsRepository.kt index 3223641..b19d280 100644 --- a/app/src/main/java/com/aryan/reader/opds/OpdsRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsRepository.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.opds +package org.dueattendant149.bookreader.opds import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit -import com.aryan.reader.shared.opds.SharedOpdsCatalogs -import com.aryan.reader.shared.opds.SharedOpdsRepository +import org.dueattendant149.bookreader.shared.opds.SharedOpdsCatalogs +import org.dueattendant149.bookreader.shared.opds.SharedOpdsRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.OkHttpClient diff --git a/app/src/main/java/com/aryan/reader/opds/OpdsViewModel.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsViewModel.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/opds/OpdsViewModel.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsViewModel.kt index 08c1f36..55388c2 100644 --- a/app/src/main/java/com/aryan/reader/opds/OpdsViewModel.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/opds/OpdsViewModel.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.opds +package org.dueattendant149.bookreader.opds import android.app.Application import android.content.Context import android.net.Uri import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.aryan.reader.R -import com.aryan.reader.shared.opds.SharedOpdsController -import com.aryan.reader.shared.opds.SharedOpdsDownloadNamer +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.shared.opds.SharedOpdsController +import org.dueattendant149.bookreader.shared.opds.SharedOpdsDownloadNamer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommands.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommands.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommands.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommands.kt index bbfa901..545a622 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommands.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommands.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.view.KeyEvent diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/AndroidHtmlParserPlatform.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlParserPlatform.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/paginatedreader/AndroidHtmlParserPlatform.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlParserPlatform.kt index 77363d7..5e53f5d 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/AndroidHtmlParserPlatform.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlParserPlatform.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.graphics.BitmapFactory import androidx.compose.ui.text.font.FontFamily -import com.aryan.reader.epub.safeFileInRoot +import org.dueattendant149.bookreader.epub.safeFileInRoot import java.io.File import java.net.URLDecoder import java.nio.file.Paths diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/BookPaginator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/BookPaginator.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/paginatedreader/BookPaginator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/BookPaginator.kt index d06b6ac..deffd25 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/BookPaginator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/BookPaginator.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.content.Context import android.os.Build @@ -36,26 +36,26 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density -import com.aryan.reader.SearchResult -import com.aryan.reader.applyBookReplacementsToHtmlDocument -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.epub.contentFilePath -import com.aryan.reader.epub.plainTextCharacterCount -import com.aryan.reader.paginatedreader.data.BookCacheDao -import com.aryan.reader.paginatedreader.data.BookProcessingInput -import com.aryan.reader.paginatedreader.data.BookProcessingWorker -import com.aryan.reader.paginatedreader.data.ConfigurationCache -import com.aryan.reader.paginatedreader.data.LATEST_PAGE_CACHE_VERSION -import com.aryan.reader.paginatedreader.data.LATEST_PROCESSING_VERSION -import com.aryan.reader.paginatedreader.data.PageCacheEntry -import com.aryan.reader.paginatedreader.data.PageIndexEntry -import com.aryan.reader.paginatedreader.data.ProcessedBook -import com.aryan.reader.paginatedreader.data.ProcessedChapter -import com.aryan.reader.paginatedreader.data.SerializableEpubChapter -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderBookReplacementPreferencesJson -import com.aryan.reader.tts.PageCharacterRange -import com.aryan.reader.tts.splitTextIntoChunks +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.applyBookReplacementsToHtmlDocument +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.contentFilePath +import org.dueattendant149.bookreader.epub.plainTextCharacterCount +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDao +import org.dueattendant149.bookreader.paginatedreader.data.BookProcessingInput +import org.dueattendant149.bookreader.paginatedreader.data.BookProcessingWorker +import org.dueattendant149.bookreader.paginatedreader.data.ConfigurationCache +import org.dueattendant149.bookreader.paginatedreader.data.LATEST_PAGE_CACHE_VERSION +import org.dueattendant149.bookreader.paginatedreader.data.LATEST_PROCESSING_VERSION +import org.dueattendant149.bookreader.paginatedreader.data.PageCacheEntry +import org.dueattendant149.bookreader.paginatedreader.data.PageIndexEntry +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedBook +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedChapter +import org.dueattendant149.bookreader.paginatedreader.data.SerializableEpubChapter +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferencesJson +import org.dueattendant149.bookreader.tts.PageCharacterRange +import org.dueattendant149.bookreader.tts.splitTextIntoChunks import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/ContentStyler.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStyler.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/ContentStyler.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStyler.kt index 975845e..f363596 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/ContentStyler.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStyler.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.os.Build import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblings.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblings.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblings.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblings.kt index d3f7264..628f7f6 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblings.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblings.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight -import com.aryan.reader.ReaderFontDiagnosticsTag -import com.aryan.reader.readerFontDiagnosticSummary -import com.aryan.reader.shared.detectFontVariant -import com.aryan.reader.shared.familyFilenameSignature -import com.aryan.reader.shared.fontWeightCssDescriptor +import org.dueattendant149.bookreader.ReaderFontDiagnosticsTag +import org.dueattendant149.bookreader.readerFontDiagnosticSummary +import org.dueattendant149.bookreader.shared.detectFontVariant +import org.dueattendant149.bookreader.shared.familyFilenameSignature +import org.dueattendant149.bookreader.shared.fontWeightCssDescriptor import timber.log.Timber import java.io.File diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/FontLoader.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/FontLoader.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/paginatedreader/FontLoader.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/FontLoader.kt index b94b224..31e4b0a 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/FontLoader.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/FontLoader.kt @@ -17,16 +17,16 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import timber.log.Timber import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight -import com.aryan.reader.ReaderFontDiagnosticsTag -import com.aryan.reader.readerFontDiagnosticSummary -import com.aryan.reader.shared.supportsVariableWeightAxis +import org.dueattendant149.bookreader.ReaderFontDiagnosticsTag +import org.dueattendant149.bookreader.readerFontDiagnosticSummary +import org.dueattendant149.bookreader.shared.supportsVariableWeightAxis import java.io.File import java.security.MessageDigest diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/IPaginator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/IPaginator.kt similarity index 94% rename from app/src/main/java/com/aryan/reader/paginatedreader/IPaginator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/IPaginator.kt index 6f4bddf..442a8ed 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/IPaginator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/IPaginator.kt @@ -17,10 +17,10 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.runtime.Stable -import com.aryan.reader.SearchResult +import org.dueattendant149.bookreader.SearchResult import kotlinx.coroutines.flow.Flow @Stable diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/Locator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Locator.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/paginatedreader/Locator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Locator.kt index ad6de20..04385ce 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/Locator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Locator.kt @@ -17,18 +17,18 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.content.Context import timber.log.Timber import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.epub.contentFilePath -import com.aryan.reader.paginatedreader.data.BookCacheDao -import com.aryan.reader.paginatedreader.data.ProcessedChapter +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.contentFilePath +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDao +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedChapter import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi @@ -316,7 +316,7 @@ class LocatorConverter( fun traverse(blocks: List) { for (block in blocks) { if (block is SemanticTextBlock && block.cfi != null && block.text.isNotBlank()) { - val subChunks = com.aryan.reader.tts.splitTextIntoChunks(block.text) + val subChunks = org.dueattendant149.bookreader.tts.splitTextIntoChunks(block.text) var currentSearchIndex = 0 for (chunkText in subChunks) { val firstWord = chunkText.trim().substringBefore(' ') diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/MathMLRenderer.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/MathMLRenderer.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/MathMLRenderer.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/MathMLRenderer.kt index a55b214..afa7ca5 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/MathMLRenderer.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/MathMLRenderer.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.annotation.SuppressLint import android.content.Context @@ -29,7 +29,7 @@ import android.webkit.JavascriptInterface import android.webkit.WebChromeClient import android.webkit.WebView import android.webkit.WebViewClient -import com.aryan.reader.BuildConfig +import org.dueattendant149.bookreader.BuildConfig import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withTimeoutOrNull diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/PageCountEstimator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimator.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/paginatedreader/PageCountEstimator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimator.kt index d3e0cc1..e5d5803 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/PageCountEstimator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimator.kt @@ -17,13 +17,13 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubChapter import kotlin.math.ceil import kotlin.math.max diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReader.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReader.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReader.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReader.kt index 5686027..c1a369e 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReader.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReader.kt @@ -1,7 +1,7 @@ // PaginatedReader.kt @file:Suppress("VariableNeverRead") -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.annotation.SuppressLint import android.content.ActivityNotFoundException @@ -10,8 +10,8 @@ import android.content.Intent import android.os.Build import android.util.Log import android.widget.Toast -import com.aryan.reader.BuildConfig -import com.aryan.reader.copyPlainTextToClipboard +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.copyPlainTextToClipboard import androidx.compose.ui.unit.isSpecified import androidx.annotation.RequiresApi import androidx.compose.foundation.ExperimentalFoundationApi @@ -160,21 +160,21 @@ import coil.ImageLoader import coil.compose.AsyncImage import coil.imageLoader import coil.request.ImageRequest.Builder -import com.aryan.reader.R -import com.aryan.reader.loadReaderTextureBitmap -import com.aryan.reader.countWords -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.plainTextCharacterCount -import com.aryan.reader.epubreader.HighlightColor -import com.aryan.reader.epubreader.PaginatedTextSelectionMenu -import com.aryan.reader.epubreader.PaletteManagerDialog -import com.aryan.reader.epubreader.ReaderTextAlign -import com.aryan.reader.epubreader.TtsHighlightInfo -import com.aryan.reader.epubreader.UserHighlight -import com.aryan.reader.paginatedreader.data.BookCacheDatabase -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderLocator as SharedReaderLocator -import com.aryan.reader.shared.ui.sharedAcceleratedLazyWheelScroll +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.loadReaderTextureBitmap +import org.dueattendant149.bookreader.countWords +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.plainTextCharacterCount +import org.dueattendant149.bookreader.epubreader.HighlightColor +import org.dueattendant149.bookreader.epubreader.PaginatedTextSelectionMenu +import org.dueattendant149.bookreader.epubreader.PaletteManagerDialog +import org.dueattendant149.bookreader.epubreader.ReaderTextAlign +import org.dueattendant149.bookreader.epubreader.TtsHighlightInfo +import org.dueattendant149.bookreader.epubreader.UserHighlight +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDatabase +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderLocator as SharedReaderLocator +import org.dueattendant149.bookreader.shared.ui.sharedAcceleratedLazyWheelScroll import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModel.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModel.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModel.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModel.kt index 77d1da8..e38ff3b 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReaderViewModel.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderViewModel.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.content.Context import android.os.Build @@ -31,8 +31,8 @@ import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.paginatedreader.data.BookCacheDatabase +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDatabase import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReconfiguration.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfiguration.kt similarity index 75% rename from app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReconfiguration.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfiguration.kt index fe7fa7e..9a4d550 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/PaginatedReconfiguration.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfiguration.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader internal fun resolvePaginatedReconfigurationAnchor( currentPageLocator: Locator?, diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/Paginator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Paginator.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/Paginator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Paginator.kt index 70394cf..aa8302a 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/Paginator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Paginator.kt @@ -17,11 +17,11 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.os.Build import android.util.Log -import com.aryan.reader.BuildConfig +import org.dueattendant149.bookreader.BuildConfig import timber.log.Timber import androidx.annotation.RequiresApi import androidx.compose.ui.text.AnnotatedString diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkDiagnostics.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkDiagnostics.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkDiagnostics.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkDiagnostics.kt index 413228e..fe48f24 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkDiagnostics.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkDiagnostics.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.text.AnnotatedString diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkStyle.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkStyle.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkStyle.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkStyle.kt index eef2832..861ce32 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderLinkStyle.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkStyle.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderNavigationTargets.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargets.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/paginatedreader/ReaderNavigationTargets.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargets.kt index 7a37e57..715b125 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/ReaderNavigationTargets.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargets.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader -import com.aryan.reader.SearchResult +import org.dueattendant149.bookreader.SearchResult internal fun flattenTextContentBlocksForNavigation(blocks: List): List { return blocks.flatMap { block -> diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/RenderThemeApplier.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplier.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/RenderThemeApplier.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplier.kt index 6b830ea..401bbda 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/RenderThemeApplier.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplier.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/StablePaginatedNavigation.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigation.kt similarity index 92% rename from app/src/main/java/com/aryan/reader/paginatedreader/StablePaginatedNavigation.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigation.kt index ae7de84..e83dbd2 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/StablePaginatedNavigation.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigation.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader internal suspend fun resolveStableChapterStartPage( chapterIndex: Int, diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/SvgStringFetcher.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/SvgStringFetcher.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/paginatedreader/SvgStringFetcher.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/SvgStringFetcher.kt index 32a9e2d..91de476 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/SvgStringFetcher.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/SvgStringFetcher.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import timber.log.Timber import coil.decode.DataSource diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/Woff2Converter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Woff2Converter.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/paginatedreader/Woff2Converter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Woff2Converter.kt index 992ab7e..e24fdd2 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/Woff2Converter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/Woff2Converter.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader object Woff2Converter { diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheDatabase.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDatabase.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheDatabase.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDatabase.kt index d0a1e0f..d9d2655 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheDatabase.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDatabase.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader.data +package org.dueattendant149.bookreader.paginatedreader.data import android.content.Context import androidx.room.Dao diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheEntities.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheEntities.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheEntities.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheEntities.kt index f6fe682..4732dcc 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookCacheEntities.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheEntities.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader.data +package org.dueattendant149.bookreader.paginatedreader.data import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookProcessingWorker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookProcessingWorker.kt similarity index 88% rename from app/src/main/java/com/aryan/reader/paginatedreader/data/BookProcessingWorker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookProcessingWorker.kt index 93e4bac..8d8845a 100644 --- a/app/src/main/java/com/aryan/reader/paginatedreader/data/BookProcessingWorker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookProcessingWorker.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader.data +package org.dueattendant149.bookreader.paginatedreader.data import android.content.Context import android.graphics.BitmapFactory @@ -35,18 +35,18 @@ import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import com.aryan.reader.applyBookReplacementsToHtmlDocument -import com.aryan.reader.epub.epubContentFilePath -import com.aryan.reader.paginatedreader.CssParser -import com.aryan.reader.paginatedreader.AndroidHtmlResourceResolver -import com.aryan.reader.paginatedreader.FontFaceInfo -import com.aryan.reader.paginatedreader.MathMLRenderer -import com.aryan.reader.paginatedreader.OptimizedCssRules -import com.aryan.reader.paginatedreader.RenderResult -import com.aryan.reader.paginatedreader.androidHtmlToSemanticBlocks -import com.aryan.reader.paginatedreader.loadFontFamilies -import com.aryan.reader.paginatedreader.semanticBlockModule -import com.aryan.reader.shared.ReaderBookReplacementPreferencesJson +import org.dueattendant149.bookreader.applyBookReplacementsToHtmlDocument +import org.dueattendant149.bookreader.epub.epubContentFilePath +import org.dueattendant149.bookreader.paginatedreader.CssParser +import org.dueattendant149.bookreader.paginatedreader.AndroidHtmlResourceResolver +import org.dueattendant149.bookreader.paginatedreader.FontFaceInfo +import org.dueattendant149.bookreader.paginatedreader.MathMLRenderer +import org.dueattendant149.bookreader.paginatedreader.OptimizedCssRules +import org.dueattendant149.bookreader.paginatedreader.RenderResult +import org.dueattendant149.bookreader.paginatedreader.androidHtmlToSemanticBlocks +import org.dueattendant149.bookreader.paginatedreader.loadFontFamilies +import org.dueattendant149.bookreader.paginatedreader.semanticBlockModule +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferencesJson import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async @@ -349,7 +349,7 @@ class BookProcessingWorker( val allAnchors = mutableListOf() processedChapters.forEach { chapter -> - val blocks = proto.decodeFromByteArray>(chapter.contentBlocksProto) + val blocks = proto.decodeFromByteArray>(chapter.contentBlocksProto) allAnchors.addAll(extractAnchorsFromBlocks(bookId, chapter.chapterIndex, blocks)) } if (allAnchors.isNotEmpty()) { @@ -380,18 +380,18 @@ class BookProcessingWorker( private fun extractAnchorsFromBlocks( bookId: String, chapterIndex: Int, - blocks: List + blocks: List ): List { val anchors = mutableListOf() - fun walk(block: com.aryan.reader.paginatedreader.SemanticBlock) { + fun walk(block: org.dueattendant149.bookreader.paginatedreader.SemanticBlock) { // 1. Check block ID block.elementId?.let { anchors.add(AnchorIndexEntry(bookId, it, chapterIndex, block.blockIndex)) } // 2. Check Span IDs (Inline anchors) - if (block is com.aryan.reader.paginatedreader.SemanticTextBlock) { + if (block is org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock) { block.spans.forEach { span -> span.elementId?.let { anchors.add(AnchorIndexEntry(bookId, it, chapterIndex, block.blockIndex)) @@ -401,10 +401,10 @@ class BookProcessingWorker( // 3. Recurse when (block) { - is com.aryan.reader.paginatedreader.SemanticFlexContainer -> block.children.forEach { walk(it) } - is com.aryan.reader.paginatedreader.SemanticTable -> block.rows.flatten().forEach { cell -> cell.content.forEach { walk(it) } } - is com.aryan.reader.paginatedreader.SemanticList -> block.items.forEach { walk(it) } - is com.aryan.reader.paginatedreader.SemanticWrappingBlock -> { + is org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer -> block.children.forEach { walk(it) } + is org.dueattendant149.bookreader.paginatedreader.SemanticTable -> block.rows.flatten().forEach { cell -> cell.content.forEach { walk(it) } } + is org.dueattendant149.bookreader.paginatedreader.SemanticList -> block.items.forEach { walk(it) } + is org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock -> { walk(block.floatedImage) block.paragraphsToWrap.forEach { walk(it) } } @@ -417,21 +417,21 @@ class BookProcessingWorker( } private fun estimateSemanticPageCount( - blocks: List + blocks: List ): Int { var charCount = 0 - fun walk(block: com.aryan.reader.paginatedreader.SemanticBlock) { + fun walk(block: org.dueattendant149.bookreader.paginatedreader.SemanticBlock) { when (block) { - is com.aryan.reader.paginatedreader.SemanticTextBlock -> { + is org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock -> { charCount += block.text.length } - is com.aryan.reader.paginatedreader.SemanticFlexContainer -> block.children.forEach(::walk) - is com.aryan.reader.paginatedreader.SemanticTable -> { + is org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer -> block.children.forEach(::walk) + is org.dueattendant149.bookreader.paginatedreader.SemanticTable -> { block.rows.forEach { row -> row.forEach { cell -> cell.content.forEach(::walk) } } } - is com.aryan.reader.paginatedreader.SemanticList -> block.items.forEach(::walk) - is com.aryan.reader.paginatedreader.SemanticWrappingBlock -> block.paragraphsToWrap.forEach(::walk) + is org.dueattendant149.bookreader.paginatedreader.SemanticList -> block.items.forEach(::walk) + is org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock -> block.paragraphsToWrap.forEach(::walk) else -> Unit } } diff --git a/app/src/main/java/com/aryan/reader/pdf/AnnotationDock.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/AnnotationDock.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/AnnotationDock.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/AnnotationDock.kt index 2d83401..5ed1400 100644 --- a/app/src/main/java/com/aryan/reader/pdf/AnnotationDock.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/AnnotationDock.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateFloatAsState @@ -75,7 +75,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import com.aryan.reader.R +import org.dueattendant149.bookreader.R @Composable fun AnnotationDock( diff --git a/app/src/main/java/com/aryan/reader/pdf/DemoAnnotationGenerator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/DemoAnnotationGenerator.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/DemoAnnotationGenerator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/DemoAnnotationGenerator.kt index 852ee9d..76a7a20 100644 --- a/app/src/main/java/com/aryan/reader/pdf/DemoAnnotationGenerator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/DemoAnnotationGenerator.kt @@ -17,12 +17,12 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Path import androidx.compose.ui.graphics.Color import androidx.core.graphics.PathParser -import com.aryan.reader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation object DemoAnnotationGenerator { diff --git a/app/src/main/java/com/aryan/reader/pdf/MagnifierComposable.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/MagnifierComposable.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/MagnifierComposable.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/MagnifierComposable.kt index e2612c9..30abf7e 100644 --- a/app/src/main/java/com/aryan/reader/pdf/MagnifierComposable.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/MagnifierComposable.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Rect import android.graphics.RectF diff --git a/app/src/main/java/com/aryan/reader/pdf/NativePdfiumBridge.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/NativePdfiumBridge.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/pdf/NativePdfiumBridge.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/NativePdfiumBridge.kt index b5a6ac0..6c73ce2 100644 --- a/app/src/main/java/com/aryan/reader/pdf/NativePdfiumBridge.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/NativePdfiumBridge.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf -import com.aryan.reader.shared.pdf.PdfiumAnnotationSubtype +import org.dueattendant149.bookreader.shared.pdf.PdfiumAnnotationSubtype object NativePdfiumBridge { init { diff --git a/app/src/main/java/com/aryan/reader/pdf/OcrModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/OcrModels.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/pdf/OcrModels.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/OcrModels.kt index b7e4dc5..af5e1f7 100644 --- a/app/src/main/java/com/aryan/reader/pdf/OcrModels.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/OcrModels.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.ocr +package org.dueattendant149.bookreader.pdf.ocr import android.graphics.Rect diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfAnnotationModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationModels.kt similarity index 83% rename from app/src/main/java/com/aryan/reader/pdf/PdfAnnotationModels.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationModels.kt index af6df30..c18ce01 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfAnnotationModels.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfAnnotationModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf enum class AnnotationType { INK, TEXT diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfBubblePrefetch.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubblePrefetch.kt similarity index 94% rename from app/src/main/java/com/aryan/reader/pdf/PdfBubblePrefetch.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubblePrefetch.kt index 6c19bcd..36319d8 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfBubblePrefetch.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubblePrefetch.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf internal const val PDF_BUBBLE_PREFETCH_RADIUS = 1 diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfBubbleZoom.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubbleZoom.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/PdfBubbleZoom.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubbleZoom.kt index ce292e3..1515351 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfBubbleZoom.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfBubbleZoom.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Bitmap import android.graphics.RectF import androidx.core.graphics.createBitmap -import com.aryan.reader.ml.SpeechBubble +import org.dueattendant149.bookreader.ml.SpeechBubble import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfCoverGenerator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGenerator.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfCoverGenerator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGenerator.kt index 2611dd5..7b72a67 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfCoverGenerator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfCoverGenerator.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfDialogs.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDialogs.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfDialogs.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDialogs.kt index 10f6fd9..28226db 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfDialogs.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDialogs.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -38,7 +38,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.dp -import com.aryan.reader.R +import org.dueattendant149.bookreader.R @Composable internal fun PasswordDialog(isError: Boolean, onDismiss: () -> Unit, onConfirm: (String) -> Unit) { diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfDocumentUtils.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDocumentUtils.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfDocumentUtils.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDocumentUtils.kt index 386f4ea..a2c4b14 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfDocumentUtils.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDocumentUtils.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Bitmap @@ -13,8 +13,8 @@ import android.print.PrintDocumentInfo import android.provider.OpenableColumns import android.util.LruCache import androidx.core.graphics.createBitmap -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox import io.legere.pdfiumandroid.suspend.PdfiumCoreKt import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfDrawer.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDrawer.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfDrawer.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDrawer.kt index ebfe680..88ecfa1 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfDrawer.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfDrawer.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.Image @@ -73,7 +73,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.R +import org.dueattendant149.bookreader.R import io.legere.pdfiumandroid.api.Bookmark import io.legere.pdfiumandroid.suspend.PdfDocumentKt import kotlinx.coroutines.delay @@ -82,9 +82,9 @@ import kotlinx.coroutines.withContext import org.json.JSONArray import timber.log.Timber import androidx.core.graphics.createBitmap -import com.aryan.reader.cardTitle -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.cardTitle +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.pdf.data.VirtualPage private const val MAX_FIXED_RECURSION = 128 diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfEmbeddedAnnotations.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfEmbeddedAnnotations.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/PdfEmbeddedAnnotations.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfEmbeddedAnnotations.kt index bf62806..08d8a38 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfEmbeddedAnnotations.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfEmbeddedAnnotations.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.RectF import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfExporter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfExporter.kt similarity index 100% rename from app/src/main/java/com/aryan/reader/pdf/PdfExporter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfExporter.kt diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfHelper.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfHelper.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfHelper.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfHelper.kt index e840f3c..08d7f07 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfHelper.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfHelper.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Bitmap import android.graphics.Rect @@ -90,17 +90,17 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties -import com.aryan.reader.OcrEngine -import com.aryan.reader.R -import com.aryan.reader.pdf.ocr.OcrElement -import com.aryan.reader.pdf.ocr.OcrLine -import com.aryan.reader.pdf.ocr.OcrResult -import com.aryan.reader.pdf.ocr.OcrSymbol -import com.aryan.reader.shared.pdf.DEFAULT_SHARED_PDF_COMMENT_AUTHOR -import com.aryan.reader.shared.pdf.SharedPdfAnnotationComment -import com.aryan.reader.shared.pdf.pdfCommentChildren -import com.aryan.reader.shared.pdf.visiblePdfAnnotationComments -import com.aryan.reader.shared.pdf.withoutPdfCommentThread +import org.dueattendant149.bookreader.OcrEngine +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.pdf.ocr.OcrElement +import org.dueattendant149.bookreader.pdf.ocr.OcrLine +import org.dueattendant149.bookreader.pdf.ocr.OcrResult +import org.dueattendant149.bookreader.pdf.ocr.OcrSymbol +import org.dueattendant149.bookreader.shared.pdf.DEFAULT_SHARED_PDF_COMMENT_AUTHOR +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationComment +import org.dueattendant149.bookreader.shared.pdf.pdfCommentChildren +import org.dueattendant149.bookreader.shared.pdf.visiblePdfAnnotationComments +import org.dueattendant149.bookreader.shared.pdf.withoutPdfCommentThread import timber.log.Timber import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfModels.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfModels.kt similarity index 55% rename from app/src/main/java/com/aryan/reader/pdf/PdfModels.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfModels.kt index 0831a0b..bde90c7 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfModels.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfModels.kt @@ -1,24 +1,24 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.annotation.OptIn import androidx.core.content.edit import androidx.media3.common.util.UnstableApi -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.tts.TtsPlaybackManager -internal typealias SaveMode = com.aryan.reader.shared.SaveMode +internal typealias SaveMode = org.dueattendant149.bookreader.shared.SaveMode -typealias SearchHighlightMode = com.aryan.reader.shared.SearchHighlightMode +typealias SearchHighlightMode = org.dueattendant149.bookreader.shared.SearchHighlightMode internal sealed interface HistoryAction { data class Add(val pageIndex: Int, val annotation: PdfAnnotation) : HistoryAction data class Remove(val items: Map>) : HistoryAction } -internal typealias DockLocation = com.aryan.reader.shared.DockLocation +internal typealias DockLocation = org.dueattendant149.bookreader.shared.DockLocation -internal typealias DisplayMode = com.aryan.reader.shared.PdfDisplayMode +internal typealias DisplayMode = org.dueattendant149.bookreader.shared.PdfDisplayMode @OptIn(UnstableApi::class) @Suppress("unused") diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfNavigationUI.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfNavigationUI.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfNavigationUI.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfNavigationUI.kt index 998d4ad..f731406 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfNavigationUI.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfNavigationUI.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState @@ -42,7 +42,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.unit.dp -import com.aryan.reader.R +import org.dueattendant149.bookreader.R private data class ScrollbarCalculations( val thumbHeight: Float, diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfOneHandZoom.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoom.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfOneHandZoom.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoom.kt index ee5afc4..a1f3a32 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfOneHandZoom.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoom.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPageAnnotationRemapping.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageAnnotationRemapping.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/pdf/PdfPageAnnotationRemapping.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageAnnotationRemapping.kt index 50ae6e1..d64bfd4 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPageAnnotationRemapping.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageAnnotationRemapping.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPageComposable.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageComposable.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfPageComposable.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageComposable.kt index 1a44fe5..3399fdc 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPageComposable.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageComposable.kt @@ -2,7 +2,7 @@ @file:Suppress( "RemoveRedundantQualifierName", "COMPOSE_APPLIER_CALL_MISMATCH", "UnusedVariable", "unused" ) -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Bitmap import android.graphics.BitmapShader @@ -117,20 +117,20 @@ import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.zIndex import androidx.core.graphics.createBitmap import androidx.core.graphics.scale -import com.aryan.reader.R -import com.aryan.reader.SearchResult -import com.aryan.reader.isCanvasSafeBitmap -import com.aryan.reader.loadReaderTextureBitmap -import com.aryan.reader.ml.SpeechBubble -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.pdf.ocr.OcrElement -import com.aryan.reader.pdf.ocr.OcrResult -import com.aryan.reader.shared.ui.SharedSelectionMenuRect -import com.aryan.reader.shared.ui.SharedSelectionMenuSize -import com.aryan.reader.shared.ui.SharedSelectionMenuViewport -import com.aryan.reader.shared.ui.sharedSelectionMenuPlacement +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.isCanvasSafeBitmap +import org.dueattendant149.bookreader.loadReaderTextureBitmap +import org.dueattendant149.bookreader.ml.SpeechBubble +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.ocr.OcrElement +import org.dueattendant149.bookreader.pdf.ocr.OcrResult +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuRect +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuSize +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuViewport +import org.dueattendant149.bookreader.shared.ui.sharedSelectionMenuPlacement import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.Job @@ -266,7 +266,7 @@ internal fun PdfPageComposable( resetZoomTrigger: Long = 0L, onTtsHighlightCenterCalculated: ((Float) -> Unit)? = null, onSearchHighlightCenterCalculated: ((Float) -> Unit)? = null, - activeTheme: com.aryan.reader.ReaderTheme = com.aryan.reader.ReaderTheme("no_theme", "No Theme", Color.Unspecified, Color.Unspecified, false), + activeTheme: org.dueattendant149.bookreader.ReaderTheme = org.dueattendant149.bookreader.ReaderTheme("no_theme", "No Theme", Color.Unspecified, Color.Unspecified, false), activeTextureAlpha: Float = 0.55f, excludeImages: Boolean = false, onDoubleTap: ((Offset) -> Unit)? = null, diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPageLayoutDebug.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLayoutDebug.kt similarity index 89% rename from app/src/main/java/com/aryan/reader/pdf/PdfPageLayoutDebug.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLayoutDebug.kt index fd22157..e376c40 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPageLayoutDebug.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLayoutDebug.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.VirtualPage internal const val PDF_BLANK_PAGE_PERSISTENCE_TAG = "PdfBlankPagePersist" diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPageLinks.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLinks.kt similarity index 85% rename from app/src/main/java/com/aryan/reader/pdf/PdfPageLinks.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLinks.kt index 72e0f04..3bc074d 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPageLinks.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageLinks.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Rect -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.VirtualPage enum class LinkSource { ANNOTATION, TEXT_CONTENT diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPageRenderResources.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageRenderResources.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfPageRenderResources.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageRenderResources.kt index 4b406db..eabb202 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPageRenderResources.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPageRenderResources.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Bitmap import android.graphics.Rect @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.core.graphics.createBitmap import androidx.core.graphics.set -import com.aryan.reader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation import timber.log.Timber import java.util.concurrent.ConcurrentLinkedQueue import kotlin.math.PI diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfPreferences.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPreferences.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfPreferences.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPreferences.kt index 5b0b9f4..101a527 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfPreferences.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfPreferences.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.annotation.StringRes @@ -6,11 +6,11 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.core.content.edit -import com.aryan.reader.BuildConfig -import com.aryan.reader.R -import com.aryan.reader.epubreader.SystemUiMode -import com.aryan.reader.shared.BuiltInPdfReaderThemes -import com.aryan.reader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.epubreader.SystemUiMode +import org.dueattendant149.bookreader.shared.BuiltInPdfReaderThemes +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode internal const val VERTICAL_SCROLL_TAG = "PdfVerticalScroll" internal const val SETTINGS_PREFS_NAME = "epub_reader_settings" diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfSearchUI.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSearchUI.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfSearchUI.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSearchUI.kt index f0bbb43..fdd6bd2 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfSearchUI.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSearchUI.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -41,8 +41,8 @@ import androidx.compose.ui.unit.dp import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.itemContentType -import com.aryan.reader.R -import com.aryan.reader.SearchResult +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.SearchResult @Composable internal fun SearchNavigationPill( diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfSettingsSheets.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSettingsSheets.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfSettingsSheets.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSettingsSheets.kt index 6cc32b7..b3b5952 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfSettingsSheets.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfSettingsSheets.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.foundation.clickable import androidx.annotation.StringRes @@ -74,12 +74,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import com.aryan.reader.R -import com.aryan.reader.epubreader.OptionSegmentedControl -import com.aryan.reader.epubreader.SystemUiMode -import com.aryan.reader.epubreader.titleRes -import com.aryan.reader.readerModalMaxHeightDp -import com.aryan.reader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.epubreader.OptionSegmentedControl +import org.dueattendant149.bookreader.epubreader.SystemUiMode +import org.dueattendant149.bookreader.epubreader.titleRes +import org.dueattendant149.bookreader.readerModalMaxHeightDp +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode enum class PdfFlatItemType { SECTION_HEADER, TOOL, EMPTY_PLACEHOLDER, MORE_HEADER, MORE_TOOL } diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfTextBox.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfTextBox.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfTextBox.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfTextBox.kt index 4686c32..017e411 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfTextBox.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfTextBox.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -47,7 +47,7 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.aryan.reader.R +import org.dueattendant149.bookreader.R import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.geometry.Offset @@ -71,7 +71,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import com.aryan.reader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.PdfTextBox import timber.log.Timber import kotlin.math.roundToInt diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfToHtmlGenerator.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToHtmlGenerator.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfToHtmlGenerator.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToHtmlGenerator.kt index f613fd5..e1e27a4 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfToHtmlGenerator.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToHtmlGenerator.kt @@ -1,5 +1,5 @@ // PdfToHtmlGenerator.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfToolbars.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToolbars.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfToolbars.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToolbars.kt index 7f34d34..baa4855 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfToolbars.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfToolbars.kt @@ -1,5 +1,5 @@ // PdfToolbars.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -13,7 +13,7 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFileItem import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -37,15 +37,15 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.sp -import com.aryan.reader.BuildConfig -import com.aryan.reader.FileType -import com.aryan.reader.R -import com.aryan.reader.SearchState -import com.aryan.reader.SearchTopBar -import com.aryan.reader.TooltipIconButton -import com.aryan.reader.areReaderAiFeaturesEnabled -import com.aryan.reader.cardTitle -import com.aryan.reader.epubreader.SystemUiMode +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.SearchState +import org.dueattendant149.bookreader.SearchTopBar +import org.dueattendant149.bookreader.TooltipIconButton +import org.dueattendant149.bookreader.areReaderAiFeaturesEnabled +import org.dueattendant149.bookreader.cardTitle +import org.dueattendant149.bookreader.epubreader.SystemUiMode import kotlin.collections.isNotEmpty internal val PdfTabStripHeight = 44.dp diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfVerticalPerfLog.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalPerfLog.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/pdf/PdfVerticalPerfLog.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalPerfLog.kt index 7eee3f1..17d8b60 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfVerticalPerfLog.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalPerfLog.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import timber.log.Timber import kotlin.math.roundToInt diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfVerticalReader.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReader.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PdfVerticalReader.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReader.kt index 63cd25f..d6683a2 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfVerticalReader.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReader.kt @@ -20,7 +20,7 @@ // PdfVerticalReader.kt @file:Suppress("COMPOSE_APPLIER_CALL_MISMATCH", "VariableNeverRead") -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.annotation.SuppressLint import android.graphics.Bitmap @@ -108,13 +108,13 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.zIndex -import com.aryan.reader.SearchResult -import com.aryan.reader.ml.SpeechBubble -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.shared.pdf.calculatePdfVerticalPageLayoutPx -import com.aryan.reader.shared.pdf.pdfVerticalPageGapDp +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.ml.SpeechBubble +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.shared.pdf.calculatePdfVerticalPageLayoutPx +import org.dueattendant149.bookreader.shared.pdf.pdfVerticalPageGapDp import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.coroutineScope @@ -132,7 +132,7 @@ private const val SCROLL_BOUNDS_TAG = "PdfScrollBounds" private const val VERTICAL_TILE_RENDER_IDLE_COOLDOWN_MS = 220L internal fun resolvePdfVerticalPageBackgroundColor( - activeTheme: com.aryan.reader.ReaderTheme + activeTheme: org.dueattendant149.bookreader.ReaderTheme ): Color { val resolved = when (activeTheme.id) { "no_theme", "system" -> Color.White @@ -261,7 +261,7 @@ internal fun PdfVerticalReader( state: VerticalPdfReaderState, pdfDocument: StableHolder, documentKey: String, - activeTheme: com.aryan.reader.ReaderTheme, + activeTheme: org.dueattendant149.bookreader.ReaderTheme, activeTextureAlpha: Float = 0.55f, excludeImages: Boolean = false, totalPages: Int, diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfViewerScreen.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreen.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfViewerScreen.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreen.kt index c501ce2..130f591 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfViewerScreen.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerScreen.kt @@ -22,7 +22,7 @@ "SimplifyBooleanWithConstants" ) @file:kotlin.OptIn(ExperimentalMaterial3Api::class) -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.Manifest import android.annotation.SuppressLint @@ -209,86 +209,86 @@ import androidx.lifecycle.viewModelScope import androidx.media3.common.util.UnstableApi import androidx.paging.compose.collectAsLazyPagingItems import androidx.work.WorkInfo -import com.aryan.reader.AiDefinitionPopup -import com.aryan.reader.AiDefinitionResult -import com.aryan.reader.AiFeature -import com.aryan.reader.AiHubBottomSheet -import com.aryan.reader.BuildConfig -import com.aryan.reader.COMIC_ARCHIVE_FILE_TYPES -import com.aryan.reader.FileType -import com.aryan.reader.HighlightColorPickerDialog -import com.aryan.reader.MainViewModel -import com.aryan.reader.R -import com.aryan.reader.ReaderBrightnessEffect -import com.aryan.reader.ReaderBrightnessSheet -import com.aryan.reader.ReaderFileInfoDialogs -import com.aryan.reader.ReaderScreenOrientationEffect -import com.aryan.reader.ReaderScreenOrientationSheet -import com.aryan.reader.ReaderThemePanel -import com.aryan.reader.SearchResult -import com.aryan.reader.SummarizationResult -import com.aryan.reader.SummaryCacheManager -import com.aryan.reader.TtsSettingsSheet -import com.aryan.reader.TtsWordReplacementsSheet -import com.aryan.reader.areReaderAiFeaturesEnabled -import com.aryan.reader.callByokGeminiInlineAi -import com.aryan.reader.epubreader.AutoScrollControls -import com.aryan.reader.epubreader.DictionarySettingsDialog -import com.aryan.reader.epubreader.ExternalDictionaryHelper -import com.aryan.reader.epubreader.SystemUiMode -import com.aryan.reader.epubreader.TtsOverlayControls -import com.aryan.reader.epubreader.loadTapToNavigateSetting -import com.aryan.reader.epubreader.saveTapToNavigateSetting -import com.aryan.reader.fetchAiDefinition -import com.aryan.reader.isByokCloudTtsAvailable -import com.aryan.reader.loadCustomThemes -import com.aryan.reader.loadGlobalTextureTransparency -import com.aryan.reader.loadPdfRightToLeftPagination -import com.aryan.reader.loadReaderBrightnessSettings -import com.aryan.reader.loadReaderScreenOrientationMode -import com.aryan.reader.loadReaderSliderToggled -import com.aryan.reader.loadTtsReplacementPreferences -import com.aryan.reader.logCloudAnnotationSyncTrace -import com.aryan.reader.ml.SpeechBubble -import com.aryan.reader.paginatedreader.TtsChunk -import com.aryan.reader.pdf.data.AnnotationSettingsRepository -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfAnnotationRepository -import com.aryan.reader.pdf.data.PdfHighlightRepository -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.PdfTextBoxRepository -import com.aryan.reader.pdf.data.PdfTextRepository -import com.aryan.reader.pdf.data.SmartSearchResult -import com.aryan.reader.pdf.data.TextStyleConfig -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.readerSliderBookmarkPosition -import com.aryan.reader.readerSliderChromeColors -import com.aryan.reader.readerSliderStepPage -import com.aryan.reader.readerSliderToggleState -import com.aryan.reader.rememberSearchState -import com.aryan.reader.saveCustomThemes -import com.aryan.reader.saveGlobalTextureTransparency -import com.aryan.reader.savePdfRightToLeftPagination -import com.aryan.reader.saveReaderBrightnessSettings -import com.aryan.reader.saveReaderScreenOrientationMode -import com.aryan.reader.saveReaderSliderToggled -import com.aryan.reader.saveTtsReplacementPreferences -import com.aryan.reader.scaledToCanvasLimit -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.pdf.PdfSpreadLayout -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.ui.ReaderMinimalSlider -import com.aryan.reader.shouldRenderReaderSlider -import com.aryan.reader.summarizationUrl -import com.aryan.reader.tts.ReaderTtsOverlaySize -import com.aryan.reader.tts.SpeakerSamplePlayer -import com.aryan.reader.tts.TtsPlaybackManager -import com.aryan.reader.tts.loadReaderTtsOverlaySize -import com.aryan.reader.tts.readerTtsOverlayAlignmentBias -import com.aryan.reader.tts.rememberTtsController -import com.aryan.reader.tts.saveReaderTtsOverlaySize -import com.aryan.reader.tts.splitTextIntoChunks -import com.aryan.reader.withTtsReplacements +import org.dueattendant149.bookreader.AiDefinitionPopup +import org.dueattendant149.bookreader.AiDefinitionResult +import org.dueattendant149.bookreader.AiFeature +import org.dueattendant149.bookreader.AiHubBottomSheet +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.COMIC_ARCHIVE_FILE_TYPES +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.HighlightColorPickerDialog +import org.dueattendant149.bookreader.MainViewModel +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.ReaderBrightnessEffect +import org.dueattendant149.bookreader.ReaderBrightnessSheet +import org.dueattendant149.bookreader.ReaderFileInfoDialogs +import org.dueattendant149.bookreader.ReaderScreenOrientationEffect +import org.dueattendant149.bookreader.ReaderScreenOrientationSheet +import org.dueattendant149.bookreader.ReaderThemePanel +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.SummarizationResult +import org.dueattendant149.bookreader.SummaryCacheManager +import org.dueattendant149.bookreader.TtsSettingsSheet +import org.dueattendant149.bookreader.TtsWordReplacementsSheet +import org.dueattendant149.bookreader.areReaderAiFeaturesEnabled +import org.dueattendant149.bookreader.callByokGeminiInlineAi +import org.dueattendant149.bookreader.epubreader.AutoScrollControls +import org.dueattendant149.bookreader.epubreader.DictionarySettingsDialog +import org.dueattendant149.bookreader.epubreader.ExternalDictionaryHelper +import org.dueattendant149.bookreader.epubreader.SystemUiMode +import org.dueattendant149.bookreader.epubreader.TtsOverlayControls +import org.dueattendant149.bookreader.epubreader.loadTapToNavigateSetting +import org.dueattendant149.bookreader.epubreader.saveTapToNavigateSetting +import org.dueattendant149.bookreader.fetchAiDefinition +import org.dueattendant149.bookreader.isByokCloudTtsAvailable +import org.dueattendant149.bookreader.loadCustomThemes +import org.dueattendant149.bookreader.loadGlobalTextureTransparency +import org.dueattendant149.bookreader.loadPdfRightToLeftPagination +import org.dueattendant149.bookreader.loadReaderBrightnessSettings +import org.dueattendant149.bookreader.loadReaderScreenOrientationMode +import org.dueattendant149.bookreader.loadReaderSliderToggled +import org.dueattendant149.bookreader.loadTtsReplacementPreferences +import org.dueattendant149.bookreader.logCloudAnnotationSyncTrace +import org.dueattendant149.bookreader.ml.SpeechBubble +import org.dueattendant149.bookreader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.pdf.data.AnnotationSettingsRepository +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotationRepository +import org.dueattendant149.bookreader.pdf.data.PdfHighlightRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.PdfTextBoxRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextRepository +import org.dueattendant149.bookreader.pdf.data.SmartSearchResult +import org.dueattendant149.bookreader.pdf.data.TextStyleConfig +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.readerSliderBookmarkPosition +import org.dueattendant149.bookreader.readerSliderChromeColors +import org.dueattendant149.bookreader.readerSliderStepPage +import org.dueattendant149.bookreader.readerSliderToggleState +import org.dueattendant149.bookreader.rememberSearchState +import org.dueattendant149.bookreader.saveCustomThemes +import org.dueattendant149.bookreader.saveGlobalTextureTransparency +import org.dueattendant149.bookreader.savePdfRightToLeftPagination +import org.dueattendant149.bookreader.saveReaderBrightnessSettings +import org.dueattendant149.bookreader.saveReaderScreenOrientationMode +import org.dueattendant149.bookreader.saveReaderSliderToggled +import org.dueattendant149.bookreader.saveTtsReplacementPreferences +import org.dueattendant149.bookreader.scaledToCanvasLimit +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.pdf.PdfSpreadLayout +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.ui.ReaderMinimalSlider +import org.dueattendant149.bookreader.shouldRenderReaderSlider +import org.dueattendant149.bookreader.summarizationUrl +import org.dueattendant149.bookreader.tts.ReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.SpeakerSamplePlayer +import org.dueattendant149.bookreader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.tts.loadReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.readerTtsOverlayAlignmentBias +import org.dueattendant149.bookreader.tts.rememberTtsController +import org.dueattendant149.bookreader.tts.saveReaderTtsOverlaySize +import org.dueattendant149.bookreader.tts.splitTextIntoChunks +import org.dueattendant149.bookreader.withTtsReplacements import io.legere.pdfiumandroid.suspend.PdfDocumentKt import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope @@ -350,7 +350,7 @@ fun PdfViewerScreen( var tapToNavigateEnabled by remember { mutableStateOf(loadTapToNavigateSetting(context)) } var showThemePanel by remember { mutableStateOf(false) } var currentThemeId by remember { mutableStateOf(loadPdfThemeId(context)) } - var excludeImages by remember { mutableStateOf(com.aryan.reader.loadExcludeImages(context)) } + var excludeImages by remember { mutableStateOf(org.dueattendant149.bookreader.loadExcludeImages(context)) } var customThemes by remember { mutableStateOf(loadCustomThemes(context)) } var globalTextureTransparency by remember { mutableFloatStateOf(loadGlobalTextureTransparency(context)) } val documentCache = remember { DocumentCache(3) } @@ -517,7 +517,7 @@ fun PdfViewerScreen( ttsState.currentText var currentTtsMode by remember { mutableStateOf( - com.aryan.reader.tts.loadTtsMode(context).let { + org.dueattendant149.bookreader.tts.loadTtsMode(context).let { if (BuildConfig.FLAVOR == "oss" && !isByokCloudTtsAvailable(context)) TtsPlaybackManager.TtsMode.BASE else it } ) @@ -739,7 +739,7 @@ fun PdfViewerScreen( var showBrightnessSheet by remember { mutableStateOf(false) } ReaderBrightnessEffect(window, readerBrightnessSettings) - val updateReaderBrightness: (com.aryan.reader.ReaderBrightnessSettings) -> Unit = { settings -> + val updateReaderBrightness: (org.dueattendant149.bookreader.ReaderBrightnessSettings) -> Unit = { settings -> readerBrightnessSettings = settings saveReaderBrightnessSettings(context, settings) } @@ -2845,7 +2845,7 @@ fun PdfViewerScreen( val effectiveUseOnline = areReaderAiFeaturesEnabled(context) && useOnlineDictionary if (effectiveUseOnline) { - val wordCount = com.aryan.reader.countWords(text) + val wordCount = org.dueattendant149.bookreader.countWords(text) if (BuildConfig.FLAVOR != "oss" && wordCount > 1 && !isProUser) { showDictionaryUpsellDialog = true } else { @@ -8039,7 +8039,7 @@ fun PdfViewerScreen( excludeImages = excludeImages, onExcludeImagesChange = { excludeImages = it - com.aryan.reader.saveExcludeImages(context, it) + org.dueattendant149.bookreader.saveExcludeImages(context, it) }, showExcludeImagesOption = true, builtInThemes = PdfBuiltInThemes, diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfViewerStateLogic.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerStateLogic.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/PdfViewerStateLogic.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerStateLogic.kt index 5f66339..a988985 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfViewerStateLogic.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfViewerStateLogic.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.ui.geometry.Offset -import com.aryan.reader.shared.pdf.PdfSpreadLayout -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.pdf.PdfSpreadLayout +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import kotlin.math.roundToInt internal fun resolveEraserStrokeWidth( diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfiumAnnotationExporter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporter.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/PdfiumAnnotationExporter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporter.kt index c22d71c..cbebfcc 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfiumAnnotationExporter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporter.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Bitmap @@ -31,16 +31,16 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationExportMapper -import com.aryan.reader.shared.pdf.pdfInkAppearancePoints +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationExportMapper +import org.dueattendant149.bookreader.shared.pdf.pdfInkAppearancePoints import java.io.File import java.io.FileInputStream import java.io.FileOutputStream diff --git a/app/src/main/java/com/aryan/reader/pdf/PdfiumEngineProvider.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumEngineProvider.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/PdfiumEngineProvider.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumEngineProvider.kt index a9662ed..1274392 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PdfiumEngineProvider.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PdfiumEngineProvider.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf -import com.aryan.reader.shared.pdf.PdfiumBridge +import org.dueattendant149.bookreader.shared.pdf.PdfiumBridge import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/com/aryan/reader/pdf/PenIcons.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PenIcons.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/PenIcons.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PenIcons.kt index 149df40..1aaaff1 100644 --- a/app/src/main/java/com/aryan/reader/pdf/PenIcons.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/PenIcons.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.BitmapShader import android.graphics.PorterDuff @@ -46,7 +46,7 @@ import androidx.compose.ui.graphics.drawscope.Stroke as ComposeStroke import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation import android.graphics.Paint as NativePaint private val BODY_COLOR = Color(0xFF454545) diff --git a/app/src/main/java/com/aryan/reader/pdf/ReflowWorker.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ReflowWorker.kt similarity index 94% rename from app/src/main/java/com/aryan/reader/pdf/ReflowWorker.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ReflowWorker.kt index 08f316b..51704c9 100644 --- a/app/src/main/java/com/aryan/reader/pdf/ReflowWorker.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ReflowWorker.kt @@ -1,15 +1,15 @@ // ReflowWorker.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.core.net.toUri import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import androidx.work.workDataOf -import com.aryan.reader.FileType -import com.aryan.reader.R -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.RecentFilesRepository +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.RecentFilesRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/RichTextSystem.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/RichTextSystem.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/RichTextSystem.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/RichTextSystem.kt index f4aef13..5064d94 100644 --- a/app/src/main/java/com/aryan/reader/pdf/RichTextSystem.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/RichTextSystem.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.compose.runtime.Stable @@ -44,7 +44,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.sp -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.VirtualPage import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/com/aryan/reader/pdf/SvgToAnnotationConverter.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/SvgToAnnotationConverter.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/SvgToAnnotationConverter.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/SvgToAnnotationConverter.kt index 6641c16..876728b 100644 --- a/app/src/main/java/com/aryan/reader/pdf/SvgToAnnotationConverter.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/SvgToAnnotationConverter.kt @@ -19,14 +19,14 @@ */ @file:Suppress("SameParameterValue") -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Path import android.util.Xml import androidx.compose.ui.graphics.Color import androidx.core.graphics.PathParser -import com.aryan.reader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation import org.xmlpull.v1.XmlPullParser import timber.log.Timber import java.util.Stack diff --git a/app/src/main/java/com/aryan/reader/pdf/TextAnnotationDock.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/TextAnnotationDock.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/TextAnnotationDock.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/TextAnnotationDock.kt index f66d333..ae270c0 100644 --- a/app/src/main/java/com/aryan/reader/pdf/TextAnnotationDock.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/TextAnnotationDock.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -111,8 +111,8 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupProperties import androidx.core.graphics.toColorInt -import com.aryan.reader.R -import com.aryan.reader.data.CustomFontEntity +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.data.CustomFontEntity import timber.log.Timber import java.io.File import kotlin.math.roundToInt @@ -238,13 +238,13 @@ fun TextAnnotationDock( ) } - items(com.aryan.reader.epubreader.ReaderFont.entries.toTypedArray()) { font -> - if (font == com.aryan.reader.epubreader.ReaderFont.ORIGINAL) return@items + items(org.dueattendant149.bookreader.epubreader.ReaderFont.entries.toTypedArray()) { font -> + if (font == org.dueattendant149.bookreader.epubreader.ReaderFont.ORIGINAL) return@items val isSelected = currentFontName == font.displayName FontItem( name = font.displayName, isSelected = isSelected, - fontFamily = com.aryan.reader.epubreader.getComposeFontFamily(font, null, LocalContext.current.assets), + fontFamily = org.dueattendant149.bookreader.epubreader.getComposeFontFamily(font, null, LocalContext.current.assets), onClick = { val assetPath = getAssetPathForReaderFont(font.displayName) onFontSelected(font.displayName, assetPath) diff --git a/app/src/main/java/com/aryan/reader/pdf/ToolSettingsPopup.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ToolSettingsPopup.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/ToolSettingsPopup.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ToolSettingsPopup.kt index 93e897a..50a7e4a 100644 --- a/app/src/main/java/com/aryan/reader/pdf/ToolSettingsPopup.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/ToolSettingsPopup.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.Canvas @@ -82,13 +82,13 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import com.aryan.reader.BrightnessSlider -import com.aryan.reader.ColorComparePill -import com.aryan.reader.HexInput -import com.aryan.reader.R -import com.aryan.reader.RgbInputColumn -import com.aryan.reader.SpectrumBox -import com.aryan.reader.readerModalMaxHeightDp +import org.dueattendant149.bookreader.BrightnessSlider +import org.dueattendant149.bookreader.ColorComparePill +import org.dueattendant149.bookreader.HexInput +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.RgbInputColumn +import org.dueattendant149.bookreader.SpectrumBox +import org.dueattendant149.bookreader.readerModalMaxHeightDp import kotlin.math.roundToInt @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/aryan/reader/pdf/UniversalDocument.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/UniversalDocument.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/UniversalDocument.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/UniversalDocument.kt index 7bfb240..94c0e7d 100644 --- a/app/src/main/java/com/aryan/reader/pdf/UniversalDocument.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/UniversalDocument.kt @@ -1,5 +1,5 @@ // UniversalDocument.kt -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.Bitmap @@ -12,10 +12,10 @@ import android.graphics.Rect import android.graphics.RectF import android.net.Uri import android.os.Build -import com.aryan.reader.COMIC_ARCHIVE_FILE_TYPES -import com.aryan.reader.FileType -import com.aryan.reader.R -import com.aryan.reader.pptx.PptxDocumentWrapper +import org.dueattendant149.bookreader.COMIC_ARCHIVE_FILE_TYPES +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.pptx.PptxDocumentWrapper import io.legere.pdfiumandroid.api.Bookmark import io.legere.pdfiumandroid.suspend.PdfDocumentKt import io.legere.pdfiumandroid.suspend.PdfPageKt @@ -784,16 +784,16 @@ class OpdsStreamDocumentWrapper( private val cacheDir = File(context.cacheDir, "opds_stream_${bookId.hashCode()}").apply { mkdirs() } private val catalog = catalogId?.let { - com.aryan.reader.opds.OpdsRepository(context).getCatalogs().find { c -> c.id == it } + org.dueattendant149.bookreader.opds.OpdsRepository(context).getCatalogs().find { c -> c.id == it } } - private val client = com.aryan.reader.opds.OpdsRepository.sharedHttpClient.newBuilder() + private val client = org.dueattendant149.bookreader.opds.OpdsRepository.sharedHttpClient.newBuilder() .apply { val streamCatalog = catalog val username = streamCatalog?.username val password = streamCatalog?.password if (!username.isNullOrBlank() && !password.isNullOrBlank()) { - authenticator(com.aryan.reader.opds.OpdsRepository.OpdsAuthenticator(username, password)) + authenticator(org.dueattendant149.bookreader.opds.OpdsRepository.OpdsAuthenticator(username, password)) } } .build() diff --git a/app/src/main/java/com/aryan/reader/pdf/data/AnnotationSettingsRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/AnnotationSettingsRepository.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/pdf/data/AnnotationSettingsRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/AnnotationSettingsRepository.kt index 032c5b8..8a8c706 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/AnnotationSettingsRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/AnnotationSettingsRepository.kt @@ -17,12 +17,12 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.pdf.InkType +import org.dueattendant149.bookreader.pdf.InkType import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PageLayoutRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PageLayoutRepository.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/data/PageLayoutRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PageLayoutRepository.kt index 8535d78..b1f23c1 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PageLayoutRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PageLayoutRepository.kt @@ -17,11 +17,11 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context -import com.aryan.reader.pdf.PDF_BLANK_PAGE_PERSISTENCE_TAG -import com.aryan.reader.pdf.pdfLayoutDebugSummary +import org.dueattendant149.bookreader.pdf.PDF_BLANK_PAGE_PERSISTENCE_TAG +import org.dueattendant149.bookreader.pdf.pdfLayoutDebugSummary import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONArray diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationData.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationData.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationData.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationData.kt index 4d1a1a9..4bc7891 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationData.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationData.kt @@ -17,18 +17,18 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.graphics.RectF import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.pdf.AnnotationType -import com.aryan.reader.pdf.InkType -import com.aryan.reader.pdf.PdfHighlightColor -import com.aryan.reader.pdf.PdfPoint -import com.aryan.reader.pdf.PdfUserHighlight -import com.aryan.reader.shared.pdf.SharedPdfAnnotationComment +import org.dueattendant149.bookreader.pdf.AnnotationType +import org.dueattendant149.bookreader.pdf.InkType +import org.dueattendant149.bookreader.pdf.PdfHighlightColor +import org.dueattendant149.bookreader.pdf.PdfPoint +import org.dueattendant149.bookreader.pdf.PdfUserHighlight +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationComment import org.json.JSONArray import org.json.JSONObject import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationRepository.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationRepository.kt index 6e1f59f..b5c84f1 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfAnnotationRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfAnnotationRepository.kt @@ -17,11 +17,11 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context -import com.aryan.reader.logCloudAnnotationSyncTrace -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.logCloudAnnotationSyncTrace +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfHighlightRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfHighlightRepository.kt similarity index 93% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfHighlightRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfHighlightRepository.kt index b19b252..8a9352d 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfHighlightRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfHighlightRepository.kt @@ -1,9 +1,9 @@ // PdfHighlightRepository.kt -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context -import com.aryan.reader.logCloudAnnotationSyncTrace -import com.aryan.reader.pdf.PdfUserHighlight +import org.dueattendant149.bookreader.logCloudAnnotationSyncTrace +import org.dueattendant149.bookreader.pdf.PdfUserHighlight import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextBoxRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextBoxRepository.kt similarity index 96% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfTextBoxRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextBoxRepository.kt index 294c0a1..d62f89b 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextBoxRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextBoxRepository.kt @@ -17,10 +17,10 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context -import com.aryan.reader.logCloudAnnotationSyncTrace +import org.dueattendant149.bookreader.logCloudAnnotationSyncTrace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextDatabase.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextDatabase.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfTextDatabase.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextDatabase.kt index f26b065..5e1bbdf 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextDatabase.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextDatabase.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context import androidx.paging.PagingSource diff --git a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextRepository.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextRepository.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/pdf/data/PdfTextRepository.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextRepository.kt index 00fcb2a..acd603b 100644 --- a/app/src/main/java/com/aryan/reader/pdf/data/PdfTextRepository.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pdf/data/PdfTextRepository.kt @@ -17,13 +17,13 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.pdf.data +package org.dueattendant149.bookreader.pdf.data import android.content.Context import android.graphics.RectF import timber.log.Timber import androidx.core.graphics.createBitmap -import com.aryan.reader.pdf.OcrHelper +import org.dueattendant149.bookreader.pdf.OcrHelper import io.legere.pdfiumandroid.suspend.PdfDocumentKt import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow @@ -33,8 +33,8 @@ import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.flatMap -import com.aryan.reader.SearchResult -import com.aryan.reader.pdf.PdfiumEngineProvider +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.pdf.PdfiumEngineProvider import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString @@ -42,7 +42,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.graphics.Color import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map -import com.aryan.reader.pdf.ReaderDocument +import org.dueattendant149.bookreader.pdf.ReaderDocument private const val TAG = "PdfSearchDiag" diff --git a/app/src/main/java/com/aryan/reader/pptx/PptxDocument.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/pptx/PptxDocument.kt similarity index 95% rename from app/src/main/java/com/aryan/reader/pptx/PptxDocument.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/pptx/PptxDocument.kt index d3cc2f1..2742c05 100644 --- a/app/src/main/java/com/aryan/reader/pptx/PptxDocument.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/pptx/PptxDocument.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pptx +package org.dueattendant149.bookreader.pptx import android.content.Context import android.graphics.Bitmap @@ -28,33 +28,33 @@ import android.text.style.SubscriptSpan import android.text.style.SuperscriptSpan import android.text.style.TypefaceSpan import androidx.core.graphics.createBitmap -import com.aryan.reader.pdf.DummyTextPage -import com.aryan.reader.pdf.ReaderDocument -import com.aryan.reader.pdf.ReaderLink -import com.aryan.reader.pdf.ReaderPage -import com.aryan.reader.pdf.ReaderTextPage -import com.aryan.reader.pdf.ReaderTextRect -import com.aryan.reader.shared.pptx.SharedPptxAutoFitMode -import com.aryan.reader.shared.pptx.SharedPptxCharBox -import com.aryan.reader.shared.pptx.SharedPptxCustomGeometry -import com.aryan.reader.shared.pptx.SharedPptxDeck -import com.aryan.reader.shared.pptx.SharedPptxDeckCache -import com.aryan.reader.shared.pptx.SharedPptxElement -import com.aryan.reader.shared.pptx.SharedPptxGradientFill -import com.aryan.reader.shared.pptx.SharedPptxImageCrop -import com.aryan.reader.shared.pptx.SharedPptxImageElement -import com.aryan.reader.shared.pptx.SharedPptxParagraph -import com.aryan.reader.shared.pptx.SharedPptxPathCommand -import com.aryan.reader.shared.pptx.SharedPptxRect -import com.aryan.reader.shared.pptx.SharedPptxShapeElement -import com.aryan.reader.shared.pptx.SharedPptxSlide -import com.aryan.reader.shared.pptx.SharedPptxTableCell -import com.aryan.reader.shared.pptx.SharedPptxTableElement -import com.aryan.reader.shared.pptx.SharedPptxTableRow -import com.aryan.reader.shared.pptx.SharedPptxTextAlign -import com.aryan.reader.shared.pptx.SharedPptxTextInsets -import com.aryan.reader.shared.pptx.SharedPptxTextRun -import com.aryan.reader.shared.pptx.SharedPptxVerticalAnchor +import org.dueattendant149.bookreader.pdf.DummyTextPage +import org.dueattendant149.bookreader.pdf.ReaderDocument +import org.dueattendant149.bookreader.pdf.ReaderLink +import org.dueattendant149.bookreader.pdf.ReaderPage +import org.dueattendant149.bookreader.pdf.ReaderTextPage +import org.dueattendant149.bookreader.pdf.ReaderTextRect +import org.dueattendant149.bookreader.shared.pptx.SharedPptxAutoFitMode +import org.dueattendant149.bookreader.shared.pptx.SharedPptxCharBox +import org.dueattendant149.bookreader.shared.pptx.SharedPptxCustomGeometry +import org.dueattendant149.bookreader.shared.pptx.SharedPptxDeck +import org.dueattendant149.bookreader.shared.pptx.SharedPptxDeckCache +import org.dueattendant149.bookreader.shared.pptx.SharedPptxElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxGradientFill +import org.dueattendant149.bookreader.shared.pptx.SharedPptxImageCrop +import org.dueattendant149.bookreader.shared.pptx.SharedPptxImageElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxParagraph +import org.dueattendant149.bookreader.shared.pptx.SharedPptxPathCommand +import org.dueattendant149.bookreader.shared.pptx.SharedPptxRect +import org.dueattendant149.bookreader.shared.pptx.SharedPptxShapeElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxSlide +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTableCell +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTableElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTableRow +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTextAlign +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTextInsets +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTextRun +import org.dueattendant149.bookreader.shared.pptx.SharedPptxVerticalAnchor import io.legere.pdfiumandroid.api.Bookmark import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/aryan/reader/tts/BaseTtsSynthesizer.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizer.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/tts/BaseTtsSynthesizer.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizer.kt index b9e7da2..c23a422 100644 --- a/app/src/main/java/com/aryan/reader/tts/BaseTtsSynthesizer.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/BaseTtsSynthesizer.kt @@ -17,17 +17,17 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.Context import android.os.Bundle import android.speech.tts.TextToSpeech import android.speech.tts.UtteranceProgressListener import android.speech.tts.Voice -import com.aryan.reader.BuildConfig -import com.aryan.reader.epubreader.loadTtsPitch -import com.aryan.reader.epubreader.loadTtsSpeechRate -import com.aryan.reader.loadNativeVoice +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.epubreader.loadTtsPitch +import org.dueattendant149.bookreader.epubreader.loadTtsSpeechRate +import org.dueattendant149.bookreader.loadNativeVoice import timber.log.Timber import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.TimeoutCancellationException diff --git a/app/src/main/java/com/aryan/reader/tts/ReaderTtsMiniBar.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsMiniBar.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/tts/ReaderTtsMiniBar.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsMiniBar.kt index aac10c4..ddfc02a 100644 --- a/app/src/main/java/com/aryan/reader/tts/ReaderTtsMiniBar.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsMiniBar.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable @@ -34,8 +34,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.media3.common.util.UnstableApi -import com.aryan.reader.R -import com.aryan.reader.tts.TtsPlaybackManager.TtsState +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsState private const val TTS_MINI_BAR_EDGE_PADDING_DP = 16 private const val TTS_MINI_BAR_MAIN_BOTTOM_PADDING_DP = 96 diff --git a/app/src/main/java/com/aryan/reader/tts/ReaderTtsOverlaySize.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsOverlaySize.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/tts/ReaderTtsOverlaySize.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsOverlaySize.kt index 0a509cc..648fe54 100644 --- a/app/src/main/java/com/aryan/reader/tts/ReaderTtsOverlaySize.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/ReaderTtsOverlaySize.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/com/aryan/reader/tts/TtsController.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsController.kt similarity index 97% rename from app/src/main/java/com/aryan/reader/tts/TtsController.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsController.kt index dcf3f2a..a13a3db 100644 --- a/app/src/main/java/com/aryan/reader/tts/TtsController.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsController.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.ComponentName import android.content.Context @@ -34,11 +34,11 @@ import androidx.media3.common.Player import androidx.media3.common.util.UnstableApi import androidx.media3.session.MediaController import androidx.media3.session.SessionToken -import com.aryan.reader.BuildConfig -import com.aryan.reader.epubreader.loadTtsPitch -import com.aryan.reader.epubreader.loadTtsSpeechRate -import com.aryan.reader.isByokCloudTtsAvailable -import com.aryan.reader.tts.TtsPlaybackManager.TtsState +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.epubreader.loadTtsPitch +import org.dueattendant149.bookreader.epubreader.loadTtsSpeechRate +import org.dueattendant149.bookreader.isByokCloudTtsAvailable +import org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsState import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors import kotlinx.coroutines.CoroutineScope @@ -196,7 +196,7 @@ class TtsController(context: Context) : Player.Listener { } fun start( - chunks: List, + chunks: List, bookTitle: String, chapterTitle: String?, coverImageUri: String?, diff --git a/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsNotificationIntent.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsNotificationIntent.kt new file mode 100644 index 0000000..32973da --- /dev/null +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsNotificationIntent.kt @@ -0,0 +1,8 @@ +package org.dueattendant149.bookreader.tts + +const val ACTION_OPEN_TTS_SESSION = "org.dueattendant149.bookreader.tts.OPEN_SESSION" +const val EXTRA_TTS_BOOK_ID = "org.dueattendant149.bookreader.tts.extra.BOOK_ID" +const val EXTRA_TTS_CHAPTER_INDEX = "org.dueattendant149.bookreader.tts.extra.CHAPTER_INDEX" +const val EXTRA_TTS_SOURCE_CFI = "org.dueattendant149.bookreader.tts.extra.SOURCE_CFI" +const val EXTRA_TTS_START_OFFSET = "org.dueattendant149.bookreader.tts.extra.START_OFFSET" +const val EXTRA_TTS_PAGE_INDEX = "org.dueattendant149.bookreader.tts.extra.PAGE_INDEX" diff --git a/app/src/main/java/com/aryan/reader/tts/TtsPlaybackManager.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsPlaybackManager.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/tts/TtsPlaybackManager.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsPlaybackManager.kt index 0629516..011fcb0 100644 --- a/app/src/main/java/com/aryan/reader/tts/TtsPlaybackManager.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsPlaybackManager.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.app.PendingIntent import android.content.Context @@ -34,8 +34,8 @@ import androidx.media3.session.CommandButton import androidx.media3.session.MediaSession import androidx.media3.session.SessionCommand import androidx.media3.session.SessionResult -import com.aryan.reader.MainActivity -import com.aryan.reader.R +import org.dueattendant149.bookreader.MainActivity +import org.dueattendant149.bookreader.R import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture import kotlinx.coroutines.CoroutineScope @@ -50,8 +50,8 @@ import kotlinx.coroutines.withContext import java.io.File import java.util.concurrent.atomic.AtomicInteger import androidx.core.net.toUri -import com.aryan.reader.paginatedreader.TimedWord -import com.aryan.reader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.paginatedreader.TimedWord +import org.dueattendant149.bookreader.paginatedreader.TtsChunk import kotlinx.coroutines.delay import kotlin.math.roundToInt @@ -65,25 +65,25 @@ internal fun stableSortedIntSnapshot(values: Collection): List { } val START_TTS_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.START") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.START") val STOP_TTS_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.STOP") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.STOP") val CHANGE_SPEAKER_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.CHANGE_SPEAKER") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.CHANGE_SPEAKER") val FLUSH_PREFETCH_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.FLUSH_PREFETCH") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.FLUSH_PREFETCH") private val STATE_UPDATE_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.STATE_UPDATE") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.STATE_UPDATE") val CHANGE_TTS_MODE_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.CHANGE_MODE") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.CHANGE_MODE") val SLICE_CURRENT_AND_RELOAD_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.SLICE_AND_RELOAD") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.SLICE_AND_RELOAD") val SET_PLAYBACK_PARAMS_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.SET_PLAYBACK_PARAMS") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.SET_PLAYBACK_PARAMS") val SKIP_TO_PREVIOUS_TTS_CHUNK_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.SKIP_TO_PREVIOUS_CHUNK") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.SKIP_TO_PREVIOUS_CHUNK") val SKIP_TO_NEXT_TTS_CHUNK_COMMAND: SessionCommand - get() = ttsSessionCommand("com.aryan.reader.tts.SKIP_TO_NEXT_CHUNK") + get() = ttsSessionCommand("org.dueattendant149.bookreader.tts.SKIP_TO_NEXT_CHUNK") const val TTS_NOTIFICATION_DIAG_TAG = "TTS_NOTIFICATION_DIAG" const val TTS_CHUNK_NAV_DIAG_TAG = "TTS_CHUNK_NAV_DIAG" diff --git a/app/src/main/java/com/aryan/reader/tts/TtsService.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsService.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/tts/TtsService.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsService.kt index 3531ed0..17c9ad9 100644 --- a/app/src/main/java/com/aryan/reader/tts/TtsService.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsService.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.Manifest import android.app.Notification @@ -42,11 +42,11 @@ import androidx.media3.session.DefaultMediaNotificationProvider import androidx.media3.session.MediaNotification import androidx.media3.session.MediaSession import androidx.media3.session.MediaSessionService -import com.aryan.reader.R -import com.aryan.reader.GEMINI_CLOUD_TTS_MODEL -import com.aryan.reader.isByokCloudTtsAvailable -import com.aryan.reader.loadAiByokSettings -import com.aryan.reader.tts.TtsPlaybackManager.TtsMode +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.GEMINI_CLOUD_TTS_MODEL +import org.dueattendant149.bookreader.isByokCloudTtsAvailable +import org.dueattendant149.bookreader.loadAiByokSettings +import org.dueattendant149.bookreader.tts.TtsPlaybackManager.TtsMode import kotlinx.coroutines.Job import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -249,8 +249,8 @@ private const val TTS_FOREGROUND_CHANNEL_ID = "tts_playback" // Keep this aligned with Media3's default notification ID so playback updates replace the fallback. private const val TTS_FOREGROUND_NOTIFICATION_ID = 1001 private const val TTS_FOREGROUND_IDLE_GRACE_MS = 15_000L -private const val ACTION_TTS_NOTIFICATION_PREVIOUS_CHUNK = "com.aryan.reader.tts.NOTIFICATION_PREVIOUS_CHUNK" -private const val ACTION_TTS_NOTIFICATION_NEXT_CHUNK = "com.aryan.reader.tts.NOTIFICATION_NEXT_CHUNK" +private const val ACTION_TTS_NOTIFICATION_PREVIOUS_CHUNK = "org.dueattendant149.bookreader.tts.NOTIFICATION_PREVIOUS_CHUNK" +private const val ACTION_TTS_NOTIFICATION_NEXT_CHUNK = "org.dueattendant149.bookreader.tts.NOTIFICATION_NEXT_CHUNK" private const val TTS_NOTIFICATION_PREVIOUS_REQUEST_CODE = 4208 private const val TTS_NOTIFICATION_NEXT_REQUEST_CODE = 4209 diff --git a/app/src/main/java/com/aryan/reader/tts/TtsUtils.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsUtils.kt similarity index 99% rename from app/src/main/java/com/aryan/reader/tts/TtsUtils.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsUtils.kt index 19a9737..594b823 100644 --- a/app/src/main/java/com/aryan/reader/tts/TtsUtils.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/tts/TtsUtils.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.Context import android.media.MediaPlayer @@ -27,7 +27,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.core.content.edit import androidx.media3.common.util.UnstableApi -import com.aryan.reader.BuildConfig +import org.dueattendant149.bookreader.BuildConfig import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aryan/reader/ui/theme/Color.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Color.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/ui/theme/Color.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Color.kt index c690bdc..e69b93a 100644 --- a/app/src/main/java/com/aryan/reader/ui/theme/Color.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Color.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.ui.theme +package org.dueattendant149.bookreader.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/aryan/reader/ui/theme/Theme.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Theme.kt similarity index 98% rename from app/src/main/java/com/aryan/reader/ui/theme/Theme.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Theme.kt index 4ed63a3..080c31c 100644 --- a/app/src/main/java/com/aryan/reader/ui/theme/Theme.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Theme.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.ui.theme +package org.dueattendant149.bookreader.ui.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme @@ -32,7 +32,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontFamily import com.materialkolor.PaletteStyle import androidx.compose.ui.platform.LocalContext -import com.aryan.reader.shared.ui.withAppFontFamily +import org.dueattendant149.bookreader.shared.ui.withAppFontFamily import com.materialkolor.dynamicColorScheme private val lightScheme = lightColorScheme( diff --git a/app/src/main/java/com/aryan/reader/ui/theme/Type.kt b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Type.kt similarity index 94% rename from app/src/main/java/com/aryan/reader/ui/theme/Type.kt rename to app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Type.kt index f4c3191..996ef13 100644 --- a/app/src/main/java/com/aryan/reader/ui/theme/Type.kt +++ b/app/src/main/java/com/dueattendant149/bookreader/reader/ui/theme/Type.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.ui.theme +package org.dueattendant149.bookreader.ui.theme import androidx.compose.material3.Typography diff --git a/app/src/oss/java/com/aryan/reader/Auth.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/Auth.kt similarity index 92% rename from app/src/oss/java/com/aryan/reader/Auth.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/Auth.kt index 1ede8d4..83792eb 100644 --- a/app/src/oss/java/com/aryan/reader/Auth.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/Auth.kt @@ -1,5 +1,5 @@ // src\oss -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import kotlinx.coroutines.flow.Flow diff --git a/app/src/oss/java/com/aryan/reader/BillingClientWrapper.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/BillingClientWrapper.kt similarity index 92% rename from app/src/oss/java/com/aryan/reader/BillingClientWrapper.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/BillingClientWrapper.kt index 638d535..97ff7ce 100644 --- a/app/src/oss/java/com/aryan/reader/BillingClientWrapper.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/BillingClientWrapper.kt @@ -1,10 +1,10 @@ // src\oss -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Activity import android.content.Context -import com.aryan.reader.data.ProductDetailsEntity -import com.aryan.reader.data.PurchaseEntity +import org.dueattendant149.bookreader.data.ProductDetailsEntity +import org.dueattendant149.bookreader.data.PurchaseEntity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/oss/java/com/aryan/reader/GoogleDriveAuthManager.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/GoogleDriveAuthManager.kt similarity index 90% rename from app/src/oss/java/com/aryan/reader/GoogleDriveAuthManager.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/GoogleDriveAuthManager.kt index 3671d5e..ef0c09c 100644 --- a/app/src/oss/java/com/aryan/reader/GoogleDriveAuthManager.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/GoogleDriveAuthManager.kt @@ -1,5 +1,5 @@ // src/oss -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.content.Intent diff --git a/app/src/oss/java/com/aryan/reader/OcrEngine.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/OcrEngine.kt similarity index 71% rename from app/src/oss/java/com/aryan/reader/OcrEngine.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/OcrEngine.kt index 568a8db..46d1462 100644 --- a/app/src/oss/java/com/aryan/reader/OcrEngine.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/OcrEngine.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.graphics.Bitmap -import com.aryan.reader.pdf.OcrLanguage -import com.aryan.reader.pdf.ocr.OcrResult +import org.dueattendant149.bookreader.pdf.OcrLanguage +import org.dueattendant149.bookreader.pdf.ocr.OcrResult import timber.log.Timber object OcrEngine { diff --git a/app/src/oss/java/com/aryan/reader/data/CloudflareRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/CloudflareRepository.kt similarity index 92% rename from app/src/oss/java/com/aryan/reader/data/CloudflareRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/CloudflareRepository.kt index 5e0b171..818491a 100644 --- a/app/src/oss/java/com/aryan/reader/data/CloudflareRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/CloudflareRepository.kt @@ -1,5 +1,5 @@ // src\oss -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import kotlinx.serialization.Serializable diff --git a/app/src/oss/java/com/aryan/reader/data/FeedbackRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/FeedbackRepository.kt similarity index 98% rename from app/src/oss/java/com/aryan/reader/data/FeedbackRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/FeedbackRepository.kt index 5f39841..656c9fc 100644 --- a/app/src/oss/java/com/aryan/reader/data/FeedbackRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/FeedbackRepository.kt @@ -1,5 +1,5 @@ // src\oss -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import android.net.Uri diff --git a/app/src/oss/java/com/aryan/reader/data/FirestoreRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/FirestoreRepository.kt similarity index 99% rename from app/src/oss/java/com/aryan/reader/data/FirestoreRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/FirestoreRepository.kt index 9c0a6fd..a46830f 100644 --- a/app/src/oss/java/com/aryan/reader/data/FirestoreRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/FirestoreRepository.kt @@ -1,7 +1,7 @@ // src\oss @file:Suppress("unused", "RedundantSuspendModifier") -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import java.util.Date diff --git a/app/src/oss/java/com/aryan/reader/data/GoogleDriveRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepository.kt similarity index 95% rename from app/src/oss/java/com/aryan/reader/data/GoogleDriveRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepository.kt index b129adc..ee98848 100644 --- a/app/src/oss/java/com/aryan/reader/data/GoogleDriveRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepository.kt @@ -1,9 +1,9 @@ // src\oss -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import android.content.Intent -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import java.io.File data class DriveFileList( diff --git a/app/src/oss/java/com/aryan/reader/data/PlatformFeaturesRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/PlatformFeaturesRepository.kt similarity index 89% rename from app/src/oss/java/com/aryan/reader/data/PlatformFeaturesRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/PlatformFeaturesRepository.kt index 6ae27e7..3d420d8 100644 --- a/app/src/oss/java/com/aryan/reader/data/PlatformFeaturesRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/PlatformFeaturesRepository.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.app.Activity import android.content.Context diff --git a/app/src/oss/java/com/aryan/reader/data/RemoteConfigRepository.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/RemoteConfigRepository.kt similarity index 67% rename from app/src/oss/java/com/aryan/reader/data/RemoteConfigRepository.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/RemoteConfigRepository.kt index f9b60bd..9c45103 100644 --- a/app/src/oss/java/com/aryan/reader/data/RemoteConfigRepository.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/RemoteConfigRepository.kt @@ -1,5 +1,5 @@ // src\oss -package com.aryan.reader.data +package org.dueattendant149.bookreader.data class RemoteConfigRepository { fun init() { diff --git a/app/src/oss/java/com/aryan/reader/data/SyncWorker.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/SyncWorker.kt similarity index 89% rename from app/src/oss/java/com/aryan/reader/data/SyncWorker.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/data/SyncWorker.kt index e788903..bc1cf6d 100644 --- a/app/src/oss/java/com/aryan/reader/data/SyncWorker.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/data/SyncWorker.kt @@ -1,5 +1,5 @@ // src\oss -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context import androidx.work.CoroutineWorker diff --git a/app/src/oss/java/com/aryan/reader/ml/SpeechBubbleDetector.kt b/app/src/oss/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt similarity index 91% rename from app/src/oss/java/com/aryan/reader/ml/SpeechBubbleDetector.kt rename to app/src/oss/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt index c920bb3..ed74b9a 100644 --- a/app/src/oss/java/com/aryan/reader/ml/SpeechBubbleDetector.kt +++ b/app/src/oss/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.ml +package org.dueattendant149.bookreader.ml import android.graphics.Bitmap import timber.log.Timber diff --git a/app/src/pro/java/com/aryan/reader/ml/SpeechBubbleDetector.kt b/app/src/pro/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt similarity index 99% rename from app/src/pro/java/com/aryan/reader/ml/SpeechBubbleDetector.kt rename to app/src/pro/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt index de2156a..eb23acc 100644 --- a/app/src/pro/java/com/aryan/reader/ml/SpeechBubbleDetector.kt +++ b/app/src/pro/java/com/dueattendant149/bookreader/reader/ml/SpeechBubbleDetector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.ml +package org.dueattendant149.bookreader.ml import ai.onnxruntime.OnnxTensor import ai.onnxruntime.OrtEnvironment diff --git a/app/src/proTest/java/com/aryan/reader/data/FirestoreRepositoryMappingTest.kt b/app/src/proTest/java/com/dueattendant149/bookreader/reader/data/FirestoreRepositoryMappingTest.kt similarity index 96% rename from app/src/proTest/java/com/aryan/reader/data/FirestoreRepositoryMappingTest.kt rename to app/src/proTest/java/com/dueattendant149/bookreader/reader/data/FirestoreRepositoryMappingTest.kt index b210d07..7d1850f 100644 --- a/app/src/proTest/java/com/aryan/reader/data/FirestoreRepositoryMappingTest.kt +++ b/app/src/proTest/java/com/dueattendant149/bookreader/reader/data/FirestoreRepositoryMappingTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/app/src/proTest/java/com/aryan/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt b/app/src/proTest/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt similarity index 93% rename from app/src/proTest/java/com/aryan/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt rename to app/src/proTest/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt index b6ca934..5d4e089 100644 --- a/app/src/proTest/java/com/aryan/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt +++ b/app/src/proTest/java/com/dueattendant149/bookreader/reader/data/GoogleDriveRepositoryUploadMetadataTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/AndroidLegalLinksTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidLegalLinksTest.kt similarity index 94% rename from app/src/test/java/com/aryan/reader/AndroidLegalLinksTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AndroidLegalLinksTest.kt index 6e35276..a5a8e8c 100644 --- a/app/src/test/java/com/aryan/reader/AndroidLegalLinksTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidLegalLinksTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/AndroidSettingsHubModelsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModelsTest.kt similarity index 94% rename from app/src/test/java/com/aryan/reader/AndroidSettingsHubModelsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModelsTest.kt index dcd409f..405b13f 100644 --- a/app/src/test/java/com/aryan/reader/AndroidSettingsHubModelsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSettingsHubModelsTest.kt @@ -1,11 +1,11 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.shared.SharedSettingsAction -import com.aryan.reader.shared.SharedSettingsDestination -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SharedSettingsHubModel -import com.aryan.reader.shared.SharedSettingsItemModel -import com.aryan.reader.shared.sharedSettingsHubModel +import org.dueattendant149.bookreader.shared.SharedSettingsAction +import org.dueattendant149.bookreader.shared.SharedSettingsDestination +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SharedSettingsHubModel +import org.dueattendant149.bookreader.shared.SharedSettingsItemModel +import org.dueattendant149.bookreader.shared.sharedSettingsHubModel import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/AndroidSharedStateBridgeTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridgeTest.kt similarity index 94% rename from app/src/test/java/com/aryan/reader/AndroidSharedStateBridgeTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridgeTest.kt index 67b77ac..584568b 100644 --- a/app/src/test/java/com/aryan/reader/AndroidSharedStateBridgeTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidSharedStateBridgeTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookTagCrossRef -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity -import com.aryan.reader.shared.AppAction as SharedAppAction -import com.aryan.reader.shared.AppFontPreference as SharedAppFontPreference -import com.aryan.reader.shared.AppThemeMode as SharedAppThemeMode -import com.aryan.reader.shared.LibraryAction as SharedLibraryAction +import org.dueattendant149.bookreader.data.BookTagCrossRef +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.shared.AppAction as SharedAppAction +import org.dueattendant149.bookreader.shared.AppFontPreference as SharedAppFontPreference +import org.dueattendant149.bookreader.shared.AppThemeMode as SharedAppThemeMode +import org.dueattendant149.bookreader.shared.LibraryAction as SharedLibraryAction import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/AndroidStringFormatResourcesTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidStringFormatResourcesTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/AndroidStringFormatResourcesTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AndroidStringFormatResourcesTest.kt index a2e3520..bed450c 100644 --- a/app/src/test/java/com/aryan/reader/AndroidStringFormatResourcesTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AndroidStringFormatResourcesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import java.io.File import java.util.Date diff --git a/app/src/test/java/com/aryan/reader/AppFontResolverTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AppFontResolverTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/AppFontResolverTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AppFontResolverTest.kt index 906df99..98315d9 100644 --- a/app/src/test/java/com/aryan/reader/AppFontResolverTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AppFontResolverTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.CustomFontEntity +import org.dueattendant149.bookreader.data.CustomFontEntity import org.junit.Assert.assertNull import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/AppLanguageOptionsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/AppLanguageOptionsTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/AppLanguageOptionsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/AppLanguageOptionsTest.kt index bc5815a..29eff97 100644 --- a/app/src/test/java/com/aryan/reader/AppLanguageOptionsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/AppLanguageOptionsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import java.io.File import javax.xml.parsers.DocumentBuilderFactory diff --git a/app/src/test/java/com/aryan/reader/BookReplacementHtmlTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/BookReplacementHtmlTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/BookReplacementHtmlTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/BookReplacementHtmlTest.kt index a5f910e..8733dd8 100644 --- a/app/src/test/java/com/aryan/reader/BookReplacementHtmlTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/BookReplacementHtmlTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.shared.ReaderBookReplacementPreferences -import com.aryan.reader.shared.ReaderWordReplacementRule +import org.dueattendant149.bookreader.shared.ReaderBookReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderWordReplacementRule import org.jsoup.Jsoup import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/ClipboardUtilsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ClipboardUtilsTest.kt similarity index 90% rename from app/src/test/java/com/aryan/reader/ClipboardUtilsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ClipboardUtilsTest.kt index 9e83f6d..6bed5ec 100644 --- a/app/src/test/java/com/aryan/reader/ClipboardUtilsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ClipboardUtilsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/CloudEpubAnnotationMetadataTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadataTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/CloudEpubAnnotationMetadataTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadataTest.kt index b26d7b9..98b8241 100644 --- a/app/src/test/java/com/aryan/reader/CloudEpubAnnotationMetadataTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/CloudEpubAnnotationMetadataTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookMetadata -import com.aryan.reader.data.RecentFileItem +import org.dueattendant149.bookreader.data.BookMetadata +import org.dueattendant149.bookreader.data.RecentFileItem import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisionsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisionsTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisionsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisionsTest.kt index 4013cba..e985828 100644 --- a/app/src/test/java/com/aryan/reader/CloudPdfAnnotationSidecarDecisionsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/CloudPdfAnnotationSidecarDecisionsTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookMetadata -import com.aryan.reader.data.effectiveAnnotationModifiedTimestamp +import org.dueattendant149.bookreader.data.BookMetadata +import org.dueattendant149.bookreader.data.effectiveAnnotationModifiedTimestamp import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/EmbeddedEbookMetadataExtractorTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractorTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/EmbeddedEbookMetadataExtractorTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractorTest.kt index 09c23d9..b716382 100644 --- a/app/src/test/java/com/aryan/reader/EmbeddedEbookMetadataExtractorTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/EmbeddedEbookMetadataExtractorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/ExampleUnitTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ExampleUnitTest.kt similarity index 88% rename from app/src/test/java/com/aryan/reader/ExampleUnitTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ExampleUnitTest.kt index a978d73..a4d44bc 100644 --- a/app/src/test/java/com/aryan/reader/ExampleUnitTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/ExternalFileOpenRouteDeciderTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouteDeciderTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/ExternalFileOpenRouteDeciderTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouteDeciderTest.kt index 0a9e992..fa144b0 100644 --- a/app/src/test/java/com/aryan/reader/ExternalFileOpenRouteDeciderTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ExternalFileOpenRouteDeciderTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/FileHasherTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/FileHasherTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/FileHasherTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/FileHasherTest.kt index 279948f..c6f2aed 100644 --- a/app/src/test/java/com/aryan/reader/FileHasherTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/FileHasherTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/FileTypeResolverTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/FileTypeResolverTest.kt similarity index 94% rename from app/src/test/java/com/aryan/reader/FileTypeResolverTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/FileTypeResolverTest.kt index 4456bf8..c7f9db0 100644 --- a/app/src/test/java/com/aryan/reader/FileTypeResolverTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/FileTypeResolverTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -21,7 +21,7 @@ class FileTypeResolverTest { assertEquals(FileType.HTML, resolveFileTypeFromName("table.csv")) assertEquals(FileType.HTML, resolveFileTypeFromName("script.kt")) assertEquals(FileType.HTML, resolveFileTypeFromName("payload.json.txt")) - assertEquals(com.aryan.reader.shared.SharedFileCapabilities.resolveFileTypeForName("payload.json.txt"), resolveFileTypeFromName("payload.json.txt")) + assertEquals(org.dueattendant149.bookreader.shared.SharedFileCapabilities.resolveFileTypeForName("payload.json.txt"), resolveFileTypeFromName("payload.json.txt")) } @Test diff --git a/app/src/test/java/com/aryan/reader/LibraryStateProjectorTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/LibraryStateProjectorTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/LibraryStateProjectorTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/LibraryStateProjectorTest.kt index 9a97319..a13e1dd 100644 --- a/app/src/test/java/com/aryan/reader/LibraryStateProjectorTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/LibraryStateProjectorTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookShelfCrossRef -import com.aryan.reader.data.BookTagCrossRef -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.ShelfEntity -import com.aryan.reader.data.TagEntity +import org.dueattendant149.bookreader.data.BookShelfCrossRef +import org.dueattendant149.bookreader.data.BookTagCrossRef +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.ShelfEntity +import org.dueattendant149.bookreader.data.TagEntity import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/MainViewModelTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/MainViewModelTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/MainViewModelTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/MainViewModelTest.kt index 0b533e2..f05df07 100644 --- a/app/src/test/java/com/aryan/reader/MainViewModelTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/MainViewModelTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.app.Application import android.content.ContentResolver @@ -11,15 +11,15 @@ import androidx.compose.ui.graphics.toArgb import androidx.credentials.CredentialManager import androidx.lifecycle.ViewModel import androidx.work.WorkManager -import com.aryan.reader.data.* -import com.aryan.reader.paginatedreader.Locator -import com.aryan.reader.paginatedreader.data.BookCacheDao -import com.aryan.reader.paginatedreader.data.BookCacheDatabase -import com.aryan.reader.pdf.data.PdfMetaDao -import com.aryan.reader.pdf.data.PdfTextDao -import com.aryan.reader.pdf.data.PdfTextDatabase -import com.aryan.reader.tts.TtsController -import com.aryan.reader.tts.TtsPlaybackManager +import org.dueattendant149.bookreader.data.* +import org.dueattendant149.bookreader.paginatedreader.Locator +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDao +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDatabase +import org.dueattendant149.bookreader.pdf.data.PdfMetaDao +import org.dueattendant149.bookreader.pdf.data.PdfTextDao +import org.dueattendant149.bookreader.pdf.data.PdfTextDatabase +import org.dueattendant149.bookreader.tts.TtsController +import org.dueattendant149.bookreader.tts.TtsPlaybackManager import io.mockk.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -115,7 +115,7 @@ class MainViewModelTest { every { mockApplication.applicationContext } returns mockApplication every { mockApplication.getSharedPreferences(any(), any()) } returns mockPrefs every { mockApplication.resources } returns mockResources - every { mockApplication.packageName } returns "com.aryan.reader" + every { mockApplication.packageName } returns "org.dueattendant149.bookreader" every { mockApplication.filesDir } returns filesDir every { mockApplication.cacheDir } returns cacheDir every { mockApplication.getExternalFilesDir(any()) } returns externalFilesDir @@ -449,7 +449,7 @@ class MainViewModelTest { @Test fun `startup removes pending external always-remove file before restoring session`() = runTest(testDispatcher) { - val pendingUri = "file:///data/user/0/com.aryan.reader/files/books/external.epub" + val pendingUri = "file:///data/user/0/org.dueattendant149.bookreader/files/books/external.epub" val pendingEntry = """{"bookId":"external-book","uriString":"$pendingUri"}""" prefsStringSets["pending_external_file_removals"] = setOf(pendingEntry) every { mockPrefs.getString("last_open_book_id", null) } returns "external-book" diff --git a/app/src/test/java/com/aryan/reader/PurchaseAccountObfuscatorTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscatorTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/PurchaseAccountObfuscatorTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscatorTest.kt index 4682e73..18634fe 100644 --- a/app/src/test/java/com/aryan/reader/PurchaseAccountObfuscatorTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/PurchaseAccountObfuscatorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/ReaderBrightnessSettingsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderBrightnessSettingsTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/ReaderBrightnessSettingsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ReaderBrightnessSettingsTest.kt index 25bbdf4..fb744fd 100644 --- a/app/src/test/java/com/aryan/reader/ReaderBrightnessSettingsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderBrightnessSettingsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/ReaderPopupSizingTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderPopupSizingTest.kt similarity index 93% rename from app/src/test/java/com/aryan/reader/ReaderPopupSizingTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ReaderPopupSizingTest.kt index 01b5a95..134997f 100644 --- a/app/src/test/java/com/aryan/reader/ReaderPopupSizingTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderPopupSizingTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/ReaderScreenOrientationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientationTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/ReaderScreenOrientationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientationTest.kt index a4b31b5..749aaf1 100644 --- a/app/src/test/java/com/aryan/reader/ReaderScreenOrientationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderScreenOrientationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import android.content.Context import android.content.SharedPreferences diff --git a/app/src/test/java/com/aryan/reader/ReaderSliderChromeStateTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeStateTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/ReaderSliderChromeStateTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeStateTest.kt index edd8bf1..c80771f 100644 --- a/app/src/test/java/com/aryan/reader/ReaderSliderChromeStateTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/ReaderSliderChromeStateTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import androidx.compose.ui.graphics.Color import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/SharedModelMappersTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/SharedModelMappersTest.kt similarity index 93% rename from app/src/test/java/com/aryan/reader/SharedModelMappersTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/SharedModelMappersTest.kt index 8e31f20..24e3a48 100644 --- a/app/src/test/java/com/aryan/reader/SharedModelMappersTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/SharedModelMappersTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.data.BookTagCrossRef -import com.aryan.reader.data.RecentFileItem -import com.aryan.reader.data.TagEntity -import com.aryan.reader.data.toBookMetadata -import com.aryan.reader.data.toRecentFileItem -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.shared.FileType as SharedFileType -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.Shelf as SharedShelf -import com.aryan.reader.shared.ShelfType as SharedShelfType +import org.dueattendant149.bookreader.data.BookTagCrossRef +import org.dueattendant149.bookreader.data.RecentFileItem +import org.dueattendant149.bookreader.data.TagEntity +import org.dueattendant149.bookreader.data.toBookMetadata +import org.dueattendant149.bookreader.data.toRecentFileItem +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.shared.FileType as SharedFileType +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.Shelf as SharedShelf +import org.dueattendant149.bookreader.shared.ShelfType as SharedShelfType import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertSame diff --git a/app/src/test/java/com/aryan/reader/SyncedFolderPrefsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefsTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/SyncedFolderPrefsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefsTest.kt index 56c4815..c0558eb 100644 --- a/app/src/test/java/com/aryan/reader/SyncedFolderPrefsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/SyncedFolderPrefsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader +package org.dueattendant149.bookreader import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/TtsReplacementChunkTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/TtsReplacementChunkTest.kt similarity index 83% rename from app/src/test/java/com/aryan/reader/TtsReplacementChunkTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/TtsReplacementChunkTest.kt index e0c8a23..42816bb 100644 --- a/app/src/test/java/com/aryan/reader/TtsReplacementChunkTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/TtsReplacementChunkTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader +package org.dueattendant149.bookreader -import com.aryan.reader.paginatedreader.TtsChunk -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTtsReplacementRule +import org.dueattendant149.bookreader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementRule import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/data/FileTypeConverterTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/FileTypeConverterTest.kt similarity index 87% rename from app/src/test/java/com/aryan/reader/data/FileTypeConverterTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/FileTypeConverterTest.kt index ee19115..3232051 100644 --- a/app/src/test/java/com/aryan/reader/data/FileTypeConverterTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/FileTypeConverterTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/data/FolderBookMetadataTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadataTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/data/FolderBookMetadataTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadataTest.kt index 5392302..e1af358 100644 --- a/app/src/test/java/com/aryan/reader/data/FolderBookMetadataTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/FolderBookMetadataTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/data/ImportedFontFileNameTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/ImportedFontFileNameTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/data/ImportedFontFileNameTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/ImportedFontFileNameTest.kt index 8c7dbcf..3ba8221 100644 --- a/app/src/test/java/com/aryan/reader/data/ImportedFontFileNameTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/ImportedFontFileNameTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/data/RecentFileDaoMetadataExtractionTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoMetadataExtractionTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/data/RecentFileDaoMetadataExtractionTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoMetadataExtractionTest.kt index 5ab3abe..07356e9 100644 --- a/app/src/test/java/com/aryan/reader/data/RecentFileDaoMetadataExtractionTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoMetadataExtractionTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Room -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/data/RecentFileDaoReadingPositionTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoReadingPositionTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/data/RecentFileDaoReadingPositionTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoReadingPositionTest.kt index 61ac1b7..61ff85b 100644 --- a/app/src/test/java/com/aryan/reader/data/RecentFileDaoReadingPositionTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileDaoReadingPositionTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import androidx.room.Room -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest import org.junit.After diff --git a/app/src/test/java/com/aryan/reader/data/RecentFileItemReadingPositionMappingTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileItemReadingPositionMappingTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/data/RecentFileItemReadingPositionMappingTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileItemReadingPositionMappingTest.kt index a7f4626..e306e49 100644 --- a/app/src/test/java/com/aryan/reader/data/RecentFileItemReadingPositionMappingTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFileItemReadingPositionMappingTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt index 3aa683d..3871cbc 100644 --- a/app/src/test/java/com/aryan/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/RecentFilesRepositoryReadingPositionMergeTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data import android.content.Context -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/aryan/reader/data/SmartCollectionEngineTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngineTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/data/SmartCollectionEngineTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngineTest.kt index ae64fb4..2951758 100644 --- a/app/src/test/java/com/aryan/reader/data/SmartCollectionEngineTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/data/SmartCollectionEngineTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.data +package org.dueattendant149.bookreader.data -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/epub/EpubImportSecurityTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubImportSecurityTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/epub/EpubImportSecurityTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubImportSecurityTest.kt index fd8bee3..8f158f8 100644 --- a/app/src/test/java/com/aryan/reader/epub/EpubImportSecurityTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubImportSecurityTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import io.mockk.every diff --git a/app/src/test/java/com/aryan/reader/epub/EpubParserUnitTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubParserUnitTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/epub/EpubParserUnitTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubParserUnitTest.kt index d1fa26c..4303833 100644 --- a/app/src/test/java/com/aryan/reader/epub/EpubParserUnitTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/EpubParserUnitTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import io.mockk.every diff --git a/app/src/test/java/com/aryan/reader/epub/ImportedFileCacheTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCacheTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/epub/ImportedFileCacheTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCacheTest.kt index b1c40c1..466ffa2 100644 --- a/app/src/test/java/com/aryan/reader/epub/ImportedFileCacheTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/ImportedFileCacheTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context import io.mockk.every diff --git a/app/src/test/java/com/aryan/reader/epub/SingleFileImporterTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporterTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/epub/SingleFileImporterTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporterTest.kt index 3b021b1..e340698 100644 --- a/app/src/test/java/com/aryan/reader/epub/SingleFileImporterTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epub/SingleFileImporterTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.epub +package org.dueattendant149.bookreader.epub import android.content.Context -import com.aryan.reader.FileType +import org.dueattendant149.bookreader.FileType import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/aryan/reader/epubreader/ChapterWebViewHighlightJsonTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewHighlightJsonTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/epubreader/ChapterWebViewHighlightJsonTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewHighlightJsonTest.kt index 31a21bc..c9e36e2 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/ChapterWebViewHighlightJsonTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/ChapterWebViewHighlightJsonTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderLocator import org.json.JSONArray import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderBridgeAndControlsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBridgeAndControlsTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderBridgeAndControlsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBridgeAndControlsTest.kt index be2db10..616f808 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderBridgeAndControlsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderBridgeAndControlsTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.webkit.WebView -import com.aryan.reader.RenderMode +import org.dueattendant149.bookreader.RenderMode import io.mockk.mockk import io.mockk.verify import kotlinx.coroutines.CompletableDeferred diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderContentTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContentTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderContentTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContentTest.kt index c44196c..1c4d602 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderContentTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderContentTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context -import com.aryan.reader.R -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.epub.hasReadableExtractedContent -import com.aryan.reader.paginatedreader.Locator -import com.aryan.reader.paginatedreader.LocatorConverter +import org.dueattendant149.bookreader.R +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.hasReadableExtractedContent +import org.dueattendant149.bookreader.paginatedreader.Locator +import org.dueattendant149.bookreader.paginatedreader.LocatorConverter import io.mockk.coEvery import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderImagesTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImagesTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderImagesTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImagesTest.kt index 2830ee4..55b1086 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderImagesTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderImagesTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Rule diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt index afcfc10..95f43fa 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderPreferencesAndAnnotationsTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.Context import android.content.SharedPreferences import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubChapter import io.mockk.every import io.mockk.mockk import org.json.JSONArray diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderSearchTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearchTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderSearchTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearchTest.kt index e3a5d69..099f89e 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderSearchTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderSearchTest.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import androidx.compose.ui.text.buildAnnotatedString -import com.aryan.reader.RenderMode -import com.aryan.reader.SearchResult -import com.aryan.reader.SearchState -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.paginatedreader.IPaginator -import com.aryan.reader.paginatedreader.Page +import org.dueattendant149.bookreader.RenderMode +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.SearchState +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.paginatedreader.IPaginator +import org.dueattendant149.bookreader.paginatedreader.Page import io.mockk.mockk import io.mockk.verify import kotlinx.coroutines.CoroutineScope diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt index afbc6a1..4ad2ab2 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderTtsHighlightAssetTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsStateTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsStateTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsStateTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsStateTest.kt index 8dc7f1c..4b6823e 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubReaderVisualOptionsStateTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubReaderVisualOptionsStateTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.shared.PageInfoMode +import org.dueattendant149.bookreader.shared.PageInfoMode import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/epubreader/EpubTtsChunkMatchingTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatchingTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/epubreader/EpubTtsChunkMatchingTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatchingTest.kt index 2d46fde..63c6371 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/EpubTtsChunkMatchingTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/EpubTtsChunkMatchingTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader -import com.aryan.reader.paginatedreader.TtsChunk +import org.dueattendant149.bookreader.paginatedreader.TtsChunk import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/epubreader/TestSharedPreferences.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/TestSharedPreferences.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/epubreader/TestSharedPreferences.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/TestSharedPreferences.kt index 660c9ad..4b12af3 100644 --- a/app/src/test/java/com/aryan/reader/epubreader/TestSharedPreferences.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/epubreader/TestSharedPreferences.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.epubreader +package org.dueattendant149.bookreader.epubreader import android.content.SharedPreferences diff --git a/app/src/test/java/com/aryan/reader/opds/OpdsParserTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsParserTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/opds/OpdsParserTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsParserTest.kt index d30c146..f47d0c9 100644 --- a/app/src/test/java/com/aryan/reader/opds/OpdsParserTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsParserTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.opds +package org.dueattendant149.bookreader.opds import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/opds/OpdsRepositoryTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsRepositoryTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/opds/OpdsRepositoryTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsRepositoryTest.kt index 0a0699a..9cfb78d 100644 --- a/app/src/test/java/com/aryan/reader/opds/OpdsRepositoryTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/opds/OpdsRepositoryTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.opds +package org.dueattendant149.bookreader.opds import okhttp3.Protocol import okhttp3.Request diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt index 0357e3e..11d0db1 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidEpubKeyCommandsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.view.KeyEvent import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt index ac5a3ce..9ee21a0 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/AndroidHtmlResourceResolverTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/CfiUtilsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CfiUtilsTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/paginatedreader/CfiUtilsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CfiUtilsTest.kt index 3e5290c..9baedfa 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/CfiUtilsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CfiUtilsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/ContentStylerTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStylerTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/paginatedreader/ContentStylerTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStylerTest.kt index 5ff2ac8..7adfdc9 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/ContentStylerTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ContentStylerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/CssParserThemeModeTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserThemeModeTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/paginatedreader/CssParserThemeModeTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserThemeModeTest.kt index 34bf957..9d53fb8 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/CssParserThemeModeTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/CssParserThemeModeTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Constraints diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblingsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblingsTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblingsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblingsTest.kt index df92e2c..b2b4c58 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/EpubFontFaceSiblingsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/EpubFontFaceSiblingsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/LocatorConverterTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/LocatorConverterTest.kt similarity index 93% rename from app/src/test/java/com/aryan/reader/paginatedreader/LocatorConverterTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/LocatorConverterTest.kt index 56c9d01..0be8a66 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/LocatorConverterTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/LocatorConverterTest.kt @@ -1,18 +1,18 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import android.content.Context -import com.aryan.reader.epub.EpubBook -import com.aryan.reader.epub.EpubChapter -import com.aryan.reader.paginatedreader.data.AnchorIndexEntry -import com.aryan.reader.paginatedreader.data.BookCacheDao -import com.aryan.reader.paginatedreader.data.ConfigurationCache -import com.aryan.reader.paginatedreader.data.PageCacheChunk -import com.aryan.reader.paginatedreader.data.PageCacheMetadata -import com.aryan.reader.paginatedreader.data.PageIndexEntry -import com.aryan.reader.paginatedreader.data.ProcessedBook -import com.aryan.reader.paginatedreader.data.ProcessedChapter -import com.aryan.reader.paginatedreader.data.ProcessedChapterChunk -import com.aryan.reader.paginatedreader.data.ProcessedChapterMetadata +import org.dueattendant149.bookreader.epub.EpubBook +import org.dueattendant149.bookreader.epub.EpubChapter +import org.dueattendant149.bookreader.paginatedreader.data.AnchorIndexEntry +import org.dueattendant149.bookreader.paginatedreader.data.BookCacheDao +import org.dueattendant149.bookreader.paginatedreader.data.ConfigurationCache +import org.dueattendant149.bookreader.paginatedreader.data.PageCacheChunk +import org.dueattendant149.bookreader.paginatedreader.data.PageCacheMetadata +import org.dueattendant149.bookreader.paginatedreader.data.PageIndexEntry +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedBook +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedChapter +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedChapterChunk +import org.dueattendant149.bookreader.paginatedreader.data.ProcessedChapterMetadata import io.mockk.mockk import kotlinx.coroutines.test.runTest import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/NativeVerticalLocationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/NativeVerticalLocationTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/paginatedreader/NativeVerticalLocationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/NativeVerticalLocationTest.kt index 67de172..ae354c5 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/NativeVerticalLocationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/NativeVerticalLocationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/PageCountEstimatorTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimatorTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/paginatedreader/PageCountEstimatorTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimatorTest.kt index 96a1939..8455ed5 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/PageCountEstimatorTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PageCountEstimatorTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.sp -import com.aryan.reader.epub.EpubChapter +import org.dueattendant149.bookreader.epub.EpubChapter import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatedHighlightMappingTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedHighlightMappingTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/paginatedreader/PaginatedHighlightMappingTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedHighlightMappingTest.kt index 96926d0..b1ce337 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatedHighlightMappingTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedHighlightMappingTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.AnnotatedString -import com.aryan.reader.epubreader.HighlightColor -import com.aryan.reader.epubreader.UserHighlight -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.epubreader.HighlightColor +import org.dueattendant149.bookreader.epubreader.UserHighlight +import org.dueattendant149.bookreader.shared.ReaderLocator import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatedReconfigurationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfigurationTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/paginatedreader/PaginatedReconfigurationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfigurationTest.kt index b343c26..fc78609 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatedReconfigurationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReconfigurationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatorMeasurementContractTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorMeasurementContractTest.kt similarity index 92% rename from app/src/test/java/com/aryan/reader/paginatedreader/PaginatorMeasurementContractTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorMeasurementContractTest.kt index cda31ef..4db74f4 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/PaginatorMeasurementContractTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/PaginatorMeasurementContractTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/ReaderLinkAnnotationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkAnnotationTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/paginatedreader/ReaderLinkAnnotationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkAnnotationTest.kt index ed11cd6..2fdb5d9 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/ReaderLinkAnnotationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderLinkAnnotationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.buildAnnotatedString import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/ReaderNavigationTargetsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargetsTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/paginatedreader/ReaderNavigationTargetsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargetsTest.kt index 9ea5f5f..a0326f9 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/ReaderNavigationTargetsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/ReaderNavigationTargetsTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.buildAnnotatedString -import com.aryan.reader.SearchResult +import org.dueattendant149.bookreader.SearchResult import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/RenderThemeApplierTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplierTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/paginatedreader/RenderThemeApplierTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplierTest.kt index 970edd8..6522f06 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/RenderThemeApplierTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/RenderThemeApplierTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.SpanStyle diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/StablePaginatedNavigationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigationTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/paginatedreader/StablePaginatedNavigationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigationTest.kt index a5a35e5..1491d75 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/StablePaginatedNavigationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/StablePaginatedNavigationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/paginatedreader/data/BookCacheDaoTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDaoTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/paginatedreader/data/BookCacheDaoTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDaoTest.kt index 385e513..7729538 100644 --- a/app/src/test/java/com/aryan/reader/paginatedreader/data/BookCacheDaoTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/paginatedreader/data/BookCacheDaoTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.paginatedreader.data +package org.dueattendant149.bookreader.paginatedreader.data import androidx.room.Room -import com.aryan.reader.paginatedreader.Page +import org.dueattendant149.bookreader.paginatedreader.Page import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.encodeToByteArray import kotlinx.serialization.protobuf.ProtoBuf diff --git a/app/src/test/java/com/aryan/reader/pdf/MagnifierGeometryTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/MagnifierGeometryTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/pdf/MagnifierGeometryTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/MagnifierGeometryTest.kt index ba97fbf..9616845 100644 --- a/app/src/test/java/com/aryan/reader/pdf/MagnifierGeometryTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/MagnifierGeometryTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.Rect import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfBitmapPoolTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfBitmapPoolTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/pdf/PdfBitmapPoolTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfBitmapPoolTest.kt index 6524c5a..cc3dfe0 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfBitmapPoolTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfBitmapPoolTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.core.graphics.createBitmap import org.junit.After diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfOneHandZoomTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoomTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/pdf/PdfOneHandZoomTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoomTest.kt index ea2c6a9..3ec0b2d 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfOneHandZoomTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfOneHandZoomTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderCoreLogicTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderCoreLogicTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderCoreLogicTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderCoreLogicTest.kt index 531b6e7..135f291 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderCoreLogicTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderCoreLogicTest.kt @@ -1,18 +1,18 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.graphics.RectF import android.graphics.Rect import android.net.Uri import androidx.compose.ui.graphics.Color -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfAnnotationRepository -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.pdf.ocr.OcrBlock -import com.aryan.reader.pdf.ocr.OcrElement -import com.aryan.reader.pdf.ocr.OcrLine -import com.aryan.reader.pdf.ocr.OcrResult +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotationRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.ocr.OcrBlock +import org.dueattendant149.bookreader.pdf.ocr.OcrElement +import org.dueattendant149.bookreader.pdf.ocr.OcrLine +import org.dueattendant149.bookreader.pdf.ocr.OcrResult import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderPreferencesTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderPreferencesTest.kt similarity index 98% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderPreferencesTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderPreferencesTest.kt index cd7859a..e0d944b 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderPreferencesTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderPreferencesTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import android.content.SharedPreferences import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.epubreader.SystemUiMode -import com.aryan.reader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.epubreader.SystemUiMode +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode import io.mockk.every import io.mockk.mockk import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderRepositoryTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRepositoryTest.kt similarity index 94% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderRepositoryTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRepositoryTest.kt index c12a9b1..35c2ee9 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderRepositoryTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRepositoryTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.Color -import com.aryan.reader.pdf.data.PageLayoutRepository -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfAnnotationRepository -import com.aryan.reader.pdf.data.PdfHighlightRepository -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.PdfTextBoxRepository -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.PageLayoutRepository +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfAnnotationRepository +import org.dueattendant149.bookreader.pdf.data.PdfHighlightRepository +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.PdfTextBoxRepository +import org.dueattendant149.bookreader.pdf.data.VirtualPage import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderRichTextTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRichTextTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderRichTextTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRichTextTest.kt index 57e3d45..5674fd3 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderRichTextTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderRichTextTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context import androidx.compose.ui.graphics.Color @@ -10,7 +10,7 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.sp -import com.aryan.reader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.pdf.data.VirtualPage import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderSerializerTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSerializerTest.kt similarity index 95% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderSerializerTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSerializerTest.kt index bb87fe9..dfc16b7 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderSerializerTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSerializerTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.RectF import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.pdf.data.AnnotationSerializer -import com.aryan.reader.pdf.data.HighlightSerializer -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.TextBoxSerializer -import com.aryan.reader.shared.pdf.SharedPdfAnnotationComment +import org.dueattendant149.bookreader.pdf.data.AnnotationSerializer +import org.dueattendant149.bookreader.pdf.data.HighlightSerializer +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.TextBoxSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationComment import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt similarity index 92% rename from app/src/test/java/com/aryan/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt index 1078858..ec020cd 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReaderSettingsAndSharedModelsTest.kt @@ -1,22 +1,22 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.BuildConfig -import com.aryan.reader.FileType -import com.aryan.reader.pdf.data.AnnotationSettingsRepository -import com.aryan.reader.pdf.data.AnnotationToolSettings -import com.aryan.reader.pdf.data.TextStyleConfig -import com.aryan.reader.pdf.data.ToolConfig -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.PdfZoomSpec -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.BuildConfig +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.pdf.data.AnnotationSettingsRepository +import org.dueattendant149.bookreader.pdf.data.AnnotationToolSettings +import org.dueattendant149.bookreader.pdf.data.TextStyleConfig +import org.dueattendant149.bookreader.pdf.data.ToolConfig +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfReleaseRulesTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReleaseRulesTest.kt similarity index 64% rename from app/src/test/java/com/aryan/reader/pdf/PdfReleaseRulesTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReleaseRulesTest.kt index 8793996..aca08b2 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfReleaseRulesTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfReleaseRulesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import java.io.File import org.junit.Assert.assertTrue @@ -10,10 +10,10 @@ class PdfReleaseRulesTest { fun `release rules keep pdf reader and pdfium internals`() { val rules = readProguardRules() - assertTrue(rules.contains("-keep class com.aryan.reader.pdf.PdfViewerScreenKt")) - assertTrue(rules.contains("-keep class com.aryan.reader.pdf.PdfPageComposableKt")) + assertTrue(rules.contains("-keep class org.dueattendant149.bookreader.pdf.PdfViewerScreenKt")) + assertTrue(rules.contains("-keep class org.dueattendant149.bookreader.pdf.PdfPageComposableKt")) assertTrue(rules.contains("-keep class io.legere.pdfiumandroid.**")) - assertTrue(rules.contains("-keep class com.aryan.reader.pdf.NativePdfiumBridge")) + assertTrue(rules.contains("-keep class org.dueattendant149.bookreader.pdf.NativePdfiumBridge")) } private fun readProguardRules(): String { diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfTextRepositoryTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfTextRepositoryTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/pdf/PdfTextRepositoryTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfTextRepositoryTest.kt index c32a053..77f2578 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfTextRepositoryTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfTextRepositoryTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.content.Context -import com.aryan.reader.SearchResult -import com.aryan.reader.pdf.data.PdfMetaDao -import com.aryan.reader.pdf.data.PdfMetadata -import com.aryan.reader.pdf.data.PdfSearchIndex -import com.aryan.reader.pdf.data.PdfSearchMatch -import com.aryan.reader.pdf.data.PdfTextDao -import com.aryan.reader.pdf.data.PdfTextDatabase -import com.aryan.reader.pdf.data.PdfTextRepository -import com.aryan.reader.pdf.data.SmartSearchResult +import org.dueattendant149.bookreader.SearchResult +import org.dueattendant149.bookreader.pdf.data.PdfMetaDao +import org.dueattendant149.bookreader.pdf.data.PdfMetadata +import org.dueattendant149.bookreader.pdf.data.PdfSearchIndex +import org.dueattendant149.bookreader.pdf.data.PdfSearchMatch +import org.dueattendant149.bookreader.pdf.data.PdfTextDao +import org.dueattendant149.bookreader.pdf.data.PdfTextDatabase +import org.dueattendant149.bookreader.pdf.data.PdfTextRepository +import org.dueattendant149.bookreader.pdf.data.SmartSearchResult import io.mockk.coEvery import io.mockk.coVerify import io.mockk.coVerifyOrder diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfVerticalReaderThemeTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReaderThemeTest.kt similarity index 91% rename from app/src/test/java/com/aryan/reader/pdf/PdfVerticalReaderThemeTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReaderThemeTest.kt index 5576483..71859dd 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfVerticalReaderThemeTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfVerticalReaderThemeTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.ui.graphics.Color -import com.aryan.reader.ReaderTheme +import org.dueattendant149.bookreader.ReaderTheme import org.junit.Assert.assertEquals import org.junit.Assert.assertNotEquals import org.junit.Test diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfZoomLockStateTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfZoomLockStateTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/pdf/PdfZoomLockStateTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfZoomLockStateTest.kt index 357a5be..43988b2 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfZoomLockStateTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfZoomLockStateTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import androidx.compose.ui.geometry.Offset -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/pdf/PdfiumAnnotationExporterTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporterTest.kt similarity index 97% rename from app/src/test/java/com/aryan/reader/pdf/PdfiumAnnotationExporterTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporterTest.kt index 676e18d..1026079 100644 --- a/app/src/test/java/com/aryan/reader/pdf/PdfiumAnnotationExporterTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pdf/PdfiumAnnotationExporterTest.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.pdf +package org.dueattendant149.bookreader.pdf import android.graphics.RectF import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.pdf.data.PdfAnnotation -import com.aryan.reader.pdf.data.PdfTextBox -import com.aryan.reader.pdf.data.VirtualPage -import com.aryan.reader.shared.pdf.SharedPdfAnnotationComment +import org.dueattendant149.bookreader.pdf.data.PdfAnnotation +import org.dueattendant149.bookreader.pdf.data.PdfTextBox +import org.dueattendant149.bookreader.pdf.data.VirtualPage +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationComment import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/com/aryan/reader/pptx/PptxDocumentParserTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/pptx/PptxDocumentParserTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/pptx/PptxDocumentParserTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/pptx/PptxDocumentParserTest.kt index 5176540..10aeb30 100644 --- a/app/src/test/java/com/aryan/reader/pptx/PptxDocumentParserTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/pptx/PptxDocumentParserTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.pptx +package org.dueattendant149.bookreader.pptx import android.content.ContentResolver import android.content.Context import android.net.Uri -import com.aryan.reader.FileType -import com.aryan.reader.pdf.DocumentFactory +import org.dueattendant149.bookreader.FileType +import org.dueattendant149.bookreader.pdf.DocumentFactory import io.legere.pdfiumandroid.suspend.PdfiumCoreKt import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/aryan/reader/tts/TtsCacheManagerSecurityTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsCacheManagerSecurityTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/tts/TtsCacheManagerSecurityTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsCacheManagerSecurityTest.kt index 0d1f783..f8338af 100644 --- a/app/src/test/java/com/aryan/reader/tts/TtsCacheManagerSecurityTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsCacheManagerSecurityTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.Context import org.junit.Assert.assertTrue diff --git a/app/src/test/java/com/aryan/reader/tts/TtsChunkNavigationTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsChunkNavigationTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/tts/TtsChunkNavigationTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsChunkNavigationTest.kt index 1e579cd..ccbc788 100644 --- a/app/src/test/java/com/aryan/reader/tts/TtsChunkNavigationTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsChunkNavigationTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import androidx.media3.common.util.UnstableApi import org.junit.Assert.assertEquals diff --git a/app/src/test/java/com/aryan/reader/tts/TtsModePolicyTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsModePolicyTest.kt similarity index 99% rename from app/src/test/java/com/aryan/reader/tts/TtsModePolicyTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsModePolicyTest.kt index dbb4fb0..eec0bbd 100644 --- a/app/src/test/java/com/aryan/reader/tts/TtsModePolicyTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsModePolicyTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.speech.tts.Voice import androidx.media3.common.util.UnstableApi diff --git a/app/src/test/java/com/aryan/reader/tts/TtsSpeakerPreferencesTest.kt b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsSpeakerPreferencesTest.kt similarity index 96% rename from app/src/test/java/com/aryan/reader/tts/TtsSpeakerPreferencesTest.kt rename to app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsSpeakerPreferencesTest.kt index 85f084d..3cff4e5 100644 --- a/app/src/test/java/com/aryan/reader/tts/TtsSpeakerPreferencesTest.kt +++ b/app/src/test/java/com/dueattendant149/bookreader/reader/tts/TtsSpeakerPreferencesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.tts +package org.dueattendant149.bookreader.tts import android.content.Context import org.junit.Assert.assertEquals diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts index dbb906a..e0cd987 100644 --- a/desktopApp/build.gradle.kts +++ b/desktopApp/build.gradle.kts @@ -1466,7 +1466,7 @@ kotlin { compose.desktop { application { - mainClass = "com.aryan.reader.desktop.LauncherKt" + mainClass = "org.dueattendant149.bookreader.desktop.LauncherKt" desktopPackagingJavaHome?.let { javaHome = it } jvmArgs("--add-opens", "java.desktop/sun.awt=ALL-UNNAMED") diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubLoader.kt b/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubLoader.kt deleted file mode 100644 index d165b07..0000000 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubLoader.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.aryan.reader.desktop - -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedJvmBookLoader -import java.io.File - -object DesktopEpubLoader { - fun load(file: File): SharedEpubBook { - return SharedJvmBookLoader.load(file, FileType.EPUB) - } -} diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAccountProfileRepository.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAccountProfileRepository.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAccountProfileRepository.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAccountProfileRepository.kt index 25019b5..03181c1 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAccountProfileRepository.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAccountProfileRepository.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiByokStore.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStore.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiByokStore.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStore.kt index 09d0be7..5a5dfdf 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiByokStore.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStore.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.DEFAULT_CLOUD_TTS_SPEAKER_ID -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL_ID -import com.aryan.reader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.DEFAULT_CLOUD_TTS_SPEAKER_ID +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL_ID +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings import com.sun.jna.Library import com.sun.jna.Memory import com.sun.jna.Native @@ -21,7 +21,7 @@ private const val WINDOWS_CRED_PERSIST_LOCAL_MACHINE = 2 private const val WINDOWS_ERROR_NOT_FOUND = 1168 private const val LINUX_SECRET_SCHEMA_DONT_MATCH_NAME = 2 private const val LINUX_SECRET_SCHEMA_ATTRIBUTE_STRING = 0 -private const val LINUX_SECRET_SCHEMA_NAME = "com.aryan.reader.Secret" +private const val LINUX_SECRET_SCHEMA_NAME = "org.dueattendant149.bookreader.Secret" private const val LINUX_SECRET_COLLECTION_DEFAULT = "default" private const val LINUX_SECRET_SERVICE_APPLICATION_ATTRIBUTE = "application" private const val LINUX_SECRET_SERVICE_APPLICATION_VALUE = "Episteme.Reader" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiHub.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiHub.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiHub.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiHub.kt index 29debfe..391979b 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAiHub.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiHub.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.verticalScroll @@ -38,10 +38,10 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.RecapResult -import com.aryan.reader.shared.SummarizationResult -import com.aryan.reader.shared.ui.SharedMarkdownText -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.RecapResult +import org.dueattendant149.bookreader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.ui.SharedMarkdownText +import org.dueattendant149.bookreader.shared.ui.readerString @Composable internal fun DesktopAiHubSheet( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppHost.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppHost.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppHost.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppHost.kt index 735aee4..ac63f0b 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppHost.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppHost.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -36,13 +36,13 @@ import androidx.compose.ui.window.WindowPosition import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.application import androidx.compose.ui.window.rememberWindowState -import com.aryan.reader.shared.AppContrastOption -import com.aryan.reader.shared.AppThemeMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedJvmBookLoadSemanticMode -import com.aryan.reader.shared.ui.SharedAppTheme -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.AppContrastOption +import org.dueattendant149.bookreader.shared.AppThemeMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoadSemanticMode +import org.dueattendant149.bookreader.shared.ui.SharedAppTheme +import org.dueattendant149.bookreader.shared.ui.readerString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppState.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppState.kt similarity index 88% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppState.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppState.kt index 485e86e..686e4ae 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAppState.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAppState.kt @@ -1,16 +1,16 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookShelfRef -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.SharedLibraryProjectionInput -import com.aryan.reader.shared.SharedLibrarySnapshot -import com.aryan.reader.shared.SharedLibraryStateProjector -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.ShelfRecord -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter -import com.aryan.reader.shared.ui.SharedAppTab +import org.dueattendant149.bookreader.shared.BookShelfRef +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.SharedLibraryProjectionInput +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshot +import org.dueattendant149.bookreader.shared.SharedLibraryStateProjector +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.ShelfRecord +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.ui.SharedAppTab internal val DesktopInitialAppTab = SharedAppTab.LIBRARY diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAtomicFile.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAtomicFile.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAtomicFile.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAtomicFile.kt index 930308d..c58f3df 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopAtomicFile.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAtomicFile.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.nio.file.AtomicMoveNotSupportedException diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBookImporter.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporter.kt similarity index 93% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBookImporter.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporter.kt index fada6ce..55268cf 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBookImporter.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporter.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ImportedBookFile -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.ImportedBookFile +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities import java.io.File import java.nio.file.Files import java.nio.file.StandardCopyOption diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBuildProfile.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfile.kt similarity index 89% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBuildProfile.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfile.kt index c7a8681..4055007 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopBuildProfile.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfile.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SharedLegalLinks -import com.aryan.reader.shared.SharedLegalProfile -import com.aryan.reader.shared.sharedLegalLinksForProfile +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SharedLegalLinks +import org.dueattendant149.bookreader.shared.SharedLegalProfile +import org.dueattendant149.bookreader.shared.sharedLegalLinksForProfile internal const val DesktopFlavorProperty = "episteme.desktop.flavor" internal const val DesktopVersionProperty = "episteme.desktop.version" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopByokAiAdapter.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopByokAiAdapter.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopByokAiAdapter.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopByokAiAdapter.kt index 2e002c4..e51f5dc 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopByokAiAdapter.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopByokAiAdapter.kt @@ -1,14 +1,14 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.AiAdapter -import com.aryan.reader.shared.AiDefinitionResult -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiFeature -import com.aryan.reader.shared.ReaderByokTextRequest -import com.aryan.reader.shared.ReaderByokTextRequestResult -import com.aryan.reader.shared.ReaderByokTextRequests -import com.aryan.reader.shared.RecapResult -import com.aryan.reader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.AiAdapter +import org.dueattendant149.bookreader.shared.AiDefinitionResult +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiFeature +import org.dueattendant149.bookreader.shared.ReaderByokTextRequest +import org.dueattendant149.bookreader.shared.ReaderByokTextRequestResult +import org.dueattendant149.bookreader.shared.ReaderByokTextRequests +import org.dueattendant149.bookreader.shared.RecapResult +import org.dueattendant149.bookreader.shared.SummarizationResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudConfig.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfig.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudConfig.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfig.kt index 1a93985..2ca06c6 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudConfig.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfig.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.util.Properties diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudRepositories.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudRepositories.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudRepositories.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudRepositories.kt index 82c818f..5b3ea79 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudRepositories.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudRepositories.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.SharedFileCapabilities import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.encodeToString diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSidecarSync.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSidecarSync.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSidecarSync.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSidecarSync.kt index 361666c..31f86bb 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSidecarSync.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSidecarSync.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSync.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSync.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSync.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSync.kt index 846f6bf..382ac97 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSync.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSync.kt @@ -1,24 +1,24 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.BookShelfRef -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.EpubBookmark -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.SharedCloudBookMetadataWinner -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.ShelfRecord -import com.aryan.reader.shared.sharedCloudBookMetadataWinner -import com.aryan.reader.shared.shouldDownloadRemoteCloudBookContent -import com.aryan.reader.shared.shouldUploadLocalCloudBookContent -import com.aryan.reader.shared.sharedCloudBookContentFileName -import com.aryan.reader.shared.toStablePositionCfi -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.BookShelfRef +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.EpubBookmark +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.SharedCloudBookMetadataWinner +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.ShelfRecord +import org.dueattendant149.bookreader.shared.sharedCloudBookMetadataWinner +import org.dueattendant149.bookreader.shared.shouldDownloadRemoteCloudBookContent +import org.dueattendant149.bookreader.shared.shouldUploadLocalCloudBookContent +import org.dueattendant149.bookreader.shared.sharedCloudBookContentFileName +import org.dueattendant149.bookreader.shared.toStablePositionCfi +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark import java.io.File internal data class DesktopCloudSyncInput( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncDiagnostics.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncDiagnostics.kt similarity index 91% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncDiagnostics.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncDiagnostics.kt index 37c5517..4ac30f5 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncDiagnostics.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncDiagnostics.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.SharedFileCapabilities internal const val DesktopCloudSyncLogTag = "EpistemeCloudSync" internal const val DesktopCloudAnnotationSyncLogTag = "EpistemeCloudAnnotations" @@ -63,7 +63,7 @@ internal fun BookItem.hasSameCloudReaderPosition(other: BookItem): Boolean { progressMatches } -private fun com.aryan.reader.shared.FileType.usesCloudLocatorForDiagnostics(): Boolean { +private fun org.dueattendant149.bookreader.shared.FileType.usesCloudLocatorForDiagnostics(): Boolean { return this != FileType.PDF && this != FileType.PPTX && !SharedFileCapabilities.isComicArchive(this) } diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncSettingsStore.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncSettingsStore.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncSettingsStore.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncSettingsStore.kt index 5749fce..0b2b0e9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCloudSyncSettingsStore.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncSettingsStore.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.util.Properties diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopComicArchive.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchive.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopComicArchive.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchive.kt index c411916..ab7ad33 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopComicArchive.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchive.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsStreamReference +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsStreamReference import com.sun.jna.Library import com.sun.jna.Native import com.sun.jna.Pointer diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCustomFontStore.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStore.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCustomFontStore.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStore.kt index 6d4aad5..54a86b9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopCustomFontStore.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStore.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.CustomFontItem import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonPrimitive diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopDiagnostics.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopDiagnostics.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopDiagnostics.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopDiagnostics.kt index 6c2ee5f..ded1895 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopDiagnostics.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopDiagnostics.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop internal const val DesktopDiagnosticsProperty = "episteme.desktop.diagnostics" private const val DesktopDiagnosticsTagsProperty = "episteme.desktop.diagnostics.tags" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsing.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsing.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsing.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsing.kt index 1135c79..9884b1e 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsing.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsing.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.toStableReaderPositionCfi -import com.aryan.reader.shared.ui.SharedNativeReaderLinkClick +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.toStableReaderPositionCfi +import org.dueattendant149.bookreader.shared.ui.SharedNativeReaderLinkClick import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonNull import kotlinx.serialization.json.contentOrNull diff --git a/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubLoader.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubLoader.kt new file mode 100644 index 0000000..e5e9e62 --- /dev/null +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubLoader.kt @@ -0,0 +1,12 @@ +package org.dueattendant149.bookreader.desktop + +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoader +import java.io.File + +object DesktopEpubLoader { + fun load(file: File): SharedEpubBook { + return SharedJvmBookLoader.load(file, FileType.EPUB) + } +} diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubPagination.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPagination.kt similarity index 89% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubPagination.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPagination.kt index 0084d44..7d7b5de 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubPagination.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPagination.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -10,11 +10,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.reader.ReaderLayoutSignature -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderViewportSpec -import com.aryan.reader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.ReaderLayoutSignature +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderViewportSpec +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook internal data class DesktopEpubPaginationRequest( val bookId: String, diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubWebView.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubWebView.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubWebView.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubWebView.kt index 972e324..8013732 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopEpubWebView.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubWebView.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -8,10 +8,10 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.ui.ReaderContentNavigationTarget +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.ui.ReaderContentNavigationTarget import kotlinx.coroutines.launch @Composable diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopExternalLinks.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopExternalLinks.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopExternalLinks.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopExternalLinks.kt index b3ad451..2b8c4a9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopExternalLinks.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopExternalLinks.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.readerString import java.awt.Desktop import java.net.URI import java.net.URLEncoder diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacement.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacement.kt similarity index 90% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacement.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacement.kt index 17d198e..a106401 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacement.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacement.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop internal data class DesktopFeatureNoticePlacement( val readerWindowId: String? = null diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDialogs.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDialogs.kt similarity index 93% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDialogs.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDialogs.kt index 92ba0b6..ebacf70 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDialogs.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDialogs.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.ImportedBookFile -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.ImportedBookFile +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities import java.awt.FileDialog import java.awt.Frame import java.io.File diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDropTarget.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDropTarget.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDropTarget.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDropTarget.kt index e83341e..240ef38 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFileDropTarget.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFileDropTarget.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -20,11 +20,11 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.ImportedBookFile -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.ui.readerQuantityString -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ImportedBookFile +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.ui.readerQuantityString +import org.dueattendant149.bookreader.shared.ui.readerString import java.awt.Component import java.awt.Container import java.awt.EventQueue diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFirebaseAuthRepository.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFirebaseAuthRepository.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFirebaseAuthRepository.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFirebaseAuthRepository.kt index 1c82cb5..89f21c4 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFirebaseAuthRepository.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFirebaseAuthRepository.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.UserData +import org.dueattendant149.bookreader.shared.UserData import com.sun.net.httpserver.HttpServer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractor.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractor.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractor.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractor.kt index 6d66c03..7a1a4bb 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractor.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractor.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.reader.SharedJvmBookLoader +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoader import java.awt.Color import java.awt.Font import java.awt.GradientPaint diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncFeedback.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncFeedback.kt similarity index 73% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncFeedback.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncFeedback.kt index 3f241c9..e612816 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncFeedback.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncFeedback.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.SharedReaderScreenState internal fun desktopFolderSyncCompletedState( state: SharedReaderScreenState, diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncLog.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncLog.kt similarity index 92% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncLog.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncLog.kt index 818f43d..44149df 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopFolderSyncLog.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderSyncLog.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop private const val DesktopFolderSyncLogTag = "EpistemeFolderSync" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopGeminiCloudTtsAdapter.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopGeminiCloudTtsAdapter.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopGeminiCloudTtsAdapter.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopGeminiCloudTtsAdapter.kt index f3c8ec0..2cba6df 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopGeminiCloudTtsAdapter.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopGeminiCloudTtsAdapter.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderTtsCacheSummary -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.ReaderTtsFileCacheManager -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.TtsAdapter -import com.aryan.reader.shared.createReaderTtsWavHeaderUnknownLength -import com.aryan.reader.shared.patchReaderTtsWavHeader -import com.aryan.reader.shared.splitReaderTextIntoTtsChunks +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderTtsCacheSummary +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsFileCacheManager +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.TtsAdapter +import org.dueattendant149.bookreader.shared.createReaderTtsWavHeaderUnknownLength +import org.dueattendant149.bookreader.shared.patchReaderTtsWavHeader +import org.dueattendant149.bookreader.shared.splitReaderTextIntoTtsChunks import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ensureActive diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLanguageSettings.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLanguageSettings.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLanguageSettings.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLanguageSettings.kt index 5382def..71f3cf2 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLanguageSettings.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLanguageSettings.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -22,7 +22,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.readerString import java.io.File import java.util.Properties diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabase.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabase.kt similarity index 88% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabase.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabase.kt index ff6bc2e..1b087c9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabase.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabase.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.SharedLibrarySnapshot -import com.aryan.reader.shared.SharedLibrarySnapshotJson +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshot +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshotJson import java.io.File import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryUi.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryUi.kt index 007ffc4..b93b635 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLibraryUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -31,25 +31,25 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.AppAction -import com.aryan.reader.shared.BannerMessage -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedFolderPathResolver -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.Shelf -import com.aryan.reader.shared.SmartCollectionDefinition -import com.aryan.reader.shared.SmartField -import com.aryan.reader.shared.SmartOperator -import com.aryan.reader.shared.SmartRule -import com.aryan.reader.shared.Tag -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.ui.NonReaderLibraryTab -import com.aryan.reader.shared.ui.SharedLibraryScreen -import com.aryan.reader.shared.ui.SharedStableOutlinedTextField -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.AppAction +import org.dueattendant149.bookreader.shared.BannerMessage +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedFolderPathResolver +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.Shelf +import org.dueattendant149.bookreader.shared.SmartCollectionDefinition +import org.dueattendant149.bookreader.shared.SmartField +import org.dueattendant149.bookreader.shared.SmartOperator +import org.dueattendant149.bookreader.shared.SmartRule +import org.dueattendant149.bookreader.shared.Tag +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.ui.NonReaderLibraryTab +import org.dueattendant149.bookreader.shared.ui.SharedLibraryScreen +import org.dueattendant149.bookreader.shared.ui.SharedStableOutlinedTextField +import org.dueattendant149.bookreader.shared.ui.readerString import java.io.File internal fun BookItem.hasEmbeddedMetadataChange(updated: BookItem): Boolean { diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSync.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSync.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSync.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSync.kt index 4c8d099..9c078af 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSync.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSync.kt @@ -1,30 +1,30 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.BookShelfRef -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.LOCAL_FOLDER_ANNOTATION_SUFFIX -import com.aryan.reader.shared.LOCAL_FOLDER_SIDECAR_HASH_PREFIX -import com.aryan.reader.shared.LOCAL_FOLDER_SYNC_DATA_DIR -import com.aryan.reader.shared.LocalFolderSyncEngine -import com.aryan.reader.shared.LocalFolderSyncStats -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedFolderBookMetadata -import com.aryan.reader.shared.SharedFolderScannedFile -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.SyncedFolder -import com.aryan.reader.shared.localFolderSyncAnnotationFileName -import com.aryan.reader.shared.localFolderSyncAnnotationTempFileName -import com.aryan.reader.shared.localFolderSyncMetadataFileName -import com.aryan.reader.shared.localFolderSyncMetadataTempFileName -import com.aryan.reader.shared.localFolderSyncSidecarStem -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec -import com.aryan.reader.shared.pdf.SharedPdfRichTextLog -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer -import com.aryan.reader.shared.toSharedFolderBookMetadata -import com.aryan.reader.shared.toStablePositionCfi +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.BookShelfRef +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_ANNOTATION_SUFFIX +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SIDECAR_HASH_PREFIX +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SYNC_DATA_DIR +import org.dueattendant149.bookreader.shared.LocalFolderSyncEngine +import org.dueattendant149.bookreader.shared.LocalFolderSyncStats +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedFolderBookMetadata +import org.dueattendant149.bookreader.shared.SharedFolderScannedFile +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.SyncedFolder +import org.dueattendant149.bookreader.shared.localFolderSyncAnnotationFileName +import org.dueattendant149.bookreader.shared.localFolderSyncAnnotationTempFileName +import org.dueattendant149.bookreader.shared.localFolderSyncMetadataFileName +import org.dueattendant149.bookreader.shared.localFolderSyncMetadataTempFileName +import org.dueattendant149.bookreader.shared.localFolderSyncSidecarStem +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextLog +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.toSharedFolderBookMetadata +import org.dueattendant149.bookreader.shared.toStablePositionCfi import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLogFormatting.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLogFormatting.kt similarity index 83% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLogFormatting.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLogFormatting.kt index 673db6a..95d9de9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopLogFormatting.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLogFormatting.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop internal fun String.logPreview(maxLength: Int = 96): String { return replace(Regex("\\s+"), " ") diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsCoverImage.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsCoverImage.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsCoverImage.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsCoverImage.kt index e39304c..7a984be 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsCoverImage.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsCoverImage.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -18,8 +18,8 @@ import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsEntry +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsEntry import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.skia.Image as SkiaImage diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsRepository.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepository.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsRepository.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepository.kt index 1e46f0f..f694c4e 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopOpdsRepository.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepository.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.opds.OpdsAcquisition -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsEntry -import com.aryan.reader.shared.opds.OpdsFeed -import com.aryan.reader.shared.opds.SharedOpdsCatalogs -import com.aryan.reader.shared.opds.SharedOpdsDownloadNamer -import com.aryan.reader.shared.opds.SharedOpdsParser -import com.aryan.reader.shared.opds.SharedOpdsRepository +import org.dueattendant149.bookreader.shared.opds.OpdsAcquisition +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsEntry +import org.dueattendant149.bookreader.shared.opds.OpdsFeed +import org.dueattendant149.bookreader.shared.opds.SharedOpdsCatalogs +import org.dueattendant149.bookreader.shared.opds.SharedOpdsDownloadNamer +import org.dueattendant149.bookreader.shared.opds.SharedOpdsParser +import org.dueattendant149.bookreader.shared.opds.SharedOpdsRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.Closeable diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPaidAiAdapter.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiAdapter.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPaidAiAdapter.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiAdapter.kt index b907520..95a9d08 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPaidAiAdapter.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiAdapter.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.AiAdapter -import com.aryan.reader.shared.AiDefinitionResult -import com.aryan.reader.shared.RecapResult -import com.aryan.reader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.AiAdapter +import org.dueattendant149.bookreader.shared.AiDefinitionResult +import org.dueattendant149.bookreader.shared.RecapResult +import org.dueattendant149.bookreader.shared.SummarizationResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAnnotationUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAnnotationUi.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAnnotationUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAnnotationUi.kt index b5b7a75..5b6d718 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAnnotationUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAnnotationUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -47,25 +47,25 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.pdf.DEFAULT_SHARED_PDF_COMMENT_AUTHOR -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationComment -import com.aryan.reader.shared.pdf.SharedPdfAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotation -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.pdfCommentChildren -import com.aryan.reader.shared.pdf.sharedPdfStrokePercent -import com.aryan.reader.shared.pdf.sharedPdfStrokeWidthRange -import com.aryan.reader.shared.pdf.sharedPdfTextStyle -import com.aryan.reader.shared.pdf.visiblePdfAnnotationComments -import com.aryan.reader.shared.pdf.withoutPdfCommentThread -import com.aryan.reader.shared.pdf.withSharedPdfTextStyle -import com.aryan.reader.shared.ui.SharedHsvColorPickerDialog -import com.aryan.reader.shared.ui.SharedPdfTextStyleControls -import com.aryan.reader.shared.ui.SharedStableOutlinedTextField -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.pdf.DEFAULT_SHARED_PDF_COMMENT_AUTHOR +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationComment +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.pdfCommentChildren +import org.dueattendant149.bookreader.shared.pdf.sharedPdfStrokePercent +import org.dueattendant149.bookreader.shared.pdf.sharedPdfStrokeWidthRange +import org.dueattendant149.bookreader.shared.pdf.sharedPdfTextStyle +import org.dueattendant149.bookreader.shared.pdf.visiblePdfAnnotationComments +import org.dueattendant149.bookreader.shared.pdf.withoutPdfCommentThread +import org.dueattendant149.bookreader.shared.pdf.withSharedPdfTextStyle +import org.dueattendant149.bookreader.shared.ui.SharedHsvColorPickerDialog +import org.dueattendant149.bookreader.shared.ui.SharedPdfTextStyleControls +import org.dueattendant149.bookreader.shared.ui.SharedStableOutlinedTextField +import org.dueattendant149.bookreader.shared.ui.readerString import java.text.DateFormat import java.util.Date import java.util.UUID diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAppearance.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAppearance.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAppearance.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAppearance.kt index 6277bf3..b56fb3e 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfAppearance.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfAppearance.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -31,10 +31,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.BuiltInPdfReaderThemes -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.BuiltInPdfReaderThemes +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.reader.ReaderSettings internal enum class DesktopPdfInspectorTab(val title: String) { APPEARANCE("Appearance"), diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfChromeUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfChromeUi.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfChromeUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfChromeUi.kt index ee21b77..5018a0a 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfChromeUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfChromeUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -53,12 +53,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.SearchHighlightMode -import com.aryan.reader.shared.pdf.SharedPdfSearchResult -import com.aryan.reader.shared.ui.ReaderMinimalSlider -import com.aryan.reader.shared.ui.ReaderTooltipIconButton -import com.aryan.reader.shared.ui.SharedStableOutlinedTextField -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.SearchHighlightMode +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchResult +import org.dueattendant149.bookreader.shared.ui.ReaderMinimalSlider +import org.dueattendant149.bookreader.shared.ui.ReaderTooltipIconButton +import org.dueattendant149.bookreader.shared.ui.SharedStableOutlinedTextField +import org.dueattendant149.bookreader.shared.ui.readerString import kotlinx.coroutines.delay @Composable diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfFileActions.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActions.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfFileActions.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActions.kt index 24b0089..59c88bf 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfFileActions.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActions.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb @@ -7,13 +7,13 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.shared.SaveMode -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.SHARED_PDF_PAGE_BREAK_CHAR -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationExportMapper -import com.aryan.reader.shared.pdf.SharedPdfRichPageLayout -import com.aryan.reader.shared.pdf.sharedPdfTextPageRelativeFontSize +import org.dueattendant149.bookreader.shared.SaveMode +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.SHARED_PDF_PAGE_BREAK_CHAR +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationExportMapper +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichPageLayout +import org.dueattendant149.bookreader.shared.pdf.sharedPdfTextPageRelativeFontSize import java.awt.FileDialog import java.awt.Font import java.awt.Frame diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfInspectorUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfInspectorUi.kt similarity index 93% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfInspectorUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfInspectorUi.kt index 87e360f..780bc1b 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfInspectorUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfInspectorUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -38,26 +38,26 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.BuiltInPdfReaderThemes -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.SharedPdfRichTextController -import com.aryan.reader.shared.pdf.SharedPdfTextStyleConfig -import com.aryan.reader.shared.pdf.currentSharedPdfTextStyleConfig -import com.aryan.reader.shared.pdf.updateCurrentSharedPdfTextStyle -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.ui.SharedPdfHighlighterPaletteEditor -import com.aryan.reader.shared.ui.SharedPdfTextAnnotationDock -import com.aryan.reader.shared.ui.SharedReaderThemeControls -import com.aryan.reader.shared.ui.SharedReaderVerticalScrollbar -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedAcceleratedLazyWheelScroll +import org.dueattendant149.bookreader.shared.BuiltInPdfReaderThemes +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextController +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextStyleConfig +import org.dueattendant149.bookreader.shared.pdf.currentSharedPdfTextStyleConfig +import org.dueattendant149.bookreader.shared.pdf.updateCurrentSharedPdfTextStyle +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.ui.SharedPdfHighlighterPaletteEditor +import org.dueattendant149.bookreader.shared.ui.SharedPdfTextAnnotationDock +import org.dueattendant149.bookreader.shared.ui.SharedReaderThemeControls +import org.dueattendant149.bookreader.shared.ui.SharedReaderVerticalScrollbar +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedAcceleratedLazyWheelScroll @Composable internal fun DesktopPdfInspectorPanel( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfKeyCommands.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfKeyCommands.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfKeyCommands.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfKeyCommands.kt index ca16662..a5b3adb 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfKeyCommands.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfKeyCommands.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.input.key.Key import androidx.compose.ui.input.key.KeyEvent diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationUi.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationUi.kt index 0f5f716..d9ee5b1 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -66,13 +66,13 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.PdfTocEntry -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfBookmark -import com.aryan.reader.shared.ui.SharedReaderVerticalScrollbar -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedAcceleratedLazyWheelScroll +import org.dueattendant149.bookreader.shared.PdfTocEntry +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmark +import org.dueattendant149.bookreader.shared.ui.SharedReaderVerticalScrollbar +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedAcceleratedLazyWheelScroll import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPage.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPage.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPage.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPage.kt index 11076f9..bf7c1e0 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPage.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPage.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.animation.Crossfade import androidx.compose.animation.core.tween @@ -40,31 +40,31 @@ import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.SearchHighlightMode -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.PdfZoomSpec -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotation -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.SharedPdfRichTextController -import com.aryan.reader.shared.pdf.SharedPdfSearchEngine -import com.aryan.reader.shared.pdf.SharedPdfSearchResult -import com.aryan.reader.shared.pdf.SharedPdfTextDraft -import com.aryan.reader.shared.pdf.sharedPdfTextStyle -import com.aryan.reader.shared.ui.SharedPdfAnnotationOverlay -import com.aryan.reader.shared.ui.SharedPdfEmbeddedAnnotationOverlay -import com.aryan.reader.shared.ui.SharedPdfInlineTextEditorOverlay -import com.aryan.reader.shared.ui.SharedPdfPageNumberOverlay -import com.aryan.reader.shared.ui.SharedPdfRichTextLayer -import com.aryan.reader.shared.ui.SharedPdfTextBoxEditorOverlay -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedPdfEmbeddedHitTest -import com.aryan.reader.shared.ui.sharedPdfHitTest -import com.aryan.reader.shared.ui.toSharedPdfPoint +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.SearchHighlightMode +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextController +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchEngine +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchResult +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextDraft +import org.dueattendant149.bookreader.shared.pdf.sharedPdfTextStyle +import org.dueattendant149.bookreader.shared.ui.SharedPdfAnnotationOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfEmbeddedAnnotationOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfInlineTextEditorOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfPageNumberOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfRichTextLayer +import org.dueattendant149.bookreader.shared.ui.SharedPdfTextBoxEditorOverlay +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedPdfEmbeddedHitTest +import org.dueattendant149.bookreader.shared.ui.sharedPdfHitTest +import org.dueattendant149.bookreader.shared.ui.toSharedPdfPoint import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPageInteractions.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPageInteractions.kt similarity index 93% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPageInteractions.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPageInteractions.kt index 2c84bc6..064ad73 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPageInteractions.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPageInteractions.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown @@ -7,22 +7,22 @@ import androidx.compose.ui.input.pointer.PointerInputScope import androidx.compose.ui.input.pointer.changedToUp import androidx.compose.ui.input.pointer.isSecondaryPressed import androidx.compose.ui.unit.IntSize -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfNormalizedPoint -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.PdfSelectionGeometry -import com.aryan.reader.shared.pdf.PdfTextCharBounds -import com.aryan.reader.shared.pdf.PdfZoomSpec -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfInkRenderer -import com.aryan.reader.shared.pdf.SharedPdfReaderAction -import com.aryan.reader.shared.pdf.SharedPdfReaderState -import com.aryan.reader.shared.pdf.SharedPdfTextDraft -import com.aryan.reader.shared.pdf.reduce -import com.aryan.reader.shared.ui.sharedPdfHitTest -import com.aryan.reader.shared.ui.toSharedPdfPoint +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfNormalizedPoint +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.PdfSelectionGeometry +import org.dueattendant149.bookreader.shared.pdf.PdfTextCharBounds +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfInkRenderer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderAction +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderState +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextDraft +import org.dueattendant149.bookreader.shared.pdf.reduce +import org.dueattendant149.bookreader.shared.ui.sharedPdfHitTest +import org.dueattendant149.bookreader.shared.ui.toSharedPdfPoint import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.withTimeout diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPasswordDialog.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPasswordDialog.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPasswordDialog.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPasswordDialog.kt index 9f14e03..adafc75 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfPasswordDialog.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfPasswordDialog.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Arrangement @@ -16,8 +16,8 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ui.SharedStableOutlinedTextField -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.SharedStableOutlinedTextField +import org.dueattendant149.bookreader.shared.ui.readerString @Composable internal fun DesktopPdfPasswordDialog( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReaderScreen.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReaderScreen.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReaderScreen.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReaderScreen.kt index d99ac7d..1be1c5c 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReaderScreen.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReaderScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade @@ -72,78 +72,78 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.AiAdapter -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiFeature -import com.aryan.reader.shared.ReaderAiResultState -import com.aryan.reader.shared.ReaderCloudTtsState -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderExternalLookupAction -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.ReaderTtsPlanner -import com.aryan.reader.shared.ReaderTtsProgress -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.SaveMode -import com.aryan.reader.shared.SearchHighlightMode -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SummarizationResult -import com.aryan.reader.shared.externalLookupUrl -import com.aryan.reader.shared.withTtsReplacements -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.PdfSpreadLayout -import com.aryan.reader.shared.pdf.PdfVisiblePageLayout -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotation -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.SharedPdfJumpHistory -import com.aryan.reader.shared.pdf.SharedPdfReaderAction -import com.aryan.reader.shared.pdf.SharedPdfReaderState -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.pdf.SharedPdfRichTextController -import com.aryan.reader.shared.pdf.SharedPdfRichTextLog -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer -import com.aryan.reader.shared.pdf.SharedPdfSearchEngine -import com.aryan.reader.shared.pdf.SharedPdfSearchResult -import com.aryan.reader.shared.pdf.SharedPdfTextAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfTextDraft -import com.aryan.reader.shared.pdf.SharedPdfTextStyleConfig -import com.aryan.reader.shared.pdf.mostVisiblePdfPageIndex -import com.aryan.reader.shared.pdf.pdfVerticalPageGapDp -import com.aryan.reader.shared.pdf.reduce -import com.aryan.reader.shared.pdf.sharedPdfTextStyle -import com.aryan.reader.shared.pdf.toAnnotation -import com.aryan.reader.shared.pdf.withBounds -import com.aryan.reader.shared.pdf.withSharedPdfTextStyle -import com.aryan.reader.shared.pdf.withStyle -import com.aryan.reader.shared.pdf.withText -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.readerCloudTtsControlsModel -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.ui.ReaderWorkspaceFileActionState -import com.aryan.reader.shared.ui.ReaderWorkspaceShell -import com.aryan.reader.shared.ui.LocalSharedStringResolver -import com.aryan.reader.shared.ui.SharedPdfAnnotationOverlay -import com.aryan.reader.shared.ui.SharedPdfEmbeddedAnnotationOverlay -import com.aryan.reader.shared.ui.SharedPdfInlineTextEditorOverlay -import com.aryan.reader.shared.ui.SharedPdfInteractionDock -import com.aryan.reader.shared.ui.SharedPdfPageNumberOverlay -import com.aryan.reader.shared.ui.SharedPdfRichTextHiddenInput -import com.aryan.reader.shared.ui.SharedPdfRichTextLayer -import com.aryan.reader.shared.ui.SharedPdfTextBoxEditorOverlay -import com.aryan.reader.shared.ui.SharedPdfVerticalScrollbar -import com.aryan.reader.shared.ui.SharedReaderTtsOverlayControls -import com.aryan.reader.shared.ui.pdfReaderWorkspaceModel -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedPdfEmbeddedHitTest -import com.aryan.reader.shared.ui.sharedPdfHitTest -import com.aryan.reader.shared.ui.toSharedPdfPoint +import org.dueattendant149.bookreader.shared.AiAdapter +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiFeature +import org.dueattendant149.bookreader.shared.ReaderAiResultState +import org.dueattendant149.bookreader.shared.ReaderCloudTtsState +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderExternalLookupAction +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsPlanner +import org.dueattendant149.bookreader.shared.ReaderTtsProgress +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.SaveMode +import org.dueattendant149.bookreader.shared.SearchHighlightMode +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.externalLookupUrl +import org.dueattendant149.bookreader.shared.withTtsReplacements +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.PdfSpreadLayout +import org.dueattendant149.bookreader.shared.pdf.PdfVisiblePageLayout +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.SharedPdfJumpHistory +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderAction +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderState +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextController +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextLog +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchEngine +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchResult +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextDraft +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextStyleConfig +import org.dueattendant149.bookreader.shared.pdf.mostVisiblePdfPageIndex +import org.dueattendant149.bookreader.shared.pdf.pdfVerticalPageGapDp +import org.dueattendant149.bookreader.shared.pdf.reduce +import org.dueattendant149.bookreader.shared.pdf.sharedPdfTextStyle +import org.dueattendant149.bookreader.shared.pdf.toAnnotation +import org.dueattendant149.bookreader.shared.pdf.withBounds +import org.dueattendant149.bookreader.shared.pdf.withSharedPdfTextStyle +import org.dueattendant149.bookreader.shared.pdf.withStyle +import org.dueattendant149.bookreader.shared.pdf.withText +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.readerCloudTtsControlsModel +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.ui.ReaderWorkspaceFileActionState +import org.dueattendant149.bookreader.shared.ui.ReaderWorkspaceShell +import org.dueattendant149.bookreader.shared.ui.LocalSharedStringResolver +import org.dueattendant149.bookreader.shared.ui.SharedPdfAnnotationOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfEmbeddedAnnotationOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfInlineTextEditorOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfInteractionDock +import org.dueattendant149.bookreader.shared.ui.SharedPdfPageNumberOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfRichTextHiddenInput +import org.dueattendant149.bookreader.shared.ui.SharedPdfRichTextLayer +import org.dueattendant149.bookreader.shared.ui.SharedPdfTextBoxEditorOverlay +import org.dueattendant149.bookreader.shared.ui.SharedPdfVerticalScrollbar +import org.dueattendant149.bookreader.shared.ui.SharedReaderTtsOverlayControls +import org.dueattendant149.bookreader.shared.ui.pdfReaderWorkspaceModel +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedPdfEmbeddedHitTest +import org.dueattendant149.bookreader.shared.ui.sharedPdfHitTest +import org.dueattendant149.bookreader.shared.ui.toSharedPdfPoint import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReflow.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflow.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReflow.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflow.kt index 82d464e..2e57abc 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfReflow.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflow.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.pdf.SharedPdfReflowHtml +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowHtml import java.io.File private const val DesktopPdfReflowSuffix = "_reflow" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbing.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbing.kt similarity index 73% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbing.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbing.kt index c1aea6b..f77e5fa 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbing.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbing.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.pdf.PdfSpreadLayout -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.pdf.PdfSpreadLayout +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import kotlin.math.roundToInt internal fun desktopPdfPageScrubTarget( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSelectionUi.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSelectionUi.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSelectionUi.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSelectionUi.kt index 8f8a1df..f1faa3f 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSelectionUi.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSelectionUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Canvas @@ -52,14 +52,14 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.ui.SharedHsvColorPickerDialog -import com.aryan.reader.shared.ui.SharedSelectionMenuRect -import com.aryan.reader.shared.ui.SharedSelectionMenuSize -import com.aryan.reader.shared.ui.SharedSelectionMenuViewport -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedSelectionMenuPlacement +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.ui.SharedHsvColorPickerDialog +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuRect +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuSize +import org.dueattendant149.bookreader.shared.ui.SharedSelectionMenuViewport +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedSelectionMenuPlacement import kotlin.math.roundToInt internal data class DesktopPdfTextSelection( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarEffects.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarEffects.kt similarity index 91% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarEffects.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarEffects.kt index b6f6543..a0976ce 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarEffects.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarEffects.kt @@ -1,16 +1,16 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfBookmark -import com.aryan.reader.shared.pdf.SharedPdfBookmarkSerializer -import com.aryan.reader.shared.pdf.SharedPdfRichDocument -import com.aryan.reader.shared.pdf.SharedPdfRichTextController -import com.aryan.reader.shared.pdf.SharedPdfRichTextLog -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer -import com.aryan.reader.shared.pdf.SharedPdfSearchResult +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmark +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmarkSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichDocument +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextController +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextLog +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchResult import java.io.File import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.isActive diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecars.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecars.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecars.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecars.kt index 3dda716..433796c 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSidecars.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecars.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.security.MessageDigest diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSyncSidecars.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSyncSidecars.kt similarity index 91% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSyncSidecars.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSyncSidecars.kt index cd06a93..d602e08 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfSyncSidecars.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSyncSidecars.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSidecarCodec -import com.aryan.reader.shared.pdf.SharedPdfBookmark -import com.aryan.reader.shared.pdf.SharedPdfBookmarkSerializer -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSidecarCodec +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmark +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmarkSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfTheme.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTheme.kt similarity index 88% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfTheme.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTheme.kt index 9d42bb6..bd23c2d 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfTheme.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTheme.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.pdf.pdfVerticalPageGapDp +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.pdf.pdfVerticalPageGapDp internal val DesktopDefaultPdfDisplayMode = PdfDisplayMode.PAGINATION internal val DesktopDefaultPdfVerticalPageGap = 8.dp diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfZoom.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfZoom.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfZoom.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfZoom.kt index d7fd191..509c355 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfZoom.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfZoom.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.gestures.calculateCentroid import androidx.compose.foundation.gestures.calculateZoom @@ -15,8 +15,8 @@ import androidx.compose.ui.input.pointer.isCtrlPressed as isPointerCtrlPressed import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec import kotlin.math.abs import kotlin.math.exp import kotlin.math.roundToInt diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfium.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfium.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfium.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfium.kt index 53127af..f71a86d 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPdfium.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfium.kt @@ -1,35 +1,35 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.PdfTocEntry -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsStreamReference -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfZoomSpec -import com.aryan.reader.shared.pdf.PdfiumAnnotationSubtype -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationExportMapper -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotation -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotationThreads -import com.aryan.reader.shared.pdf.SharedPdfHighlightAnnotationExport -import com.aryan.reader.shared.pdf.SharedPdfInkAnnotationExport -import com.aryan.reader.shared.pdf.SharedPdfIndexedPage -import com.aryan.reader.shared.pdf.SharedPdfReflowImageElement -import com.aryan.reader.shared.pdf.SharedPdfReflowPage -import com.aryan.reader.shared.pdf.SharedPdfReflowPageElement -import com.aryan.reader.shared.pdf.SharedPdfReflowTextElement -import com.aryan.reader.shared.pdf.SharedPdfReflowTextLine -import com.aryan.reader.shared.pdf.SharedPdfReflowTextSpan -import com.aryan.reader.shared.pdf.SharedPdfRichPageLayout -import com.aryan.reader.shared.pdf.SharedPdfSearchIndex -import com.aryan.reader.shared.pdf.SharedPdfSearchResult -import com.aryan.reader.shared.pdf.pdfInkAppearancePoints +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.PdfTocEntry +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsStreamReference +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.pdf.PdfiumAnnotationSubtype +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationExportMapper +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotationThreads +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlightAnnotationExport +import org.dueattendant149.bookreader.shared.pdf.SharedPdfInkAnnotationExport +import org.dueattendant149.bookreader.shared.pdf.SharedPdfIndexedPage +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowImageElement +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowPage +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowPageElement +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowTextElement +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowTextLine +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReflowTextSpan +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichPageLayout +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchIndex +import org.dueattendant149.bookreader.shared.pdf.SharedPdfSearchResult +import org.dueattendant149.bookreader.shared.pdf.pdfInkAppearancePoints import com.sun.jna.Callback import com.sun.jna.Library import com.sun.jna.Memory diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPlatformPaths.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPaths.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPlatformPaths.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPaths.kt index a2c46ac..fcb4b6f 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPlatformPaths.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPaths.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.util.Locale diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPptxDocument.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocument.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPptxDocument.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocument.kt index 013355d..14885d2 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopPptxDocument.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocument.kt @@ -1,19 +1,19 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.pptx.SharedPptxCharBox as DesktopPptxCharBox -import com.aryan.reader.shared.pptx.SharedPptxDeck as DesktopPptxDeck -import com.aryan.reader.shared.pptx.SharedPptxDeckCache -import com.aryan.reader.shared.pptx.SharedPptxImageCrop as DesktopPptxImageCrop -import com.aryan.reader.shared.pptx.SharedPptxImageElement as DesktopPptxImageElement -import com.aryan.reader.shared.pptx.SharedPptxParagraph as DesktopPptxParagraph -import com.aryan.reader.shared.pptx.SharedPptxRect as DesktopPptxRect -import com.aryan.reader.shared.pptx.SharedPptxShapeElement as DesktopPptxShapeElement -import com.aryan.reader.shared.pptx.SharedPptxSlide as DesktopPptxSlide -import com.aryan.reader.shared.pptx.SharedPptxTableCell as DesktopPptxTableCell -import com.aryan.reader.shared.pptx.SharedPptxTableElement as DesktopPptxTableElement -import com.aryan.reader.shared.pptx.SharedPptxTextAlign as DesktopPptxTextAlign -import com.aryan.reader.shared.pptx.SharedPptxTextInsets as DesktopPptxTextInsets -import com.aryan.reader.shared.pptx.SharedPptxVerticalAnchor as DesktopPptxVerticalAnchor +import org.dueattendant149.bookreader.shared.pptx.SharedPptxCharBox as DesktopPptxCharBox +import org.dueattendant149.bookreader.shared.pptx.SharedPptxDeck as DesktopPptxDeck +import org.dueattendant149.bookreader.shared.pptx.SharedPptxDeckCache +import org.dueattendant149.bookreader.shared.pptx.SharedPptxImageCrop as DesktopPptxImageCrop +import org.dueattendant149.bookreader.shared.pptx.SharedPptxImageElement as DesktopPptxImageElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxParagraph as DesktopPptxParagraph +import org.dueattendant149.bookreader.shared.pptx.SharedPptxRect as DesktopPptxRect +import org.dueattendant149.bookreader.shared.pptx.SharedPptxShapeElement as DesktopPptxShapeElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxSlide as DesktopPptxSlide +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTableCell as DesktopPptxTableCell +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTableElement as DesktopPptxTableElement +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTextAlign as DesktopPptxTextAlign +import org.dueattendant149.bookreader.shared.pptx.SharedPptxTextInsets as DesktopPptxTextInsets +import org.dueattendant149.bookreader.shared.pptx.SharedPptxVerticalAnchor as DesktopPptxVerticalAnchor import java.awt.AlphaComposite import java.awt.BasicStroke import java.awt.Color diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProScreen.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProScreen.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProScreen.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProScreen.kt index 4c533ef..655ae2f 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProScreen.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -29,8 +29,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.UserData -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.UserData +import org.dueattendant149.bookreader.shared.ui.readerString @Composable internal fun DesktopProScreen( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProfileAvatar.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProfileAvatar.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProfileAvatar.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProfileAvatar.kt index 8f34ef3..e60ad28 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopProfileAvatar.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopProfileAvatar.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -22,7 +22,7 @@ import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.foundation.shape.CircleShape -import com.aryan.reader.shared.UserData +import org.dueattendant149.bookreader.shared.UserData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.skia.Image as SkiaImage diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDefaults.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaults.kt similarity index 79% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDefaults.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaults.kt index ebda3be..c0e0a73 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDefaults.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaults.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings internal const val DesktopReaderDefaultsVersion = 1 diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDiagnostics.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDiagnostics.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDiagnostics.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDiagnostics.kt index 2fe3dae..8ee7aeb 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderDiagnostics.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDiagnostics.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderLocator private const val PdfZoomPerfLogTag = "EpistemePdfZoomPerf" private const val PdfZoomSettleLogTag = "EpistemePdfZoomSettle" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpenTrace.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpenTrace.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpenTrace.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpenTrace.kt index 9752419..540e7db 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpenTrace.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpenTrace.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop internal const val DesktopReaderOpenTraceTag = "EpistemeDesktopOpenTrace" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpening.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpening.kt similarity index 82% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpening.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpening.kt index 2bdba86..909ac08 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderOpening.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderOpening.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.ui.SharedAppTab +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.ui.SharedAppTab internal data class DesktopReaderOpening( val requestId: Long, diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderPanels.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderPanels.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderPanels.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderPanels.kt index 08fe7b2..90474f9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderPanels.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderPanels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -42,22 +42,22 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL_ID -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiModelOption -import com.aryan.reader.shared.ReaderAiModelOptions -import com.aryan.reader.shared.ReaderAiResultState -import com.aryan.reader.shared.ReaderCloudTtsVoices -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.maskedReaderAiKey -import com.aryan.reader.shared.ui.SharedMarkdownText -import com.aryan.reader.shared.ui.SharedReaderPopupLayer -import com.aryan.reader.shared.ui.SharedReaderTtsReplacementControls -import com.aryan.reader.shared.ui.SharedStableOutlinedTextField -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.ui.sharedReaderPopupWidth +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL_ID +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiModelOption +import org.dueattendant149.bookreader.shared.ReaderAiModelOptions +import org.dueattendant149.bookreader.shared.ReaderAiResultState +import org.dueattendant149.bookreader.shared.ReaderCloudTtsVoices +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.maskedReaderAiKey +import org.dueattendant149.bookreader.shared.ui.SharedMarkdownText +import org.dueattendant149.bookreader.shared.ui.SharedReaderPopupLayer +import org.dueattendant149.bookreader.shared.ui.SharedReaderTtsReplacementControls +import org.dueattendant149.bookreader.shared.ui.SharedStableOutlinedTextField +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.ui.sharedReaderPopupWidth @Composable internal fun DesktopReaderBottomSheet( diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderScreen.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderScreen.kt similarity index 95% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderScreen.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderScreen.kt index 9b0721d..e3db9d4 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderScreen.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -29,41 +29,41 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.ReaderAction -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiFeature -import com.aryan.reader.shared.ReaderAutoScrollState -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderExternalLookupAction -import com.aryan.reader.shared.ReaderHighlightPalette -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.ReaderToolbarPreferences -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.ReaderImageReference -import com.aryan.reader.shared.reader.ReaderLinkTarget -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.reader.ReaderViewportSpec -import com.aryan.reader.shared.reader.SharedEpubPaginationCache -import com.aryan.reader.shared.reader.SharedMeasuredEpubPaginator -import com.aryan.reader.shared.reader.isRightToLeftPaginationEnabled -import com.aryan.reader.shared.reader.layoutSignature -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.ui.DesktopEpubNativeImage -import com.aryan.reader.shared.ui.ReaderContentRenderPlan -import com.aryan.reader.shared.ui.SharedNativePaginatedReader -import com.aryan.reader.shared.ui.SharedNativeReaderSelectionAction -import com.aryan.reader.shared.ui.SharedNativeVerticalReader -import com.aryan.reader.shared.ui.SharedReaderScreen +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.ReaderAction +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiFeature +import org.dueattendant149.bookreader.shared.ReaderAutoScrollState +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderExternalLookupAction +import org.dueattendant149.bookreader.shared.ReaderHighlightPalette +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderToolbarPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.ReaderImageReference +import org.dueattendant149.bookreader.shared.reader.ReaderLinkTarget +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.ReaderViewportSpec +import org.dueattendant149.bookreader.shared.reader.SharedEpubPaginationCache +import org.dueattendant149.bookreader.shared.reader.SharedMeasuredEpubPaginator +import org.dueattendant149.bookreader.shared.reader.isRightToLeftPaginationEnabled +import org.dueattendant149.bookreader.shared.reader.layoutSignature +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.ui.DesktopEpubNativeImage +import org.dueattendant149.bookreader.shared.ui.ReaderContentRenderPlan +import org.dueattendant149.bookreader.shared.ui.SharedNativePaginatedReader +import org.dueattendant149.bookreader.shared.ui.SharedNativeReaderSelectionAction +import org.dueattendant149.bookreader.shared.ui.SharedNativeVerticalReader +import org.dueattendant149.bookreader.shared.ui.SharedReaderScreen import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTexturePreview.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTexturePreview.kt similarity index 96% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTexturePreview.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTexturePreview.kt index 73ba84d..6789d5c 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTexturePreview.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTexturePreview.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.Image import androidx.compose.foundation.background diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTextures.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTextures.kt similarity index 92% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTextures.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTextures.kt index 90ea59a..143aefa 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTextures.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTextures.kt @@ -1,11 +1,11 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap -import com.aryan.reader.shared.ReaderTexture -import com.aryan.reader.shared.ReaderTextureFilePrefix -import com.aryan.reader.shared.ReaderTextureImportExtensions -import com.aryan.reader.shared.readerTextureMimeTypeForExtension +import org.dueattendant149.bookreader.shared.ReaderTexture +import org.dueattendant149.bookreader.shared.ReaderTextureFilePrefix +import org.dueattendant149.bookreader.shared.ReaderTextureImportExtensions +import org.dueattendant149.bookreader.shared.readerTextureMimeTypeForExtension import java.io.ByteArrayInputStream import java.io.File import java.util.Base64 diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTypography.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypography.kt similarity index 87% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTypography.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypography.kt index defaf8f..c1301d3 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderTypography.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypography.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.platform.Font as DesktopFont -import com.aryan.reader.shared.AppFontPreference -import com.aryan.reader.shared.AppFontPreferenceKind -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.detectFontVariant -import com.aryan.reader.shared.familyFilenameSignature -import com.aryan.reader.shared.supportsVariableWeightAxis +import org.dueattendant149.bookreader.shared.AppFontPreference +import org.dueattendant149.bookreader.shared.AppFontPreferenceKind +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.detectFontVariant +import org.dueattendant149.bookreader.shared.familyFilenameSignature +import org.dueattendant149.bookreader.shared.supportsVariableWeightAxis import java.io.File internal fun ReaderSettings.toDesktopReaderFontFamily(): FontFamily { diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderWindowState.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowState.kt similarity index 92% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderWindowState.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowState.kt index e19b13a..99ccd30 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopReaderWindowState.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowState.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowPlacement -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.ReaderCloudTtsState -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.RecapResult -import com.aryan.reader.shared.SummarizationResult -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.ReaderCloudTtsState +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.RecapResult +import org.dueattendant149.bookreader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState import kotlinx.coroutines.Job internal const val DesktopReaderWindowDefaultWidthDp = 1120f diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStartupSplash.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupSplash.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStartupSplash.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupSplash.kt index 3e15c05..11c49d9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStartupSplash.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupSplash.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.awt.BorderLayout import java.awt.Color diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStringResources.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResources.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStringResources.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResources.kt index 8dd48e4..6432e60 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopStringResources.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResources.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ui.SharedStringResolver +import org.dueattendant149.bookreader.shared.ui.SharedStringResolver import org.w3c.dom.Element import java.io.InputStream import java.util.Locale diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStore.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStore.kt similarity index 98% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStore.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStore.kt index a8591e9..f3f741f 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStore.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStore.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.security.MessageDigest diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopTtsLog.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLog.kt similarity index 94% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopTtsLog.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLog.kt index 677cfc8..ddd623d 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopTtsLog.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLog.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsChunk private const val DesktopTtsLogTag = "EpistemeDesktopTts" private const val DesktopTtsStartTraceLogTag = "EpistemeDesktopTtsStartTrace" diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowPolish.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolish.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowPolish.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolish.kt index a949aa0..50aac69 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowPolish.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolish.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowStateStore.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStore.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowStateStore.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStore.kt index a2f4ed4..3b5408b 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowStateStore.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStore.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowsWebView2EpubWebView.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowsWebView2EpubWebView.kt similarity index 99% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowsWebView2EpubWebView.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowsWebView2EpubWebView.kt index 8ae5d46..56e2ce9 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/DesktopWindowsWebView2EpubWebView.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowsWebView2EpubWebView.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -25,12 +25,12 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.EpubAnnotationSerializer -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.ui.ReaderContentNavigationTarget -import com.aryan.reader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.EpubAnnotationSerializer +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.ui.ReaderContentNavigationTarget +import org.dueattendant149.bookreader.shared.ui.readerString import kotlinx.coroutines.delay import org.eclipse.swt.SWT import org.eclipse.swt.awt.SWT_AWT diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Launcher.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Launcher.kt similarity index 71% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Launcher.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Launcher.kt index d03d1f1..6893a1e 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Launcher.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Launcher.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop fun main() { val startupSplash = DesktopStartupSplash.show() diff --git a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Main.kt b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Main.kt similarity index 97% rename from desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Main.kt rename to desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Main.kt index 6861db2..ef77e24 100644 --- a/desktopApp/src/desktopMain/kotlin/com/aryan/reader/desktop/Main.kt +++ b/desktopApp/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/desktop/Main.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -29,92 +29,92 @@ import androidx.compose.ui.window.Window import androidx.compose.ui.window.WindowPlacement import androidx.compose.ui.window.WindowPosition import androidx.compose.ui.window.rememberWindowState -import com.aryan.reader.shared.AppAction -import com.aryan.reader.shared.AppFontPreference -import com.aryan.reader.shared.BannerMessage -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.BookShelfRef -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.ImportedBookFile -import com.aryan.reader.shared.LibraryAction -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiFeature -import com.aryan.reader.shared.ReaderAiResultState -import com.aryan.reader.shared.ReaderCloudTtsState -import com.aryan.reader.shared.ReaderContextExtractor -import com.aryan.reader.shared.RecapResult -import com.aryan.reader.shared.ReaderExternalLookupAction -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderFeatureSurface -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.ReaderTtsCacheSummary -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.ReaderTtsPlanner -import com.aryan.reader.shared.ReaderTtsProgress -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedImportOutcomeCounts -import com.aryan.reader.shared.SharedImportPlanner -import com.aryan.reader.shared.SharedLibraryEditor -import com.aryan.reader.shared.SharedLibraryStateProjector -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.SharedSettingsAction -import com.aryan.reader.shared.SharedSettingsDestination -import com.aryan.reader.shared.SharedSettingsHubInput -import com.aryan.reader.shared.SharedSettingsPlatform -import com.aryan.reader.shared.Shelf -import com.aryan.reader.shared.ShelfRecord -import com.aryan.reader.shared.ShelfType -import com.aryan.reader.shared.SmartCollectionDefinition -import com.aryan.reader.shared.SummarizationResult -import com.aryan.reader.shared.externalLookupUrl -import com.aryan.reader.shared.opds.OpdsAcquisition -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsEntry -import com.aryan.reader.shared.opds.OpdsStreamReference -import com.aryan.reader.shared.opds.SharedOpdsController -import com.aryan.reader.shared.opds.SharedOpdsDownloadState -import com.aryan.reader.shared.opds.SharedOpdsStreamUri -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.ReaderImageReference -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubMetadataEditor -import com.aryan.reader.shared.reader.SharedEpubMetadataUpdate -import com.aryan.reader.shared.reader.SharedEpubPaginationCache -import com.aryan.reader.shared.reader.SharedJvmBookLoadSemanticMode -import com.aryan.reader.shared.reader.SharedJvmBookLoader -import com.aryan.reader.shared.readerCloudTtsControlsModel -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.sharedSettingsHubModel -import com.aryan.reader.shared.shouldApplyRemoteCloudBookMetadataUpdate -import com.aryan.reader.shared.shouldUploadLocalCloudBookContent -import com.aryan.reader.shared.shouldUploadLocalCloudBookMetadataUpdate -import com.aryan.reader.shared.ui.NonReaderLibraryTab -import com.aryan.reader.shared.ui.SharedAboutScreen -import com.aryan.reader.shared.ui.SharedAddToShelfDialog -import com.aryan.reader.shared.ui.SharedAppShell -import com.aryan.reader.shared.ui.SharedAppTab -import com.aryan.reader.shared.ui.SharedAppTheme -import com.aryan.reader.shared.ui.SharedAppThemeControls -import com.aryan.reader.shared.ui.SharedAppThemeSettingsDialog -import com.aryan.reader.shared.ui.SharedBookInfoDialog -import com.aryan.reader.shared.ui.SharedConfirmDialog -import com.aryan.reader.shared.ui.SharedCustomFontsScreen -import com.aryan.reader.shared.ui.SharedHelpFeedbackScreen -import com.aryan.reader.shared.ui.LocalSharedStringResolver -import com.aryan.reader.shared.ui.SharedManageShelfBooksDialog -import com.aryan.reader.shared.ui.SharedOpdsScreen -import com.aryan.reader.shared.ui.SharedReaderModalOwnerWindowProvider -import com.aryan.reader.shared.ui.SharedReaderTtsOverlayControls -import com.aryan.reader.shared.ui.SharedSettingsHub -import com.aryan.reader.shared.ui.SharedSupportProjectScreen -import com.aryan.reader.shared.ui.SharedTextInputDialog -import com.aryan.reader.shared.ui.readerString -import com.aryan.reader.shared.withTtsReplacements +import org.dueattendant149.bookreader.shared.AppAction +import org.dueattendant149.bookreader.shared.AppFontPreference +import org.dueattendant149.bookreader.shared.BannerMessage +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.BookShelfRef +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.ImportedBookFile +import org.dueattendant149.bookreader.shared.LibraryAction +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiFeature +import org.dueattendant149.bookreader.shared.ReaderAiResultState +import org.dueattendant149.bookreader.shared.ReaderCloudTtsState +import org.dueattendant149.bookreader.shared.ReaderContextExtractor +import org.dueattendant149.bookreader.shared.RecapResult +import org.dueattendant149.bookreader.shared.ReaderExternalLookupAction +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderFeatureSurface +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.ReaderTtsCacheSummary +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsPlanner +import org.dueattendant149.bookreader.shared.ReaderTtsProgress +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedImportOutcomeCounts +import org.dueattendant149.bookreader.shared.SharedImportPlanner +import org.dueattendant149.bookreader.shared.SharedLibraryEditor +import org.dueattendant149.bookreader.shared.SharedLibraryStateProjector +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.SharedSettingsAction +import org.dueattendant149.bookreader.shared.SharedSettingsDestination +import org.dueattendant149.bookreader.shared.SharedSettingsHubInput +import org.dueattendant149.bookreader.shared.SharedSettingsPlatform +import org.dueattendant149.bookreader.shared.Shelf +import org.dueattendant149.bookreader.shared.ShelfRecord +import org.dueattendant149.bookreader.shared.ShelfType +import org.dueattendant149.bookreader.shared.SmartCollectionDefinition +import org.dueattendant149.bookreader.shared.SummarizationResult +import org.dueattendant149.bookreader.shared.externalLookupUrl +import org.dueattendant149.bookreader.shared.opds.OpdsAcquisition +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsEntry +import org.dueattendant149.bookreader.shared.opds.OpdsStreamReference +import org.dueattendant149.bookreader.shared.opds.SharedOpdsController +import org.dueattendant149.bookreader.shared.opds.SharedOpdsDownloadState +import org.dueattendant149.bookreader.shared.opds.SharedOpdsStreamUri +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.ReaderImageReference +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubMetadataEditor +import org.dueattendant149.bookreader.shared.reader.SharedEpubMetadataUpdate +import org.dueattendant149.bookreader.shared.reader.SharedEpubPaginationCache +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoadSemanticMode +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoader +import org.dueattendant149.bookreader.shared.readerCloudTtsControlsModel +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.sharedSettingsHubModel +import org.dueattendant149.bookreader.shared.shouldApplyRemoteCloudBookMetadataUpdate +import org.dueattendant149.bookreader.shared.shouldUploadLocalCloudBookContent +import org.dueattendant149.bookreader.shared.shouldUploadLocalCloudBookMetadataUpdate +import org.dueattendant149.bookreader.shared.ui.NonReaderLibraryTab +import org.dueattendant149.bookreader.shared.ui.SharedAboutScreen +import org.dueattendant149.bookreader.shared.ui.SharedAddToShelfDialog +import org.dueattendant149.bookreader.shared.ui.SharedAppShell +import org.dueattendant149.bookreader.shared.ui.SharedAppTab +import org.dueattendant149.bookreader.shared.ui.SharedAppTheme +import org.dueattendant149.bookreader.shared.ui.SharedAppThemeControls +import org.dueattendant149.bookreader.shared.ui.SharedAppThemeSettingsDialog +import org.dueattendant149.bookreader.shared.ui.SharedBookInfoDialog +import org.dueattendant149.bookreader.shared.ui.SharedConfirmDialog +import org.dueattendant149.bookreader.shared.ui.SharedCustomFontsScreen +import org.dueattendant149.bookreader.shared.ui.SharedHelpFeedbackScreen +import org.dueattendant149.bookreader.shared.ui.LocalSharedStringResolver +import org.dueattendant149.bookreader.shared.ui.SharedManageShelfBooksDialog +import org.dueattendant149.bookreader.shared.ui.SharedOpdsScreen +import org.dueattendant149.bookreader.shared.ui.SharedReaderModalOwnerWindowProvider +import org.dueattendant149.bookreader.shared.ui.SharedReaderTtsOverlayControls +import org.dueattendant149.bookreader.shared.ui.SharedSettingsHub +import org.dueattendant149.bookreader.shared.ui.SharedSupportProjectScreen +import org.dueattendant149.bookreader.shared.ui.SharedTextInputDialog +import org.dueattendant149.bookreader.shared.ui.readerString +import org.dueattendant149.bookreader.shared.withTtsReplacements import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -3749,7 +3749,7 @@ internal fun EpistemeDesktopApp( } } - fun emitOpds(next: com.aryan.reader.shared.opds.SharedOpdsScreenState) { + fun emitOpds(next: org.dueattendant149.bookreader.shared.opds.SharedOpdsScreenState) { opdsState = next } diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAiByokStoreTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStoreTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAiByokStoreTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStoreTest.kt index c38a562..737dfb4 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAiByokStoreTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAiByokStoreTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL_ID -import com.aryan.reader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL_ID +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings import java.nio.file.Files import kotlin.io.path.readText import kotlin.io.path.writeText diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAurPackagingMetadataTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAurPackagingMetadataTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAurPackagingMetadataTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAurPackagingMetadataTest.kt index c26b565..b72f737 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAurPackagingMetadataTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAurPackagingMetadataTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAuthStoreTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAuthStoreTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAuthStoreTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAuthStoreTest.kt index f5d4042..0cf8176 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopAuthStoreTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopAuthStoreTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.UserData +import org.dueattendant149.bookreader.shared.UserData import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBookImporterTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporterTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBookImporterTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporterTest.kt index 952614f..08bc0ed 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBookImporterTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBookImporterTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ImportedBookFile +import org.dueattendant149.bookreader.shared.ImportedBookFile import java.io.File import java.nio.file.Files import java.security.MessageDigest diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBuildProfileTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfileTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBuildProfileTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfileTest.kt index e27cde3..9280be1 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopBuildProfileTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopBuildProfileTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.GEMINI_CLOUD_TTS_MODEL_ID -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.GEMINI_CLOUD_TTS_MODEL_ID +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudConfigTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfigTest.kt similarity index 98% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudConfigTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfigTest.kt index 89ad488..e2ef8cf 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudConfigTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudConfigTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.util.Properties import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudSyncMappingTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncMappingTest.kt similarity index 94% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudSyncMappingTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncMappingTest.kt index 060b811..de3454c 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCloudSyncMappingTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCloudSyncMappingTest.kt @@ -1,16 +1,16 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.pdf.SharedPdfAnnotationSerializer -import com.aryan.reader.shared.pdf.SharedPdfBookmark -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.pdf.SharedPdfRichDocument -import com.aryan.reader.shared.pdf.SharedPdfRichTextSerializer -import com.aryan.reader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationSerializer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfBookmark +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichDocument +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextSerializer +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComicArchiveTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchiveTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComicArchiveTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchiveTest.kt index fde0e1b..829b126 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComicArchiveTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComicArchiveTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.shared.FileType import org.apache.commons.compress.archivers.tar.TarArchiveEntry import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream import java.io.File diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComposeInteropTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComposeInteropTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComposeInteropTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComposeInteropTest.kt index f8f396a..5d3700f 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopComposeInteropTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopComposeInteropTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCustomFontStoreTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStoreTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCustomFontStoreTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStoreTest.kt index 365d922..a755d8d 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopCustomFontStoreTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopCustomFontStoreTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.CustomFontItem import java.io.File import java.nio.file.Files import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsingTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsingTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsingTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsingTest.kt index e79f5cd..257652e 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubBridgeParsingTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubBridgeParsingTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderLocator import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubPaginationTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPaginationTest.kt similarity index 89% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubPaginationTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPaginationTest.kt index 6c22df2..cde4361 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopEpubPaginationTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopEpubPaginationTest.kt @@ -1,11 +1,11 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.ReaderViewportSpec -import com.aryan.reader.shared.reader.layoutSignature +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderViewportSpec +import org.dueattendant149.bookreader.shared.reader.layoutSignature import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacementTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacementTest.kt similarity index 94% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacementTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacementTest.kt index cc89a9f..50eee68 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFeatureNoticePlacementTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFeatureNoticePlacementTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractorTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractorTest.kt similarity index 98% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractorTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractorTest.kt index d54e44a..50412cc 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopFolderMetadataExtractorTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopFolderMetadataExtractorTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType import java.io.File import java.nio.file.Files import java.util.Base64 diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabaseTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabaseTest.kt similarity index 90% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabaseTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabaseTest.kt index 7c43edb..8b2d450 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLibraryDatabaseTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLibraryDatabaseTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.SharedLibrarySnapshot -import com.aryan.reader.shared.SharedLibrarySnapshotJson +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshot +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshotJson import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSyncTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSyncTest.kt similarity index 93% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSyncTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSyncTest.kt index 70dd8ca..dd60247 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopLocalFolderSyncTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopLocalFolderSyncTest.kt @@ -1,11 +1,11 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.LOCAL_FOLDER_SYNC_DATA_DIR -import com.aryan.reader.shared.SharedFolderBookMetadata -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.SyncedFolder +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.LOCAL_FOLDER_SYNC_DATA_DIR +import org.dueattendant149.bookreader.shared.SharedFolderBookMetadata +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.SyncedFolder import java.io.File import java.nio.file.Files import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopOpdsRepositoryTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepositoryTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopOpdsRepositoryTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepositoryTest.kt index 3a7f0e3..4ea13be 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopOpdsRepositoryTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopOpdsRepositoryTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.io.File import java.nio.file.Files @@ -74,7 +74,7 @@ class DesktopOpdsRepositoryTest { password: String? ) { saveCatalogs( - com.aryan.reader.shared.opds.SharedOpdsCatalogs.addCatalog( + org.dueattendant149.bookreader.shared.opds.SharedOpdsCatalogs.addCatalog( catalogs = loadCatalogs(), title = title, url = url, diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPaidAiUsageTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiUsageTest.kt similarity index 93% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPaidAiUsageTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiUsageTest.kt index 1dc17ff..28541ab 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPaidAiUsageTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPaidAiUsageTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfFileActionsTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActionsTest.kt similarity index 90% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfFileActionsTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActionsTest.kt index d4a052c..cc7376e 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfFileActionsTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfFileActionsTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.text.AnnotatedString -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfRichPageLayout +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichPageLayout import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationSidebarTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationSidebarTest.kt similarity index 88% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationSidebarTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationSidebarTest.kt index 769f804..8d7dc06 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfNavigationSidebarTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfNavigationSidebarTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfReflowTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflowTest.kt similarity index 89% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfReflowTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflowTest.kt index 7c1333b..7339f3d 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfReflowTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfReflowTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.SharedLibraryStateProjector -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.ui.toNonReaderLibraryOrganizationModel +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.SharedLibraryStateProjector +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.ui.toNonReaderLibraryOrganizationModel import java.io.File import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbingTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbingTest.kt similarity index 85% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbingTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbingTest.kt index dc2e0d1..333f4bf 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfScrubbingTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfScrubbingTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarsTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarsTest.kt similarity index 90% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarsTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarsTest.kt index ff1e73f..c47a802 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfSidecarsTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfSidecarsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertNotEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfTextHighlightStateTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTextHighlightStateTest.kt similarity index 84% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfTextHighlightStateTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTextHighlightStateTest.kt index e2a4ee7..19562e0 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfTextHighlightStateTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfTextHighlightStateTest.kt @@ -1,11 +1,11 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfReaderAction -import com.aryan.reader.shared.pdf.SharedPdfReaderState -import com.aryan.reader.shared.pdf.reduce +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderAction +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderState +import org.dueattendant149.bookreader.shared.pdf.reduce import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfThemeTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfThemeTest.kt similarity index 95% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfThemeTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfThemeTest.kt index a386b68..09648a7 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPdfThemeTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPdfThemeTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderTheme import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPlatformPathsTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPathsTest.kt similarity index 98% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPlatformPathsTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPathsTest.kt index aee2fc3..95f55de 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPlatformPathsTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPlatformPathsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPptxDocumentTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocumentTest.kt similarity index 98% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPptxDocumentTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocumentTest.kt index c746843..387ce4b 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopPptxDocumentTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopPptxDocumentTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.pptx.SharedPptxDeckCache +import org.dueattendant149.bookreader.shared.pptx.SharedPptxDeckCache import java.io.File import java.nio.file.Files import java.util.zip.ZipEntry diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderDefaultsTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaultsTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderDefaultsTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaultsTest.kt index abd4154..6e81891 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderDefaultsTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderDefaultsTest.kt @@ -1,18 +1,18 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedLibrarySnapshot -import com.aryan.reader.shared.pdf.PdfZoomSpec -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedLibrarySnapshot +import org.dueattendant149.bookreader.shared.pdf.PdfZoomSpec +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderKeyCommandsTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderKeyCommandsTest.kt similarity index 99% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderKeyCommandsTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderKeyCommandsTest.kt index e12afbd..d383823 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderKeyCommandsTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderKeyCommandsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.awt.Canvas import java.awt.event.KeyEvent diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderTypographyTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypographyTest.kt similarity index 88% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderTypographyTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypographyTest.kt index 5103149..b3c8c3b 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderTypographyTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderTypographyTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.shared.reader.ReaderPage import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderWindowStateTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowStateTest.kt similarity index 95% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderWindowStateTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowStateTest.kt index 4d0ab94..99e93cf 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopReaderWindowStateTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopReaderWindowStateTest.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowPlacement -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.ui.SharedAppTab +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.ui.SharedAppTab import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStartupTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStartupTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupTest.kt index 2509680..3538120 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStartupTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStartupTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedJvmBookLoadSemanticMode +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedJvmBookLoadSemanticMode import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStringResourcesTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResourcesTest.kt similarity index 99% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStringResourcesTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResourcesTest.kt index b3c1536..9c16d69 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopStringResourcesTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopStringResourcesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStoreTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStoreTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStoreTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStoreTest.kt index 5c826fa..0775a3f 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopSummaryCacheStoreTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopSummaryCacheStoreTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import java.nio.file.Files import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopTtsLogTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLogTest.kt similarity index 92% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopTtsLogTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLogTest.kt index 7180b83..24e4728 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopTtsLogTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopTtsLogTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertFalse diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWebView2LayoutTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWebView2LayoutTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWebView2LayoutTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWebView2LayoutTest.kt index 30570ef..1ff5168 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWebView2LayoutTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWebView2LayoutTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowPolishTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolishTest.kt similarity index 97% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowPolishTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolishTest.kt index 354ecfa..c250c25 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowPolishTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowPolishTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import androidx.compose.ui.graphics.Color import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowStateStoreTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStoreTest.kt similarity index 96% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowStateStoreTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStoreTest.kt index c87903d..23c27e6 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/DesktopWindowStateStoreTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/DesktopWindowStateStoreTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.io.path.createTempFile import kotlin.test.Test diff --git a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/LinuxSecretToolCodecTest.kt b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/LinuxSecretToolCodecTest.kt similarity index 98% rename from desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/LinuxSecretToolCodecTest.kt rename to desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/LinuxSecretToolCodecTest.kt index 532360b..4ae7a89 100644 --- a/desktopApp/src/desktopTest/kotlin/com/aryan/reader/desktop/LinuxSecretToolCodecTest.kt +++ b/desktopApp/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/desktop/LinuxSecretToolCodecTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.desktop +package org.dueattendant149.bookreader.desktop import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index b231b97..20ae666 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -65,7 +65,7 @@ kotlin { if (!desktopOnlyBuild) { extensions.configure("android") { - namespace = "com.aryan.reader.shared" + namespace = "org.dueattendant149.bookreader.shared" compileSdk = 36 defaultConfig { diff --git a/shared/src/androidMain/kotlin/com/aryan/reader/shared/LocalFolderSync.android.kt b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.android.kt similarity index 84% rename from shared/src/androidMain/kotlin/com/aryan/reader/shared/LocalFolderSync.android.kt rename to shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.android.kt index 700e05e..cabc21b 100644 --- a/shared/src/androidMain/kotlin/com/aryan/reader/shared/LocalFolderSync.android.kt +++ b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.android.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import java.security.MessageDigest diff --git a/shared/src/androidMain/kotlin/com/aryan/reader/shared/Platform.android.kt b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.android.kt similarity index 58% rename from shared/src/androidMain/kotlin/com/aryan/reader/shared/Platform.android.kt rename to shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.android.kt index d1f14a5..92ed9f2 100644 --- a/shared/src/androidMain/kotlin/com/aryan/reader/shared/Platform.android.kt +++ b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.android.kt @@ -1,3 +1,3 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared actual fun currentTimestamp(): Long = System.currentTimeMillis() diff --git a/shared/src/androidMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.android.kt b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.android.kt similarity index 81% rename from shared/src/androidMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.android.kt rename to shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.android.kt index 269b0df..4555979 100644 --- a/shared/src/androidMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.android.kt +++ b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.android.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import android.util.Log -import com.aryan.reader.shared.BuildConfig +import org.dueattendant149.bookreader.shared.BuildConfig internal actual val SharedReaderDiagnosticsEnabled: Boolean = BuildConfig.DEBUG diff --git a/shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.android.kt b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.android.kt similarity index 94% rename from shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.android.kt rename to shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.android.kt index 6282dc2..bea2290 100644 --- a/shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.android.kt +++ b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.android.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import android.graphics.BitmapFactory import androidx.compose.foundation.Image diff --git a/shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.android.kt b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.android.kt similarity index 93% rename from shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.android.kt rename to shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.android.kt index a1dec4b..b092083 100644 --- a/shared/src/androidMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.android.kt +++ b/shared/src/androidMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.android.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.runtime.Composable import androidx.compose.ui.window.Dialog diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/CssParser.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/CssParser.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/CssParser.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/CssParser.kt index 62d02b0..60559ae 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/CssParser.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/CssParser.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/FontFamilyMapper.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/FontFamilyMapper.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/FontFamilyMapper.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/FontFamilyMapper.kt index 63e6d13..3c6dd99 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/FontFamilyMapper.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/FontFamilyMapper.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.font.FontFamily diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/PaginatedReaderData.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderData.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/PaginatedReaderData.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderData.kt index ef21cf2..fd5e478 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/PaginatedReaderData.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/PaginatedReaderData.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ @file:OptIn(ExperimentalSerializationApi::class) -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified @@ -32,13 +32,13 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.paginatedreader.serialization.AnnotatedStringSerializer -import com.aryan.reader.paginatedreader.serialization.ColorSerializer -import com.aryan.reader.paginatedreader.serialization.DpSerializer -import com.aryan.reader.paginatedreader.serialization.ParagraphStyleSerializer -import com.aryan.reader.paginatedreader.serialization.SpanStyleSerializer -import com.aryan.reader.paginatedreader.serialization.TextAlignSerializer -import com.aryan.reader.paginatedreader.serialization.TextUnitSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.AnnotatedStringSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.ColorSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.DpSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.ParagraphStyleSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.SpanStyleSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.TextAlignSerializer +import org.dueattendant149.bookreader.paginatedreader.serialization.TextUnitSerializer import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber @@ -381,8 +381,8 @@ data class CssRule( data class FontFaceInfo( @ProtoNumber(1) val fontFamily: String, @ProtoNumber(2) val src: String, - @ProtoNumber(3) @Serializable(with = com.aryan.reader.paginatedreader.serialization.FontWeightSerializer::class) val fontWeight: FontWeight?, - @ProtoNumber(4) @Serializable(with = com.aryan.reader.paginatedreader.serialization.FontStyleSerializer::class) val fontStyle: FontStyle? + @ProtoNumber(3) @Serializable(with = org.dueattendant149.bookreader.paginatedreader.serialization.FontWeightSerializer::class) val fontWeight: FontWeight?, + @ProtoNumber(4) @Serializable(with = org.dueattendant149.bookreader.paginatedreader.serialization.FontStyleSerializer::class) val fontStyle: FontStyle? ) @Serializable diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/SemanticModel.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/SemanticModel.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/SemanticModel.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/SemanticModel.kt index 4c757eb..e68cb89 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/SemanticModel.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/SemanticModel.kt @@ -19,7 +19,7 @@ */ @file:OptIn(ExperimentalSerializationApi::class) -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/StyleUtils.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtils.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/StyleUtils.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtils.kt index 9347350..d425019 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/StyleUtils.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/StyleUtils.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/UserAgentStylesheet.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/UserAgentStylesheet.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/UserAgentStylesheet.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/UserAgentStylesheet.kt index 0b79a05..73f4d9f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/UserAgentStylesheet.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/UserAgentStylesheet.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader object UserAgentStylesheet { diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/serialization/ComposeTypeSerializers.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/serialization/ComposeTypeSerializers.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/serialization/ComposeTypeSerializers.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/serialization/ComposeTypeSerializers.kt index f44955f..123956f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/paginatedreader/serialization/ComposeTypeSerializers.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/serialization/ComposeTypeSerializers.kt @@ -18,7 +18,7 @@ * mail: epistemereader@gmail.com */ @file:OptIn(ExperimentalSerializationApi::class) -package com.aryan.reader.paginatedreader.serialization +package org.dueattendant149.bookreader.paginatedreader.serialization import androidx.compose.ui.geometry.Offset import androidx.compose.ui.text.font.FontFamily @@ -43,7 +43,7 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isSpecified -import com.aryan.reader.paginatedreader.FontFamilyMapper +import org.dueattendant149.bookreader.paginatedreader.FontFamilyMapper import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.KSerializer import kotlinx.serialization.SerialName diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/AppActions.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppActions.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/AppActions.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppActions.kt index 47e8e79..71f7080 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/AppActions.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppActions.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.ReaderSearchOptions +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderSearchOptions sealed interface LibraryAction { data class SearchChanged(val query: String) : LibraryAction diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/AppModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/AppModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppModels.kt index eecf764..5a3de22 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/AppModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/AppModels.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.reader.ReaderSettings data class SharedText( val name: String, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/CloudSyncDecisions.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisions.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/CloudSyncDecisions.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisions.kt index 47c3e55..f81c834 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/CloudSyncDecisions.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisions.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared enum class SharedCloudBookMetadataWinner { LOCAL, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/CustomFontModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CustomFontModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/CustomFontModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CustomFontModels.kt index f868fb2..c6ed956 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/CustomFontModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/CustomFontModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/FileCapabilities.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilities.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/FileCapabilities.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilities.kt index 3a00dee..8146139 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/FileCapabilities.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilities.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared enum class ReaderPlatform { ANDROID, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/FontVariantInference.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInference.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/FontVariantInference.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInference.kt index cbcc7d8..1eace98 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/FontVariantInference.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInference.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ImportContracts.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ImportContracts.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ImportContracts.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ImportContracts.kt index 1ab914a..a768765 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ImportContracts.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ImportContracts.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared enum class SharedImportDecisionStatus { IMPORTABLE, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryModels.kt similarity index 94% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryModels.kt index 79f4cc0..2d18fa9 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryModels.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.reader.ReaderBookmark -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.reader.ReaderSettings enum class FileType { PDF, EPUB, MOBI, MD, TXT, HTML, FB2, CBZ, CBR, CB7, CBT, DOCX, ODT, FODT, PPTX, UNKNOWN diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryMutations.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryMutations.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryMutations.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryMutations.kt index 12afe1f..f22767a 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryMutations.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryMutations.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class SharedLibraryMutationResult( val state: SharedReaderScreenState, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryProjector.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryProjector.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryProjector.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryProjector.kt index e7f3789..ddff77e 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryProjector.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryProjector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared class LibraryProjector { fun home(state: LibraryState): HomeScreenModel { diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryStateProjector.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryStateProjector.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryStateProjector.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryStateProjector.kt index 2e3aaaf..64e3c77 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LibraryStateProjector.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LibraryStateProjector.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class ShelfRecord( val id: String, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LocalFolderSync.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/LocalFolderSync.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.kt index 97a1124..3cceb68 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/LocalFolderSync.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/PdfReaderModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/PdfReaderModels.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/PdfReaderModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/PdfReaderModels.kt index 36e226f..29ea9af 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/PdfReaderModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/PdfReaderModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared enum class SaveMode { ORIGINAL, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationModels.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationModels.kt index 0957299..6942569 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationSerializer.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationSerializer.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationSerializer.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationSerializer.kt index 5d282a9..6c75319 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAnnotationSerializer.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAnnotationSerializer.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAppearanceModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModels.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAppearanceModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModels.kt index e495d60..6496bda 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderAppearanceModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModels.kt @@ -1,11 +1,11 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign import kotlin.math.max import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderExtrasModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderExtrasModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModels.kt index e929072..ddac244 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderExtrasModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModels.kt @@ -1,16 +1,16 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter -import com.aryan.reader.shared.reader.logSharedReaderDiagnostic +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.reader.logSharedReaderDiagnostic const val GEMINI_CLOUD_TTS_MODEL = "gemini-3.1-flash-live-preview" const val GEMINI_CLOUD_TTS_MODEL_ID = "gemini:$GEMINI_CLOUD_TTS_MODEL" diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderMarkdownModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderMarkdownModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownModels.kt index bafd853..adc5387 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderMarkdownModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class ReaderMarkdownDocument( val blocks: List diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderSearchModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderSearchModels.kt similarity index 93% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderSearchModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderSearchModels.kt index ef5fdd0..3e1ed28 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderSearchModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderSearchModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class SearchResult( val locationInSource: Int, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderToolbarModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderToolbarModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarModels.kt index 48464d1..ca2e976 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderToolbarModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared private val DefaultReaderBottomToolIds: Set get() = setOf( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderTtsReplacements.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacements.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderTtsReplacements.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacements.kt index 876e694..587245f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderTtsReplacements.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacements.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderWordReplacements.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderWordReplacements.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderWordReplacements.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderWordReplacements.kt index 04a8d92..ee034ce 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ReaderWordReplacements.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderWordReplacements.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/RepositoryContracts.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/RepositoryContracts.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/RepositoryContracts.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/RepositoryContracts.kt index 671137d..3cdfcb3 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/RepositoryContracts.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/RepositoryContracts.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.coroutines.flow.Flow diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SampleLibrary.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SampleLibrary.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SampleLibrary.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SampleLibrary.kt index 5a847c6..b5c676f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SampleLibrary.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SampleLibrary.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared fun sampleLibraryState(): LibraryState { val reference = Tag("reference", "Reference", 0xFF9575CD.toInt()) diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ScreenProjectors.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ScreenProjectors.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ScreenProjectors.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ScreenProjectors.kt index eda6178..68b9010 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ScreenProjectors.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ScreenProjectors.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class SharedHomeScreenModel( val recentBooks: List, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SettingsHubModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModels.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SettingsHubModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModels.kt index b500c01..df0ed2f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SettingsHubModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared enum class SharedSettingsPlatform { ANDROID, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFeaturePolicy.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFeaturePolicy.kt similarity index 94% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFeaturePolicy.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFeaturePolicy.kt index c51cb64..ef4746e 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFeaturePolicy.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFeaturePolicy.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared data class SharedFeaturePolicy( val networkAccess: Boolean = true, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFormatters.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFormatters.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFormatters.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFormatters.kt index f51770f..2038dc4 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedFormatters.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedFormatters.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.math.log10 import kotlin.math.pow diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLegalLinks.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinks.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLegalLinks.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinks.kt index b4bebc8..9c0a20f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLegalLinks.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinks.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared const val EPISTEME_POLICY_BASE_URL = "https://aryan-raj3112.github.io/reader-policy" diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLibrarySnapshot.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshot.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLibrarySnapshot.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshot.kt index b41a272..6f6561c 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedLibrarySnapshot.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshot.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray @@ -16,13 +16,13 @@ import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.longOrNull import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.reader.ReaderBookmark -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign data class SharedLibrarySnapshot( val books: List = emptyList(), diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedReducers.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducers.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedReducers.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducers.kt index bc7788c..94f94e0 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SharedReducers.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducers.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState fun LibraryState.reduce(action: LibraryAction): LibraryState { return when (action) { diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SmartCollectionEngine.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngine.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/SmartCollectionEngine.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngine.kt index 67e35e0..de1f8a8 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/SmartCollectionEngine.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngine.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogs.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogs.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogs.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogs.kt index 6bea4a2..80fd208 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogs.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogs.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsController.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsController.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsController.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsController.kt index 151596c..d36b737 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsController.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsController.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds class SharedOpdsController( private val repository: SharedOpdsRepository, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsModels.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsModels.kt index 2e7cdd9..3e34222 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds data class OpdsCatalog( val id: String, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsUtilities.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsUtilities.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsUtilities.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsUtilities.kt index b135fa2..8ab4b2b 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsUtilities.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsUtilities.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.SharedFileCapabilities object SharedOpdsSearch { suspend fun buildSearchUrl( @@ -135,7 +135,7 @@ object SharedOpdsDownloadNamer { .lowercase() .takeIf { it.isNotBlank() } ?: return null - if (SharedFileCapabilities.fileTypeForName(cleanName) == com.aryan.reader.shared.FileType.UNKNOWN) return null + if (SharedFileCapabilities.fileTypeForName(cleanName) == org.dueattendant149.bookreader.shared.FileType.UNKNOWN) return null return ".$extension" } } diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfInteractionModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfInteractionModels.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfInteractionModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfInteractionModels.kt index 1de9902..a547bac 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfInteractionModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfInteractionModels.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfReaderSession.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSession.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfReaderSession.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSession.kt index fabcad0..fa64956 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfReaderSession.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSession.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.SearchHighlightMode +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.SearchHighlightMode import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometry.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometry.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometry.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometry.kt index b7ca73d..5752b08 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometry.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometry.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.math.abs diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayout.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayout.kt similarity index 96% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayout.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayout.kt index 8cfd434..e0aba37 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayout.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayout.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings object PdfSpreadLayout { fun isTwoPageSpreadEnabled(settings: ReaderSettings): Boolean { diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfVerticalLayout.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfVerticalLayout.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfVerticalLayout.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfVerticalLayout.kt index 135c480..3c9739a 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfVerticalLayout.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfVerticalLayout.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfiumBridge.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfiumBridge.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfiumBridge.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfiumBridge.kt index 8ae6e7d..28c9241 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/PdfiumBridge.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfiumBridge.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf /** * Platform-neutral surface for Pdfium functions that are not exposed by the diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt index 79f3e2c..2fab031 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapper.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.math.sqrt diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt index 4f145cf..1d4b6b4 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSidecarCodec.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf -import com.aryan.reader.shared.localFolderSyncSha256ShortHex +import org.dueattendant149.bookreader.shared.localFolderSyncSha256ShortHex import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRendering.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRendering.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRendering.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRendering.kt index 184b41d..45cd479 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRendering.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRendering.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflow.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflow.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflow.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflow.kt index 3109d00..c6dcf1f 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflow.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflow.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichText.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichText.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichText.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichText.kt index eb092cd..9309bf3 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichText.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichText.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotations.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotations.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotations.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotations.kt index 7ee25aa..ee330d6 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotations.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotations.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.unit.IntSize import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderEngine.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngine.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderEngine.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngine.kt index 8044d7b..a34a562 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderEngine.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngine.kt @@ -1,17 +1,17 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticSpacer -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.toStableReaderPositionCfi +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticSpacer +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.toStableReaderPositionCfi sealed interface ReaderLinkTarget { data class External(val url: String) : ReaderLinkTarget diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilder.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilder.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilder.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilder.kt index a3e8a66..1495b8a 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilder.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilder.kt @@ -1,23 +1,23 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticHeader -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticListItem -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.paginatedreader.SemanticSpacer -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.paginatedreader.BorderStyle -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.ReaderHighlightPalette -import com.aryan.reader.shared.ReaderTexture -import com.aryan.reader.shared.UserHighlight +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticHeader +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticListItem +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.SemanticSpacer +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.paginatedreader.BorderStyle +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.ReaderHighlightPalette +import org.dueattendant149.bookreader.shared.ReaderTexture +import org.dueattendant149.bookreader.shared.UserHighlight import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.isSpecified diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderImageModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModels.kt similarity index 92% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderImageModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModels.kt index f415581..23b7bc3 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderImageModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModels.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.shared.ReaderLocator +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.shared.ReaderLocator data class ReaderImageReference( val id: String, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistory.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistory.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistory.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistory.kt index deaa0b5..37c6e65 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistory.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistory.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader data class ReaderJumpHistory( val locators: List = emptyList(), diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderModels.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderModels.kt index 3a2e4e9..e11d0f2 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/ReaderModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderModels.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.shared.PageInfoMode -import com.aryan.reader.shared.PageInfoPosition -import com.aryan.reader.shared.SystemUiMode +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.shared.PageInfoMode +import org.dueattendant149.bookreader.shared.PageInfoPosition +import org.dueattendant149.bookreader.shared.SystemUiMode data class SharedEpubBook( val id: String, @@ -31,7 +31,7 @@ data class SharedEpubChapter( val baseHref: String? = null ) -typealias ReaderLocator = com.aryan.reader.shared.ReaderLocator +typealias ReaderLocator = org.dueattendant149.bookreader.shared.ReaderLocator enum class ReaderReadingMode { PAGINATED, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.kt similarity index 92% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.kt index 177d3a3..e639d3d 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader internal const val SharedReaderDiagnosticsProperty = "episteme.desktop.diagnostics" internal const val SharedReaderDiagnosticsTagsProperty = "episteme.desktop.diagnostics.tags" diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderTextAlignment.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderTextAlignment.kt similarity index 96% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderTextAlignment.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderTextAlignment.kt index 63f3527..7c6db8c 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedReaderTextAlignment.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderTextAlignment.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.text.style.TextAlign diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedTextBookFactory.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedTextBookFactory.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedTextBookFactory.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedTextBookFactory.kt index 1e9d6bf..d1eb784 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SharedTextBookFactory.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedTextBookFactory.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader object SharedTextBookFactory { fun fromPlainText( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SimplePaginator.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SimplePaginator.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SimplePaginator.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SimplePaginator.kt index e9caa98..14fd4bd 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/reader/SimplePaginator.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SimplePaginator.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader class SimplePaginator { fun paginate( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.kt similarity index 81% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.kt index 057db4d..3533a66 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModels.kt similarity index 94% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModels.kt index ae6d21c..0210cce 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModels.kt @@ -1,17 +1,17 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.LibraryFilters -import com.aryan.reader.shared.ReadStatusFilter -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.ShelfType -import com.aryan.reader.shared.isOpdsStream -import com.aryan.reader.shared.progressPercentValue -import com.aryan.reader.shared.toHomeScreenModel +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.LibraryFilters +import org.dueattendant149.bookreader.shared.ReadStatusFilter +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.ShelfType +import org.dueattendant149.bookreader.shared.isOpdsStream +import org.dueattendant149.bookreader.shared.progressPercentValue +import org.dueattendant149.bookreader.shared.toHomeScreenModel enum class SharedAppToolAction { SETTINGS, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderScreens.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderScreens.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderScreens.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderScreens.kt index 5993a45..3e5812a 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/NonReaderScreens.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderScreens.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.ExperimentalFoundationApi @@ -91,24 +91,24 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.IN_APP_STORAGE_SOURCE -import com.aryan.reader.shared.LibraryAction -import com.aryan.reader.shared.LibraryFilters -import com.aryan.reader.shared.ReadStatusFilter -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.Shelf -import com.aryan.reader.shared.ShelfType -import com.aryan.reader.shared.SortOrder -import com.aryan.reader.shared.cardAuthor -import com.aryan.reader.shared.cardTitle -import com.aryan.reader.shared.isOpdsStream -import com.aryan.reader.shared.progressPercentValue -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.replaceBookSelectionWithVisibleBooks +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.IN_APP_STORAGE_SOURCE +import org.dueattendant149.bookreader.shared.LibraryAction +import org.dueattendant149.bookreader.shared.LibraryFilters +import org.dueattendant149.bookreader.shared.ReadStatusFilter +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.Shelf +import org.dueattendant149.bookreader.shared.ShelfType +import org.dueattendant149.bookreader.shared.SortOrder +import org.dueattendant149.bookreader.shared.cardAuthor +import org.dueattendant149.bookreader.shared.cardTitle +import org.dueattendant149.bookreader.shared.isOpdsStream +import org.dueattendant149.bookreader.shared.progressPercentValue +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.replaceBookSelectionWithVisibleBooks enum class NonReaderLibraryTab { BOOKS, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderContentRenderPlan.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderContentRenderPlan.kt similarity index 76% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderContentRenderPlan.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderContentRenderPlan.kt index 3545e52..c1e1620 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderContentRenderPlan.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderContentRenderPlan.kt @@ -1,14 +1,14 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.ReaderHighlightPalette -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSearchOptions -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.ReaderHighlightPalette +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSearchOptions +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook data class ReaderContentNavigationTarget( val locator: ReaderLocator?, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSlider.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSlider.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSlider.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSlider.kt index a269a0c..a7c40f0 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSlider.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSlider.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.Canvas import androidx.compose.foundation.gestures.awaitEachGesture diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderTooltips.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderTooltips.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderTooltips.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderTooltips.kt index afbc495..5fbc58b 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderTooltips.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderTooltips.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModels.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModels.kt similarity index 94% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModels.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModels.kt index 45c9a6f..224d9f6 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModels.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModels.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderAutoScrollState -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderTool -import com.aryan.reader.shared.ReaderToolbarPreferences -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfReaderState -import com.aryan.reader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderAutoScrollState +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderTool +import org.dueattendant149.bookreader.shared.ReaderToolbarPreferences +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderState +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState enum class ReaderWorkspaceKind { EPUB, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceShell.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceShell.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceShell.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceShell.kt index 912e8a3..b3f00d7 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceShell.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceShell.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.FastOutSlowInEasing @@ -79,8 +79,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.BannerMessage -import com.aryan.reader.shared.reader.logSharedReaderDiagnostic +import org.dueattendant149.bookreader.shared.BannerMessage +import org.dueattendant149.bookreader.shared.reader.logSharedReaderDiagnostic import kotlinx.coroutines.delay import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppShell.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppShell.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppShell.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppShell.kt index a285f08..7736862 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppShell.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppShell.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.background import androidx.compose.foundation.BorderStroke @@ -61,11 +61,11 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.AppContrastOption -import com.aryan.reader.shared.AppThemeMode -import com.aryan.reader.shared.CustomAppTheme -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.UserData +import org.dueattendant149.bookreader.shared.AppContrastOption +import org.dueattendant149.bookreader.shared.AppThemeMode +import org.dueattendant149.bookreader.shared.CustomAppTheme +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.UserData enum class SharedAppTab { LIBRARY, diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppThemeSettings.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeSettings.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppThemeSettings.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeSettings.kt index cc54786..0ec69c6 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedAppThemeSettings.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeSettings.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -77,9 +77,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.shared.AppContrastOption -import com.aryan.reader.shared.AppThemeMode -import com.aryan.reader.shared.CustomAppTheme +import org.dueattendant149.bookreader.shared.AppContrastOption +import org.dueattendant149.bookreader.shared.AppThemeMode +import org.dueattendant149.bookreader.shared.CustomAppTheme import com.materialkolor.PaletteStyle import com.materialkolor.dynamicColorScheme import kotlin.math.PI diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedLibraryDialogs.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedLibraryDialogs.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedLibraryDialogs.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedLibraryDialogs.kt index af7f8aa..80516f4 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedLibraryDialogs.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedLibraryDialogs.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.clickable import androidx.compose.foundation.horizontalScroll @@ -60,14 +60,14 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.Shelf -import com.aryan.reader.shared.Tag -import com.aryan.reader.shared.cardAuthor -import com.aryan.reader.shared.cardTitle -import com.aryan.reader.shared.formatFileSize -import com.aryan.reader.shared.parseTagList +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.Shelf +import org.dueattendant149.bookreader.shared.Tag +import org.dueattendant149.bookreader.shared.cardAuthor +import org.dueattendant149.bookreader.shared.cardTitle +import org.dueattendant149.bookreader.shared.formatFileSize +import org.dueattendant149.bookreader.shared.parseTagList @Composable fun SharedTextInputDialog( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedMarkdownText.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedMarkdownText.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedMarkdownText.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedMarkdownText.kt index bf415ec..978892b 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedMarkdownText.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedMarkdownText.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -23,8 +23,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ReaderMarkdownBlock -import com.aryan.reader.shared.ReaderMarkdownParser +import org.dueattendant149.bookreader.shared.ReaderMarkdownBlock +import org.dueattendant149.bookreader.shared.ReaderMarkdownParser @Composable fun SharedMarkdownText( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReader.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReader.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReader.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReader.kt index 56fab51..c4fca30 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReader.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReader.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -104,35 +104,35 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isSpecified import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.BlockStyle -import com.aryan.reader.paginatedreader.BorderStyle -import com.aryan.reader.paginatedreader.CssParser -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticHeader -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticListItem -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.paginatedreader.SemanticSpacer -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubCutoffDiagnosticsTag -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter -import com.aryan.reader.shared.reader.SharedReaderTextAlign -import com.aryan.reader.shared.reader.logSharedReaderDiagnostic -import com.aryan.reader.shared.reader.resolveSharedReaderFontFeatureSettings -import com.aryan.reader.shared.reader.resolveSharedReaderTextAlign +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.BlockStyle +import org.dueattendant149.bookreader.paginatedreader.BorderStyle +import org.dueattendant149.bookreader.paginatedreader.CssParser +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticHeader +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticListItem +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.SemanticSpacer +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubCutoffDiagnosticsTag +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.logSharedReaderDiagnostic +import org.dueattendant149.bookreader.shared.reader.resolveSharedReaderFontFeatureSettings +import org.dueattendant149.bookreader.shared.reader.resolveSharedReaderTextAlign import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.distinctUntilChanged import kotlin.io.encoding.Base64 diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedOpdsScreen.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedOpdsScreen.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedOpdsScreen.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedOpdsScreen.kt index ae39e8b..dec3afb 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedOpdsScreen.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedOpdsScreen.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -62,14 +62,14 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.opds.OpdsAcquisition -import com.aryan.reader.shared.opds.OpdsCatalog -import com.aryan.reader.shared.opds.OpdsEntry -import com.aryan.reader.shared.opds.SharedOpdsLocalBookMatcher -import com.aryan.reader.shared.opds.SharedOpdsDownloadState -import com.aryan.reader.shared.opds.SharedOpdsScreenState -import com.aryan.reader.shared.opds.SharedOpdsText +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.opds.OpdsAcquisition +import org.dueattendant149.bookreader.shared.opds.OpdsCatalog +import org.dueattendant149.bookreader.shared.opds.OpdsEntry +import org.dueattendant149.bookreader.shared.opds.SharedOpdsLocalBookMatcher +import org.dueattendant149.bookreader.shared.opds.SharedOpdsDownloadState +import org.dueattendant149.bookreader.shared.opds.SharedOpdsScreenState +import org.dueattendant149.bookreader.shared.opds.SharedOpdsText @Composable fun SharedOpdsScreen( @@ -512,7 +512,7 @@ private fun SharedOpdsEmptyState(onAddCatalog: () -> Unit, modifier: Modifier = @Composable private fun SharedOpdsFacetMenu( groupName: String, - facets: List, + facets: List, onOpenFeedUrl: (String) -> Unit ) { var expanded by remember { mutableStateOf(false) } diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUi.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUi.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUi.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUi.kt index ec98bcc..802a4d2 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUi.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.LinearEasing @@ -99,28 +99,28 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.PdfPageBounds -import com.aryan.reader.shared.pdf.PdfPagePoint -import com.aryan.reader.shared.pdf.PdfToolConfig -import com.aryan.reader.shared.pdf.SharedPdfAnnotation -import com.aryan.reader.shared.pdf.SharedPdfAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfAndroidHighlightColors -import com.aryan.reader.shared.pdf.SharedPdfEmbeddedAnnotation -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.pdf.SharedPdfInkRenderData -import com.aryan.reader.shared.pdf.SharedPdfInkRenderer -import com.aryan.reader.shared.pdf.SharedPdfTextAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfTextDraft -import com.aryan.reader.shared.pdf.SharedPdfTextFontPreset -import com.aryan.reader.shared.pdf.SharedPdfTextResizeHandle -import com.aryan.reader.shared.pdf.SharedPdfTextStyleConfig -import com.aryan.reader.shared.pdf.movedBy -import com.aryan.reader.shared.pdf.resizedBy -import com.aryan.reader.shared.pdf.sharedPdfTextFontSizePx -import com.aryan.reader.shared.pdf.sharedPdfStrokeWidthRange -import com.aryan.reader.shared.pdf.withSharedPdfTextFontSize +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.PdfPageBounds +import org.dueattendant149.bookreader.shared.pdf.PdfPagePoint +import org.dueattendant149.bookreader.shared.pdf.PdfToolConfig +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAndroidHighlightColors +import org.dueattendant149.bookreader.shared.pdf.SharedPdfEmbeddedAnnotation +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.pdf.SharedPdfInkRenderData +import org.dueattendant149.bookreader.shared.pdf.SharedPdfInkRenderer +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextDraft +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextFontPreset +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextResizeHandle +import org.dueattendant149.bookreader.shared.pdf.SharedPdfTextStyleConfig +import org.dueattendant149.bookreader.shared.pdf.movedBy +import org.dueattendant149.bookreader.shared.pdf.resizedBy +import org.dueattendant149.bookreader.shared.pdf.sharedPdfTextFontSizePx +import org.dueattendant149.bookreader.shared.pdf.sharedPdfStrokeWidthRange +import org.dueattendant149.bookreader.shared.pdf.withSharedPdfTextFontSize import kotlin.math.roundToInt val SharedPdfAnnotationDefaultTools: List = listOf( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfRichTextUi.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfRichTextUi.kt similarity index 96% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfRichTextUi.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfRichTextUi.kt index d476539..726ddf4 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedPdfRichTextUi.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfRichTextUi.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateFloat @@ -37,10 +37,10 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isSpecified import androidx.compose.ui.unit.sp -import com.aryan.reader.shared.pdf.SharedPdfRichTextController -import com.aryan.reader.shared.pdf.SharedPdfRichTextLog -import com.aryan.reader.shared.pdf.sharedPdfRichTextSelectionBounds -import com.aryan.reader.shared.pdf.withoutTrailingSharedPdfPageBreak +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextController +import org.dueattendant149.bookreader.shared.pdf.SharedPdfRichTextLog +import org.dueattendant149.bookreader.shared.pdf.sharedPdfRichTextSelectionBounds +import org.dueattendant149.bookreader.shared.pdf.withoutTrailingSharedPdfPageBreak import kotlinx.coroutines.delay import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderChrome.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderChrome.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderChrome.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderChrome.kt index 45f00b6..1ce2779 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderChrome.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderChrome.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -115,65 +115,65 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.aryan.reader.shared.BuiltInReaderThemes -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.fontFaceSummary -import com.aryan.reader.shared.groupByFamily -import com.aryan.reader.shared.hasVariableWeightFace -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.PageInfoMode -import com.aryan.reader.shared.PageInfoPosition -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderAiFeature -import com.aryan.reader.shared.ReaderAiResultState -import com.aryan.reader.shared.ReaderCloudTtsVoices -import com.aryan.reader.shared.ReaderContextExtractor -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderExternalLookupAction -import com.aryan.reader.shared.ReaderAction -import com.aryan.reader.shared.ReaderHighlightPalette -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.ReaderTexture -import com.aryan.reader.shared.ReaderTextureFilePrefix -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.ReaderTool -import com.aryan.reader.shared.ReaderToolbarPreferences -import com.aryan.reader.shared.ReaderTtsChunk -import com.aryan.reader.shared.ReaderTtsPlanner -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.ReaderTtsReplacementBookSettings -import com.aryan.reader.shared.ReaderTtsReplacementEngine -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.ReaderTtsReplacementRule -import com.aryan.reader.shared.ReaderTtsReplacementSuggestions -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.currentTimestamp -import com.aryan.reader.shared.reduce -import com.aryan.reader.shared.readerTextureDisplayName -import com.aryan.reader.shared.resetReaderFormatSettings -import com.aryan.reader.shared.sanitizeCustomReaderThemes -import com.aryan.reader.shared.shouldShowPageWidthFormatControl -import com.aryan.reader.shared.toReaderSettings -import com.aryan.reader.shared.withHorizontalReaderMargin -import com.aryan.reader.shared.withVerticalReaderMargin -import com.aryan.reader.shared.reader.PaginatedReaderState -import com.aryan.reader.shared.reader.ReaderImageReference -import com.aryan.reader.shared.reader.ReaderBookmark -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.ReaderHtmlDocumentBuilder -import com.aryan.reader.shared.reader.ReaderLinkTarget -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.ReaderSpreadLayout -import com.aryan.reader.shared.reader.SharedEpubTocEntry -import com.aryan.reader.shared.reader.SharedReaderTextAlign -import com.aryan.reader.shared.reader.appearanceSignature -import com.aryan.reader.shared.reader.isRightToLeftPaginationEnabled -import com.aryan.reader.shared.reader.layoutSignature -import com.aryan.reader.shared.reader.logSharedReaderDiagnostic -import com.aryan.reader.shared.reader.readerImageReferences +import org.dueattendant149.bookreader.shared.BuiltInReaderThemes +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.fontFaceSummary +import org.dueattendant149.bookreader.shared.groupByFamily +import org.dueattendant149.bookreader.shared.hasVariableWeightFace +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.PageInfoMode +import org.dueattendant149.bookreader.shared.PageInfoPosition +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderAiFeature +import org.dueattendant149.bookreader.shared.ReaderAiResultState +import org.dueattendant149.bookreader.shared.ReaderCloudTtsVoices +import org.dueattendant149.bookreader.shared.ReaderContextExtractor +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderExternalLookupAction +import org.dueattendant149.bookreader.shared.ReaderAction +import org.dueattendant149.bookreader.shared.ReaderHighlightPalette +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderTexture +import org.dueattendant149.bookreader.shared.ReaderTextureFilePrefix +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.ReaderTool +import org.dueattendant149.bookreader.shared.ReaderToolbarPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsChunk +import org.dueattendant149.bookreader.shared.ReaderTtsPlanner +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementBookSettings +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementEngine +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementRule +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementSuggestions +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.currentTimestamp +import org.dueattendant149.bookreader.shared.reduce +import org.dueattendant149.bookreader.shared.readerTextureDisplayName +import org.dueattendant149.bookreader.shared.resetReaderFormatSettings +import org.dueattendant149.bookreader.shared.sanitizeCustomReaderThemes +import org.dueattendant149.bookreader.shared.shouldShowPageWidthFormatControl +import org.dueattendant149.bookreader.shared.toReaderSettings +import org.dueattendant149.bookreader.shared.withHorizontalReaderMargin +import org.dueattendant149.bookreader.shared.withVerticalReaderMargin +import org.dueattendant149.bookreader.shared.reader.PaginatedReaderState +import org.dueattendant149.bookreader.shared.reader.ReaderImageReference +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.ReaderHtmlDocumentBuilder +import org.dueattendant149.bookreader.shared.reader.ReaderLinkTarget +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderSpreadLayout +import org.dueattendant149.bookreader.shared.reader.SharedEpubTocEntry +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.appearanceSignature +import org.dueattendant149.bookreader.shared.reader.isRightToLeftPaginationEnabled +import org.dueattendant149.bookreader.shared.reader.layoutSignature +import org.dueattendant149.bookreader.shared.reader.logSharedReaderDiagnostic +import org.dueattendant149.bookreader.shared.reader.readerImageReferences import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlin.math.roundToInt @@ -4182,7 +4182,7 @@ private fun SharedReaderTocTreeItem( } private fun SharedEpubTocEntry.targetChapterIndex( - chapters: List + chapters: List ): Int? { val targetPath = href.normalizedReaderTocPath() return chapters.indexOfFirst { chapter -> diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.kt index 01061b0..b1730a5 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.Composable diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderScrollbars.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderScrollbars.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderScrollbars.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderScrollbars.kt index 2bde8c2..c0ac687 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderScrollbars.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderScrollbars.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderTtsOverlayControls.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderTtsOverlayControls.kt similarity index 97% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderTtsOverlayControls.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderTtsOverlayControls.kt index decb556..7eee7d0 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedReaderTtsOverlayControls.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderTtsOverlayControls.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.animation.AnimatedContent import androidx.compose.animation.animateContentSize @@ -47,11 +47,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.ReaderAiByokSettings -import com.aryan.reader.shared.ReaderCloudTtsState -import com.aryan.reader.shared.ReaderTtsReadScope -import com.aryan.reader.shared.readerCloudTtsControlsModel -import com.aryan.reader.shared.readerCloudTtsVoiceById +import org.dueattendant149.bookreader.shared.ReaderAiByokSettings +import org.dueattendant149.bookreader.shared.ReaderCloudTtsState +import org.dueattendant149.bookreader.shared.ReaderTtsReadScope +import org.dueattendant149.bookreader.shared.readerCloudTtsControlsModel +import org.dueattendant149.bookreader.shared.readerCloudTtsVoiceById @Composable fun SharedReaderTtsOverlayControls( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacement.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacement.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacement.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacement.kt index 5348144..128fda0 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacement.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacement.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import kotlin.math.max import kotlin.math.min diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSettingsHub.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSettingsHub.kt similarity index 96% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSettingsHub.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSettingsHub.kt index fec91c2..c18d82d 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedSettingsHub.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSettingsHub.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -44,23 +44,23 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.BuiltInPdfReaderThemes -import com.aryan.reader.shared.CustomFontItem -import com.aryan.reader.shared.ReaderAction -import com.aryan.reader.shared.ReaderTheme -import com.aryan.reader.shared.ReaderToolbarPreferences -import com.aryan.reader.shared.ReaderTtsReplacementPreferences -import com.aryan.reader.shared.SharedSettingsAction -import com.aryan.reader.shared.SharedSettingsCategoryModel -import com.aryan.reader.shared.SharedSettingsDestination -import com.aryan.reader.shared.SharedSettingsHubModel -import com.aryan.reader.shared.SharedSettingsItemKind -import com.aryan.reader.shared.SharedSettingsItemModel -import com.aryan.reader.shared.SharedSettingsPageKind -import com.aryan.reader.shared.SharedSettingsPageModel -import com.aryan.reader.shared.SharedSettingsSearchResult -import com.aryan.reader.shared.parentDestination -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.BuiltInPdfReaderThemes +import org.dueattendant149.bookreader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.ReaderAction +import org.dueattendant149.bookreader.shared.ReaderTheme +import org.dueattendant149.bookreader.shared.ReaderToolbarPreferences +import org.dueattendant149.bookreader.shared.ReaderTtsReplacementPreferences +import org.dueattendant149.bookreader.shared.SharedSettingsAction +import org.dueattendant149.bookreader.shared.SharedSettingsCategoryModel +import org.dueattendant149.bookreader.shared.SharedSettingsDestination +import org.dueattendant149.bookreader.shared.SharedSettingsHubModel +import org.dueattendant149.bookreader.shared.SharedSettingsItemKind +import org.dueattendant149.bookreader.shared.SharedSettingsItemModel +import org.dueattendant149.bookreader.shared.SharedSettingsPageKind +import org.dueattendant149.bookreader.shared.SharedSettingsPageModel +import org.dueattendant149.bookreader.shared.SharedSettingsSearchResult +import org.dueattendant149.bookreader.shared.parentDestination +import org.dueattendant149.bookreader.shared.reader.ReaderSettings @Composable fun SharedSettingsHub( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStableTextFields.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStableTextFields.kt similarity index 98% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStableTextFields.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStableTextFields.kt index 4d6ee53..0ab4b34 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStableTextFields.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStableTextFields.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStrings.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStrings.kt similarity index 95% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStrings.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStrings.kt index 73d93b8..946aef9 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedStrings.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStrings.kt @@ -1,10 +1,10 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf -import com.aryan.reader.shared.BannerMessage -import com.aryan.reader.shared.SharedText +import org.dueattendant149.bookreader.shared.BannerMessage +import org.dueattendant149.bookreader.shared.SharedText @Immutable class SharedStringResolver( diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUiTokens.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUiTokens.kt similarity index 92% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUiTokens.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUiTokens.kt index bd35755..08b60b8 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUiTokens.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUiTokens.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.material3.MaterialTheme diff --git a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUtilityScreens.kt b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUtilityScreens.kt similarity index 99% rename from shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUtilityScreens.kt rename to shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUtilityScreens.kt index 54482ff..41d94fc 100644 --- a/shared/src/commonMain/kotlin/com/aryan/reader/shared/ui/SharedUtilityScreens.kt +++ b/shared/src/commonMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedUtilityScreens.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -67,8 +67,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.shared.AppFontPreference -import com.aryan.reader.shared.CustomFontItem +import org.dueattendant149.bookreader.shared.AppFontPreference +import org.dueattendant149.bookreader.shared.CustomFontItem @Composable fun SharedCustomFontsScreen( diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/CloudSyncDecisionsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisionsTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/CloudSyncDecisionsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisionsTest.kt index cdf310c..aee3384 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/CloudSyncDecisionsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/CloudSyncDecisionsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/EpubAnnotationSerializerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/EpubAnnotationSerializerTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/EpubAnnotationSerializerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/EpubAnnotationSerializerTest.kt index b9615fc..c0dd1e2 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/EpubAnnotationSerializerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/EpubAnnotationSerializerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/FileCapabilitiesTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilitiesTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/FileCapabilitiesTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilitiesTest.kt index 81e7bbd..565bb9d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/FileCapabilitiesTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FileCapabilitiesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/FontVariantInferenceTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInferenceTest.kt similarity index 97% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/FontVariantInferenceTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInferenceTest.kt index c2d4d76..e91d724 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/FontVariantInferenceTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/FontVariantInferenceTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/LocalFolderSyncEngineTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSyncEngineTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/LocalFolderSyncEngineTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSyncEngineTest.kt index 4f0a2ed..c0e144f 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/LocalFolderSyncEngineTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSyncEngineTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderActionReducerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderActionReducerTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderActionReducerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderActionReducerTest.kt index a4183b0..bbce355 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderActionReducerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderActionReducerTest.kt @@ -1,13 +1,13 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSearchOptions -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSearchOptions +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderAppearanceModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModelsTest.kt similarity index 93% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderAppearanceModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModelsTest.kt index 97bca5d..3122367 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderAppearanceModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderAppearanceModelsTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfAndroidHighlightColors -import com.aryan.reader.shared.pdf.SharedPdfAnnotationDefaults -import com.aryan.reader.shared.pdf.SharedPdfHighlighterPalette -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAndroidHighlightColors +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotationDefaults +import org.dueattendant149.bookreader.shared.pdf.SharedPdfHighlighterPalette +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderBookReplacementEngineTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderBookReplacementEngineTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderBookReplacementEngineTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderBookReplacementEngineTest.kt index 5e51602..2d4f23c 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderBookReplacementEngineTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderBookReplacementEngineTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderDefaultSettingsStateTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderDefaultSettingsStateTest.kt similarity index 91% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderDefaultSettingsStateTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderDefaultSettingsStateTest.kt index e1ff65f..2dd04e1 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderDefaultSettingsStateTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderDefaultSettingsStateTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderExtrasModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModelsTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderExtrasModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModelsTest.kt index d5d4c6c..7cf13b0 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderExtrasModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderExtrasModelsTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.PaginatedReaderState -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSessionState -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.PaginatedReaderState +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSessionState +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderMarkdownParserTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownParserTest.kt similarity index 95% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderMarkdownParserTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownParserTest.kt index adc1982..e5bd72f 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderMarkdownParserTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderMarkdownParserTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderToolbarPreferencesTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarPreferencesTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderToolbarPreferencesTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarPreferencesTest.kt index 6609ef3..e6c6c58 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderToolbarPreferencesTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderToolbarPreferencesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderTtsReplacementEngineTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacementEngineTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderTtsReplacementEngineTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacementEngineTest.kt index 849ec73..cbeaf96 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ReaderTtsReplacementEngineTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsReplacementEngineTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SettingsHubModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModelsTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SettingsHubModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModelsTest.kt index 750815b..3d3869f 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SettingsHubModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SettingsHubModelsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedAppThemeReducerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedAppThemeReducerTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedAppThemeReducerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedAppThemeReducerTest.kt index 75c925a..e187ec1 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedAppThemeReducerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedAppThemeReducerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color import kotlin.test.Test diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedImportPlannerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedImportPlannerTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedImportPlannerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedImportPlannerTest.kt index 3263e61..d403452 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedImportPlannerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedImportPlannerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLegalLinksTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinksTest.kt similarity index 94% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLegalLinksTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinksTest.kt index f13deeb..bfd8b51 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLegalLinksTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLegalLinksTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryEditorTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryEditorTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryEditorTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryEditorTest.kt index 727fe84..46bd605 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryEditorTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryEditorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryProjectorTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryProjectorTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryProjectorTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryProjectorTest.kt index c295dff..8aba3d1 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibraryProjectorTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibraryProjectorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibrarySnapshotJsonTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshotJsonTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibrarySnapshotJsonTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshotJsonTest.kt index ac97718..fbc5386 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedLibrarySnapshotJsonTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedLibrarySnapshotJsonTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import androidx.compose.ui.graphics.Color -import com.aryan.reader.shared.pdf.SharedPdfReaderViewport -import com.aryan.reader.shared.reader.ReaderBookmark -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderReadingMode -import com.aryan.reader.shared.reader.ReaderSettings -import com.aryan.reader.shared.reader.SharedReaderTextAlign +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderViewport +import org.dueattendant149.bookreader.shared.reader.ReaderBookmark +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderReadingMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.SharedReaderTextAlign import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedReducersTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducersTest.kt similarity index 95% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedReducersTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducersTest.kt index 2cbcc2e..5944b10 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SharedReducersTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SharedReducersTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SmartCollectionEngineTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngineTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/SmartCollectionEngineTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngineTest.kt index d83cc96..2414e55 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/SmartCollectionEngineTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/SmartCollectionEngineTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogsTest.kt similarity index 97% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogsTest.kt index 50dceb1..ad1def2 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsCatalogsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsCatalogsTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsControllerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsControllerTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsControllerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsControllerTest.kt index 3542b9d..c68e681 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsControllerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsControllerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds import kotlinx.coroutines.runBlocking import kotlin.test.Test diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfReaderSessionTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSessionTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfReaderSessionTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSessionTest.kt index e24fb52..60dce59 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfReaderSessionTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfReaderSessionTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.unit.dp -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.SearchHighlightMode +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.SearchHighlightMode import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometryTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometryTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometryTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometryTest.kt index 8fc40ad..7da77a6 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSelectionGeometryTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSelectionGeometryTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayoutTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayoutTest.kt similarity index 95% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayoutTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayoutTest.kt index d6b4e2f..b95da0d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/PdfSpreadLayoutTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/PdfSpreadLayoutTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf -import com.aryan.reader.shared.reader.ReaderPageSpreadMode -import com.aryan.reader.shared.reader.ReaderSettings +import org.dueattendant149.bookreader.shared.reader.ReaderPageSpreadMode +import org.dueattendant149.bookreader.shared.reader.ReaderSettings import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt similarity index 97% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt index 0a96a04..213650d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationCommentsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt index 76036fe..71746bc 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationExportMapperTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt index c8a7d88..8d64cc1 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfAnnotationSerializerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRenderingTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRenderingTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRenderingTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRenderingTest.kt index c5dd416..cb5b19e 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfInkRenderingTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfInkRenderingTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflowTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflowTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflowTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflowTest.kt index dd4ec78..76cba63 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfReflowTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfReflowTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichTextTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichTextTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichTextTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichTextTest.kt index c9bd216..97b2691 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfRichTextTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfRichTextTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt similarity index 99% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt index e763551..6135129 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/pdf/SharedPdfTextAnnotationsTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pdf +package org.dueattendant149.bookreader.shared.pdf import androidx.compose.ui.unit.IntSize import kotlin.math.abs diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderEngineTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngineTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderEngineTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngineTest.kt index 59ea91d..daab6f0 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderEngineTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderEngineTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertSame diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt index 148770f..c8f404d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderHtmlDocumentBuilderTest.kt @@ -1,26 +1,26 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em -import com.aryan.reader.paginatedreader.BlockStyle -import com.aryan.reader.paginatedreader.BorderStyle -import com.aryan.reader.paginatedreader.BoxBorders -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticListItem -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.paginatedreader.SemanticSpan -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTableCell -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.ReaderHighlightPalette -import com.aryan.reader.shared.ReaderTexture -import com.aryan.reader.shared.UserHighlight +import org.dueattendant149.bookreader.paginatedreader.BlockStyle +import org.dueattendant149.bookreader.paginatedreader.BorderStyle +import org.dueattendant149.bookreader.paginatedreader.BoxBorders +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticListItem +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.SemanticSpan +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTableCell +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.ReaderHighlightPalette +import org.dueattendant149.bookreader.shared.ReaderTexture +import org.dueattendant149.bookreader.shared.UserHighlight import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderImageModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModelsTest.kt similarity index 91% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderImageModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModelsTest.kt index 5c55ad8..65b9ffd 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderImageModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderImageModelsTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistoryTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistoryTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistoryTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistoryTest.kt index 7e4e114..b1e48d4 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderJumpHistoryTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderJumpHistoryTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderSpreadLayoutTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderSpreadLayoutTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderSpreadLayoutTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderSpreadLayoutTest.kt index 8078b69..d9922da 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/reader/ReaderSpreadLayoutTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/ReaderSpreadLayoutTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModelsTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModelsTest.kt index 52b73e3..dfcc982 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/NonReaderLayoutModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/NonReaderLayoutModelsTest.kt @@ -1,17 +1,17 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui -import com.aryan.reader.shared.BookItem -import com.aryan.reader.shared.FileType -import com.aryan.reader.shared.LibraryFilters -import com.aryan.reader.shared.ReadStatusFilter -import com.aryan.reader.shared.ReaderPlatform -import com.aryan.reader.shared.SharedFeaturePolicy -import com.aryan.reader.shared.SharedFileCapabilities -import com.aryan.reader.shared.SharedReaderScreenState -import com.aryan.reader.shared.Shelf -import com.aryan.reader.shared.ShelfType -import com.aryan.reader.shared.SyncedFolder -import com.aryan.reader.shared.Tag +import org.dueattendant149.bookreader.shared.BookItem +import org.dueattendant149.bookreader.shared.FileType +import org.dueattendant149.bookreader.shared.LibraryFilters +import org.dueattendant149.bookreader.shared.ReadStatusFilter +import org.dueattendant149.bookreader.shared.ReaderPlatform +import org.dueattendant149.bookreader.shared.SharedFeaturePolicy +import org.dueattendant149.bookreader.shared.SharedFileCapabilities +import org.dueattendant149.bookreader.shared.SharedReaderScreenState +import org.dueattendant149.bookreader.shared.Shelf +import org.dueattendant149.bookreader.shared.ShelfType +import org.dueattendant149.bookreader.shared.SyncedFolder +import org.dueattendant149.bookreader.shared.Tag import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSliderTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSliderTest.kt similarity index 95% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSliderTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSliderTest.kt index 98e34c8..2c1bc93 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderMinimalSliderTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderMinimalSliderTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModelsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModelsTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModelsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModelsTest.kt index 52b5e1b..ca435c7 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/ReaderWorkspaceModelsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/ReaderWorkspaceModelsTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui -import com.aryan.reader.shared.PdfDisplayMode -import com.aryan.reader.shared.ReaderAutoScrollState -import com.aryan.reader.shared.ReaderCloudTtsState -import com.aryan.reader.shared.ReaderExtrasState -import com.aryan.reader.shared.ReaderTool -import com.aryan.reader.shared.ReaderToolbarPreferences -import com.aryan.reader.shared.pdf.SharedPdfReaderState -import com.aryan.reader.shared.reader.ReaderEngine -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.PdfDisplayMode +import org.dueattendant149.bookreader.shared.ReaderAutoScrollState +import org.dueattendant149.bookreader.shared.ReaderCloudTtsState +import org.dueattendant149.bookreader.shared.ReaderExtrasState +import org.dueattendant149.bookreader.shared.ReaderTool +import org.dueattendant149.bookreader.shared.ReaderToolbarPreferences +import org.dueattendant149.bookreader.shared.pdf.SharedPdfReaderState +import org.dueattendant149.bookreader.shared.reader.ReaderEngine +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedAppThemeColorMathTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeColorMathTest.kt similarity index 97% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedAppThemeColorMathTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeColorMathTest.kt index 7813c8c..33e86b4 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedAppThemeColorMathTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedAppThemeColorMathTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt similarity index 96% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt index 65193ac..9d00a7a 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativePaginatedReaderInteractionTest.kt @@ -1,15 +1,15 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.shared.HighlightColor -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.UserHighlight -import com.aryan.reader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.shared.HighlightColor +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.UserHighlight +import org.dueattendant149.bookreader.shared.reader.ReaderPage import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt similarity index 93% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt index 14f550b..613db2c 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedNativeVerticalReaderFlowTest.kt @@ -1,23 +1,23 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp -import com.aryan.reader.paginatedreader.BlockStyle -import com.aryan.reader.paginatedreader.BorderStyle -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.shared.ReaderLocator -import com.aryan.reader.shared.reader.ReaderPage -import com.aryan.reader.shared.reader.SharedEpubBook -import com.aryan.reader.shared.reader.SharedEpubChapter -import com.aryan.reader.shared.reader.resolveSharedReaderFontFeatureSettings -import com.aryan.reader.shared.reader.resolveSharedReaderTextAlign +import org.dueattendant149.bookreader.paginatedreader.BlockStyle +import org.dueattendant149.bookreader.paginatedreader.BorderStyle +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.shared.ReaderLocator +import org.dueattendant149.bookreader.shared.reader.ReaderPage +import org.dueattendant149.bookreader.shared.reader.SharedEpubBook +import org.dueattendant149.bookreader.shared.reader.SharedEpubChapter +import org.dueattendant149.bookreader.shared.reader.resolveSharedReaderFontFeatureSettings +import org.dueattendant149.bookreader.shared.reader.resolveSharedReaderTextAlign import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUiTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUiTest.kt similarity index 92% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUiTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUiTest.kt index 1af0158..79b81e1 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedPdfAnnotationUiTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedPdfAnnotationUiTest.kt @@ -1,12 +1,12 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.BlendMode import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.aryan.reader.shared.pdf.PdfAnnotationKind -import com.aryan.reader.shared.pdf.PdfInkTool -import com.aryan.reader.shared.pdf.SharedPdfAndroidHighlightColors -import com.aryan.reader.shared.pdf.SharedPdfAnnotation +import org.dueattendant149.bookreader.shared.pdf.PdfAnnotationKind +import org.dueattendant149.bookreader.shared.pdf.PdfInkTool +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAndroidHighlightColors +import org.dueattendant149.bookreader.shared.pdf.SharedPdfAnnotation import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalSizingTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalSizingTest.kt similarity index 91% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalSizingTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalSizingTest.kt index 75f3883..9ffc87d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalSizingTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalSizingTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacementTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacementTest.kt similarity index 98% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacementTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacementTest.kt index 19ee6f6..081953d 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedSelectionMenuPlacementTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedSelectionMenuPlacementTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedStringsTest.kt b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStringsTest.kt similarity index 95% rename from shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedStringsTest.kt rename to shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStringsTest.kt index 17891df..bb86111 100644 --- a/shared/src/commonTest/kotlin/com/aryan/reader/shared/ui/SharedStringsTest.kt +++ b/shared/src/commonTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedStringsTest.kt @@ -1,6 +1,6 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui -import com.aryan.reader.shared.SharedText +import org.dueattendant149.bookreader.shared.SharedText import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/LocalFolderSync.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.desktop.kt similarity index 84% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/LocalFolderSync.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.desktop.kt index 700e05e..cabc21b 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/LocalFolderSync.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/LocalFolderSync.desktop.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import java.security.MessageDigest diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/Platform.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.desktop.kt similarity index 58% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/Platform.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.desktop.kt index d1f14a5..92ed9f2 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/Platform.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/Platform.desktop.kt @@ -1,3 +1,3 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared actual fun currentTimestamp(): Long = System.currentTimeMillis() diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.desktop.kt similarity index 96% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.desktop.kt index 19b75e2..091d2de 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/reader/SharedReaderDiagnostics.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedReaderDiagnostics.desktop.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader private const val SharedReaderDiagnosticsEnv = "EPISTEME_DESKTOP_DIAGNOSTICS" private const val SharedReaderDiagnosticsTagsEnv = "EPISTEME_DESKTOP_DIAGNOSTICS_TAGS" diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCache.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCache.kt similarity index 98% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCache.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCache.kt index 3880ff7..1b61da7 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCache.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCache.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImage.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImage.desktop.kt similarity index 98% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImage.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImage.desktop.kt index c5bd2e3..852cadf 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImage.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImage.desktop.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Spacer @@ -17,7 +17,7 @@ import androidx.compose.ui.graphics.ColorMatrix import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.layout.ContentScale -import com.aryan.reader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticImage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.skia.Data diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.desktop.kt similarity index 95% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.desktop.kt index 03c152b..70d3145 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/LocalBookCoverImage.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/LocalBookCoverImage.desktop.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.foundation.Image import androidx.compose.runtime.LaunchedEffect diff --git a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.desktop.kt b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.desktop.kt similarity index 99% rename from shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.desktop.kt rename to shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.desktop.kt index 650e976..46e69a6 100644 --- a/shared/src/desktopMain/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayer.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayer.desktop.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/paginatedreader/HtmlParserLinkTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserLinkTest.kt similarity index 98% rename from shared/src/desktopTest/kotlin/com/aryan/reader/paginatedreader/HtmlParserLinkTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserLinkTest.kt index 83c31e9..5a99006 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/paginatedreader/HtmlParserLinkTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParserLinkTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManagerTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManagerTest.kt similarity index 97% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManagerTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManagerTest.kt index 9eee62d..40f1527 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManagerTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManagerTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import java.nio.file.Files import kotlin.test.Test diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsParserTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParserTest.kt similarity index 99% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsParserTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParserTest.kt index 1a2d300..56281ce 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/opds/SharedOpdsParserTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParserTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditorTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditorTest.kt similarity index 99% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditorTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditorTest.kt index 60a8054..36b0f0b 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditorTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import java.io.File import java.util.zip.CRC32 diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCacheTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCacheTest.kt similarity index 98% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCacheTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCacheTest.kt index e41a918..dab48e6 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCacheTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCacheTest.kt @@ -1,8 +1,8 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph import kotlinx.coroutines.runBlocking import java.nio.file.Files import kotlin.test.Test diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCacheTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCacheTest.kt similarity index 94% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCacheTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCacheTest.kt index 2f9dce6..48a3116 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCacheTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCacheTest.kt @@ -1,9 +1,9 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.shared.FileType import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoaderTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoaderTest.kt similarity index 99% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoaderTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoaderTest.kt index 9b0d460..1b72d9a 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoaderTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoaderTest.kt @@ -1,7 +1,7 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.shared.FileType import java.io.File import java.nio.file.Files import java.util.Base64 diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt similarity index 90% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt index 1181b1b..3cb4d20 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCacheTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectoriesTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectoriesTest.kt similarity index 94% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectoriesTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectoriesTest.kt index c153ae9..9ff502e 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectoriesTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectoriesTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import kotlin.test.Test import kotlin.test.assertEquals diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt similarity index 95% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt index e056b20..b6f7766 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginatorTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.text.ParagraphStyle import androidx.compose.ui.text.style.Hyphens @@ -6,10 +6,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextIndent import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.BlockStyle -import com.aryan.reader.paginatedreader.BoxBorders -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.BlockStyle +import org.dueattendant149.bookreader.paginatedreader.BoxBorders +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCacheTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCacheTest.kt similarity index 97% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCacheTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCacheTest.kt index 74284cb..b8af7a8 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopBookCoverImageCacheTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopBookCoverImageCacheTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import java.awt.Color import java.awt.image.BufferedImage diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImageTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImageTest.kt similarity index 93% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImageTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImageTest.kt index e113441..4829313 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/DesktopEpubNativeImageTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/DesktopEpubNativeImageTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.Alignment import kotlin.test.Test diff --git a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt similarity index 99% rename from shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt rename to shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt index bafc744..3808608 100644 --- a/shared/src/desktopTest/kotlin/com/aryan/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt +++ b/shared/src/desktopTest/kotlin/com/dueattendant149/bookreader/reader/shared/ui/SharedReaderModalLayerDesktopTest.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.ui +package org.dueattendant149.bookreader.shared.ui import androidx.compose.ui.unit.dp import kotlin.test.Test diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/paginatedreader/HtmlParser.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParser.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/paginatedreader/HtmlParser.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParser.kt index 02fe2e0..db0f8c1 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/paginatedreader/HtmlParser.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/paginatedreader/HtmlParser.kt @@ -17,7 +17,7 @@ * * mail: epistemereader@gmail.com */ -package com.aryan.reader.paginatedreader +package org.dueattendant149.bookreader.paginatedreader import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.isSpecified diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManager.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManager.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManager.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManager.kt index bbe5ff6..21fe08c 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/ReaderTtsFileCacheManager.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/ReaderTtsFileCacheManager.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared +package org.dueattendant149.bookreader.shared import java.io.File import java.io.RandomAccessFile diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsParser.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParser.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsParser.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParser.kt index b40faab..ed28f5a 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/opds/SharedOpdsParser.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/opds/SharedOpdsParser.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.opds +package org.dueattendant149.bookreader.shared.opds import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/pptx/SharedPptxDocument.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/pptx/SharedPptxDocument.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/pptx/SharedPptxDocument.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/pptx/SharedPptxDocument.kt index 6616c53..997386d 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/pptx/SharedPptxDocument.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/pptx/SharedPptxDocument.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.pptx +package org.dueattendant149.bookreader.shared.pptx import org.jsoup.Jsoup import org.jsoup.nodes.Element diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditor.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditor.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditor.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditor.kt index a8341de..33787f3 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubMetadataEditor.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubMetadataEditor.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import org.jsoup.Jsoup import org.jsoup.nodes.Document diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCache.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCache.kt similarity index 99% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCache.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCache.kt index 934071c..0c166a6 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedEpubPaginationCache.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedEpubPaginationCache.kt @@ -1,9 +1,9 @@ @file:OptIn(ExperimentalSerializationApi::class) -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.semanticBlockModule +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.semanticBlockModule import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCache.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCache.kt similarity index 97% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCache.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCache.kt index 78f7731..ca2e533 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoadCache.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoadCache.kt @@ -1,10 +1,10 @@ @file:OptIn(ExperimentalSerializationApi::class) -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.semanticBlockModule -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.semanticBlockModule +import org.dueattendant149.bookreader.shared.FileType import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromByteArray diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoader.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoader.kt similarity index 98% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoader.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoader.kt index da53279..f91efed 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmBookLoader.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmBookLoader.kt @@ -1,24 +1,24 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssParser -import com.aryan.reader.paginatedreader.HtmlResourceResolver -import com.aryan.reader.paginatedreader.OptimizedCssRules -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticSpacer -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock -import com.aryan.reader.paginatedreader.UserAgentStylesheet -import com.aryan.reader.paginatedreader.htmlToSemanticBlocks -import com.aryan.reader.shared.FileType +import org.dueattendant149.bookreader.paginatedreader.CssParser +import org.dueattendant149.bookreader.paginatedreader.HtmlResourceResolver +import org.dueattendant149.bookreader.paginatedreader.OptimizedCssRules +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticSpacer +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.paginatedreader.UserAgentStylesheet +import org.dueattendant149.bookreader.paginatedreader.htmlToSemanticBlocks +import org.dueattendant149.bookreader.shared.FileType import org.jsoup.Jsoup import org.jsoup.nodes.Element import org.jsoup.nodes.Node diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCache.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCache.kt similarity index 92% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCache.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCache.kt index cd3a3f8..53a18ad 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmLruMemoryCache.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmLruMemoryCache.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader internal class SharedJvmLruMemoryCache( private val maxEntries: Int diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectories.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectories.kt similarity index 95% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectories.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectories.kt index 7fc0be8..dd3a88a 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedJvmUserDirectories.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedJvmUserDirectories.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import java.io.File import java.util.Locale diff --git a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginator.kt b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginator.kt similarity index 97% rename from shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginator.kt rename to shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginator.kt index ffc651d..0ecce15 100644 --- a/shared/src/readerJvmMain/kotlin/com/aryan/reader/shared/reader/SharedMeasuredEpubPaginator.kt +++ b/shared/src/readerJvmMain/kotlin/com/dueattendant149/bookreader/reader/shared/reader/SharedMeasuredEpubPaginator.kt @@ -1,4 +1,4 @@ -package com.aryan.reader.shared.reader +package org.dueattendant149.bookreader.shared.reader import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.ParagraphStyle @@ -22,19 +22,19 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.isSpecified import androidx.compose.ui.unit.sp -import com.aryan.reader.paginatedreader.CssStyle -import com.aryan.reader.paginatedreader.SemanticBlock -import com.aryan.reader.paginatedreader.SemanticFlexContainer -import com.aryan.reader.paginatedreader.SemanticHeader -import com.aryan.reader.paginatedreader.SemanticImage -import com.aryan.reader.paginatedreader.SemanticList -import com.aryan.reader.paginatedreader.SemanticListItem -import com.aryan.reader.paginatedreader.SemanticMath -import com.aryan.reader.paginatedreader.SemanticParagraph -import com.aryan.reader.paginatedreader.SemanticSpacer -import com.aryan.reader.paginatedreader.SemanticTable -import com.aryan.reader.paginatedreader.SemanticTextBlock -import com.aryan.reader.paginatedreader.SemanticWrappingBlock +import org.dueattendant149.bookreader.paginatedreader.CssStyle +import org.dueattendant149.bookreader.paginatedreader.SemanticBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticFlexContainer +import org.dueattendant149.bookreader.paginatedreader.SemanticHeader +import org.dueattendant149.bookreader.paginatedreader.SemanticImage +import org.dueattendant149.bookreader.paginatedreader.SemanticList +import org.dueattendant149.bookreader.paginatedreader.SemanticListItem +import org.dueattendant149.bookreader.paginatedreader.SemanticMath +import org.dueattendant149.bookreader.paginatedreader.SemanticParagraph +import org.dueattendant149.bookreader.paginatedreader.SemanticSpacer +import org.dueattendant149.bookreader.paginatedreader.SemanticTable +import org.dueattendant149.bookreader.paginatedreader.SemanticTextBlock +import org.dueattendant149.bookreader.paginatedreader.SemanticWrappingBlock import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.currentCoroutineContext @@ -817,23 +817,23 @@ class SharedMeasuredEpubPaginator( private fun Dp.toPxInt(): Int = with(density) { toPx().roundToInt() } - private fun com.aryan.reader.paginatedreader.BoxBorders.verticalPx(): Int { + private fun org.dueattendant149.bookreader.paginatedreader.BoxBorders.verticalPx(): Int { return top.toPxIfSpecified() + bottom.toPxIfSpecified() } - private fun com.aryan.reader.paginatedreader.BoxBorders.horizontalPx(): Int { + private fun org.dueattendant149.bookreader.paginatedreader.BoxBorders.horizontalPx(): Int { return left.toPxIfSpecified() + right.toPxIfSpecified() } - private fun com.aryan.reader.paginatedreader.BlockStyle.verticalBorderPx(): Int { + private fun org.dueattendant149.bookreader.paginatedreader.BlockStyle.verticalBorderPx(): Int { return (borderTop?.width?.toPxIfSpecified() ?: 0) + (borderBottom?.width?.toPxIfSpecified() ?: 0) } - private fun com.aryan.reader.paginatedreader.BlockStyle.horizontalBorderPx(): Int { + private fun org.dueattendant149.bookreader.paginatedreader.BlockStyle.horizontalBorderPx(): Int { return (borderLeft?.width?.toPxIfSpecified() ?: 0) + (borderRight?.width?.toPxIfSpecified() ?: 0) } - private fun com.aryan.reader.paginatedreader.BlockStyle.horizontalOuterPx(): Int { + private fun org.dueattendant149.bookreader.paginatedreader.BlockStyle.horizontalOuterPx(): Int { return margin.horizontalPx() + padding.horizontalPx() + horizontalBorderPx() }