From 0a244128e4a1ee1bf763959634db7466a11aa64b Mon Sep 17 00:00:00 2001 From: Syer10 Date: Mon, 22 Mar 2021 21:23:25 -0400 Subject: [PATCH] Initial commit --- .gitattributes | 25 ++ .gitignore | 22 ++ LICENSE | 373 ++++++++++++++++++ build.gradle.kts | 85 ++++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 +++++++++ gradlew.bat | 89 +++++ settings.gradle.kts | 11 + .../ca/gosyer/backend/models/Category.kt | 17 + .../ca/gosyer/backend/models/Chapter.kt | 24 ++ .../ca/gosyer/backend/models/Extension.kt | 25 ++ .../kotlin/ca/gosyer/backend/models/Manga.kt | 28 ++ .../ca/gosyer/backend/models/MangaPage.kt | 15 + .../kotlin/ca/gosyer/backend/models/Page.kt | 15 + .../kotlin/ca/gosyer/backend/models/Source.kt | 20 + .../ca/gosyer/backend/network/HttpClient.kt | 25 ++ .../interactions/BaseInteractionHandler.kt | 132 +++++++ .../CategoryInteractionHandler.kt | 110 ++++++ .../interactions/ChapterInteractionHandler.kt | 56 +++ .../ExtensionInteractionHandler.kt | 45 +++ .../interactions/LibraryInteractionHandler.kt | 41 ++ .../interactions/MangaInteractionHandler.kt | 31 ++ .../interactions/SourceInteractionHandler.kt | 84 ++++ .../backend/network/requests/Category.kt | 46 +++ .../backend/network/requests/Chapters.kt | 19 + .../backend/network/requests/Extensions.kt | 23 ++ .../backend/network/requests/Library.kt | 19 + .../gosyer/backend/network/requests/Manga.kt | 15 + .../backend/network/requests/RestRequests.kt | 15 + .../backend/network/requests/Sources.kt | 35 ++ .../gosyer/backend/preferences/Preference.kt | 49 +++ .../preferences/impl/BooleanPreference.kt | 46 +++ .../preferences/impl/DoublePreference.kt | 46 +++ .../preferences/impl/FloatPreference.kt | 46 +++ .../backend/preferences/impl/IntPreference.kt | 46 +++ .../preferences/impl/JsonPreference.kt | 86 ++++ .../preferences/impl/LongPreference.kt | 46 +++ .../backend/preferences/impl/Preference.kt | 78 ++++ .../preferences/impl/StringPreference.kt | 46 +++ .../kotlin/ca/gosyer/ui/base/WindowDialog.kt | 89 +++++ .../gosyer/ui/base/components/ErrorScreen.kt | 44 +++ .../ca/gosyer/ui/base/components/KtorImage.kt | 93 +++++ .../ui/base/components/LoadingScreen.kt | 31 ++ .../ca/gosyer/ui/base/components/Manga.kt | 85 ++++ .../ca/gosyer/ui/base/components/Pager.kt | 217 ++++++++++ .../ca/gosyer/ui/base/vm/ComposeViewModel.kt | 25 ++ .../kotlin/ca/gosyer/ui/base/vm/ViewModel.kt | 22 ++ .../ca/gosyer/ui/base/vm/ViewModelModule.kt | 26 ++ .../gosyer/ui/categories/CategoriesDialogs.kt | 80 ++++ .../ca/gosyer/ui/categories/CategoriesMenu.kt | 156 ++++++++ .../ui/categories/CategoriesMenuViewModel.kt | 119 ++++++ .../ca/gosyer/ui/extensions/ExtensionsMenu.kt | 138 +++++++ .../ui/extensions/ExtensionsMenuViewModel.kt | 77 ++++ .../gosyer/ui/library/LibraryMangaBadges.kt | 47 +++ .../ca/gosyer/ui/library/LibraryScreen.kt | 182 +++++++++ .../ui/library/LibraryScreenViewModel.kt | 93 +++++ .../ca/gosyer/ui/library/MangaCompactGrid.kt | 109 +++++ .../kotlin/ca/gosyer/ui/main/MainViewModel.kt | 11 + src/main/kotlin/ca/gosyer/ui/main/main.kt | 85 ++++ .../kotlin/ca/gosyer/ui/manga/MangaMenu.kt | 214 ++++++++++ .../ca/gosyer/ui/manga/MangaMenuViewModel.kt | 87 ++++ .../ca/gosyer/ui/sources/SourcesMenu.kt | 57 +++ .../gosyer/ui/sources/SourcesMenuViewModel.kt | 74 ++++ .../ui/sources/components/SourceHomeScreen.kt | 117 ++++++ .../ui/sources/components/SourceScreen.kt | 102 +++++ .../components/SourceScreenViewModel.kt | 84 ++++ .../ui/sources/components/SourceTabs.kt | 147 +++++++ .../kotlin/ca/gosyer/util/compose/Color.kt | 11 + .../kotlin/ca/gosyer/util/compose/Image.kt | 24 ++ .../kotlin/ca/gosyer/util/compose/Theme.kt | 38 ++ src/main/kotlin/ca/gosyer/util/system/Flow.kt | 30 ++ src/main/kotlin/ca/gosyer/util/system/Koin.kt | 13 + .../ca/gosyer/util/system/ProcessFile.kt | 24 ++ src/main/resources/logback.xml | 38 ++ .../network/ExtensionInteractionTest.kt | 12 + 77 files changed, 4926 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Category.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Chapter.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Extension.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Manga.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/MangaPage.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Page.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/models/Source.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/HttpClient.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/BaseInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/CategoryInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/ChapterInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/ExtensionInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/LibraryInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/MangaInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/interactions/SourceInteractionHandler.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Category.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Chapters.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Extensions.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Library.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Manga.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/RestRequests.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/network/requests/Sources.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/Preference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/BooleanPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/DoublePreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/FloatPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/IntPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/JsonPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/LongPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/Preference.kt create mode 100644 src/main/kotlin/ca/gosyer/backend/preferences/impl/StringPreference.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/WindowDialog.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/components/ErrorScreen.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/components/Manga.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/components/Pager.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/vm/ComposeViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/vm/ViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/base/vm/ViewModelModule.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenuViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/library/LibraryMangaBadges.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/library/MangaCompactGrid.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/main/MainViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/main/main.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/manga/MangaMenuViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/SourcesMenuViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/components/SourceHomeScreen.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreen.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreenViewModel.kt create mode 100644 src/main/kotlin/ca/gosyer/ui/sources/components/SourceTabs.kt create mode 100644 src/main/kotlin/ca/gosyer/util/compose/Color.kt create mode 100644 src/main/kotlin/ca/gosyer/util/compose/Image.kt create mode 100644 src/main/kotlin/ca/gosyer/util/compose/Theme.kt create mode 100644 src/main/kotlin/ca/gosyer/util/system/Flow.kt create mode 100644 src/main/kotlin/ca/gosyer/util/system/Koin.kt create mode 100644 src/main/kotlin/ca/gosyer/util/system/ProcessFile.kt create mode 100644 src/main/resources/logback.xml create mode 100644 src/test/kotlin/ca/gosyer/backend/network/ExtensionInteractionTest.kt diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..91a5614a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,25 @@ +* text=auto +* text eol=lf + +# Windows forced line-endings +/.idea/* text eol=crlf + +# Gradle wrapper +*.jar binary + +# Images +*.webp binary +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.ico binary +*.gz binary +*.zip binary +*.7z binary +*.ttf binary +*.eot binary +*.woff binary +*.pyc binary +*.swp binary +*.pdf binary \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..dea6d9d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +gradle-local.properties +gpg/ +.gradle/ +build/ +*.class +*.log +*.settings.xml + +# Eclipse +.classpath +.project +.settings/ +bin/ + +# IDEA +*.iml +*.ipr +*.iws +/.idea/* +!/.idea/runConfigurations +out/ +workspace.xml \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..d0a1fa14 --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..c01616d5 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,85 @@ +import org.jetbrains.compose.compose +import org.jetbrains.compose.desktop.application.dsl.TargetFormat +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.4.31" + kotlin("plugin.serialization") version "1.4.31" + id("org.jetbrains.compose") version "0.4.0-build174" +} + +group = "ca.gosyer" +version = "1.0.0" + +repositories { + jcenter() + mavenCentral() + maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } +} + +dependencies { + // UI (Compose) + implementation(compose.desktop.currentOs) + + // Threading + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3") + + // Json + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0") + + // Dependency Injection + implementation("io.insert-koin:koin-core-ext:3.0.1-beta-1") + + // Http client + val ktorVersion = "1.5.2" + implementation("io.ktor:ktor-client-core:$ktorVersion") + implementation("io.ktor:ktor-client-okhttp:$ktorVersion") + implementation("io.ktor:ktor-client-serialization:$ktorVersion") + implementation("io.ktor:ktor-client-logging:$ktorVersion") + + // Logging + implementation("ch.qos.logback:logback-classic:1.2.3") + //implementation("org.fusesource.jansi:jansi:1.18") + implementation("io.github.microutils:kotlin-logging:2.0.5") + + // Preferences + val multiplatformSettingsVersion = "0.7.4" + implementation("com.russhwolf:multiplatform-settings-jvm:$multiplatformSettingsVersion") + implementation("com.russhwolf:multiplatform-settings-serialization-jvm:$multiplatformSettingsVersion") + implementation("com.russhwolf:multiplatform-settings-coroutines-jvm:$multiplatformSettingsVersion") + + // Testing + testImplementation(kotlin("test-junit5")) + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3") +} + +tasks { + withType { + kotlinOptions { + jvmTarget = "15" + freeCompilerArgs = listOf( + "-Xopt-in=kotlin.RequiresOptIn", + "-Xopt-in=kotlin.time.ExperimentalTime", + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi", + "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi", + "-Xopt-in=com.russhwolf.settings.ExperimentalSettingsApi", + "-Xopt-in=com.russhwolf.settings.ExperimentalSettingsImplementation" + ) + } + } + test { + useJUnit() + } +} + + +compose.desktop { + application { + mainClass = "ca.gosyer.ui.main.MainKt" + nativeDistributions { + targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) + packageName = "TachideskJUI" + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..7fc6f1ff --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..442d9132 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..4f906e0c --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..f451cfdf --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } + } + +} +rootProject.name = "TachideskJUI" + + diff --git a/src/main/kotlin/ca/gosyer/backend/models/Category.kt b/src/main/kotlin/ca/gosyer/backend/models/Category.kt new file mode 100644 index 00000000..6c1df4e3 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Category.kt @@ -0,0 +1,17 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class Category( + val id: Long, + val order: Int, + val name: String, + val landing: Boolean +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/models/Chapter.kt b/src/main/kotlin/ca/gosyer/backend/models/Chapter.kt new file mode 100644 index 00000000..0c8419e2 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Chapter.kt @@ -0,0 +1,24 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Chapter( + val id: Long, + val url: String, + val name: String, + @SerialName("date_upload") + val dateUpload: Long, + @SerialName("chapter_number") + val chapterNumber: Float, + val scanlator: String?, + val mangaId: Long, + val pageCount: Int? = null, +) diff --git a/src/main/kotlin/ca/gosyer/backend/models/Extension.kt b/src/main/kotlin/ca/gosyer/backend/models/Extension.kt new file mode 100644 index 00000000..a6e981f2 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Extension.kt @@ -0,0 +1,25 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class Extension( + val name: String, + val pkgName: String, + val versionName: String, + val versionCode: Int, + val lang: String, + val apkName: String, + val iconUrl: String, + val installed: Boolean, + val classFQName: String, + val nsfw: Boolean +) { + fun iconUrl(serverUrl: String) = serverUrl + iconUrl +} diff --git a/src/main/kotlin/ca/gosyer/backend/models/Manga.kt b/src/main/kotlin/ca/gosyer/backend/models/Manga.kt new file mode 100644 index 00000000..934cbd1f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Manga.kt @@ -0,0 +1,28 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class Manga( + val id: Long, + val sourceId: Long, + val url: String, + val title: String, + val thumbnailUrl: String? = null, + val initialized: Boolean = false, + val artist: String? = null, + val author: String? = null, + val description: String? = null, + val genre: String? = null, + val status: String, + val inLibrary: Boolean = false, + val source: Source? +) { + fun cover(serverUrl: String) = thumbnailUrl?.let { serverUrl + it } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/models/MangaPage.kt b/src/main/kotlin/ca/gosyer/backend/models/MangaPage.kt new file mode 100644 index 00000000..3b879848 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/MangaPage.kt @@ -0,0 +1,15 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class MangaPage( + val mangaList: List, + val hasNextPage: Boolean +) diff --git a/src/main/kotlin/ca/gosyer/backend/models/Page.kt b/src/main/kotlin/ca/gosyer/backend/models/Page.kt new file mode 100644 index 00000000..bfa705ce --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Page.kt @@ -0,0 +1,15 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class Page( + val index: Int, + var imageUrl: String, +) diff --git a/src/main/kotlin/ca/gosyer/backend/models/Source.kt b/src/main/kotlin/ca/gosyer/backend/models/Source.kt new file mode 100644 index 00000000..65368800 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/models/Source.kt @@ -0,0 +1,20 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.models + +import kotlinx.serialization.Serializable + +@Serializable +data class Source( + val id: Long, + val name: String, + val lang: String, + val iconUrl: String, + val supportsLatest: Boolean +) { + fun iconUrl(serverUrl: String) = serverUrl + iconUrl +} diff --git a/src/main/kotlin/ca/gosyer/backend/network/HttpClient.kt b/src/main/kotlin/ca/gosyer/backend/network/HttpClient.kt new file mode 100644 index 00000000..0f200114 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/HttpClient.kt @@ -0,0 +1,25 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network + +import io.ktor.client.HttpClient +import io.ktor.client.engine.okhttp.OkHttp +import io.ktor.client.features.json.JsonFeature +import io.ktor.client.features.logging.LogLevel +import io.ktor.client.features.logging.Logging +import org.koin.dsl.module + +val networkModule = module { + single { + HttpClient(OkHttp) { + install(JsonFeature) + install(Logging) { + level = LogLevel.INFO + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/BaseInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/BaseInteractionHandler.kt new file mode 100644 index 00000000..10647e2c --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/BaseInteractionHandler.kt @@ -0,0 +1,132 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import androidx.compose.ui.graphics.ImageBitmap +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import io.ktor.client.request.HttpRequestBuilder +import io.ktor.client.request.delete +import io.ktor.client.request.forms.submitForm +import io.ktor.client.request.get +import io.ktor.client.request.patch +import io.ktor.client.request.post +import io.ktor.http.Parameters +import kotlinx.coroutines.CancellationException + +open class BaseInteractionHandler { + val preferences: PreferenceHelper by inject() + val serverUrl get() = preferences.serverUrl.get() + + protected suspend inline fun HttpClient.getRepeat( + urlString: String, + block: HttpRequestBuilder.() -> Unit = {} + ): T { + var attempt = 1 + var lastException: Exception + do { + try { + return get(urlString, block) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } + + protected suspend inline fun HttpClient.deleteRepeat( + urlString: String, + block: HttpRequestBuilder.() -> Unit = {} + ): T { + var attempt = 1 + var lastException: Exception + do { + try { + return delete(urlString, block) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } + + protected suspend inline fun HttpClient.patchRepeat( + urlString: String, + block: HttpRequestBuilder.() -> Unit = {} + ): T { + var attempt = 1 + var lastException: Exception + do { + try { + return patch(urlString, block) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } + + protected suspend inline fun HttpClient.postRepeat( + urlString: String, + block: HttpRequestBuilder.() -> Unit = {} + ): T { + var attempt = 1 + var lastException: Exception + do { + try { + return post(urlString, block) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } + + protected suspend inline fun HttpClient.submitFormRepeat( + urlString: String, + formParameters: Parameters = Parameters.Empty, + encodeInQuery: Boolean = false, + block: HttpRequestBuilder.() -> Unit = {} + ): T { + var attempt = 1 + var lastException: Exception + do { + try { + return submitForm(urlString, formParameters, encodeInQuery, block) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } + + suspend fun imageFromUrl(client: HttpClient, imageUrl: String): ImageBitmap { + var attempt = 1 + var lastException: Exception + do { + try { + return ca.gosyer.util.compose.imageFromUrl(client, imageUrl) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= 3) + throw lastException + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/CategoryInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/CategoryInteractionHandler.kt new file mode 100644 index 00000000..08cb133c --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/CategoryInteractionHandler.kt @@ -0,0 +1,110 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.Category +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.requests.addMangaToCategoryQuery +import ca.gosyer.backend.network.requests.categoryDeleteRequest +import ca.gosyer.backend.network.requests.categoryModifyRequest +import ca.gosyer.backend.network.requests.categoryReorderRequest +import ca.gosyer.backend.network.requests.createCategoryRequest +import ca.gosyer.backend.network.requests.getCategoriesQuery +import ca.gosyer.backend.network.requests.getMangaCategoriesQuery +import ca.gosyer.backend.network.requests.getMangaInCategoryQuery +import ca.gosyer.backend.network.requests.removeMangaFromCategoryRequest +import io.ktor.client.HttpClient +import io.ktor.client.request.forms.formData +import io.ktor.client.statement.HttpResponse +import io.ktor.http.HttpMethod +import io.ktor.http.Parameters +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class CategoryInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getMangaCategories(mangaId: Long) = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + getMangaCategoriesQuery(mangaId) + ) + } + + suspend fun addMangaToCategory(mangaId: Long, categoryId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + addMangaToCategoryQuery(mangaId, categoryId) + ) + } + + suspend fun removeMangaFromCategory(mangaId: Long, categoryId: Long) = withContext(Dispatchers.IO) { + client.deleteRepeat( + serverUrl + removeMangaFromCategoryRequest(mangaId, categoryId) + ) + } + + suspend fun getCategories() = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + getCategoriesQuery() + ) + } + + suspend fun createCategory(name: String) = withContext(Dispatchers.IO) { + client.submitFormRepeat( + serverUrl + createCategoryRequest(), + formParameters = Parameters.build { + append("name", name) + } + ) + } + + suspend fun modifyCategory(categoryId: Long, name: String? = null, isLanding: Boolean? = null) = withContext(Dispatchers.IO) { + client.submitFormRepeat( + serverUrl + categoryModifyRequest(categoryId), + formParameters = Parameters.build { + if (name != null) { + append("name", name) + } + if (isLanding != null) { + append("isLanding", isLanding.toString()) + } + } + ) { + method = HttpMethod.Patch + formData { + if (name != null) { + append("name", name) + } + if (isLanding != null) { + append("isLanding", isLanding.toString()) + } + } + } + } + + suspend fun reorderCategory(categoryId: Long, to: Int, from: Int) = withContext(Dispatchers.IO) { + client.submitFormRepeat( + serverUrl + categoryReorderRequest(categoryId), + formParameters = Parameters.build { + append("to", to.toString()) + append("from", from.toString()) + } + ) { + method = HttpMethod.Patch + } + } + + suspend fun deleteCategory(categoryId: Long) = withContext(Dispatchers.IO) { + client.deleteRepeat( + serverUrl + categoryDeleteRequest(categoryId) + ) + } + + suspend fun getMangaFromCategory(categoryId: Long) = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + getMangaInCategoryQuery(categoryId) + ) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/ChapterInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/ChapterInteractionHandler.kt new file mode 100644 index 00000000..39571cf3 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/ChapterInteractionHandler.kt @@ -0,0 +1,56 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.Chapter +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.requests.getChapterQuery +import ca.gosyer.backend.network.requests.getMangaChaptersQuery +import ca.gosyer.backend.network.requests.getPageQuery +import io.ktor.client.HttpClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class ChapterInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getChapters(mangaId: Long) = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + getMangaChaptersQuery(mangaId) + ) + } + + suspend fun getChapters(manga: Manga) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + getMangaChaptersQuery(manga.id) + ) + } + + suspend fun getChapter(mangaId: Long, chapterId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + getChapterQuery(mangaId, chapterId) + ) + } + + suspend fun getChapter(chapter: Chapter) = getChapter(chapter.mangaId, chapter.id) + + suspend fun getChapter(manga: Manga, chapterId: Long) = getChapter(manga.id, chapterId) + + suspend fun getChapter(manga: Manga, chapter: Chapter) = getChapter(manga.id, chapter.id) + + suspend fun getPage(mangaId: Long, chapterId: Long, pageNum: Int) = withContext(Dispatchers.IO) { + imageFromUrl( + client, + serverUrl + getPageQuery(mangaId, chapterId, pageNum) + ) + } + + suspend fun getPage(chapter: Chapter, pageNum: Int) = getPage(chapter.mangaId, chapter.id, pageNum) + + suspend fun getPage(manga: Manga, chapterId: Long, pageNum: Int) = getPage(manga.id, chapterId, pageNum) + + suspend fun getPage(manga: Manga, chapter: Chapter, pageNum: Int) = getPage(manga.id, chapter.id, pageNum) +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/ExtensionInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/ExtensionInteractionHandler.kt new file mode 100644 index 00000000..659fa184 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/ExtensionInteractionHandler.kt @@ -0,0 +1,45 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.Extension +import ca.gosyer.backend.network.requests.apkIconQuery +import ca.gosyer.backend.network.requests.apkInstallQuery +import ca.gosyer.backend.network.requests.apkUninstallQuery +import ca.gosyer.backend.network.requests.extensionListQuery +import io.ktor.client.HttpClient +import io.ktor.client.statement.HttpResponse +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class ExtensionInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getExtensionList() = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + extensionListQuery() + ) + } + + suspend fun installExtension(extension: Extension) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + apkInstallQuery(extension.apkName) + ) + } + + suspend fun uninstallExtension(extension: Extension) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + apkUninstallQuery(extension.apkName) + ) + } + + suspend fun getApkIcon(extension: Extension) = withContext(Dispatchers.IO) { + imageFromUrl( + client, + serverUrl + apkIconQuery(extension.apkName) + ) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/LibraryInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/LibraryInteractionHandler.kt new file mode 100644 index 00000000..1e36aa6b --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/LibraryInteractionHandler.kt @@ -0,0 +1,41 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.requests.addMangaToLibraryQuery +import ca.gosyer.backend.network.requests.getLibraryQuery +import ca.gosyer.backend.network.requests.removeMangaFromLibraryRequest +import io.ktor.client.HttpClient +import io.ktor.client.statement.HttpResponse +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class LibraryInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getLibraryManga() = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + getLibraryQuery() + ) + } + + suspend fun addMangaToLibrary(mangaId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + addMangaToLibraryQuery(mangaId) + ) + } + + suspend fun addMangaToLibrary(manga: Manga) = addMangaToLibrary(manga.id) + + suspend fun removeMangaFromLibrary(mangaId: Long) = withContext(Dispatchers.IO) { + client.deleteRepeat( + serverUrl + removeMangaFromLibraryRequest(mangaId) + ) + } + + suspend fun removeMangaFromLibrary(manga: Manga) = removeMangaFromLibrary(manga.id) +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/MangaInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/MangaInteractionHandler.kt new file mode 100644 index 00000000..4976c71f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/MangaInteractionHandler.kt @@ -0,0 +1,31 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.requests.mangaQuery +import ca.gosyer.backend.network.requests.mangaThumbnailQuery +import io.ktor.client.HttpClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class MangaInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getManga(mangaId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + mangaQuery(mangaId) + ) + } + + suspend fun getMangaThumbnail(mangaId: Long) = withContext(Dispatchers.IO) { + imageFromUrl( + client, + serverUrl + mangaThumbnailQuery(mangaId) + ) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/interactions/SourceInteractionHandler.kt b/src/main/kotlin/ca/gosyer/backend/network/interactions/SourceInteractionHandler.kt new file mode 100644 index 00000000..9d234014 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/interactions/SourceInteractionHandler.kt @@ -0,0 +1,84 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.interactions + +import ca.gosyer.backend.models.MangaPage +import ca.gosyer.backend.models.Source +import ca.gosyer.backend.network.requests.getFilterListQuery +import ca.gosyer.backend.network.requests.globalSearchQuery +import ca.gosyer.backend.network.requests.sourceInfoQuery +import ca.gosyer.backend.network.requests.sourceLatestQuery +import ca.gosyer.backend.network.requests.sourceListQuery +import ca.gosyer.backend.network.requests.sourcePopularQuery +import ca.gosyer.backend.network.requests.sourceSearchQuery +import io.ktor.client.HttpClient +import io.ktor.client.statement.HttpResponse +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class SourceInteractionHandler(private val client: HttpClient): BaseInteractionHandler() { + + suspend fun getSourceList() = withContext(Dispatchers.IO) { + client.getRepeat>( + serverUrl + sourceListQuery() + ) + } + + suspend fun getSourceInfo(sourceId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + sourceInfoQuery(sourceId) + ) + } + + suspend fun getSourceInfo(source: Source) = getSourceInfo(source.id) + + suspend fun getPopularManga(sourceId: Long, pageNum: Int) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + sourcePopularQuery(sourceId, pageNum) + ) + } + + suspend fun getPopularManga(source: Source, pageNum: Int) = getPopularManga( + source.id, pageNum + ) + + suspend fun getLatestManga(sourceId: Long, pageNum: Int) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + sourceLatestQuery(sourceId, pageNum) + ) + } + + suspend fun getLatestManga(source: Source, pageNum: Int) = getLatestManga( + source.id, pageNum + ) + + // TODO: 2021-03-14 + suspend fun getGlobalSearchResults(searchTerm: String) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + globalSearchQuery(searchTerm) + ) + } + + suspend fun getSearchResults(sourceId: Long, searchTerm: String, pageNum: Int) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + sourceSearchQuery(sourceId, searchTerm, pageNum) + ) + } + + suspend fun getSearchResults(source: Source, searchTerm: String, pageNum: Int) = getSearchResults( + source.id, searchTerm, pageNum + ) + + // TODO: 2021-03-14 + suspend fun getFilterList(sourceId: Long) = withContext(Dispatchers.IO) { + client.getRepeat( + serverUrl + getFilterListQuery(sourceId) + ) + } + + suspend fun getFilterList(source: Source) = getFilterList(source.id) +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Category.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Category.kt new file mode 100644 index 00000000..9a9171c1 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Category.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun getMangaCategoriesQuery(mangaId: Long) = + "/api/v1/manga/$mangaId/category/" + +@Get +fun addMangaToCategoryQuery(mangaId: Long, categoryId: Long) = + "/api/v1/manga/$mangaId/category/$categoryId" + +@Delete +fun removeMangaFromCategoryRequest(mangaId: Long, categoryId: Long) = + "/api/v1/manga/$mangaId/category/$categoryId" + +@Get +fun getCategoriesQuery() = + "/api/v1/category/" + +/** + * Post a formbody with the param {name} for creation of a category + */ +@Post +fun createCategoryRequest() = + "/api/v1/category/" + +@Patch +fun categoryModifyRequest(categoryId: Long) = + "/api/v1/category/$categoryId" + +@Patch +fun categoryReorderRequest(categoryId: Long) = + "/api/v1/category/$categoryId/reorder" + +@Delete +fun categoryDeleteRequest(categoryId: Long) = + "/api/v1/category/$categoryId" + +@Get +fun getMangaInCategoryQuery(categoryId: Long) = + "/api/v1/category/$categoryId" \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Chapters.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Chapters.kt new file mode 100644 index 00000000..a2d4322d --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Chapters.kt @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun getMangaChaptersQuery(mangaId: Long) = + "/api/v1/manga/$mangaId/chapters" + +@Get +fun getChapterQuery(mangaId: Long, chapterId: Long) = + "/api/v1/manga/$mangaId/chapter/$chapterId" + +@Get +fun getPageQuery(mangaId: Long, chapterId: Long, index: Int) = + "/api/v1/manga/$mangaId/chapter/$chapterId/page/$index" \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Extensions.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Extensions.kt new file mode 100644 index 00000000..df7af2da --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Extensions.kt @@ -0,0 +1,23 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun extensionListQuery() = + "/api/v1/extension/list" + +@Get +fun apkInstallQuery(apkName: String) = + "/api/v1/extension/install/$apkName" + +@Get +fun apkUninstallQuery(apkName: String) = + "/api/v1/extension/uninstall/$apkName" + +@Get +fun apkIconQuery(apkName: String) = + "/api/v1/extension/icon/$apkName" \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Library.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Library.kt new file mode 100644 index 00000000..95eb7989 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Library.kt @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun addMangaToLibraryQuery(mangaId: Long) = + "/api/v1/manga/$mangaId/library" + +@Delete +fun removeMangaFromLibraryRequest(mangaId: Long) = + "/api/v1/manga/$mangaId/library" + +@Get +fun getLibraryQuery() = + "/api/v1/library/" \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Manga.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Manga.kt new file mode 100644 index 00000000..169f5be1 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Manga.kt @@ -0,0 +1,15 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun mangaQuery(mangaId: Long) = + "/api/v1/manga/$mangaId/" + +@Get +fun mangaThumbnailQuery(mangaId: Long) = + "/api/v1/manga/$mangaId/thumbnail" diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/RestRequests.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/RestRequests.kt new file mode 100644 index 00000000..53289bf5 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/RestRequests.kt @@ -0,0 +1,15 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +annotation class Get + +annotation class Post + +annotation class Delete + +annotation class Patch \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/network/requests/Sources.kt b/src/main/kotlin/ca/gosyer/backend/network/requests/Sources.kt new file mode 100644 index 00000000..fc3e0013 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/network/requests/Sources.kt @@ -0,0 +1,35 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.network.requests + +@Get +fun sourceListQuery() = + "/api/v1/source/list" + +@Get +fun sourceInfoQuery(sourceId: Long) = + "/api/v1/source/$sourceId" + +@Get +fun sourcePopularQuery(sourceId: Long, pageNum: Int) = + "/api/v1/source/$sourceId/popular/$pageNum" + +@Get +fun sourceLatestQuery(sourceId: Long, pageNum: Int) = + "/api/v1/source/$sourceId/latest/$pageNum" + +@Get +fun globalSearchQuery(searchTerm: String) = + "/api/v1/search/$searchTerm" + +@Get +fun sourceSearchQuery(sourceId: Long, searchTerm: String, pageNum: Int) = + "/api/v1/source/$sourceId/search/$searchTerm/$pageNum" + +@Get +fun getFilterListQuery(sourceId: Long) = + "/api/v1/source/$sourceId/filters/" \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/Preference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/Preference.kt new file mode 100644 index 00000000..530c1e61 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/Preference.kt @@ -0,0 +1,49 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences + +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import ca.gosyer.backend.preferences.impl.getBooleanPreference +import ca.gosyer.backend.preferences.impl.getJsonPreference +import ca.gosyer.backend.preferences.impl.getLongPreference +import ca.gosyer.backend.preferences.impl.getStringPreference +import ca.gosyer.ui.library.DisplayMode +import ca.gosyer.util.compose.color +import com.russhwolf.settings.JvmPreferencesSettings +import com.russhwolf.settings.ObservableSettings +import kotlinx.serialization.builtins.ListSerializer +import kotlinx.serialization.builtins.serializer +import org.koin.dsl.module +import java.util.prefs.Preferences + +class PreferenceHelper { + private val settings = JvmPreferencesSettings(Preferences.userRoot()) as ObservableSettings + val serverUrl = settings.getStringPreference("server_url", "http://localhost:4567") + val enabledLangs = settings.getJsonPreference("server_langs", listOf("all", "en"), ListSerializer(String.serializer())) + val libraryDisplay = settings.getJsonPreference("library_display", DisplayMode.CompactGrid, DisplayMode.serializer()) + + val lightTheme = settings.getBooleanPreference("light_theme", true) + val lightPrimary = settings.getLongPreference("light_color_primary", 0xFF00a2ff) + val lightPrimaryVariant = settings.getLongPreference("light_color_primary_variant", 0xFF0091EA) + val lightSecondary = settings.getLongPreference("light_color_secondary", 0xFFF44336) + val lightSecondaryVaraint = settings.getLongPreference("light_color_secondary_variant", 0xFFE53935) + + fun getTheme() = when (lightTheme.get()) { + true -> lightColors( + lightPrimary.get().color, + lightPrimaryVariant.get().color, + lightSecondary.get().color, + lightSecondaryVaraint.get().color + ) + false -> darkColors() + } +} + +val preferencesModule = module { + single { PreferenceHelper() } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/BooleanPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/BooleanPreference.kt new file mode 100644 index 00000000..db30d014 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/BooleanPreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getBooleanFlow +import com.russhwolf.settings.coroutines.getBooleanOrNullFlow +import com.russhwolf.settings.set + +class BooleanPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: Boolean +): DefaultPreference { + override fun get() = settings.getBoolean(key, default) + override fun asFLow() = settings.getBooleanFlow(key, default) + override fun set(value: Boolean) { + settings[key] = value + } +} + +class BooleanNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getBooleanOrNull(key) + override fun asFLow() = settings.getBooleanOrNullFlow(key) + override fun set(value: Boolean?) { + settings[key] = value + } +} + +fun ObservableSettings.getBooleanPreference(key: String, default: Boolean) = BooleanPreference( + this, + key, + default +) + +fun ObservableSettings.getBooleanPreference(key: String) = BooleanNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/DoublePreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/DoublePreference.kt new file mode 100644 index 00000000..eb8137e7 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/DoublePreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getDoubleFlow +import com.russhwolf.settings.coroutines.getDoubleOrNullFlow +import com.russhwolf.settings.set + +class DoublePreference( + override val settings: ObservableSettings, + override val key: String, + override val default: Double +): DefaultPreference { + override fun get() = settings.getDouble(key, default) + override fun asFLow() = settings.getDoubleFlow(key, default) + override fun set(value: Double) { + settings[key] = value + } +} + +class DoubleNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getDoubleOrNull(key) + override fun asFLow() = settings.getDoubleOrNullFlow(key) + override fun set(value: Double?) { + settings[key] = value + } +} + +fun ObservableSettings.getDoublePreference(key: String, default: Double) = DoublePreference( + this, + key, + default +) + +fun ObservableSettings.getDoublePreference(key: String) = DoubleNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/FloatPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/FloatPreference.kt new file mode 100644 index 00000000..817ed8a5 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/FloatPreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getFloatFlow +import com.russhwolf.settings.coroutines.getFloatOrNullFlow +import com.russhwolf.settings.set + +class FloatPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: Float +): DefaultPreference { + override fun get() = settings.getFloat(key, default) + override fun asFLow() = settings.getFloatFlow(key, default) + override fun set(value: Float) { + settings[key] = value + } +} + +class FloatNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getFloatOrNull(key) + override fun asFLow() = settings.getFloatOrNullFlow(key) + override fun set(value: Float?) { + settings[key] = value + } +} + +fun ObservableSettings.getFloatPreference(key: String, default: Float) = FloatPreference( + this, + key, + default +) + +fun ObservableSettings.getFloatPreference(key: String) = FloatNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/IntPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/IntPreference.kt new file mode 100644 index 00000000..af7bcd1f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/IntPreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getIntFlow +import com.russhwolf.settings.coroutines.getIntOrNullFlow +import com.russhwolf.settings.set + +class IntPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: Int +): DefaultPreference { + override fun get() = settings.getInt(key, default) + override fun asFLow() = settings.getIntFlow(key, default) + override fun set(value: Int) { + settings[key] = value + } +} + +class IntNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getIntOrNull(key) + override fun asFLow() = settings.getIntOrNullFlow(key) + override fun set(value: Int?) { + settings[key] = value + } +} + +fun ObservableSettings.getIntPreference(key: String, default: Int) = IntPreference( + this, + key, + default +) + +fun ObservableSettings.getIntPreference(key: String) = IntNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/JsonPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/JsonPreference.kt new file mode 100644 index 00000000..67a25b70 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/JsonPreference.kt @@ -0,0 +1,86 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.Settings +import com.russhwolf.settings.get +import com.russhwolf.settings.serialization.decodeValue +import com.russhwolf.settings.serialization.decodeValueOrNull +import com.russhwolf.settings.serialization.encodeValue +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.serialization.KSerializer + +class JsonPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: T, + private val serializer: KSerializer +): DefaultPreference { + override fun get() = settings.decodeValue(serializer, key, default) + override fun asFLow() = settings.createFlow(key, default) { key, default -> + decodeValue(serializer, key, default) + } + override fun set(value: T) { + settings.encodeValue(serializer, key, value) + } + + fun getJson(): String? { + return settings[key] + } +} + +class JsonNullPreference( + override val settings: ObservableSettings, + override val key: String, + private val serializer: KSerializer +): NullPreference { + override fun get() = settings.decodeValueOrNull(serializer, key) + override fun asFLow() = settings.createFlow(key, null) { key, _ -> + decodeValueOrNull(serializer, key) + } + override fun set(value: T?) { + if (value != null) { + settings.encodeValue(serializer, key, value) + } else { + settings.remove(key) + } + } + + fun getJson(): String? { + return settings[key] + } +} + +fun ObservableSettings.getJsonPreference(key: String, default: T, serializer: KSerializer) = JsonPreference( + this, + key, + default, + serializer +) + +fun ObservableSettings.getJsonPreference(key: String, serializer: KSerializer) = JsonNullPreference( + this, + key, + serializer +) + +private inline fun ObservableSettings.createFlow( + key: String, + defaultValue: T, + crossinline getter: Settings.(String, T) -> T +): Flow = callbackFlow { + offer(getter(key, defaultValue)) + val listener = addListener(key) { + offer(getter(key, defaultValue)) + } + awaitClose { + listener.deactivate() + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/LongPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/LongPreference.kt new file mode 100644 index 00000000..37c7f129 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/LongPreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getLongFlow +import com.russhwolf.settings.coroutines.getLongOrNullFlow +import com.russhwolf.settings.set + +class LongPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: Long +): DefaultPreference { + override fun get() = settings.getLong(key, default) + override fun asFLow() = settings.getLongFlow(key, default) + override fun set(value: Long) { + settings[key] = value + } +} + +class LongNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getLongOrNull(key) + override fun asFLow() = settings.getLongOrNullFlow(key) + override fun set(value: Long?) { + settings[key] = value + } +} + +fun ObservableSettings.getLongPreference(key: String, default: Long) = LongPreference( + this, + key, + default +) + +fun ObservableSettings.getLongPreference(key: String) = LongNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/Preference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/Preference.kt new file mode 100644 index 00000000..36cfd12e --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/Preference.kt @@ -0,0 +1,78 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import ca.gosyer.util.system.asStateFlow +import com.russhwolf.settings.ObservableSettings +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow + +interface Preference { + /** + * The settings to watch for this preference. Must be a instance of [ObservableSettings] + * so that we can watch changes + */ + val settings: ObservableSettings + + /** + * The key for this preference + */ + val key: String +} + + +interface NullPreference : Preference { + /** + * Returns the value stored at [key] as [T], or `null` if no value was stored. If a value of a different + * type was stored at `key`, the behavior is not defined. + */ + fun get(): T? + + /** + * Create a new [Flow], based on observing the given [key]. This flow will immediately emit the + * current value and then emit any subsequent values when the underlying `Settings` changes. When no value is present, + * `null` will be emitted instead. + */ + fun asFLow(): Flow + + /** + * See [asFLow], this function is equilivent to that except in that it stores the latest value instead of emitting + */ + fun asStateFlow(scope: CoroutineScope): StateFlow = asFLow().asStateFlow(get(), scope, true) + + /** + * Stores a [T] value at [key], or remove what's there if [value] is null. + */ + fun set(value: T?) +} + +interface DefaultPreference : Preference { + val default: T + + /** + * Returns the value stored at [key] as [T], or [default] if no value was stored. If a value of a different + * type was stored at `key`, the behavior is not defined. + */ + fun get(): T + + /** + * Create a new [Flow], based on observing the given [key]. This flow will immediately emit the + * current value and then emit any subsequent values when the underlying `Settings` changes. When no value is present, + * [default] will be emitted instead. + */ + fun asFLow(): Flow + + /** + * See [asFLow], this function is equilivent to that except in that it stores the latest value instead of emitting + */ + fun asStateFlow(scope: CoroutineScope): StateFlow = asFLow().asStateFlow(get(), scope, true) + /** + * Stores the [T] [value] at [key]. + */ + fun set(value: T) +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/backend/preferences/impl/StringPreference.kt b/src/main/kotlin/ca/gosyer/backend/preferences/impl/StringPreference.kt new file mode 100644 index 00000000..49e26364 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/backend/preferences/impl/StringPreference.kt @@ -0,0 +1,46 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.backend.preferences.impl + +import com.russhwolf.settings.ObservableSettings +import com.russhwolf.settings.coroutines.getStringFlow +import com.russhwolf.settings.coroutines.getStringOrNullFlow +import com.russhwolf.settings.set + +class StringPreference( + override val settings: ObservableSettings, + override val key: String, + override val default: String +): DefaultPreference { + override fun get() = settings.getString(key, default) + override fun asFLow() = settings.getStringFlow(key, default) + override fun set(value: String) { + settings[key] = value + } +} + +class StringNullPreference( + override val settings: ObservableSettings, + override val key: String, +): NullPreference { + override fun get() = settings.getStringOrNull(key) + override fun asFLow() = settings.getStringOrNullFlow(key) + override fun set(value: String?) { + settings[key] = value + } +} + +fun ObservableSettings.getStringPreference(key: String, default: String) = StringPreference( + this, + key, + default +) + +fun ObservableSettings.getStringPreference(key: String) = StringNullPreference( + this, + key +) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/WindowDialog.kt b/src/main/kotlin/ca/gosyer/ui/base/WindowDialog.kt new file mode 100644 index 00000000..a721352d --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/WindowDialog.kt @@ -0,0 +1,89 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base + +import androidx.compose.desktop.AppWindow +import androidx.compose.desktop.WindowEvents +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.MaterialTheme +import androidx.compose.material.OutlinedButton +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import javax.swing.SwingUtilities + +@Suppress("FunctionName") +fun WindowDialog( + title: String = "Dialog", + size: IntSize = IntSize(400, 200), + onDismissRequest: (() -> Unit)? = null, + forceFocus: Boolean = true, + showNegativeButton: Boolean = true, + negativeButtonText: String = "Cancel", + onNegativeButton: (() -> Unit)? = null, + positiveButtonText: String = "OK", + onPositiveButton: (() -> Unit)? = null, + row: @Composable (RowScope.() -> Unit) +) = SwingUtilities.invokeLater { + val window = AppWindow( + title = title, + size = size, + location = IntOffset.Zero, + centered = true, + icon = null, + menuBar = null, + undecorated = false, + events = WindowEvents(), + onDismissRequest = onDismissRequest + ) + + if (forceFocus) { + window.events.onFocusLost = { + window.window.requestFocus() + } + } + + fun (() -> Unit)?.plusClose(): (() -> Unit) = { + this?.invoke() + window.close() + } + + window.keyboard.setShortcut(Key.Enter, onPositiveButton.plusClose()) + window.keyboard.setShortcut(Key.Escape, onNegativeButton.plusClose()) + + window.show { + MaterialTheme { + Surface { + Column(verticalArrangement = Arrangement.Bottom, modifier = Modifier.fillMaxSize()) { + Row(content = row, modifier = Modifier.fillMaxSize().weight(1F)) + Row(verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxSize().weight(2F)) { + if (showNegativeButton) { + OutlinedButton(onNegativeButton.plusClose(), modifier = Modifier.padding(end = 8.dp, bottom = 8.dp)) { + Text(negativeButtonText) + } + } + + OutlinedButton(onPositiveButton.plusClose(), modifier = Modifier.padding(end = 8.dp, bottom = 8.dp)) { + Text(positiveButtonText) + } + } + } + } + } + } +} diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/ErrorScreen.kt b/src/main/kotlin/ca/gosyer/ui/base/components/ErrorScreen.kt new file mode 100644 index 00000000..265ee280 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/components/ErrorScreen.kt @@ -0,0 +1,44 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.sp +import kotlin.random.Random + + +@Composable +fun ErrorScreen(errorMessage: String? = null) { + Box(Modifier.fillMaxSize()) { + Column(modifier = Modifier.align(Alignment.Center)) { + Text(getRandomErrorFace(), fontSize = 36.sp, color = MaterialTheme.colors.onBackground) + if (errorMessage != null) { + Text(errorMessage, color = MaterialTheme.colors.onBackground) + } + } + } +} + +private val ERROR_FACES = arrayOf( + "(･o･;)", + "Σ(ಠ_ಠ)", + "ಥ_ಥ", + "(˘･_･˘)", + "(；￣Д￣)", + "(･Д･。" +) + +fun getRandomErrorFace(): String { + return ERROR_FACES[Random.nextInt(ERROR_FACES.size)] +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt new file mode 100644 index 00000000..def59e9e --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt @@ -0,0 +1,93 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.components + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.DefaultAlpha +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.layout.ContentScale +import ca.gosyer.util.compose.imageFromUrl +import io.ktor.client.HttpClient +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch + +@Composable +fun KtorImage( + client: HttpClient, + imageUrl: String, + imageModifier: Modifier = Modifier.fillMaxSize(), + loadingModifier: Modifier = imageModifier, + contentDescription: String? = null, + alignment: Alignment = Alignment.Center, + contentScale: ContentScale = ContentScale.Fit, + alpha: Float = DefaultAlpha, + colorFilter: ColorFilter? = null, + retries: Int = 3 +) { + BoxWithConstraints { + val drawable: MutableState = remember { mutableStateOf(null) } + val loading: MutableState = remember { mutableStateOf(true) } + DisposableEffect(imageUrl) { + val handler = CoroutineExceptionHandler { _, _ -> + loading.value = false + } + val job = GlobalScope.launch(handler) { + if (drawable.value == null) { + drawable.value = getImage(client, imageUrl, retries) + } + loading.value = false + } + + onDispose { + job.cancel() + drawable.value = null + } + } + + val value = drawable.value + if (value != null) { + Image( + value, + modifier = imageModifier, + contentDescription = contentDescription, + alignment = alignment, + contentScale = contentScale, + alpha = alpha, + colorFilter = colorFilter + ) + } else { + LoadingScreen(loading.value, loadingModifier) + } + } +} + +private suspend fun getImage(client: HttpClient, imageUrl: String, retries: Int = 3): ImageBitmap { + var attempt = 1 + var lastException: Exception + do { + try { + return imageFromUrl(client, imageUrl) + } catch (e: Exception) { + if (e is CancellationException) throw e + lastException = e + } + attempt++ + } while (attempt <= retries) + throw lastException +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt new file mode 100644 index 00000000..0bdd04e8 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt @@ -0,0 +1,31 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.components + +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.size +import androidx.compose.material.CircularProgressIndicator +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.min + +@Composable +fun LoadingScreen( + isLoading: Boolean = true, + modifier: Modifier = Modifier.fillMaxSize(), + errorMessage: String? = null +) { + BoxWithConstraints(modifier) { + if (isLoading) { + CircularProgressIndicator(Modifier.align(Alignment.Center).size(min(maxHeight, maxWidth) / 2)) + } else { + ErrorScreen(errorMessage) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/Manga.kt b/src/main/kotlin/ca/gosyer/ui/base/components/Manga.kt new file mode 100644 index 00000000..91be7e09 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/components/Manga.kt @@ -0,0 +1,85 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.LocalTextStyle +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import ca.gosyer.util.system.get + +@Composable +fun MangaGridItem( + title: String, + cover: String?, + onClick: () -> Unit = {}, +) { + val fontStyle = LocalTextStyle.current.merge( + TextStyle(letterSpacing = 0.sp, fontFamily = FontFamily.SansSerif, fontSize = 14.sp) + ) + + Surface( + modifier = Modifier + .fillMaxWidth() + .aspectRatio(mangaAspectRatio) + .padding(4.dp) + .clickable(onClick = onClick), + elevation = 4.dp, + shape = RoundedCornerShape(4.dp) + ) { + Box(modifier = Modifier.fillMaxSize()) { + if (cover != null) { + KtorImage(get(), cover, contentScale = ContentScale.Crop) + } + Box(modifier = Modifier.fillMaxSize().then(shadowGradient)) + Text( + text = title, + color = Color.White, + style = fontStyle, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.wrapContentHeight(Alignment.CenterVertically) + .align(Alignment.BottomStart) + .padding(8.dp), + ) + } + } +} + +const val mangaAspectRatio = 12.8F / 18.2F + +private val shadowGradient = Modifier.drawWithCache { + val gradient = Brush.linearGradient( + 0.75f to Color.Transparent, + 1.0f to Color(0xAA000000), + start = Offset(0f, 0f), + end = Offset(0f, size.height) + ) + onDrawBehind { + drawRect(gradient) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/Pager.kt b/src/main/kotlin/ca/gosyer/ui/base/components/Pager.kt new file mode 100644 index 00000000..129bf49f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/components/Pager.kt @@ -0,0 +1,217 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.components + +import androidx.compose.animation.core.Animatable +import androidx.compose.foundation.gestures.Orientation +import androidx.compose.foundation.gestures.draggable +import androidx.compose.foundation.gestures.rememberDraggableState +import androidx.compose.foundation.layout.Box +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.structuralEqualityPolicy +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.layout.Measurable +import androidx.compose.ui.layout.ParentDataModifier +import androidx.compose.ui.unit.Density +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +/** + * This is a modified version of: + * https://gist.github.com/adamp/07d468f4bcfe632670f305ce3734f511 + */ + +class PagerState( + currentPage: Int = 0, + minPage: Int = 0, + maxPage: Int = 0 +) { + private var _minPage by mutableStateOf(minPage) + var minPage: Int + get() = _minPage + set(value) { + _minPage = value.coerceAtMost(_maxPage) + _currentPage = _currentPage.coerceIn(_minPage, _maxPage) + } + + private var _maxPage by mutableStateOf(maxPage, structuralEqualityPolicy()) + var maxPage: Int + get() = _maxPage + set(value) { + _maxPage = value.coerceAtLeast(_minPage) + _currentPage = _currentPage.coerceIn(_minPage, maxPage) + } + + private var _currentPage by mutableStateOf(currentPage.coerceIn(minPage, maxPage)) + var currentPage: Int + get() = _currentPage + set(value) { + _currentPage = value.coerceIn(minPage, maxPage) + } + + enum class SelectionState { Selected, Undecided } + + var selectionState by mutableStateOf(SelectionState.Selected) + + suspend inline fun selectPage(block: PagerState.() -> R): R = try { + selectionState = SelectionState.Undecided + block() + } finally { + selectPage() + } + + suspend fun selectPage() { + currentPage -= currentPageOffset.roundToInt() + snapToOffset(0f) + selectionState = SelectionState.Selected + } + + private var _currentPageOffset = Animatable(0f).apply { + updateBounds(-1f, 1f) + } + val currentPageOffset: Float + get() = _currentPageOffset.value + + suspend fun snapToOffset(offset: Float) { + val max = if (currentPage == minPage) 0f else 1f + val min = if (currentPage == maxPage) 0f else -1f + _currentPageOffset.snapTo(offset.coerceIn(min, max)) + } + + suspend fun fling(velocity: Float) { + if (velocity < 0 && currentPage == maxPage) return + if (velocity > 0 && currentPage == minPage) return + + _currentPageOffset.animateTo(currentPageOffset.roundToInt().toFloat()) + selectPage() + } + + override fun toString(): String = "PagerState{minPage=$minPage, maxPage=$maxPage, " + + "currentPage=$currentPage, currentPageOffset=$currentPageOffset}" +} + +@Immutable +private data class PageData(val page: Int) : ParentDataModifier { + override fun Density.modifyParentData(parentData: Any?): Any = this@PageData +} + +private val Measurable.page: Int + get() = (parentData as? PageData)?.page ?: error("no PageData for measurable $this") + +@Composable +fun Pager( + state: PagerState, + modifier: Modifier = Modifier, + offscreenLimit: Int = 2, + pageContent: @Composable PagerScope.() -> Unit +) { + var pageSize by remember { mutableStateOf(0) } + val coroutineScope = rememberCoroutineScope() + Layout( + content = { + val minPage = (state.currentPage - offscreenLimit).coerceAtLeast(state.minPage) + val maxPage = (state.currentPage + offscreenLimit).coerceAtMost(state.maxPage) + + for (page in minPage..maxPage) { + val pageData = PageData(page) + val scope = PagerScope(state, page) + key(pageData) { + Box(contentAlignment = Alignment.Center, modifier = pageData) { + scope.pageContent() + } + } + } + }, + modifier = modifier.draggable( + orientation = Orientation.Horizontal, + onDragStarted = { + state.selectionState = PagerState.SelectionState.Undecided + }, + onDragStopped = { velocity -> + coroutineScope.launch { + // Velocity is in pixels per second, but we deal in percentage offsets, so we + // need to scale the velocity to match + state.fling(velocity / pageSize) + } + }, + state = rememberDraggableState { dy -> + coroutineScope.launch { + with(state) { + val pos = pageSize * currentPageOffset + val max = if (currentPage == minPage) 0 else pageSize * offscreenLimit + val min = if (currentPage == maxPage) 0 else -pageSize * offscreenLimit + val newPos = (pos + dy).coerceIn(min.toFloat(), max.toFloat()) + snapToOffset(newPos / pageSize) + } + } + }, + ) + ) { measurables, constraints -> + layout(constraints.maxWidth, constraints.maxHeight) { + val currentPage = state.currentPage + val offset = state.currentPageOffset + val childConstraints = constraints.copy(minWidth = 0, minHeight = 0) + + measurables + .map { + it.measure(childConstraints) to it.page + } + .forEach { (placeable, page) -> + // TODO: current this centers each page. We should investigate reading + // gravity modifiers on the child, or maybe as a param to Pager. + val xCenterOffset = (constraints.maxWidth - placeable.width) / 2 + val yCenterOffset = (constraints.maxHeight - placeable.height) / 2 + + if (currentPage == page) { + pageSize = placeable.width + } + + val xItemOffset = ((page + offset - currentPage) * placeable.width).roundToInt() + + placeable.place( + x = xCenterOffset + xItemOffset, + y = yCenterOffset + ) + } + } + } +} + +/** + * Scope for [Pager] content. + */ +class PagerScope( + private val state: PagerState, + val page: Int +) { + /** + * Returns the current selected page + */ + val currentPage: Int + get() = state.currentPage + + /** + * Returns the current selected page offset + */ + val currentPageOffset: Float + get() = state.currentPageOffset + + /** + * Returns the current selection state + */ + val selectionState: PagerState.SelectionState + get() = state.selectionState +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/base/vm/ComposeViewModel.kt b/src/main/kotlin/ca/gosyer/ui/base/vm/ComposeViewModel.kt new file mode 100644 index 00000000..870ef08a --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/vm/ComposeViewModel.kt @@ -0,0 +1,25 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.vm + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.remember +import org.koin.core.context.GlobalContext + +@Composable +inline fun composeViewModel(): VM { + val viewModel = remember { + GlobalContext.get().get() + } + DisposableEffect(viewModel) { + onDispose { + viewModel.destroy() + } + } + return viewModel +} diff --git a/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModel.kt b/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModel.kt new file mode 100644 index 00000000..9f136dfa --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModel.kt @@ -0,0 +1,22 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.vm + +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.cancel + +abstract class ViewModel { + + protected val scope = MainScope() + + fun destroy() { + scope.cancel() + onDestroy() + } + + open fun onDestroy() {} +} diff --git a/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModelModule.kt b/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModelModule.kt new file mode 100644 index 00000000..fc4a24ad --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/base/vm/ViewModelModule.kt @@ -0,0 +1,26 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.base.vm + +import ca.gosyer.ui.categories.CategoriesMenuViewModel +import ca.gosyer.ui.extensions.ExtensionsMenuViewModel +import ca.gosyer.ui.library.LibraryScreenViewModel +import ca.gosyer.ui.main.MainViewModel +import ca.gosyer.ui.manga.MangaMenuViewModel +import ca.gosyer.ui.sources.SourcesMenuViewModel +import ca.gosyer.ui.sources.components.SourceScreenViewModel +import org.koin.dsl.module + +val viewModelModule = module { + factory { MainViewModel() } + factory { ExtensionsMenuViewModel() } + factory { SourcesMenuViewModel() } + factory { SourceScreenViewModel() } + factory { MangaMenuViewModel() } + factory { LibraryScreenViewModel() } + factory { CategoriesMenuViewModel() } +} diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt new file mode 100644 index 00000000..824c3b00 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesDialogs.kt @@ -0,0 +1,80 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.categories + +import androidx.compose.material.Text +import androidx.compose.material.TextField +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.text.input.TextFieldValue +import ca.gosyer.ui.base.WindowDialog +import kotlinx.coroutines.flow.MutableStateFlow + +fun openRenameDialog( + category: CategoriesMenuViewModel.MenuCategory, + onRename: (String) -> Unit +) { + val newName = MutableStateFlow(TextFieldValue(category.name)) + + WindowDialog( + title = "TachideskJUI - Categories - Rename Dialog", + positiveButtonText = "Rename", + onPositiveButton = { + if (newName.value.text != category.name) { + onRename(newName.value.text) + } + } + ) { + val newNameState by newName.collectAsState() + + TextField( + newNameState, + onValueChange = { + newName.value = it + } + ) + } +} + +fun openDeleteDialog( + category: CategoriesMenuViewModel.MenuCategory, + onDelete: (CategoriesMenuViewModel.MenuCategory) -> Unit +) { + WindowDialog( + title = "TachideskJUI - Categories - Delete Dialog", + positiveButtonText = "Yes", + onPositiveButton = { + onDelete(category) + }, + negativeButtonText = "No" + ) { + Text("Do you wish to delete the category ${category.name}?") + } +} + +fun openCreateDialog( + onCreate: (String) -> Unit +) { + val name = MutableStateFlow(TextFieldValue("")) + + WindowDialog( + title = "TachideskJUI - Categories - Create Dialog", + positiveButtonText = "Create", + onPositiveButton = { + onCreate(name.value.text) + } + ) { + val nameState by name.collectAsState() + + TextField( + nameState, + onValueChange = { + name.value = it + } + ) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt new file mode 100644 index 00000000..351ad45d --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenu.kt @@ -0,0 +1,156 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.categories + +import androidx.compose.desktop.WindowEvents +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material.Card +import androidx.compose.material.ContentAlpha +import androidx.compose.material.ExtendedFloatingActionButton +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.LocalContentAlpha +import androidx.compose.material.LocalContentColor +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.KeyboardArrowUp +import androidx.compose.material.icons.outlined.List +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.util.compose.ThemedWindow + +fun openCategoriesMenu() { + val windowEvents = WindowEvents() + ThemedWindow("TachideskJUI - Categories", events = windowEvents) { + CategoriesMenu(windowEvents) + } +} + +@Composable +fun CategoriesMenu(windowEvents: WindowEvents) { + val vm = composeViewModel() + val categories by vm.categories.collectAsState() + remember { + windowEvents.onClose = { vm.updateCategories() } + } + + Box { + LazyColumn(modifier = Modifier.fillMaxSize()) { + itemsIndexed(categories) { i, category -> + CategoryRow( + category = category, + moveUpEnabled = i != 0, + moveDownEnabled = i != categories.lastIndex, + onMoveUp = { vm.moveUp(category) }, + onMoveDown = { vm.moveDown(category) }, + onRename = { + openRenameDialog(category) { + vm.renameCategory(category, it) + } + }, + onDelete = { + openDeleteDialog(category) { + vm.deleteCategory(category) + } + }, + ) + } + } + ExtendedFloatingActionButton( + text = { Text(text = "Add") }, + icon = { Icon(imageVector = Icons.Default.Add, contentDescription = null) }, + modifier = Modifier.align(Alignment.BottomEnd).padding(16.dp), + onClick = { + openCreateDialog { + vm.createCategory(it) + } + } + ) + } +} + +@Composable +private fun CategoryRow( + category: CategoriesMenuViewModel.MenuCategory, + moveUpEnabled: Boolean = true, + moveDownEnabled: Boolean = true, + onMoveUp: () -> Unit = {}, + onMoveDown: () -> Unit = {}, + onRename: () -> Unit = {}, + onDelete: () -> Unit = {}, +) { + Card(Modifier.padding(8.dp)) { + Column { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + imageVector = Icons.Outlined.List, + modifier = Modifier.padding(16.dp), + tint = MaterialTheme.colors.primary, + contentDescription = null, + ) + Text( + text = category.name, + modifier = Modifier.weight(1f).padding(end = 16.dp) + ) + } + Row(verticalAlignment = Alignment.CenterVertically) { + CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { + val enabledColor = LocalContentColor.current + val disabledColor = enabledColor.copy(ContentAlpha.disabled) + IconButton( + onClick = onMoveUp, + enabled = moveUpEnabled + ) { + Icon( + imageVector = Icons.Default.KeyboardArrowUp, + tint = if (moveUpEnabled) enabledColor else disabledColor, + contentDescription = null + ) + } + IconButton( + onClick = onMoveDown, + enabled = moveDownEnabled + ) { + Icon( + imageVector = Icons.Default.KeyboardArrowDown, + tint = if (moveDownEnabled) enabledColor else disabledColor, + contentDescription = null + ) + } + Spacer(modifier = Modifier.weight(1f)) + IconButton(onClick = onRename) { + Icon(imageVector = Icons.Default.Edit, + contentDescription = null) + } + IconButton(onClick = onDelete) { + Icon(imageVector = Icons.Default.Delete, + contentDescription = null) + } + } + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt new file mode 100644 index 00000000..1ff1ce25 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt @@ -0,0 +1,119 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.categories + +import ca.gosyer.backend.models.Category +import ca.gosyer.backend.network.interactions.CategoryInteractionHandler +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import mu.KotlinLogging + +class CategoriesMenuViewModel : ViewModel() { + private val httpClient: HttpClient by inject() + private val logger = KotlinLogging.logger {} + private var originalCategories = emptyList() + private val _categories = MutableStateFlow(emptyList()) + val categories = _categories.asStateFlow() + + private val _isLoading = MutableStateFlow(true) + val isLoading = _isLoading.asStateFlow() + + init { + getCategories() + } + + fun getCategories() { + scope.launch { + _categories.value = emptyList() + _isLoading.value = true + try { + _categories.value = CategoryInteractionHandler(httpClient).getCategories() + .sortedBy { it.order } + .also { originalCategories = it } + .map { it.toMenuCategory() } + } catch (e: Exception) { + if (e is CancellationException) throw e + } finally { + _isLoading.value = false + } + } + } + + fun updateCategories(manualUpdate: Boolean = false) { + val handler = CoroutineExceptionHandler { _, throwable -> + logger.debug { throwable } + } + GlobalScope.launch(handler) { + val categories = _categories.value + val newCategories = categories.filter { it.id == null } + newCategories.forEach { + CategoryInteractionHandler(httpClient).createCategory(it.name) + } + originalCategories.forEach { originalCategory -> + val category = categories.find { it.id == originalCategory.id } + if (category == null) { + CategoryInteractionHandler(httpClient).deleteCategory(originalCategory.id) + } else if (category.name != originalCategory.name) { + CategoryInteractionHandler(httpClient).modifyCategory(originalCategory.id, category.name) + } + } + val updatedCategories = CategoryInteractionHandler(httpClient).getCategories() + updatedCategories.forEach { updatedCategory -> + val category = categories.find { it.id == updatedCategory.id || it.name == updatedCategory.name } ?: return@forEach + if (category.order != updatedCategory.order) { + logger.debug { category.order.toString() + " to " + updatedCategory.order.toString() } + CategoryInteractionHandler(httpClient).reorderCategory(updatedCategory.id, category.order, updatedCategory.order) + } + } + + if (manualUpdate) { + getCategories() + } + } + } + + fun renameCategory(category: MenuCategory, newName: String) { + _categories.value = (_categories.value - category + category.copy(name = newName)).sortedBy { it.order } + } + + fun deleteCategory(category: MenuCategory) { + _categories.value = _categories.value - category + } + + fun createCategory(name: String) { + _categories.value += MenuCategory(order = categories.value.size, name = name, landing = false) + } + + fun moveUp(category: MenuCategory) { + val categories = _categories.value + val index = categories.indexOf(category) + if (index == -1) throw Exception("Invalid index") + categories[index].order = category.order - 1 + categories[index - 1].order = category.order + 1 + _categories.value = categories.sortedBy { it.order } + } + + fun moveDown(category: MenuCategory) { + val categories = _categories.value + val index = categories.indexOf(category) + if (index == -1) throw Exception("Invalid index") + categories[index].order = category.order + 1 + categories[index + 1].order = category.order - 1 + _categories.value = categories.sortedBy { it.order } + } + + fun Category.toMenuCategory() = MenuCategory(id, order, name, landing) + + data class MenuCategory(val id: Long? = null, var order: Int, val name: String, val landing: Boolean = false) +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt new file mode 100644 index 00000000..a83f23cd --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenu.kt @@ -0,0 +1,138 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.extensions + +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.VerticalScrollbar +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.material.Button +import androidx.compose.material.ContentAlpha +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import ca.gosyer.backend.models.Extension +import ca.gosyer.ui.base.components.KtorImage +import ca.gosyer.ui.base.components.LoadingScreen +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.util.compose.ThemedWindow +import ca.gosyer.util.system.get + +fun openExtensionsMenu() { + ThemedWindow(title = "TachideskJUI - Extensions", size = IntSize(550, 700)) { + ExtensionsMenu() + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun ExtensionsMenu() { + val vm = composeViewModel() + val extensions by vm.extensions.collectAsState() + val isLoading by vm.isLoading.collectAsState() + val serverUrl by vm.serverUrl.collectAsState() + + Box(Modifier.fillMaxSize().background(MaterialTheme.colors.background)) { + if (extensions.isEmpty()) { + LoadingScreen(isLoading) + } else { + val state = rememberLazyListState() + val itemCount = extensions.size + + Box(Modifier.fillMaxSize()) { + LazyColumn(Modifier.fillMaxSize().padding(end = 12.dp), state) { + items(extensions) { extension -> + ExtensionItem( + extension, + serverUrl, + onInstallClicked = { + vm.install(it) + }, + onUninstallClicked = { + vm.uninstall(it) + } + ) + Spacer(Modifier.height(8.dp)) + } + } + VerticalScrollbar( + modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(), + adapter = rememberScrollbarAdapter( + scrollState = state, + itemCount = itemCount, + averageItemSize = 37.dp // TextBox height + Spacer height + ) + ) + } + } + } +} + +@Composable +fun ExtensionItem( + extension: Extension, + serverUrl: String, + onInstallClicked: (Extension) -> Unit, + onUninstallClicked: (Extension) -> Unit +) { + Box(modifier = Modifier.fillMaxWidth().height(64.dp).background(MaterialTheme.colors.background)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Spacer(Modifier.width(4.dp)) + KtorImage(get(), extension.iconUrl(serverUrl), Modifier.size(60.dp)) + Spacer(Modifier.width(8.dp)) + Column { + val title = buildAnnotatedString { + append("${extension.name} ") + val mediumColor = MaterialTheme.colors.onBackground.copy(alpha = ContentAlpha.medium) + withStyle(SpanStyle(fontSize = 12.sp, color = mediumColor)) { append("v${extension.versionName}") } + } + Text(title, fontSize = 26.sp, color = MaterialTheme.colors.onBackground) + Row { + Text(extension.lang.toUpperCase(), fontSize = 14.sp, color = MaterialTheme.colors.onBackground) + if (extension.nsfw) { + Spacer(Modifier.width(4.dp)) + Text("18+", fontSize = 14.sp, color = Color.Red) + } + } + } + + } + Button( + { + if (extension.installed) onUninstallClicked(extension) else onInstallClicked(extension) + }, + modifier = Modifier.align(Alignment.CenterEnd) + ) { + Text(if (extension.installed) "Uninstall" else "Install") + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenuViewModel.kt b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenuViewModel.kt new file mode 100644 index 00000000..93109b77 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/extensions/ExtensionsMenuViewModel.kt @@ -0,0 +1,77 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.extensions + +import ca.gosyer.backend.models.Extension +import ca.gosyer.backend.network.interactions.ExtensionInteractionHandler +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import mu.KotlinLogging + +class ExtensionsMenuViewModel: ViewModel() { + private val preferences: PreferenceHelper by inject() + private val httpClient: HttpClient by inject() + private val logger = KotlinLogging.logger {} + + val serverUrl = preferences.serverUrl.asStateFlow(scope) + + private val _extensions = MutableStateFlow(emptyList()) + val extensions = _extensions.asStateFlow() + + private val _isLoading = MutableStateFlow(true) + val isLoading = _isLoading.asStateFlow() + + + init { + scope.launch { + getExtensions() + } + } + + private suspend fun getExtensions() { + try { + _isLoading.value = true + val enabledLangs = preferences.enabledLangs.get() + val extensions = ExtensionInteractionHandler(httpClient).getExtensionList() + _extensions.value = extensions.filter { it.lang in enabledLangs }.sortedWith(compareBy({ it.lang }, { it.pkgName })) + } catch (e: Exception) { + if (e is CancellationException) throw e + } finally { + _isLoading.value = false + } + } + + fun install(extension: Extension) { + logger.info { "Install clicked" } + scope.launch { + try { + ExtensionInteractionHandler(httpClient).installExtension(extension) + } catch (e: Exception) { + if (e is CancellationException) throw e + } + getExtensions() + } + } + + fun uninstall(extension: Extension) { + logger.info { "Uninstall clicked" } + scope.launch { + try { + ExtensionInteractionHandler(httpClient).uninstallExtension(extension) + } catch (e: Exception) { + if (e is CancellationException) throw e + } + getExtensions() + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/library/LibraryMangaBadges.kt b/src/main/kotlin/ca/gosyer/ui/library/LibraryMangaBadges.kt new file mode 100644 index 00000000..b0ea5d34 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/library/LibraryMangaBadges.kt @@ -0,0 +1,47 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.library + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.dp + +@Composable +fun LibraryMangaBadges( + unread: Int?, + downloaded: Int?, + modifier: Modifier = Modifier, +) { + if (unread == null && downloaded == null) return + + Row(modifier = modifier.clip(MaterialTheme.shapes.medium)) { + if (unread != null && unread > 0) { + Text( + text = unread.toString(), + modifier = Modifier.background(MaterialTheme.colors.primary).then(BadgesInnerPadding), + style = MaterialTheme.typography.caption, + color = MaterialTheme.colors.onPrimary + ) + } + if (downloaded != null && downloaded > 0) { + Text( + text = downloaded.toString(), + modifier = Modifier.background(MaterialTheme.colors.secondary).then(BadgesInnerPadding), + style = MaterialTheme.typography.caption, + color = MaterialTheme.colors.onSecondary + ) + } + } +} + +private val BadgesInnerPadding = Modifier.padding(horizontal = 3.dp, vertical = 1.dp) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt new file mode 100644 index 00000000..8ec57328 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreen.kt @@ -0,0 +1,182 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.library + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.animation.expandVertically +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.material.ExperimentalMaterialApi +import androidx.compose.material.ScrollableTabRow +import androidx.compose.material.Tab +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.State +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.unit.dp +import ca.gosyer.backend.models.Category +import ca.gosyer.backend.models.Manga +import ca.gosyer.ui.base.components.LoadingScreen +import ca.gosyer.ui.base.components.Pager +import ca.gosyer.ui.base.components.PagerState +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.ui.manga.openMangaMenu +import ca.gosyer.util.compose.ThemedWindow +import kotlinx.serialization.Serializable + +fun openLibraryMenu() { + ThemedWindow { + LibraryScreen() + } +} + +@OptIn(ExperimentalMaterialApi::class) +@Composable +fun LibraryScreen() { + val vm = composeViewModel() + val categories by vm.categories.collectAsState() + val selectedCategoryIndex by vm.selectedCategoryIndex.collectAsState() + val displayMode by vm.displayMode.collectAsState() + val isLoading by vm.isLoading.collectAsState() + val serverUrl by vm.serverUrl.collectAsState() + //val sheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden) + + if (categories.isEmpty()) { + LoadingScreen(isLoading) + } else { + + /*ModalBottomSheetLayout( + sheetState = sheetState, + sheetContent = { *//*LibrarySheet()*//* } + ) {*/ + Column { + /*Toolbar( + title = { + val text = if (vm.showCategoryTabs) { + stringResource(R.string.library_label) + } else { + vm.selectedCategory?.visibleName.orEmpty() + } + Text(text) + }, + actions = { + IconButton(onClick = { scope.launch { sheetState.show() }}) { + Icon(Icons.Default.FilterList, contentDescription = null) + } + } + )*/ + LibraryTabs( + visible = true, //vm.showCategoryTabs, + categories = categories, + selectedPage = selectedCategoryIndex, + onPageChanged = vm::setSelectedPage + ) + LibraryPager( + categories = categories, + displayMode = displayMode, + selectedPage = selectedCategoryIndex, + serverUrl = serverUrl, + getLibraryForPage = { vm.getLibraryForCategoryIndex(it).collectAsState() }, + onPageChanged = { vm.setSelectedPage(it) }, + onClickManga = ::openMangaMenu + ) + } + // } + } +} + +@OptIn(ExperimentalAnimationApi::class) +@Composable +private fun LibraryTabs( + visible: Boolean, + categories: List, + selectedPage: Int, + onPageChanged: (Int) -> Unit +) { + if (categories.isEmpty()) return + + AnimatedVisibility( + visible = visible, + enter = expandVertically(), + exit = shrinkVertically() + ) { + ScrollableTabRow( + selectedTabIndex = selectedPage, + // backgroundColor = CustomColors.current.bars, + // contentColor = CustomColors.current.onBars, + edgePadding = 0.dp + ) { + categories.forEachIndexed { i, category -> + Tab( + selected = selectedPage == i, + onClick = { onPageChanged(i) }, + text = { Text(category.name) } + ) + } + } + } +} + +@Composable +private fun LibraryPager( + categories: List, + displayMode: DisplayMode, + selectedPage: Int, + serverUrl: String, + getLibraryForPage: @Composable (Int) -> State>, + onPageChanged: (Int) -> Unit, + onClickManga: (Manga) -> Unit +) { + if (categories.isEmpty()) return + + val state = remember(categories.size, selectedPage) { + PagerState( + currentPage = selectedPage, + minPage = 0, + maxPage = categories.lastIndex + ) + } + LaunchedEffect(state.currentPage) { + if (state.currentPage != selectedPage) { + onPageChanged(state.currentPage) + } + } + Pager(state = state, offscreenLimit = 1) { + val library by getLibraryForPage(page) + when (displayMode) { + DisplayMode.CompactGrid -> LibraryMangaCompactGrid( + library = library, + serverUrl = serverUrl, + onClickManga = onClickManga + ) + /*DisplayMode.ComfortableGrid -> LibraryMangaComfortableGrid( + library = library, + onClickManga = onClickManga + ) + DisplayMode.List -> LibraryMangaList( + library = library, + onClickManga = onClickManga + )*/ + else -> Box {} + } + } +} + +@Serializable +sealed class DisplayMode { + @Serializable + object List : DisplayMode() + @Serializable + object CompactGrid : DisplayMode() + @Serializable + object ComfortableGrid : DisplayMode() +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt new file mode 100644 index 00000000..c0ad527a --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt @@ -0,0 +1,93 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.library + +import ca.gosyer.backend.models.Category +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.interactions.CategoryInteractionHandler +import ca.gosyer.backend.network.interactions.LibraryInteractionHandler +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +private typealias LibraryMap = MutableMap>> +private data class Library(val categories: MutableStateFlow>, val mangaMap: LibraryMap) + +private fun LibraryMap.getManga(order: Int) = + getOrPut(order) { MutableStateFlow(emptyList()) } +private fun LibraryMap.setManga(order: Int, manga: List) { + getManga(order).value = manga +} + +class LibraryScreenViewModel: ViewModel() { + private val preferences: PreferenceHelper by inject() + private val httpClient: HttpClient by inject() + + val serverUrl = preferences.serverUrl.asStateFlow(scope) + + private val library = Library(MutableStateFlow(emptyList()), mutableMapOf()) + val categories = library.categories.asStateFlow() + + private val _selectedCategoryIndex = MutableStateFlow(0) + val selectedCategoryIndex = _selectedCategoryIndex.asStateFlow() + + val displayMode = preferences.libraryDisplay.asStateFlow(scope) + + private val _isLoading = MutableStateFlow(true) + val isLoading = _isLoading.asStateFlow() + + init { + getLibrary() + } + + private fun getLibrary() { + scope.launch { + _isLoading.value = true + try { + val categories = CategoryInteractionHandler(httpClient).getCategories() + if (categories.isEmpty()) { + library.categories.value = listOf(defaultCategory) + library.mangaMap.setManga(defaultCategory.order, LibraryInteractionHandler(httpClient).getLibraryManga()) + } else { + library.categories.value = listOf(defaultCategory) + categories.sortedBy { it.order } + categories.map { + async { + library.mangaMap.setManga(it.order, CategoryInteractionHandler(httpClient).getMangaFromCategory(it.id)) + } + }.awaitAll() + val mangaInCategories = library.mangaMap.flatMap { it.value.value }.map { it.id }.distinct() + library.mangaMap.setManga(defaultCategory.order, LibraryInteractionHandler(httpClient).getLibraryManga().filterNot { it.id in mangaInCategories }) + } + } catch (e: Exception) { + } finally { + _isLoading.value = false + } + } + } + + + fun setSelectedPage(page: Int) { + _selectedCategoryIndex.value = page + } + + fun getLibraryForCategoryIndex(index: Int): StateFlow> { + return library.mangaMap.getManga(index).asStateFlow() + } + + companion object { + val defaultCategory = Category(0, 0, "Default",true) + } +} + + diff --git a/src/main/kotlin/ca/gosyer/ui/library/MangaCompactGrid.kt b/src/main/kotlin/ca/gosyer/ui/library/MangaCompactGrid.kt new file mode 100644 index 00000000..e2dfc0f8 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/library/MangaCompactGrid.kt @@ -0,0 +1,109 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.library + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.GridCells +import androidx.compose.foundation.lazy.LazyVerticalGrid +import androidx.compose.foundation.lazy.items +import androidx.compose.material.LocalTextStyle +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import ca.gosyer.backend.models.Manga +import ca.gosyer.ui.base.components.KtorImage +import ca.gosyer.util.system.get + +@Composable +fun LibraryMangaCompactGrid( + library: List, + serverUrl: String, + onClickManga: (Manga) -> Unit = {} +) { + LazyVerticalGrid( + cells = GridCells.Adaptive(160.dp), + modifier = Modifier.fillMaxSize().padding(4.dp) + ) { + items(library) { manga -> + LibraryMangaCompactGridItem( + manga = manga, + unread = null, // TODO + downloaded = null, // TODO + serverUrl = serverUrl, + onClick = { onClickManga(manga) } + ) + } + } +} + +@Composable +private fun LibraryMangaCompactGridItem( + manga: Manga, + unread: Int?, + downloaded: Int?, + serverUrl: String, + onClick: () -> Unit = {} +) { + val cover = remember(manga.id, serverUrl) { manga.cover(serverUrl) } + val fontStyle = LocalTextStyle.current.merge( + TextStyle(letterSpacing = 0.sp, fontFamily = FontFamily.SansSerif, fontSize = 14.sp) + ) + + Box(modifier = Modifier.padding(4.dp) + .fillMaxWidth() + .aspectRatio(3f / 4f) + .clip(MaterialTheme.shapes.medium) + .clickable(onClick = onClick) + ) { + if (cover != null) { + KtorImage(get(), cover, contentScale = ContentScale.Crop) + } + Box(modifier = Modifier.fillMaxSize().then(shadowGradient)) + Text( + text = manga.title, + color = Color.White, + style = fontStyle, + maxLines = 2, + modifier = Modifier.align(Alignment.BottomStart).padding(8.dp) + ) + LibraryMangaBadges( + unread = unread, + downloaded = downloaded, + modifier = Modifier.padding(4.dp) + ) + } +} + +private val shadowGradient = Modifier.drawWithCache { + val gradient = Brush.linearGradient( + 0.75f to Color.Transparent, + 1.0f to Color(0xAA000000), + start = Offset(0f, 0f), + end = Offset(0f, size.height) + ) + onDrawBehind { + drawRect(gradient) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/main/MainViewModel.kt b/src/main/kotlin/ca/gosyer/ui/main/MainViewModel.kt new file mode 100644 index 00000000..8ec91538 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/main/MainViewModel.kt @@ -0,0 +1,11 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.main + +import ca.gosyer.ui.base.vm.ViewModel + +class MainViewModel : ViewModel() \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/main/main.kt b/src/main/kotlin/ca/gosyer/ui/main/main.kt new file mode 100644 index 00000000..80634171 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/main/main.kt @@ -0,0 +1,85 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.main + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.Button +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.ui.Modifier +import ca.gosyer.backend.network.networkModule +import ca.gosyer.backend.preferences.preferencesModule +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.ui.base.vm.viewModelModule +import ca.gosyer.ui.categories.openCategoriesMenu +import ca.gosyer.ui.extensions.openExtensionsMenu +import ca.gosyer.ui.library.openLibraryMenu +import ca.gosyer.ui.sources.openSourcesMenu +import ca.gosyer.util.compose.ThemedWindow +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import mu.KotlinLogging +import org.koin.core.context.startKoin +import kotlin.concurrent.thread + +fun main() { + GlobalScope.launch { + val logger = KotlinLogging.logger("Server") + val runtime = Runtime.getRuntime() + + val process = runtime.exec("java -jar resources/Tachidesk.jar") + runtime.addShutdownHook(thread(start = false) { + process?.destroy() + }) + val reader = process.inputStream.reader().buffered() + logger.info { "Server started successfully" } + var line: String? + while (reader.readLine().also { line = it } != null) { + logger.info { line } + } + logger.info { "Server closed" } + val exitVal = process.waitFor() + logger.info { "Process exitValue: $exitVal" } + } + + startKoin { + modules( + preferencesModule, + networkModule, + viewModelModule + ) + } + + + ThemedWindow(title = "TachideskJUI") { + val vm = composeViewModel() + Column(Modifier.fillMaxSize().background(MaterialTheme.colors.background)) { + Button( + onClick = ::openExtensionsMenu + ) { + Text("Extensions") + } + Button( + onClick = ::openSourcesMenu + ) { + Text("Sources") + } + Button( + onClick = ::openLibraryMenu + ) { + Text("Library") + } + Button( + onClick = ::openCategoriesMenu + ) { + Text("Categories") + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt new file mode 100644 index 00000000..b47e82b7 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenu.kt @@ -0,0 +1,214 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.manga + +import androidx.compose.foundation.VerticalScrollbar +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.defaultMinSize +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Button +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import ca.gosyer.backend.models.Chapter +import ca.gosyer.backend.models.Manga +import ca.gosyer.ui.base.components.KtorImage +import ca.gosyer.ui.base.components.LoadingScreen +import ca.gosyer.ui.base.components.mangaAspectRatio +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.util.compose.ThemedWindow +import ca.gosyer.util.system.get + +fun openMangaMenu(mangaId: Long) { + ThemedWindow("TachideskJUI") { + MangaMenu(mangaId) + } +} + +fun openMangaMenu(manga: Manga) { + ThemedWindow("TachideskJUI - ${manga.title}") { + MangaMenu(manga) + } +} + +@Composable +fun MangaMenu(mangaId: Long) { + val vm = composeViewModel() + remember(mangaId) { + vm.init(mangaId) + } + MangaMenu(vm) +} + +@Composable +fun MangaMenu(manga: Manga) { + val vm = composeViewModel() + remember(manga) { + vm.init(manga) + } + MangaMenu(vm) +} + +@Composable +fun MangaMenu(vm: MangaMenuViewModel) { + val manga by vm.manga.collectAsState() + val chapters by vm.chapters.collectAsState() + val isLoading by vm.isLoading.collectAsState() + val serverUrl by vm.serverUrl.collectAsState() + + Column(Modifier.background(MaterialTheme.colors.background)) { + Surface(Modifier.height(40.dp).fillMaxWidth()) { + Row { + Button(onClick = vm::toggleFavorite) { + Text(if (manga?.inLibrary == true) "UnFavorite" else "Favorite") + } + } + } + manga?.let { manga -> + Box { + val state = rememberLazyListState() + LazyColumn(state = state) { + items( + listOf(MangaMenu.MangaMenuManga(manga)) + chapters.map { MangaMenu.MangaMenuChapter(it) } + ) { + when (it) { + is MangaMenu.MangaMenuManga -> MangaItem(it.manga, serverUrl) + is MangaMenu.MangaMenuChapter -> ChapterItem(it.chapter) + } + } + } + VerticalScrollbar( + modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(), + adapter = rememberScrollbarAdapter( + scrollState = state, + itemCount = chapters.size + 1, + averageItemSize = 70.dp + ) + ) + if (isLoading) { + LoadingScreen() + } + } + } + } +} + +@Composable +fun MangaItem(manga: Manga, serverUrl: String) { + BoxWithConstraints(Modifier.padding(8.dp)) { + if (maxWidth > 600.dp) { + Row { + Cover(manga, serverUrl) + Spacer(Modifier.width(16.dp)) + Surface( + elevation = 2.dp, + modifier = Modifier.defaultMinSize(minHeight = 450.dp).fillMaxWidth() + ) { + MangaInfo(manga) + } + } + } else { + Column { + Cover(manga, serverUrl, Modifier.align(Alignment.CenterHorizontally)) + Spacer(Modifier.height(16.dp)) + Surface(elevation = 2.dp) { + MangaInfo(manga) + } + } + } + } +} + +@Composable +private fun Cover(manga: Manga, serverUrl: String, modifier: Modifier = Modifier) { + Surface( + modifier = modifier then Modifier + .width(300.dp) + .aspectRatio(mangaAspectRatio) + .padding(4.dp), + elevation = 4.dp, + shape = RoundedCornerShape(4.dp) + ) { + Box(modifier = Modifier.fillMaxSize()) { + manga.cover(serverUrl).let { + if (it != null) { + KtorImage(get(), it) + } + } + } + } +} + +sealed class MangaMenu { + data class MangaMenuManga(val manga: Manga) + + data class MangaMenuChapter(val chapter: Chapter) +} + +@Composable +private fun MangaInfo(manga: Manga, modifier: Modifier = Modifier) { + Column(modifier) { + Text(manga.title, fontSize = 22.sp, fontWeight = FontWeight.Bold) + if (!manga.author.isNullOrEmpty()) { + Text(manga.author, fontSize = 18.sp) + } + if (!manga.artist.isNullOrEmpty() && manga.artist != manga.author) { + Text(manga.artist, fontSize = 18.sp) + } + if (!manga.description.isNullOrEmpty()) { + Text(manga.description) + } + if (!manga.genre.isNullOrEmpty()) { + Text(manga.genre) + } + } +} + +@Composable +private fun ChapterItem(chapter: Chapter) { + Surface(modifier = Modifier.fillMaxWidth().height(70.dp).padding(4.dp), elevation = 2.dp) { + Column(Modifier.padding(4.dp)) { + Text(chapter.name, fontSize = 20.sp) + val description = mutableListOf() + if (chapter.dateUpload != 0L) { + description += chapter.dateUpload.toString() + } + if (!chapter.scanlator.isNullOrEmpty()) { + description += chapter.scanlator + } + if (description.isNotEmpty()) { + Spacer(Modifier.height(2.dp)) + Text(description.joinToString(" - ")) + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/manga/MangaMenuViewModel.kt b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenuViewModel.kt new file mode 100644 index 00000000..3acd7bf5 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/manga/MangaMenuViewModel.kt @@ -0,0 +1,87 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.manga + +import ca.gosyer.backend.models.Chapter +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.network.interactions.ChapterInteractionHandler +import ca.gosyer.backend.network.interactions.LibraryInteractionHandler +import ca.gosyer.backend.network.interactions.MangaInteractionHandler +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +class MangaMenuViewModel : ViewModel() { + private val preferences: PreferenceHelper by inject() + private val httpClient: HttpClient by inject() + + val serverUrl = preferences.serverUrl.asStateFlow(scope) + + private val _manga = MutableStateFlow(null) + val manga = _manga.asStateFlow() + + private val _chapters = MutableStateFlow(emptyList()) + val chapters = _chapters.asStateFlow() + + private val _isLoading = MutableStateFlow(true) + val isLoading = _isLoading.asStateFlow() + + fun init(manga: Manga) { + _manga.value = manga + init(manga.id) + } + + fun init(mangaId: Long) { + scope.launch { + refreshMangaAsync(mangaId).await() to refreshChaptersAsync(mangaId).await() + _isLoading.value = false + } + } + + private suspend fun refreshMangaAsync(mangaId: Long) = withContext(Dispatchers.IO) { + async { + try { + _manga.value = MangaInteractionHandler(httpClient).getManga(mangaId) + } catch (e: Exception) { + if (e is CancellationException) throw e + } + } + } + + suspend fun refreshChaptersAsync(mangaId: Long) = withContext(Dispatchers.IO) { + async { + try { + _chapters.value = ChapterInteractionHandler(httpClient).getChapters(mangaId) + } catch (e: Exception) { + if (e is CancellationException) throw e + } + } + } + + fun toggleFavorite() { + scope.launch { + manga.value?.let { + if (it.inLibrary) { + LibraryInteractionHandler(httpClient).removeMangaFromLibrary(it) + } else { + LibraryInteractionHandler(httpClient).addMangaToLibrary(it) + } + + refreshMangaAsync(it.id).await() + } + } + + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt new file mode 100644 index 00000000..9e1aed37 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt @@ -0,0 +1,57 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import ca.gosyer.backend.models.Source +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.ui.sources.components.SourceHomeScreen +import ca.gosyer.ui.sources.components.SourceScreen +import ca.gosyer.ui.sources.components.SourceTopBar +import ca.gosyer.util.compose.ThemedWindow + +fun openSourcesMenu() { + ThemedWindow(title = "TachideskJUI - Sources") { + SourcesMenu() + } +} + +@Composable +fun SourcesMenu() { + val vm = composeViewModel() + val isLoading by vm.isLoading.collectAsState() + val sources by vm.sources.collectAsState() + val sourceTabs by vm.sourceTabs.collectAsState() + val selectedSourceTab by vm.selectedSourceTab.collectAsState() + val serverUrl by vm.serverUrl.collectAsState() + + Column(Modifier.fillMaxSize().background(MaterialTheme.colors.background)) { + SourceTopBar( + openHome = { + vm.selectTab(null) + }, + sources = sourceTabs, + tabSelected = selectedSourceTab, + onTabSelected = vm::selectTab, + onTabClosed = vm::closeTab + ) + + val selectedSource: Source? = selectedSourceTab + if (selectedSource != null) { + SourceScreen(selectedSource) + } else { + SourceHomeScreen(isLoading, sources, serverUrl, vm::addTab) + } + } +} diff --git a/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenuViewModel.kt b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenuViewModel.kt new file mode 100644 index 00000000..1b06fd13 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/SourcesMenuViewModel.kt @@ -0,0 +1,74 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources + +import ca.gosyer.backend.models.Source +import ca.gosyer.backend.network.interactions.SourceInteractionHandler +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import mu.KotlinLogging + +class SourcesMenuViewModel: ViewModel() { + private val preferences: PreferenceHelper by inject() + private val httpClient: HttpClient by inject() + private val logger = KotlinLogging.logger {} + + val serverUrl = preferences.serverUrl.asStateFlow(scope) + + private val _isLoading = MutableStateFlow(true) + val isLoading = _isLoading.asStateFlow() + + private val _sources = MutableStateFlow(emptyList()) + val sources = _sources.asStateFlow() + + private val _sourceTabs = MutableStateFlow(mapOf(null to null)) + val sourceTabs = _sourceTabs.asStateFlow() + + private val _selectedSourceTab = MutableStateFlow(null) + val selectedSourceTab = _selectedSourceTab.asStateFlow() + + init { + getSources() + } + + private fun getSources() { + scope.launch { + try { + val sources = SourceInteractionHandler(httpClient).getSourceList() + logger.info { sources } + _sources.value = sources//.filter { it.lang in Preferences.enabledLangs } + logger.info { _sources.value } + } catch (e: Exception) { + if (e is CancellationException) throw e + } finally { + _isLoading.value = false + } + } + } + + fun selectTab(source: Source?) { + _selectedSourceTab.value = source + } + + fun addTab(source: Source) { + _sourceTabs.value += source.id to source + selectTab(source) + } + + fun closeTab(source: Source) { + _sourceTabs.value -= source.id + if (selectedSourceTab.value?.id == source.id) { + _selectedSourceTab.value = null + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/sources/components/SourceHomeScreen.kt b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceHomeScreen.kt new file mode 100644 index 00000000..084ca90f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceHomeScreen.kt @@ -0,0 +1,117 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources.components + +import androidx.compose.foundation.VerticalScrollbar +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.GridCells +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.LazyVerticalGrid +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import ca.gosyer.backend.models.Source +import ca.gosyer.ui.base.components.KtorImage +import ca.gosyer.ui.base.components.LoadingScreen +import ca.gosyer.util.system.get + +@Composable +fun SourceHomeScreen( + isLoading: Boolean, + sources: List, + serverUrl: String, + onSourceClicked: (Source) -> Unit +) { + if (sources.isEmpty()) { + LoadingScreen(isLoading) + } else { + Box(Modifier.fillMaxSize(), Alignment.TopCenter) { + val state = rememberLazyListState() + SourceCategory("all", sources, serverUrl, onSourceClicked, state) + /*val sourcesByLang = sources.groupBy { it.lang.toLowerCase() }.toList() + LazyColumn(state = state) { + items(sourcesByLang) { (lang, sources) -> + SourceCategory( + lang, + sources, + onSourceClicked = sourceClicked + ) + Spacer(Modifier.height(8.dp)) + } + }*/ + + VerticalScrollbar( + modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight(), + adapter = rememberScrollbarAdapter( + scrollState = state, + itemCount = sources.size, + averageItemSize = 12.dp // TextBox height + Spacer height + ) + ) + } + } +} + +@Composable +fun SourceCategory( + lang: String, + sources: List, + serverUrl: String, + onSourceClicked: (Source) -> Unit, + state: LazyListState +) { + Column { + Surface(elevation = 1.dp, modifier = Modifier.fillMaxWidth()) { + Text(lang.toUpperCase(), modifier = Modifier.align(Alignment.CenterHorizontally), color = MaterialTheme.colors.onBackground) + } + LazyVerticalGrid(GridCells.Adaptive(120.dp), state = state) { + items(sources) { source -> + SourceItem( + source, + serverUrl, + onSourceClicked = onSourceClicked + ) + Spacer(Modifier.height(8.dp)) + } + } + } +} + + +@Composable +fun SourceItem( + source: Source, + serverUrl: String, + onSourceClicked: (Source) -> Unit +) { + Column( + Modifier.size(120.dp) + .clickable { + onSourceClicked(source) + }, + horizontalAlignment = Alignment.CenterHorizontally + ) { + KtorImage(get(), source.iconUrl(serverUrl), Modifier.size(96.dp)) + Spacer(Modifier.height(4.dp)) + Text("${source.name} (${source.lang})", color = MaterialTheme.colors.onBackground) + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreen.kt b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreen.kt new file mode 100644 index 00000000..a15c3ae7 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreen.kt @@ -0,0 +1,102 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.lazy.GridCells +import androidx.compose.foundation.lazy.LazyVerticalGrid +import androidx.compose.foundation.lazy.items +import androidx.compose.material.Button +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.models.Source +import ca.gosyer.ui.base.components.LoadingScreen +import ca.gosyer.ui.base.components.MangaGridItem +import ca.gosyer.ui.base.vm.composeViewModel +import ca.gosyer.ui.manga.openMangaMenu + +@Composable +fun SourceScreen( + source: Source +) { + val vm = composeViewModel() + remember(source) { + vm.init(source) + } + val mangas by vm.mangas.collectAsState() + val hasNextPage by vm.hasNextPage.collectAsState() + val loading by vm.loading.collectAsState() + val isLatest by vm.isLatest.collectAsState() + val serverUrl by vm.serverUrl.collectAsState() + + MangaTable( + mangas, + loading, + hasNextPage, + isLatest, + serverUrl, + onLoadNextPage = vm::loadNextPage, + onClickManga = ::openMangaMenu, + onClickMode = vm::setMode + ) +} + +@Composable +private fun MangaTable( + mangas: List, + isLoading: Boolean = false, + hasNextPage: Boolean = false, + isLatest: Boolean, + serverUrl: String, + onLoadNextPage: () -> Unit, + onClickManga: (Manga) -> Unit, + onClickMode: (Boolean) -> Unit +) { + if (mangas.isEmpty()) { + LoadingScreen(isLoading) + } else { + Column { + // TODO: this should happen automatically on scroll + Box(modifier = Modifier.fillMaxWidth()) { + Button( + onClick = onLoadNextPage, + enabled = hasNextPage && !isLoading, + modifier = Modifier.align(Alignment.TopStart) + ) { + Text(text = if (isLoading) "Loading..." else "Load next page") + } + Button( + onClick = { onClickMode(!isLatest) }, + enabled = !isLoading, + modifier = Modifier.align(Alignment.TopEnd) + ) { + Text(text = if (isLatest) "Latest" else "Browse") + } + } + + + LazyVerticalGrid(GridCells.Adaptive(160.dp)) { + items(mangas) { manga -> + MangaGridItem( + title = manga.title, + cover = manga.cover(serverUrl), + onClick = { onClickManga(manga) } + ) + } + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreenViewModel.kt b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreenViewModel.kt new file mode 100644 index 00000000..e94e9de4 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceScreenViewModel.kt @@ -0,0 +1,84 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources.components + +import ca.gosyer.backend.models.Manga +import ca.gosyer.backend.models.MangaPage +import ca.gosyer.backend.models.Source +import ca.gosyer.backend.network.interactions.SourceInteractionHandler +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.ui.base.vm.ViewModel +import ca.gosyer.util.system.asStateFlow +import ca.gosyer.util.system.inject +import io.ktor.client.HttpClient +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +class SourceScreenViewModel: ViewModel() { + private lateinit var source: Source + private val preferences: PreferenceHelper by inject() + private val httpClient: HttpClient by inject() + + val serverUrl = preferences.serverUrl.asFLow() + .asStateFlow(preferences.serverUrl.get(),scope, true) + + private val _mangas = MutableStateFlow(emptyList()) + val mangas = _mangas.asStateFlow() + + private val _hasNextPage = MutableStateFlow(false) + val hasNextPage = _hasNextPage.asStateFlow() + + private val _loading = MutableStateFlow(true) + val loading = _loading.asStateFlow() + + private val _isLatest = MutableStateFlow(true) + val isLatest = _isLatest.asStateFlow() + + private val _pageNum = MutableStateFlow(1) + val pageNum = _pageNum.asStateFlow() + + fun init(source: Source) { + this.source = source + scope.launch { + _loading.value = true + _mangas.value = emptyList() + _hasNextPage.value = false + _pageNum.value = 1 + val page = getPage() + _mangas.value += page.mangaList + _hasNextPage.value = page.hasNextPage + _loading.value = false + } + } + + fun loadNextPage() { + scope.launch { + _hasNextPage.value = false + _pageNum.value++ + val page = getPage() + _mangas.value += page.mangaList + _hasNextPage.value = page.hasNextPage + _loading.value = false + } + } + + fun setMode(toLatest: Boolean) { + if (isLatest.value != toLatest){ + _isLatest.value = toLatest + init(source) + } + } + + private suspend fun getPage(): MangaPage { + return if (isLatest.value) { + SourceInteractionHandler(httpClient).getLatestManga(source, pageNum.value) + } else { + SourceInteractionHandler(httpClient).getPopularManga(source, pageNum.value) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/ui/sources/components/SourceTabs.kt b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceTabs.kt new file mode 100644 index 00000000..ff129de8 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/ui/sources/components/SourceTabs.kt @@ -0,0 +1,147 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.ui.sources.components + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material.MaterialTheme +import androidx.compose.material.ScrollableTabRow +import androidx.compose.material.Surface +import androidx.compose.material.Tab +import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Home +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import ca.gosyer.backend.models.Source + +@Composable +fun SourceTopBar( + openHome: () -> Unit, + sources: Map, + tabSelected: Source?, + onTabSelected: (Source?) -> Unit, + onTabClosed: (Source) -> Unit, + modifier: Modifier = Modifier +) { + Surface( + elevation = 2.dp, + color = MaterialTheme.colors.surface + ) { + SourceTabBar( + modifier = modifier, + onHomeClicked = openHome + ) { tabBarModifier -> + SourceTabs( + modifier = tabBarModifier, + sources = sources, + tabSelected = tabSelected, + onTabSelected = { newTab -> onTabSelected(newTab) }, + onTabClosed = onTabClosed + ) + } + } + +} + +@Composable +fun SourceTabBar( + modifier: Modifier = Modifier, + onHomeClicked: () -> Unit, + children: @Composable (Modifier) -> Unit +) { + Row(modifier) { + // Separate Row as the children shouldn't have the padding + Box(Modifier.padding(4.dp).align(Alignment.CenterVertically)) { + Image( + modifier = Modifier + .clickable(onClick = onHomeClicked), + imageVector = Icons.Filled.Home, + contentDescription = null, + colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface) + ) + } + children( + Modifier + .weight(1f) + .align(Alignment.CenterVertically) + ) + + } + +} + +@Composable +fun SourceTabs( + modifier: Modifier = Modifier, + sources: Map, + tabSelected: Source?, + onTabSelected: (Source?) -> Unit, + onTabClosed: (Source) -> Unit +) { + ScrollableTabRow( + selectedTabIndex = 1,//sources.indexOf(tabSelected).let { if (it == -1) 1 else it }, + modifier = modifier, + contentColor = MaterialTheme.colors.onSurface, + indicator = { + + }, + divider = { + + }, + backgroundColor = MaterialTheme.colors.surface + ) { + sources.forEach { (sourceId, source) -> + val selected = sourceId == tabSelected?.id + + var rowModifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp) + if (selected) { + rowModifier = + Modifier + .border(BorderStroke(2.dp, MaterialTheme.colors.onSurface), RectangleShape) + .then(rowModifier) + } + + Tab( + modifier = Modifier.background(MaterialTheme.colors.surface), + selected = selected, + onClick = { onTabSelected(source) } + ) { + Row(rowModifier, verticalAlignment = Alignment.CenterVertically) { + Text( + text = source?.name?.toUpperCase() ?: "Sources", + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + if (source != null) { + Image( + modifier = Modifier + .clickable { + onTabClosed(source) + }, + imageVector = Icons.Filled.Close, + contentDescription = null, + colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface) + ) + } + } + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/compose/Color.kt b/src/main/kotlin/ca/gosyer/util/compose/Color.kt new file mode 100644 index 00000000..f4ab2391 --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/compose/Color.kt @@ -0,0 +1,11 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.compose + +import androidx.compose.ui.graphics.Color + +val Long.color get() = Color(this) \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/compose/Image.kt b/src/main/kotlin/ca/gosyer/util/compose/Image.kt new file mode 100644 index 00000000..549fec2e --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/compose/Image.kt @@ -0,0 +1,24 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.compose + +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.graphics.asImageBitmap +import io.ktor.client.HttpClient +import io.ktor.client.request.get +import io.ktor.client.statement.HttpResponse +import io.ktor.client.statement.readBytes +import org.jetbrains.skija.Image +import java.io.File + +fun imageFromFile(file: File): ImageBitmap { + return Image.makeFromEncoded(file.readBytes()).asImageBitmap() +} + +suspend fun imageFromUrl(client: HttpClient, url: String): ImageBitmap { + return Image.makeFromEncoded(client.get(url).readBytes()).asImageBitmap() +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/compose/Theme.kt b/src/main/kotlin/ca/gosyer/util/compose/Theme.kt new file mode 100644 index 00000000..caa7106f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/compose/Theme.kt @@ -0,0 +1,38 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.compose + +import androidx.compose.desktop.DesktopMaterialTheme +import androidx.compose.desktop.Window +import androidx.compose.desktop.WindowEvents +import androidx.compose.runtime.Composable +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.window.MenuBar +import ca.gosyer.backend.preferences.PreferenceHelper +import ca.gosyer.util.system.get +import java.awt.image.BufferedImage + +fun ThemedWindow( + title: String = "JetpackDesktopWindow", + size: IntSize = IntSize(800, 600), + location: IntOffset = IntOffset.Zero, + centered: Boolean = true, + icon: BufferedImage? = null, + menuBar: MenuBar? = null, + undecorated: Boolean = false, + resizable: Boolean = true, + events: WindowEvents = WindowEvents(), + onDismissRequest: (() -> Unit)? = null, + content: @Composable () -> Unit = { } +) { + Window(title, size, location, centered, icon, menuBar, undecorated, resizable, events, onDismissRequest) { + DesktopMaterialTheme(get().getTheme()) { + content() + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/system/Flow.kt b/src/main/kotlin/ca/gosyer/util/system/Flow.kt new file mode 100644 index 00000000..3b228d8c --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/system/Flow.kt @@ -0,0 +1,30 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.system + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.drop +import kotlinx.coroutines.launch + +fun Flow.asStateFlow(defaultValue: T, scope: CoroutineScope, dropFirst: Boolean = false): StateFlow { + val flow = MutableStateFlow(defaultValue) + scope.launch { + if (dropFirst) { + drop(1) + } else { + this@asStateFlow + }.collect { + flow.value = it + } + } + return flow.asStateFlow() +} \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/system/Koin.kt b/src/main/kotlin/ca/gosyer/util/system/Koin.kt new file mode 100644 index 00000000..4d32ca5f --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/system/Koin.kt @@ -0,0 +1,13 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.system + +import org.koin.core.context.GlobalContext + +inline fun get() = GlobalContext.get().get() + +inline fun inject() = GlobalContext.get().inject() \ No newline at end of file diff --git a/src/main/kotlin/ca/gosyer/util/system/ProcessFile.kt b/src/main/kotlin/ca/gosyer/util/system/ProcessFile.kt new file mode 100644 index 00000000..4266cede --- /dev/null +++ b/src/main/kotlin/ca/gosyer/util/system/ProcessFile.kt @@ -0,0 +1,24 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package ca.gosyer.util.system + +import java.io.File + +fun processFile() { + val pidFile = ProcessHandle.current().pid() + val strTmp = System.getProperty("java.io.tmpdir") + val file = File("$strTmp/TachideskJUI.pid") + + //backup deletion + if (file.exists()) { + file.delete() + } + + file.writeText(pidFile.toString()) + + file.deleteOnExit() +} \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 00000000..47543e7b --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,38 @@ + + + + + + + + %highlight(%d{HH:mm:ss.SSS} [%thread] %level/%logger{0}: %msg%n) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/kotlin/ca/gosyer/backend/network/ExtensionInteractionTest.kt b/src/test/kotlin/ca/gosyer/backend/network/ExtensionInteractionTest.kt new file mode 100644 index 00000000..cf61a97f --- /dev/null +++ b/src/test/kotlin/ca/gosyer/backend/network/ExtensionInteractionTest.kt @@ -0,0 +1,12 @@ +package ca.gosyer.backend.network + +import kotlin.test.Test + +class ExtensionInteractionTest { + + + @Test + fun `Install a extension`() { + + } +} \ No newline at end of file