From c79cc16dabf68d20737f61ce53a9905d9c332c45 Mon Sep 17 00:00:00 2001 From: NightFish <101402767+dmzz-yyhyy@users.noreply.github.com> Date: Sat, 5 Oct 2024 00:16:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B9=A6=E6=9E=B6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E7=9B=B8=E5=85=B3=E7=B1=BB=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AE=B9=E9=A1=B5=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E4=B8=8B=E8=BE=B9=E8=B7=9D=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E7=AB=A0=E8=8A=82=E5=90=8D=E7=A7=B0=E7=9A=84?= =?UTF-8?q?=E7=AB=A0=E8=8A=82=E6=8C=87=E7=A4=BA=E5=99=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 +- .../data/UserDataRepository.kt | 5 +- .../data/bookshelf/BookshelfRepository.kt | 90 +++++++++- .../data/bookshelf/BookshelfSortType.kt | 5 +- .../data/json/AppUserDataJson.kt | 104 ++++++++++++ .../data/json/BookShelfBookMetadataData.kt | 20 +++ .../data/json/BookUserData.kt | 22 +++ .../data/json/BookshelfData.kt | 34 ++++ .../data/json/BookshelfSortTypeTypeAdapter.kt | 16 ++ .../data/json/LocalTimeDataTypeAdapter.kt | 16 ++ .../data/json/UserDataData.kt | 8 + .../data/local/room/dao/BookshelfDao.kt | 8 +- .../data/update/UpdateCheckRepository.kt | 15 +- .../data/web/wenku8/Wenku8Api.kt | 2 +- .../data/work/ImportDataWork.kt | 44 +++++ .../data/work/SaveBookshelfWork.kt | 44 +++++ .../ui/LightNovelReaderApp.kt | 25 +-- .../lightnovelreader/ui/book/BookScreen.kt | 4 +- .../ui/book/content/ContentScreen.kt | 122 ++++++++++---- .../ui/book/detail/DetailScreen.kt | 45 ++++- .../ui/home/bookshelf/BookShelfScreen.kt | 10 +- .../bookshelf/home/BookshelfHomeScreen.kt | 151 ++++++++++++++++- .../bookshelf/home/BookshelfHomeUiState.kt | 6 +- .../bookshelf/home/BookshelfHomeViewModel.kt | 129 ++++++++++----- .../ui/home/exploration/Exploration.kt | 38 +++-- .../search/ExplorationSearchScreen.kt | 5 +- .../lightnovelreader/BookshelfSortType.kt | 9 + .../dmzz_yyhyy/lightnovelreader/GsonTest.kt | 154 ++++++++++++++++++ 28 files changed, 982 insertions(+), 153 deletions(-) create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/AppUserDataJson.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/BookShelfBookMetadataData.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/BookUserData.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/BookshelfData.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/BookshelfSortTypeTypeAdapter.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/LocalTimeDataTypeAdapter.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/json/UserDataData.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/work/ImportDataWork.kt create mode 100644 app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/work/SaveBookshelfWork.kt create mode 100644 app/src/test/java/indi/dmzz_yyhyy/lightnovelreader/BookshelfSortType.kt create mode 100644 app/src/test/java/indi/dmzz_yyhyy/lightnovelreader/GsonTest.kt diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b43f4c0..8a6d3e7 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@