From 077b63c45a97ffd720be3c17baa4d68a2aeabe2e Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Tue, 28 Oct 2025 18:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=90=8D=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=B9=A6=E6=BA=90?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- English.md | 2 +- api.md | 26 +-- app/build.gradle | 2 +- app/proguard-rules.pro | 4 +- .../1.json | 0 .../10.json | 0 .../11.json | 0 .../12.json | 0 .../13.json | 0 .../14.json | 0 .../15.json | 0 .../16.json | 0 .../17.json | 0 .../18.json | 0 .../19.json | 0 .../2.json | 0 .../20.json | 0 .../21.json | 0 .../22.json | 0 .../23.json | 0 .../24.json | 0 .../25.json | 0 .../26.json | 0 .../27.json | 0 .../28.json | 0 .../29.json | 0 .../3.json | 0 .../30.json | 0 .../31.json | 0 .../32.json | 0 .../33.json | 0 .../34.json | 0 .../35.json | 0 .../36.json | 0 .../37.json | 0 .../38.json | 0 .../39.json | 0 .../4.json | 0 .../40.json | 0 .../41.json | 0 .../42.json | 0 .../43.json | 0 .../44.json | 0 .../45.json | 0 .../46.json | 0 .../47.json | 0 .../48.json | 0 .../49.json | 0 .../5.json | 0 .../50.json | 0 .../51.json | 0 .../52.json | 0 .../53.json | 0 .../54.json | 0 .../55.json | 0 .../56.json | 0 .../57.json | 0 .../58.json | 0 .../59.json | 0 .../6.json | 0 .../60.json | 0 .../61.json | 0 .../62.json | 0 .../63.json | 0 .../64.json | 0 .../65.json | 0 .../66.json | 0 .../67.json | 0 .../68.json | 0 .../69.json | 0 .../7.json | 0 .../70.json | 0 .../71.json | 0 .../72.json | 0 .../73.json | 0 .../74.json | 0 .../75.json | 0 .../76.json | 0 .../77.json | 0 .../8.json | 0 .../9.json | 0 .../kazusa => legado/app}/AndroidJsTest.kt | 2 +- .../app}/ExampleInstrumentedTest.kt | 2 +- .../{legato/kazusa => legado/app}/HttpTest.kt | 6 +- .../kazusa => legado/app}/HttpTtsTest.kt | 6 +- .../kazusa => legado/app}/MigrationTest.kt | 4 +- .../kazusa => legado/app}/UpdateTest.kt | 10 +- app/src/main/AndroidManifest.xml | 6 +- .../io/{legato/kazusa => legado/app}/App.kt | 80 +++---- .../{legato/kazusa => legado/app}/README.md | 0 .../app}/api/ReaderProvider.kt | 8 +- .../kazusa => legado/app}/api/ReturnData.kt | 2 +- .../kazusa => legado/app}/api/ShortCuts.kt | 10 +- .../app}/api/controller/BookController.kt | 46 ++-- .../api/controller/BookSourceController.kt | 16 +- .../api/controller/ReplaceRuleController.kt | 16 +- .../api/controller/RssSourceController.kt | 16 +- .../app}/base/AppContextWrapper.kt | 11 +- .../app}/base/BaseActivity.kt | 42 ++-- .../base/BaseBottomSheetDialogFragment.kt | 10 +- .../app}/base/BaseDialogFragment.kt | 10 +- .../app}/base/BaseFragment.kt | 5 +- .../app}/base/BasePrefDialogFragment.kt | 4 +- .../kazusa => legado/app}/base/BaseService.kt | 16 +- .../app}/base/BaseViewModel.kt | 6 +- .../kazusa => legado/app}/base/README.md | 0 .../app}/base/VMBaseActivity.kt | 4 +- .../app}/base/VMBaseFragment.kt | 2 +- .../app}/base/adapter/DiffRecyclerAdapter.kt | 2 +- .../app}/base/adapter/ItemAnimation.kt | 4 +- .../app}/base/adapter/ItemViewHolder.kt | 2 +- .../app}/base/adapter/RecyclerAdapter.kt | 8 +- .../adapter/animations/AlphaInAnimation.kt | 2 +- .../base/adapter/animations/BaseAnimation.kt | 2 +- .../adapter/animations/ScaleInAnimation.kt | 2 +- .../animations/SlideInBottomAnimation.kt | 2 +- .../animations/SlideInLeftAnimation.kt | 2 +- .../animations/SlideInRightAnimation.kt | 2 +- .../app}/constant/AppConst.kt | 6 +- .../kazusa => legado/app}/constant/AppLog.kt | 10 +- .../app}/constant/AppPattern.kt | 2 +- .../app}/constant/BookSourceType.kt | 2 +- .../app}/constant/BookType.kt | 2 +- .../app}/constant/EventBus.kt | 2 +- .../app}/constant/IntentAction.kt | 2 +- .../app}/constant/NotificationId.kt | 2 +- .../app}/constant/PageAnim.kt | 2 +- .../app}/constant/PreferKey.kt | 2 +- .../app}/constant/SourceType.kt | 2 +- .../kazusa => legado/app}/constant/Status.kt | 2 +- .../kazusa => legado/app}/constant/Theme.kt | 2 +- .../kazusa => legado/app}/data/AppDatabase.kt | 90 ++++---- .../app}/data/DatabaseMigrations.kt | 8 +- .../kazusa => legado/app}/data/README.md | 0 .../app}/data/dao/BookChapterDao.kt | 4 +- .../kazusa => legado/app}/data/dao/BookDao.kt | 12 +- .../app}/data/dao/BookGroupDao.kt | 6 +- .../app}/data/dao/BookSourceDao.kt | 12 +- .../app}/data/dao/BookmarkDao.kt | 4 +- .../app}/data/dao/CacheDao.kt | 4 +- .../app}/data/dao/CookieDao.kt | 4 +- .../app}/data/dao/DictRuleDao.kt | 4 +- .../app}/data/dao/HttpTTSDao.kt | 4 +- .../app}/data/dao/KeyboardAssistsDao.kt | 4 +- .../app}/data/dao/ReadRecordDao.kt | 6 +- .../app}/data/dao/ReplaceRuleDao.kt | 10 +- .../app}/data/dao/RssArticleDao.kt | 4 +- .../app}/data/dao/RssReadRecordDao.kt | 4 +- .../app}/data/dao/RssSourceDao.kt | 10 +- .../app}/data/dao/RssStarDao.kt | 4 +- .../app}/data/dao/RuleSubDao.kt | 4 +- .../app}/data/dao/SearchBookDao.kt | 4 +- .../app}/data/dao/SearchKeywordDao.kt | 4 +- .../app}/data/dao/ServerDao.kt | 4 +- .../app}/data/dao/TxtTocRuleDao.kt | 4 +- .../app}/data/entities/BaseBook.kt | 10 +- .../app}/data/entities/BaseRssArticle.kt | 8 +- .../app}/data/entities/BaseSource.kt | 32 +-- .../app}/data/entities/Book.kt | 32 +-- .../app}/data/entities/BookChapter.kt | 32 +-- .../app}/data/entities/BookChapterReview.kt | 2 +- .../app}/data/entities/BookGroup.kt | 6 +- .../app}/data/entities/BookProgress.kt | 2 +- .../app}/data/entities/BookSource.kt | 24 +- .../app}/data/entities/BookSourcePart.kt | 8 +- .../app}/data/entities/Bookmark.kt | 2 +- .../app}/data/entities/Cache.kt | 2 +- .../app}/data/entities/Cookie.kt | 2 +- .../app}/data/entities/DictRule.kt | 8 +- .../app}/data/entities/HttpTTS.kt | 10 +- .../app}/data/entities/KeyboardAssist.kt | 2 +- .../app}/data/entities/ReadRecord.kt | 2 +- .../app}/data/entities/ReadRecordShow.kt | 2 +- .../app}/data/entities/ReplaceRule.kt | 8 +- .../app}/data/entities/RssArticle.kt | 6 +- .../app}/data/entities/RssReadRecord.kt | 2 +- .../app}/data/entities/RssSource.kt | 6 +- .../app}/data/entities/RssStar.kt | 6 +- .../app}/data/entities/RuleSub.kt | 2 +- .../app}/data/entities/SearchBook.kt | 10 +- .../app}/data/entities/SearchKeyword.kt | 2 +- .../app}/data/entities/Server.kt | 6 +- .../app}/data/entities/TxtTocRule.kt | 2 +- .../app}/data/entities/rule/BookInfoRule.kt | 4 +- .../app}/data/entities/rule/BookListRule.kt | 2 +- .../app}/data/entities/rule/ContentRule.kt | 4 +- .../app}/data/entities/rule/ExploreKind.kt | 2 +- .../app}/data/entities/rule/ExploreRule.kt | 4 +- .../app}/data/entities/rule/FlexChildStyle.kt | 2 +- .../app}/data/entities/rule/ReviewRule.kt | 4 +- .../app}/data/entities/rule/RowUi.kt | 2 +- .../app}/data/entities/rule/SearchRule.kt | 4 +- .../app}/data/entities/rule/TocRule.kt | 4 +- .../app}/exception/ConcurrentException.kt | 2 +- .../app}/exception/ContentEmptyException.kt | 2 +- .../app}/exception/EmptyFileException.kt | 2 +- .../exception/InvalidBooksDirException.kt | 2 +- .../app}/exception/NoBooksDirException.kt | 4 +- .../app}/exception/NoStackTraceException.kt | 2 +- .../app}/exception/RegexTimeoutException.kt | 2 +- .../app}/exception/TocEmptyException.kt | 2 +- .../app}/help/AppFreezeMonitor.kt | 6 +- .../kazusa => legado/app}/help/AppWebDav.kt | 52 ++--- .../app}/help/CacheManager.kt | 12 +- .../app}/help/ConcurrentRateLimiter.kt | 8 +- .../app}/help/CrashHandler.kt | 32 +-- .../kazusa => legado/app}/help/DefaultData.kt | 34 +-- .../app}/help/DirectLinkUpload.kt | 26 +-- .../app}/help/EventMessage.kt | 2 +- .../app}/help/ExecutorService.kt | 2 +- .../kazusa => legado/app}/help/IntentData.kt | 2 +- .../kazusa => legado/app}/help/IntentHelp.kt | 6 +- .../app}/help/JsEncodeUtils.kt | 10 +- .../app}/help/JsExtensions.kt | 84 +++---- .../app}/help/LauncherIconHelp.kt | 6 +- .../app}/help/LayoutManager.kt | 2 +- .../app}/help/LifecycleHelp.kt | 6 +- .../kazusa => legado/app}/help/MediaHelp.kt | 4 +- .../kazusa => legado/app}/help/PaintPool.kt | 4 +- .../kazusa => legado/app}/help/README.md | 0 .../app}/help/ReplaceAnalyzer.kt | 8 +- .../app}/help/RuleBigDataHelp.kt | 12 +- .../app}/help/RuleComplete.kt | 2 +- .../{legato/kazusa => legado/app}/help/TTS.kt | 12 +- .../app}/help/book/BookContent.kt | 4 +- .../app}/help/book/BookExtensions.kt | 42 ++-- .../app}/help/book/BookHelp.kt | 52 ++--- .../app}/help/book/ContentHelp.kt | 2 +- .../app}/help/book/ContentProcessor.kt | 30 +-- .../app}/help/config/AppConfig.kt | 36 +-- .../app}/help/config/LocalConfig.kt | 12 +- .../app}/help/config/ReadBookConfig.kt | 47 ++-- .../app}/help/config/ReadTipConfig.kt | 4 +- .../app}/help/config/SourceConfig.kt | 2 +- .../app}/help/config/ThemeConfig.kt | 42 ++-- .../help/coroutine/ActivelyCancelException.kt | 2 +- .../app}/help/coroutine/CompositeCoroutine.kt | 2 +- .../app}/help/coroutine/Coroutine.kt | 4 +- .../app}/help/coroutine/CoroutineContainer.kt | 2 +- .../app}/help/crypto/AsymmetricCrypto.kt | 4 +- .../app}/help/crypto/README.md | 0 .../kazusa => legado/app}/help/crypto/Sign.kt | 2 +- .../help/crypto/SymmetricCryptoAndroid.kt | 6 +- .../app}/help/exoplayer/ExoPlayerHelper.kt | 8 +- .../help/exoplayer/InputStreamDataSource.kt | 2 +- .../app}/help/glide/AsyncRecycleBitmapPool.kt | 4 +- .../app}/help/glide/BlurTransformation.kt | 4 +- .../app}/help/glide/FilePathLoader.kt | 2 +- .../app}/help/glide/GlideHeaders.kt | 2 +- .../app}/help/glide/ImageLoader.kt | 10 +- .../app}/help/glide/LegadoDataUrlLoader.kt | 10 +- .../app}/help/glide/LegadoGlideModule.kt | 6 +- .../help/glide/OkHttpModeLoaderFactory.kt | 2 +- .../app}/help/glide/OkHttpModelLoader.kt | 2 +- .../app}/help/glide/OkHttpStreamFetcher.kt | 24 +- .../help/glide/progress/OnProgressListener.kt | 2 +- .../help/glide/progress/ProgressManager.kt | 4 +- .../glide/progress/ProgressResponseBody.kt | 2 +- .../app}/help/http/BackstageWebView.kt | 12 +- .../app}/help/http/CookieManager.kt | 12 +- .../app}/help/http/CookieStore.kt | 24 +- .../kazusa => legado/app}/help/http/Cronet.kt | 6 +- .../app}/help/http/DecompressInterceptor.kt | 2 +- .../app}/help/http/HttpHelper.kt | 18 +- .../app}/help/http/ObsoleteUrlFactory.kt | 6 +- .../help/http/OkHttpExceptionInterceptor.kt | 2 +- .../app}/help/http/OkHttpUtils.kt | 8 +- .../http/OkhttpUncaughtExceptionHandler.kt | 4 +- .../app}/help/http/RequestMethod.kt | 2 +- .../app}/help/http/SSLHelper.kt | 4 +- .../app}/help/http/StrResponse.kt | 2 +- .../help/http/api/CookieManagerInterface.kt | 2 +- .../app}/help/rhino/NativeBaseSource.kt | 2 +- .../app}/help/source/BaseSourceExtensions.kt | 12 +- .../app}/help/source/BookSourceExtensions.kt | 24 +- .../app}/help/source/RssSourceExtensions.kt | 10 +- .../app}/help/source/SourceHelp.kt | 34 +-- .../help/source/SourceVerificationHelp.kt | 20 +- .../app}/help/storage/Backup.kt | 28 +-- .../app}/help/storage/BackupAES.kt | 6 +- .../app}/help/storage/BackupConfig.kt | 12 +- .../app}/help/storage/ImportOldData.kt | 24 +- .../app}/help/storage/Restore.kt | 90 ++++---- .../app}/help/update/AppReleaseInfo.kt | 4 +- .../app}/help/update/AppUpdate.kt | 4 +- .../app}/help/update/AppUpdateGitHub.kt | 22 +- .../kazusa => legado/app}/lib/README.md | 0 .../app}/lib/aliyun/ALiYun.kt | 2 +- .../app}/lib/cronet/AbsCallBack.kt | 16 +- .../app}/lib/cronet/BodyUploadProvider.kt | 2 +- .../app}/lib/cronet/CallbackResult.kt | 2 +- .../app}/lib/cronet/CallbackStep.kt | 2 +- .../lib/cronet/CronetCoroutineInterceptor.kt | 4 +- .../app}/lib/cronet/CronetHelper.kt | 14 +- .../app}/lib/cronet/CronetInterceptor.kt | 8 +- .../app}/lib/cronet/CronetLoader.kt | 12 +- .../lib/cronet/LargeBodyUploadProvider.kt | 2 +- .../app}/lib/cronet/NewCallBack.kt | 2 +- .../app}/lib/cronet/OldCallback.kt | 2 +- .../app}/lib/dialogs/AlertBuilder.kt | 4 +- .../app}/lib/dialogs/AndroidAlertBuilder.kt | 6 +- .../app}/lib/dialogs/AndroidDialogs.kt | 2 +- .../app}/lib/dialogs/AndroidSelectors.kt | 2 +- .../app}/lib/dialogs/SelectItem.kt | 2 +- .../app}/lib/icu4j/CharsetDetector.java | 2 +- .../app}/lib/icu4j/CharsetMatch.java | 2 +- .../app}/lib/icu4j/CharsetRecog_2022.java | 2 +- .../app}/lib/icu4j/CharsetRecog_UTF8.java | 2 +- .../app}/lib/icu4j/CharsetRecog_Unicode.java | 2 +- .../app}/lib/icu4j/CharsetRecog_mbcs.java | 2 +- .../app}/lib/icu4j/CharsetRecog_sbcs.java | 2 +- .../app}/lib/icu4j/CharsetRecognizer.java | 2 +- .../kazusa => legado/app}/lib/mobi/KF6Book.kt | 10 +- .../kazusa => legado/app}/lib/mobi/KF8Book.kt | 24 +- .../app}/lib/mobi/MobiBook.kt | 42 ++-- .../app}/lib/mobi/MobiReader.kt | 20 +- .../kazusa => legado/app}/lib/mobi/PDBFile.kt | 8 +- .../app}/lib/mobi/decompress/CDICData.kt | 2 +- .../app}/lib/mobi/decompress/Decompressor.kt | 2 +- .../mobi/decompress/HuffcdicDecompressor.kt | 14 +- .../lib/mobi/decompress/Lz77Decompressor.kt | 2 +- .../lib/mobi/decompress/PlainDecompressor.kt | 2 +- .../app}/lib/mobi/entities/ExthRecordType.kt | 2 +- .../app}/lib/mobi/entities/FdstHeader.kt | 2 +- .../app}/lib/mobi/entities/Fragment.kt | 2 +- .../app}/lib/mobi/entities/IndexData.kt | 2 +- .../app}/lib/mobi/entities/IndexEntry.kt | 2 +- .../app}/lib/mobi/entities/IndexTag.kt | 2 +- .../app}/lib/mobi/entities/IndxHeader.kt | 2 +- .../app}/lib/mobi/entities/KF6Section.kt | 2 +- .../app}/lib/mobi/entities/KF8Header.kt | 2 +- .../app}/lib/mobi/entities/KF8Pos.kt | 2 +- .../app}/lib/mobi/entities/KF8Resource.kt | 2 +- .../app}/lib/mobi/entities/KF8Section.kt | 2 +- .../lib/mobi/entities/MobiEntryHeaders.kt | 2 +- .../app}/lib/mobi/entities/MobiHeader.kt | 2 +- .../app}/lib/mobi/entities/MobiMetadata.kt | 2 +- .../app}/lib/mobi/entities/NCX.kt | 2 +- .../app}/lib/mobi/entities/PalmDocHeader.kt | 2 +- .../app}/lib/mobi/entities/Ptagx.kt | 2 +- .../app}/lib/mobi/entities/Skeleton.kt | 2 +- .../app}/lib/mobi/entities/TOC.kt | 2 +- .../app}/lib/mobi/entities/TagxHeader.kt | 2 +- .../app}/lib/mobi/entities/TagxTag.kt | 2 +- .../app}/lib/mobi/utils/BitwiseExtensions.kt | 2 +- .../lib/mobi/utils/ByteBufferExtensions.kt | 2 +- .../app}/lib/permission/OnErrorCallback.kt | 2 +- .../permission/OnPermissionsDeniedCallback.kt | 2 +- .../OnPermissionsGrantedCallback.kt | 2 +- .../permission/OnPermissionsResultCallback.kt | 2 +- .../OnRequestPermissionsResultCallback.kt | 2 +- .../app}/lib/permission/PermissionActivity.kt | 12 +- .../app}/lib/permission/Permissions.kt | 2 +- .../app}/lib/permission/PermissionsCompat.kt | 2 +- .../app}/lib/permission/Request.kt | 4 +- .../app}/lib/permission/RequestManager.kt | 2 +- .../app}/lib/permission/RequestPlugins.kt | 2 +- .../app}/lib/prefs/ColorPreference.kt | 10 +- .../app}/lib/prefs/EditTextPreference.kt | 4 +- .../lib/prefs/EditTextPreferenceDialog.kt | 6 +- .../app}/lib/prefs/IconListPreference.kt | 20 +- .../app}/lib/prefs/ImagePreviewPreference.kt | 4 +- .../app}/lib/prefs/ListPreferenceDialog.kt | 8 +- .../prefs/MultiSelectListPreferenceDialog.kt | 8 +- .../app}/lib/prefs/NameListPreference.kt | 4 +- .../app}/lib/prefs/Preference.kt | 4 +- .../app}/lib/prefs/PreferenceCategory.kt | 6 +- .../app}/lib/prefs/SwitchPreference.kt | 4 +- .../app}/lib/prefs/ThemeCardPreference.kt | 18 +- .../app}/lib/prefs/ThemeModePreference.kt | 6 +- .../app}/lib/prefs/TipPreference.kt | 4 +- .../lib/prefs/fragment/PreferenceFragment.kt | 10 +- .../app}/lib/theme/MaterialValueHelper.kt | 2 +- .../app}/lib/theme/Selector.kt | 2 +- .../io/legado/app/lib/theme/ThemeModel.kt | 3 + .../app}/lib/theme/ThemeStore.kt | 4 +- .../app}/lib/theme/ThemeStoreInterface.kt | 2 +- .../app}/lib/theme/ThemeStorePrefKeys.kt | 2 +- .../app}/lib/theme/ThemeUtils.kt | 2 +- .../app}/lib/theme/TintHelper.kt | 6 +- .../app}/lib/theme/ViewUtils.kt | 4 +- .../theme/view/ThemeBottomNavigationVIew.kt | 9 +- .../app}/lib/theme/view/ThemeCheckBox.kt | 2 +- .../app}/lib/theme/view/ThemeEditText.kt | 2 +- .../app}/lib/theme/view/ThemeProgressBar.kt | 2 +- .../app}/lib/theme/view/ThemeRadioButton.kt | 2 +- .../app}/lib/theme/view/ThemeRadioNoButton.kt | 4 +- .../app}/lib/theme/view/ThemeSlider.kt | 5 +- .../app}/lib/theme/view/ThemeSwitch.kt | 2 +- .../app}/lib/webdav/Authorization.kt | 6 +- .../app}/lib/webdav/WebDav.kt | 26 +-- .../app}/lib/webdav/WebDavException.kt | 2 +- .../app}/lib/webdav/WebDavFile.kt | 2 +- .../kazusa => legado/app}/model/AudioPlay.kt | 42 ++-- .../kazusa => legado/app}/model/BookCover.kt | 38 ++-- .../kazusa => legado/app}/model/CacheBook.kt | 34 +-- .../app}/model/CheckSource.kt | 16 +- .../kazusa => legado/app}/model/Debug.kt | 24 +- .../kazusa => legado/app}/model/Download.kt | 8 +- .../app}/model/ImageProvider.kt | 36 +-- .../kazusa => legado/app}/model/README.md | 0 .../kazusa => legado/app}/model/ReadAloud.kt | 30 +-- .../kazusa => legado/app}/model/ReadBook.kt | 68 +++--- .../kazusa => legado/app}/model/ReadManga.kt | 54 ++--- .../app}/model/SharedJsScope.kt | 18 +- .../model/analyzeRule/AnalyzeByJSonPath.kt | 4 +- .../app}/model/analyzeRule/AnalyzeByJSoup.kt | 2 +- .../app}/model/analyzeRule/AnalyzeByRegex.kt | 2 +- .../app}/model/analyzeRule/AnalyzeByXPath.kt | 2 +- .../app}/model/analyzeRule/AnalyzeRule.kt | 50 ++--- .../app}/model/analyzeRule/AnalyzeUrl.kt | 80 +++---- .../app}/model/analyzeRule/CustomUrl.kt | 6 +- .../app}/model/analyzeRule/QueryTTF.java | 2 +- .../app}/model/analyzeRule/RuleAnalyzer.kt | 2 +- .../app}/model/analyzeRule/RuleData.kt | 4 +- .../model/analyzeRule/RuleDataInterface.kt | 2 +- .../model/localBook/BaseLocalBookParse.kt | 6 +- .../app}/model/localBook/EpubFile.kt | 20 +- .../app}/model/localBook/LocalBook.kt | 90 ++++---- .../app}/model/localBook/MobiFile.kt | 26 +-- .../app}/model/localBook/PdfFile.kt | 20 +- .../app}/model/localBook/README.md | 0 .../app}/model/localBook/TextFile.kt | 26 +-- .../app}/model/localBook/UmdFile.kt | 12 +- .../app}/model/remote/RemoteBook.kt | 6 +- .../app}/model/remote/RemoteBookManager.kt | 4 +- .../app}/model/remote/RemoteBookWebDav.kt | 30 +-- .../kazusa => legado/app}/model/rss/Rss.kt | 22 +- .../app}/model/rss/RssParserByRule.kt | 22 +- .../app}/model/rss/RssParserDefault.kt | 6 +- .../app}/model/webBook/BookChapterList.kt | 38 ++-- .../app}/model/webBook/BookContent.kt | 42 ++-- .../app}/model/webBook/BookInfo.kt | 28 +-- .../app}/model/webBook/BookList.kt | 46 ++-- .../app}/model/webBook/SearchModel.kt | 24 +- .../app}/model/webBook/WebBook.kt | 36 +-- .../app}/receiver/MediaButtonReceiver.kt | 30 +-- .../app}/receiver/NetworkChangedListener.kt | 2 +- .../app}/receiver/SharedReceiverActivity.kt | 8 +- .../app}/receiver/TimeBatteryReceiver.kt | 6 +- .../app}/service/AudioPlayService.kt | 50 ++--- .../app}/service/BaseReadAloudService.kt | 58 ++--- .../app}/service/CacheBookService.kt | 34 +-- .../app}/service/CheckSourceService.kt | 52 ++--- .../app}/service/DownloadService.kt | 22 +- .../app}/service/ExportBookService.kt | 80 +++---- .../app}/service/HttpReadAloudService.kt | 36 +-- .../kazusa => legado/app}/service/README.md | 0 .../app}/service/TTSReadAloudService.kt | 34 +-- .../app}/service/WebService.kt | 44 ++-- .../app}/service/WebTileService.kt | 8 +- .../kazusa => legado/app}/ui/README.md | 0 .../app}/ui/about/AboutActivity.kt | 55 +++-- .../app}/ui/about/AppLogDialog.kt | 25 +-- .../app}/ui/about/CrashLogsDialog.kt | 40 ++-- .../app}/ui/about/ReadRecordActivity.kt | 40 ++-- .../app}/ui/about/UpdateDialog.kt | 24 +- .../ui/association/AddToBookshelfDialog.kt | 40 ++-- .../association/BaseAssociationViewModel.kt | 10 +- .../ui/association/FileAssociationActivity.kt | 50 ++--- .../association/FileAssociationViewModel.kt | 14 +- .../ui/association/ImportBookSourceDialog.kt | 34 +-- .../association/ImportBookSourceViewModel.kt | 50 ++--- .../ui/association/ImportDictRuleDialog.kt | 24 +- .../ui/association/ImportDictRuleViewModel.kt | 36 +-- .../ui/association/ImportHttpTtsDialog.kt | 32 +-- .../ui/association/ImportHttpTtsViewModel.kt | 30 +-- .../ui/association/ImportReplaceRuleDialog.kt | 32 +-- .../association/ImportReplaceRuleViewModel.kt | 34 +-- .../ui/association/ImportRssSourceDialog.kt | 34 +-- .../association/ImportRssSourceViewModel.kt | 44 ++-- .../app}/ui/association/ImportThemeDialog.kt | 32 +-- .../ui/association/ImportThemeViewModel.kt | 24 +- .../ui/association/ImportTxtTocRuleDialog.kt | 32 +-- .../association/ImportTxtTocRuleViewModel.kt | 36 +-- .../ui/association/OnLineImportActivity.kt | 14 +- .../ui/association/OnLineImportViewModel.kt | 20 +- .../ui/association/OpenUrlConfirmActivity.kt | 12 +- .../ui/association/OpenUrlConfirmDialog.kt | 19 +- .../ui/association/OpenUrlConfirmViewModel.kt | 8 +- .../association/VerificationCodeActivity.kt | 12 +- .../ui/association/VerificationCodeDialog.kt | 27 ++- .../association/VerificationCodeViewModel.kt | 8 +- .../app}/ui/book/audio/AudioPlayActivity.kt | 77 ++++--- .../app}/ui/book/audio/AudioPlayViewModel.kt | 34 +-- .../ui/book/bookmark/AllBookmarkActivity.kt | 22 +- .../ui/book/bookmark/AllBookmarkViewModel.kt | 20 +- .../app}/ui/book/bookmark/BookmarkAdapter.kt | 12 +- .../ui/book/bookmark/BookmarkDecoration.kt | 6 +- .../app}/ui/book/bookmark/BookmarkDialog.kt | 18 +- .../app}/ui/book/cache/CacheActivity.kt | 84 +++---- .../app}/ui/book/cache/CacheAdapter.kt | 20 +- .../app}/ui/book/cache/CacheViewModel.kt | 16 +- .../ui/book/changecover/ChangeCoverDialog.kt | 10 +- .../book/changecover/ChangeCoverViewModel.kt | 24 +- .../app}/ui/book/changecover/CoverAdapter.kt | 10 +- .../changesource/ChangeBookSourceAdapter.kt | 24 +- .../changesource/ChangeBookSourceDialog.kt | 59 +++-- .../changesource/ChangeBookSourceViewModel.kt | 52 ++--- .../ChangeChapterSourceAdapter.kt | 20 +- .../changesource/ChangeChapterSourceDialog.kt | 58 ++--- .../ChangeChapterSourceViewModel.kt | 12 +- .../changesource/ChangeChapterTocAdapter.kt | 22 +- .../ui/book/explore/ExploreShowActivity.kt | 25 +-- .../ui/book/explore/ExploreShowAdapter.kt | 24 +- .../ui/book/explore/ExploreShowViewModel.kt | 22 +- .../app}/ui/book/group/GroupEditDialog.kt | 32 +-- .../app}/ui/book/group/GroupManageDialog.kt | 34 ++- .../app}/ui/book/group/GroupSelectDialog.kt | 27 ++- .../app}/ui/book/group/GroupViewModel.kt | 8 +- .../ui/book/import/BaseImportBookActivity.kt | 38 ++-- .../app}/ui/book/import/local/ImportBook.kt | 6 +- .../book/import/local/ImportBookActivity.kt | 40 ++-- .../ui/book/import/local/ImportBookAdapter.kt | 22 +- .../book/import/local/ImportBookViewModel.kt | 28 +-- .../book/import/remote/RemoteBookActivity.kt | 30 +-- .../book/import/remote/RemoteBookAdapter.kt | 22 +- .../ui/book/import/remote/RemoteBookSort.kt | 2 +- .../book/import/remote/RemoteBookViewModel.kt | 30 +-- .../book/import/remote/ServerConfigDialog.kt | 21 +- .../import/remote/ServerConfigViewModel.kt | 10 +- .../ui/book/import/remote/ServersDialog.kt | 38 ++-- .../ui/book/import/remote/ServersViewModel.kt | 8 +- .../app}/ui/book/info/BookInfoActivity.kt | 118 +++++----- .../app}/ui/book/info/BookInfoViewModel.kt | 75 +++---- .../ui/book/info/edit/BookInfoEditActivity.kt | 48 ++-- .../book/info/edit/BookInfoEditViewModel.kt | 12 +- .../app}/ui/book/manage/BookAdapter.kt | 22 +- .../ui/book/manage/BookshelfManageActivity.kt | 68 +++--- .../book/manage/BookshelfManageViewModel.kt | 40 ++-- .../app}/ui/book/manage/SourcePickerDialog.kt | 33 ++- .../app}/ui/book/manga/ReadMangaActivity.kt | 110 ++++----- .../app}/ui/book/manga/ReadMangaViewModel.kt | 54 ++--- .../book/manga/config/MangaAutoReadDialog.kt | 12 +- .../config/MangaClickActionConfigDialog.kt | 20 +- .../manga/config/MangaColorFilterConfig.kt | 4 +- .../manga/config/MangaColorFilterDialog.kt | 20 +- .../manga/config/MangaFooterSettingDialog.kt | 26 +-- .../ui/book/manga/config/MangaScrollMode.kt | 2 +- .../ui/book/manga/entities/BaseMangaPage.kt | 2 +- .../manga/entities/EpaperTransformation.kt | 2 +- .../manga/entities/GrayscaleTransformation.kt | 2 +- .../ui/book/manga/entities/MangaChapter.kt | 4 +- .../ui/book/manga/entities/MangaContent.kt | 2 +- .../book/manga/entities/MangaFooterConfig.kt | 4 +- .../app}/ui/book/manga/entities/MangaPage.kt | 2 +- .../ui/book/manga/entities/ReaderLoading.kt | 2 +- .../GestureDetectorWithLongTap.kt | 2 +- .../book/manga/recyclerview/MangaAdapter.kt | 28 +-- .../manga/recyclerview/MangaLayoutManager.kt | 2 +- .../ui/book/manga/recyclerview/MangaVH.kt | 10 +- .../ui/book/manga/recyclerview/ScrollTimer.kt | 2 +- .../book/manga/recyclerview/WebtoonFrame.kt | 6 +- .../manga/recyclerview/WebtoonRecyclerView.kt | 4 +- .../app}/ui/book/read/BaseReadBookActivity.kt | 66 +++--- .../app}/ui/book/read/ContentEditDialog.kt | 40 ++-- .../ui/book/read/EffectiveReplacesDialog.kt | 28 +-- .../app}/ui/book/read/MangaMenu.kt | 40 ++-- .../app}/ui/book/read/ReadBookActivity.kt | 212 +++++++++--------- .../app}/ui/book/read/ReadBookViewModel.kt | 66 +++--- .../app}/ui/book/read/ReadMenu.kt | 57 +++-- .../app}/ui/book/read/SearchMenu.kt | 20 +- .../app}/ui/book/read/TextActionMenu.kt | 34 +-- .../ui/book/read/config/AutoReadDialog.kt | 22 +- .../app}/ui/book/read/config/BgAdapter.kt | 16 +- .../ui/book/read/config/BgTextConfigDialog.kt | 86 +++---- .../read/config/ClickActionConfigDialog.kt | 22 +- .../ui/book/read/config/FontSelectDialog.kt | 68 +++--- .../ui/book/read/config/HttpTtsEditDialog.kt | 40 ++-- .../book/read/config/HttpTtsEditViewModel.kt | 20 +- .../ui/book/read/config/MoreConfigDialog.kt | 30 +-- .../book/read/config/PaddingConfigDialog.kt | 18 +- .../app}/ui/book/read/config/PageKeyDialog.kt | 14 +- .../book/read/config/ReadAloudConfigDialog.kt | 36 +-- .../ui/book/read/config/ReadAloudDialog.kt | 32 +-- .../ui/book/read/config/ReadStyleDialog.kt | 38 ++-- .../ui/book/read/config/SpeakEngineDialog.kt | 66 +++--- .../book/read/config/SpeakEngineViewModel.kt | 20 +- .../ui/book/read/config/TipConfigDialog.kt | 24 +- .../read/config/ToolButtonConfigDialog.kt | 14 +- .../app}/ui/book/read/page/AutoPager.kt | 14 +- .../app}/ui/book/read/page/ContentTextView.kt | 46 ++-- .../app}/ui/book/read/page/PageView.kt | 46 ++-- .../app}/ui/book/read/page/ReadView.kt | 64 +++--- .../app}/ui/book/read/page/api/DataSource.kt | 6 +- .../app}/ui/book/read/page/api/PageFactory.kt | 2 +- .../read/page/delegate/CoverPageDelegate.kt | 8 +- .../page/delegate/HorizontalPageDelegate.kt | 10 +- .../read/page/delegate/NoAnimPageDelegate.kt | 4 +- .../book/read/page/delegate/PageDelegate.kt | 10 +- .../read/page/delegate/ScrollPageDelegate.kt | 12 +- .../page/delegate/SimulationPageDelegate.kt | 10 +- .../read/page/delegate/SlidePageDelegate.kt | 6 +- .../book/read/page/entities/PageDirection.kt | 5 + .../ui/book/read/page/entities/TextChapter.kt | 16 +- .../ui/book/read/page/entities/TextLine.kt | 30 +-- .../ui/book/read/page/entities/TextPage.kt | 24 +- .../book/read/page/entities/TextParagraph.kt | 2 +- .../ui/book/read/page/entities/TextPos.kt | 2 +- .../read/page/entities/column/BaseColumn.kt | 6 +- .../read/page/entities/column/ButtonColumn.kt | 8 +- .../read/page/entities/column/ImageColumn.kt | 14 +- .../read/page/entities/column/ReviewColumn.kt | 10 +- .../read/page/entities/column/TextColumn.kt | 14 +- .../read/page/provider/ChapterProvider.kt | 50 ++--- .../page/provider/LayoutProgressListener.kt | 4 +- .../read/page/provider/TextChapterLayout.kt | 50 ++--- .../ui/book/read/page/provider/TextMeasure.kt | 2 +- .../read/page/provider/TextPageFactory.kt | 12 +- .../ui/book/read/page/provider/ZhLayout.kt | 2 +- .../app}/ui/book/search/BookAdapter.kt | 12 +- .../app}/ui/book/search/HistoryKeyAdapter.kt | 12 +- .../app}/ui/book/search/SearchActivity.kt | 46 ++-- .../app}/ui/book/search/SearchAdapter.kt | 22 +- .../app}/ui/book/search/SearchScope.kt | 14 +- .../app}/ui/book/search/SearchScopeDialog.kt | 26 +-- .../app}/ui/book/search/SearchViewModel.kt | 22 +- .../searchContent/SearchContentActivity.kt | 46 ++-- .../searchContent/SearchContentAdapter.kt | 12 +- .../searchContent/SearchContentViewModel.kt | 18 +- .../ui/book/searchContent/SearchResult.kt | 4 +- .../source/debug/BookSourceDebugActivity.kt | 34 +-- .../source/debug/BookSourceDebugAdapter.kt | 10 +- .../book/source/debug/BookSourceDebugModel.kt | 10 +- .../source/edit/BookSourceEditActivity.kt | 80 +++---- .../book/source/edit/BookSourceEditAdapter.kt | 16 +- .../source/edit/BookSourceEditViewModel.kt | 50 ++--- .../book/source/manage/BookSourceActivity.kt | 94 ++++---- .../book/source/manage/BookSourceAdapter.kt | 30 +-- .../ui/book/source/manage/BookSourceSort.kt | 2 +- .../book/source/manage/BookSourceViewModel.kt | 32 +-- .../book/source/manage/GroupManageDialog.kt | 29 ++- .../app}/ui/book/toc/BookmarkAdapter.kt | 12 +- .../app}/ui/book/toc/BookmarkFragment.kt | 26 +-- .../app}/ui/book/toc/ChapterListAdapter.kt | 26 +-- .../app}/ui/book/toc/ChapterListFragment.kt | 44 ++-- .../app}/ui/book/toc/TocActivity.kt | 42 ++-- .../app}/ui/book/toc/TocActivityResult.kt | 2 +- .../app}/ui/book/toc/TocViewModel.kt | 30 +-- .../ui/book/toc/rule/TxtTocRuleActivity.kt | 56 ++--- .../ui/book/toc/rule/TxtTocRuleAdapter.kt | 16 +- .../app}/ui/book/toc/rule/TxtTocRuleDialog.kt | 54 +++-- .../ui/book/toc/rule/TxtTocRuleEditDialog.kt | 22 +- .../ui/book/toc/rule/TxtTocRuleViewModel.kt | 10 +- .../app}/ui/browser/WebViewActivity.kt | 50 ++--- .../app}/ui/browser/WebViewModel.kt | 30 +-- .../app}/ui/config/BackupConfigFragment.kt | 66 +++--- .../app}/ui/config/CheckSourceConfig.kt | 18 +- .../app}/ui/config/ConfigActivity.kt | 10 +- .../app}/ui/config/ConfigTag.kt | 2 +- .../app}/ui/config/ConfigViewModel.kt | 18 +- .../app}/ui/config/CoverConfigFragment.kt | 16 +- .../app}/ui/config/CoverRuleConfigDialog.kt | 19 +- .../app}/ui/config/DirectLinkUploadConfig.kt | 28 +-- .../app}/ui/config/OtherConfigFragment.kt | 52 ++--- .../app}/ui/config/ReadConfigFragment.kt | 30 +-- .../app}/ui/config/ThemeConfigFragment.kt | 74 +++--- .../app}/ui/config/ThemeListDialog.kt | 24 +- .../app}/ui/dict/DictDialog.kt | 21 +- .../app}/ui/dict/DictViewModel.kt | 10 +- .../app}/ui/dict/rule/DictRuleActivity.kt | 56 ++--- .../app}/ui/dict/rule/DictRuleAdapter.kt | 14 +- .../app}/ui/dict/rule/DictRuleEditDialog.kt | 18 +- .../app}/ui/dict/rule/DictRuleViewModel.kt | 14 +- .../app}/ui/file/FileManageActivity.kt | 30 +-- .../app}/ui/file/FileManageViewModel.kt | 6 +- .../app}/ui/file/FilePickerDialog.kt | 36 +-- .../app}/ui/file/FilePickerViewModel.kt | 8 +- .../app}/ui/file/HandleFileActivity.kt | 36 +-- .../app}/ui/file/HandleFileContract.kt | 12 +- .../app}/ui/file/HandleFileViewModel.kt | 10 +- .../app}/ui/file/utils/FilePickerIcon.java | 2 +- .../app}/ui/login/SourceLoginActivity.kt | 14 +- .../app}/ui/login/SourceLoginDialog.kt | 40 ++-- .../app}/ui/login/SourceLoginViewModel.kt | 14 +- .../app}/ui/login/WebViewLoginFragment.kt | 26 +-- .../app}/ui/main/MainActivity.kt | 76 +++---- .../app}/ui/main/MainFragmentInterface.kt | 2 +- .../app}/ui/main/MainViewModel.kt | 48 ++-- .../main/bookshelf/BaseBookshelfFragment.kt | 52 ++--- .../bookshelf/BookshelfConfigBottomSheet.kt | 22 +- .../ui/main/bookshelf/BookshelfViewModel.kt | 46 ++-- .../ui/main/bookshelf/books/BooksFragment.kt | 60 ++--- .../bookshelf/books/BookshelfFragment1.kt | 26 +-- .../bookshelf/books/BookshelfFragment2.kt | 64 +++--- .../bookshelf/books/BookshelfFragment3.kt | 20 +- .../books/styleDefalut/BaseBooksAdapter.kt | 8 +- .../books/styleDefalut/BooksAdapterGrid.kt | 16 +- .../styleDefalut/BooksAdapterGridCompact.kt | 12 +- .../styleDefalut/BooksAdapterGridCover.kt | 14 +- .../books/styleDefalut/BooksAdapterList.kt | 18 +- .../styleDefalut/BooksAdapterListCompact.kt | 20 +- .../books/styleFold/BaseBooksAdapter.kt | 6 +- .../books/styleFold/BooksAdapterGrid.kt | 18 +- .../styleFold/BooksAdapterGridCompact.kt | 18 +- .../books/styleFold/BooksAdapterGridCover.kt | 18 +- .../books/styleFold/BooksAdapterList.kt | 22 +- .../styleFold/BooksAdapterListCompact.kt | 22 +- .../app}/ui/main/explore/ExploreAdapter.kt | 39 ++-- .../main/explore/ExploreDiffItemCallBack.kt | 4 +- .../app}/ui/main/explore/ExploreFragment.kt | 38 ++-- .../app}/ui/main/explore/ExploreViewModel.kt | 10 +- .../app}/ui/main/my/MyFragment.kt | 60 ++--- .../app}/ui/main/rss/RssAdapter.kt | 16 +- .../app}/ui/main/rss/RssFragment.kt | 44 ++-- .../app}/ui/main/rss/RssViewModel.kt | 12 +- .../app}/ui/qrcode/QrCodeActivity.kt | 18 +- .../app}/ui/qrcode/QrCodeFragment.kt | 2 +- .../app}/ui/qrcode/QrCodeResult.kt | 2 +- .../app}/ui/qrcode/ScanResultCallback.kt | 2 +- .../app}/ui/replace/GroupManageDialog.kt | 30 +-- .../app}/ui/replace/ReplaceRuleActivity.kt | 68 +++--- .../app}/ui/replace/ReplaceRuleAdapter.kt | 16 +- .../app}/ui/replace/ReplaceRuleViewModel.kt | 10 +- .../ui/replace/edit/ReplaceEditActivity.kt | 26 +-- .../ui/replace/edit/ReplaceEditViewModel.kt | 12 +- .../ui/rss/article/BaseRssArticlesAdapter.kt | 6 +- .../app}/ui/rss/article/ReadRecordDialog.kt | 22 +- .../app}/ui/rss/article/RssArticlesAdapter.kt | 21 +- .../ui/rss/article/RssArticlesAdapter1.kt | 18 +- .../ui/rss/article/RssArticlesAdapter2.kt | 21 +- .../ui/rss/article/RssArticlesAdapter3.kt | 20 +- .../ui/rss/article/RssArticlesFragment.kt | 27 ++- .../ui/rss/article/RssArticlesViewModel.kt | 16 +- .../app}/ui/rss/article/RssSortActivity.kt | 20 +- .../app}/ui/rss/article/RssSortViewModel.kt | 14 +- .../ui/rss/favorites/RssFavoritesActivity.kt | 20 +- .../ui/rss/favorites/RssFavoritesAdapter.kt | 18 +- .../ui/rss/favorites/RssFavoritesDialog.kt | 14 +- .../ui/rss/favorites/RssFavoritesFragment.kt | 26 +-- .../ui/rss/favorites/RssFavoritesViewModel.kt | 4 +- .../app}/ui/rss/read/ReadRssActivity.kt | 66 +++--- .../app}/ui/rss/read/ReadRssViewModel.kt | 28 +-- .../app}/ui/rss/read/RssJsExtensions.kt | 12 +- .../app}/ui/rss/read/VisibleWebView.kt | 2 +- .../source/debug/RssSourceDebugActivity.kt | 22 +- .../rss/source/debug/RssSourceDebugAdapter.kt | 10 +- .../rss/source/debug/RssSourceDebugModel.kt | 10 +- .../rss/source/edit/RssSourceEditActivity.kt | 60 ++--- .../rss/source/edit/RssSourceEditAdapter.kt | 20 +- .../rss/source/edit/RssSourceEditViewModel.kt | 30 +-- .../ui/rss/source/manage/GroupManageDialog.kt | 29 ++- .../ui/rss/source/manage/RssSourceActivity.kt | 68 +++--- .../ui/rss/source/manage/RssSourceAdapter.kt | 16 +- .../rss/source/manage/RssSourceViewModel.kt | 22 +- .../ui/rss/subscription/RuleSubActivity.kt | 34 +-- .../ui/rss/subscription/RuleSubAdapter.kt | 14 +- .../app}/ui/welcome/PrivacyFragment.kt | 10 +- .../app}/ui/welcome/ThemeFragment.kt | 10 +- .../app}/ui/welcome/WebDavFragment.kt | 38 ++-- .../app}/ui/welcome/WelcomeActivity.kt | 14 +- .../app}/ui/widget/BatteryView.kt | 10 +- .../app}/ui/widget/DetailSeekBar.kt | 8 +- .../app}/ui/widget/EmptyMessageView.kt | 6 +- .../app}/ui/widget/LabelsBar.kt | 4 +- .../app}/ui/widget/NestedScrollableHost.kt | 2 +- .../widget/NoChildScrollNestedScrollView.kt | 2 +- .../app}/ui/widget/PopupAction.kt | 14 +- .../app}/ui/widget/ReaderInfoBarView.kt | 6 +- .../app}/ui/widget/SearchView.kt | 6 +- .../app}/ui/widget/SelectActionBar.kt | 6 +- .../app}/ui/widget/ShadowLayout.kt | 6 +- .../app}/ui/widget/SimpleCounterView.kt | 12 +- .../app}/ui/widget/TitleBar.kt | 8 +- .../explosion_field/ExplosionAnimator.kt | 2 +- .../anima/explosion_field/ExplosionField.kt | 2 +- .../anima/explosion_field/ExplosionView.kt | 4 +- .../explosion_field/OnAnimatorListener.kt | 2 +- .../ui/widget/anima/explosion_field/Utils.kt | 4 +- .../app}/ui/widget/code/CodeView.kt | 4 +- .../app}/ui/widget/code/CodeViewExtensions.kt | 4 +- .../app}/ui/widget/code/KeywordTokenizer.kt | 2 +- .../app}/ui/widget/dialog/CodeDialog.kt | 24 +- .../app}/ui/widget/dialog/PhotoDialog.kt | 25 +-- .../app}/ui/widget/dialog/TextDialog.kt | 19 +- .../app}/ui/widget/dialog/TextListDialog.kt | 18 +- .../app}/ui/widget/dialog/UrlOptionDialog.kt | 14 +- .../app}/ui/widget/dialog/VariableDialog.kt | 16 +- .../app}/ui/widget/dialog/WaitDialog.kt | 6 +- .../dynamiclayout/DynamicFrameLayout.kt | 4 +- .../ui/widget/dynamiclayout/ViewSwitcher.kt | 2 +- .../app}/ui/widget/image/ArcView.kt | 4 +- .../app}/ui/widget/image/CoverImageView.kt | 20 +- .../app}/ui/widget/image/FilletImageView.kt | 6 +- .../app}/ui/widget/image/ImageButton.kt | 2 +- .../app}/ui/widget/image/PhotoView.kt | 8 +- .../app}/ui/widget/image/photo/Info.kt | 2 +- .../image/photo/RotateGestureDetector.kt | 2 +- .../widget/keyboard/KeyboardAssistsConfig.kt | 38 ++-- .../ui/widget/keyboard/KeyboardToolPop.kt | 28 +-- .../ui/widget/number/NumberPickerDialog.kt | 4 +- .../app}/ui/widget/recycler/DividerNoLast.kt | 4 +- .../widget/recycler/DragSelectTouchHelper.kt | 6 +- .../recycler/HeaderAdapterDataObserver.kt | 2 +- .../ui/widget/recycler/ItemTouchCallback.kt | 2 +- .../app}/ui/widget/recycler/LoadMoreView.kt | 16 +- .../NoChildScrollLinearLayoutManager.kt | 2 +- .../widget/recycler/RecyclerViewAtPager2.kt | 2 +- .../widget/recycler/UpLinearLayoutManager.kt | 2 +- .../ui/widget/recycler/VerticalDivider.kt | 4 +- .../ui/widget/recycler/ViewPager2Container.kt | 2 +- .../scroller/FastScrollRecyclerView.kt | 4 +- .../scroller/FastScrollStateChangeListener.kt | 2 +- .../widget/recycler/scroller/FastScroller.kt | 4 +- .../widget/seekbar/SeekBarChangeListener.kt | 2 +- .../app}/ui/widget/seekbar/VerticalSeekBar.kt | 4 +- .../widget/seekbar/VerticalSeekBarWrapper.kt | 2 +- .../app}/ui/widget/text/AccentBgTextView.kt | 10 +- .../ui/widget/text/AccentStrokeTextView.kt | 2 +- .../app}/ui/widget/text/AccentTextView.kt | 2 +- .../ui/widget/text/AutoCompleteTextView.kt | 8 +- .../app}/ui/widget/text/BadgeView.kt | 12 +- .../app}/ui/widget/text/BevelLabelView.kt | 4 +- .../app}/ui/widget/text/EditEntity.kt | 2 +- .../app}/ui/widget/text/MultilineTextView.kt | 2 +- .../app}/ui/widget/text/PrimaryTextView.kt | 3 +- .../text/ScrollMultiAutoCompleteTextView.kt | 2 +- .../app}/ui/widget/text/ScrollTextView.kt | 2 +- .../app}/ui/widget/text/SecondaryTextView.kt | 2 +- .../app}/ui/widget/text/TextInputLayout.kt | 2 +- .../kazusa => legado/app}/utils/ACache.kt | 2 +- .../app}/utils/ActivityExtensions.kt | 6 +- .../app}/utils/ActivityResult.kt | 2 +- .../app}/utils/ActivityResultContracts.kt | 2 +- .../app}/utils/AlphanumComparator.kt | 2 +- .../app}/utils/AnimationExtensions.kt | 4 +- .../app}/utils/ArchiveUtils.kt | 6 +- .../app}/utils/AsyncFileHandler.kt | 4 +- .../app}/utils/BitmapUtils.kt | 2 +- .../app}/utils/BookChapterExtensions.kt | 4 +- .../app}/utils/ByteArrayExtensions.kt | 2 +- .../app}/utils/ChineseUtils.kt | 2 +- .../app}/utils/CollectionExtensions.kt | 2 +- .../kazusa => legado/app}/utils/ColorUtils.kt | 2 +- .../app}/utils/ConfigurationExtensions.kt | 2 +- .../app}/utils/ConflateLiveData.kt | 2 +- .../app}/utils/ConstraintModify.kt | 2 +- .../app}/utils/ContextExtensions.kt | 24 +- .../app}/utils/ConvertExtensions.kt | 2 +- .../app}/utils/CookieManagerExtensions.kt | 2 +- .../app}/utils/CoroutineExtensions.kt | 4 +- .../app}/utils/CustomExportUtils.kt | 4 +- .../app}/utils/DataStoreUtil.kt | 2 +- .../kazusa => legado/app}/utils/Debounce.kt | 2 +- .../kazusa => legado/app}/utils/DebugLog.kt | 4 +- .../app}/utils/DialogExtensions.kt | 5 +- .../app}/utils/DocumentUtils.kt | 2 +- .../app}/utils/DrawableUtils.kt | 2 +- .../app}/utils/EncoderUtils.kt | 2 +- .../app}/utils/EncodingDetect.kt | 4 +- .../app}/utils/EventBusExtensions.kt | 2 +- .../app}/utils/FileDocExtensions.kt | 4 +- .../app}/utils/FileExtensions.kt | 2 +- .../kazusa => legado/app}/utils/FileUtils.kt | 2 +- .../app}/utils/FirebaseManager.kt | 4 +- .../app}/utils/FlowExtensions.kt | 4 +- .../app}/utils/FragmentExtensions.kt | 22 +- .../app}/utils/GsonExtensions.kt | 14 +- .../app}/utils/HandlerUtils.kt | 2 +- .../app}/utils/HtmlFormatter.kt | 4 +- .../app}/utils/ImageSaveUtils.kt | 4 +- .../kazusa => legado/app}/utils/ImageUtils.kt | 12 +- .../app}/utils/InputStreamExtensions.kt | 2 +- .../app}/utils/IntentExtensions.kt | 2 +- .../kazusa => legado/app}/utils/IntentType.kt | 2 +- .../kazusa => legado/app}/utils/JsURL.kt | 2 +- .../app}/utils/JsonExtensions.kt | 2 +- .../app}/utils/JsoupExtensions.kt | 2 +- .../kazusa => legado/app}/utils/LogUtils.kt | 12 +- .../kazusa => legado/app}/utils/MD5Utils.kt | 2 +- .../app}/utils/MapExtensions.kt | 2 +- .../app}/utils/MenuExtensions.kt | 6 +- .../app}/utils/MutableLiveDataExtensions.kt | 2 +- .../app}/utils/NavigationViewUtils.kt | 2 +- .../app}/utils/NetworkUtils.kt | 4 +- .../app}/utils/PaintExtensions.kt | 2 +- .../app}/utils/ParcelFileDescriptorChannel.kt | 2 +- .../app}/utils/PreferencesExtensions.kt | 2 +- .../app}/utils/QRCodeUtils.kt | 2 +- .../app}/utils/RandomColor.kt | 2 +- .../app}/utils/RealPathUtil.kt | 2 +- .../app}/utils/RecyclerViewExtensions.kt | 2 +- .../app}/utils/RegexExtensions.kt | 8 +- .../app}/utils/RequestManagerExtensions.kt | 2 +- .../kazusa => legado/app}/utils/Snackbars.kt | 2 +- .../app}/utils/StringExtensions.kt | 6 +- .../app}/utils/StringUtils.kt | 2 +- .../kazusa => legado/app}/utils/SvgUtils.kt | 2 +- .../app}/utils/SyncedRenderer.kt | 2 +- .../app}/utils/SystemUtils.kt | 2 +- .../kazusa => legado/app}/utils/Throttle.kt | 2 +- .../app}/utils/ThrowableExtensions.kt | 2 +- .../kazusa => legado/app}/utils/TimeUtils.kt | 2 +- .../kazusa => legado/app}/utils/ToastUtils.kt | 8 +- .../app}/utils/ToolbarUtils.kt | 4 +- .../app}/utils/UriExtensions.kt | 12 +- .../kazusa => legado/app}/utils/UrlUtil.kt | 14 +- .../app}/utils/Utf8BomUtils.kt | 2 +- .../app}/utils/VibrationUtils.kt | 2 +- .../app}/utils/ViewExtensions.kt | 10 +- .../app}/utils/WebSettingsExtensions.kt | 4 +- .../app}/utils/WindowInsetsExtensions.kt | 2 +- .../canvasrecorder/BaseCanvasRecorder.kt | 2 +- .../utils/canvasrecorder/CanvasRecorder.kt | 2 +- .../canvasrecorder/CanvasRecorderApi23Impl.kt | 6 +- .../canvasrecorder/CanvasRecorderApi29Impl.kt | 8 +- .../CanvasRecorderExtensions.kt | 2 +- .../canvasrecorder/CanvasRecorderFactory.kt | 4 +- .../canvasrecorder/CanvasRecorderImpl.kt | 4 +- .../canvasrecorder/CanvasRecorderLocked.kt | 2 +- .../utils/canvasrecorder/pools/CanvasPool.kt | 2 +- .../utils/canvasrecorder/pools/PicturePool.kt | 4 +- .../canvasrecorder/pools/RenderNodePool.kt | 4 +- .../app}/utils/compress/LibArchiveUtils.kt | 4 +- .../app}/utils/compress/ZipUtils.kt | 6 +- .../app}/utils/objectpool/BaseObjectPool.kt | 2 +- .../utils/objectpool/BaseSafeObjectPool.kt | 2 +- .../app}/utils/objectpool/ObjectPool.kt | 2 +- .../utils/objectpool/ObjectPoolExtensions.kt | 2 +- .../app}/utils/objectpool/ObjectPoolLocked.kt | 2 +- .../ActivityViewBindings.kt | 2 +- .../FragmentViewBindings.kt | 2 +- .../ViewBindingProperty.kt | 2 +- .../kazusa => legado/app}/web/HttpServer.kt | 24 +- .../kazusa => legado/app}/web/ReadMe.md | 0 .../app}/web/WebSocketServer.kt | 6 +- .../app}/web/socket/BookSearchWebSocket.kt | 18 +- .../web/socket/BookSourceDebugWebSocket.kt | 10 +- .../web/socket/RssSourceDebugWebSocket.kt | 10 +- .../app}/web/utils/AssetsWeb.kt | 2 +- .../io/legato/kazusa/lib/theme/ThemeModel.kt | 3 - .../book/read/page/entities/PageDirection.kt | 5 - .../res/layout-land/activity_book_info.xml | 4 +- .../main/res/layout-land/view_read_menu.xml | 10 +- app/src/main/res/layout/activity_about.xml | 2 +- .../main/res/layout/activity_arrange_book.xml | 6 +- .../main/res/layout/activity_book_info.xml | 4 +- .../res/layout/activity_book_info_edit.xml | 4 +- .../main/res/layout/activity_book_read.xml | 6 +- .../main/res/layout/activity_book_search.xml | 2 +- .../main/res/layout/activity_book_source.xml | 6 +- .../res/layout/activity_book_source_edit.xml | 10 +- .../main/res/layout/activity_cache_book.xml | 2 +- .../main/res/layout/activity_dict_rule.xml | 6 +- app/src/main/res/layout/activity_donate.xml | 2 +- .../main/res/layout/activity_explore_show.xml | 6 +- .../main/res/layout/activity_file_manage.xml | 4 +- .../main/res/layout/activity_import_book.xml | 6 +- app/src/main/res/layout/activity_manga.xml | 12 +- .../res/layout/activity_qrcode_capture.xml | 2 +- .../main/res/layout/activity_read_record.xml | 2 +- .../main/res/layout/activity_replace_edit.xml | 12 +- .../main/res/layout/activity_replace_rule.xml | 6 +- .../res/layout/activity_rss_favorites.xml | 2 +- app/src/main/res/layout/activity_rss_read.xml | 4 +- .../main/res/layout/activity_rss_source.xml | 6 +- .../res/layout/activity_rss_source_edit.xml | 8 +- app/src/main/res/layout/activity_rule_sub.xml | 2 +- .../res/layout/activity_search_content.xml | 4 +- .../main/res/layout/activity_source_debug.xml | 8 +- .../main/res/layout/activity_txt_toc_rule.xml | 6 +- app/src/main/res/layout/activity_web_view.xml | 4 +- .../res/layout/dialog_add_to_bookshelf.xml | 4 +- .../res/layout/dialog_book_change_source.xml | 2 +- .../res/layout/dialog_book_group_edit.xml | 2 +- .../res/layout/dialog_bookshelf_config.xml | 2 +- .../layout/dialog_chapter_change_source.xml | 2 +- app/src/main/res/layout/dialog_code_view.xml | 2 +- .../main/res/layout/dialog_content_edit.xml | 4 +- .../main/res/layout/dialog_custom_group.xml | 2 +- app/src/main/res/layout/dialog_dict.xml | 2 +- app/src/main/res/layout/dialog_edit_text.xml | 2 +- .../main/res/layout/dialog_font_select.xml | 10 +- .../main/res/layout/dialog_http_tts_edit.xml | 14 +- .../res/layout/dialog_manga_auto_read.xml | 2 +- .../res/layout/dialog_manga_color_filter.xml | 12 +- .../main/res/layout/dialog_manga_epaper.xml | 2 +- .../layout/dialog_manga_footer_setting.xml | 2 +- .../res/layout/dialog_multiple_edit_text.xml | 4 +- app/src/main/res/layout/dialog_page_key.xml | 12 +- app/src/main/res/layout/dialog_photo_view.xml | 2 +- .../res/layout/dialog_progressbar_view.xml | 4 +- app/src/main/res/layout/dialog_read_aloud.xml | 6 +- .../res/layout/dialog_read_book_style.xml | 2 +- .../main/res/layout/dialog_read_padding.xml | 24 +- .../main/res/layout/dialog_recycler_view.xml | 2 +- .../res/layout/dialog_rss_favorite_config.xml | 18 +- .../main/res/layout/dialog_rule_sub_edit.xml | 14 +- .../main/res/layout/dialog_search_scope.xml | 2 +- .../layout/dialog_select_section_export.xml | 18 +- .../main/res/layout/dialog_source_picker.xml | 10 +- app/src/main/res/layout/dialog_text_view.xml | 2 +- app/src/main/res/layout/dialog_tip_config.xml | 8 +- app/src/main/res/layout/dialog_toc_regex.xml | 2 +- .../main/res/layout/dialog_toc_regex_edit.xml | 6 +- app/src/main/res/layout/dialog_update.xml | 2 +- .../res/layout/dialog_url_option_edit.xml | 50 ++--- .../main/res/layout/dialog_webdav_server.xml | 8 +- app/src/main/res/layout/fragment_bookmark.xml | 4 +- app/src/main/res/layout/fragment_books.xml | 4 +- .../main/res/layout/fragment_bookshelf1.xml | 4 +- .../main/res/layout/fragment_bookshelf3.xml | 4 +- .../main/res/layout/fragment_chapter_list.xml | 2 +- app/src/main/res/layout/fragment_explore.xml | 2 +- .../main/res/layout/fragment_rss_articles.xml | 2 +- .../res/layout/fragment_web_view_login.xml | 2 +- .../res/layout/item_book_group_manage.xml | 2 +- app/src/main/res/layout/item_book_source.xml | 4 +- .../main/res/layout/item_bookshelf_grid.xml | 2 +- .../layout/item_bookshelf_grid_compact.xml | 2 +- .../item_bookshelf_grid_compact_group.xml | 10 +- .../res/layout/item_bookshelf_grid_group.xml | 10 +- .../main/res/layout/item_bookshelf_list.xml | 2 +- .../layout/item_bookshelf_list_compact.xml | 2 +- .../item_bookshelf_list_compact_group.xml | 6 +- .../res/layout/item_bookshelf_list_group.xml | 10 +- app/src/main/res/layout/item_check_box.xml | 2 +- app/src/main/res/layout/item_cover.xml | 2 +- app/src/main/res/layout/item_dict_rule.xml | 4 +- app/src/main/res/layout/item_group_select.xml | 2 +- app/src/main/res/layout/item_import_book.xml | 4 +- app/src/main/res/layout/item_radio_button.xml | 2 +- app/src/main/res/layout/item_rss.xml | 2 +- app/src/main/res/layout/item_rss_source.xml | 4 +- app/src/main/res/layout/item_rule_sub.xml | 2 +- app/src/main/res/layout/item_search.xml | 2 +- .../main/res/layout/item_server_select.xml | 2 +- app/src/main/res/layout/item_source_edit.xml | 2 +- .../res/layout/item_source_edit_check_box.xml | 2 +- .../main/res/layout/item_source_import.xml | 2 +- app/src/main/res/layout/item_toc_regex.xml | 4 +- app/src/main/res/layout/view_book_page.xml | 14 +- app/src/main/res/layout/view_manga_menu.xml | 4 +- .../main/res/layout/view_navigation_badge.xml | 2 +- app/src/main/res/layout/view_read_menu.xml | 10 +- app/src/main/res/xml/about.xml | 18 +- app/src/main/res/xml/pref_config_aloud.xml | 22 +- app/src/main/res/xml/pref_config_backup.xml | 34 +-- app/src/main/res/xml/pref_config_cover.xml | 26 +-- app/src/main/res/xml/pref_config_other.xml | 88 ++++---- app/src/main/res/xml/pref_config_read.xml | 72 +++--- app/src/main/res/xml/pref_config_theme.xml | 56 ++--- app/src/main/res/xml/pref_main.xml | 40 ++-- app/src/main/res/xml/pref_strat_theme.xml | 4 +- .../kazusa => legado/app}/ExampleUnitTest.kt | 2 +- .../{legato/kazusa => legado/app}/JsTest.kt | 4 +- 1046 files changed, 6870 insertions(+), 6933 deletions(-) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/1.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/10.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/11.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/12.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/13.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/14.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/15.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/16.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/17.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/18.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/19.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/2.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/20.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/21.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/22.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/23.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/24.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/25.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/26.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/27.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/28.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/29.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/3.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/30.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/31.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/32.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/33.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/34.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/35.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/36.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/37.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/38.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/39.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/4.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/40.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/41.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/42.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/43.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/44.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/45.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/46.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/47.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/48.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/49.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/5.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/50.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/51.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/52.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/53.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/54.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/55.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/56.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/57.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/58.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/59.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/6.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/60.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/61.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/62.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/63.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/64.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/65.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/66.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/67.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/68.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/69.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/7.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/70.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/71.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/72.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/73.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/74.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/75.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/76.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/77.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/8.json (100%) rename app/schemas/{io.legato.kazusa.data.AppDatabase => io.legado.app.data.AppDatabase}/9.json (100%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/AndroidJsTest.kt (99%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/ExampleInstrumentedTest.kt (97%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/HttpTest.kt (96%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/HttpTtsTest.kt (85%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/MigrationTest.kt (95%) rename app/src/androidTest/java/io/{legato/kazusa => legado/app}/UpdateTest.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/App.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/ReaderProvider.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/ReturnData.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/ShortCuts.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/controller/BookController.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/controller/BookSourceController.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/controller/ReplaceRuleController.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/api/controller/RssSourceController.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/AppContextWrapper.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseBottomSheetDialogFragment.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseDialogFragment.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseFragment.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BasePrefDialogFragment.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseService.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/BaseViewModel.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/VMBaseActivity.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/VMBaseFragment.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/DiffRecyclerAdapter.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/ItemAnimation.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/ItemViewHolder.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/RecyclerAdapter.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/AlphaInAnimation.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/BaseAnimation.kt (77%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/ScaleInAnimation.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/SlideInBottomAnimation.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/SlideInLeftAnimation.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/base/adapter/animations/SlideInRightAnimation.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/AppConst.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/AppLog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/AppPattern.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/BookSourceType.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/BookType.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/EventBus.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/IntentAction.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/NotificationId.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/PageAnim.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/PreferKey.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/SourceType.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/Status.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/constant/Theme.kt (56%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/AppDatabase.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/DatabaseMigrations.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/BookChapterDao.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/BookDao.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/BookGroupDao.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/BookSourceDao.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/BookmarkDao.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/CacheDao.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/CookieDao.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/DictRuleDao.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/HttpTTSDao.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/KeyboardAssistsDao.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/ReadRecordDao.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/ReplaceRuleDao.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/RssArticleDao.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/RssReadRecordDao.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/RssSourceDao.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/RssStarDao.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/RuleSubDao.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/SearchBookDao.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/SearchKeywordDao.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/ServerDao.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/dao/TxtTocRuleDao.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BaseBook.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BaseRssArticle.kt (76%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BaseSource.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/Book.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookChapter.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookChapterReview.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookGroup.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookProgress.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookSource.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/BookSourcePart.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/Bookmark.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/Cache.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/Cookie.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/DictRule.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/HttpTTS.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/KeyboardAssist.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/ReadRecord.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/ReadRecordShow.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/ReplaceRule.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/RssArticle.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/RssReadRecord.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/RssSource.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/RssStar.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/RuleSub.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/SearchBook.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/SearchKeyword.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/Server.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/TxtTocRule.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/BookInfoRule.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/BookListRule.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/ContentRule.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/ExploreKind.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/ExploreRule.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/FlexChildStyle.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/ReviewRule.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/RowUi.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/SearchRule.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/data/entities/rule/TocRule.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/ConcurrentException.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/ContentEmptyException.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/EmptyFileException.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/InvalidBooksDirException.kt (67%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/NoBooksDirException.kt (66%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/NoStackTraceException.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/RegexTimeoutException.kt (66%) rename app/src/main/java/io/{legato/kazusa => legado/app}/exception/TocEmptyException.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/AppFreezeMonitor.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/AppWebDav.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/CacheManager.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/ConcurrentRateLimiter.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/CrashHandler.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/DefaultData.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/DirectLinkUpload.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/EventMessage.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/ExecutorService.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/IntentData.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/IntentHelp.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/JsEncodeUtils.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/JsExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/LauncherIconHelp.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/LayoutManager.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/LifecycleHelp.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/MediaHelp.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/PaintPool.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/ReplaceAnalyzer.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/RuleBigDataHelp.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/RuleComplete.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/TTS.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/book/BookContent.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/book/BookExtensions.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/book/BookHelp.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/book/ContentHelp.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/book/ContentProcessor.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/AppConfig.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/LocalConfig.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/ReadBookConfig.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/ReadTipConfig.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/SourceConfig.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/config/ThemeConfig.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/coroutine/ActivelyCancelException.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/coroutine/CompositeCoroutine.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/coroutine/Coroutine.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/coroutine/CoroutineContainer.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/crypto/AsymmetricCrypto.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/crypto/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/crypto/Sign.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/crypto/SymmetricCryptoAndroid.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/exoplayer/ExoPlayerHelper.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/exoplayer/InputStreamDataSource.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/AsyncRecycleBitmapPool.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/BlurTransformation.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/FilePathLoader.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/GlideHeaders.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/ImageLoader.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/LegadoDataUrlLoader.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/LegadoGlideModule.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/OkHttpModeLoaderFactory.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/OkHttpModelLoader.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/OkHttpStreamFetcher.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/progress/OnProgressListener.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/progress/ProgressManager.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/glide/progress/ProgressResponseBody.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/BackstageWebView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/CookieManager.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/CookieStore.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/Cronet.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/DecompressInterceptor.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/HttpHelper.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/ObsoleteUrlFactory.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/OkHttpExceptionInterceptor.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/OkHttpUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/OkhttpUncaughtExceptionHandler.kt (76%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/RequestMethod.kt (55%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/SSLHelper.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/StrResponse.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/http/api/CookieManagerInterface.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/rhino/NativeBaseSource.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/source/BaseSourceExtensions.kt (62%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/source/BookSourceExtensions.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/source/RssSourceExtensions.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/source/SourceHelp.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/source/SourceVerificationHelp.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/storage/Backup.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/storage/BackupAES.kt (52%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/storage/BackupConfig.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/storage/ImportOldData.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/storage/Restore.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/update/AppReleaseInfo.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/update/AppUpdate.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/help/update/AppUpdateGitHub.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/aliyun/ALiYun.kt (57%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/AbsCallBack.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/BodyUploadProvider.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CallbackResult.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CallbackStep.kt (73%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CronetCoroutineInterceptor.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CronetHelper.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CronetInterceptor.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/CronetLoader.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/LargeBodyUploadProvider.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/NewCallBack.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/cronet/OldCallback.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/dialogs/AlertBuilder.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/dialogs/AndroidAlertBuilder.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/dialogs/AndroidDialogs.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/dialogs/AndroidSelectors.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/dialogs/SelectItem.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetDetector.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetMatch.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecog_2022.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecog_UTF8.java (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecog_Unicode.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecog_mbcs.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecog_sbcs.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/icu4j/CharsetRecognizer.java (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/KF6Book.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/KF8Book.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/MobiBook.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/MobiReader.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/PDBFile.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/decompress/CDICData.kt (62%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/decompress/Decompressor.kt (63%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/decompress/HuffcdicDecompressor.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/decompress/Lz77Decompressor.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/decompress/PlainDecompressor.kt (74%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/ExthRecordType.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/FdstHeader.kt (62%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/Fragment.kt (76%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/IndexData.kt (74%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/IndexEntry.kt (77%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/IndexTag.kt (62%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/IndxHeader.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/KF6Section.kt (78%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/KF8Header.kt (74%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/KF8Pos.kt (58%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/KF8Resource.kt (68%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/KF8Section.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/MobiEntryHeaders.kt (77%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/MobiHeader.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/MobiMetadata.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/NCX.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/PalmDocHeader.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/Ptagx.kt (73%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/Skeleton.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/TOC.kt (69%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/TagxHeader.kt (69%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/entities/TagxTag.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/utils/BitwiseExtensions.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/mobi/utils/ByteBufferExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/OnErrorCallback.kt (60%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/OnPermissionsDeniedCallback.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/OnPermissionsGrantedCallback.kt (65%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/OnPermissionsResultCallback.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/OnRequestPermissionsResultCallback.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/PermissionActivity.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/Permissions.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/PermissionsCompat.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/Request.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/RequestManager.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/permission/RequestPlugins.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/ColorPreference.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/EditTextPreference.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/EditTextPreferenceDialog.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/IconListPreference.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/ImagePreviewPreference.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/ListPreferenceDialog.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/MultiSelectListPreferenceDialog.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/NameListPreference.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/Preference.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/PreferenceCategory.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/SwitchPreference.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/ThemeCardPreference.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/ThemeModePreference.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/TipPreference.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/prefs/fragment/PreferenceFragment.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/MaterialValueHelper.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/Selector.kt (99%) create mode 100644 app/src/main/java/io/legado/app/lib/theme/ThemeModel.kt rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/ThemeStore.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/ThemeStoreInterface.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/ThemeStorePrefKeys.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/ThemeUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/TintHelper.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/ViewUtils.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeBottomNavigationVIew.kt (77%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeCheckBox.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeEditText.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeProgressBar.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeRadioButton.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeRadioNoButton.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeSlider.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/theme/view/ThemeSwitch.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/webdav/Authorization.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/webdav/WebDav.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/webdav/WebDavException.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/lib/webdav/WebDavFile.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/AudioPlay.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/BookCover.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/CacheBook.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/CheckSource.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/Debug.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/Download.kt (64%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/ImageProvider.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/ReadAloud.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/ReadBook.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/ReadManga.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/SharedJsScope.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeByJSonPath.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeByJSoup.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeByRegex.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeByXPath.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeRule.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/AnalyzeUrl.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/CustomUrl.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/QueryTTF.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/RuleAnalyzer.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/RuleData.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/analyzeRule/RuleDataInterface.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/BaseLocalBookParse.kt (71%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/EpubFile.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/LocalBook.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/MobiFile.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/PdfFile.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/TextFile.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/localBook/UmdFile.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/remote/RemoteBook.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/remote/RemoteBookManager.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/remote/RemoteBookWebDav.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/rss/Rss.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/rss/RssParserByRule.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/rss/RssParserDefault.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/BookChapterList.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/BookContent.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/BookInfo.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/BookList.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/SearchModel.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/model/webBook/WebBook.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/receiver/MediaButtonReceiver.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/receiver/NetworkChangedListener.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/receiver/SharedReceiverActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/receiver/TimeBatteryReceiver.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/AudioPlayService.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/BaseReadAloudService.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/CacheBookService.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/CheckSourceService.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/DownloadService.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/ExportBookService.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/HttpReadAloudService.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/TTSReadAloudService.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/WebService.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/service/WebTileService.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/README.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/about/AboutActivity.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/about/AppLogDialog.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/about/CrashLogsDialog.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/about/ReadRecordActivity.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/about/UpdateDialog.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/AddToBookshelfDialog.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/BaseAssociationViewModel.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/FileAssociationActivity.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/FileAssociationViewModel.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportBookSourceDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportBookSourceViewModel.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportDictRuleDialog.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportDictRuleViewModel.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportHttpTtsDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportHttpTtsViewModel.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportReplaceRuleDialog.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportReplaceRuleViewModel.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportRssSourceDialog.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportRssSourceViewModel.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportThemeDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportThemeViewModel.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportTxtTocRuleDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/ImportTxtTocRuleViewModel.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/OnLineImportActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/OnLineImportViewModel.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/OpenUrlConfirmActivity.kt (71%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/OpenUrlConfirmDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/OpenUrlConfirmViewModel.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/VerificationCodeActivity.kt (70%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/VerificationCodeDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/association/VerificationCodeViewModel.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/audio/AudioPlayActivity.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/audio/AudioPlayViewModel.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/bookmark/AllBookmarkActivity.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/bookmark/AllBookmarkViewModel.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/bookmark/BookmarkAdapter.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/bookmark/BookmarkDecoration.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/bookmark/BookmarkDialog.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/cache/CacheActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/cache/CacheAdapter.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/cache/CacheViewModel.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changecover/ChangeCoverDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changecover/ChangeCoverViewModel.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changecover/CoverAdapter.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeBookSourceAdapter.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeBookSourceDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeBookSourceViewModel.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeChapterSourceAdapter.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeChapterSourceDialog.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeChapterSourceViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/changesource/ChangeChapterTocAdapter.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/explore/ExploreShowActivity.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/explore/ExploreShowAdapter.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/explore/ExploreShowViewModel.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/group/GroupEditDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/group/GroupManageDialog.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/group/GroupSelectDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/group/GroupViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/BaseImportBookActivity.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/local/ImportBook.kt (67%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/local/ImportBookActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/local/ImportBookAdapter.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/local/ImportBookViewModel.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/RemoteBookActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/RemoteBookAdapter.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/RemoteBookSort.kt (50%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/RemoteBookViewModel.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/ServerConfigDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/ServerConfigViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/ServersDialog.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/import/remote/ServersViewModel.kt (57%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/info/BookInfoActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/info/BookInfoViewModel.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/info/edit/BookInfoEditActivity.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/info/edit/BookInfoEditViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manage/BookAdapter.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manage/BookshelfManageActivity.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manage/BookshelfManageViewModel.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manage/SourcePickerDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/ReadMangaActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/ReadMangaViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaAutoReadDialog.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaClickActionConfigDialog.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaColorFilterConfig.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaColorFilterDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaFooterSettingDialog.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/config/MangaScrollMode.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/BaseMangaPage.kt (60%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/EpaperTransformation.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/GrayscaleTransformation.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/MangaChapter.kt (54%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/MangaContent.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/MangaFooterConfig.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/MangaPage.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/entities/ReaderLoading.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/MangaAdapter.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/MangaLayoutManager.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/MangaVH.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/ScrollTimer.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/WebtoonFrame.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/manga/recyclerview/WebtoonRecyclerView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/BaseReadBookActivity.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/ContentEditDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/EffectiveReplacesDialog.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/MangaMenu.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/ReadBookActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/ReadBookViewModel.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/ReadMenu.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/SearchMenu.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/TextActionMenu.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/AutoReadDialog.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/BgAdapter.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/BgTextConfigDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/ClickActionConfigDialog.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/FontSelectDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/HttpTtsEditDialog.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/HttpTtsEditViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/MoreConfigDialog.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/PaddingConfigDialog.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/PageKeyDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/ReadAloudConfigDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/ReadAloudDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/ReadStyleDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/SpeakEngineDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/SpeakEngineViewModel.kt (74%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/TipConfigDialog.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/config/ToolButtonConfigDialog.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/AutoPager.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/ContentTextView.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/PageView.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/ReadView.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/api/DataSource.kt (71%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/api/PageFactory.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/CoverPageDelegate.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/HorizontalPageDelegate.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/NoAnimPageDelegate.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/PageDelegate.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/ScrollPageDelegate.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/SimulationPageDelegate.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/delegate/SlidePageDelegate.kt (92%) create mode 100644 app/src/main/java/io/legado/app/ui/book/read/page/entities/PageDirection.kt rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/TextChapter.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/TextLine.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/TextPage.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/TextParagraph.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/TextPos.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/column/BaseColumn.kt (61%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/column/ButtonColumn.kt (54%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/column/ImageColumn.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/column/ReviewColumn.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/entities/column/TextColumn.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/ChapterProvider.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/LayoutProgressListener.kt (73%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/TextChapterLayout.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/TextMeasure.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/TextPageFactory.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/read/page/provider/ZhLayout.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/BookAdapter.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/HistoryKeyAdapter.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/SearchActivity.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/SearchAdapter.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/SearchScope.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/SearchScopeDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/search/SearchViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/searchContent/SearchContentActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/searchContent/SearchContentAdapter.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/searchContent/SearchContentViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/searchContent/SearchResult.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/debug/BookSourceDebugActivity.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/debug/BookSourceDebugAdapter.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/debug/BookSourceDebugModel.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/edit/BookSourceEditActivity.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/edit/BookSourceEditAdapter.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/edit/BookSourceEditViewModel.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/manage/BookSourceActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/manage/BookSourceAdapter.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/manage/BookSourceSort.kt (64%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/manage/BookSourceViewModel.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/source/manage/GroupManageDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/BookmarkAdapter.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/BookmarkFragment.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/ChapterListAdapter.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/ChapterListFragment.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/TocActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/TocActivityResult.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/TocViewModel.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/rule/TxtTocRuleActivity.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/rule/TxtTocRuleAdapter.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/rule/TxtTocRuleDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/rule/TxtTocRuleEditDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/book/toc/rule/TxtTocRuleViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/browser/WebViewActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/browser/WebViewModel.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/BackupConfigFragment.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/CheckSourceConfig.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ConfigActivity.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ConfigTag.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ConfigViewModel.kt (76%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/CoverConfigFragment.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/CoverRuleConfigDialog.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/DirectLinkUploadConfig.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/OtherConfigFragment.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ReadConfigFragment.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ThemeConfigFragment.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/config/ThemeListDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/DictDialog.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/DictViewModel.kt (77%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/rule/DictRuleActivity.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/rule/DictRuleAdapter.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/rule/DictRuleEditDialog.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/dict/rule/DictRuleViewModel.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/FileManageActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/FileManageViewModel.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/FilePickerDialog.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/FilePickerViewModel.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/HandleFileActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/HandleFileContract.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/HandleFileViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/file/utils/FilePickerIcon.java (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/login/SourceLoginActivity.kt (73%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/login/SourceLoginDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/login/SourceLoginViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/login/WebViewLoginFragment.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/MainActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/MainFragmentInterface.kt (64%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/MainViewModel.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/BaseBookshelfFragment.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/BookshelfConfigBottomSheet.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/BookshelfViewModel.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/BooksFragment.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/BookshelfFragment1.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/BookshelfFragment2.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/BookshelfFragment3.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/explore/ExploreAdapter.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/explore/ExploreDiffItemCallBack.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/explore/ExploreFragment.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/explore/ExploreViewModel.kt (69%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/my/MyFragment.kt (78%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/rss/RssAdapter.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/rss/RssFragment.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/main/rss/RssViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/qrcode/QrCodeActivity.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/qrcode/QrCodeFragment.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/qrcode/QrCodeResult.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/qrcode/ScanResultCallback.kt (76%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/GroupManageDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/ReplaceRuleActivity.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/ReplaceRuleAdapter.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/ReplaceRuleViewModel.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/edit/ReplaceEditActivity.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/replace/edit/ReplaceEditViewModel.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/BaseRssArticlesAdapter.kt (70%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/ReadRecordDialog.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesAdapter.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesAdapter1.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesAdapter2.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesAdapter3.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesFragment.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssArticlesViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssSortActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/article/RssSortViewModel.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/favorites/RssFavoritesActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/favorites/RssFavoritesAdapter.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/favorites/RssFavoritesDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/favorites/RssFavoritesFragment.kt (79%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/favorites/RssFavoritesViewModel.kt (58%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/read/ReadRssActivity.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/read/ReadRssViewModel.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/read/RssJsExtensions.kt (56%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/read/VisibleWebView.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/debug/RssSourceDebugActivity.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/debug/RssSourceDebugAdapter.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/debug/RssSourceDebugModel.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/edit/RssSourceEditActivity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/edit/RssSourceEditAdapter.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/edit/RssSourceEditViewModel.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/manage/GroupManageDialog.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/manage/RssSourceActivity.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/manage/RssSourceAdapter.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/source/manage/RssSourceViewModel.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/subscription/RuleSubActivity.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/rss/subscription/RuleSubAdapter.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/welcome/PrivacyFragment.kt (69%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/welcome/ThemeFragment.kt (75%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/welcome/WebDavFragment.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/welcome/WelcomeActivity.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/BatteryView.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/DetailSeekBar.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/EmptyMessageView.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/LabelsBar.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/NestedScrollableHost.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/NoChildScrollNestedScrollView.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/PopupAction.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/ReaderInfoBarView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/SearchView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/SelectActionBar.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/ShadowLayout.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/SimpleCounterView.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/TitleBar.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/anima/explosion_field/ExplosionAnimator.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/anima/explosion_field/ExplosionField.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/anima/explosion_field/ExplosionView.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/anima/explosion_field/OnAnimatorListener.kt (72%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/anima/explosion_field/Utils.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/code/CodeView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/code/CodeViewExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/code/KeywordTokenizer.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/CodeDialog.kt (78%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/PhotoDialog.kt (74%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/TextDialog.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/TextListDialog.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/UrlOptionDialog.kt (84%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/VariableDialog.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dialog/WaitDialog.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dynamiclayout/DynamicFrameLayout.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/dynamiclayout/ViewSwitcher.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/ArcView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/CoverImageView.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/FilletImageView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/ImageButton.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/PhotoView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/photo/Info.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/image/photo/RotateGestureDetector.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/keyboard/KeyboardAssistsConfig.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/keyboard/KeyboardToolPop.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/number/NumberPickerDialog.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/DividerNoLast.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/DragSelectTouchHelper.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/HeaderAdapterDataObserver.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/ItemTouchCallback.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/LoadMoreView.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/RecyclerViewAtPager2.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/UpLinearLayoutManager.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/VerticalDivider.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/ViewPager2Container.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/scroller/FastScrollRecyclerView.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/recycler/scroller/FastScroller.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/seekbar/SeekBarChangeListener.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/seekbar/VerticalSeekBar.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/seekbar/VerticalSeekBarWrapper.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/AccentBgTextView.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/AccentStrokeTextView.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/AccentTextView.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/AutoCompleteTextView.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/BadgeView.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/BevelLabelView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/EditEntity.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/MultilineTextView.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/PrimaryTextView.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/ScrollMultiAutoCompleteTextView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/ScrollTextView.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/SecondaryTextView.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/ui/widget/text/TextInputLayout.kt (85%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ACache.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ActivityExtensions.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ActivityResult.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ActivityResultContracts.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/AlphanumComparator.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/AnimationExtensions.kt (82%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ArchiveUtils.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/AsyncFileHandler.kt (81%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/BitmapUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/BookChapterExtensions.kt (53%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ByteArrayExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ChineseUtils.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/CollectionExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ColorUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ConfigurationExtensions.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ConflateLiveData.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ConstraintModify.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ContextExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ConvertExtensions.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/CookieManagerExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/CoroutineExtensions.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/CustomExportUtils.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/DataStoreUtil.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/Debounce.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/DebugLog.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/DialogExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/DocumentUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/DrawableUtils.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/EncoderUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/EncodingDetect.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/EventBusExtensions.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FileDocExtensions.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FileExtensions.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FileUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FirebaseManager.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FlowExtensions.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/FragmentExtensions.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/GsonExtensions.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/HandlerUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/HtmlFormatter.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ImageSaveUtils.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ImageUtils.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/InputStreamExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/IntentExtensions.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/IntentType.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/JsURL.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/JsonExtensions.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/JsoupExtensions.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/LogUtils.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/MD5Utils.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/MapExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/MenuExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/MutableLiveDataExtensions.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/NavigationViewUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/NetworkUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/PaintExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ParcelFileDescriptorChannel.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/PreferencesExtensions.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/QRCodeUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/RandomColor.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/RealPathUtil.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/RecyclerViewExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/RegexExtensions.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/RequestManagerExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/Snackbars.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/StringExtensions.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/StringUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/SvgUtils.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/SyncedRenderer.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/SystemUtils.kt (98%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/Throttle.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ThrowableExtensions.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/TimeUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ToastUtils.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ToolbarUtils.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/UriExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/UrlUtil.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/Utf8BomUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/VibrationUtils.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/ViewExtensions.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/WebSettingsExtensions.kt (93%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/WindowInsetsExtensions.kt (90%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/BaseCanvasRecorder.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorder.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderApi23Impl.kt (86%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderApi29Impl.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderExtensions.kt (95%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderFactory.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderImpl.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/CanvasRecorderLocked.kt (96%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/pools/CanvasPool.kt (88%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/pools/PicturePool.kt (55%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/canvasrecorder/pools/RenderNodePool.kt (78%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/compress/LibArchiveUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/compress/ZipUtils.kt (99%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/objectpool/BaseObjectPool.kt (89%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/objectpool/BaseSafeObjectPool.kt (80%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/objectpool/ObjectPool.kt (70%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/objectpool/ObjectPoolExtensions.kt (65%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/objectpool/ObjectPoolLocked.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/viewbindingdelegate/ActivityViewBindings.kt (92%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/viewbindingdelegate/FragmentViewBindings.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/utils/viewbindingdelegate/ViewBindingProperty.kt (97%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/HttpServer.kt (91%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/ReadMe.md (100%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/WebSocketServer.kt (83%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/socket/BookSearchWebSocket.kt (87%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/socket/BookSourceDebugWebSocket.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/socket/RssSourceDebugWebSocket.kt (94%) rename app/src/main/java/io/{legato/kazusa => legado/app}/web/utils/AssetsWeb.kt (97%) delete mode 100644 app/src/main/java/io/legato/kazusa/lib/theme/ThemeModel.kt delete mode 100644 app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/PageDirection.kt rename app/src/test/java/io/{legato/kazusa => legado/app}/ExampleUnitTest.kt (92%) rename app/src/test/java/io/{legato/kazusa => legado/app}/JsTest.kt (98%) diff --git a/English.md b/English.md index dcf4b2d33..9cc6b9800 100644 --- a/English.md +++ b/English.md @@ -93,7 +93,7 @@ https://www.yuque.com/legado/wiki/community * Legado 3.0 The API is provided in 2 ways: `Web way` and `Content Provider way`. You can call it yourself as needed in [here](api.md). * One-click import by url recall reading, url format: legado://import/{path}?src={url} * Path Type: bookSource,rssSource,replaceRule,textTocRule,httpTTS,theme,readConfig,dictRule,addToBookshelf -* path type explanation: Book source, subscription source, replacement rules, local txt novel directory rules, online reading engine, theme, reading layout, [add to bookshelf](/app/src/main/java/io/legato/kazusa/ui/association/AddToBookshelfDialog.kt) +* path type explanation: Book source, subscription source, replacement rules, local txt novel directory rules, online reading engine, theme, reading layout, [add to bookshelf](/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt) # diff --git a/api.md b/api.md index 82414084b..1ea46b12a 100644 --- a/api.md +++ b/api.md @@ -1,6 +1,6 @@ -# 阅读[API](/app/src/main/java/io/legato/kazusa/api/controller) +# 阅读[API](/app/src/main/java/io/legado/app/api/controller) -## 对于[Web](/app/src/main/java/io/legato/kazusa/web/)的配置 +## 对于[Web](/app/src/main/java/io/legado/app/web/)的配置 您需要先在设置中启用"Web 服务"。 @@ -14,7 +14,7 @@ #### 插入单个书源 请求BODY内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt) +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt) ``` URL = http://127.0.0.1:1234/saveBookSource @@ -24,7 +24,7 @@ Method = POST #### 插入多个书源or订阅源 请求BODY内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt)，**为数组格式**。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt)，**为数组格式**。 ``` URL = http://127.0.0.1:1234/saveBookSources @@ -51,7 +51,7 @@ Method = GET #### 删除多个书源or订阅源 请求BODY内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt)，**为数组格式**。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt)，**为数组格式**。 ``` URL = http://127.0.0.1:1234/deleteBookSources @@ -79,7 +79,7 @@ Method = GET #### 替换规则管理 请求BODY内容为`JSON`字符串， -替换规则参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/ReplaceRule.kt)。 +替换规则参考[这个文件](/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt)。 ##### 删除 @@ -118,7 +118,7 @@ Message = { key: [String] } #### 插入书籍 请求BODY内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/Book.kt)。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/Book.kt)。 ``` URL = http://127.0.0.1:1234/saveBook @@ -176,14 +176,14 @@ Method = GET #### 保存书籍进度 请求BODY内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookProgress.kt)。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookProgress.kt)。 ``` URL = http://127.0.0.1:1234/saveBookProgress Method = POST ``` -### [Content Provider](/app/src/main/java/io/legato/kazusa/api/ReaderProvider.kt) +### [Content Provider](/app/src/main/java/io/legado/app/api/ReaderProvider.kt) * 需声明`io.legado.READ_WRITE`权限 @@ -193,7 +193,7 @@ Method = POST #### 插入单个书源or订阅源 创建`Key="json"`的`ContentValues`，内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt) +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt) ``` URL = content://providerHost/bookSource/insert @@ -204,7 +204,7 @@ Method = insert #### 插入多个书源or订阅源 创建`Key="json"`的`ContentValues`，内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt)，**为数组格式**。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt)，**为数组格式**。 ``` URL = content://providerHost/bookSources/insert @@ -237,7 +237,7 @@ Method = query #### 删除多个书源or订阅源 创建`Key="json"`的`ContentValues`，内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt)，**为数组格式**。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/BookSource.kt)，**为数组格式**。 ``` URL = content://providerHost/bookSources/delete @@ -248,7 +248,7 @@ Method = delete #### 插入书籍 创建`Key="json"`的`ContentValues`，内容为`JSON`字符串， -格式参考[这个文件](/app/src/main/java/io/legato/kazusa/data/entities/Book.kt)。 +格式参考[这个文件](/app/src/main/java/io/legado/app/data/entities/Book.kt)。 ``` URL = content://providerHost/book/insert diff --git a/app/build.gradle b/app/build.gradle index e1b69307b..157d0aab6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ def getGitCommitHash() { android { compileSdk = compile_sdk_version - namespace = "io.legato.kazusa" + namespace = "io.legado.app" kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(21)) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 64bc52f97..259c220f3 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -58,7 +58,7 @@ } # 保持js引擎调用的java类 --keep class * extends io.legato.kazusa.help.JsExtensions{*;} +-keep class * extends io.legado.app.help.JsExtensions{*;} # 数据类 -keep class **.data.entities.**{*;} # hutool-core hutool-crypto @@ -122,7 +122,7 @@ cn.hutool.core.util.**{*;} # -keep class com.google.android.exoplayer2.** {*;} ## 对外提供api --keep class io.legato.kazusa.api.ReturnData{*;} +-keep class io.legado.app.api.ReturnData{*;} # Cronet -keepclassmembers class org.chromium.net.X509Util { diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/1.json b/app/schemas/io.legado.app.data.AppDatabase/1.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/1.json rename to app/schemas/io.legado.app.data.AppDatabase/1.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/10.json b/app/schemas/io.legado.app.data.AppDatabase/10.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/10.json rename to app/schemas/io.legado.app.data.AppDatabase/10.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/11.json b/app/schemas/io.legado.app.data.AppDatabase/11.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/11.json rename to app/schemas/io.legado.app.data.AppDatabase/11.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/12.json b/app/schemas/io.legado.app.data.AppDatabase/12.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/12.json rename to app/schemas/io.legado.app.data.AppDatabase/12.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/13.json b/app/schemas/io.legado.app.data.AppDatabase/13.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/13.json rename to app/schemas/io.legado.app.data.AppDatabase/13.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/14.json b/app/schemas/io.legado.app.data.AppDatabase/14.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/14.json rename to app/schemas/io.legado.app.data.AppDatabase/14.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/15.json b/app/schemas/io.legado.app.data.AppDatabase/15.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/15.json rename to app/schemas/io.legado.app.data.AppDatabase/15.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/16.json b/app/schemas/io.legado.app.data.AppDatabase/16.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/16.json rename to app/schemas/io.legado.app.data.AppDatabase/16.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/17.json b/app/schemas/io.legado.app.data.AppDatabase/17.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/17.json rename to app/schemas/io.legado.app.data.AppDatabase/17.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/18.json b/app/schemas/io.legado.app.data.AppDatabase/18.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/18.json rename to app/schemas/io.legado.app.data.AppDatabase/18.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/19.json b/app/schemas/io.legado.app.data.AppDatabase/19.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/19.json rename to app/schemas/io.legado.app.data.AppDatabase/19.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/2.json b/app/schemas/io.legado.app.data.AppDatabase/2.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/2.json rename to app/schemas/io.legado.app.data.AppDatabase/2.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/20.json b/app/schemas/io.legado.app.data.AppDatabase/20.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/20.json rename to app/schemas/io.legado.app.data.AppDatabase/20.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/21.json b/app/schemas/io.legado.app.data.AppDatabase/21.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/21.json rename to app/schemas/io.legado.app.data.AppDatabase/21.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/22.json b/app/schemas/io.legado.app.data.AppDatabase/22.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/22.json rename to app/schemas/io.legado.app.data.AppDatabase/22.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/23.json b/app/schemas/io.legado.app.data.AppDatabase/23.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/23.json rename to app/schemas/io.legado.app.data.AppDatabase/23.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/24.json b/app/schemas/io.legado.app.data.AppDatabase/24.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/24.json rename to app/schemas/io.legado.app.data.AppDatabase/24.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/25.json b/app/schemas/io.legado.app.data.AppDatabase/25.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/25.json rename to app/schemas/io.legado.app.data.AppDatabase/25.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/26.json b/app/schemas/io.legado.app.data.AppDatabase/26.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/26.json rename to app/schemas/io.legado.app.data.AppDatabase/26.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/27.json b/app/schemas/io.legado.app.data.AppDatabase/27.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/27.json rename to app/schemas/io.legado.app.data.AppDatabase/27.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/28.json b/app/schemas/io.legado.app.data.AppDatabase/28.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/28.json rename to app/schemas/io.legado.app.data.AppDatabase/28.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/29.json b/app/schemas/io.legado.app.data.AppDatabase/29.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/29.json rename to app/schemas/io.legado.app.data.AppDatabase/29.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/3.json b/app/schemas/io.legado.app.data.AppDatabase/3.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/3.json rename to app/schemas/io.legado.app.data.AppDatabase/3.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/30.json b/app/schemas/io.legado.app.data.AppDatabase/30.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/30.json rename to app/schemas/io.legado.app.data.AppDatabase/30.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/31.json b/app/schemas/io.legado.app.data.AppDatabase/31.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/31.json rename to app/schemas/io.legado.app.data.AppDatabase/31.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/32.json b/app/schemas/io.legado.app.data.AppDatabase/32.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/32.json rename to app/schemas/io.legado.app.data.AppDatabase/32.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/33.json b/app/schemas/io.legado.app.data.AppDatabase/33.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/33.json rename to app/schemas/io.legado.app.data.AppDatabase/33.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/34.json b/app/schemas/io.legado.app.data.AppDatabase/34.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/34.json rename to app/schemas/io.legado.app.data.AppDatabase/34.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/35.json b/app/schemas/io.legado.app.data.AppDatabase/35.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/35.json rename to app/schemas/io.legado.app.data.AppDatabase/35.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/36.json b/app/schemas/io.legado.app.data.AppDatabase/36.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/36.json rename to app/schemas/io.legado.app.data.AppDatabase/36.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/37.json b/app/schemas/io.legado.app.data.AppDatabase/37.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/37.json rename to app/schemas/io.legado.app.data.AppDatabase/37.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/38.json b/app/schemas/io.legado.app.data.AppDatabase/38.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/38.json rename to app/schemas/io.legado.app.data.AppDatabase/38.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/39.json b/app/schemas/io.legado.app.data.AppDatabase/39.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/39.json rename to app/schemas/io.legado.app.data.AppDatabase/39.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/4.json b/app/schemas/io.legado.app.data.AppDatabase/4.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/4.json rename to app/schemas/io.legado.app.data.AppDatabase/4.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/40.json b/app/schemas/io.legado.app.data.AppDatabase/40.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/40.json rename to app/schemas/io.legado.app.data.AppDatabase/40.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/41.json b/app/schemas/io.legado.app.data.AppDatabase/41.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/41.json rename to app/schemas/io.legado.app.data.AppDatabase/41.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/42.json b/app/schemas/io.legado.app.data.AppDatabase/42.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/42.json rename to app/schemas/io.legado.app.data.AppDatabase/42.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/43.json b/app/schemas/io.legado.app.data.AppDatabase/43.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/43.json rename to app/schemas/io.legado.app.data.AppDatabase/43.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/44.json b/app/schemas/io.legado.app.data.AppDatabase/44.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/44.json rename to app/schemas/io.legado.app.data.AppDatabase/44.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/45.json b/app/schemas/io.legado.app.data.AppDatabase/45.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/45.json rename to app/schemas/io.legado.app.data.AppDatabase/45.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/46.json b/app/schemas/io.legado.app.data.AppDatabase/46.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/46.json rename to app/schemas/io.legado.app.data.AppDatabase/46.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/47.json b/app/schemas/io.legado.app.data.AppDatabase/47.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/47.json rename to app/schemas/io.legado.app.data.AppDatabase/47.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/48.json b/app/schemas/io.legado.app.data.AppDatabase/48.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/48.json rename to app/schemas/io.legado.app.data.AppDatabase/48.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/49.json b/app/schemas/io.legado.app.data.AppDatabase/49.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/49.json rename to app/schemas/io.legado.app.data.AppDatabase/49.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/5.json b/app/schemas/io.legado.app.data.AppDatabase/5.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/5.json rename to app/schemas/io.legado.app.data.AppDatabase/5.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/50.json b/app/schemas/io.legado.app.data.AppDatabase/50.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/50.json rename to app/schemas/io.legado.app.data.AppDatabase/50.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/51.json b/app/schemas/io.legado.app.data.AppDatabase/51.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/51.json rename to app/schemas/io.legado.app.data.AppDatabase/51.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/52.json b/app/schemas/io.legado.app.data.AppDatabase/52.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/52.json rename to app/schemas/io.legado.app.data.AppDatabase/52.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/53.json b/app/schemas/io.legado.app.data.AppDatabase/53.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/53.json rename to app/schemas/io.legado.app.data.AppDatabase/53.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/54.json b/app/schemas/io.legado.app.data.AppDatabase/54.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/54.json rename to app/schemas/io.legado.app.data.AppDatabase/54.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/55.json b/app/schemas/io.legado.app.data.AppDatabase/55.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/55.json rename to app/schemas/io.legado.app.data.AppDatabase/55.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/56.json b/app/schemas/io.legado.app.data.AppDatabase/56.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/56.json rename to app/schemas/io.legado.app.data.AppDatabase/56.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/57.json b/app/schemas/io.legado.app.data.AppDatabase/57.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/57.json rename to app/schemas/io.legado.app.data.AppDatabase/57.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/58.json b/app/schemas/io.legado.app.data.AppDatabase/58.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/58.json rename to app/schemas/io.legado.app.data.AppDatabase/58.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/59.json b/app/schemas/io.legado.app.data.AppDatabase/59.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/59.json rename to app/schemas/io.legado.app.data.AppDatabase/59.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/6.json b/app/schemas/io.legado.app.data.AppDatabase/6.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/6.json rename to app/schemas/io.legado.app.data.AppDatabase/6.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/60.json b/app/schemas/io.legado.app.data.AppDatabase/60.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/60.json rename to app/schemas/io.legado.app.data.AppDatabase/60.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/61.json b/app/schemas/io.legado.app.data.AppDatabase/61.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/61.json rename to app/schemas/io.legado.app.data.AppDatabase/61.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/62.json b/app/schemas/io.legado.app.data.AppDatabase/62.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/62.json rename to app/schemas/io.legado.app.data.AppDatabase/62.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/63.json b/app/schemas/io.legado.app.data.AppDatabase/63.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/63.json rename to app/schemas/io.legado.app.data.AppDatabase/63.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/64.json b/app/schemas/io.legado.app.data.AppDatabase/64.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/64.json rename to app/schemas/io.legado.app.data.AppDatabase/64.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/65.json b/app/schemas/io.legado.app.data.AppDatabase/65.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/65.json rename to app/schemas/io.legado.app.data.AppDatabase/65.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/66.json b/app/schemas/io.legado.app.data.AppDatabase/66.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/66.json rename to app/schemas/io.legado.app.data.AppDatabase/66.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/67.json b/app/schemas/io.legado.app.data.AppDatabase/67.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/67.json rename to app/schemas/io.legado.app.data.AppDatabase/67.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/68.json b/app/schemas/io.legado.app.data.AppDatabase/68.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/68.json rename to app/schemas/io.legado.app.data.AppDatabase/68.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/69.json b/app/schemas/io.legado.app.data.AppDatabase/69.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/69.json rename to app/schemas/io.legado.app.data.AppDatabase/69.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/7.json b/app/schemas/io.legado.app.data.AppDatabase/7.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/7.json rename to app/schemas/io.legado.app.data.AppDatabase/7.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/70.json b/app/schemas/io.legado.app.data.AppDatabase/70.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/70.json rename to app/schemas/io.legado.app.data.AppDatabase/70.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/71.json b/app/schemas/io.legado.app.data.AppDatabase/71.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/71.json rename to app/schemas/io.legado.app.data.AppDatabase/71.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/72.json b/app/schemas/io.legado.app.data.AppDatabase/72.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/72.json rename to app/schemas/io.legado.app.data.AppDatabase/72.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/73.json b/app/schemas/io.legado.app.data.AppDatabase/73.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/73.json rename to app/schemas/io.legado.app.data.AppDatabase/73.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/74.json b/app/schemas/io.legado.app.data.AppDatabase/74.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/74.json rename to app/schemas/io.legado.app.data.AppDatabase/74.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/75.json b/app/schemas/io.legado.app.data.AppDatabase/75.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/75.json rename to app/schemas/io.legado.app.data.AppDatabase/75.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/76.json b/app/schemas/io.legado.app.data.AppDatabase/76.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/76.json rename to app/schemas/io.legado.app.data.AppDatabase/76.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/77.json b/app/schemas/io.legado.app.data.AppDatabase/77.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/77.json rename to app/schemas/io.legado.app.data.AppDatabase/77.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/8.json b/app/schemas/io.legado.app.data.AppDatabase/8.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/8.json rename to app/schemas/io.legado.app.data.AppDatabase/8.json diff --git a/app/schemas/io.legato.kazusa.data.AppDatabase/9.json b/app/schemas/io.legado.app.data.AppDatabase/9.json similarity index 100% rename from app/schemas/io.legato.kazusa.data.AppDatabase/9.json rename to app/schemas/io.legado.app.data.AppDatabase/9.json diff --git a/app/src/androidTest/java/io/legato/kazusa/AndroidJsTest.kt b/app/src/androidTest/java/io/legado/app/AndroidJsTest.kt similarity index 99% rename from app/src/androidTest/java/io/legato/kazusa/AndroidJsTest.kt rename to app/src/androidTest/java/io/legado/app/AndroidJsTest.kt index 17fa4df73..f2d236472 100644 --- a/app/src/androidTest/java/io/legato/kazusa/AndroidJsTest.kt +++ b/app/src/androidTest/java/io/legado/app/AndroidJsTest.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa +package io.legado.app import cn.hutool.core.lang.JarClassLoader import com.script.ScriptBindings diff --git a/app/src/androidTest/java/io/legato/kazusa/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/legado/app/ExampleInstrumentedTest.kt similarity index 97% rename from app/src/androidTest/java/io/legato/kazusa/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/io/legado/app/ExampleInstrumentedTest.kt index 0964eceb7..56130db62 100644 --- a/app/src/androidTest/java/io/legato/kazusa/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/io/legado/app/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa +package io.legado.app import android.content.Context import android.net.Uri diff --git a/app/src/androidTest/java/io/legato/kazusa/HttpTest.kt b/app/src/androidTest/java/io/legado/app/HttpTest.kt similarity index 96% rename from app/src/androidTest/java/io/legato/kazusa/HttpTest.kt rename to app/src/androidTest/java/io/legado/app/HttpTest.kt index f94e18dcf..dd5fb7965 100644 --- a/app/src/androidTest/java/io/legato/kazusa/HttpTest.kt +++ b/app/src/androidTest/java/io/legado/app/HttpTest.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa +package io.legado.app import android.app.DownloadManager import android.net.Uri import android.os.Environment import android.webkit.WebSettings import android.webkit.WebView -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.runOnUI +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.runOnUI import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import org.junit.Test diff --git a/app/src/androidTest/java/io/legato/kazusa/HttpTtsTest.kt b/app/src/androidTest/java/io/legado/app/HttpTtsTest.kt similarity index 85% rename from app/src/androidTest/java/io/legato/kazusa/HttpTtsTest.kt rename to app/src/androidTest/java/io/legado/app/HttpTtsTest.kt index 4a9bf62ec..e9b1601bb 100644 --- a/app/src/androidTest/java/io/legato/kazusa/HttpTtsTest.kt +++ b/app/src/androidTest/java/io/legado/app/HttpTtsTest.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa +package io.legado.app -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl +import io.legado.app.help.config.AppConfig +import io.legado.app.model.analyzeRule.AnalyzeUrl import kotlinx.coroutines.runBlocking import org.junit.Test diff --git a/app/src/androidTest/java/io/legato/kazusa/MigrationTest.kt b/app/src/androidTest/java/io/legado/app/MigrationTest.kt similarity index 95% rename from app/src/androidTest/java/io/legato/kazusa/MigrationTest.kt rename to app/src/androidTest/java/io/legado/app/MigrationTest.kt index f6eb9ed60..dbac4197a 100644 --- a/app/src/androidTest/java/io/legato/kazusa/MigrationTest.kt +++ b/app/src/androidTest/java/io/legado/app/MigrationTest.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa +package io.legado.app import androidx.room.Room import androidx.room.migration.Migration @@ -6,7 +6,7 @@ import androidx.room.testing.MigrationTestHelper import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import io.legato.kazusa.data.AppDatabase +import io.legado.app.data.AppDatabase import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/io/legato/kazusa/UpdateTest.kt b/app/src/androidTest/java/io/legado/app/UpdateTest.kt similarity index 87% rename from app/src/androidTest/java/io/legato/kazusa/UpdateTest.kt rename to app/src/androidTest/java/io/legado/app/UpdateTest.kt index a3596b1a2..696eec31e 100644 --- a/app/src/androidTest/java/io/legato/kazusa/UpdateTest.kt +++ b/app/src/androidTest/java/io/legado/app/UpdateTest.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa +package io.legado.app import com.google.gson.Gson -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.update.GithubRelease -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.update.GithubRelease +import io.legado.app.utils.fromJsonObject import okhttp3.Request import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebf5c7921..c98a9475d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -185,12 +185,12 @@ android:launchMode="singleTask" /> @@ -334,7 +334,7 @@ android:launchMode="standard" /> ( fullScreen: Boolean = true, diff --git a/app/src/main/java/io/legato/kazusa/base/VMBaseFragment.kt b/app/src/main/java/io/legado/app/base/VMBaseFragment.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/base/VMBaseFragment.kt rename to app/src/main/java/io/legado/app/base/VMBaseFragment.kt index debd0727b..cc78d19dd 100644 --- a/app/src/main/java/io/legato/kazusa/base/VMBaseFragment.kt +++ b/app/src/main/java/io/legado/app/base/VMBaseFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base +package io.legado.app.base import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/DiffRecyclerAdapter.kt b/app/src/main/java/io/legado/app/base/adapter/DiffRecyclerAdapter.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/base/adapter/DiffRecyclerAdapter.kt rename to app/src/main/java/io/legado/app/base/adapter/DiffRecyclerAdapter.kt index 2b2ab13bd..d9ce8a7e8 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/DiffRecyclerAdapter.kt +++ b/app/src/main/java/io/legado/app/base/adapter/DiffRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter +package io.legado.app.base.adapter import android.content.Context import android.os.Parcelable diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/ItemAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/base/adapter/ItemAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt index d5bce2880..2285c8242 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/ItemAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.base.adapter +package io.legado.app.base.adapter import android.view.animation.Interpolator import android.view.animation.LinearInterpolator -import io.legato.kazusa.base.adapter.animations.* +import io.legado.app.base.adapter.animations.* /** * Created by Invincible on 2017/12/15. diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/ItemViewHolder.kt b/app/src/main/java/io/legado/app/base/adapter/ItemViewHolder.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/base/adapter/ItemViewHolder.kt rename to app/src/main/java/io/legado/app/base/adapter/ItemViewHolder.kt index fdb5eaa72..da57d4627 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/ItemViewHolder.kt +++ b/app/src/main/java/io/legado/app/base/adapter/ItemViewHolder.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter +package io.legado.app.base.adapter import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/RecyclerAdapter.kt b/app/src/main/java/io/legado/app/base/adapter/RecyclerAdapter.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/base/adapter/RecyclerAdapter.kt rename to app/src/main/java/io/legado/app/base/adapter/RecyclerAdapter.kt index adc46c766..98090cc27 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/RecyclerAdapter.kt +++ b/app/src/main/java/io/legado/app/base/adapter/RecyclerAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter +package io.legado.app.base.adapter import android.annotation.SuppressLint import android.content.Context @@ -9,9 +9,9 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.withTimeoutOrNullAsync +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.withTimeoutOrNullAsync import kotlinx.coroutines.ensureActive import splitties.views.onLongClick import java.util.Collections diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/AlphaInAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/AlphaInAnimation.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/AlphaInAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/AlphaInAnimation.kt index 119fa0368..f5932a100 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/AlphaInAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/AlphaInAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.animation.ObjectAnimator diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/BaseAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/BaseAnimation.kt similarity index 77% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/BaseAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/BaseAnimation.kt index 40e795370..735ceca57 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/BaseAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/BaseAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.view.View diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/ScaleInAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/ScaleInAnimation.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/ScaleInAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/ScaleInAnimation.kt index df38d4e74..9566e2ad0 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/ScaleInAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/ScaleInAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.animation.ObjectAnimator diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInBottomAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInBottomAnimation.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInBottomAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/SlideInBottomAnimation.kt index 04d7132e6..941562201 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInBottomAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInBottomAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.animation.ObjectAnimator diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInLeftAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInLeftAnimation.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInLeftAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/SlideInLeftAnimation.kt index 623ea86b5..8cfae170b 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInLeftAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInLeftAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.animation.ObjectAnimator diff --git a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInRightAnimation.kt b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInRightAnimation.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInRightAnimation.kt rename to app/src/main/java/io/legado/app/base/adapter/animations/SlideInRightAnimation.kt index 765420a0e..e7f1c85e5 100644 --- a/app/src/main/java/io/legato/kazusa/base/adapter/animations/SlideInRightAnimation.kt +++ b/app/src/main/java/io/legado/app/base/adapter/animations/SlideInRightAnimation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.base.adapter.animations +package io.legado.app.base.adapter.animations import android.animation.Animator import android.animation.ObjectAnimator diff --git a/app/src/main/java/io/legato/kazusa/constant/AppConst.kt b/app/src/main/java/io/legado/app/constant/AppConst.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/constant/AppConst.kt rename to app/src/main/java/io/legado/app/constant/AppConst.kt index cb7157d92..7f3fa3a11 100644 --- a/app/src/main/java/io/legato/kazusa/constant/AppConst.kt +++ b/app/src/main/java/io/legado/app/constant/AppConst.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import android.annotation.SuppressLint import android.content.pm.PackageManager import android.provider.Settings import androidx.annotation.Keep import cn.hutool.crypto.digest.DigestUtil -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.help.update.AppVariant +import io.legado.app.BuildConfig +import io.legado.app.help.update.AppVariant import org.apache.commons.lang3.time.FastDateFormat import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/constant/AppLog.kt b/app/src/main/java/io/legado/app/constant/AppLog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/constant/AppLog.kt rename to app/src/main/java/io/legado/app/constant/AppLog.kt index 150230d4e..845e1a414 100644 --- a/app/src/main/java/io/legato/kazusa/constant/AppLog.kt +++ b/app/src/main/java/io/legado/app/constant/AppLog.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import android.util.Log -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.BuildConfig +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.LogUtils +import io.legado.app.utils.toastOnUi import splitties.init.appCtx object AppLog { diff --git a/app/src/main/java/io/legato/kazusa/constant/AppPattern.kt b/app/src/main/java/io/legado/app/constant/AppPattern.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/constant/AppPattern.kt rename to app/src/main/java/io/legado/app/constant/AppPattern.kt index 555595989..ee3b8920b 100644 --- a/app/src/main/java/io/legato/kazusa/constant/AppPattern.kt +++ b/app/src/main/java/io/legado/app/constant/AppPattern.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/constant/BookSourceType.kt b/app/src/main/java/io/legado/app/constant/BookSourceType.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/constant/BookSourceType.kt rename to app/src/main/java/io/legado/app/constant/BookSourceType.kt index 7a31dfea8..fc0d4f1f0 100644 --- a/app/src/main/java/io/legato/kazusa/constant/BookSourceType.kt +++ b/app/src/main/java/io/legado/app/constant/BookSourceType.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import androidx.annotation.IntDef diff --git a/app/src/main/java/io/legato/kazusa/constant/BookType.kt b/app/src/main/java/io/legado/app/constant/BookType.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/constant/BookType.kt rename to app/src/main/java/io/legado/app/constant/BookType.kt index f38f87238..fcdd0bd8e 100644 --- a/app/src/main/java/io/legato/kazusa/constant/BookType.kt +++ b/app/src/main/java/io/legado/app/constant/BookType.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import androidx.annotation.IntDef diff --git a/app/src/main/java/io/legato/kazusa/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/constant/EventBus.kt rename to app/src/main/java/io/legado/app/constant/EventBus.kt index f23fe405a..cf12b58a5 100644 --- a/app/src/main/java/io/legato/kazusa/constant/EventBus.kt +++ b/app/src/main/java/io/legado/app/constant/EventBus.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant object EventBus { const val MEDIA_BUTTON = "mediaButton" diff --git a/app/src/main/java/io/legato/kazusa/constant/IntentAction.kt b/app/src/main/java/io/legado/app/constant/IntentAction.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/constant/IntentAction.kt rename to app/src/main/java/io/legado/app/constant/IntentAction.kt index 8cc1bd536..5a603fa1d 100644 --- a/app/src/main/java/io/legato/kazusa/constant/IntentAction.kt +++ b/app/src/main/java/io/legado/app/constant/IntentAction.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant @Suppress("ConstPropertyName") object IntentAction { diff --git a/app/src/main/java/io/legato/kazusa/constant/NotificationId.kt b/app/src/main/java/io/legado/app/constant/NotificationId.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/constant/NotificationId.kt rename to app/src/main/java/io/legado/app/constant/NotificationId.kt index 1cafaf39b..377e3c13e 100644 --- a/app/src/main/java/io/legato/kazusa/constant/NotificationId.kt +++ b/app/src/main/java/io/legado/app/constant/NotificationId.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant /** * 通知ID不能重复,统一规划通知ID diff --git a/app/src/main/java/io/legato/kazusa/constant/PageAnim.kt b/app/src/main/java/io/legado/app/constant/PageAnim.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/constant/PageAnim.kt rename to app/src/main/java/io/legado/app/constant/PageAnim.kt index 22d98f751..ec505b455 100644 --- a/app/src/main/java/io/legato/kazusa/constant/PageAnim.kt +++ b/app/src/main/java/io/legado/app/constant/PageAnim.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import androidx.annotation.IntDef diff --git a/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/constant/PreferKey.kt rename to app/src/main/java/io/legado/app/constant/PreferKey.kt index 85e91c41d..83173ecc3 100644 --- a/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant @Suppress("ConstPropertyName") object PreferKey { diff --git a/app/src/main/java/io/legato/kazusa/constant/SourceType.kt b/app/src/main/java/io/legado/app/constant/SourceType.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/constant/SourceType.kt rename to app/src/main/java/io/legado/app/constant/SourceType.kt index ab95e6be1..14252146c 100644 --- a/app/src/main/java/io/legato/kazusa/constant/SourceType.kt +++ b/app/src/main/java/io/legado/app/constant/SourceType.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant import androidx.annotation.IntDef diff --git a/app/src/main/java/io/legato/kazusa/constant/Status.kt b/app/src/main/java/io/legado/app/constant/Status.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/constant/Status.kt rename to app/src/main/java/io/legado/app/constant/Status.kt index 9eb5a0466..678c62221 100644 --- a/app/src/main/java/io/legato/kazusa/constant/Status.kt +++ b/app/src/main/java/io/legado/app/constant/Status.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant object Status { const val STOP = 0 diff --git a/app/src/main/java/io/legato/kazusa/constant/Theme.kt b/app/src/main/java/io/legado/app/constant/Theme.kt similarity index 56% rename from app/src/main/java/io/legato/kazusa/constant/Theme.kt rename to app/src/main/java/io/legado/app/constant/Theme.kt index 31adc48e3..7a2aabe83 100644 --- a/app/src/main/java/io/legato/kazusa/constant/Theme.kt +++ b/app/src/main/java/io/legado/app/constant/Theme.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.constant +package io.legado.app.constant enum class Theme { Dark, Light, Auto; diff --git a/app/src/main/java/io/legato/kazusa/data/AppDatabase.kt b/app/src/main/java/io/legado/app/data/AppDatabase.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/data/AppDatabase.kt rename to app/src/main/java/io/legado/app/data/AppDatabase.kt index f4dbabe91..983d40601 100644 --- a/app/src/main/java/io/legato/kazusa/data/AppDatabase.kt +++ b/app/src/main/java/io/legado/app/data/AppDatabase.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data +package io.legado.app.data import android.content.ContentValues import android.database.sqlite.SQLiteDatabase @@ -7,50 +7,50 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.sqlite.db.SupportSQLiteDatabase -import io.legato.kazusa.data.dao.BookChapterDao -import io.legato.kazusa.data.dao.BookDao -import io.legato.kazusa.data.dao.BookGroupDao -import io.legato.kazusa.data.dao.BookSourceDao -import io.legato.kazusa.data.dao.BookmarkDao -import io.legato.kazusa.data.dao.CacheDao -import io.legato.kazusa.data.dao.CookieDao -import io.legato.kazusa.data.dao.DictRuleDao -import io.legato.kazusa.data.dao.HttpTTSDao -import io.legato.kazusa.data.dao.KeyboardAssistsDao -import io.legato.kazusa.data.dao.ReadRecordDao -import io.legato.kazusa.data.dao.ReplaceRuleDao -import io.legato.kazusa.data.dao.RssArticleDao -import io.legato.kazusa.data.dao.RssReadRecordDao -import io.legato.kazusa.data.dao.RssSourceDao -import io.legato.kazusa.data.dao.RssStarDao -import io.legato.kazusa.data.dao.RuleSubDao -import io.legato.kazusa.data.dao.SearchBookDao -import io.legato.kazusa.data.dao.SearchKeywordDao -import io.legato.kazusa.data.dao.ServerDao -import io.legato.kazusa.data.dao.TxtTocRuleDao -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.data.entities.Cache -import io.legato.kazusa.data.entities.Cookie -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.data.entities.KeyboardAssist -import io.legato.kazusa.data.entities.ReadRecord -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssReadRecord -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.data.entities.RssStar -import io.legato.kazusa.data.entities.RuleSub -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.data.entities.SearchKeyword -import io.legato.kazusa.data.entities.Server -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.help.DefaultData +import io.legado.app.data.dao.BookChapterDao +import io.legado.app.data.dao.BookDao +import io.legado.app.data.dao.BookGroupDao +import io.legado.app.data.dao.BookSourceDao +import io.legado.app.data.dao.BookmarkDao +import io.legado.app.data.dao.CacheDao +import io.legado.app.data.dao.CookieDao +import io.legado.app.data.dao.DictRuleDao +import io.legado.app.data.dao.HttpTTSDao +import io.legado.app.data.dao.KeyboardAssistsDao +import io.legado.app.data.dao.ReadRecordDao +import io.legado.app.data.dao.ReplaceRuleDao +import io.legado.app.data.dao.RssArticleDao +import io.legado.app.data.dao.RssReadRecordDao +import io.legado.app.data.dao.RssSourceDao +import io.legado.app.data.dao.RssStarDao +import io.legado.app.data.dao.RuleSubDao +import io.legado.app.data.dao.SearchBookDao +import io.legado.app.data.dao.SearchKeywordDao +import io.legado.app.data.dao.ServerDao +import io.legado.app.data.dao.TxtTocRuleDao +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookGroup +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.Bookmark +import io.legado.app.data.entities.Cache +import io.legado.app.data.entities.Cookie +import io.legado.app.data.entities.DictRule +import io.legado.app.data.entities.HttpTTS +import io.legado.app.data.entities.KeyboardAssist +import io.legado.app.data.entities.ReadRecord +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssReadRecord +import io.legado.app.data.entities.RssSource +import io.legado.app.data.entities.RssStar +import io.legado.app.data.entities.RuleSub +import io.legado.app.data.entities.SearchBook +import io.legado.app.data.entities.SearchKeyword +import io.legado.app.data.entities.Server +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.help.DefaultData import org.intellij.lang.annotations.Language import splitties.init.appCtx import java.util.Locale diff --git a/app/src/main/java/io/legato/kazusa/data/DatabaseMigrations.kt b/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/data/DatabaseMigrations.kt rename to app/src/main/java/io/legado/app/data/DatabaseMigrations.kt index 4d44392a9..3dc41d31e 100644 --- a/app/src/main/java/io/legato/kazusa/data/DatabaseMigrations.kt +++ b/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.data +package io.legado.app.data import androidx.room.DeleteColumn import androidx.room.migration.AutoMigrationSpec import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.constant.BookType +import io.legado.app.constant.AppConst +import io.legado.app.constant.BookSourceType +import io.legado.app.constant.BookType object DatabaseMigrations { diff --git a/app/src/main/java/io/legato/kazusa/data/README.md b/app/src/main/java/io/legado/app/data/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/data/README.md rename to app/src/main/java/io/legado/app/data/README.md diff --git a/app/src/main/java/io/legato/kazusa/data/dao/BookChapterDao.kt b/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/dao/BookChapterDao.kt rename to app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt index 4bbbde9e5..87336219b 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/BookChapterDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import io.legato.kazusa.data.entities.BookChapter +import io.legado.app.data.entities.BookChapter @Dao interface BookChapterDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/BookDao.kt b/app/src/main/java/io/legado/app/data/dao/BookDao.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/dao/BookDao.kt rename to app/src/main/java/io/legado/app/data/dao/BookDao.kt index 36029ac27..e2cec7bd3 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/BookDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Delete @@ -7,11 +7,11 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.book.isNotShelf +import io.legado.app.constant.BookType +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.data.entities.BookSource +import io.legado.app.help.book.isNotShelf import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/io/legato/kazusa/data/dao/BookGroupDao.kt b/app/src/main/java/io/legado/app/data/dao/BookGroupDao.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/data/dao/BookGroupDao.kt rename to app/src/main/java/io/legado/app/data/dao/BookGroupDao.kt index 3ed2c9339..59c8937a6 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/BookGroupDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookGroupDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,8 +7,8 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.entities.BookGroup +import io.legado.app.constant.BookType +import io.legado.app.data.entities.BookGroup import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/BookSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/data/dao/BookSourceDao.kt rename to app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt index a7f122bb0..044644a91 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/BookSourceDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Delete @@ -7,11 +7,11 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.utils.cnCompare +import io.legado.app.utils.splitNotBlank import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/data/dao/BookmarkDao.kt b/app/src/main/java/io/legado/app/data/dao/BookmarkDao.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/dao/BookmarkDao.kt rename to app/src/main/java/io/legado/app/data/dao/BookmarkDao.kt index 718d4d3a2..7940139ff 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/BookmarkDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookmarkDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.Bookmark +import io.legado.app.data.entities.Bookmark import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/io/legato/kazusa/data/dao/CacheDao.kt b/app/src/main/java/io/legado/app/data/dao/CacheDao.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/dao/CacheDao.kt rename to app/src/main/java/io/legado/app/data/dao/CacheDao.kt index 5b7fa6f7d..c3cdb331e 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/CacheDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/CacheDao.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import io.legato.kazusa.data.entities.Cache +import io.legado.app.data.entities.Cache @Dao interface CacheDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/CookieDao.kt b/app/src/main/java/io/legado/app/data/dao/CookieDao.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/data/dao/CookieDao.kt rename to app/src/main/java/io/legado/app/data/dao/CookieDao.kt index 32c2e0277..f667b7d2d 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/CookieDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/CookieDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.Cookie +import io.legado.app.data.entities.Cookie @Dao interface CookieDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/DictRuleDao.kt b/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/data/dao/DictRuleDao.kt rename to app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt index ddca83ae4..6dfd601bf 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/DictRuleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.DictRule +import io.legado.app.data.entities.DictRule import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/io/legato/kazusa/data/dao/HttpTTSDao.kt b/app/src/main/java/io/legado/app/data/dao/HttpTTSDao.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/dao/HttpTTSDao.kt rename to app/src/main/java/io/legado/app/data/dao/HttpTTSDao.kt index 1737e976d..b75fd290a 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/HttpTTSDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/HttpTTSDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.HttpTTS +import io.legado.app.data.entities.HttpTTS import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/KeyboardAssistsDao.kt b/app/src/main/java/io/legado/app/data/dao/KeyboardAssistsDao.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/data/dao/KeyboardAssistsDao.kt rename to app/src/main/java/io/legado/app/data/dao/KeyboardAssistsDao.kt index 167f40853..b25fec1a9 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/KeyboardAssistsDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/KeyboardAssistsDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.KeyboardAssist +import io.legado.app.data.entities.KeyboardAssist import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/ReadRecordDao.kt b/app/src/main/java/io/legado/app/data/dao/ReadRecordDao.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/dao/ReadRecordDao.kt rename to app/src/main/java/io/legado/app/data/dao/ReadRecordDao.kt index fd4b83239..a844fe9a7 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/ReadRecordDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/ReadRecordDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Delete @@ -6,8 +6,8 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import io.legato.kazusa.data.entities.ReadRecord -import io.legato.kazusa.data.entities.ReadRecordShow +import io.legado.app.data.entities.ReadRecord +import io.legado.app.data.entities.ReadRecordShow @Dao interface ReadRecordDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/ReplaceRuleDao.kt b/app/src/main/java/io/legado/app/data/dao/ReplaceRuleDao.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/data/dao/ReplaceRuleDao.kt rename to app/src/main/java/io/legado/app/data/dao/ReplaceRuleDao.kt index 52d04c524..09867c9b9 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/ReplaceRuleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/ReplaceRuleDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Delete @@ -6,10 +6,10 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.utils.cnCompare +import io.legado.app.utils.splitNotBlank import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/data/dao/RssArticleDao.kt b/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/data/dao/RssArticleDao.kt rename to app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt index cbf4735d3..c8742f8fc 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/RssArticleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssArticleDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.RssArticle +import io.legado.app.data.entities.RssArticle import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/RssReadRecordDao.kt b/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/data/dao/RssReadRecordDao.kt rename to app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt index aeafcb46c..138a72a4e 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/RssReadRecordDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.RssReadRecord +import io.legado.app.data.entities.RssReadRecord @Dao interface RssReadRecordDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/RssSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/RssSourceDao.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/data/dao/RssSourceDao.kt rename to app/src/main/java/io/legado/app/data/dao/RssSourceDao.kt index d9efc6939..489fce0dd 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/RssSourceDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssSourceDao.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.Dao import androidx.room.Delete @@ -6,10 +6,10 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.RssSource +import io.legado.app.utils.cnCompare +import io.legado.app.utils.splitNotBlank import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/data/dao/RssStarDao.kt b/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/data/dao/RssStarDao.kt rename to app/src/main/java/io/legado/app/data/dao/RssStarDao.kt index 56c3b9530..083b8f6bf 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/RssStarDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssStarDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.RssStar +import io.legado.app.data.entities.RssStar import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/RuleSubDao.kt b/app/src/main/java/io/legado/app/data/dao/RuleSubDao.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/data/dao/RuleSubDao.kt rename to app/src/main/java/io/legado/app/data/dao/RuleSubDao.kt index 235614768..56d87b262 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/RuleSubDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RuleSubDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.RuleSub +import io.legado.app.data.entities.RuleSub import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/SearchBookDao.kt b/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/data/dao/SearchBookDao.kt rename to app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt index 04939b7a5..9444a0964 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/SearchBookDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.SearchBook +import io.legado.app.data.entities.SearchBook @Dao interface SearchBookDao { diff --git a/app/src/main/java/io/legato/kazusa/data/dao/SearchKeywordDao.kt b/app/src/main/java/io/legado/app/data/dao/SearchKeywordDao.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/data/dao/SearchKeywordDao.kt rename to app/src/main/java/io/legado/app/data/dao/SearchKeywordDao.kt index c19ad41ee..2b433e488 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/SearchKeywordDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/SearchKeywordDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.SearchKeyword +import io.legado.app.data.entities.SearchKeyword import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/io/legato/kazusa/data/dao/ServerDao.kt b/app/src/main/java/io/legado/app/data/dao/ServerDao.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/dao/ServerDao.kt rename to app/src/main/java/io/legado/app/data/dao/ServerDao.kt index 1afd182cb..fd6b41198 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/ServerDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/ServerDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.Server +import io.legado.app.data.entities.Server import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/dao/TxtTocRuleDao.kt b/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/dao/TxtTocRuleDao.kt rename to app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt index 8eefb83d9..32981d1d4 100644 --- a/app/src/main/java/io/legato/kazusa/data/dao/TxtTocRuleDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/TxtTocRuleDao.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.data.dao +package io.legado.app.data.dao import androidx.room.* -import io.legato.kazusa.data.entities.TxtTocRule +import io.legado.app.data.entities.TxtTocRule import kotlinx.coroutines.flow.Flow @Dao diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BaseBook.kt b/app/src/main/java/io/legado/app/data/entities/BaseBook.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/data/entities/BaseBook.kt rename to app/src/main/java/io/legado/app/data/entities/BaseBook.kt index 44a00c546..a469dcd99 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BaseBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/BaseBook.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities -import io.legato.kazusa.help.RuleBigDataHelp -import io.legato.kazusa.model.analyzeRule.RuleDataInterface -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.help.RuleBigDataHelp +import io.legado.app.model.analyzeRule.RuleDataInterface +import io.legado.app.utils.GSON +import io.legado.app.utils.splitNotBlank interface BaseBook : RuleDataInterface { var name: String diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BaseRssArticle.kt b/app/src/main/java/io/legado/app/data/entities/BaseRssArticle.kt similarity index 76% rename from app/src/main/java/io/legato/kazusa/data/entities/BaseRssArticle.kt rename to app/src/main/java/io/legado/app/data/entities/BaseRssArticle.kt index 710cc375e..b42040a03 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BaseRssArticle.kt +++ b/app/src/main/java/io/legado/app/data/entities/BaseRssArticle.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities -import io.legato.kazusa.help.RuleBigDataHelp -import io.legato.kazusa.model.analyzeRule.RuleDataInterface -import io.legato.kazusa.utils.GSON +import io.legado.app.help.RuleBigDataHelp +import io.legado.app.model.analyzeRule.RuleDataInterface +import io.legado.app.utils.GSON interface BaseRssArticle : RuleDataInterface { diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BaseSource.kt b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/data/entities/BaseSource.kt rename to app/src/main/java/io/legado/app/data/entities/BaseSource.kt index c35421ef0..b56e843a6 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BaseSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import cn.hutool.crypto.symmetric.AES import com.script.ScriptBindings import com.script.buildScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.rule.RowUi -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.JsExtensions -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.crypto.SymmetricCryptoAndroid -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.source.getShareScope -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.GSONStrict -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.has -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.rule.RowUi +import io.legado.app.help.CacheManager +import io.legado.app.help.JsExtensions +import io.legado.app.help.config.AppConfig +import io.legado.app.help.crypto.SymmetricCryptoAndroid +import io.legado.app.help.http.CookieStore +import io.legado.app.help.source.getShareScope +import io.legado.app.utils.GSON +import io.legado.app.utils.GSONStrict +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.has +import io.legado.app.utils.printOnDebug import org.intellij.lang.annotations.Language /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/data/entities/Book.kt rename to app/src/main/java/io/legado/app/data/entities/Book.kt index f7902aeb8..198a2c782 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.ColumnInfo @@ -8,21 +8,21 @@ import androidx.room.Index import androidx.room.PrimaryKey import androidx.room.TypeConverter import androidx.room.TypeConverters -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.PageAnim -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.getFolderNameNoCache -import io.legato.kazusa.help.book.isEpub -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.constant.AppPattern +import io.legado.app.constant.BookType +import io.legado.app.constant.PageAnim +import io.legado.app.data.appDb +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.getFolderNameNoCache +import io.legado.app.help.book.isEpub +import io.legado.app.help.book.isImage +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ReadBook +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import java.nio.charset.Charset diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/data/entities/BookChapter.kt rename to app/src/main/java/io/legado/app/data/entities/BookChapter.kt index 13e7a0586..71ec4283a 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookChapter.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.annotation.SuppressLint import android.os.Parcelable @@ -6,21 +6,21 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.Index -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.exception.RegexTimeoutException -import io.legato.kazusa.help.RuleBigDataHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.RuleDataInterface -import io.legato.kazusa.utils.ChineseUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.replace -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.exception.RegexTimeoutException +import io.legado.app.help.RuleBigDataHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.RuleDataInterface +import io.legado.app.utils.ChineseUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.replace +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CancellationException import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookChapterReview.kt b/app/src/main/java/io/legado/app/data/entities/BookChapterReview.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/data/entities/BookChapterReview.kt rename to app/src/main/java/io/legado/app/data/entities/BookChapterReview.kt index a53d6f966..64a838f42 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookChapterReview.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapterReview.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.ColumnInfo diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookGroup.kt b/app/src/main/java/io/legado/app/data/entities/BookGroup.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/entities/BookGroup.kt rename to app/src/main/java/io/legado/app/data/entities/BookGroup.kt index 36d0d819d..37eb08edf 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookGroup.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookGroup.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.content.Context import android.os.Parcelable import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import io.legato.kazusa.R -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.help.config.AppConfig import kotlinx.parcelize.Parcelize @Suppress("ConstPropertyName") diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookProgress.kt b/app/src/main/java/io/legado/app/data/entities/BookProgress.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/BookProgress.kt rename to app/src/main/java/io/legado/app/data/entities/BookProgress.kt index 620bfbf09..d5fd70d10 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookProgress.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookProgress.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities data class BookProgress( val name: String, diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt rename to app/src/main/java/io/legado/app/data/entities/BookSource.kt index 3bd424f43..49edf798d 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import android.text.TextUtils @@ -8,17 +8,17 @@ import androidx.room.Index import androidx.room.PrimaryKey import androidx.room.TypeConverter import androidx.room.TypeConverters -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.data.entities.rule.BookInfoRule -import io.legato.kazusa.data.entities.rule.ContentRule -import io.legato.kazusa.data.entities.rule.ExploreRule -import io.legato.kazusa.data.entities.rule.ReviewRule -import io.legato.kazusa.data.entities.rule.SearchRule -import io.legato.kazusa.data.entities.rule.TocRule -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.constant.BookSourceType +import io.legado.app.data.entities.rule.BookInfoRule +import io.legado.app.data.entities.rule.ContentRule +import io.legado.app.data.entities.rule.ExploreRule +import io.legado.app.data.entities.rule.ReviewRule +import io.legado.app.data.entities.rule.SearchRule +import io.legado.app.data.entities.rule.TocRule +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.splitNotBlank import kotlinx.parcelize.Parcelize @Suppress("unused") diff --git a/app/src/main/java/io/legato/kazusa/data/entities/BookSourcePart.kt b/app/src/main/java/io/legado/app/data/entities/BookSourcePart.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/entities/BookSourcePart.kt rename to app/src/main/java/io/legado/app/data/entities/BookSourcePart.kt index 9b21a19b2..3fea92656 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/BookSourcePart.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookSourcePart.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.text.TextUtils import androidx.room.DatabaseView -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.utils.splitNotBlank @DatabaseView( diff --git a/app/src/main/java/io/legato/kazusa/data/entities/Bookmark.kt b/app/src/main/java/io/legado/app/data/entities/Bookmark.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/entities/Bookmark.kt rename to app/src/main/java/io/legado/app/data/entities/Bookmark.kt index ac7568fb5..109397042 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/Bookmark.kt +++ b/app/src/main/java/io/legado/app/data/entities/Bookmark.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.Entity diff --git a/app/src/main/java/io/legato/kazusa/data/entities/Cache.kt b/app/src/main/java/io/legado/app/data/entities/Cache.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/data/entities/Cache.kt rename to app/src/main/java/io/legado/app/data/entities/Cache.kt index 6337f1f54..f9687dea7 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/Cache.kt +++ b/app/src/main/java/io/legado/app/data/entities/Cache.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.Entity import androidx.room.Index diff --git a/app/src/main/java/io/legato/kazusa/data/entities/Cookie.kt b/app/src/main/java/io/legado/app/data/entities/Cookie.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/data/entities/Cookie.kt rename to app/src/main/java/io/legado/app/data/entities/Cookie.kt index eecd9446d..8e12febf4 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/Cookie.kt +++ b/app/src/main/java/io/legado/app/data/entities/Cookie.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.Entity import androidx.room.Index diff --git a/app/src/main/java/io/legato/kazusa/data/entities/DictRule.kt b/app/src/main/java/io/legado/app/data/entities/DictRule.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/data/entities/DictRule.kt rename to app/src/main/java/io/legado/app/data/entities/DictRule.kt index 753762656..eae1fb8bb 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/DictRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/DictRule.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl import kotlin.coroutines.coroutineContext /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/HttpTTS.kt b/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/entities/HttpTTS.kt rename to app/src/main/java/io/legado/app/data/entities/HttpTTS.kt index abcb14e45..040bb6b3d 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/HttpTTS.kt +++ b/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import com.jayway.jsonpath.DocumentContext -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.jsonPath -import io.legato.kazusa.utils.readLong -import io.legato.kazusa.utils.readString +import io.legado.app.utils.GSON +import io.legado.app.utils.jsonPath +import io.legado.app.utils.readLong +import io.legado.app.utils.readString /** * 在线朗读引擎 diff --git a/app/src/main/java/io/legato/kazusa/data/entities/KeyboardAssist.kt b/app/src/main/java/io/legado/app/data/entities/KeyboardAssist.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/KeyboardAssist.kt rename to app/src/main/java/io/legado/app/data/entities/KeyboardAssist.kt index a2488e14d..7cab22111 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/KeyboardAssist.kt +++ b/app/src/main/java/io/legado/app/data/entities/KeyboardAssist.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.ColumnInfo diff --git a/app/src/main/java/io/legato/kazusa/data/entities/ReadRecord.kt b/app/src/main/java/io/legado/app/data/entities/ReadRecord.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/ReadRecord.kt rename to app/src/main/java/io/legado/app/data/entities/ReadRecord.kt index 0b0899360..c1638ac31 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/ReadRecord.kt +++ b/app/src/main/java/io/legado/app/data/entities/ReadRecord.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/io/legato/kazusa/data/entities/ReadRecordShow.kt b/app/src/main/java/io/legado/app/data/entities/ReadRecordShow.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/data/entities/ReadRecordShow.kt rename to app/src/main/java/io/legado/app/data/entities/ReadRecordShow.kt index 9db57f564..293270276 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/ReadRecordShow.kt +++ b/app/src/main/java/io/legado/app/data/entities/ReadRecordShow.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities data class ReadRecordShow( var bookName: String, diff --git a/app/src/main/java/io/legato/kazusa/data/entities/ReplaceRule.kt b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/entities/ReplaceRule.kt rename to app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt index d1fca6e31..e3b87e31a 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/ReplaceRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import android.text.TextUtils @@ -7,9 +7,9 @@ import androidx.room.Entity import androidx.room.Ignore import androidx.room.Index import androidx.room.PrimaryKey -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/data/entities/RssArticle.kt b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/RssArticle.kt rename to app/src/main/java/io/legado/app/data/entities/RssArticle.kt index b9c2e3d57..a6aa1e639 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/RssArticle.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.IgnoredOnParcel @Entity( diff --git a/app/src/main/java/io/legato/kazusa/data/entities/RssReadRecord.kt b/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/data/entities/RssReadRecord.kt rename to app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt index bd79769b8..4fffca3e5 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/RssReadRecord.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/io/legato/kazusa/data/entities/RssSource.kt b/app/src/main/java/io/legado/app/data/entities/RssSource.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/data/entities/RssSource.kt rename to app/src/main/java/io/legado/app/data/entities/RssSource.kt index 9b16908b4..4057a9868 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/RssSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssSource.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import android.text.TextUtils @@ -6,8 +6,8 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppPattern +import io.legado.app.utils.splitNotBlank import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/java/io/legato/kazusa/data/entities/RssStar.kt b/app/src/main/java/io/legado/app/data/entities/RssStar.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/RssStar.kt rename to app/src/main/java/io/legado/app/data/entities/RssStar.kt index b051f4364..f9a74109d 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/RssStar.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssStar.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.IgnoredOnParcel diff --git a/app/src/main/java/io/legato/kazusa/data/entities/RuleSub.kt b/app/src/main/java/io/legado/app/data/entities/RuleSub.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/RuleSub.kt rename to app/src/main/java/io/legado/app/data/entities/RuleSub.kt index 44ffabdf8..2b43787fe 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/RuleSub.kt +++ b/app/src/main/java/io/legado/app/data/entities/RuleSub.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/io/legato/kazusa/data/entities/SearchBook.kt b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/entities/SearchBook.kt rename to app/src/main/java/io/legado/app/data/entities/SearchBook.kt index 185bdd1fe..2b327b6d7 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/SearchBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.content.Context import android.os.Parcelable @@ -8,10 +8,10 @@ import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.Index import androidx.room.PrimaryKey -import io.legato.kazusa.R -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.R +import io.legado.app.constant.BookType +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/io/legato/kazusa/data/entities/SearchKeyword.kt b/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/SearchKeyword.kt rename to app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt index e7028eb67..6d46eb900 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/SearchKeyword.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.Entity diff --git a/app/src/main/java/io/legato/kazusa/data/entities/Server.kt b/app/src/main/java/io/legado/app/data/entities/Server.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/Server.kt rename to app/src/main/java/io/legado/app/data/entities/Server.kt index 3dbb5f86c..c8d580729 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/Server.kt +++ b/app/src/main/java/io/legado/app/data/entities/Server.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import android.os.Parcelable import androidx.room.Entity import androidx.room.PrimaryKey -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.Parcelize import org.json.JSONObject diff --git a/app/src/main/java/io/legato/kazusa/data/entities/TxtTocRule.kt b/app/src/main/java/io/legado/app/data/entities/TxtTocRule.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/entities/TxtTocRule.kt rename to app/src/main/java/io/legado/app/data/entities/TxtTocRule.kt index ed167169b..e62651f96 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/TxtTocRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/TxtTocRule.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities +package io.legado.app.data.entities import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/BookInfoRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/BookInfoRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt index ade77d4d8..54fd63900 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/BookInfoRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/BookListRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/BookListRule.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/BookListRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/BookListRule.kt index 7a9ce4b27..60015b998 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/BookListRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/BookListRule.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule /** * 书籍列表规则 diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/ContentRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/ContentRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt index dadd25b50..aef453668 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/ContentRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreKind.kt b/app/src/main/java/io/legado/app/data/entities/rule/ExploreKind.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreKind.kt rename to app/src/main/java/io/legado/app/data/entities/rule/ExploreKind.kt index d80bccbdd..802fd31d8 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreKind.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/ExploreKind.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule /** * 发现分类 diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ExploreRule.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/ExploreRule.kt index 6d6ce4721..6871515ea 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/ExploreRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/ExploreRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/FlexChildStyle.kt b/app/src/main/java/io/legado/app/data/entities/rule/FlexChildStyle.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/FlexChildStyle.kt rename to app/src/main/java/io/legado/app/data/entities/rule/FlexChildStyle.kt index f416d552f..7efa75055 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/FlexChildStyle.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/FlexChildStyle.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.view.View import com.google.android.flexbox.FlexboxLayout diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/ReviewRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ReviewRule.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/ReviewRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/ReviewRule.kt index 3050b7f16..ad9953439 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/ReviewRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/ReviewRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/RowUi.kt b/app/src/main/java/io/legado/app/data/entities/rule/RowUi.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/RowUi.kt rename to app/src/main/java/io/legado/app/data/entities/rule/RowUi.kt index 8d604a21f..482d2aa3f 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/RowUi.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/RowUi.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule data class RowUi( var name: String, diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/SearchRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/SearchRule.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/SearchRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/SearchRule.kt index 0cc33240b..ba8cda454 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/SearchRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/SearchRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/java/io/legato/kazusa/data/entities/rule/TocRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/data/entities/rule/TocRule.kt rename to app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt index a23adfa7b..f525e9123 100644 --- a/app/src/main/java/io/legato/kazusa/data/entities/rule/TocRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.data.entities.rule +package io.legado.app.data.entities.rule import android.os.Parcelable import com.google.gson.JsonDeserializer -import io.legato.kazusa.utils.INITIAL_GSON +import io.legado.app.utils.INITIAL_GSON import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/java/io/legato/kazusa/exception/ConcurrentException.kt b/app/src/main/java/io/legado/app/exception/ConcurrentException.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/exception/ConcurrentException.kt rename to app/src/main/java/io/legado/app/exception/ConcurrentException.kt index 15207a10f..0ec3d6cca 100644 --- a/app/src/main/java/io/legato/kazusa/exception/ConcurrentException.kt +++ b/app/src/main/java/io/legado/app/exception/ConcurrentException.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.exception +package io.legado.app.exception /** * 并发限制 diff --git a/app/src/main/java/io/legato/kazusa/exception/ContentEmptyException.kt b/app/src/main/java/io/legado/app/exception/ContentEmptyException.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/exception/ContentEmptyException.kt rename to app/src/main/java/io/legado/app/exception/ContentEmptyException.kt index 0cbde3178..cf8ad3067 100644 --- a/app/src/main/java/io/legato/kazusa/exception/ContentEmptyException.kt +++ b/app/src/main/java/io/legado/app/exception/ContentEmptyException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.exception +package io.legado.app.exception /** * 内容为空 diff --git a/app/src/main/java/io/legato/kazusa/exception/EmptyFileException.kt b/app/src/main/java/io/legado/app/exception/EmptyFileException.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/exception/EmptyFileException.kt rename to app/src/main/java/io/legado/app/exception/EmptyFileException.kt index 11c989322..034cc2880 100644 --- a/app/src/main/java/io/legato/kazusa/exception/EmptyFileException.kt +++ b/app/src/main/java/io/legado/app/exception/EmptyFileException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.exception +package io.legado.app.exception /** * 文件为空 diff --git a/app/src/main/java/io/legato/kazusa/exception/InvalidBooksDirException.kt b/app/src/main/java/io/legado/app/exception/InvalidBooksDirException.kt similarity index 67% rename from app/src/main/java/io/legato/kazusa/exception/InvalidBooksDirException.kt rename to app/src/main/java/io/legado/app/exception/InvalidBooksDirException.kt index b13bc9e67..49afbb8b3 100644 --- a/app/src/main/java/io/legato/kazusa/exception/InvalidBooksDirException.kt +++ b/app/src/main/java/io/legado/app/exception/InvalidBooksDirException.kt @@ -1,3 +1,3 @@ -package io.legato.kazusa.exception +package io.legado.app.exception class InvalidBooksDirException(msg: String) : NoStackTraceException(msg) diff --git a/app/src/main/java/io/legato/kazusa/exception/NoBooksDirException.kt b/app/src/main/java/io/legado/app/exception/NoBooksDirException.kt similarity index 66% rename from app/src/main/java/io/legato/kazusa/exception/NoBooksDirException.kt rename to app/src/main/java/io/legado/app/exception/NoBooksDirException.kt index 6109cdb76..d53e89b42 100644 --- a/app/src/main/java/io/legato/kazusa/exception/NoBooksDirException.kt +++ b/app/src/main/java/io/legado/app/exception/NoBooksDirException.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.exception +package io.legado.app.exception -import io.legato.kazusa.R +import io.legado.app.R import splitties.init.appCtx class NoBooksDirException: NoStackTraceException(appCtx.getString(R.string.no_books_dir)) \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/exception/NoStackTraceException.kt b/app/src/main/java/io/legado/app/exception/NoStackTraceException.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/exception/NoStackTraceException.kt rename to app/src/main/java/io/legado/app/exception/NoStackTraceException.kt index 7af54b0dc..03e469283 100644 --- a/app/src/main/java/io/legato/kazusa/exception/NoStackTraceException.kt +++ b/app/src/main/java/io/legado/app/exception/NoStackTraceException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.exception +package io.legado.app.exception /** * 不记录错误堆栈的报错 diff --git a/app/src/main/java/io/legato/kazusa/exception/RegexTimeoutException.kt b/app/src/main/java/io/legado/app/exception/RegexTimeoutException.kt similarity index 66% rename from app/src/main/java/io/legato/kazusa/exception/RegexTimeoutException.kt rename to app/src/main/java/io/legado/app/exception/RegexTimeoutException.kt index abb1ecaaa..fcbdb5a8f 100644 --- a/app/src/main/java/io/legato/kazusa/exception/RegexTimeoutException.kt +++ b/app/src/main/java/io/legado/app/exception/RegexTimeoutException.kt @@ -1,3 +1,3 @@ -package io.legato.kazusa.exception +package io.legado.app.exception class RegexTimeoutException(msg: String) : NoStackTraceException(msg) \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/exception/TocEmptyException.kt b/app/src/main/java/io/legado/app/exception/TocEmptyException.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/exception/TocEmptyException.kt rename to app/src/main/java/io/legado/app/exception/TocEmptyException.kt index 4aaec696d..d0b7a8d79 100644 --- a/app/src/main/java/io/legato/kazusa/exception/TocEmptyException.kt +++ b/app/src/main/java/io/legado/app/exception/TocEmptyException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.exception +package io.legado.app.exception /** * 目录为空 diff --git a/app/src/main/java/io/legato/kazusa/help/AppFreezeMonitor.kt b/app/src/main/java/io/legado/app/help/AppFreezeMonitor.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/AppFreezeMonitor.kt rename to app/src/main/java/io/legado/app/help/AppFreezeMonitor.kt index 68bce0be4..59acb1520 100644 --- a/app/src/main/java/io/legato/kazusa/help/AppFreezeMonitor.kt +++ b/app/src/main/java/io/legado/app/help/AppFreezeMonitor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.annotation.SuppressLint import android.content.BroadcastReceiver @@ -8,8 +8,8 @@ import android.content.IntentFilter import android.os.Handler import android.os.HandlerThread import android.os.SystemClock -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.LogUtils +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.LogUtils object AppFreezeMonitor { diff --git a/app/src/main/java/io/legato/kazusa/help/AppWebDav.kt b/app/src/main/java/io/legado/app/help/AppWebDav.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/help/AppWebDav.kt rename to app/src/main/java/io/legado/app/help/AppWebDav.kt index 9a44ab3cc..ad7043b3b 100644 --- a/app/src/main/java/io/legato/kazusa/help/AppWebDav.kt +++ b/app/src/main/java/io/legado/app/help/AppWebDav.kt @@ -1,31 +1,31 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.net.Uri -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.storage.Backup -import io.legato.kazusa.help.storage.Restore -import io.legato.kazusa.lib.webdav.Authorization -import io.legato.kazusa.lib.webdav.WebDav -import io.legato.kazusa.lib.webdav.WebDavException -import io.legato.kazusa.lib.webdav.WebDavFile -import io.legato.kazusa.model.remote.RemoteBookWebDav -import io.legato.kazusa.utils.AlphanumComparator -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.UrlUtil -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.isJson -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookProgress +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.storage.Backup +import io.legado.app.help.storage.Restore +import io.legado.app.lib.webdav.Authorization +import io.legado.app.lib.webdav.WebDav +import io.legado.app.lib.webdav.WebDavException +import io.legado.app.lib.webdav.WebDavFile +import io.legado.app.model.remote.RemoteBookWebDav +import io.legado.app.utils.AlphanumComparator +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.UrlUtil +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getPrefString +import io.legado.app.utils.isJson +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.ensureActive import kotlinx.coroutines.runBlocking import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/help/CacheManager.kt b/app/src/main/java/io/legado/app/help/CacheManager.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/help/CacheManager.kt rename to app/src/main/java/io/legado/app/help/CacheManager.kt index eb35ed31f..a24f2bdd3 100644 --- a/app/src/main/java/io/legato/kazusa/help/CacheManager.kt +++ b/app/src/main/java/io/legado/app/help/CacheManager.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.help +package io.legado.app.help import androidx.annotation.Keep import androidx.collection.LruCache -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Cache -import io.legato.kazusa.model.analyzeRule.QueryTTF -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.memorySize +import io.legado.app.data.appDb +import io.legado.app.data.entities.Cache +import io.legado.app.model.analyzeRule.QueryTTF +import io.legado.app.utils.ACache +import io.legado.app.utils.memorySize private val queryTTFMap = LruCache(4) diff --git a/app/src/main/java/io/legato/kazusa/help/ConcurrentRateLimiter.kt b/app/src/main/java/io/legado/app/help/ConcurrentRateLimiter.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/ConcurrentRateLimiter.kt rename to app/src/main/java/io/legado/app/help/ConcurrentRateLimiter.kt index 9958b8e17..d36144e02 100644 --- a/app/src/main/java/io/legato/kazusa/help/ConcurrentRateLimiter.kt +++ b/app/src/main/java/io/legado/app/help/ConcurrentRateLimiter.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.help +package io.legado.app.help -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.exception.ConcurrentException -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl.ConcurrentRecord +import io.legado.app.data.entities.BaseSource +import io.legado.app.exception.ConcurrentException +import io.legado.app.model.analyzeRule.AnalyzeUrl.ConcurrentRecord import kotlinx.coroutines.delay class ConcurrentRateLimiter(val source: BaseSource?) { diff --git a/app/src/main/java/io/legato/kazusa/help/CrashHandler.kt b/app/src/main/java/io/legado/app/help/CrashHandler.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/help/CrashHandler.kt rename to app/src/main/java/io/legado/app/help/CrashHandler.kt index 6e25979cf..f431be0a2 100644 --- a/app/src/main/java/io/legato/kazusa/help/CrashHandler.kt +++ b/app/src/main/java/io/legado/app/help/CrashHandler.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.annotation.SuppressLint import android.content.Context @@ -7,21 +7,21 @@ import android.os.Build import android.os.Debug import android.os.Looper import android.webkit.WebSettings -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.createFolderReplace -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.longToastOnUiLegacy -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.writeText +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.model.ReadAloud +import io.legado.app.utils.FileDoc +import io.legado.app.utils.FileUtils +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.createFolderReplace +import io.legado.app.utils.externalCache +import io.legado.app.utils.getFile +import io.legado.app.utils.longToastOnUiLegacy +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.writeText import splitties.init.appCtx import java.io.PrintWriter import java.io.StringWriter diff --git a/app/src/main/java/io/legato/kazusa/help/DefaultData.kt b/app/src/main/java/io/legado/app/help/DefaultData.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/help/DefaultData.kt rename to app/src/main/java/io/legado/app/help/DefaultData.kt index d95fd24a2..b99f7953b 100644 --- a/app/src/main/java/io/legato/kazusa/help/DefaultData.kt +++ b/app/src/main/java/io/legado/app/help/DefaultData.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.help +package io.legado.app.help -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.data.entities.KeyboardAssist -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.AppConst +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.data.entities.HttpTTS +import io.legado.app.data.entities.KeyboardAssist +import io.legado.app.data.entities.RssSource +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.BookCover +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.printOnDebug import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/help/DirectLinkUpload.kt b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/help/DirectLinkUpload.kt rename to app/src/main/java/io/legado/app/help/DirectLinkUpload.kt index 02b277618..90ab1327d 100644 --- a/app/src/main/java/io/legato/kazusa/help/DirectLinkUpload.kt +++ b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.help +package io.legado.app.help import androidx.annotation.Keep -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.createFileReplace -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.ACache +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.createFileReplace +import io.legado.app.utils.externalCache +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject import splitties.init.appCtx import java.io.File import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/help/EventMessage.kt b/app/src/main/java/io/legado/app/help/EventMessage.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/EventMessage.kt rename to app/src/main/java/io/legado/app/help/EventMessage.kt index 1060dff3d..31e8f662e 100644 --- a/app/src/main/java/io/legato/kazusa/help/EventMessage.kt +++ b/app/src/main/java/io/legado/app/help/EventMessage.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.text.TextUtils diff --git a/app/src/main/java/io/legato/kazusa/help/ExecutorService.kt b/app/src/main/java/io/legado/app/help/ExecutorService.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/help/ExecutorService.kt rename to app/src/main/java/io/legado/app/help/ExecutorService.kt index 939f39ac0..78f6f2f95 100644 --- a/app/src/main/java/io/legato/kazusa/help/ExecutorService.kt +++ b/app/src/main/java/io/legado/app/help/ExecutorService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import java.util.concurrent.ExecutorService import java.util.concurrent.Executors diff --git a/app/src/main/java/io/legato/kazusa/help/IntentData.kt b/app/src/main/java/io/legado/app/help/IntentData.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/IntentData.kt rename to app/src/main/java/io/legado/app/help/IntentData.kt index 6b76a21b3..474a88bc8 100644 --- a/app/src/main/java/io/legato/kazusa/help/IntentData.kt +++ b/app/src/main/java/io/legado/app/help/IntentData.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help object IntentData { diff --git a/app/src/main/java/io/legato/kazusa/help/IntentHelp.kt b/app/src/main/java/io/legado/app/help/IntentHelp.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/help/IntentHelp.kt rename to app/src/main/java/io/legado/app/help/IntentHelp.kt index beda7aa8d..5885e46c6 100644 --- a/app/src/main/java/io/legato/kazusa/help/IntentHelp.kt +++ b/app/src/main/java/io/legado/app/help/IntentHelp.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.content.Context import android.content.Intent import android.net.Uri -import io.legato.kazusa.R -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.utils.toastOnUi import splitties.init.appCtx @Suppress("unused") diff --git a/app/src/main/java/io/legato/kazusa/help/JsEncodeUtils.kt b/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/JsEncodeUtils.kt rename to app/src/main/java/io/legado/app/help/JsEncodeUtils.kt index 398906122..bdba435f7 100644 --- a/app/src/main/java/io/legato/kazusa/help/JsEncodeUtils.kt +++ b/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.util.Base64 import cn.hutool.crypto.digest.DigestUtil import cn.hutool.crypto.digest.HMac import cn.hutool.crypto.symmetric.SymmetricCrypto -import io.legato.kazusa.help.crypto.AsymmetricCrypto -import io.legato.kazusa.help.crypto.Sign -import io.legato.kazusa.help.crypto.SymmetricCryptoAndroid -import io.legato.kazusa.utils.MD5Utils +import io.legado.app.help.crypto.AsymmetricCrypto +import io.legado.app.help.crypto.Sign +import io.legado.app.help.crypto.SymmetricCryptoAndroid +import io.legado.app.utils.MD5Utils /** diff --git a/app/src/main/java/io/legato/kazusa/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/JsExtensions.kt rename to app/src/main/java/io/legado/app/help/JsExtensions.kt index c69a4367e..b5b16549a 100644 --- a/app/src/main/java/io/legato/kazusa/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.webkit.WebSettings import androidx.annotation.Keep @@ -6,47 +6,47 @@ import cn.hutool.core.codec.Base64 import cn.hutool.core.util.HexUtil import com.script.rhino.rhinoContext import com.script.rhino.rhinoContextOrNull -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppConst.dateFormat -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.http.BackstageWebView -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.http.SSLHelper -import io.legato.kazusa.help.http.StrResponse -import io.legato.kazusa.help.source.SourceVerificationHelp -import io.legato.kazusa.help.source.getSourceType -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.QueryTTF -import io.legato.kazusa.ui.association.OpenUrlConfirmActivity -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.ChineseUtils -import io.legato.kazusa.utils.EncoderUtils -import io.legato.kazusa.utils.EncodingDetect -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.JsURL -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.UrlUtil -import io.legato.kazusa.utils.compress.LibArchiveUtils -import io.legato.kazusa.utils.createFileReplace -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isMainThread -import io.legato.kazusa.utils.longToastForJs -import io.legato.kazusa.utils.mapAsync -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toStringArray -import io.legato.kazusa.utils.toastForJs +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppConst.dateFormat +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.BaseSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.http.BackstageWebView +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.help.http.CookieStore +import io.legado.app.help.http.SSLHelper +import io.legado.app.help.http.StrResponse +import io.legado.app.help.source.SourceVerificationHelp +import io.legado.app.help.source.getSourceType +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.QueryTTF +import io.legado.app.ui.association.OpenUrlConfirmActivity +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.ChineseUtils +import io.legado.app.utils.EncoderUtils +import io.legado.app.utils.EncodingDetect +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.JsURL +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.StringUtils +import io.legado.app.utils.UrlUtil +import io.legado.app.utils.compress.LibArchiveUtils +import io.legado.app.utils.createFileReplace +import io.legado.app.utils.externalCache +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isMainThread +import io.legado.app.utils.longToastForJs +import io.legado.app.utils.mapAsync +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.startActivity +import io.legado.app.utils.toStringArray +import io.legado.app.utils.toastForJs import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt rename to app/src/main/java/io/legado/app/help/LauncherIconHelp.kt index bcf361e47..7dfc990b7 100644 --- a/app/src/main/java/io/legato/kazusa/help/LauncherIconHelp.kt +++ b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.content.ComponentName import android.content.pm.PackageManager -import io.legato.kazusa.R -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.utils.toastOnUi import splitties.init.appCtx /** diff --git a/app/src/main/java/io/legato/kazusa/help/LayoutManager.kt b/app/src/main/java/io/legado/app/help/LayoutManager.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/LayoutManager.kt rename to app/src/main/java/io/legado/app/help/LayoutManager.kt index fc25fec2d..4dee2ab06 100644 --- a/app/src/main/java/io/legato/kazusa/help/LayoutManager.kt +++ b/app/src/main/java/io/legado/app/help/LayoutManager.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import androidx.annotation.IntDef import androidx.recyclerview.widget.GridLayoutManager diff --git a/app/src/main/java/io/legato/kazusa/help/LifecycleHelp.kt b/app/src/main/java/io/legado/app/help/LifecycleHelp.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/LifecycleHelp.kt rename to app/src/main/java/io/legado/app/help/LifecycleHelp.kt index 3897912e7..f05cb6567 100644 --- a/app/src/main/java/io/legato/kazusa/help/LifecycleHelp.kt +++ b/app/src/main/java/io/legado/app/help/LifecycleHelp.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.app.Activity import android.app.Application import android.os.Bundle -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.utils.LogUtils +import io.legado.app.base.BaseService +import io.legado.app.utils.LogUtils import java.lang.ref.WeakReference /** diff --git a/app/src/main/java/io/legato/kazusa/help/MediaHelp.kt b/app/src/main/java/io/legado/app/help/MediaHelp.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/MediaHelp.kt rename to app/src/main/java/io/legado/app/help/MediaHelp.kt index bb000b895..d0324646c 100644 --- a/app/src/main/java/io/legato/kazusa/help/MediaHelp.kt +++ b/app/src/main/java/io/legado/app/help/MediaHelp.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.content.Context import android.media.AudioManager @@ -7,7 +7,7 @@ import android.support.v4.media.session.PlaybackStateCompat import androidx.media.AudioAttributesCompat import androidx.media.AudioFocusRequestCompat import androidx.media.AudioManagerCompat -import io.legato.kazusa.R +import io.legado.app.R import splitties.systemservices.audioManager object MediaHelp { diff --git a/app/src/main/java/io/legato/kazusa/help/PaintPool.kt b/app/src/main/java/io/legado/app/help/PaintPool.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/help/PaintPool.kt rename to app/src/main/java/io/legado/app/help/PaintPool.kt index 3353c3cc8..953b5375b 100644 --- a/app/src/main/java/io/legato/kazusa/help/PaintPool.kt +++ b/app/src/main/java/io/legado/app/help/PaintPool.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.graphics.Paint -import io.legato.kazusa.utils.objectpool.BaseSafeObjectPool +import io.legado.app.utils.objectpool.BaseSafeObjectPool object PaintPool : BaseSafeObjectPool(8) { diff --git a/app/src/main/java/io/legato/kazusa/help/README.md b/app/src/main/java/io/legado/app/help/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/help/README.md rename to app/src/main/java/io/legado/app/help/README.md diff --git a/app/src/main/java/io/legato/kazusa/help/ReplaceAnalyzer.kt b/app/src/main/java/io/legado/app/help/ReplaceAnalyzer.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/help/ReplaceAnalyzer.kt rename to app/src/main/java/io/legado/app/help/ReplaceAnalyzer.kt index 9e6de08b3..43004c0be 100644 --- a/app/src/main/java/io/legato/kazusa/help/ReplaceAnalyzer.kt +++ b/app/src/main/java/io/legado/app/help/ReplaceAnalyzer.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.help +package io.legado.app.help -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.utils.* +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.utils.* object ReplaceAnalyzer { diff --git a/app/src/main/java/io/legato/kazusa/help/RuleBigDataHelp.kt b/app/src/main/java/io/legado/app/help/RuleBigDataHelp.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/help/RuleBigDataHelp.kt rename to app/src/main/java/io/legado/app/help/RuleBigDataHelp.kt index 00c1663f5..83c2feeae 100644 --- a/app/src/main/java/io/legato/kazusa/help/RuleBigDataHelp.kt +++ b/app/src/main/java/io/legado/app/help/RuleBigDataHelp.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help +package io.legado.app.help -import io.legato.kazusa.data.appDb -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getFile +import io.legado.app.data.appDb +import io.legado.app.utils.FileUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getFile import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/help/RuleComplete.kt b/app/src/main/java/io/legado/app/help/RuleComplete.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/RuleComplete.kt rename to app/src/main/java/io/legado/app/help/RuleComplete.kt index bc3705aaf..d37595e83 100644 --- a/app/src/main/java/io/legato/kazusa/help/RuleComplete.kt +++ b/app/src/main/java/io/legado/app/help/RuleComplete.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help +package io.legado.app.help @Suppress("RegExpRedundantEscape") diff --git a/app/src/main/java/io/legato/kazusa/help/TTS.kt b/app/src/main/java/io/legado/app/help/TTS.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/TTS.kt rename to app/src/main/java/io/legado/app/help/TTS.kt index 7bee9e2d5..3165bb3e8 100644 --- a/app/src/main/java/io/legato/kazusa/help/TTS.kt +++ b/app/src/main/java/io/legado/app/help/TTS.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.help +package io.legado.app.help import android.speech.tts.TextToSpeech import android.speech.tts.UtteranceProgressListener -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi import splitties.init.appCtx class TTS { diff --git a/app/src/main/java/io/legato/kazusa/help/book/BookContent.kt b/app/src/main/java/io/legado/app/help/book/BookContent.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/help/book/BookContent.kt rename to app/src/main/java/io/legado/app/help/book/BookContent.kt index f7a9d1217..900eecc55 100644 --- a/app/src/main/java/io/legato/kazusa/help/book/BookContent.kt +++ b/app/src/main/java/io/legado/app/help/book/BookContent.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.help.book +package io.legado.app.help.book -import io.legato.kazusa.data.entities.ReplaceRule +import io.legado.app.data.entities.ReplaceRule data class BookContent( val sameTitleRemoved: Boolean, diff --git a/app/src/main/java/io/legato/kazusa/help/book/BookExtensions.kt b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/help/book/BookExtensions.kt rename to app/src/main/java/io/legado/app/help/book/BookExtensions.kt index f43094538..2b3b43d38 100644 --- a/app/src/main/java/io/legato/kazusa/help/book/BookExtensions.kt +++ b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt @@ -1,30 +1,30 @@ @file:Suppress("unused") -package io.legato.kazusa.help.book +package io.legado.app.help.book import android.net.Uri import com.script.buildScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BaseBook -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.RuleBigDataHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.exists -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.isUri -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.BookSourceType +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.data.entities.BaseBook +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.RuleBigDataHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.FileDoc +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.exists +import io.legado.app.utils.find +import io.legado.app.utils.inputStream +import io.legado.app.utils.isUri +import io.legado.app.utils.toastOnUi import splitties.init.appCtx import java.io.File import java.time.LocalDate diff --git a/app/src/main/java/io/legato/kazusa/help/book/BookHelp.kt b/app/src/main/java/io/legado/app/help/book/BookHelp.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/book/BookHelp.kt rename to app/src/main/java/io/legado/app/help/book/BookHelp.kt index 85d7a5a63..0ecdbc9cd 100644 --- a/app/src/main/java/io/legato/kazusa/help/book/BookHelp.kt +++ b/app/src/main/java/io/legado/app/help/book/BookHelp.kt @@ -1,34 +1,34 @@ -package io.legato.kazusa.help.book +package io.legado.app.help.book import android.graphics.BitmapFactory import android.os.ParcelFileDescriptor import androidx.documentfile.provider.DocumentFile import com.script.rhino.runScriptWithContext -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.ImageUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.SvgUtils -import io.legato.kazusa.utils.UrlUtil -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.exists -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.onEachParallel -import io.legato.kazusa.utils.postEvent +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.help.config.AppConfig +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.ImageUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.StringUtils +import io.legado.app.utils.SvgUtils +import io.legado.app.utils.UrlUtil +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.exists +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getFile +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.onEachParallel +import io.legado.app.utils.postEvent import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/help/book/ContentHelp.kt b/app/src/main/java/io/legado/app/help/book/ContentHelp.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/help/book/ContentHelp.kt rename to app/src/main/java/io/legado/app/help/book/ContentHelp.kt index 55a7671bc..ed49cb9a2 100644 --- a/app/src/main/java/io/legato/kazusa/help/book/ContentHelp.kt +++ b/app/src/main/java/io/legado/app/help/book/ContentHelp.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.book +package io.legado.app.help.book import java.util.regex.Pattern import kotlin.math.max diff --git a/app/src/main/java/io/legato/kazusa/help/book/ContentProcessor.kt b/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/help/book/ContentProcessor.kt rename to app/src/main/java/io/legado/app/help/book/ContentProcessor.kt index d7a568f57..1b2ee5219 100644 --- a/app/src/main/java/io/legato/kazusa/help/book/ContentProcessor.kt +++ b/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.help.book +package io.legado.app.help.book import android.os.Build -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern.spaceRegex -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.exception.RegexTimeoutException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.utils.ChineseUtils -import io.legato.kazusa.utils.escapeRegex -import io.legato.kazusa.utils.replace -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern.spaceRegex +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.exception.RegexTimeoutException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.utils.ChineseUtils +import io.legado.app.utils.escapeRegex +import io.legado.app.utils.replace +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CancellationException import splitties.init.appCtx import java.lang.ref.WeakReference diff --git a/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt rename to app/src/main/java/io/legado/app/help/config/AppConfig.kt index a3ae1d598..caba0e5d5 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.content.SharedPreferences import android.os.Build -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.ui.book.manga.config.MangaScrollMode -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.getPrefLong -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.isNightMode -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.putPrefLong -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.removePref -import io.legato.kazusa.utils.sysConfiguration -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.BuildConfig +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.ui.book.manga.config.MangaScrollMode +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.getPrefLong +import io.legado.app.utils.getPrefString +import io.legado.app.utils.isNightMode +import io.legado.app.utils.putPrefBoolean +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.putPrefLong +import io.legado.app.utils.putPrefString +import io.legado.app.utils.removePref +import io.legado.app.utils.sysConfiguration +import io.legado.app.utils.toastOnUi import splitties.init.appCtx @Suppress("MemberVisibilityCanBePrivate", "ConstPropertyName") diff --git a/app/src/main/java/io/legato/kazusa/help/config/LocalConfig.kt b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/help/config/LocalConfig.kt rename to app/src/main/java/io/legado/app/help/config/LocalConfig.kt index cb88cb128..0b4b76e5b 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/LocalConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit -import io.legato.kazusa.utils.getBoolean -import io.legato.kazusa.utils.putBoolean -import io.legato.kazusa.utils.putLong -import io.legato.kazusa.utils.putString -import io.legato.kazusa.utils.remove +import io.legado.app.utils.getBoolean +import io.legado.app.utils.putBoolean +import io.legado.app.utils.putLong +import io.legado.app.utils.putString +import io.legado.app.utils.remove import splitties.init.appCtx @Suppress("ConstPropertyName") diff --git a/app/src/main/java/io/legato/kazusa/help/config/ReadBookConfig.kt b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/config/ReadBookConfig.kt rename to app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt index 66dedecf7..34c856ddd 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/ReadBookConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.graphics.Color import android.graphics.drawable.BitmapDrawable @@ -7,29 +7,28 @@ import android.graphics.drawable.Drawable import androidx.annotation.Keep import androidx.core.graphics.toColorInt import com.google.android.material.color.MaterialColors -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PageAnim -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.utils.BitmapUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.createFolderReplace -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.getMeanColor -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.hexString -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.resizeAndRecycle +import io.legado.app.constant.AppLog +import io.legado.app.constant.PageAnim +import io.legado.app.constant.PreferKey +import io.legado.app.help.DefaultData +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.utils.BitmapUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.createFolderReplace +import io.legado.app.utils.externalCache +import io.legado.app.utils.externalFiles +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getFile +import io.legado.app.utils.getMeanColor +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.hexString +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.resizeAndRecycle import splitties.init.appCtx import java.io.File import kotlin.String diff --git a/app/src/main/java/io/legato/kazusa/help/config/ReadTipConfig.kt b/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/config/ReadTipConfig.kt rename to app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt index 3c9b36991..dc36ffae0 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/ReadTipConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/ReadTipConfig.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.content.Context -import io.legato.kazusa.R +import io.legado.app.R import splitties.init.appCtx @Suppress("ConstPropertyName") diff --git a/app/src/main/java/io/legato/kazusa/help/config/SourceConfig.kt b/app/src/main/java/io/legado/app/help/config/SourceConfig.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/help/config/SourceConfig.kt rename to app/src/main/java/io/legado/app/help/config/SourceConfig.kt index 03a519a6c..67368309c 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/SourceConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/SourceConfig.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.content.Context.MODE_PRIVATE import androidx.core.content.edit diff --git a/app/src/main/java/io/legato/kazusa/help/config/ThemeConfig.kt b/app/src/main/java/io/legado/app/help/config/ThemeConfig.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/help/config/ThemeConfig.kt rename to app/src/main/java/io/legado/app/help/config/ThemeConfig.kt index b52fe8929..7ad289271 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/ThemeConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/ThemeConfig.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.config +package io.legado.app.help.config import android.content.Context import android.graphics.Bitmap @@ -6,26 +6,26 @@ import android.util.DisplayMetrics import androidx.annotation.Keep import androidx.appcompat.app.AppCompatDelegate import androidx.core.graphics.toColorInt -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.constant.Theme -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.utils.BitmapUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.hexString -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.stackBlur +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.constant.Theme +import io.legado.app.help.DefaultData +import io.legado.app.model.BookCover +import io.legado.app.utils.BitmapUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.getPrefString +import io.legado.app.utils.hexString +import io.legado.app.utils.postEvent +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.stackBlur import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/help/coroutine/ActivelyCancelException.kt b/app/src/main/java/io/legado/app/help/coroutine/ActivelyCancelException.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/help/coroutine/ActivelyCancelException.kt rename to app/src/main/java/io/legado/app/help/coroutine/ActivelyCancelException.kt index e419a1de6..626a866b7 100644 --- a/app/src/main/java/io/legato/kazusa/help/coroutine/ActivelyCancelException.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/ActivelyCancelException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.coroutine +package io.legado.app.help.coroutine import kotlin.coroutines.cancellation.CancellationException diff --git a/app/src/main/java/io/legato/kazusa/help/coroutine/CompositeCoroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/coroutine/CompositeCoroutine.kt rename to app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt index 343f1c4e2..14c123378 100644 --- a/app/src/main/java/io/legato/kazusa/help/coroutine/CompositeCoroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/CompositeCoroutine.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.coroutine +package io.legado.app.help.coroutine @Suppress("unused") class CompositeCoroutine : CoroutineContainer { diff --git a/app/src/main/java/io/legato/kazusa/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/coroutine/Coroutine.kt rename to app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt index 01013b356..f2bb9ed08 100644 --- a/app/src/main/java/io/legato/kazusa/help/coroutine/Coroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.help.coroutine +package io.legado.app.help.coroutine -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.printOnDebug import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CompletionHandler import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/io/legato/kazusa/help/coroutine/CoroutineContainer.kt b/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/help/coroutine/CoroutineContainer.kt rename to app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt index 0e6d16599..8ef02af1f 100644 --- a/app/src/main/java/io/legato/kazusa/help/coroutine/CoroutineContainer.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/CoroutineContainer.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.coroutine +package io.legado.app.help.coroutine internal interface CoroutineContainer { diff --git a/app/src/main/java/io/legato/kazusa/help/crypto/AsymmetricCrypto.kt b/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/crypto/AsymmetricCrypto.kt rename to app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt index 5c29b3979..2d9724f8c 100644 --- a/app/src/main/java/io/legato/kazusa/help/crypto/AsymmetricCrypto.kt +++ b/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.help.crypto +package io.legado.app.help.crypto import androidx.annotation.Keep import cn.hutool.crypto.KeyUtil import cn.hutool.crypto.asymmetric.KeyType -import io.legato.kazusa.utils.EncoderUtils +import io.legado.app.utils.EncoderUtils import java.io.InputStream import cn.hutool.crypto.asymmetric.AsymmetricCrypto as HutoolAsymmetricCrypto diff --git a/app/src/main/java/io/legato/kazusa/help/crypto/README.md b/app/src/main/java/io/legado/app/help/crypto/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/help/crypto/README.md rename to app/src/main/java/io/legado/app/help/crypto/README.md diff --git a/app/src/main/java/io/legato/kazusa/help/crypto/Sign.kt b/app/src/main/java/io/legado/app/help/crypto/Sign.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/crypto/Sign.kt rename to app/src/main/java/io/legado/app/help/crypto/Sign.kt index 1a27bd25f..8c671d920 100644 --- a/app/src/main/java/io/legato/kazusa/help/crypto/Sign.kt +++ b/app/src/main/java/io/legado/app/help/crypto/Sign.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.crypto +package io.legado.app.help.crypto import androidx.annotation.Keep import cn.hutool.crypto.KeyUtil diff --git a/app/src/main/java/io/legato/kazusa/help/crypto/SymmetricCryptoAndroid.kt b/app/src/main/java/io/legado/app/help/crypto/SymmetricCryptoAndroid.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/help/crypto/SymmetricCryptoAndroid.kt rename to app/src/main/java/io/legado/app/help/crypto/SymmetricCryptoAndroid.kt index 053bcc282..c98eb68d4 100644 --- a/app/src/main/java/io/legato/kazusa/help/crypto/SymmetricCryptoAndroid.kt +++ b/app/src/main/java/io/legado/app/help/crypto/SymmetricCryptoAndroid.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.help.crypto +package io.legado.app.help.crypto import androidx.annotation.Keep import cn.hutool.core.codec.Base64 import cn.hutool.core.util.HexUtil import cn.hutool.crypto.symmetric.SymmetricCrypto -import io.legato.kazusa.utils.EncoderUtils -import io.legato.kazusa.utils.isHex +import io.legado.app.utils.EncoderUtils +import io.legado.app.utils.isHex import java.io.InputStream import java.nio.charset.Charset diff --git a/app/src/main/java/io/legato/kazusa/help/exoplayer/ExoPlayerHelper.kt b/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/help/exoplayer/ExoPlayerHelper.kt rename to app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt index 50449d4b1..7e4fe8cca 100644 --- a/app/src/main/java/io/legato/kazusa/help/exoplayer/ExoPlayerHelper.kt +++ b/app/src/main/java/io/legado/app/help/exoplayer/ExoPlayerHelper.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.exoplayer +package io.legado.app.help.exoplayer import android.annotation.SuppressLint import android.content.Context @@ -17,9 +17,9 @@ import androidx.media3.exoplayer.DefaultLoadControl import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.source.DefaultMediaSourceFactory import com.google.gson.reflect.TypeToken -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.externalCache +import io.legado.app.help.http.okHttpClient +import io.legado.app.utils.GSON +import io.legado.app.utils.externalCache import okhttp3.CacheControl import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/help/exoplayer/InputStreamDataSource.kt b/app/src/main/java/io/legado/app/help/exoplayer/InputStreamDataSource.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/exoplayer/InputStreamDataSource.kt rename to app/src/main/java/io/legado/app/help/exoplayer/InputStreamDataSource.kt index 9d601c922..cc44828b0 100644 --- a/app/src/main/java/io/legato/kazusa/help/exoplayer/InputStreamDataSource.kt +++ b/app/src/main/java/io/legado/app/help/exoplayer/InputStreamDataSource.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.exoplayer +package io.legado.app.help.exoplayer import android.annotation.SuppressLint import android.net.Uri diff --git a/app/src/main/java/io/legato/kazusa/help/glide/AsyncRecycleBitmapPool.kt b/app/src/main/java/io/legado/app/help/glide/AsyncRecycleBitmapPool.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/help/glide/AsyncRecycleBitmapPool.kt rename to app/src/main/java/io/legado/app/help/glide/AsyncRecycleBitmapPool.kt index 5bc9f202e..ebad97b64 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/AsyncRecycleBitmapPool.kt +++ b/app/src/main/java/io/legado/app/help/glide/AsyncRecycleBitmapPool.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import android.graphics.Bitmap import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter import com.bumptech.glide.load.engine.bitmap_recycle.LruBitmapPool -import io.legato.kazusa.help.globalExecutor +import io.legado.app.help.globalExecutor class AsyncRecycleBitmapPool(private val delegate: BitmapPool) : BitmapPool by delegate { diff --git a/app/src/main/java/io/legato/kazusa/help/glide/BlurTransformation.kt b/app/src/main/java/io/legado/app/help/glide/BlurTransformation.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/help/glide/BlurTransformation.kt rename to app/src/main/java/io/legado/app/help/glide/BlurTransformation.kt index 09a1bff1d..aec2dcaf0 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/BlurTransformation.kt +++ b/app/src/main/java/io/legado/app/help/glide/BlurTransformation.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import android.graphics.Bitmap import androidx.annotation.IntRange import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool import com.bumptech.glide.load.resource.bitmap.BitmapTransformation -import io.legato.kazusa.utils.stackBlur +import io.legado.app.utils.stackBlur import java.security.MessageDigest /** diff --git a/app/src/main/java/io/legato/kazusa/help/glide/FilePathLoader.kt b/app/src/main/java/io/legado/app/help/glide/FilePathLoader.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/glide/FilePathLoader.kt rename to app/src/main/java/io/legado/app/help/glide/FilePathLoader.kt index 6a52bfaaf..149020bfd 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/FilePathLoader.kt +++ b/app/src/main/java/io/legado/app/help/glide/FilePathLoader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource diff --git a/app/src/main/java/io/legato/kazusa/help/glide/GlideHeaders.kt b/app/src/main/java/io/legado/app/help/glide/GlideHeaders.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/help/glide/GlideHeaders.kt rename to app/src/main/java/io/legado/app/help/glide/GlideHeaders.kt index eed5ce0cd..a488c61f7 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/GlideHeaders.kt +++ b/app/src/main/java/io/legado/app/help/glide/GlideHeaders.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.load.model.Headers diff --git a/app/src/main/java/io/legato/kazusa/help/glide/ImageLoader.kt b/app/src/main/java/io/legado/app/help/glide/ImageLoader.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/glide/ImageLoader.kt rename to app/src/main/java/io/legado/app/help/glide/ImageLoader.kt index e3c03c700..8eabdb3db 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/ImageLoader.kt +++ b/app/src/main/java/io/legado/app/help/glide/ImageLoader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import android.content.Context import android.graphics.Bitmap @@ -9,10 +9,10 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import com.bumptech.glide.Glide import com.bumptech.glide.RequestBuilder -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isDataUrl -import io.legato.kazusa.utils.lifecycle +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isDataUrl +import io.legado.app.utils.lifecycle import java.io.File import androidx.core.net.toUri diff --git a/app/src/main/java/io/legato/kazusa/help/glide/LegadoDataUrlLoader.kt b/app/src/main/java/io/legado/app/help/glide/LegadoDataUrlLoader.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/help/glide/LegadoDataUrlLoader.kt rename to app/src/main/java/io/legado/app/help/glide/LegadoDataUrlLoader.kt index 4c65ec4d4..a7e14be07 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/LegadoDataUrlLoader.kt +++ b/app/src/main/java/io/legado/app/help/glide/LegadoDataUrlLoader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource @@ -8,10 +8,10 @@ import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory import com.bumptech.glide.signature.ObjectKey -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.ImageUtils +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.ReadManga +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.ImageUtils import com.script.rhino.runScriptWithContext import kotlinx.coroutines.Job import java.io.InputStream diff --git a/app/src/main/java/io/legato/kazusa/help/glide/LegadoGlideModule.kt b/app/src/main/java/io/legado/app/help/glide/LegadoGlideModule.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/help/glide/LegadoGlideModule.kt rename to app/src/main/java/io/legado/app/help/glide/LegadoGlideModule.kt index ab8c83290..7d70f6574 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/LegadoGlideModule.kt +++ b/app/src/main/java/io/legado/app/help/glide/LegadoGlideModule.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import android.content.Context import android.util.Log @@ -10,8 +10,8 @@ import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory import com.bumptech.glide.load.engine.cache.MemorySizeCalculator import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.module.AppGlideModule -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.BuildConfig +import io.legado.app.help.config.AppConfig import java.io.File import java.io.InputStream diff --git a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpModeLoaderFactory.kt b/app/src/main/java/io/legado/app/help/glide/OkHttpModeLoaderFactory.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/help/glide/OkHttpModeLoaderFactory.kt rename to app/src/main/java/io/legado/app/help/glide/OkHttpModeLoaderFactory.kt index 0afa135d9..86f9f86e7 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpModeLoaderFactory.kt +++ b/app/src/main/java/io/legado/app/help/glide/OkHttpModeLoaderFactory.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.load.model.ModelLoader diff --git a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpModelLoader.kt b/app/src/main/java/io/legado/app/help/glide/OkHttpModelLoader.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/glide/OkHttpModelLoader.kt rename to app/src/main/java/io/legado/app/help/glide/OkHttpModelLoader.kt index 0984bcdea..6f8eca83f 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpModelLoader.kt +++ b/app/src/main/java/io/legado/app/help/glide/OkHttpModelLoader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.load.Option import com.bumptech.glide.load.Options diff --git a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpStreamFetcher.kt b/app/src/main/java/io/legado/app/help/glide/OkHttpStreamFetcher.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/help/glide/OkHttpStreamFetcher.kt rename to app/src/main/java/io/legado/app/help/glide/OkHttpStreamFetcher.kt index 386a8af21..dc50fe4c3 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/OkHttpStreamFetcher.kt +++ b/app/src/main/java/io/legado/app/help/glide/OkHttpStreamFetcher.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide +package io.legado.app.help.glide import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource @@ -8,17 +8,17 @@ import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.util.ContentLengthInputStream import com.script.rhino.runScriptWithContext -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.addHeaders -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.okHttpClientManga -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.ImageUtils -import io.legato.kazusa.utils.isWifiConnect +import io.legado.app.data.entities.BaseSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.addHeaders +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.okHttpClientManga +import io.legado.app.help.source.SourceHelp +import io.legado.app.model.ReadManga +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.ImageUtils +import io.legado.app.utils.isWifiConnect import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.SupervisorJob diff --git a/app/src/main/java/io/legato/kazusa/help/glide/progress/OnProgressListener.kt b/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/help/glide/progress/OnProgressListener.kt rename to app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt index 499747a43..19561c75b 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/progress/OnProgressListener.kt +++ b/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt @@ -1,3 +1,3 @@ -package io.legato.kazusa.help.glide.progress +package io.legado.app.help.glide.progress typealias OnProgressListener = ((isComplete: Boolean, percentage: Int, bytesRead: Long, totalBytes: Long) -> Unit)? \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressManager.kt b/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressManager.kt rename to app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt index 0d12efb4f..8b37534fa 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressManager.kt +++ b/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.help.glide.progress +package io.legado.app.help.glide.progress -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.AnalyzeUrl import java.util.concurrent.ConcurrentHashMap /** diff --git a/app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressResponseBody.kt b/app/src/main/java/io/legado/app/help/glide/progress/ProgressResponseBody.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressResponseBody.kt rename to app/src/main/java/io/legado/app/help/glide/progress/ProgressResponseBody.kt index 9fc2b1996..9a8158a9a 100644 --- a/app/src/main/java/io/legato/kazusa/help/glide/progress/ProgressResponseBody.kt +++ b/app/src/main/java/io/legado/app/help/glide/progress/ProgressResponseBody.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.glide.progress +package io.legado.app.help.glide.progress import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/io/legato/kazusa/help/http/BackstageWebView.kt b/app/src/main/java/io/legado/app/help/http/BackstageWebView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/http/BackstageWebView.kt rename to app/src/main/java/io/legado/app/help/http/BackstageWebView.kt index 9d273677a..e8176e713 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/BackstageWebView.kt +++ b/app/src/main/java/io/legado/app/help/http/BackstageWebView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import android.annotation.SuppressLint import android.net.http.SslError @@ -12,11 +12,11 @@ import android.webkit.WebResourceRequest import android.webkit.WebSettings import android.webkit.WebView import android.webkit.WebViewClient -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.utils.runOnUI +import io.legado.app.constant.AppConst +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.utils.runOnUI import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Runnable import kotlinx.coroutines.suspendCancellableCoroutine diff --git a/app/src/main/java/io/legato/kazusa/help/http/CookieManager.kt b/app/src/main/java/io/legado/app/help/http/CookieManager.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/http/CookieManager.kt rename to app/src/main/java/io/legado/app/help/http/CookieManager.kt index 1502d3574..5d90e52d0 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/CookieManager.kt +++ b/app/src/main/java/io/legado/app/help/http/CookieManager.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import android.webkit.CookieManager -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.help.CacheManager +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.splitNotBlank import okhttp3.Cookie import okhttp3.Headers import okhttp3.HttpUrl diff --git a/app/src/main/java/io/legato/kazusa/help/http/CookieStore.kt b/app/src/main/java/io/legado/app/help/http/CookieStore.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/help/http/CookieStore.kt rename to app/src/main/java/io/legado/app/help/http/CookieStore.kt index 66e66bca0..63ee8a943 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/CookieStore.kt +++ b/app/src/main/java/io/legado/app/help/http/CookieStore.kt @@ -1,20 +1,20 @@ @file:Suppress("unused") -package io.legato.kazusa.help.http +package io.legado.app.help.http import android.text.TextUtils import androidx.annotation.Keep -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern.equalsRegex -import io.legato.kazusa.constant.AppPattern.semicolonRegex -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Cookie -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.http.CookieManager.getCookieNoSession -import io.legato.kazusa.help.http.CookieManager.mergeCookiesToMap -import io.legato.kazusa.help.http.api.CookieManagerInterface -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.removeCookie +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern.equalsRegex +import io.legado.app.constant.AppPattern.semicolonRegex +import io.legado.app.data.appDb +import io.legado.app.data.entities.Cookie +import io.legado.app.help.CacheManager +import io.legado.app.help.http.CookieManager.getCookieNoSession +import io.legado.app.help.http.CookieManager.mergeCookiesToMap +import io.legado.app.help.http.api.CookieManagerInterface +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.removeCookie @Keep object CookieStore : CookieManagerInterface { diff --git a/app/src/main/java/io/legato/kazusa/help/http/Cronet.kt b/app/src/main/java/io/legado/app/help/http/Cronet.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/help/http/Cronet.kt rename to app/src/main/java/io/legado/app/help/http/Cronet.kt index a5e449cea..36d8e3fcd 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/Cronet.kt +++ b/app/src/main/java/io/legado/app/help/http/Cronet.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http -import io.legato.kazusa.lib.cronet.CronetInterceptor -import io.legato.kazusa.lib.cronet.CronetLoader +import io.legado.app.lib.cronet.CronetInterceptor +import io.legado.app.lib.cronet.CronetLoader import okhttp3.Interceptor object Cronet { diff --git a/app/src/main/java/io/legato/kazusa/help/http/DecompressInterceptor.kt b/app/src/main/java/io/legado/app/help/http/DecompressInterceptor.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/http/DecompressInterceptor.kt rename to app/src/main/java/io/legado/app/help/http/DecompressInterceptor.kt index 46e14fcd6..976d01f86 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/DecompressInterceptor.kt +++ b/app/src/main/java/io/legado/app/help/http/DecompressInterceptor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import okhttp3.Interceptor import okhttp3.Response diff --git a/app/src/main/java/io/legato/kazusa/help/http/HttpHelper.kt b/app/src/main/java/io/legado/app/help/http/HttpHelper.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/help/http/HttpHelper.kt rename to app/src/main/java/io/legado/app/help/http/HttpHelper.kt index 78e0db449..1efd9e8c5 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/HttpHelper.kt +++ b/app/src/main/java/io/legado/app/help/http/HttpHelper.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.glide.progress.ProgressManager.LISTENER -import io.legato.kazusa.help.glide.progress.ProgressResponseBody -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.utils.NetworkUtils +import io.legado.app.constant.AppConst +import io.legado.app.help.CacheManager +import io.legado.app.help.config.AppConfig +import io.legado.app.help.glide.progress.ProgressManager.LISTENER +import io.legado.app.help.glide.progress.ProgressResponseBody +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.model.ReadManga +import io.legado.app.utils.NetworkUtils import okhttp3.ConnectionSpec import okhttp3.Cookie import okhttp3.CookieJar diff --git a/app/src/main/java/io/legato/kazusa/help/http/ObsoleteUrlFactory.kt b/app/src/main/java/io/legado/app/help/http/ObsoleteUrlFactory.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/help/http/ObsoleteUrlFactory.kt rename to app/src/main/java/io/legado/app/help/http/ObsoleteUrlFactory.kt index f6f57334d..4d348f5f4 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/ObsoleteUrlFactory.kt +++ b/app/src/main/java/io/legado/app/help/http/ObsoleteUrlFactory.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import android.os.Build import androidx.annotation.RequiresApi -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.help.http.SSLHelper.unsafeTrustManager +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.help.http.SSLHelper.unsafeTrustManager import okhttp3.Call import okhttp3.Callback import okhttp3.Dispatcher diff --git a/app/src/main/java/io/legato/kazusa/help/http/OkHttpExceptionInterceptor.kt b/app/src/main/java/io/legado/app/help/http/OkHttpExceptionInterceptor.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/help/http/OkHttpExceptionInterceptor.kt rename to app/src/main/java/io/legado/app/help/http/OkHttpExceptionInterceptor.kt index 3c328f1db..018044274 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/OkHttpExceptionInterceptor.kt +++ b/app/src/main/java/io/legado/app/help/http/OkHttpExceptionInterceptor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import okhttp3.Interceptor import okhttp3.Response diff --git a/app/src/main/java/io/legato/kazusa/help/http/OkHttpUtils.kt b/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/http/OkHttpUtils.kt rename to app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt index dea158431..1134967e8 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/OkHttpUtils.kt +++ b/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http -import io.legato.kazusa.utils.EncodingDetect -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.Utf8BomUtils +import io.legado.app.utils.EncodingDetect +import io.legado.app.utils.GSON +import io.legado.app.utils.Utf8BomUtils import kotlinx.coroutines.suspendCancellableCoroutine import okhttp3.Call import okhttp3.Callback diff --git a/app/src/main/java/io/legato/kazusa/help/http/OkhttpUncaughtExceptionHandler.kt b/app/src/main/java/io/legado/app/help/http/OkhttpUncaughtExceptionHandler.kt similarity index 76% rename from app/src/main/java/io/legato/kazusa/help/http/OkhttpUncaughtExceptionHandler.kt rename to app/src/main/java/io/legado/app/help/http/OkhttpUncaughtExceptionHandler.kt index 1fa02d877..69b526ea9 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/OkhttpUncaughtExceptionHandler.kt +++ b/app/src/main/java/io/legado/app/help/http/OkhttpUncaughtExceptionHandler.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http -import io.legato.kazusa.constant.AppLog +import io.legado.app.constant.AppLog object OkhttpUncaughtExceptionHandler : Thread.UncaughtExceptionHandler { diff --git a/app/src/main/java/io/legato/kazusa/help/http/RequestMethod.kt b/app/src/main/java/io/legado/app/help/http/RequestMethod.kt similarity index 55% rename from app/src/main/java/io/legato/kazusa/help/http/RequestMethod.kt rename to app/src/main/java/io/legado/app/help/http/RequestMethod.kt index 744317adb..bba9f9761 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/RequestMethod.kt +++ b/app/src/main/java/io/legado/app/help/http/RequestMethod.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http enum class RequestMethod { GET, POST diff --git a/app/src/main/java/io/legato/kazusa/help/http/SSLHelper.kt b/app/src/main/java/io/legado/app/help/http/SSLHelper.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/help/http/SSLHelper.kt rename to app/src/main/java/io/legado/app/help/http/SSLHelper.kt index 4207c179d..e540282c7 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/SSLHelper.kt +++ b/app/src/main/java/io/legado/app/help/http/SSLHelper.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import android.annotation.SuppressLint import android.net.http.X509TrustManagerExtensions -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.printOnDebug import java.io.IOException diff --git a/app/src/main/java/io/legato/kazusa/help/http/StrResponse.kt b/app/src/main/java/io/legado/app/help/http/StrResponse.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/help/http/StrResponse.kt rename to app/src/main/java/io/legado/app/help/http/StrResponse.kt index 39982f0f2..46fed6291 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/StrResponse.kt +++ b/app/src/main/java/io/legado/app/help/http/StrResponse.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http +package io.legado.app.help.http import androidx.annotation.Keep import okhttp3.Headers diff --git a/app/src/main/java/io/legato/kazusa/help/http/api/CookieManagerInterface.kt b/app/src/main/java/io/legado/app/help/http/api/CookieManagerInterface.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/help/http/api/CookieManagerInterface.kt rename to app/src/main/java/io/legado/app/help/http/api/CookieManagerInterface.kt index 76fa2ff21..927ba4faf 100644 --- a/app/src/main/java/io/legato/kazusa/help/http/api/CookieManagerInterface.kt +++ b/app/src/main/java/io/legado/app/help/http/api/CookieManagerInterface.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.http.api +package io.legado.app.help.http.api interface CookieManagerInterface { diff --git a/app/src/main/java/io/legato/kazusa/help/rhino/NativeBaseSource.kt b/app/src/main/java/io/legado/app/help/rhino/NativeBaseSource.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/help/rhino/NativeBaseSource.kt rename to app/src/main/java/io/legado/app/help/rhino/NativeBaseSource.kt index 2436840c7..ed50b4d88 100644 --- a/app/src/main/java/io/legato/kazusa/help/rhino/NativeBaseSource.kt +++ b/app/src/main/java/io/legado/app/help/rhino/NativeBaseSource.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.help.rhino +package io.legado.app.help.rhino import com.script.rhino.JavaObjectWrapFactory import org.mozilla.javascript.NativeJavaObject diff --git a/app/src/main/java/io/legato/kazusa/help/source/BaseSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/BaseSourceExtensions.kt similarity index 62% rename from app/src/main/java/io/legato/kazusa/help/source/BaseSourceExtensions.kt rename to app/src/main/java/io/legado/app/help/source/BaseSourceExtensions.kt index 1189aec80..5c64a1b66 100644 --- a/app/src/main/java/io/legato/kazusa/help/source/BaseSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/BaseSourceExtensions.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help.source +package io.legado.app.help.source -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.model.SharedJsScope +import io.legado.app.constant.SourceType +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.RssSource +import io.legado.app.model.SharedJsScope import org.mozilla.javascript.Scriptable import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/io/legato/kazusa/help/source/BookSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/help/source/BookSourceExtensions.kt rename to app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt index 2a5d7b8c7..6d92062b2 100644 --- a/app/src/main/java/io/legato/kazusa/help/source/BookSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt @@ -1,17 +1,17 @@ -package io.legato.kazusa.help.source +package io.legado.app.help.source import com.script.rhino.runScriptWithContext -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.rule.ExploreKind -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.BookSourceType +import io.legado.app.constant.BookType +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.rule.ExploreKind +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.printOnDebug import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/io/legato/kazusa/help/source/RssSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/help/source/RssSourceExtensions.kt rename to app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt index c231e5e4e..230b6f72a 100644 --- a/app/src/main/java/io/legato/kazusa/help/source/RssSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.help.source +package io.legado.app.help.source -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.NetworkUtils +import io.legado.app.data.entities.RssSource +import io.legado.app.utils.ACache +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.NetworkUtils import com.script.rhino.runScriptWithContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/help/source/SourceHelp.kt b/app/src/main/java/io/legado/app/help/source/SourceHelp.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/help/source/SourceHelp.kt rename to app/src/main/java/io/legado/app/help/source/SourceHelp.kt index 83b004225..6efd4df24 100644 --- a/app/src/main/java/io/legato/kazusa/help/source/SourceHelp.kt +++ b/app/src/main/java/io/legado/app/help/source/SourceHelp.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.help.source +package io.legado.app.help.source -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.help.AppCacheManager -import io.legato.kazusa.help.config.SourceConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.utils.EncoderUtils -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.SourceType +import io.legado.app.data.appDb +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.RssSource +import io.legado.app.help.AppCacheManager +import io.legado.app.help.config.SourceConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.AudioPlay +import io.legado.app.model.ReadBook +import io.legado.app.model.ReadManga +import io.legado.app.utils.EncoderUtils +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi import splitties.init.appCtx object SourceHelp { diff --git a/app/src/main/java/io/legato/kazusa/help/source/SourceVerificationHelp.kt b/app/src/main/java/io/legado/app/help/source/SourceVerificationHelp.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/help/source/SourceVerificationHelp.kt rename to app/src/main/java/io/legado/app/help/source/SourceVerificationHelp.kt index 9e26aa522..80b514365 100644 --- a/app/src/main/java/io/legato/kazusa/help/source/SourceVerificationHelp.kt +++ b/app/src/main/java/io/legado/app/help/source/SourceVerificationHelp.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.help.source +package io.legado.app.help.source -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.ui.association.VerificationCodeActivity -import io.legato.kazusa.ui.browser.WebViewActivity -import io.legato.kazusa.utils.isMainThread -import io.legato.kazusa.utils.startActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.BaseSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.CacheManager +import io.legado.app.help.IntentData +import io.legado.app.ui.association.VerificationCodeActivity +import io.legado.app.ui.browser.WebViewActivity +import io.legado.app.utils.isMainThread +import io.legado.app.utils.startActivity import splitties.init.appCtx import java.util.concurrent.locks.LockSupport import kotlin.time.Duration.Companion.minutes diff --git a/app/src/main/java/io/legato/kazusa/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/help/storage/Backup.kt rename to app/src/main/java/io/legado/app/help/storage/Backup.kt index e561598cb..8ee3f4fbe 100644 --- a/app/src/main/java/io/legato/kazusa/help/storage/Backup.kt +++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.help.storage +package io.legado.app.help.storage import android.content.Context import android.net.Uri import androidx.documentfile.provider.DocumentFile -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.compress.ZipUtils +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.utils.* +import io.legado.app.utils.compress.ZipUtils import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.ensureActive import kotlinx.coroutines.sync.Mutex diff --git a/app/src/main/java/io/legato/kazusa/help/storage/BackupAES.kt b/app/src/main/java/io/legado/app/help/storage/BackupAES.kt similarity index 52% rename from app/src/main/java/io/legato/kazusa/help/storage/BackupAES.kt rename to app/src/main/java/io/legado/app/help/storage/BackupAES.kt index 3833f9e37..f420e2c23 100644 --- a/app/src/main/java/io/legato/kazusa/help/storage/BackupAES.kt +++ b/app/src/main/java/io/legado/app/help/storage/BackupAES.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.help.storage +package io.legado.app.help.storage import cn.hutool.crypto.symmetric.AES -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.utils.MD5Utils +import io.legado.app.help.config.LocalConfig +import io.legado.app.utils.MD5Utils class BackupAES : AES( MD5Utils.md5Encode(LocalConfig.password ?: "").encodeToByteArray(0, 16) diff --git a/app/src/main/java/io/legato/kazusa/help/storage/BackupConfig.kt b/app/src/main/java/io/legado/app/help/storage/BackupConfig.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/help/storage/BackupConfig.kt rename to app/src/main/java/io/legado/app/help/storage/BackupConfig.kt index 367f2b9ef..3c0ad84ef 100644 --- a/app/src/main/java/io/legato/kazusa/help/storage/BackupConfig.kt +++ b/app/src/main/java/io/legado/app/help/storage/BackupConfig.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.help.storage +package io.legado.app.help.storage -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject import splitties.init.appCtx /** diff --git a/app/src/main/java/io/legato/kazusa/help/storage/ImportOldData.kt b/app/src/main/java/io/legado/app/help/storage/ImportOldData.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/help/storage/ImportOldData.kt rename to app/src/main/java/io/legado/app/help/storage/ImportOldData.kt index b30fefff7..5689c84e5 100644 --- a/app/src/main/java/io/legato/kazusa/help/storage/ImportOldData.kt +++ b/app/src/main/java/io/legado/app/help/storage/ImportOldData.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.help.storage +package io.legado.app.help.storage import android.content.Context import android.net.Uri import androidx.documentfile.provider.DocumentFile import com.jayway.jsonpath.DocumentContext -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.rule.* -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.ReplaceAnalyzer -import io.legato.kazusa.utils.* +import io.legado.app.R +import io.legado.app.constant.AppConst +import io.legado.app.constant.BookSourceType +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.rule.* +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.ReplaceAnalyzer +import io.legado.app.utils.* import splitties.init.appCtx import java.io.File import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/help/storage/Restore.kt rename to app/src/main/java/io/legado/app/help/storage/Restore.kt index 6624f1976..9f464392f 100644 --- a/app/src/main/java/io/legato/kazusa/help/storage/Restore.kt +++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt @@ -1,54 +1,54 @@ -package io.legato.kazusa.help.storage +package io.legado.app.help.storage import android.content.Context import android.database.sqlite.SQLiteConstraintException import android.net.Uri import androidx.core.content.edit import androidx.documentfile.provider.DocumentFile -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst.androidId -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.data.entities.KeyboardAssist -import io.legato.kazusa.data.entities.ReadRecord -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.data.entities.RssStar -import io.legato.kazusa.data.entities.RuleSub -import io.legato.kazusa.data.entities.SearchKeyword -import io.legato.kazusa.data.entities.Server -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.LauncherIconHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.upType -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.defaultSharedPreferences -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.getSharedPreferences -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.openInputStream -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.BuildConfig +import io.legado.app.R +import io.legado.app.constant.AppConst.androidId +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.Bookmark +import io.legado.app.data.entities.DictRule +import io.legado.app.data.entities.HttpTTS +import io.legado.app.data.entities.KeyboardAssist +import io.legado.app.data.entities.ReadRecord +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.data.entities.RssSource +import io.legado.app.data.entities.RssStar +import io.legado.app.data.entities.RuleSub +import io.legado.app.data.entities.SearchKeyword +import io.legado.app.data.entities.Server +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.LauncherIconHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.upType +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.ACache +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.LogUtils +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.defaultSharedPreferences +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.getPrefString +import io.legado.app.utils.getSharedPreferences +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.openInputStream +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.delay import kotlinx.coroutines.sync.Mutex diff --git a/app/src/main/java/io/legato/kazusa/help/update/AppReleaseInfo.kt b/app/src/main/java/io/legado/app/help/update/AppReleaseInfo.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/help/update/AppReleaseInfo.kt rename to app/src/main/java/io/legado/app/help/update/AppReleaseInfo.kt index a877f12ea..c4352562a 100644 --- a/app/src/main/java/io/legato/kazusa/help/update/AppReleaseInfo.kt +++ b/app/src/main/java/io/legado/app/help/update/AppReleaseInfo.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.help.update +package io.legado.app.help.update import android.os.Build import androidx.annotation.Keep import com.google.gson.annotations.SerializedName -import io.legato.kazusa.exception.NoStackTraceException +import io.legado.app.exception.NoStackTraceException import java.time.Instant data class AppReleaseInfo( diff --git a/app/src/main/java/io/legato/kazusa/help/update/AppUpdate.kt b/app/src/main/java/io/legado/app/help/update/AppUpdate.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/help/update/AppUpdate.kt rename to app/src/main/java/io/legado/app/help/update/AppUpdate.kt index 10a814f5a..5e905aed2 100644 --- a/app/src/main/java/io/legato/kazusa/help/update/AppUpdate.kt +++ b/app/src/main/java/io/legado/app/help/update/AppUpdate.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.help.update +package io.legado.app.help.update -import io.legato.kazusa.help.coroutine.Coroutine +import io.legado.app.help.coroutine.Coroutine import kotlinx.coroutines.CoroutineScope object AppUpdate { diff --git a/app/src/main/java/io/legato/kazusa/help/update/AppUpdateGitHub.kt b/app/src/main/java/io/legado/app/help/update/AppUpdateGitHub.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/help/update/AppUpdateGitHub.kt rename to app/src/main/java/io/legado/app/help/update/AppUpdateGitHub.kt index 5e2fd5dcb..5d1c513cf 100644 --- a/app/src/main/java/io/legato/kazusa/help/update/AppUpdateGitHub.kt +++ b/app/src/main/java/io/legado/app/help/update/AppUpdateGitHub.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.help.update +package io.legado.app.help.update -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.newCallResponse -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.constant.AppConst +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.newCallResponse +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject import kotlinx.coroutines.CoroutineScope object AppUpdateGitHub : AppUpdate.AppUpdateInterface { diff --git a/app/src/main/java/io/legato/kazusa/lib/README.md b/app/src/main/java/io/legado/app/lib/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/lib/README.md rename to app/src/main/java/io/legado/app/lib/README.md diff --git a/app/src/main/java/io/legato/kazusa/lib/aliyun/ALiYun.kt b/app/src/main/java/io/legado/app/lib/aliyun/ALiYun.kt similarity index 57% rename from app/src/main/java/io/legato/kazusa/lib/aliyun/ALiYun.kt rename to app/src/main/java/io/legado/app/lib/aliyun/ALiYun.kt index 6c7994781..8d2bc8bbf 100644 --- a/app/src/main/java/io/legato/kazusa/lib/aliyun/ALiYun.kt +++ b/app/src/main/java/io/legado/app/lib/aliyun/ALiYun.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.aliyun +package io.legado.app.lib.aliyun object ALiYun { diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/AbsCallBack.kt b/app/src/main/java/io/legado/app/lib/cronet/AbsCallBack.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/cronet/AbsCallBack.kt rename to app/src/main/java/io/legado/app/lib/cronet/AbsCallBack.kt index 1e0ecf9fc..d054da5d4 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/AbsCallBack.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/AbsCallBack.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import androidx.annotation.Keep -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.CookieManager -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.asIOException -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.CookieManager +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.help.http.okHttpClient +import io.legado.app.utils.DebugLog +import io.legado.app.utils.asIOException +import io.legado.app.utils.splitNotBlank import kotlinx.coroutines.delay import okhttp3.Call import okhttp3.Callback diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/BodyUploadProvider.kt b/app/src/main/java/io/legado/app/lib/cronet/BodyUploadProvider.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/cronet/BodyUploadProvider.kt rename to app/src/main/java/io/legado/app/lib/cronet/BodyUploadProvider.kt index f12d39c42..d03ce896e 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/BodyUploadProvider.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/BodyUploadProvider.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import androidx.annotation.Keep import okhttp3.RequestBody diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CallbackResult.kt b/app/src/main/java/io/legado/app/lib/cronet/CallbackResult.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CallbackResult.kt rename to app/src/main/java/io/legado/app/lib/cronet/CallbackResult.kt index 6772659a1..e2b31125c 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CallbackResult.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CallbackResult.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import org.chromium.net.CronetException diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CallbackStep.kt b/app/src/main/java/io/legado/app/lib/cronet/CallbackStep.kt similarity index 73% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CallbackStep.kt rename to app/src/main/java/io/legado/app/lib/cronet/CallbackStep.kt index 54b0cfbbe..968b0555f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CallbackStep.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CallbackStep.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet enum class CallbackStep { ON_READ_COMPLETED, diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetCoroutineInterceptor.kt b/app/src/main/java/io/legado/app/lib/cronet/CronetCoroutineInterceptor.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CronetCoroutineInterceptor.kt rename to app/src/main/java/io/legado/app/lib/cronet/CronetCoroutineInterceptor.kt index 6aad1eaab..b6674a1ba 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetCoroutineInterceptor.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CronetCoroutineInterceptor.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import androidx.annotation.Keep -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.printOnDebug import kotlinx.coroutines.runBlocking import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withTimeout diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetHelper.kt b/app/src/main/java/io/legado/app/lib/cronet/CronetHelper.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CronetHelper.kt rename to app/src/main/java/io/legado/app/lib/cronet/CronetHelper.kt index 5ad86f4ff..786b04198 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetHelper.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CronetHelper.kt @@ -1,15 +1,15 @@ @file:Keep @file:Suppress("DEPRECATION") -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import androidx.annotation.Keep -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.help.http.SSLHelper -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.externalCache +import io.legado.app.constant.AppLog +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.help.http.SSLHelper +import io.legado.app.help.http.okHttpClient +import io.legado.app.utils.DebugLog +import io.legado.app.utils.externalCache import okhttp3.Headers import okhttp3.MediaType import okhttp3.Request diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetInterceptor.kt b/app/src/main/java/io/legado/app/lib/cronet/CronetInterceptor.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CronetInterceptor.kt rename to app/src/main/java/io/legado/app/lib/cronet/CronetInterceptor.kt index 16a608233..4b333d4e6 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetInterceptor.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CronetInterceptor.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import android.annotation.SuppressLint import android.os.Build import androidx.annotation.Keep -import io.legato.kazusa.help.http.CookieManager -import io.legato.kazusa.help.http.CookieManager.cookieJarHeader -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.help.http.CookieManager +import io.legado.app.help.http.CookieManager.cookieJarHeader +import io.legado.app.utils.printOnDebug import okhttp3.Call import okhttp3.CookieJar import okhttp3.HttpUrl diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetLoader.kt b/app/src/main/java/io/legado/app/lib/cronet/CronetLoader.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/cronet/CronetLoader.kt rename to app/src/main/java/io/legado/app/lib/cronet/CronetLoader.kt index 3e526530f..2ef745305 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/CronetLoader.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/CronetLoader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import android.annotation.SuppressLint import android.content.Context @@ -6,11 +6,11 @@ import android.content.pm.ApplicationInfo import android.os.Build import android.text.TextUtils import androidx.annotation.Keep -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.Cronet -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.BuildConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.Cronet +import io.legado.app.utils.DebugLog +import io.legado.app.utils.printOnDebug import org.chromium.net.CronetEngine import org.json.JSONObject import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/LargeBodyUploadProvider.kt b/app/src/main/java/io/legado/app/lib/cronet/LargeBodyUploadProvider.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/cronet/LargeBodyUploadProvider.kt rename to app/src/main/java/io/legado/app/lib/cronet/LargeBodyUploadProvider.kt index 78bfcbe5a..b07327f73 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/LargeBodyUploadProvider.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/LargeBodyUploadProvider.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import androidx.annotation.Keep import okhttp3.RequestBody diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/NewCallBack.kt b/app/src/main/java/io/legado/app/lib/cronet/NewCallBack.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/cronet/NewCallBack.kt rename to app/src/main/java/io/legado/app/lib/cronet/NewCallBack.kt index 5d8b552fb..701c9ea49 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/NewCallBack.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/NewCallBack.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import android.annotation.SuppressLint import android.os.Build diff --git a/app/src/main/java/io/legato/kazusa/lib/cronet/OldCallback.kt b/app/src/main/java/io/legado/app/lib/cronet/OldCallback.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/cronet/OldCallback.kt rename to app/src/main/java/io/legado/app/lib/cronet/OldCallback.kt index c829b39df..faf1fc635 100644 --- a/app/src/main/java/io/legato/kazusa/lib/cronet/OldCallback.kt +++ b/app/src/main/java/io/legado/app/lib/cronet/OldCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.cronet +package io.legado.app.lib.cronet import android.os.ConditionVariable import androidx.annotation.Keep diff --git a/app/src/main/java/io/legato/kazusa/lib/dialogs/AlertBuilder.kt b/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/dialogs/AlertBuilder.kt rename to app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt index d5d6c6e53..e79156630 100644 --- a/app/src/main/java/io/legato/kazusa/lib/dialogs/AlertBuilder.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.lib.dialogs +package io.legado.app.lib.dialogs import android.annotation.SuppressLint import android.content.Context @@ -10,7 +10,7 @@ import android.view.KeyEvent import android.view.View import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import io.legato.kazusa.R +import io.legado.app.R @SuppressLint("SupportAnnotationUsage") interface AlertBuilder { diff --git a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidAlertBuilder.kt b/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidAlertBuilder.kt rename to app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt index 6d87686ce..9febacd04 100644 --- a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidAlertBuilder.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.dialogs +package io.legado.app.lib.dialogs import android.content.Context import android.content.DialogInterface @@ -7,8 +7,8 @@ import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AlertDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import io.legato.kazusa.R -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.help.config.AppConfig internal class AndroidAlertBuilder(override val ctx: Context) : AlertBuilder { private val builder = MaterialAlertDialogBuilder(ctx) diff --git a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidDialogs.kt b/app/src/main/java/io/legado/app/lib/dialogs/AndroidDialogs.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidDialogs.kt rename to app/src/main/java/io/legado/app/lib/dialogs/AndroidDialogs.kt index df2022513..7690a47c3 100644 --- a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidDialogs.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AndroidDialogs.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE", "unused", "DEPRECATION") -package io.legato.kazusa.lib.dialogs +package io.legado.app.lib.dialogs import android.app.ProgressDialog import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidSelectors.kt b/app/src/main/java/io/legado/app/lib/dialogs/AndroidSelectors.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidSelectors.kt rename to app/src/main/java/io/legado/app/lib/dialogs/AndroidSelectors.kt index 1fa938b7c..4cb5a166f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/dialogs/AndroidSelectors.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AndroidSelectors.kt @@ -16,7 +16,7 @@ @file:Suppress("unused") -package io.legato.kazusa.lib.dialogs +package io.legado.app.lib.dialogs import android.content.Context import android.content.DialogInterface diff --git a/app/src/main/java/io/legato/kazusa/lib/dialogs/SelectItem.kt b/app/src/main/java/io/legado/app/lib/dialogs/SelectItem.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/lib/dialogs/SelectItem.kt rename to app/src/main/java/io/legado/app/lib/dialogs/SelectItem.kt index c4eecdb34..71a8f613a 100644 --- a/app/src/main/java/io/legato/kazusa/lib/dialogs/SelectItem.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/SelectItem.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.dialogs +package io.legado.app.lib.dialogs @Suppress("unused") data class SelectItem( diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetDetector.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetDetector.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java index fb7dd4ffd..cfd4d6276 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetDetector.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java @@ -6,7 +6,7 @@ others. All Rights Reserved. * ****************************************************************************** */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; import android.os.ParcelFileDescriptor; import android.system.OsConstants; diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetMatch.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetMatch.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java index 71053dff9..04bbe6222 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetMatch.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java @@ -6,7 +6,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_2022.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_2022.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java index a7fe04e20..40cf53ea0 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_2022.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java @@ -6,7 +6,7 @@ * others. All Rights Reserved. * ******************************************************************************* */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; /** * class CharsetRecog_2022 part of the ICU charset detection imlementation. diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_UTF8.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_UTF8.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java index 69e947202..60ff6d746 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_UTF8.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java @@ -6,7 +6,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; /** * Charset recognizer for UTF-8 diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_Unicode.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_Unicode.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java index 7073d4980..82380e654 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_Unicode.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java @@ -8,7 +8,7 @@ * */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; /** * This class matches UTF-16 and UTF-32, both big- and little-endian. The diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_mbcs.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_mbcs.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java index 015cb0533..0e211a7ab 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_mbcs.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java @@ -7,7 +7,7 @@ **************************************************************************** * */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; import java.util.Arrays; diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_sbcs.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_sbcs.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java index 12e3f88b1..070b7754b 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecog_sbcs.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java @@ -8,7 +8,7 @@ * */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; /** * This class recognizes single-byte encodings. Because the encoding scheme is so diff --git a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecognizer.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecognizer.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java index 0a4e28792..1adabd330 100644 --- a/app/src/main/java/io/legato/kazusa/lib/icu4j/CharsetRecognizer.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java @@ -6,7 +6,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legato.kazusa.lib.icu4j; +package io.legado.app.lib.icu4j; /** * Abstract class for recognizing a single charset. diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/KF6Book.kt b/app/src/main/java/io/legado/app/lib/mobi/KF6Book.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/mobi/KF6Book.kt rename to app/src/main/java/io/legado/app/lib/mobi/KF6Book.kt index 0cd0a7a65..740a79870 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/KF6Book.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/KF6Book.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.lib.mobi +package io.legado.app.lib.mobi -import io.legato.kazusa.lib.mobi.entities.KF6Section -import io.legato.kazusa.lib.mobi.entities.MobiEntryHeaders -import io.legato.kazusa.lib.mobi.entities.NCX -import io.legato.kazusa.lib.mobi.entities.TOC +import io.legado.app.lib.mobi.entities.KF6Section +import io.legado.app.lib.mobi.entities.MobiEntryHeaders +import io.legado.app.lib.mobi.entities.NCX +import io.legado.app.lib.mobi.entities.TOC import java.nio.CharBuffer diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/KF8Book.kt b/app/src/main/java/io/legado/app/lib/mobi/KF8Book.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/lib/mobi/KF8Book.kt rename to app/src/main/java/io/legado/app/lib/mobi/KF8Book.kt index a8b433b26..3f09c89ae 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/KF8Book.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/KF8Book.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.lib.mobi +package io.legado.app.lib.mobi -import io.legato.kazusa.lib.mobi.entities.FdstHeader -import io.legato.kazusa.lib.mobi.entities.Fragment -import io.legato.kazusa.lib.mobi.entities.KF8Pos -import io.legato.kazusa.lib.mobi.entities.KF8Resource -import io.legato.kazusa.lib.mobi.entities.KF8Section -import io.legato.kazusa.lib.mobi.entities.MobiEntryHeaders -import io.legato.kazusa.lib.mobi.entities.NCX -import io.legato.kazusa.lib.mobi.entities.Skeleton -import io.legato.kazusa.lib.mobi.entities.TOC -import io.legato.kazusa.lib.mobi.utils.readString -import io.legato.kazusa.lib.mobi.utils.readUInt32 +import io.legado.app.lib.mobi.entities.FdstHeader +import io.legado.app.lib.mobi.entities.Fragment +import io.legado.app.lib.mobi.entities.KF8Pos +import io.legado.app.lib.mobi.entities.KF8Resource +import io.legado.app.lib.mobi.entities.KF8Section +import io.legado.app.lib.mobi.entities.MobiEntryHeaders +import io.legado.app.lib.mobi.entities.NCX +import io.legado.app.lib.mobi.entities.Skeleton +import io.legado.app.lib.mobi.entities.TOC +import io.legado.app.lib.mobi.utils.readString +import io.legado.app.lib.mobi.utils.readUInt32 import java.nio.ByteBuffer import java.util.Locale diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/MobiBook.kt b/app/src/main/java/io/legado/app/lib/mobi/MobiBook.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/lib/mobi/MobiBook.kt rename to app/src/main/java/io/legado/app/lib/mobi/MobiBook.kt index d4e82686e..a2917517f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/MobiBook.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/MobiBook.kt @@ -1,26 +1,26 @@ -package io.legato.kazusa.lib.mobi +package io.legado.app.lib.mobi import android.util.SparseArray -import io.legato.kazusa.lib.mobi.decompress.Decompressor -import io.legato.kazusa.lib.mobi.decompress.HuffcdicDecompressor -import io.legato.kazusa.lib.mobi.decompress.Lz77Decompressor -import io.legato.kazusa.lib.mobi.decompress.PlainDecompressor -import io.legato.kazusa.lib.mobi.entities.IndexData -import io.legato.kazusa.lib.mobi.entities.IndexEntry -import io.legato.kazusa.lib.mobi.entities.IndexTag -import io.legato.kazusa.lib.mobi.entities.IndxHeader -import io.legato.kazusa.lib.mobi.entities.MobiEntryHeaders -import io.legato.kazusa.lib.mobi.entities.MobiMetadata -import io.legato.kazusa.lib.mobi.entities.NCX -import io.legato.kazusa.lib.mobi.entities.Ptagx -import io.legato.kazusa.lib.mobi.entities.TOC -import io.legato.kazusa.lib.mobi.entities.TagxHeader -import io.legato.kazusa.lib.mobi.entities.TagxTag -import io.legato.kazusa.lib.mobi.utils.and -import io.legato.kazusa.lib.mobi.utils.readString -import io.legato.kazusa.lib.mobi.utils.readUInt16Array -import io.legato.kazusa.lib.mobi.utils.readUInt32 -import io.legato.kazusa.lib.mobi.utils.readUInt8 +import io.legado.app.lib.mobi.decompress.Decompressor +import io.legado.app.lib.mobi.decompress.HuffcdicDecompressor +import io.legado.app.lib.mobi.decompress.Lz77Decompressor +import io.legado.app.lib.mobi.decompress.PlainDecompressor +import io.legado.app.lib.mobi.entities.IndexData +import io.legado.app.lib.mobi.entities.IndexEntry +import io.legado.app.lib.mobi.entities.IndexTag +import io.legado.app.lib.mobi.entities.IndxHeader +import io.legado.app.lib.mobi.entities.MobiEntryHeaders +import io.legado.app.lib.mobi.entities.MobiMetadata +import io.legado.app.lib.mobi.entities.NCX +import io.legado.app.lib.mobi.entities.Ptagx +import io.legado.app.lib.mobi.entities.TOC +import io.legado.app.lib.mobi.entities.TagxHeader +import io.legado.app.lib.mobi.entities.TagxTag +import io.legado.app.lib.mobi.utils.and +import io.legado.app.lib.mobi.utils.readString +import io.legado.app.lib.mobi.utils.readUInt16Array +import io.legado.app.lib.mobi.utils.readUInt32 +import io.legado.app.lib.mobi.utils.readUInt8 import java.io.ByteArrayInputStream import java.io.InputStream import java.nio.ByteBuffer diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/MobiReader.kt b/app/src/main/java/io/legado/app/lib/mobi/MobiReader.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/mobi/MobiReader.kt rename to app/src/main/java/io/legado/app/lib/mobi/MobiReader.kt index 7fd8e4e0e..2a8b3eeca 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/MobiReader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/MobiReader.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.lib.mobi +package io.legado.app.lib.mobi import android.os.ParcelFileDescriptor -import io.legato.kazusa.lib.mobi.entities.ExthRecordType -import io.legato.kazusa.lib.mobi.entities.KF8Header -import io.legato.kazusa.lib.mobi.entities.MobiEntryHeaders -import io.legato.kazusa.lib.mobi.entities.MobiHeader -import io.legato.kazusa.lib.mobi.entities.PalmDocHeader -import io.legato.kazusa.lib.mobi.utils.readString -import io.legato.kazusa.lib.mobi.utils.readUInt16 -import io.legato.kazusa.lib.mobi.utils.readUInt32 -import io.legato.kazusa.lib.mobi.utils.readUInt8 +import io.legado.app.lib.mobi.entities.ExthRecordType +import io.legado.app.lib.mobi.entities.KF8Header +import io.legado.app.lib.mobi.entities.MobiEntryHeaders +import io.legado.app.lib.mobi.entities.MobiHeader +import io.legado.app.lib.mobi.entities.PalmDocHeader +import io.legado.app.lib.mobi.utils.readString +import io.legado.app.lib.mobi.utils.readUInt16 +import io.legado.app.lib.mobi.utils.readUInt32 +import io.legado.app.lib.mobi.utils.readUInt8 import java.nio.ByteBuffer import java.nio.charset.Charset diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/PDBFile.kt b/app/src/main/java/io/legado/app/lib/mobi/PDBFile.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/lib/mobi/PDBFile.kt rename to app/src/main/java/io/legado/app/lib/mobi/PDBFile.kt index b3a02bf2a..dfa0c739f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/PDBFile.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/PDBFile.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.lib.mobi +package io.legado.app.lib.mobi import android.os.ParcelFileDescriptor -import io.legato.kazusa.lib.mobi.utils.readString -import io.legato.kazusa.lib.mobi.utils.readUInt16 -import io.legato.kazusa.lib.mobi.utils.readUInt32 +import io.legado.app.lib.mobi.utils.readString +import io.legado.app.lib.mobi.utils.readUInt16 +import io.legado.app.lib.mobi.utils.readUInt32 import java.io.FileInputStream import java.nio.ByteBuffer import java.nio.channels.FileChannel diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/CDICData.kt b/app/src/main/java/io/legado/app/lib/mobi/decompress/CDICData.kt similarity index 62% rename from app/src/main/java/io/legato/kazusa/lib/mobi/decompress/CDICData.kt rename to app/src/main/java/io/legado/app/lib/mobi/decompress/CDICData.kt index 58425492f..980dd4fa2 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/CDICData.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/decompress/CDICData.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.decompress +package io.legado.app.lib.mobi.decompress class CDICEntry( var data: ByteArray, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Decompressor.kt b/app/src/main/java/io/legado/app/lib/mobi/decompress/Decompressor.kt similarity index 63% rename from app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Decompressor.kt rename to app/src/main/java/io/legado/app/lib/mobi/decompress/Decompressor.kt index 90b4a635f..a19352bb7 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Decompressor.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/decompress/Decompressor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.decompress +package io.legado.app.lib.mobi.decompress interface Decompressor { diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/HuffcdicDecompressor.kt b/app/src/main/java/io/legado/app/lib/mobi/decompress/HuffcdicDecompressor.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/lib/mobi/decompress/HuffcdicDecompressor.kt rename to app/src/main/java/io/legado/app/lib/mobi/decompress/HuffcdicDecompressor.kt index 7eb75f72f..d7f0a1df0 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/HuffcdicDecompressor.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/decompress/HuffcdicDecompressor.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.lib.mobi.decompress +package io.legado.app.lib.mobi.decompress -import io.legato.kazusa.lib.mobi.MobiBook -import io.legato.kazusa.lib.mobi.entities.MobiHeader -import io.legato.kazusa.lib.mobi.utils.readIntArray -import io.legato.kazusa.lib.mobi.utils.readString -import io.legato.kazusa.lib.mobi.utils.readUInt16 -import io.legato.kazusa.lib.mobi.utils.readUInt32 +import io.legado.app.lib.mobi.MobiBook +import io.legado.app.lib.mobi.entities.MobiHeader +import io.legado.app.lib.mobi.utils.readIntArray +import io.legado.app.lib.mobi.utils.readString +import io.legado.app.lib.mobi.utils.readUInt16 +import io.legado.app.lib.mobi.utils.readUInt32 import java.io.ByteArrayOutputStream import java.nio.ByteBuffer import kotlin.math.min diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Lz77Decompressor.kt b/app/src/main/java/io/legado/app/lib/mobi/decompress/Lz77Decompressor.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Lz77Decompressor.kt rename to app/src/main/java/io/legado/app/lib/mobi/decompress/Lz77Decompressor.kt index df537d5ed..91ed22b01 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/Lz77Decompressor.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/decompress/Lz77Decompressor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.decompress +package io.legado.app.lib.mobi.decompress import androidx.core.util.Pools.SynchronizedPool diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/PlainDecompressor.kt b/app/src/main/java/io/legado/app/lib/mobi/decompress/PlainDecompressor.kt similarity index 74% rename from app/src/main/java/io/legato/kazusa/lib/mobi/decompress/PlainDecompressor.kt rename to app/src/main/java/io/legado/app/lib/mobi/decompress/PlainDecompressor.kt index 525bb98d4..7bc4ce743 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/decompress/PlainDecompressor.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/decompress/PlainDecompressor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.decompress +package io.legado.app.lib.mobi.decompress class PlainDecompressor : Decompressor { diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/ExthRecordType.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/ExthRecordType.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/ExthRecordType.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/ExthRecordType.kt index 8f5844787..b2746d6be 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/ExthRecordType.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/ExthRecordType.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class ExthRecordType( val name: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/FdstHeader.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/FdstHeader.kt similarity index 62% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/FdstHeader.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/FdstHeader.kt index 2b0dec350..61fb1b63e 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/FdstHeader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/FdstHeader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class FdstHeader( val magic: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Fragment.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/Fragment.kt similarity index 76% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/Fragment.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/Fragment.kt index 2be270afd..50e647f6d 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Fragment.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/Fragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class Fragment( val insertOffset: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexData.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexData.kt similarity index 74% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexData.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/IndexData.kt index f13dc8f11..962d99efe 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexData.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexData.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities import android.util.SparseArray diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexEntry.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexEntry.kt similarity index 77% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexEntry.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/IndexEntry.kt index 696ed0a5e..717a51997 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexEntry.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexEntry.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities import android.util.SparseArray diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexTag.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexTag.kt similarity index 62% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexTag.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/IndexTag.kt index 4f5a60a1b..8de50d2b4 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndexTag.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/IndexTag.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class IndexTag( val tagId: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndxHeader.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/IndxHeader.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndxHeader.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/IndxHeader.kt index 02595fcf6..7c13bcc81 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/IndxHeader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/IndxHeader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class IndxHeader( val magic: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF6Section.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/KF6Section.kt similarity index 78% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF6Section.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/KF6Section.kt index d91de0d07..b15ccf487 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF6Section.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/KF6Section.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class KF6Section( val index: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Header.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Header.kt similarity index 74% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Header.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/KF8Header.kt index 6a3dd8c4d..c5c639b2e 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Header.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Header.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class KF8Header( val fdst: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Pos.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Pos.kt similarity index 58% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Pos.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/KF8Pos.kt index f01e17241..e317a76ca 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Pos.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Pos.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class KF8Pos( val fid: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Resource.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Resource.kt similarity index 68% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Resource.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/KF8Resource.kt index 24cc866f4..eb2b51d79 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Resource.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Resource.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class KF8Resource( val resourceType: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Section.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Section.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Section.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/KF8Section.kt index 9f3a2dd13..781cf9f33 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/KF8Section.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/KF8Section.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class KF8Section( val index: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiEntryHeaders.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiEntryHeaders.kt similarity index 77% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiEntryHeaders.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/MobiEntryHeaders.kt index f0814b16d..0194dbdb9 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiEntryHeaders.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiEntryHeaders.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class MobiEntryHeaders( val palmdoc: PalmDocHeader, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiHeader.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiHeader.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiHeader.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/MobiHeader.kt index 607f811b6..827f1eaae 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiHeader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiHeader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class MobiHeader( val identifier: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiMetadata.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiMetadata.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiMetadata.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/MobiMetadata.kt index 6cb303fba..5655e2704 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/MobiMetadata.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/MobiMetadata.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class MobiMetadata( val identifier: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/NCX.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/NCX.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/NCX.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/NCX.kt index 524c330bd..4aed57f83 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/NCX.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/NCX.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class NCX( val index: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/PalmDocHeader.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/PalmDocHeader.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/PalmDocHeader.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/PalmDocHeader.kt index dc439d27b..c985a02fc 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/PalmDocHeader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/PalmDocHeader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class PalmDocHeader( val compression: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Ptagx.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/Ptagx.kt similarity index 73% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/Ptagx.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/Ptagx.kt index 5171e04c9..adb2a3d01 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Ptagx.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/Ptagx.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class Ptagx( val tag: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Skeleton.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/Skeleton.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/Skeleton.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/Skeleton.kt index e4577550c..cd6979687 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/Skeleton.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/Skeleton.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class Skeleton( val index: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TOC.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/TOC.kt similarity index 69% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/TOC.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/TOC.kt index ed9ade5ff..d47f31f39 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TOC.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/TOC.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class TOC( val label: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxHeader.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/TagxHeader.kt similarity index 69% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxHeader.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/TagxHeader.kt index 145efe8db..0925ddb27 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxHeader.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/TagxHeader.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class TagxHeader( val magic: String, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxTag.kt b/app/src/main/java/io/legado/app/lib/mobi/entities/TagxTag.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxTag.kt rename to app/src/main/java/io/legado/app/lib/mobi/entities/TagxTag.kt index 05dccaef7..2b02edf7c 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/entities/TagxTag.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/entities/TagxTag.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.entities +package io.legado.app.lib.mobi.entities data class TagxTag( val tag: Int, diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/utils/BitwiseExtensions.kt b/app/src/main/java/io/legado/app/lib/mobi/utils/BitwiseExtensions.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/lib/mobi/utils/BitwiseExtensions.kt rename to app/src/main/java/io/legado/app/lib/mobi/utils/BitwiseExtensions.kt index ea4e1a1f2..ae19d86ec 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/utils/BitwiseExtensions.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/utils/BitwiseExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.utils +package io.legado.app.lib.mobi.utils internal infix fun Byte.and(mask: Int): Int = toInt() and mask diff --git a/app/src/main/java/io/legato/kazusa/lib/mobi/utils/ByteBufferExtensions.kt b/app/src/main/java/io/legado/app/lib/mobi/utils/ByteBufferExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/mobi/utils/ByteBufferExtensions.kt rename to app/src/main/java/io/legado/app/lib/mobi/utils/ByteBufferExtensions.kt index d706d3711..e206d6f3f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/mobi/utils/ByteBufferExtensions.kt +++ b/app/src/main/java/io/legado/app/lib/mobi/utils/ByteBufferExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.mobi.utils +package io.legado.app.lib.mobi.utils import java.nio.ByteBuffer import java.nio.charset.Charset diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/OnErrorCallback.kt b/app/src/main/java/io/legado/app/lib/permission/OnErrorCallback.kt similarity index 60% rename from app/src/main/java/io/legato/kazusa/lib/permission/OnErrorCallback.kt rename to app/src/main/java/io/legado/app/lib/permission/OnErrorCallback.kt index 84806c756..2f32126a9 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/OnErrorCallback.kt +++ b/app/src/main/java/io/legado/app/lib/permission/OnErrorCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission interface OnErrorCallback { diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsDeniedCallback.kt b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsDeniedCallback.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsDeniedCallback.kt rename to app/src/main/java/io/legado/app/lib/permission/OnPermissionsDeniedCallback.kt index 74d8ef6d6..0cc6b715b 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsDeniedCallback.kt +++ b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsDeniedCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission interface OnPermissionsDeniedCallback { diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsGrantedCallback.kt b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsGrantedCallback.kt similarity index 65% rename from app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsGrantedCallback.kt rename to app/src/main/java/io/legado/app/lib/permission/OnPermissionsGrantedCallback.kt index 289e4970a..fe43e947e 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsGrantedCallback.kt +++ b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsGrantedCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission interface OnPermissionsGrantedCallback { diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsResultCallback.kt b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsResultCallback.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsResultCallback.kt rename to app/src/main/java/io/legado/app/lib/permission/OnPermissionsResultCallback.kt index 4415830a1..9d83c31af 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/OnPermissionsResultCallback.kt +++ b/app/src/main/java/io/legado/app/lib/permission/OnPermissionsResultCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission interface OnPermissionsResultCallback { diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/OnRequestPermissionsResultCallback.kt b/app/src/main/java/io/legado/app/lib/permission/OnRequestPermissionsResultCallback.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/lib/permission/OnRequestPermissionsResultCallback.kt rename to app/src/main/java/io/legado/app/lib/permission/OnRequestPermissionsResultCallback.kt index 1de042cca..4298e0fb4 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/OnRequestPermissionsResultCallback.kt +++ b/app/src/main/java/io/legado/app/lib/permission/OnRequestPermissionsResultCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission interface OnRequestPermissionsResultCallback { diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/PermissionActivity.kt b/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/permission/PermissionActivity.kt rename to app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt index f7a807ea4..5595b968e 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/PermissionActivity.kt +++ b/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission import android.annotation.SuppressLint import android.content.Intent @@ -13,11 +13,11 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.utils.registerForActivityResult -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException +import io.legado.app.utils.registerForActivityResult +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.launch import androidx.core.net.toUri diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/Permissions.kt b/app/src/main/java/io/legado/app/lib/permission/Permissions.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/permission/Permissions.kt rename to app/src/main/java/io/legado/app/lib/permission/Permissions.kt index 6e2a4607e..4801b1dab 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/Permissions.kt +++ b/app/src/main/java/io/legado/app/lib/permission/Permissions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission import android.os.Build diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/PermissionsCompat.kt b/app/src/main/java/io/legado/app/lib/permission/PermissionsCompat.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/permission/PermissionsCompat.kt rename to app/src/main/java/io/legado/app/lib/permission/PermissionsCompat.kt index db7c9d2f0..c29eb31d7 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/PermissionsCompat.kt +++ b/app/src/main/java/io/legado/app/lib/permission/PermissionsCompat.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission import androidx.annotation.StringRes diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/Request.kt b/app/src/main/java/io/legado/app/lib/permission/Request.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/permission/Request.kt rename to app/src/main/java/io/legado/app/lib/permission/Request.kt index c4caedefa..4ac8fabc1 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/Request.kt +++ b/app/src/main/java/io/legado/app/lib/permission/Request.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission import android.annotation.SuppressLint import android.content.pm.PackageManager @@ -7,7 +7,7 @@ import android.os.Environment import androidx.annotation.StringRes import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat -import io.legato.kazusa.utils.startActivity +import io.legado.app.utils.startActivity import splitties.init.appCtx import splitties.systemservices.powerManager diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/RequestManager.kt b/app/src/main/java/io/legado/app/lib/permission/RequestManager.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/permission/RequestManager.kt rename to app/src/main/java/io/legado/app/lib/permission/RequestManager.kt index ea84ee6b2..c4a67edb8 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/RequestManager.kt +++ b/app/src/main/java/io/legado/app/lib/permission/RequestManager.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/io/legato/kazusa/lib/permission/RequestPlugins.kt b/app/src/main/java/io/legado/app/lib/permission/RequestPlugins.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/lib/permission/RequestPlugins.kt rename to app/src/main/java/io/legado/app/lib/permission/RequestPlugins.kt index 51e9d9583..59bf0f0eb 100644 --- a/app/src/main/java/io/legato/kazusa/lib/permission/RequestPlugins.kt +++ b/app/src/main/java/io/legado/app/lib/permission/RequestPlugins.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.permission +package io.legado.app.lib.permission internal object RequestPlugins { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/ColorPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/ColorPreference.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/prefs/ColorPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/ColorPreference.kt index d94297670..5818bb812 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/ColorPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/ColorPreference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.content.ContextWrapper @@ -12,9 +12,9 @@ import androidx.appcompat.app.AlertDialog import androidx.fragment.app.FragmentActivity import androidx.preference.PreferenceViewHolder import com.jaredrummler.android.colorpicker.* -import io.legato.kazusa.utils.ColorUtils -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.themeColor +import io.legado.app.utils.ColorUtils +import io.legado.app.utils.applyTint +import io.legado.app.utils.themeColor @Suppress("MemberVisibilityCanBePrivate", "unused") class ColorPreference @JvmOverloads constructor( @@ -45,7 +45,7 @@ class ColorPreference @JvmOverloads constructor( init { isPersistent = true - layoutResource = io.legato.kazusa.R.layout.view_preference + layoutResource = io.legado.app.R.layout.view_preference val a = context.obtainStyledAttributes(attrs, R.styleable.ColorPreference) showDialog = a.getBoolean(R.styleable.ColorPreference_cpv_showDialog, true) diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/EditTextPreference.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/EditTextPreference.kt index c22550d0d..cdaa386ac 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/EditTextPreference.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.util.AttributeSet import android.widget.TextView import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor class EditTextPreference(context: Context, attrs: AttributeSet) : diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreferenceDialog.kt b/app/src/main/java/io/legado/app/lib/prefs/EditTextPreferenceDialog.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreferenceDialog.kt rename to app/src/main/java/io/legado/app/lib/prefs/EditTextPreferenceDialog.kt index 4625c1d1c..642ad95f6 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/EditTextPreferenceDialog.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/EditTextPreferenceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.app.Dialog import android.os.Bundle @@ -6,8 +6,8 @@ import android.view.Gravity import android.view.WindowManager import androidx.preference.EditTextPreferenceDialogFragmentCompat import androidx.preference.PreferenceDialogFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.filletBackground diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/IconListPreference.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/IconListPreference.kt index 0b61b0867..bfcc6353a 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/IconListPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/IconListPreference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.content.ContextWrapper @@ -12,15 +12,15 @@ import androidx.fragment.app.FragmentActivity import androidx.preference.ListPreference import androidx.preference.PreferenceViewHolder import androidx.recyclerview.widget.GridLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemIconPreferenceBinding -import io.legato.kazusa.utils.getCompatDrawable -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemIconPreferenceBinding +import io.legado.app.utils.getCompatDrawable +import io.legado.app.utils.themeColor +import io.legado.app.utils.viewbindingdelegate.viewBinding class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/ImagePreviewPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/ImagePreviewPreference.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/lib/prefs/ImagePreviewPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/ImagePreviewPreference.kt index 8edb6025e..dfd82534a 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/ImagePreviewPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/ImagePreviewPreference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.graphics.BitmapFactory @@ -6,7 +6,7 @@ import android.util.AttributeSet import android.view.View import android.widget.ImageView import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R +import io.legado.app.R import java.io.File class ImagePreviewPreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/ListPreferenceDialog.kt b/app/src/main/java/io/legado/app/lib/prefs/ListPreferenceDialog.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/prefs/ListPreferenceDialog.kt rename to app/src/main/java/io/legado/app/lib/prefs/ListPreferenceDialog.kt index 5fddcbf8d..ddeeee92d 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/ListPreferenceDialog.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/ListPreferenceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.app.Dialog import android.os.Bundle @@ -6,11 +6,11 @@ import android.view.Gravity import android.view.WindowManager import androidx.preference.ListPreferenceDialogFragmentCompat import androidx.preference.PreferenceDialogFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.filletBackground -import io.legato.kazusa.utils.dpToPx +import io.legado.app.utils.dpToPx class ListPreferenceDialog : ListPreferenceDialogFragmentCompat() { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/MultiSelectListPreferenceDialog.kt b/app/src/main/java/io/legado/app/lib/prefs/MultiSelectListPreferenceDialog.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/prefs/MultiSelectListPreferenceDialog.kt rename to app/src/main/java/io/legado/app/lib/prefs/MultiSelectListPreferenceDialog.kt index 7f7f6801a..18d3615bc 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/MultiSelectListPreferenceDialog.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/MultiSelectListPreferenceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.app.Dialog import android.os.Bundle @@ -6,11 +6,11 @@ import android.view.Gravity import android.view.WindowManager import androidx.preference.MultiSelectListPreferenceDialogFragmentCompat import androidx.preference.PreferenceDialogFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.filletBackground -import io.legato.kazusa.utils.dpToPx +import io.legado.app.utils.dpToPx class MultiSelectListPreferenceDialog : MultiSelectListPreferenceDialogFragmentCompat() { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/NameListPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/NameListPreference.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/lib/prefs/NameListPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/NameListPreference.kt index 91a1fb84e..b724450b0 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/NameListPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/NameListPreference.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.util.AttributeSet import android.widget.TextView import androidx.preference.ListPreference import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R +import io.legado.app.R import androidx.core.content.withStyledAttributes //import io.legado.app.lib.theme.bottomBackground diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/Preference.kt b/app/src/main/java/io/legado/app/lib/prefs/Preference.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/lib/prefs/Preference.kt rename to app/src/main/java/io/legado/app/lib/prefs/Preference.kt index 69b37eb8f..280879561 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/Preference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/Preference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.graphics.drawable.Drawable @@ -11,7 +11,7 @@ import android.widget.TextView import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/PreferenceCategory.kt b/app/src/main/java/io/legado/app/lib/prefs/PreferenceCategory.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/lib/prefs/PreferenceCategory.kt rename to app/src/main/java/io/legado/app/lib/prefs/PreferenceCategory.kt index bba223395..9ada92b06 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/PreferenceCategory.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/PreferenceCategory.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.util.AttributeSet @@ -6,9 +6,7 @@ import android.widget.TextView import androidx.core.view.isVisible import androidx.preference.PreferenceCategory import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R -import io.legato.kazusa.lib.theme.primaryColor -import io.legato.kazusa.utils.themeColor +import io.legado.app.R //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/SwitchPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/SwitchPreference.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/lib/prefs/SwitchPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/SwitchPreference.kt index a22f60ec8..fc70edc79 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/SwitchPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/SwitchPreference.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.SwitchCompat import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreferenceCompat -import io.legato.kazusa.R +import io.legado.app.R import androidx.core.content.withStyledAttributes //import io.legado.app.lib.theme.accentColor diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/ThemeCardPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/ThemeCardPreference.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/lib/prefs/ThemeCardPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/ThemeCardPreference.kt index f287a18dc..ec5febf50 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/ThemeCardPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/ThemeCardPreference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.annotation.SuppressLint import android.content.Context @@ -16,14 +16,14 @@ import androidx.preference.PreferenceViewHolder import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.card.MaterialCardView -import io.legato.kazusa.R -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.restart -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.getPrefString +import io.legado.app.utils.postEvent +import io.legado.app.utils.restart +import io.legado.app.utils.toastOnUi import splitties.init.appCtx @SuppressLint("ResourceType") diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/ThemeModePreference.kt b/app/src/main/java/io/legado/app/lib/prefs/ThemeModePreference.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/lib/prefs/ThemeModePreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/ThemeModePreference.kt index 9708573ed..404fd08b3 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/ThemeModePreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/ThemeModePreference.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.os.Handler @@ -6,8 +6,8 @@ import android.os.Looper import android.util.AttributeSet import androidx.preference.PreferenceViewHolder import com.google.android.material.button.MaterialButtonToggleGroup -import io.legato.kazusa.R -import io.legato.kazusa.help.config.ThemeConfig +import io.legado.app.R +import io.legado.app.help.config.ThemeConfig class ThemeModePreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/TipPreference.kt b/app/src/main/java/io/legado/app/lib/prefs/TipPreference.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/lib/prefs/TipPreference.kt rename to app/src/main/java/io/legado/app/lib/prefs/TipPreference.kt index 4c38f7ef2..85397ac69 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/TipPreference.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/TipPreference.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.lib.prefs +package io.legado.app.lib.prefs import android.content.Context import android.util.AttributeSet import android.widget.TextView import androidx.core.content.withStyledAttributes import androidx.preference.PreferenceViewHolder -import io.legato.kazusa.R +import io.legado.app.R class TipPreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/lib/prefs/fragment/PreferenceFragment.kt b/app/src/main/java/io/legado/app/lib/prefs/fragment/PreferenceFragment.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/lib/prefs/fragment/PreferenceFragment.kt rename to app/src/main/java/io/legado/app/lib/prefs/fragment/PreferenceFragment.kt index 6e012d9b3..e5fef1006 100644 --- a/app/src/main/java/io/legato/kazusa/lib/prefs/fragment/PreferenceFragment.kt +++ b/app/src/main/java/io/legado/app/lib/prefs/fragment/PreferenceFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.prefs.fragment +package io.legado.app.lib.prefs.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,10 +9,10 @@ import androidx.preference.ListPreference import androidx.preference.MultiSelectListPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import io.legato.kazusa.lib.prefs.EditTextPreferenceDialog -import io.legato.kazusa.lib.prefs.ListPreferenceDialog -import io.legato.kazusa.lib.prefs.MultiSelectListPreferenceDialog -import io.legato.kazusa.utils.applyNavigationBarPadding +import io.legado.app.lib.prefs.EditTextPreferenceDialog +import io.legado.app.lib.prefs.ListPreferenceDialog +import io.legado.app.lib.prefs.MultiSelectListPreferenceDialog +import io.legado.app.utils.applyNavigationBarPadding abstract class PreferenceFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/MaterialValueHelper.kt b/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/lib/theme/MaterialValueHelper.kt rename to app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt index 941829c2b..0bfae0c11 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/MaterialValueHelper.kt +++ b/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/Selector.kt b/app/src/main/java/io/legado/app/lib/theme/Selector.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/theme/Selector.kt rename to app/src/main/java/io/legado/app/lib/theme/Selector.kt index 5722cb53a..f9985528f 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/Selector.kt +++ b/app/src/main/java/io/legado/app/lib/theme/Selector.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.content.Context import android.content.res.ColorStateList diff --git a/app/src/main/java/io/legado/app/lib/theme/ThemeModel.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeModel.kt new file mode 100644 index 000000000..66cc021a4 --- /dev/null +++ b/app/src/main/java/io/legado/app/lib/theme/ThemeModel.kt @@ -0,0 +1,3 @@ +package io.legado.app.lib.theme + + diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStore.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/theme/ThemeStore.kt rename to app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt index 5d6908126..a4312bf05 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStore.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.annotation.SuppressLint import android.content.Context @@ -9,7 +9,7 @@ import androidx.annotation.ColorInt import androidx.annotation.ColorRes import androidx.core.content.ContextCompat import androidx.core.graphics.toColorInt -import io.legato.kazusa.utils.ColorUtils +import io.legado.app.utils.ColorUtils import splitties.init.appCtx import androidx.core.content.edit import com.google.android.material.color.DynamicColors diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStoreInterface.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeStoreInterface.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/lib/theme/ThemeStoreInterface.kt rename to app/src/main/java/io/legado/app/lib/theme/ThemeStoreInterface.kt index 2748b3a58..2ebeb39e9 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStoreInterface.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ThemeStoreInterface.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import androidx.annotation.AttrRes diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStorePrefKeys.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/lib/theme/ThemeStorePrefKeys.kt rename to app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt index 9005243de..a1a0c21fb 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeStorePrefKeys.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme /** * @author Aidan Follestad (afollestad), Karim Abou Zeid (kabouzeid) diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeUtils.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/theme/ThemeUtils.kt rename to app/src/main/java/io/legado/app/lib/theme/ThemeUtils.kt index 0f9d579a3..4599942f1 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeUtils.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ThemeUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.content.Context import android.graphics.drawable.Drawable diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/TintHelper.kt b/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/lib/theme/TintHelper.kt rename to app/src/main/java/io/legado/app/lib/theme/TintHelper.kt index 878fb2ede..b9f5be5c3 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/TintHelper.kt +++ b/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.annotation.SuppressLint import android.content.Context @@ -26,8 +26,8 @@ import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import androidx.core.widget.TextViewCompat import com.google.android.material.floatingactionbutton.FloatingActionButton -import io.legato.kazusa.R -import io.legato.kazusa.utils.ColorUtils +import io.legado.app.R +import io.legado.app.utils.ColorUtils /** * @author afollestad, plusCubed diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ViewUtils.kt b/app/src/main/java/io/legado/app/lib/theme/ViewUtils.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/theme/ViewUtils.kt rename to app/src/main/java/io/legado/app/lib/theme/ViewUtils.kt index f9864f4d7..931676edd 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ViewUtils.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ViewUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme +package io.legado.app.lib.theme import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable @@ -6,7 +6,7 @@ import android.graphics.drawable.TransitionDrawable import android.view.View import android.view.ViewTreeObserver import androidx.annotation.ColorInt -import io.legato.kazusa.utils.DrawableUtils +import io.legado.app.utils.DrawableUtils /** * @author Karim Abou Zeid (kabouzeid) diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeBottomNavigationVIew.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeBottomNavigationVIew.kt similarity index 77% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeBottomNavigationVIew.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeBottomNavigationVIew.kt index 5a6c70249..65703b2ce 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeBottomNavigationVIew.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeBottomNavigationVIew.kt @@ -1,18 +1,15 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.view.ViewCompat import com.google.android.material.bottomnavigation.BottomNavigationView -import io.legato.kazusa.databinding.ViewNavigationBadgeBinding -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.databinding.ViewNavigationBadgeBinding //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getSecondaryTextColor -import io.legato.kazusa.ui.widget.text.BadgeView -import androidx.core.graphics.drawable.toDrawable +import io.legado.app.ui.widget.text.BadgeView class ThemeBottomNavigationVIew(context: Context, attrs: AttributeSet) : BottomNavigationView(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeCheckBox.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeCheckBox.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeCheckBox.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeCheckBox.kt index e42aab818..903662e3c 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeCheckBox.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeCheckBox.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeEditText.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeEditText.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt index 276b5cb62..bb597a22c 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeEditText.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeProgressBar.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeProgressBar.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeProgressBar.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeProgressBar.kt index 21f2c0159..5b62d29b6 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeProgressBar.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeProgressBar.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioButton.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioButton.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioButton.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioButton.kt index 8642b1bea..f657f164c 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioButton.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioButton.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioNoButton.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioNoButton.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioNoButton.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioNoButton.kt index d4374ccac..17de391f1 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeRadioNoButton.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioNoButton.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.TooltipCompat import com.google.android.material.radiobutton.MaterialRadioButton -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSlider.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeSlider.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSlider.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeSlider.kt index 3cdc62f3c..7d7a9eecc 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSlider.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeSlider.kt @@ -1,11 +1,8 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view -import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet -import android.view.MotionEvent import com.google.android.material.slider.Slider -import kotlin.math.abs //import io.legado.app.lib.theme.accentColor diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSwitch.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeSwitch.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSwitch.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeSwitch.kt index bc9cdc2aa..73ac372ba 100644 --- a/app/src/main/java/io/legato/kazusa/lib/theme/view/ThemeSwitch.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeSwitch.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.theme.view +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/lib/webdav/Authorization.kt b/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/lib/webdav/Authorization.kt rename to app/src/main/java/io/legado/app/lib/webdav/Authorization.kt index 7234a0a64..b3130b7d1 100644 --- a/app/src/main/java/io/legato/kazusa/lib/webdav/Authorization.kt +++ b/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.lib.webdav +package io.legado.app.lib.webdav -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Server.WebDavConfig +import io.legado.app.data.appDb +import io.legado.app.data.entities.Server.WebDavConfig import okhttp3.Credentials import java.nio.charset.Charset import java.nio.charset.StandardCharsets diff --git a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDav.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/lib/webdav/WebDav.kt rename to app/src/main/java/io/legado/app/lib/webdav/WebDav.kt index c293314b0..d7b4fad10 100644 --- a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDav.kt +++ b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.lib.webdav +package io.legado.app.lib.webdav import android.annotation.SuppressLint import android.net.Uri import cn.hutool.core.net.URLDecoder -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.newCallResponse -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.CustomUrl -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.findNS -import io.legato.kazusa.utils.findNSPrefix -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.toRequestBody +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.newCallResponse +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.CustomUrl +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.findNS +import io.legado.app.utils.findNSPrefix +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.toRequestBody import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.ensureActive import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDavException.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/lib/webdav/WebDavException.kt rename to app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt index 7a84f4c13..210fff73d 100644 --- a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDavException.kt +++ b/app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.webdav +package io.legado.app.lib.webdav open class WebDavException(msg: String) : Exception(msg) { diff --git a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDavFile.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDavFile.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/lib/webdav/WebDavFile.kt rename to app/src/main/java/io/legado/app/lib/webdav/WebDavFile.kt index fe97755dc..70b9becd6 100644 --- a/app/src/main/java/io/legato/kazusa/lib/webdav/WebDavFile.kt +++ b/app/src/main/java/io/legado/app/lib/webdav/WebDavFile.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.lib.webdav +package io.legado.app.lib.webdav /** * webDavFile diff --git a/app/src/main/java/io/legato/kazusa/model/AudioPlay.kt b/app/src/main/java/io/legado/app/model/AudioPlay.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/model/AudioPlay.kt rename to app/src/main/java/io/legado/app/model/AudioPlay.kt index 632cea6c1..ef37148b4 100644 --- a/app/src/main/java/io/legato/kazusa/model/AudioPlay.kt +++ b/app/src/main/java/io/legado/app/model/AudioPlay.kt @@ -1,28 +1,28 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.annotation.SuppressLint import android.content.Context import android.content.Intent -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.Status -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.getBookSource -import io.legato.kazusa.help.book.readSimulating -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.service.AudioPlayService -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.startService -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.Status +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.getBookSource +import io.legado.app.help.book.readSimulating +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.book.update +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.webBook.WebBook +import io.legado.app.service.AudioPlayService +import io.legado.app.utils.postEvent +import io.legado.app.utils.startService +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancelChildren diff --git a/app/src/main/java/io/legato/kazusa/model/BookCover.kt b/app/src/main/java/io/legado/app/model/BookCover.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/model/BookCover.kt rename to app/src/main/java/io/legado/app/model/BookCover.kt index de20def44..1a5084acd 100644 --- a/app/src/main/java/io/legato/kazusa/model/BookCover.kt +++ b/app/src/main/java/io/legado/app/model/BookCover.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.annotation.SuppressLint import android.content.Context @@ -18,24 +18,24 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.glide.BlurTransformation -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.BitmapUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefString +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.Book +import io.legado.app.help.CacheManager +import io.legado.app.help.DefaultData +import io.legado.app.help.config.AppConfig +import io.legado.app.help.glide.BlurTransformation +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.BitmapUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefString import splitties.init.appCtx import java.io.File import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/model/CacheBook.kt b/app/src/main/java/io/legado/app/model/CacheBook.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/model/CacheBook.kt rename to app/src/main/java/io/legado/app/model/CacheBook.kt index dd54ba5a5..72ca1c641 100644 --- a/app/src/main/java/io/legato/kazusa/model/CacheBook.kt +++ b/app/src/main/java/io/legado/app/model/CacheBook.kt @@ -1,22 +1,22 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.content.Context -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.ConcurrentException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.coroutine.CompositeCoroutine -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.service.CacheBookService -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.startService +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.ConcurrentException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.coroutine.CompositeCoroutine +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.webBook.WebBook +import io.legado.app.service.CacheBookService +import io.legado.app.utils.postEvent +import io.legado.app.utils.startService import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart diff --git a/app/src/main/java/io/legato/kazusa/model/CheckSource.kt b/app/src/main/java/io/legado/app/model/CheckSource.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/model/CheckSource.kt rename to app/src/main/java/io/legado/app/model/CheckSource.kt index 756a0f72f..a55b49a3a 100644 --- a/app/src/main/java/io/legato/kazusa/model/CheckSource.kt +++ b/app/src/main/java/io/legado/app/model/CheckSource.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.content.Context -import io.legato.kazusa.R -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.service.CheckSourceService -import io.legato.kazusa.utils.startService +import io.legado.app.R +import io.legado.app.constant.IntentAction +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.help.CacheManager +import io.legado.app.help.IntentData +import io.legado.app.service.CheckSourceService +import io.legado.app.utils.startService import splitties.init.appCtx object CheckSource { diff --git a/app/src/main/java/io/legato/kazusa/model/Debug.kt b/app/src/main/java/io/legado/app/model/Debug.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/model/Debug.kt rename to app/src/main/java/io/legado/app/model/Debug.kt index cba5782b0..a0748328a 100644 --- a/app/src/main/java/io/legato/kazusa/model/Debug.kt +++ b/app/src/main/java/io/legado/app/model/Debug.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.annotation.SuppressLint import android.util.Log -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.* -import io.legato.kazusa.help.book.isWebFile -import io.legato.kazusa.help.coroutine.CompositeCoroutine -import io.legato.kazusa.help.source.sortUrls -import io.legato.kazusa.model.rss.Rss -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.stackTraceStr +import io.legado.app.BuildConfig +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.* +import io.legado.app.help.book.isWebFile +import io.legado.app.help.coroutine.CompositeCoroutine +import io.legado.app.help.source.sortUrls +import io.legado.app.model.rss.Rss +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.stackTraceStr import kotlinx.coroutines.CoroutineScope import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/io/legato/kazusa/model/Download.kt b/app/src/main/java/io/legado/app/model/Download.kt similarity index 64% rename from app/src/main/java/io/legato/kazusa/model/Download.kt rename to app/src/main/java/io/legado/app/model/Download.kt index 3d67c8a98..439ba3452 100644 --- a/app/src/main/java/io/legato/kazusa/model/Download.kt +++ b/app/src/main/java/io/legado/app/model/Download.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.content.Context -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.service.DownloadService -import io.legato.kazusa.utils.startService +import io.legado.app.constant.IntentAction +import io.legado.app.service.DownloadService +import io.legado.app.utils.startService object Download { diff --git a/app/src/main/java/io/legato/kazusa/model/ImageProvider.kt b/app/src/main/java/io/legado/app/model/ImageProvider.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/model/ImageProvider.kt rename to app/src/main/java/io/legado/app/model/ImageProvider.kt index 67c5837dc..32c8ce74b 100644 --- a/app/src/main/java/io/legato/kazusa/model/ImageProvider.kt +++ b/app/src/main/java/io/legado/app/model/ImageProvider.kt @@ -1,26 +1,26 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.graphics.Bitmap import android.graphics.BitmapFactory import android.util.Size import androidx.collection.LruCache -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog.putDebug -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isEpub -import io.legato.kazusa.help.book.isMobi -import io.legato.kazusa.help.book.isPdf -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.localBook.EpubFile -import io.legato.kazusa.model.localBook.MobiFile -import io.legato.kazusa.model.localBook.PdfFile -import io.legato.kazusa.utils.BitmapUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.SvgUtils -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog.putDebug +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isEpub +import io.legado.app.help.book.isMobi +import io.legado.app.help.book.isPdf +import io.legado.app.help.config.AppConfig +import io.legado.app.model.localBook.EpubFile +import io.legado.app.model.localBook.MobiFile +import io.legado.app.model.localBook.PdfFile +import io.legado.app.utils.BitmapUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.SvgUtils +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/model/README.md b/app/src/main/java/io/legado/app/model/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/model/README.md rename to app/src/main/java/io/legado/app/model/README.md diff --git a/app/src/main/java/io/legato/kazusa/model/ReadAloud.kt b/app/src/main/java/io/legado/app/model/ReadAloud.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/model/ReadAloud.kt rename to app/src/main/java/io/legado/app/model/ReadAloud.kt index bbde7da2c..8c1a61398 100644 --- a/app/src/main/java/io/legato/kazusa/model/ReadAloud.kt +++ b/app/src/main/java/io/legado/app/model/ReadAloud.kt @@ -1,22 +1,22 @@ -package io.legato.kazusa.model +package io.legado.app.model import android.content.Context import android.content.Intent import android.os.Bundle -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.service.HttpReadAloudService -import io.legato.kazusa.service.TTSReadAloudService -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.startForegroundServiceCompat -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.data.appDb +import io.legado.app.data.entities.HttpTTS +import io.legado.app.help.config.AppConfig +import io.legado.app.service.BaseReadAloudService +import io.legado.app.service.HttpReadAloudService +import io.legado.app.service.TTSReadAloudService +import io.legado.app.utils.LogUtils +import io.legado.app.utils.StringUtils +import io.legado.app.utils.postEvent +import io.legado.app.utils.startForegroundServiceCompat +import io.legado.app.utils.toastOnUi import splitties.init.appCtx object ReadAloud { diff --git a/app/src/main/java/io/legato/kazusa/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/model/ReadBook.kt rename to app/src/main/java/io/legado/app/model/ReadBook.kt index b5c859f04..cb155628b 100644 --- a/app/src/main/java/io/legato/kazusa/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -1,38 +1,38 @@ -package io.legato.kazusa.model +package io.legado.app.model -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PageAnim.scrollPageAnim -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.ReadRecord -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isPdf -import io.legato.kazusa.help.book.isSameNameAuthor -import io.legato.kazusa.help.book.readSimulating -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.globalExecutor -import io.legato.kazusa.model.localBook.TextFile -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.service.CacheBookService -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.book.read.page.provider.LayoutProgressListener -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.PageAnim.scrollPageAnim +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.ReadRecord +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.isImage +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isPdf +import io.legado.app.help.book.isSameNameAuthor +import io.legado.app.help.book.readSimulating +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.book.update +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.globalExecutor +import io.legado.app.model.localBook.TextFile +import io.legado.app.model.webBook.WebBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.service.CacheBookService +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.book.read.page.provider.LayoutProgressListener +import io.legado.app.utils.postEvent +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/model/ReadManga.kt b/app/src/main/java/io/legado/app/model/ReadManga.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/model/ReadManga.kt rename to app/src/main/java/io/legado/app/model/ReadManga.kt index c93553ea0..f017c489c 100644 --- a/app/src/main/java/io/legato/kazusa/model/ReadManga.kt +++ b/app/src/main/java/io/legado/app/model/ReadManga.kt @@ -1,31 +1,31 @@ -package io.legato.kazusa.model +package io.legado.app.model -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.ReadRecord -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.ConcurrentRateLimiter -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isSameNameAuthor -import io.legato.kazusa.help.book.readSimulating -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.globalExecutor -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.ui.book.manga.entities.BaseMangaPage -import io.legato.kazusa.ui.book.manga.entities.MangaChapter -import io.legato.kazusa.ui.book.manga.entities.MangaContent -import io.legato.kazusa.ui.book.manga.entities.MangaPage -import io.legato.kazusa.ui.book.manga.entities.ReaderLoading -import io.legato.kazusa.utils.mapIndexed +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.ReadRecord +import io.legado.app.help.AppWebDav +import io.legado.app.help.ConcurrentRateLimiter +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isSameNameAuthor +import io.legado.app.help.book.readSimulating +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.book.update +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.globalExecutor +import io.legado.app.model.webBook.WebBook +import io.legado.app.ui.book.manga.entities.BaseMangaPage +import io.legado.app.ui.book.manga.entities.MangaChapter +import io.legado.app.ui.book.manga.entities.MangaContent +import io.legado.app.ui.book.manga.entities.MangaPage +import io.legado.app.ui.book.manga.entities.ReaderLoading +import io.legado.app.utils.mapIndexed import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legato/kazusa/model/SharedJsScope.kt b/app/src/main/java/io/legado/app/model/SharedJsScope.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/model/SharedJsScope.kt rename to app/src/main/java/io/legado/app/model/SharedJsScope.kt index 1587cc62c..b2bfe23b1 100644 --- a/app/src/main/java/io/legato/kazusa/model/SharedJsScope.kt +++ b/app/src/main/java/io/legado/app/model/SharedJsScope.kt @@ -1,17 +1,17 @@ -package io.legato.kazusa.model +package io.legado.app.model import androidx.collection.LruCache import com.google.gson.reflect.TypeToken import com.script.ScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.newCallStrResponse -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonObject +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.newCallStrResponse +import io.legado.app.help.http.okHttpClient +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonObject import kotlinx.coroutines.runBlocking import org.mozilla.javascript.Scriptable import org.mozilla.javascript.ScriptableObject diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSonPath.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSonPath.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt index 8b760899d..71d9006ce 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSonPath.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import androidx.annotation.Keep import com.jayway.jsonpath.JsonPath import com.jayway.jsonpath.ReadContext -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.printOnDebug @Suppress("RegExpRedundantEscape") diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSoup.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt index 3b20e8faa..e6103d1e6 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByJSoup.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import androidx.annotation.Keep import org.jsoup.Jsoup diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByRegex.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByRegex.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt index e5f3b9528..7e41eba6a 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByRegex.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import androidx.annotation.Keep import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByXPath.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByXPath.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt index b30a61899..b0d52cf3a 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeByXPath.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import android.text.TextUtils import androidx.annotation.Keep diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeRule.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index 8a42b83ec..43de180be 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -1,34 +1,34 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import android.text.TextUtils import androidx.annotation.Keep import com.script.CompiledScript import com.script.buildScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.constant.AppPattern.JS_PATTERN -import io.legato.kazusa.data.entities.BaseBook -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.JsExtensions -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.source.getShareScope -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.GSONStrict -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getOrPutLimit -import io.legato.kazusa.utils.isDataUrl -import io.legato.kazusa.utils.isJson -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.stackTraceStr +import io.legado.app.constant.AppPattern.JS_PATTERN +import io.legado.app.data.entities.BaseBook +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.RssArticle +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.CacheManager +import io.legado.app.help.JsExtensions +import io.legado.app.help.http.CookieStore +import io.legado.app.help.source.getShareScope +import io.legado.app.model.Debug +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.GSON +import io.legado.app.utils.GSONStrict +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getOrPutLimit +import io.legado.app.utils.isDataUrl +import io.legado.app.utils.isJson +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.stackTraceStr import kotlinx.coroutines.ensureActive import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeUrl.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index f9d63cdee..bcb505e2c 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule import android.annotation.SuppressLint import android.util.Base64 @@ -11,45 +11,45 @@ import com.bumptech.glide.load.model.GlideUrl import com.script.buildScriptBindings import com.script.rhino.RhinoScriptEngine import com.script.rhino.runScriptWithContext -import io.legato.kazusa.constant.AppConst.UA_NAME -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.AppPattern.JS_PATTERN -import io.legato.kazusa.constant.AppPattern.dataUriRegex -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.CacheManager -import io.legato.kazusa.help.ConcurrentRateLimiter -import io.legato.kazusa.help.JsExtensions -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.exoplayer.ExoPlayerHelper -import io.legato.kazusa.help.glide.GlideHeaders -import io.legato.kazusa.help.http.BackstageWebView -import io.legato.kazusa.help.http.CookieManager -import io.legato.kazusa.help.http.CookieManager.mergeCookies -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.http.RequestMethod -import io.legato.kazusa.help.http.StrResponse -import io.legato.kazusa.help.http.addHeaders -import io.legato.kazusa.help.http.get -import io.legato.kazusa.help.http.getProxyClient -import io.legato.kazusa.help.http.newCallResponse -import io.legato.kazusa.help.http.newCallStrResponse -import io.legato.kazusa.help.http.postForm -import io.legato.kazusa.help.http.postJson -import io.legato.kazusa.help.http.postMultipart -import io.legato.kazusa.help.source.getShareScope -import io.legato.kazusa.utils.EncoderUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.GSONStrict -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.get -import io.legato.kazusa.utils.isJson -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.isXml +import io.legado.app.constant.AppConst.UA_NAME +import io.legado.app.constant.AppPattern +import io.legado.app.constant.AppPattern.JS_PATTERN +import io.legado.app.constant.AppPattern.dataUriRegex +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.CacheManager +import io.legado.app.help.ConcurrentRateLimiter +import io.legado.app.help.JsExtensions +import io.legado.app.help.config.AppConfig +import io.legado.app.help.exoplayer.ExoPlayerHelper +import io.legado.app.help.glide.GlideHeaders +import io.legado.app.help.http.BackstageWebView +import io.legado.app.help.http.CookieManager +import io.legado.app.help.http.CookieManager.mergeCookies +import io.legado.app.help.http.CookieStore +import io.legado.app.help.http.RequestMethod +import io.legado.app.help.http.StrResponse +import io.legado.app.help.http.addHeaders +import io.legado.app.help.http.get +import io.legado.app.help.http.getProxyClient +import io.legado.app.help.http.newCallResponse +import io.legado.app.help.http.newCallStrResponse +import io.legado.app.help.http.postForm +import io.legado.app.help.http.postJson +import io.legado.app.help.http.postMultipart +import io.legado.app.help.source.getShareScope +import io.legado.app.utils.EncoderUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.GSONStrict +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.get +import io.legado.app.utils.isJson +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.isXml import kotlinx.coroutines.runBlocking import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/CustomUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/CustomUrl.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/CustomUrl.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/CustomUrl.kt index 750ff44cd..99fe118ea 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/CustomUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/CustomUrl.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject @Suppress("unused") class CustomUrl(url: String) { diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/QueryTTF.java b/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/QueryTTF.java rename to app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java index 1e0dbd53f..c5b9695c7 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/QueryTTF.java +++ b/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule; +package io.legado.app.model.analyzeRule; import androidx.annotation.Keep; diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleAnalyzer.kt b/app/src/main/java/io/legado/app/model/analyzeRule/RuleAnalyzer.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleAnalyzer.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/RuleAnalyzer.kt index 9b6106c4f..5fd91e15d 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleAnalyzer.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/RuleAnalyzer.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule //通用的规则切分处理 class RuleAnalyzer(data: String, code: Boolean = false) { diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleData.kt b/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleData.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt index 01cbc1564..ba17c882e 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleData.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule -import io.legato.kazusa.utils.GSON +import io.legado.app.utils.GSON class RuleData : RuleDataInterface { diff --git a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleDataInterface.kt b/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleDataInterface.kt rename to app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt index 18e67d7b2..c7a58ce40 100644 --- a/app/src/main/java/io/legato/kazusa/model/analyzeRule/RuleDataInterface.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.analyzeRule +package io.legado.app.model.analyzeRule interface RuleDataInterface { diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/BaseLocalBookParse.kt b/app/src/main/java/io/legado/app/model/localBook/BaseLocalBookParse.kt similarity index 71% rename from app/src/main/java/io/legato/kazusa/model/localBook/BaseLocalBookParse.kt rename to app/src/main/java/io/legado/app/model/localBook/BaseLocalBookParse.kt index 2d155bf02..8d59bfc23 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/BaseLocalBookParse.kt +++ b/app/src/main/java/io/legado/app/model/localBook/BaseLocalBookParse.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter import java.io.InputStream /** diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/EpubFile.kt b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/model/localBook/EpubFile.kt rename to app/src/main/java/io/legado/app/model/localBook/EpubFile.kt index e48c7029e..eb0f7f61d 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/EpubFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook import android.graphics.Bitmap import android.graphics.BitmapFactory import android.os.ParcelFileDescriptor import android.text.TextUtils -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.encodeURI -import io.legato.kazusa.utils.isXml -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.BookHelp +import io.legado.app.utils.FileUtils +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.encodeURI +import io.legado.app.utils.isXml +import io.legado.app.utils.printOnDebug import me.ag2s.epublib.domain.EpubBook import me.ag2s.epublib.domain.Resource import me.ag2s.epublib.domain.TOCReference diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/model/localBook/LocalBook.kt rename to app/src/main/java/io/legado/app/model/localBook/LocalBook.kt index a303b8ce0..645e6f4d8 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/LocalBook.kt +++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook import android.net.Uri import android.util.Base64 @@ -6,50 +6,50 @@ import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile import com.script.ScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.exception.EmptyFileException -import io.legato.kazusa.exception.NoBooksDirException -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.exception.TocEmptyException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.addType -import io.legato.kazusa.help.book.archiveName -import io.legato.kazusa.help.book.getArchiveUri -import io.legato.kazusa.help.book.getLocalUri -import io.legato.kazusa.help.book.getRemoteUrl -import io.legato.kazusa.help.book.isArchive -import io.legato.kazusa.help.book.isEpub -import io.legato.kazusa.help.book.isMobi -import io.legato.kazusa.help.book.isPdf -import io.legato.kazusa.help.book.isUmd -import io.legato.kazusa.help.book.removeLocalUriCache -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.webdav.WebDav -import io.legato.kazusa.lib.webdav.WebDavException -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isDataUrl -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.exception.EmptyFileException +import io.legado.app.exception.NoBooksDirException +import io.legado.app.exception.NoStackTraceException +import io.legado.app.exception.TocEmptyException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.addType +import io.legado.app.help.book.archiveName +import io.legado.app.help.book.getArchiveUri +import io.legado.app.help.book.getLocalUri +import io.legado.app.help.book.getRemoteUrl +import io.legado.app.help.book.isArchive +import io.legado.app.help.book.isEpub +import io.legado.app.help.book.isMobi +import io.legado.app.help.book.isPdf +import io.legado.app.help.book.isUmd +import io.legado.app.help.book.removeLocalUriCache +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.webdav.WebDav +import io.legado.app.lib.webdav.WebDavException +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.externalFiles +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getFile +import io.legado.app.utils.inputStream +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isDataUrl +import io.legado.app.utils.printOnDebug import kotlinx.coroutines.runBlocking import org.apache.commons.text.StringEscapeUtils import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/MobiFile.kt b/app/src/main/java/io/legado/app/model/localBook/MobiFile.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/model/localBook/MobiFile.kt rename to app/src/main/java/io/legado/app/model/localBook/MobiFile.kt index c3408a754..4b1bb4818 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/MobiFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/MobiFile.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook import android.graphics.Bitmap import android.graphics.BitmapFactory import android.os.ParcelFileDescriptor -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.lib.mobi.KF6Book -import io.legato.kazusa.lib.mobi.KF8Book -import io.legato.kazusa.lib.mobi.MobiBook -import io.legato.kazusa.lib.mobi.MobiReader -import io.legato.kazusa.lib.mobi.entities.TOC -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.BookHelp +import io.legado.app.lib.mobi.KF6Book +import io.legado.app.lib.mobi.KF8Book +import io.legado.app.lib.mobi.MobiBook +import io.legado.app.lib.mobi.MobiReader +import io.legado.app.lib.mobi.entities.TOC +import io.legado.app.utils.FileUtils +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.printOnDebug import org.jsoup.Jsoup import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/PdfFile.kt b/app/src/main/java/io/legado/app/model/localBook/PdfFile.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/model/localBook/PdfFile.kt rename to app/src/main/java/io/legado/app/model/localBook/PdfFile.kt index 8430acb72..9723e3a1c 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/PdfFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/PdfFile.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook import android.graphics.Bitmap import android.graphics.Color import android.graphics.pdf.PdfRenderer import android.os.ParcelFileDescriptor -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.getLocalUri -import io.legato.kazusa.utils.BitmapUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.SystemUtils -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.getLocalUri +import io.legado.app.utils.BitmapUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.SystemUtils +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.printOnDebug import splitties.init.appCtx import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/README.md b/app/src/main/java/io/legado/app/model/localBook/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/model/localBook/README.md rename to app/src/main/java/io/legado/app/model/localBook/README.md diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/TextFile.kt b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/model/localBook/TextFile.kt rename to app/src/main/java/io/legado/app/model/localBook/TextFile.kt index 84bbc21a7..7766e3734 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/TextFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt @@ -1,17 +1,17 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.exception.EmptyFileException -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.book.isLocalModified -import io.legato.kazusa.utils.EncodingDetect -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.Utf8BomUtils +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.exception.EmptyFileException +import io.legado.app.help.DefaultData +import io.legado.app.help.book.isLocalModified +import io.legado.app.utils.EncodingDetect +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.StringUtils +import io.legado.app.utils.Utf8BomUtils import java.io.FileNotFoundException import java.nio.charset.Charset import java.util.regex.Matcher diff --git a/app/src/main/java/io/legato/kazusa/model/localBook/UmdFile.kt b/app/src/main/java/io/legado/app/model/localBook/UmdFile.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/model/localBook/UmdFile.kt rename to app/src/main/java/io/legado/app/model/localBook/UmdFile.kt index 8c02ae242..c652ddc48 100644 --- a/app/src/main/java/io/legato/kazusa/model/localBook/UmdFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/UmdFile.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.model.localBook +package io.legado.app.model.localBook -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.utils.DebugLog +import io.legado.app.utils.FileUtils +import io.legado.app.utils.printOnDebug import me.ag2s.umdlib.domain.UmdBook import me.ag2s.umdlib.umd.UmdReader import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBook.kt b/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/model/remote/RemoteBook.kt rename to app/src/main/java/io/legado/app/model/remote/RemoteBook.kt index 22e6d6965..f620b58d5 100644 --- a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBook.kt +++ b/app/src/main/java/io/legado/app/model/remote/RemoteBook.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.model.remote +package io.legado.app.model.remote import androidx.annotation.Keep -import io.legato.kazusa.lib.webdav.WebDavFile -import io.legato.kazusa.model.localBook.LocalBook +import io.legado.app.lib.webdav.WebDavFile +import io.legado.app.model.localBook.LocalBook @Keep data class RemoteBook( diff --git a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBookManager.kt b/app/src/main/java/io/legado/app/model/remote/RemoteBookManager.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/model/remote/RemoteBookManager.kt rename to app/src/main/java/io/legado/app/model/remote/RemoteBookManager.kt index f43e3bfee..abfd68a74 100644 --- a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBookManager.kt +++ b/app/src/main/java/io/legado/app/model/remote/RemoteBookManager.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.model.remote +package io.legado.app.model.remote import android.net.Uri -import io.legato.kazusa.data.entities.Book +import io.legado.app.data.entities.Book abstract class RemoteBookManager { diff --git a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/model/remote/RemoteBookWebDav.kt rename to app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt index 37254fcda..31f8fa48c 100644 --- a/app/src/main/java/io/legato/kazusa/model/remote/RemoteBookWebDav.kt +++ b/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.model.remote +package io.legado.app.model.remote import android.net.Uri -import io.legato.kazusa.constant.AppPattern.archiveFileRegex -import io.legato.kazusa.constant.AppPattern.bookFileRegex -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.webdav.Authorization -import io.legato.kazusa.lib.webdav.WebDav -import io.legato.kazusa.lib.webdav.WebDavFile -import io.legato.kazusa.model.analyzeRule.CustomUrl -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.isContentScheme +import io.legado.app.constant.AppPattern.archiveFileRegex +import io.legado.app.constant.AppPattern.bookFileRegex +import io.legado.app.constant.BookType +import io.legado.app.data.entities.Book +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.update +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.webdav.Authorization +import io.legado.app.lib.webdav.WebDav +import io.legado.app.lib.webdav.WebDavFile +import io.legado.app.model.analyzeRule.CustomUrl +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.isContentScheme import kotlinx.coroutines.runBlocking class RemoteBookWebDav( diff --git a/app/src/main/java/io/legato/kazusa/model/rss/Rss.kt b/app/src/main/java/io/legado/app/model/rss/Rss.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/model/rss/Rss.kt rename to app/src/main/java/io/legado/app/model/rss/Rss.kt index 7f1e7d4a7..519a1f0ee 100644 --- a/app/src/main/java/io/legato/kazusa/model/rss/Rss.kt +++ b/app/src/main/java/io/legado/app/model/rss/Rss.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.model.rss +package io.legado.app.model.rss -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.StrResponse -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.RuleData -import io.legato.kazusa.utils.NetworkUtils +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssSource +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.StrResponse +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.RuleData +import io.legado.app.utils.NetworkUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/io/legato/kazusa/model/rss/RssParserByRule.kt b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/model/rss/RssParserByRule.kt rename to app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt index 2e4be9711..26fd751b0 100644 --- a/app/src/main/java/io/legato/kazusa/model/rss/RssParserByRule.kt +++ b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.model.rss +package io.legado.app.model.rss import androidx.annotation.Keep -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setRuleData -import io.legato.kazusa.model.analyzeRule.RuleData -import io.legato.kazusa.utils.NetworkUtils +import io.legado.app.R +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setRuleData +import io.legado.app.model.analyzeRule.RuleData +import io.legado.app.utils.NetworkUtils import splitties.init.appCtx import java.util.Locale import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/model/rss/RssParserDefault.kt b/app/src/main/java/io/legado/app/model/rss/RssParserDefault.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/model/rss/RssParserDefault.kt rename to app/src/main/java/io/legado/app/model/rss/RssParserDefault.kt index fd70feeaf..6568283c3 100644 --- a/app/src/main/java/io/legato/kazusa/model/rss/RssParserDefault.kt +++ b/app/src/main/java/io/legado/app/model/rss/RssParserDefault.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.model.rss +package io.legado.app.model.rss -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.model.Debug +import io.legado.app.data.entities.RssArticle +import io.legado.app.model.Debug import org.xmlpull.v1.XmlPullParser import org.xmlpull.v1.XmlPullParserException import org.xmlpull.v1.XmlPullParserFactory diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/BookChapterList.kt b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/model/webBook/BookChapterList.kt rename to app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt index 6e2b558d7..01ad6e9ca 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/BookChapterList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt @@ -1,26 +1,26 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook import android.text.TextUtils import com.script.ScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.rule.TocRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.exception.TocEmptyException -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setChapter -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.isTrue -import io.legato.kazusa.utils.mapAsync +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.rule.TocRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.exception.TocEmptyException +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.config.AppConfig +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setChapter +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.isTrue +import io.legado.app.utils.mapAsync import kotlinx.coroutines.ensureActive import kotlinx.coroutines.flow.flow import org.mozilla.javascript.Context diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/BookContent.kt b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/model/webBook/BookContent.kt rename to app/src/main/java/io/legado/app/model/webBook/BookContent.kt index 020f475ac..f1796fb92 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/BookContent.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt @@ -1,25 +1,25 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.rule.ContentRule -import io.legato.kazusa.exception.ContentEmptyException -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setChapter -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setNextChapterUrl -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.mapAsync +import io.legado.app.R +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.rule.ContentRule +import io.legado.app.exception.ContentEmptyException +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setChapter +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setNextChapterUrl +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.mapAsync import kotlinx.coroutines.ensureActive import kotlinx.coroutines.flow.flow import org.apache.commons.text.StringEscapeUtils diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/BookInfo.kt b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/model/webBook/BookInfo.kt rename to app/src/main/java/io/legado/app/model/webBook/BookInfo.kt index 17bb6f59d..f90d5fab0 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/BookInfo.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook import android.text.TextUtils -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isWebFile -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.StringUtils.wordCountFormat +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isWebFile +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.utils.DebugLog +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.StringUtils.wordCountFormat import kotlinx.coroutines.ensureActive import splitties.init.appCtx import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/model/webBook/BookList.kt rename to app/src/main/java/io/legado/app/model/webBook/BookList.kt index 20c479f28..10898874f 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt @@ -1,27 +1,27 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.data.entities.rule.BookListRule -import io.legato.kazusa.data.entities.rule.ExploreKind -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.source.exploreKindsJson -import io.legato.kazusa.help.source.getBookType -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setRuleData -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.RuleData -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.GSONStrict -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.StringUtils.wordCountFormat -import io.legato.kazusa.utils.fromJsonArray +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.SearchBook +import io.legado.app.data.entities.rule.BookListRule +import io.legado.app.data.entities.rule.ExploreKind +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.source.exploreKindsJson +import io.legado.app.help.source.getBookType +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setRuleData +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.RuleData +import io.legado.app.utils.GSON +import io.legado.app.utils.GSONStrict +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.StringUtils.wordCountFormat +import io.legado.app.utils.fromJsonArray import kotlinx.coroutines.ensureActive import splitties.init.appCtx import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/SearchModel.kt b/app/src/main/java/io/legado/app/model/webBook/SearchModel.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/model/webBook/SearchModel.kt rename to app/src/main/java/io/legado/app/model/webBook/SearchModel.kt index f4e0c566d..09ab427af 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/SearchModel.kt +++ b/app/src/main/java/io/legado/app/model/webBook/SearchModel.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.search.SearchScope -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.mapParallelSafe +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.SearchBook +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.search.SearchScope +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.mapParallelSafe import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExecutorCoroutineDispatcher import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/model/webBook/WebBook.kt b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/model/webBook/WebBook.kt rename to app/src/main/java/io/legado/app/model/webBook/WebBook.kt index 09657d3a5..1d9d39319 100644 --- a/app/src/main/java/io/legato/kazusa/model/webBook/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt @@ -1,22 +1,22 @@ -package io.legato.kazusa.model.webBook +package io.legado.app.model.webBook -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.addType -import io.legato.kazusa.help.book.removeAllBookType -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.StrResponse -import io.legato.kazusa.help.source.getBookType -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.RuleData +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.SearchBook +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.addType +import io.legado.app.help.book.removeAllBookType +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.StrResponse +import io.legado.app.help.source.getBookType +import io.legado.app.model.Debug +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.RuleData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/io/legato/kazusa/receiver/MediaButtonReceiver.kt b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/receiver/MediaButtonReceiver.kt rename to app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt index e6e6a9cd3..d7548a19a 100644 --- a/app/src/main/java/io/legato/kazusa/receiver/MediaButtonReceiver.kt +++ b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt @@ -1,23 +1,23 @@ -package io.legato.kazusa.receiver +package io.legado.app.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.view.KeyEvent -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.LifecycleHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.service.AudioPlayService -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.postEvent +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.help.LifecycleHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.model.AudioPlay +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.service.AudioPlayService +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.LogUtils +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.postEvent /** diff --git a/app/src/main/java/io/legato/kazusa/receiver/NetworkChangedListener.kt b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/receiver/NetworkChangedListener.kt rename to app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt index 57b21be1e..a81ca2471 100644 --- a/app/src/main/java/io/legato/kazusa/receiver/NetworkChangedListener.kt +++ b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.receiver +package io.legado.app.receiver import android.annotation.SuppressLint import android.content.BroadcastReceiver diff --git a/app/src/main/java/io/legato/kazusa/receiver/SharedReceiverActivity.kt b/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/receiver/SharedReceiverActivity.kt rename to app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt index 4fc38e52c..b21bb7658 100644 --- a/app/src/main/java/io/legato/kazusa/receiver/SharedReceiverActivity.kt +++ b/app/src/main/java/io/legado/app/receiver/SharedReceiverActivity.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.receiver +package io.legado.app.receiver import android.annotation.SuppressLint import android.content.Intent import android.os.Build import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.main.MainActivity -import io.legato.kazusa.utils.startActivity +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.main.MainActivity +import io.legado.app.utils.startActivity import splitties.init.appCtx class SharedReceiverActivity : AppCompatActivity() { diff --git a/app/src/main/java/io/legato/kazusa/receiver/TimeBatteryReceiver.kt b/app/src/main/java/io/legado/app/receiver/TimeBatteryReceiver.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/receiver/TimeBatteryReceiver.kt rename to app/src/main/java/io/legado/app/receiver/TimeBatteryReceiver.kt index 6c50f0595..e6537d7b3 100644 --- a/app/src/main/java/io/legato/kazusa/receiver/TimeBatteryReceiver.kt +++ b/app/src/main/java/io/legado/app/receiver/TimeBatteryReceiver.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.receiver +package io.legado.app.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.utils.postEvent +import io.legado.app.constant.EventBus +import io.legado.app.utils.postEvent class TimeBatteryReceiver : BroadcastReceiver() { diff --git a/app/src/main/java/io/legato/kazusa/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/service/AudioPlayService.kt rename to app/src/main/java/io/legado/app/service/AudioPlayService.kt index 1483e89cb..7b13b2332 100644 --- a/app/src/main/java/io/legato/kazusa/service/AudioPlayService.kt +++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.content.BroadcastReceiver @@ -21,31 +21,29 @@ import androidx.media.AudioFocusRequestCompat import androidx.media3.common.PlaybackException import androidx.media3.common.Player import androidx.media3.exoplayer.ExoPlayer -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.constant.Status -import io.legato.kazusa.help.MediaHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.exoplayer.ExoPlayerHelper -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl.Companion.getMediaItem -import io.legato.kazusa.receiver.MediaButtonReceiver -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.utils.activityPendingIntent -import io.legato.kazusa.utils.broadcastPendingIntent -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.constant.Status +import io.legado.app.help.MediaHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.exoplayer.ExoPlayerHelper +import io.legado.app.help.glide.ImageLoader +import io.legado.app.model.AudioPlay +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.AnalyzeUrl.Companion.getMediaItem +import io.legado.app.receiver.MediaButtonReceiver +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.utils.activityPendingIntent +import io.legado.app.utils.postEvent +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt rename to app/src/main/java/io/legado/app/service/BaseReadAloudService.kt index 64cd8be3e..bf74a8a2b 100644 --- a/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.app.PendingIntent @@ -23,34 +23,34 @@ import androidx.core.app.NotificationCompat import androidx.lifecycle.lifecycleScope import androidx.media.AudioFocusRequestCompat import androidx.media.AudioManagerCompat -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.constant.Status -import io.legato.kazusa.help.MediaHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.receiver.MediaButtonReceiver -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.activityPendingIntent -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.observeSharedPreferences -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.constant.PreferKey +import io.legado.app.constant.Status +import io.legado.app.help.MediaHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.glide.ImageLoader +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.receiver.MediaButtonReceiver +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.utils.LogUtils +import io.legado.app.utils.activityPendingIntent +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.observeEvent +import io.legado.app.utils.observeSharedPreferences +import io.legado.app.utils.postEvent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/service/CacheBookService.kt b/app/src/main/java/io/legado/app/service/CacheBookService.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/service/CacheBookService.kt rename to app/src/main/java/io/legado/app/service/CacheBookService.kt index 31242dacf..650254376 100644 --- a/app/src/main/java/io/legato/kazusa/service/CacheBookService.kt +++ b/app/src/main/java/io/legado/app/service/CacheBookService.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.content.Intent import androidx.core.app.NotificationCompat import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.ui.book.cache.CacheActivity -import io.legato.kazusa.utils.activityPendingIntent -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.servicePendingIntent +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.data.appDb +import io.legado.app.help.book.update +import io.legado.app.help.config.AppConfig +import io.legado.app.model.CacheBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.ui.book.cache.CacheActivity +import io.legado.app.utils.activityPendingIntent +import io.legado.app.utils.postEvent +import io.legado.app.utils.servicePendingIntent import kotlinx.coroutines.Job import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/service/CheckSourceService.kt rename to app/src/main/java/io/legado/app/service/CheckSourceService.kt index 8e6eb3186..4d08b1d6d 100644 --- a/app/src/main/java/io/legato/kazusa/service/CheckSourceService.kt +++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt @@ -1,34 +1,34 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.content.Intent import androidx.core.app.NotificationCompat import androidx.lifecycle.lifecycleScope import com.script.ScriptException -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.ContentEmptyException -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.exception.TocEmptyException -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.source.exploreKinds -import io.legato.kazusa.model.CheckSource -import io.legato.kazusa.model.Debug -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.ui.book.source.manage.BookSourceActivity -import io.legato.kazusa.utils.activityPendingIntent -import io.legato.kazusa.utils.onEachParallel -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.BookSourceType +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.ContentEmptyException +import io.legado.app.exception.NoStackTraceException +import io.legado.app.exception.TocEmptyException +import io.legado.app.help.IntentData +import io.legado.app.help.config.AppConfig +import io.legado.app.help.source.exploreKinds +import io.legado.app.model.CheckSource +import io.legado.app.model.Debug +import io.legado.app.model.webBook.WebBook +import io.legado.app.ui.book.source.manage.BookSourceActivity +import io.legado.app.utils.activityPendingIntent +import io.legado.app.utils.onEachParallel +import io.legado.app.utils.postEvent +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Job import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.asCoroutineDispatcher diff --git a/app/src/main/java/io/legato/kazusa/service/DownloadService.kt b/app/src/main/java/io/legado/app/service/DownloadService.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/service/DownloadService.kt rename to app/src/main/java/io/legado/app/service/DownloadService.kt index bb2e5c944..be9173144 100644 --- a/app/src/main/java/io/legato/kazusa/service/DownloadService.kt +++ b/app/src/main/java/io/legado/app/service/DownloadService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.app.DownloadManager @@ -11,16 +11,16 @@ import android.os.Environment import androidx.core.app.NotificationCompat import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.utils.IntentType -import io.legato.kazusa.utils.openFileUri -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.utils.IntentType +import io.legado.app.utils.openFileUri +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.isActive diff --git a/app/src/main/java/io/legato/kazusa/service/ExportBookService.kt b/app/src/main/java/io/legado/app/service/ExportBookService.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/service/ExportBookService.kt rename to app/src/main/java/io/legado/app/service/ExportBookService.kt index 64d975fa1..20439e327 100644 --- a/app/src/main/java/io/legato/kazusa/service/ExportBookService.kt +++ b/app/src/main/java/io/legado/app/service/ExportBookService.kt @@ -1,49 +1,49 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.content.Intent import androidx.core.app.NotificationCompat import androidx.lifecycle.lifecycleScope import com.bumptech.glide.Glide -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.getExportFileName -import io.legato.kazusa.help.book.isLocalModified -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.ui.book.cache.CacheActivity -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.HtmlFormatter -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.activityPendingIntent -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.delete -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.list -import io.legato.kazusa.utils.mapAsync -import io.legato.kazusa.utils.mapAsyncIndexed -import io.legato.kazusa.utils.openOutputStream -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.writeFile +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.getExportFileName +import io.legado.app.help.book.isLocalModified +import io.legado.app.help.config.AppConfig +import io.legado.app.model.ReadBook +import io.legado.app.model.localBook.LocalBook +import io.legado.app.ui.book.cache.CacheActivity +import io.legado.app.utils.FileDoc +import io.legado.app.utils.FileUtils +import io.legado.app.utils.HtmlFormatter +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.activityPendingIntent +import io.legado.app.utils.cnCompare +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.delete +import io.legado.app.utils.find +import io.legado.app.utils.list +import io.legado.app.utils.mapAsync +import io.legado.app.utils.mapAsyncIndexed +import io.legado.app.utils.openOutputStream +import io.legado.app.utils.postEvent +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.writeFile import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.coroutineScope diff --git a/app/src/main/java/io/legato/kazusa/service/HttpReadAloudService.kt b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/service/HttpReadAloudService.kt rename to app/src/main/java/io/legado/app/service/HttpReadAloudService.kt index 3045f8001..fcc872b85 100644 --- a/app/src/main/java/io/legato/kazusa/service/HttpReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.app.PendingIntent @@ -25,23 +25,23 @@ import androidx.media3.exoplayer.source.MediaSource import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy import com.script.ScriptException -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.exoplayer.InputStreamDataSource -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.entities.HttpTTS +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.exoplayer.InputStreamDataSource +import io.legado.app.help.http.okHttpClient +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.FileUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/service/README.md b/app/src/main/java/io/legado/app/service/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/service/README.md rename to app/src/main/java/io/legado/app/service/README.md diff --git a/app/src/main/java/io/legato/kazusa/service/TTSReadAloudService.kt b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/service/TTSReadAloudService.kt rename to app/src/main/java/io/legado/app/service/TTSReadAloudService.kt index 375d3ffa3..530df2529 100644 --- a/app/src/main/java/io/legato/kazusa/service/TTSReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.app.PendingIntent import android.speech.tts.TextToSpeech import android.speech.tts.UtteranceProgressListener -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.MediaHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.MediaHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.utils.GSON +import io.legado.app.utils.LogUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.delay import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/service/WebService.kt b/app/src/main/java/io/legado/app/service/WebService.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/service/WebService.kt rename to app/src/main/java/io/legado/app/service/WebService.kt index e191528db..a5617a140 100644 --- a/app/src/main/java/io/legato/kazusa/service/WebService.kt +++ b/app/src/main/java/io/legado/app/service/WebService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.annotation.SuppressLint import android.content.Context @@ -7,27 +7,27 @@ import android.net.wifi.WifiManager import android.os.Build import android.os.PowerManager import androidx.core.app.NotificationCompat -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseService -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.constant.NotificationId -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.receiver.NetworkChangedListener -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.servicePendingIntent -import io.legato.kazusa.utils.startForegroundServiceCompat -import io.legato.kazusa.utils.startService -import io.legato.kazusa.utils.stopService -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.web.HttpServer -import io.legato.kazusa.web.WebSocketServer +import io.legado.app.R +import io.legado.app.base.BaseService +import io.legado.app.constant.AppConst +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.constant.NotificationId +import io.legado.app.constant.PreferKey +import io.legado.app.receiver.NetworkChangedListener +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.postEvent +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.sendToClip +import io.legado.app.utils.servicePendingIntent +import io.legado.app.utils.startForegroundServiceCompat +import io.legado.app.utils.startService +import io.legado.app.utils.stopService +import io.legado.app.utils.toastOnUi +import io.legado.app.web.HttpServer +import io.legado.app.web.WebSocketServer import splitties.init.appCtx import splitties.systemservices.powerManager import splitties.systemservices.wifiManager diff --git a/app/src/main/java/io/legato/kazusa/service/WebTileService.kt b/app/src/main/java/io/legado/app/service/WebTileService.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/service/WebTileService.kt rename to app/src/main/java/io/legado/app/service/WebTileService.kt index 276b4b57c..68bd72c5d 100644 --- a/app/src/main/java/io/legato/kazusa/service/WebTileService.kt +++ b/app/src/main/java/io/legado/app/service/WebTileService.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.service +package io.legado.app.service import android.app.Dialog import android.app.ForegroundServiceStartNotAllowedException @@ -8,9 +8,9 @@ import android.service.quicksettings.Tile import android.service.quicksettings.TileService import android.view.WindowManager.BadTokenException import androidx.annotation.RequiresApi -import io.legato.kazusa.R -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.R +import io.legado.app.constant.IntentAction +import io.legado.app.utils.printOnDebug /** diff --git a/app/src/main/java/io/legato/kazusa/ui/README.md b/app/src/main/java/io/legado/app/ui/README.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/ui/README.md rename to app/src/main/java/io/legado/app/ui/README.md diff --git a/app/src/main/java/io/legato/kazusa/ui/about/AboutActivity.kt b/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/about/AboutActivity.kt rename to app/src/main/java/io/legado/app/ui/about/AboutActivity.kt index 2e09b4a85..f847a242b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/about/AboutActivity.kt +++ b/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.about +package io.legado.app.ui.about //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.filletBackground @@ -8,33 +8,32 @@ import android.view.MenuItem import androidx.annotation.StringRes import androidx.core.net.toUri import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppConst.appInfo -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.databinding.ActivityAboutBinding -import io.legato.kazusa.help.CrashHandler -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.update.AppUpdate -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.createFolderIfNotExist -import io.legato.kazusa.utils.delete -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.list -import io.legato.kazusa.utils.openInputStream -import io.legato.kazusa.utils.openOutputStream -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseActivity +import io.legado.app.constant.AppConst.appInfo +import io.legado.app.constant.AppLog +import io.legado.app.databinding.ActivityAboutBinding +import io.legado.app.help.CrashHandler +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.update.AppUpdate +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.FileDoc +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.createFolderIfNotExist +import io.legado.app.utils.delete +import io.legado.app.utils.externalCache +import io.legado.app.utils.find +import io.legado.app.utils.list +import io.legado.app.utils.openInputStream +import io.legado.app.utils.openOutputStream +import io.legado.app.utils.openUrl +import io.legado.app.utils.share +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.delay import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/about/AppLogDialog.kt b/app/src/main/java/io/legado/app/ui/about/AppLogDialog.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/ui/about/AppLogDialog.kt rename to app/src/main/java/io/legado/app/ui/about/AppLogDialog.kt index 859166756..5ba91ad2c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/about/AppLogDialog.kt +++ b/app/src/main/java/io/legado/app/ui/about/AppLogDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.about +package io.legado.app.ui.about import android.content.Context import android.os.Bundle @@ -7,19 +7,18 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemAppLogBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemAppLogBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.LogUtils +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick import java.util.* diff --git a/app/src/main/java/io/legato/kazusa/ui/about/CrashLogsDialog.kt b/app/src/main/java/io/legado/app/ui/about/CrashLogsDialog.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/about/CrashLogsDialog.kt rename to app/src/main/java/io/legado/app/ui/about/CrashLogsDialog.kt index 506345d95..16c3d1279 100644 --- a/app/src/main/java/io/legato/kazusa/ui/about/CrashLogsDialog.kt +++ b/app/src/main/java/io/legado/app/ui/about/CrashLogsDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.about +package io.legado.app.ui.about import android.app.Application import android.net.Uri @@ -11,27 +11,25 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.MutableLiveData import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.Item1lineTextBinding -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.Item1lineTextBinding +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.delete -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.list -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.FileDoc +import io.legado.app.utils.FileUtils +import io.legado.app.utils.delete +import io.legado.app.utils.find +import io.legado.app.utils.getFile +import io.legado.app.utils.list +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.isActive import java.io.FileFilter diff --git a/app/src/main/java/io/legato/kazusa/ui/about/ReadRecordActivity.kt b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/about/ReadRecordActivity.kt rename to app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt index 616dbed53..138b44008 100644 --- a/app/src/main/java/io/legato/kazusa/ui/about/ReadRecordActivity.kt +++ b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.about +package io.legado.app.ui.about import android.content.Context import android.os.Bundle @@ -7,26 +7,26 @@ import android.view.MenuItem import android.view.ViewGroup import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReadRecordShow -import io.legato.kazusa.databinding.ActivityReadRecordBinding -import io.legato.kazusa.databinding.ItemReadRecordBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.BookCover +import io.legado.app.R +import io.legado.app.base.BaseActivity +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReadRecordShow +import io.legado.app.databinding.ActivityReadRecordBinding +import io.legado.app.databinding.ItemReadRecordBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.BookCover //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.getInt -import io.legato.kazusa.utils.putInt -import io.legato.kazusa.utils.startActivityForBook -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.cnCompare +import io.legado.app.utils.getInt +import io.legado.app.utils.putInt +import io.legado.app.utils.startActivityForBook +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/about/UpdateDialog.kt b/app/src/main/java/io/legado/app/ui/about/UpdateDialog.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/about/UpdateDialog.kt rename to app/src/main/java/io/legado/app/ui/about/UpdateDialog.kt index 5998cf7d1..87fcad18f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/about/UpdateDialog.kt +++ b/app/src/main/java/io/legado/app/ui/about/UpdateDialog.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.ui.about +package io.legado.app.ui.about import android.os.Build import android.os.Bundle import android.view.View -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.DialogUpdateBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.update.AppUpdate -import io.legato.kazusa.help.update.AppVariant -import io.legato.kazusa.model.Download -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.BuildConfig +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.AppConst +import io.legado.app.databinding.DialogUpdateBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.update.AppUpdate +import io.legado.app.help.update.AppVariant +import io.legado.app.model.Download +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import io.noties.markwon.Markwon import io.noties.markwon.ext.tables.TablePlugin import io.noties.markwon.html.HtmlPlugin diff --git a/app/src/main/java/io/legato/kazusa/ui/association/AddToBookshelfDialog.kt b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/association/AddToBookshelfDialog.kt rename to app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt index 6dbfb64d8..771f0c5ff 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/AddToBookshelfDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.app.Application @@ -9,25 +9,25 @@ import android.view.ViewGroup import androidx.core.view.isVisible import androidx.fragment.app.viewModels import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.DialogAddToBookshelfBinding -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.DialogAddToBookshelfBinding +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.webBook.WebBook +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.utils.GSON +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.setLayout +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 添加书籍链接到书架，需要对应网站书源 diff --git a/app/src/main/java/io/legato/kazusa/ui/association/BaseAssociationViewModel.kt b/app/src/main/java/io/legado/app/ui/association/BaseAssociationViewModel.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/association/BaseAssociationViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/BaseAssociationViewModel.kt index 6a1c14de3..0ad391e61 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/BaseAssociationViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/BaseAssociationViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import android.net.Uri import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.utils.contains -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.readText +import io.legado.app.base.BaseViewModel +import io.legado.app.utils.contains +import io.legado.app.utils.inputStream +import io.legado.app.utils.readText abstract class BaseAssociationViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/association/FileAssociationActivity.kt rename to app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt index c2e31fa38..a4877fcfc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/FileAssociationActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.net.Uri import android.os.Bundle @@ -6,30 +6,30 @@ import androidx.activity.viewModels import androidx.core.os.postDelayed import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.databinding.ActivityTranslucenceBinding -import io.legato.kazusa.exception.InvalidBooksDirException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.canRead -import io.legato.kazusa.utils.checkWrite -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.readUri -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.startActivityForBook -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.databinding.ActivityTranslucenceBinding +import io.legado.app.exception.InvalidBooksDirException +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.FileUtils +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.canRead +import io.legado.app.utils.checkWrite +import io.legado.app.utils.getFile +import io.legado.app.utils.gone +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.readUri +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.startActivityForBook +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/association/FileAssociationViewModel.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/association/FileAssociationViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt index 6a9117bd5..08a03674c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/FileAssociationViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import android.net.Uri import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.AppPattern.bookFileRegex -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.* +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.AppPattern.bookFileRegex +import io.legado.app.data.entities.Book +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.* class FileAssociationViewModel(application: Application) : BaseAssociationViewModel(application) { val importBookLiveData = MutableLiveData() diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt index fd7777529..fbe95899a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -10,23 +10,23 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.DialogCustomGroupBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.DialogCustomGroupBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt index e1188229a..350123e10 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportBookSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt @@ -1,33 +1,33 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import android.net.Uri import androidx.lifecycle.MutableLiveData import com.jayway.jsonpath.JsonPath -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.isUri -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.config.AppConfig +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.source.SourceHelp +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.inputStream +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.isUri +import io.legado.app.utils.splitNotBlank class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportDictRuleDialog.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportDictRuleDialog.kt index e5cb0ae97..a66f70ffc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportDictRuleDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -8,18 +8,18 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.DictRule +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick class ImportDictRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view), diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportDictRuleViewModel.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportDictRuleViewModel.kt index 02fea23b0..5dfd9fc74 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportDictRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportDictRuleViewModel.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject class ImportDictRuleViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt index 60f41eaa9..25920ea36 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -8,22 +8,22 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.HttpTTS +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.GSON +import io.legado.app.utils.gone +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import splitties.views.onClick class ImportHttpTtsDialog() : BaseDialogFragment(R.layout.dialog_recycler_view), diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsViewModel.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportHttpTtsViewModel.kt index 4fc78e6e5..38a5971b4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportHttpTtsViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsViewModel.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.HttpTTS +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject class ImportHttpTtsViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt index 61cc4c7b1..fe48c304f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -10,22 +10,22 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.databinding.DialogCustomGroupBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.databinding.DialogCustomGroupBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view), diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleViewModel.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleViewModel.kt index 7423ce904..e8a149f5c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportReplaceRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleViewModel.kt @@ -1,23 +1,23 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.ReplaceAnalyzer -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.ReplaceAnalyzer +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.splitNotBlank class ImportReplaceRuleViewModel(app: Application) : BaseViewModel(app) { var isAddGroup = false diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt index bbbed284c..8c1baf617 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -10,23 +10,23 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.DialogCustomGroupBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.DialogCustomGroupBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick /** diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt index 95b0a2960..e62b2fd14 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportRssSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt @@ -1,29 +1,29 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData import com.jayway.jsonpath.JsonPath -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.jsonPath -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.source.SourceHelp +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.jsonPath +import io.legado.app.utils.splitNotBlank class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) { var isAddGroup = false diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportThemeDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportThemeDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt index 623120294..60babbeca 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportThemeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -8,22 +8,22 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding -import io.legato.kazusa.help.config.ThemeConfig +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding +import io.legado.app.help.config.ThemeConfig //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.GSON +import io.legado.app.utils.gone +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import splitties.views.onClick class ImportThemeDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_recycler_view) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportThemeViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportThemeViewModel.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportThemeViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportThemeViewModel.kt index 9e536458a..06d802a52 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportThemeViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportThemeViewModel.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.* +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.ThemeConfig +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.* class ImportThemeViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleDialog.kt rename to app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt index 664c9d9f7..bc17f842e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.content.Context @@ -8,22 +8,22 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemSourceImportBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemSourceImportBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.CodeDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.dialog.CodeDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.GSON +import io.legado.app.utils.gone +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import splitties.views.onClick class ImportTxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleViewModel.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleViewModel.kt index f150cd928..c83cb8f4e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/ImportTxtTocRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleViewModel.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject class ImportTxtTocRuleViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/OnLineImportActivity.kt b/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/association/OnLineImportActivity.kt rename to app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt index cbfeb1b19..9ba34497a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/OnLineImportActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.os.Bundle import androidx.activity.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.databinding.ActivityTranslucenceBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.databinding.ActivityTranslucenceBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 网络一键导入 diff --git a/app/src/main/java/io/legato/kazusa/ui/association/OnLineImportViewModel.kt b/app/src/main/java/io/legado/app/ui/association/OnLineImportViewModel.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/association/OnLineImportViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/OnLineImportViewModel.kt index cb3b216e5..d95aac5ec 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/OnLineImportViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/OnLineImportViewModel.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import androidx.core.net.toUri -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.externalCache +import io.legado.app.R +import io.legado.app.constant.AppConst +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.utils.FileUtils +import io.legado.app.utils.externalCache import okhttp3.MediaType.Companion.toMediaType import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmActivity.kt b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmActivity.kt similarity index 71% rename from app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmActivity.kt rename to app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmActivity.kt index d3cd0d9d6..8500a1870 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmActivity.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.os.Bundle -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.databinding.ActivityTranslucenceBinding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.base.BaseActivity +import io.legado.app.constant.SourceType +import io.legado.app.databinding.ActivityTranslucenceBinding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding class OpenUrlConfirmActivity : BaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmDialog.kt b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmDialog.kt rename to app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmDialog.kt index 0a9c3c90f..c67923199 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.content.Intent import android.os.Bundle @@ -8,16 +8,15 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.core.net.toUri import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.databinding.DialogOpenUrlConfirmBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.constant.AppLog +import io.legado.app.databinding.DialogOpenUrlConfirmBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.setLayout +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx class OpenUrlConfirmDialog() : BaseDialogFragment(R.layout.dialog_open_url_confirm), diff --git a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmViewModel.kt b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmViewModel.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmViewModel.kt index 97a3e085e..68695a7e1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/OpenUrlConfirmViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/OpenUrlConfirmViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import android.os.Bundle -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.help.source.SourceHelp +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.SourceType +import io.legado.app.help.source.SourceHelp class OpenUrlConfirmViewModel(app: Application): BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeActivity.kt b/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt similarity index 70% rename from app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeActivity.kt rename to app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt index 977765e54..e6cc8416c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.os.Bundle -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.databinding.ActivityTranslucenceBinding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.base.BaseActivity +import io.legado.app.constant.SourceType +import io.legado.app.databinding.ActivityTranslucenceBinding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 验证码 diff --git a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeDialog.kt b/app/src/main/java/io/legado/app/ui/association/VerificationCodeDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeDialog.kt rename to app/src/main/java/io/legado/app/ui/association/VerificationCodeDialog.kt index 43cf2ae73..8aedd72eb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/VerificationCodeDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.annotation.SuppressLint import android.graphics.Bitmap @@ -14,20 +14,19 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.databinding.DialogVerificationCodeViewBinding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.help.source.SourceVerificationHelp -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.databinding.DialogVerificationCodeViewBinding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.help.source.SourceVerificationHelp +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.ui.widget.dialog.PhotoDialog -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.ImageProvider +import io.legado.app.ui.widget.dialog.PhotoDialog +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 图片验证码对话框 diff --git a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeViewModel.kt b/app/src/main/java/io/legado/app/ui/association/VerificationCodeViewModel.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeViewModel.kt rename to app/src/main/java/io/legado/app/ui/association/VerificationCodeViewModel.kt index ed7a38a7f..3bb29170d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/association/VerificationCodeViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/VerificationCodeViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.association +package io.legado.app.ui.association import android.app.Application import android.os.Bundle -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.help.source.SourceHelp +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.SourceType +import io.legado.app.help.source.SourceHelp class VerificationCodeViewModel(app: Application): BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayActivity.kt rename to app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt index ab5b6acf2..fd9865061 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.audio +package io.legado.app.ui.book.audio import android.animation.ValueAnimator import android.annotation.SuppressLint @@ -29,44 +29,43 @@ import com.google.android.material.color.MaterialColors import com.google.android.material.slider.Slider import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.constant.Status -import io.legato.kazusa.constant.Theme -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.ActivityAudioPlayBinding -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.service.AudioPlayService -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.changesource.ChangeBookSourceDialog -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.book.toc.TocActivityResult -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.ToolbarUtils.setAllIconsColor -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.observeEventSticky -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.startActivityForBook -import io.legato.kazusa.utils.startAnimation -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.constant.Status +import io.legado.app.constant.Theme +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.ActivityAudioPlayBinding +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.removeType +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.AudioPlay +import io.legado.app.model.BookCover +import io.legado.app.service.AudioPlayService +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.changesource.ChangeBookSourceDialog +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.book.toc.TocActivityResult +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.ToolbarUtils.setAllIconsColor +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.gone +import io.legado.app.utils.observeEvent +import io.legado.app.utils.observeEventSticky +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.startActivityForBook +import io.legado.app.utils.startAnimation +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayViewModel.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt index fa7429dde..6f42b08e4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/audio/AudioPlayViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.book.audio +package io.legado.app.ui.book.audio import android.app.Application import android.content.Intent import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.book.getBookSource -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.help.book.getBookSource +import io.legado.app.help.book.removeType +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.model.AudioPlay +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.postEvent +import io.legado.app.utils.toastOnUi class AudioPlayViewModel(application: Application) : BaseViewModel(application) { val titleData = MutableLiveData() diff --git a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkActivity.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkActivity.kt rename to app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt index 42487151c..51c2f5b40 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.book.bookmark +package io.legado.app.ui.book.bookmark import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.ActivityAllBookmarkBinding -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.ActivityAllBookmarkBinding +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkViewModel.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt index ff914814f..b2557d3b6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.book.bookmark +package io.legado.app.ui.book.bookmark import android.app.Application import android.net.Uri -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.openOutputStream -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.writeToOutputStream +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.utils.FileDoc +import io.legado.app.utils.GSON +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.openOutputStream +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.writeToOutputStream import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkAdapter.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt index 3ab6c6eb6..a823c082e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.bookmark +package io.legado.app.ui.book.bookmark import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.ItemBookmarkBinding -import io.legato.kazusa.utils.gone +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.ItemBookmarkBinding +import io.legado.app.utils.gone import splitties.views.onClick class BookmarkAdapter(context: Context, val callback: Callback) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDecoration.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDecoration.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDecoration.kt rename to app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDecoration.kt index e8c36883d..c19c518c1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDecoration.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDecoration.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.bookmark +package io.legado.app.ui.book.bookmark import android.content.Context import android.graphics.Canvas @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.color.MaterialColors //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.spToPx +import io.legado.app.utils.dpToPx +import io.legado.app.utils.spToPx import kotlin.math.min class BookmarkDecoration( diff --git a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDialog.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDialog.kt rename to app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt index a7bbe2d80..3c0e389ec 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/bookmark/BookmarkDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.book.bookmark +package io.legado.app.ui.book.bookmark import android.os.Bundle import android.view.View import android.view.ViewGroup import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.DialogBookmarkBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.data.appDb +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.DialogBookmarkBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt rename to app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt index 126b82530..f80c2317d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.cache +package io.legado.app.ui.book.cache import android.annotation.SuppressLint import android.os.Bundle @@ -11,47 +11,47 @@ import androidx.appcompat.widget.PopupMenu import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.textfield.TextInputLayout -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppConst.charsets -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.IntentAction -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ActivityCacheBookBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogSelectSectionExportBinding -import io.legato.kazusa.help.book.getExportFileName -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.tryParesExportFileName -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.service.ExportBookService -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.applyOpenTint -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.checkWrite -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.enableCustomExport -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChange -import io.legato.kazusa.utils.iconItemOnLongClick -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startService -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.verificationField -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppConst.charsets +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.IntentAction +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ActivityCacheBookBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogSelectSectionExportBinding +import io.legado.app.help.book.getExportFileName +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.tryParesExportFileName +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.CacheBook +import io.legado.app.service.ExportBookService +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.ACache +import io.legado.app.utils.FileDoc +import io.legado.app.utils.applyOpenTint +import io.legado.app.utils.applyTint +import io.legado.app.utils.checkWrite +import io.legado.app.utils.cnCompare +import io.legado.app.utils.enableCustomExport +import io.legado.app.utils.flowWithLifecycleAndDatabaseChange +import io.legado.app.utils.iconItemOnLongClick +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.observeEvent +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startService +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.verificationField +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt index a45e50af8..8d274ea8f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.cache +package io.legado.app.ui.book.cache import android.content.Context import android.os.Handler @@ -9,15 +9,15 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DiffUtil import com.google.android.material.button.MaterialButton -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemDownloadBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemDownloadBinding +import io.legado.app.help.book.isLocal +import io.legado.app.model.CacheBook +import io.legado.app.utils.gone +import io.legado.app.utils.visible class CacheAdapter(context: Context, private val callBack: CallBack) : DiffRecyclerAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheViewModel.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/book/cache/CacheViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt index 6538a846e..f2e26727e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.book.cache +package io.legado.app.ui.book.cache import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.utils.sendValue +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.utils.sendValue import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverDialog.kt rename to app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt index 1ce3142f5..3cc83fd09 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.changecover +package io.legado.app.ui.book.changecover //import io.legado.app.lib.theme.primaryColor import android.os.Bundle @@ -11,10 +11,10 @@ import androidx.lifecycle.Lifecycle.State.STARTED import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.GridLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogChangeCoverBinding -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogChangeCoverBinding +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt index 08ed15471..2df4a0b5c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changecover/ChangeCoverViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.book.changecover +package io.legado.app.ui.book.changecover import android.app.Application import android.os.Bundle import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.mapParallelSafe +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.SearchBook +import io.legado.app.help.config.AppConfig +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.mapParallelSafe import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.ExecutorCoroutineDispatcher import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changecover/CoverAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/book/changecover/CoverAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt index bdc591774..92b90ac94 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changecover/CoverAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.changecover +package io.legado.app.ui.book.changecover import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ItemCoverBinding +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ItemCoverBinding class CoverAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceAdapter.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceAdapter.kt index 22c337a19..2f75a9052 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.content.Context import android.os.Bundle @@ -6,17 +6,17 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.PopupMenu import androidx.recyclerview.widget.DiffUtil -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ItemChangeSourceBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ItemChangeSourceBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible import splitties.views.onLongClick diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt index cf2d75534..3d1069efb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource //import io.legado.app.lib.theme.getPrimaryTextColor //import io.legado.app.lib.theme.primaryColor @@ -17,35 +17,34 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.DialogBookChangeSourceBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.book.source.manage.BookSourceActivity -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.getCompatDrawable -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.DialogBookChangeSourceBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.book.source.manage.BookSourceActivity +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.applyTint +import io.legado.app.utils.dpToPx +import io.legado.app.utils.getCompatDrawable +import io.legado.app.utils.observeEvent +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt index 4803aa327..ed2f54e1c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt @@ -1,35 +1,35 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.app.Application import android.os.Bundle import androidx.annotation.CallSuper import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.primaryStr -import io.legato.kazusa.help.book.releaseHtmlData -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.SourceConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.internString -import io.legato.kazusa.utils.mapParallel -import io.legato.kazusa.utils.mapParallelSafe -import io.legato.kazusa.utils.onEachIndexed -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.SearchBook +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.primaryStr +import io.legado.app.help.book.releaseHtmlData +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.SourceConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.source.SourceHelp +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.internString +import io.legado.app.utils.mapParallel +import io.legado.app.utils.mapParallelSafe +import io.legado.app.utils.onEachIndexed +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.ExecutorCoroutineDispatcher diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceAdapter.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceAdapter.kt index 128f88ce4..e7a68609f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.content.Context import android.os.Bundle @@ -6,15 +6,15 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.PopupMenu import androidx.recyclerview.widget.DiffUtil -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ItemChangeSourceBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ItemChangeSourceBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.visible import splitties.views.onLongClick diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceDialog.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt index 3cfcf5b6b..6cca903f2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.os.Bundle import android.view.Menu @@ -16,35 +16,35 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.DialogChapterChangeSourceBinding -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.DialogChapterChangeSourceBinding +import io.legado.app.help.book.BookHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.book.source.manage.BookSourceActivity -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.book.source.manage.BookSourceActivity +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.applyTint +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.observeEvent +import io.legado.app.utils.setLayout +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceViewModel.kt index 5aa9585eb..c97d0406d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.app.Application import android.os.Bundle -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.webBook.WebBook +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.webBook.WebBook @Suppress("MemberVisibilityCanBePrivate") class ChangeChapterSourceViewModel(application: Application) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterTocAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterTocAdapter.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterTocAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterTocAdapter.kt index a6ba2c619..e12dcc63f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterTocAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterTocAdapter.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.book.changesource +package io.legado.app.ui.book.changesource import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.databinding.ItemChapterListBinding -import io.legato.kazusa.lib.theme.ThemeUtils +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.BookChapter +import io.legado.app.databinding.ItemChapterListBinding +import io.legado.app.lib.theme.ThemeUtils //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.gone +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible class ChangeChapterTocAdapter(context: Context, val callback: Callback) : RecyclerAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowActivity.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowActivity.kt rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt index 3ff63b8b1..a8a16ad3a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt @@ -1,21 +1,20 @@ -package io.legato.kazusa.ui.book.explore +package io.legado.app.ui.book.explore import android.os.Bundle import androidx.activity.viewModels import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ActivityExploreShowBinding -import io.legato.kazusa.databinding.ViewLoadMoreBinding -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.widget.recycler.LoadMoreView -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ActivityExploreShowBinding +import io.legado.app.databinding.ViewLoadMoreBinding +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.widget.recycler.LoadMoreView +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 发现列表 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowAdapter.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt index 175dfa4f7..9baff2b4d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.ui.book.explore +package io.legado.app.ui.book.explore import android.content.Context import android.os.Bundle import android.view.ViewGroup import android.widget.LinearLayout import androidx.core.view.isVisible -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ItemSearchBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.widget.text.AccentBgTextView -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ItemSearchBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.widget.text.AccentBgTextView +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.visible class ExploreShowAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowViewModel.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt index 869eee9e2..1fc24f296 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/explore/ExploreShowViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.ui.book.explore +package io.legado.app.ui.book.explore import android.app.Application import android.content.Intent import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.help.book.isNotShelf -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.stackTraceStr +import io.legado.app.BuildConfig +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.SearchBook +import io.legado.app.help.book.isNotShelf +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.stackTraceStr import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/book/group/GroupEditDialog.kt rename to app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt index 635907d4c..30f40e247 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.book.group +package io.legado.app.ui.book.group import android.os.Bundle import android.view.View import android.widget.ArrayAdapter import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.DialogBookGroupEditBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.SelectImageContract -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readUri -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.DialogBookGroupEditBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.FileUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.SelectImageContract +import io.legado.app.utils.externalFiles +import io.legado.app.utils.gone +import io.legado.app.utils.inputStream +import io.legado.app.utils.launch +import io.legado.app.utils.readUri +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx import splitties.views.onClick import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/book/group/GroupManageDialog.kt rename to app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt index 063ff537c..a77af2898 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.group +package io.legado.app.ui.book.group import android.content.Context import android.os.Bundle @@ -11,26 +11,24 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemBookGroupManageBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemBookGroupManageBinding //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.utils.gone +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupSelectDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/book/group/GroupSelectDialog.kt rename to app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt index 1ce8dc67c..945ab7d08 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupSelectDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.group +package io.legado.app.ui.book.group import android.content.Context import android.os.Bundle @@ -11,22 +11,21 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.DialogBookGroupPickerBinding -import io.legato.kazusa.databinding.ItemGroupSelectBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.DialogBookGroupPickerBinding +import io.legado.app.databinding.ItemGroupSelectBinding //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupViewModel.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/group/GroupViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt index 4703788d9..2609486c7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/group/GroupViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.book.group +package io.legado.app.ui.book.group import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookGroup +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookGroup class GroupViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/BaseImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/import/BaseImportBookActivity.kt rename to app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt index b628492bf..530d55d74 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/BaseImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt @@ -1,28 +1,28 @@ -package io.legato.kazusa.ui.book.import +package io.legado.app.ui.book.import import android.os.Bundle import android.view.MotionEvent import androidx.appcompat.widget.SearchView import androidx.lifecycle.ViewModel -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ActivityImportBookBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppPattern +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ActivityImportBookBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.startActivityForBook -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.localBook.LocalBook +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.startActivityForBook +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBook.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBook.kt similarity index 67% rename from app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBook.kt rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBook.kt index f3825f42c..3fa74d5ab 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBook.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBook.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.book.import.local +package io.legado.app.ui.book.import.local -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.FileDoc +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.FileDoc data class ImportBook( val file: FileDoc, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookActivity.kt rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt index 38c4d8b9b..d303042b0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.import.local +package io.legado.app.ui.book.import.local //import io.legado.app.lib.theme.backgroundColor import android.annotation.SuppressLint @@ -14,25 +14,25 @@ import androidx.core.view.isVisible import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.ui.book.import.BaseImportBookActivity -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isUri -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.ui.book.import.BaseImportBookActivity +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.gone +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isUri +import io.legado.app.utils.launch +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt index c0aeffd91..050c294ae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.book.import.local +package io.legado.app.ui.book.import.local import android.annotation.SuppressLint import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.ItemImportBookBinding -import io.legato.kazusa.utils.ConvertUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppConst +import io.legado.app.databinding.ItemImportBookBinding +import io.legado.app.utils.ConvertUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.visible class ImportBookAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt index b711b99a7..2490ba91d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/local/ImportBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.ui.book.import.local +package io.legado.app.ui.book.import.local import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern.archiveFileRegex -import io.legato.kazusa.constant.AppPattern.bookFileRegex -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.AlphanumComparator -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.delete -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.list -import io.legato.kazusa.utils.mapParallel -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern.archiveFileRegex +import io.legado.app.constant.AppPattern.bookFileRegex +import io.legado.app.constant.PreferKey +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.AlphanumComparator +import io.legado.app.utils.FileDoc +import io.legado.app.utils.delete +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.list +import io.legado.app.utils.mapParallel +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.channels.Channel diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookActivity.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt index 9ed2f98f3..d5ea0ce49 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.annotation.SuppressLint import android.net.Uri @@ -12,20 +12,20 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.remote.RemoteBook -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.import.BaseImportBookActivity -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.remote.RemoteBook +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.import.BaseImportBookActivity +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.find +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt index 493fd546a..64ce19c65 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.annotation.SuppressLint import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.ItemImportBookBinding -import io.legato.kazusa.model.remote.RemoteBook -import io.legato.kazusa.utils.ConvertUtils -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppConst +import io.legado.app.databinding.ItemImportBookBinding +import io.legado.app.model.remote.RemoteBook +import io.legado.app.utils.ConvertUtils +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.visible /** diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookSort.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt similarity index 50% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookSort.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt index 2ff5bcda5..41964035e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookSort.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote enum class RemoteBookSort { Default, Name diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt index a0ca0fc8a..51be1e278 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/RemoteBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.webdav.Authorization -import io.legato.kazusa.model.analyzeRule.CustomUrl -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.model.remote.RemoteBook -import io.legato.kazusa.model.remote.RemoteBookWebDav -import io.legato.kazusa.utils.AlphanumComparator -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.webdav.Authorization +import io.legado.app.model.analyzeRule.CustomUrl +import io.legado.app.model.localBook.LocalBook +import io.legado.app.model.remote.RemoteBook +import io.legado.app.model.remote.RemoteBookWebDav +import io.legado.app.utils.AlphanumComparator +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.callbackFlow diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt index 94d3710f4..50de29752 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.os.Bundle import android.text.InputType @@ -7,17 +7,16 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.data.entities.Server -import io.legato.kazusa.data.entities.rule.RowUi -import io.legato.kazusa.databinding.DialogWebdavServerBinding -import io.legato.kazusa.databinding.ItemSourceEditBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.data.entities.Server +import io.legado.app.data.entities.rule.RowUi +import io.legado.app.databinding.DialogWebdavServerBinding +import io.legado.app.databinding.ItemSourceEditBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.GSON +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding import org.json.JSONObject class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, true), diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigViewModel.kt index f98653d0d..875304232 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServerConfigViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Server -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.Server +import io.legado.app.utils.toastOnUi class ServerConfigViewModel(application: Application): BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersDialog.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/ServersDialog.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersDialog.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/ServersDialog.kt index 20734c4f1..2e72ab566 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/ServersDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.content.Context import android.content.DialogInterface @@ -10,26 +10,26 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppConst.DEFAULT_WEBDAV_ID -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Server -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemServerSelectBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppConst.DEFAULT_WEBDAV_ID +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Server +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemServerSelectBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.applyTint +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/ServersViewModel.kt similarity index 57% rename from app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/import/remote/ServersViewModel.kt index 2c401c6fe..0508e87cb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/import/remote/ServersViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/ServersViewModel.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.book.import.remote +package io.legado.app.ui.book.import.remote import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Server +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.Server class ServersViewModel(application: Application): BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt rename to app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 1c8c3dad4..5662b917b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.info +package io.legado.app.ui.book.info import android.animation.ValueAnimator import android.annotation.SuppressLint @@ -33,64 +33,64 @@ import com.google.android.material.color.DynamicColorsOptions import com.google.android.material.color.MaterialColors import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.ActivityBookInfoBinding -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.addType -import io.legato.kazusa.help.book.getRemoteUrl -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isLocalTxt -import io.legato.kazusa.help.book.isWebFile -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.model.remote.RemoteBookWebDav -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.changecover.ChangeCoverDialog -import io.legato.kazusa.ui.book.changesource.ChangeBookSourceDialog -import io.legato.kazusa.ui.book.group.GroupSelectDialog -import io.legato.kazusa.ui.book.info.edit.BookInfoEditActivity -import io.legato.kazusa.ui.book.manga.ReadMangaActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity.Companion.RESULT_DELETED -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.book.toc.TocActivityResult -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.widget.dialog.PhotoDialog -import io.legato.kazusa.ui.widget.dialog.VariableDialog -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.ConvertUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.ToolbarUtils.setAllIconsColor -import io.legato.kazusa.utils.applyNavigationBarMargin -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.longToastOnUi -import io.legato.kazusa.utils.openFileUri -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.shareWithQr -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.ActivityBookInfoBinding +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.addType +import io.legado.app.help.book.getRemoteUrl +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isLocalTxt +import io.legado.app.help.book.isWebFile +import io.legado.app.help.book.removeType +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.BookCover +import io.legado.app.model.remote.RemoteBookWebDav +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.changecover.ChangeCoverDialog +import io.legado.app.ui.book.changesource.ChangeBookSourceDialog +import io.legado.app.ui.book.group.GroupSelectDialog +import io.legado.app.ui.book.info.edit.BookInfoEditActivity +import io.legado.app.ui.book.manga.ReadMangaActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.read.ReadBookActivity.Companion.RESULT_DELETED +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.book.toc.TocActivityResult +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.widget.dialog.PhotoDialog +import io.legado.app.ui.widget.dialog.VariableDialog +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.ConvertUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.GSON +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.ToolbarUtils.setAllIconsColor +import io.legado.app.utils.applyNavigationBarMargin +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.longToastOnUi +import io.legado.app.utils.openFileUri +import io.legado.app.utils.sendToClip +import io.legado.app.utils.shareWithQr +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index ac8e60ef5..de0c146ed 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -1,47 +1,46 @@ -package io.legato.kazusa.ui.book.info +package io.legado.app.ui.book.info import android.app.Application import android.content.Intent import android.net.Uri import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.exception.NoBooksDirException -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.getExportFileName -import io.legato.kazusa.help.book.getRemoteUrl -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isNotShelf -import io.legato.kazusa.help.book.isSameNameAuthor -import io.legato.kazusa.help.book.isWebFile -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.updateTo -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.lib.webdav.ObjectNotFoundException -import io.legato.kazusa.model.AudioPlay -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.ArchiveUtils -import io.legato.kazusa.utils.UrlUtil -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoBooksDirException +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.getExportFileName +import io.legado.app.help.book.getRemoteUrl +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isNotShelf +import io.legado.app.help.book.isSameNameAuthor +import io.legado.app.help.book.isWebFile +import io.legado.app.help.book.removeType +import io.legado.app.help.book.updateTo +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.lib.webdav.ObjectNotFoundException +import io.legado.app.model.AudioPlay +import io.legado.app.model.BookCover +import io.legado.app.model.ReadBook +import io.legado.app.model.ReadManga +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.localBook.LocalBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.UrlUtil +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.postEvent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditActivity.kt rename to app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt index 5caa9fafa..da1035d71 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.info.edit +package io.legado.app.ui.book.info.edit import android.net.Uri import android.os.Bundle @@ -7,29 +7,29 @@ import android.view.MenuItem import android.widget.ArrayAdapter import androidx.activity.viewModels import androidx.core.view.WindowInsetsCompat -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ActivityBookInfoEditBinding -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.addType -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.ui.book.changecover.ChangeCoverDialog -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.SelectImageContract -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readUri -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.BookType +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ActivityBookInfoEditBinding +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.addType +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.removeType +import io.legado.app.ui.book.changecover.ChangeCoverDialog +import io.legado.app.utils.FileUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.SelectImageContract +import io.legado.app.utils.externalFiles +import io.legado.app.utils.inputStream +import io.legado.app.utils.launch +import io.legado.app.utils.readUri +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx import splitties.views.bottomPadding import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditViewModel.kt index 6a99ae128..ebb4e6cec 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/edit/BookInfoEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditViewModel.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.book.info.edit +package io.legado.app.ui.book.info.edit import android.app.Application import android.database.sqlite.SQLiteConstraintException import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.model.ReadBook +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.model.ReadBook class BookInfoEditViewModel(application: Application) : BaseViewModel(application) { var book: Book? = null diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/manage/BookAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt index 3463dc44d..2017ddcce 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manage +package io.legado.app.ui.book.manage import android.annotation.SuppressLint import android.content.Context @@ -6,17 +6,17 @@ import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemArrangeBookBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemArrangeBookBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback import java.util.* class BookAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageActivity.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageActivity.kt rename to app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt index c28cdb3ac..e29586759 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manage +package io.legado.app.ui.book.manage import android.annotation.SuppressLint import android.os.Bundle @@ -13,41 +13,41 @@ import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.ActivityArrangeBookBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.book.contains -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.ActivityArrangeBookBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.book.contains +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.ui.book.group.GroupManageDialog -import io.legato.kazusa.ui.book.group.GroupSelectDialog -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.book.group.GroupManageDialog +import io.legado.app.ui.book.group.GroupSelectDialog +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.cnCompare +import io.legado.app.utils.dpToPx +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.sendToClip +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageViewModel.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageViewModel.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageViewModel.kt index c2b19e8c4..ded518ae9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manage/BookshelfManageViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageViewModel.kt @@ -1,26 +1,26 @@ -package io.legato.kazusa.ui.book.manage +package io.legado.app.ui.book.manage import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.writeToOutputStream +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.removeType +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.localBook.LocalBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.writeToOutputStream import kotlinx.coroutines.delay import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manage/SourcePickerDialog.kt b/app/src/main/java/io/legado/app/ui/book/manage/SourcePickerDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/manage/SourcePickerDialog.kt rename to app/src/main/java/io/legado/app/ui/book/manage/SourcePickerDialog.kt index c114f0907..16ccff708 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manage/SourcePickerDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/SourcePickerDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manage +package io.legado.app.ui.book.manage import android.content.Context import android.os.Bundle @@ -10,24 +10,23 @@ import androidx.appcompat.widget.Toolbar import androidx.core.view.setPadding import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.databinding.DialogSourcePickerBinding -import io.legato.kazusa.databinding.Item1lineTextBinding -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.databinding.DialogSourcePickerBinding +import io.legado.app.databinding.Item1lineTextBinding +import io.legado.app.help.config.AppConfig //import io.legado.app.lib.theme.primaryColor //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.utils.dpToPx +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt rename to app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt index 8daab38f5..9f8d99c4b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga +package io.legado.app.ui.book.manga import android.annotation.SuppressLint import android.content.Intent @@ -25,60 +25,60 @@ import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL import com.bumptech.glide.util.FixedPreloadSizeProvider import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.databinding.ActivityMangaBinding -import io.legato.kazusa.databinding.ViewLoadMoreBinding -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.storage.Backup -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.receiver.NetworkChangedListener -import io.legato.kazusa.ui.book.changesource.ChangeBookSourceDialog -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.book.manga.config.MangaAutoReadDialog -import io.legato.kazusa.ui.book.manga.config.MangaClickActionConfigDialog -import io.legato.kazusa.ui.book.manga.config.MangaColorFilterConfig -import io.legato.kazusa.ui.book.manga.config.MangaColorFilterDialog -import io.legato.kazusa.ui.book.manga.config.MangaFooterSettingDialog -import io.legato.kazusa.ui.book.manga.config.MangaScrollMode -import io.legato.kazusa.ui.book.manga.entities.BaseMangaPage -import io.legato.kazusa.ui.book.manga.entities.MangaFooterConfig -import io.legato.kazusa.ui.book.manga.entities.MangaPage -import io.legato.kazusa.ui.book.manga.recyclerview.MangaAdapter -import io.legato.kazusa.ui.book.manga.recyclerview.MangaLayoutManager -import io.legato.kazusa.ui.book.manga.recyclerview.ScrollTimer -import io.legato.kazusa.ui.book.manga.recyclerview.WebtoonFrame -import io.legato.kazusa.ui.book.read.MangaMenu -import io.legato.kazusa.ui.book.read.ReadBookActivity.Companion.RESULT_DELETED -import io.legato.kazusa.ui.book.toc.TocActivityResult -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.ui.widget.recycler.LoadMoreView -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.canScroll -import io.legato.kazusa.utils.fastBinarySearch -import io.legato.kazusa.utils.findCenterViewPosition -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.toggleSystemBar -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.BuildConfig +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.data.entities.BookSource +import io.legado.app.databinding.ActivityMangaBinding +import io.legado.app.databinding.ViewLoadMoreBinding +import io.legado.app.help.book.isImage +import io.legado.app.help.book.removeType +import io.legado.app.help.config.AppConfig +import io.legado.app.help.storage.Backup +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.ReadManga +import io.legado.app.receiver.NetworkChangedListener +import io.legado.app.ui.book.changesource.ChangeBookSourceDialog +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.book.manga.config.MangaAutoReadDialog +import io.legado.app.ui.book.manga.config.MangaClickActionConfigDialog +import io.legado.app.ui.book.manga.config.MangaColorFilterConfig +import io.legado.app.ui.book.manga.config.MangaColorFilterDialog +import io.legado.app.ui.book.manga.config.MangaFooterSettingDialog +import io.legado.app.ui.book.manga.config.MangaScrollMode +import io.legado.app.ui.book.manga.entities.BaseMangaPage +import io.legado.app.ui.book.manga.entities.MangaFooterConfig +import io.legado.app.ui.book.manga.entities.MangaPage +import io.legado.app.ui.book.manga.recyclerview.MangaAdapter +import io.legado.app.ui.book.manga.recyclerview.MangaLayoutManager +import io.legado.app.ui.book.manga.recyclerview.ScrollTimer +import io.legado.app.ui.book.manga.recyclerview.WebtoonFrame +import io.legado.app.ui.book.read.MangaMenu +import io.legado.app.ui.book.read.ReadBookActivity.Companion.RESULT_DELETED +import io.legado.app.ui.book.toc.TocActivityResult +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.ui.widget.recycler.LoadMoreView +import io.legado.app.utils.GSON +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.canScroll +import io.legado.app.utils.fastBinarySearch +import io.legado.app.utils.findCenterViewPosition +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.gone +import io.legado.app.utils.observeEvent +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.toggleSystemBar +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaViewModel.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt index 8faea7930..9fb27ecee 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt @@ -1,36 +1,36 @@ -package io.legato.kazusa.ui.book.manga +package io.legado.app.ui.book.manga import android.app.Application import android.content.Intent import android.graphics.Bitmap import androidx.lifecycle.viewModelScope import com.bumptech.glide.Glide -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.Book.ReadConfig -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isLocalModified -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.ImageSaveUtils -import io.legato.kazusa.utils.mapParallelSafe -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.Book.ReadConfig +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isLocalModified +import io.legado.app.help.book.removeType +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.ReadManga +import io.legado.app.model.localBook.LocalBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.ImageSaveUtils +import io.legado.app.utils.mapParallelSafe +import io.legado.app.utils.postEvent +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaAutoReadDialog.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaAutoReadDialog.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaAutoReadDialog.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaAutoReadDialog.kt index cb736b824..a38b2ffc7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaAutoReadDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaAutoReadDialog.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config import android.os.Bundle import android.view.View -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogMangaAutoReadBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogMangaAutoReadBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.viewbindingdelegate.viewBinding class MangaAutoReadDialog : BaseBottomSheetDialogFragment(R.layout.dialog_manga_auto_read) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaClickActionConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaClickActionConfigDialog.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaClickActionConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaClickActionConfigDialog.kt index 1e181367b..4005cd1a2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaClickActionConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaClickActionConfigDialog.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config import android.content.DialogInterface import android.os.Bundle import android.view.View import android.view.ViewGroup import android.widget.TextView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogClickActionConfigBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogClickActionConfigBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.selector +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.viewbindingdelegate.viewBinding class MangaClickActionConfigDialog : BaseDialogFragment(R.layout.dialog_click_action_config) { private val binding by viewBinding(DialogClickActionConfigBinding::bind) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterConfig.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterConfig.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterConfig.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterConfig.kt index 4f6b87336..bdd27c268 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterConfig.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterConfig.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config -import io.legato.kazusa.utils.GSON +import io.legado.app.utils.GSON data class MangaColorFilterConfig( var r: Int = 0, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterDialog.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterDialog.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterDialog.kt index f10729508..60fcd7804 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaColorFilterDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaColorFilterDialog.kt @@ -1,19 +1,19 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config import android.content.DialogInterface import android.os.Bundle import android.view.View import android.view.WindowManager import androidx.core.view.isVisible -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogMangaColorFilterBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogMangaColorFilterBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.invisible +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible class MangaColorFilterDialog : BaseBottomSheetDialogFragment(R.layout.dialog_manga_color_filter) { private val binding by viewBinding(DialogMangaColorFilterBinding::bind) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaFooterSettingDialog.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaFooterSettingDialog.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaFooterSettingDialog.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaFooterSettingDialog.kt index 2f883281a..3c3207604 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaFooterSettingDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaFooterSettingDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config import android.content.DialogInterface import android.os.Bundle @@ -7,18 +7,18 @@ import android.view.View import androidx.core.view.isVisible import androidx.transition.TransitionManager import com.google.android.material.chip.Chip -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogMangaFooterSettingBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.manga.entities.MangaFooterConfig -import io.legato.kazusa.ui.widget.ReaderInfoBarView -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogMangaFooterSettingBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.manga.entities.MangaFooterConfig +import io.legado.app.ui.widget.ReaderInfoBarView +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.postEvent +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding class MangaFooterSettingDialog : BaseBottomSheetDialogFragment(R.layout.dialog_manga_footer_setting) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollMode.kt b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaScrollMode.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollMode.kt rename to app/src/main/java/io/legado/app/ui/book/manga/config/MangaScrollMode.kt index 4013f737e..4c372dafa 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollMode.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/config/MangaScrollMode.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.config +package io.legado.app.ui.book.manga.config object MangaScrollMode { const val PAGE_LEFT_TO_RIGHT = 1 // 单页式（从左到右） diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/BaseMangaPage.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/BaseMangaPage.kt similarity index 60% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/BaseMangaPage.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/BaseMangaPage.kt index 68020526d..60bac9109 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/BaseMangaPage.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/BaseMangaPage.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities interface BaseMangaPage { val chapterIndex: Int diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/EpaperTransformation.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/EpaperTransformation.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/EpaperTransformation.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/EpaperTransformation.kt index f4312c5ee..3f9fdaaa1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/EpaperTransformation.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/EpaperTransformation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities import android.graphics.Bitmap import android.graphics.Canvas diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/GrayscaleTransformation.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/GrayscaleTransformation.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/GrayscaleTransformation.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/GrayscaleTransformation.kt index 3c30bb452..84b57b224 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/GrayscaleTransformation.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/GrayscaleTransformation.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities import android.graphics.Bitmap import android.graphics.Canvas diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaChapter.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaChapter.kt similarity index 54% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaChapter.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/MangaChapter.kt index 6e57cc1ac..93b2acdd0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaChapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaChapter.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities -import io.legato.kazusa.data.entities.BookChapter +import io.legado.app.data.entities.BookChapter data class MangaChapter( val chapter: BookChapter, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaContent.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaContent.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt index 0fbcabf97..904297882 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaContent.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities data class MangaContent( val pos: Int, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaFooterConfig.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaFooterConfig.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaFooterConfig.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/MangaFooterConfig.kt index da2132bd2..c7c7d590b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaFooterConfig.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaFooterConfig.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities import androidx.annotation.Keep -import io.legato.kazusa.ui.widget.ReaderInfoBarView +import io.legado.app.ui.widget.ReaderInfoBarView @Keep data class MangaFooterConfig( diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaPage.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaPage.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaPage.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/MangaPage.kt index ab2729fe5..99ecb4768 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/MangaPage.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaPage.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities data class MangaPage( override val chapterIndex: Int = 0,//总章节位置 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt index 51d578200..8362cc7f0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.entities +package io.legado.app.ui.book.manga.entities data class ReaderLoading( override val chapterIndex: Int = 0, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt index 402a40b0a..8d07390dc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.os.Handler diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt index bdf72f2c6..78b5e0fc7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.graphics.ColorMatrix @@ -18,19 +18,19 @@ import com.bumptech.glide.Glide import com.bumptech.glide.ListPreloader.PreloadModelProvider import com.bumptech.glide.RequestBuilder import com.bumptech.glide.load.resource.bitmap.BitmapTransformation -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter.Companion.TYPE_FOOTER_VIEW -import io.legato.kazusa.databinding.ItemBookMangaEdgeBinding -import io.legato.kazusa.databinding.ItemBookMangaPageBinding -import io.legato.kazusa.help.glide.progress.ProgressManager -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.ui.book.manga.config.MangaColorFilterConfig -import io.legato.kazusa.ui.book.manga.entities.EpaperTransformation -import io.legato.kazusa.ui.book.manga.entities.GrayscaleTransformation -import io.legato.kazusa.ui.book.manga.entities.MangaPage -import io.legato.kazusa.ui.book.manga.entities.ReaderLoading -import io.legato.kazusa.utils.dpToPx +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter.Companion.TYPE_FOOTER_VIEW +import io.legado.app.databinding.ItemBookMangaEdgeBinding +import io.legado.app.databinding.ItemBookMangaPageBinding +import io.legado.app.help.glide.progress.ProgressManager +import io.legado.app.model.BookCover +import io.legado.app.model.ReadManga +import io.legado.app.ui.book.manga.config.MangaColorFilterConfig +import io.legado.app.ui.book.manga.entities.EpaperTransformation +import io.legado.app.ui.book.manga.entities.GrayscaleTransformation +import io.legado.app.ui.book.manga.entities.MangaPage +import io.legado.app.ui.book.manga.entities.ReaderLoading +import io.legado.app.utils.dpToPx class MangaAdapter(private val context: Context) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaLayoutManager.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaLayoutManager.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaLayoutManager.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaLayoutManager.kt index f7198487c..d75b220d0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaLayoutManager.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaLayoutManager.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import androidx.recyclerview.widget.LinearLayoutManager diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt index 16f3da5f4..512f5ba38 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.annotation.SuppressLint import android.content.Context @@ -22,10 +22,10 @@ import com.bumptech.glide.load.Transformation import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target -import io.legato.kazusa.help.glide.progress.ProgressManager -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.help.glide.progress.ProgressManager +import io.legado.app.model.BookCover +import io.legado.app.model.ReadManga +import io.legado.app.utils.printOnDebug open class MangaVH(val binding: VB, private val context: Context) : RecyclerView.ViewHolder(binding.root) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/ScrollTimer.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/ScrollTimer.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt index d960841df..e3a0d7ccf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/ScrollTimer.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt index 55ac149fa..d17ad98bd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.graphics.Rect @@ -9,8 +9,8 @@ import android.view.MotionEvent import android.view.ScaleGestureDetector import android.widget.FrameLayout import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.findCenterViewPosition +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.findCenterViewPosition class WebtoonFrame : FrameLayout { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonRecyclerView.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonRecyclerView.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt index 026f7ad8f..0d1e10d8c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonRecyclerView.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.manga.recyclerview +package io.legado.app.ui.book.manga.recyclerview import android.animation.AnimatorSet import android.animation.ValueAnimator @@ -12,7 +12,7 @@ import android.view.animation.DecelerateInterpolator import androidx.core.animation.doOnEnd import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.utils.findCenterViewPosition +import io.legado.app.utils.findCenterViewPosition import kotlin.math.abs diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt rename to app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt index 736a3d2d6..de2f930bd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.annotation.SuppressLint import android.content.pm.ActivityInfo @@ -15,38 +15,38 @@ import androidx.core.view.doOnDetach import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.google.android.material.datepicker.MaterialDatePicker -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppConst.charsets -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.ActivityBookReadBinding -import io.legato.kazusa.databinding.DialogDownloadChoiceBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogSimulatedReadingBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog -import io.legato.kazusa.ui.book.read.config.ClickActionConfigDialog -import io.legato.kazusa.ui.book.read.config.PaddingConfigDialog -import io.legato.kazusa.ui.book.read.config.PageKeyDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.ColorUtils -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.find -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.isTv -import io.legato.kazusa.utils.setLightStatusBar -import io.legato.kazusa.utils.setNavigationBarColorAuto -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppConst.charsets +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.ActivityBookReadBinding +import io.legado.app.databinding.DialogDownloadChoiceBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogSimulatedReadingBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.CacheBook +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.config.BgTextConfigDialog +import io.legado.app.ui.book.read.config.ClickActionConfigDialog +import io.legado.app.ui.book.read.config.PaddingConfigDialog +import io.legado.app.ui.book.read.config.PageKeyDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.ColorUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.find +import io.legado.app.utils.getPrefString +import io.legado.app.utils.gone +import io.legado.app.utils.isTv +import io.legado.app.utils.setLightStatusBar +import io.legado.app.utils.setNavigationBarColorAuto +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.themeColor +import io.legado.app.utils.viewbindingdelegate.viewBinding import java.time.Instant import java.time.LocalDate import java.time.ZoneId diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ContentEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/book/read/ContentEditDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt index 1389e378d..9c03da0a7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ContentEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.app.Application import android.content.DialogInterface @@ -10,25 +10,25 @@ import android.view.View import androidx.fragment.app.viewModels import androidx.lifecycle.MutableLiveData import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.databinding.DialogContentEditBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookChapter +import io.legado.app.databinding.DialogContentEditBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.isLocal +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.ReadBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.gone +import io.legado.app.utils.sendToClip +import io.legado.app.utils.themeColor +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/EffectiveReplacesDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/EffectiveReplacesDialog.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/read/EffectiveReplacesDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/EffectiveReplacesDialog.kt index 32f3782b3..1230bfce0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/EffectiveReplacesDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/EffectiveReplacesDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.content.Context import android.content.DialogInterface @@ -9,20 +9,20 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.Item1lineTextBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.Item1lineTextBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.replace.edit.ReplaceEditActivity -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.ReadBook +import io.legado.app.ui.replace.edit.ReplaceEditActivity +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 起效的替换规则 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt rename to app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt index 11702a39b..57443348f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read //import io.legado.app.lib.theme.bottomBackground import android.annotation.SuppressLint @@ -10,25 +10,25 @@ import android.widget.FrameLayout import androidx.core.view.isGone import androidx.core.view.isVisible import com.google.android.material.slider.Slider -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ViewMangaMenuBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.source.getSourceType -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.ReadManga -import io.legato.kazusa.ui.browser.WebViewActivity -import io.legato.kazusa.utils.ConstraintModify -import io.legato.kazusa.utils.VibrationUtils -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.loadAnimation -import io.legato.kazusa.utils.modifyBegin -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.databinding.ViewMangaMenuBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.source.getSourceType +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.ReadBook +import io.legado.app.model.ReadManga +import io.legado.app.ui.browser.WebViewActivity +import io.legado.app.utils.ConstraintModify +import io.legado.app.utils.VibrationUtils +import io.legado.app.utils.activity +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.loadAnimation +import io.legado.app.utils.modifyBegin +import io.legado.app.utils.openUrl +import io.legado.app.utils.startActivity +import io.legado.app.utils.visible class MangaMenu @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt rename to app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 54c5d6274..1b7c0900c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read //import io.legado.app.lib.theme.accentColor import android.annotation.SuppressLint @@ -24,111 +24,111 @@ import androidx.lifecycle.lifecycleScope import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import com.jaredrummler.android.colorpicker.ColorPickerDialogListener -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.constant.Status -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.help.TTS -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isEpub -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isLocalTxt -import io.legato.kazusa.help.book.isMobi -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.update -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ReadTipConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.source.getSourceType -import io.legato.kazusa.help.storage.Backup -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.analyzeRule.AnalyzeRule -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setChapter -import io.legato.kazusa.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext -import io.legato.kazusa.model.localBook.EpubFile -import io.legato.kazusa.model.localBook.MobiFile -import io.legato.kazusa.receiver.NetworkChangedListener -import io.legato.kazusa.receiver.TimeBatteryReceiver -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.bookmark.BookmarkDialog -import io.legato.kazusa.ui.book.changesource.ChangeBookSourceDialog -import io.legato.kazusa.ui.book.changesource.ChangeChapterSourceDialog -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.book.read.config.AutoReadDialog -import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.BG_COLOR -import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.TEXT_COLOR -import io.legato.kazusa.ui.book.read.config.FontSelectDialog.Companion.S_COLOR -import io.legato.kazusa.ui.book.read.config.ReadAloudDialog -import io.legato.kazusa.ui.book.read.config.ReadStyleDialog -import io.legato.kazusa.ui.book.read.config.TipConfigDialog.Companion.TIP_COLOR -import io.legato.kazusa.ui.book.read.config.TipConfigDialog.Companion.TIP_DIVIDER_COLOR -import io.legato.kazusa.ui.book.read.config.ToolButtonConfigDialog -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.book.read.page.provider.LayoutProgressListener -import io.legato.kazusa.ui.book.searchContent.SearchContentActivity -import io.legato.kazusa.ui.book.searchContent.SearchResult -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.book.toc.TocActivityResult -import io.legato.kazusa.ui.book.toc.rule.TxtTocRuleDialog -import io.legato.kazusa.ui.browser.WebViewActivity -import io.legato.kazusa.ui.dict.DictDialog -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.replace.ReplaceRuleActivity -import io.legato.kazusa.ui.replace.edit.ReplaceEditActivity -import io.legato.kazusa.ui.widget.PopupAction -import io.legato.kazusa.ui.widget.dialog.PhotoDialog -import io.legato.kazusa.utils.Debounce -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.StartActivityContract -import io.legato.kazusa.utils.applyOpenTint -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.dismissDialogFragment -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.hexString -import io.legato.kazusa.utils.iconItemOnLongClick -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.isTrue -import io.legato.kazusa.utils.navigationBarGravity -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.observeEventSticky -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.startActivityForBook -import io.legato.kazusa.utils.sysScreenOffTime -import io.legato.kazusa.utils.throttle -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.visible +import io.legado.app.BuildConfig +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.constant.Status +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.IntentData +import io.legado.app.help.TTS +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isEpub +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isLocalTxt +import io.legado.app.help.book.isMobi +import io.legado.app.help.book.removeType +import io.legado.app.help.book.update +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ReadTipConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.source.getSourceType +import io.legado.app.help.storage.Backup +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.model.analyzeRule.AnalyzeRule +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setChapter +import io.legado.app.model.analyzeRule.AnalyzeRule.Companion.setCoroutineContext +import io.legado.app.model.localBook.EpubFile +import io.legado.app.model.localBook.MobiFile +import io.legado.app.receiver.NetworkChangedListener +import io.legado.app.receiver.TimeBatteryReceiver +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.bookmark.BookmarkDialog +import io.legado.app.ui.book.changesource.ChangeBookSourceDialog +import io.legado.app.ui.book.changesource.ChangeChapterSourceDialog +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.book.read.config.AutoReadDialog +import io.legado.app.ui.book.read.config.BgTextConfigDialog.Companion.BG_COLOR +import io.legado.app.ui.book.read.config.BgTextConfigDialog.Companion.TEXT_COLOR +import io.legado.app.ui.book.read.config.FontSelectDialog.Companion.S_COLOR +import io.legado.app.ui.book.read.config.ReadAloudDialog +import io.legado.app.ui.book.read.config.ReadStyleDialog +import io.legado.app.ui.book.read.config.TipConfigDialog.Companion.TIP_COLOR +import io.legado.app.ui.book.read.config.TipConfigDialog.Companion.TIP_DIVIDER_COLOR +import io.legado.app.ui.book.read.config.ToolButtonConfigDialog +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.book.read.page.provider.LayoutProgressListener +import io.legado.app.ui.book.searchContent.SearchContentActivity +import io.legado.app.ui.book.searchContent.SearchResult +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.book.toc.TocActivityResult +import io.legado.app.ui.book.toc.rule.TxtTocRuleDialog +import io.legado.app.ui.browser.WebViewActivity +import io.legado.app.ui.dict.DictDialog +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.replace.ReplaceRuleActivity +import io.legado.app.ui.replace.edit.ReplaceEditActivity +import io.legado.app.ui.widget.PopupAction +import io.legado.app.ui.widget.dialog.PhotoDialog +import io.legado.app.utils.Debounce +import io.legado.app.utils.GSON +import io.legado.app.utils.LogUtils +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.StartActivityContract +import io.legado.app.utils.applyOpenTint +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.dismissDialogFragment +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.getPrefString +import io.legado.app.utils.hexString +import io.legado.app.utils.iconItemOnLongClick +import io.legado.app.utils.invisible +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.isTrue +import io.legado.app.utils.navigationBarGravity +import io.legado.app.utils.observeEvent +import io.legado.app.utils.observeEventSticky +import io.legado.app.utils.postEvent +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.startActivityForBook +import io.legado.app.utils.sysScreenOffTime +import io.legado.app.utils.throttle +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 919b09820..3da25f3de 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -1,40 +1,40 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.app.Application import android.content.Intent import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isLocalModified -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.ui.book.searchContent.SearchResult -import io.legato.kazusa.utils.ImageSaveUtils -import io.legato.kazusa.utils.mapParallelSafe -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.toStringArray -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.BookProgress +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isLocalModified +import io.legado.app.help.book.removeType +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.ImageProvider +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.model.localBook.LocalBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.ui.book.searchContent.SearchResult +import io.legado.app.utils.ImageSaveUtils +import io.legado.app.utils.mapParallelSafe +import io.legado.app.utils.postEvent +import io.legado.app.utils.toStringArray +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.ensureActive import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt rename to app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index cd0497523..5c6e2e947 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.annotation.SuppressLint import android.content.Context @@ -22,34 +22,33 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.button.MaterialButtonGroup import com.google.android.material.overflow.OverflowLinearLayout import com.google.android.material.slider.Slider -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.ViewReadMenuBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.source.getSourceType -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.browser.WebViewActivity -import io.legato.kazusa.ui.widget.seekbar.SeekBarChangeListener -import io.legato.kazusa.utils.ConstraintModify -import io.legato.kazusa.utils.VibrationUtils -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.loadAnimation -import io.legato.kazusa.utils.modifyBegin -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible -import org.checkerframework.checker.units.qual.cd +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.ViewReadMenuBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.source.getSourceType +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.ReadBook +import io.legado.app.ui.browser.WebViewActivity +import io.legado.app.ui.widget.seekbar.SeekBarChangeListener +import io.legado.app.utils.ConstraintModify +import io.legado.app.utils.VibrationUtils +import io.legado.app.utils.activity +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.dpToPx +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.loadAnimation +import io.legado.app.utils.modifyBegin +import io.legado.app.utils.openUrl +import io.legado.app.utils.putPrefBoolean +import io.legado.app.utils.startActivity +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible import splitties.views.onClick /** diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt rename to app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt index 24ddb625b..0b01978f7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.annotation.SuppressLint import android.content.Context @@ -7,17 +7,17 @@ import android.view.LayoutInflater import android.view.animation.Animation import android.widget.FrameLayout import androidx.core.view.isVisible -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ViewSearchMenuBinding +import io.legado.app.R +import io.legado.app.databinding.ViewSearchMenuBinding //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.searchContent.SearchResult -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.loadAnimation -import io.legato.kazusa.utils.visible +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.searchContent.SearchResult +import io.legado.app.utils.activity +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.invisible +import io.legado.app.utils.loadAnimation +import io.legado.app.utils.visible /** * 搜索界面菜单 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/TextActionMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/TextActionMenu.kt rename to app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt index 16b8695f5..ed786ca93 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/TextActionMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read +package io.legado.app.ui.book.read import android.annotation.SuppressLint import android.app.SearchManager @@ -15,23 +15,23 @@ import androidx.appcompat.view.SupportMenuInflater import androidx.appcompat.view.menu.MenuBuilder import androidx.appcompat.view.menu.MenuItemImpl import androidx.core.view.isVisible -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.ItemTextBinding -import io.legato.kazusa.databinding.PopupActionMenuBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.ItemTextBinding +import io.legado.app.databinding.PopupActionMenuBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.gone +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.sendToClip +import io.legado.app.utils.share +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.visible import androidx.core.net.toUri -import io.legato.kazusa.constant.AppLog +import io.legado.app.constant.AppLog @SuppressLint("RestrictedApi") class TextActionMenu(private val context: Context, private val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt index 2c3711d3b..504945673 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.DialogInterface import android.os.Bundle import android.view.View import com.google.android.material.slider.Slider -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogAutoReadBinding -import io.legato.kazusa.help.config.ReadBookConfig +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogAutoReadBinding +import io.legado.app.help.config.ReadBookConfig //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.book.read.BaseReadBookActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.book.read.BaseReadBookActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import java.util.Locale diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt b/app/src/main/java/io/legado/app/ui/book/read/config/BgAdapter.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/BgAdapter.kt index b361801df..ff541218e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/BgAdapter.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.ItemBgImageBinding -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.utils.postEvent +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.EventBus +import io.legado.app.databinding.ItemBgImageBinding +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.glide.ImageLoader +import io.legado.app.utils.postEvent import java.io.File class BgAdapter(context: Context, val textColor: Int) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt index 24e171328..d168681f8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.annotation.SuppressLint import android.content.DialogInterface @@ -11,48 +11,48 @@ import androidx.core.view.isGone import androidx.documentfile.provider.DocumentFile import com.google.android.material.slider.Slider import com.jaredrummler.android.colorpicker.ColorPickerDialog -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogReadBgTextBinding -import io.legato.kazusa.databinding.ItemBgImageBinding -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.SelectImageContract -import io.legato.kazusa.utils.compress.ZipUtils -import io.legato.kazusa.utils.createFileReplace -import io.legato.kazusa.utils.createFolderReplace -import io.legato.kazusa.utils.externalCache -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getFile -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.longToast -import io.legato.kazusa.utils.openOutputStream -import io.legato.kazusa.utils.outputStream -import io.legato.kazusa.utils.parseToUri -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.readBytes -import io.legato.kazusa.utils.readUri -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogReadBgTextBinding +import io.legado.app.databinding.ItemBgImageBinding +import io.legado.app.help.DefaultData +import io.legado.app.help.book.isImage +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.SelectImageContract +import io.legado.app.utils.compress.ZipUtils +import io.legado.app.utils.createFileReplace +import io.legado.app.utils.createFolderReplace +import io.legado.app.utils.externalCache +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getFile +import io.legado.app.utils.inputStream +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.launch +import io.legado.app.utils.longToast +import io.legado.app.utils.openOutputStream +import io.legado.app.utils.outputStream +import io.legado.app.utils.parseToUri +import io.legado.app.utils.postEvent +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.readBytes +import io.legado.app.utils.readUri +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ClickActionConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/ClickActionConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt index 822ddce06..6f95ecf06 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ClickActionConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.DialogInterface import android.os.Bundle import android.view.View import android.view.ViewGroup import android.widget.TextView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogClickActionConfigBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogClickActionConfigBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.selector +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 点击区域设置 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/FontSelectDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/FontSelectDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/FontSelectDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/FontSelectDialog.kt index 618e2d2da..96c898ed6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/FontSelectDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/FontSelectDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.Context import android.graphics.Typeface @@ -8,44 +8,44 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import androidx.appcompat.widget.Toolbar -import io.legato.kazusa.help.config.ReadBookConfig +import io.legado.app.help.config.ReadBookConfig import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import com.jaredrummler.android.colorpicker.ColorPickerDialog -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogFontSelectBinding -import io.legato.kazusa.databinding.ItemFontBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.RealPathUtil -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.list -import io.legato.kazusa.utils.listFileDocs -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogFontSelectBinding +import io.legado.app.databinding.ItemFontBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.utils.FileDoc +import io.legado.app.utils.FileUtils +import io.legado.app.utils.RealPathUtil +import io.legado.app.utils.applyTint +import io.legado.app.utils.cnCompare +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getPrefString +import io.legado.app.utils.invisible +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.list +import io.legado.app.utils.listFileDocs +import io.legado.app.utils.postEvent +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.putPrefString +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.launch import java.io.File import java.net.URLDecoder diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt index abafb0a6a..641eb1da2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt @@ -1,32 +1,28 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.os.Bundle import android.view.MenuItem import android.view.View -import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.databinding.DialogHttpTtsEditBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.data.entities.HttpTTS +import io.legado.app.databinding.DialogHttpTtsEditBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.widget.code.addJsPattern -import io.legato.kazusa.ui.widget.code.addJsonPattern -import io.legato.kazusa.ui.widget.code.addLegadoPattern -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.widget.code.addJsPattern +import io.legado.app.ui.widget.code.addJsonPattern +import io.legado.app.ui.widget.code.addLegadoPattern +import io.legado.app.utils.GSON +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding class HttpTtsEditDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_http_tts_edit), Toolbar.OnMenuItemClickListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt index c7fa1c808..17222d770 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/HttpTtsEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.app.Application import android.os.Bundle -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.utils.getClipText -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.HttpTTS +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.ReadAloud +import io.legado.app.utils.getClipText +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.toastOnUi class HttpTtsEditViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/MoreConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/MoreConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt index 21bd1798a..ba922796c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/MoreConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.primaryColor @@ -10,20 +10,20 @@ import android.view.View import android.view.ViewConfiguration import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.removePref +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.postEvent +import io.legado.app.utils.removePref class MoreConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_more_config) { private val readPreferTag = "readPreferenceFragment" diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/PaddingConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/PaddingConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt index cc10fc2ce..57b12f530 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/PaddingConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.DialogInterface import android.os.Bundle import android.view.View -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogReadPaddingBinding -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogReadPaddingBinding +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.utils.postEvent +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding class PaddingConfigDialog : BaseDialogFragment(R.layout.dialog_read_padding) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/PageKeyDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/PageKeyDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/PageKeyDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/PageKeyDialog.kt index dad6ebc2f..f34f01622 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/PageKeyDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/PageKeyDialog.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.app.Dialog import android.content.Context import android.view.KeyEvent import android.view.ViewGroup -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogPageKeyBinding +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogPageKeyBinding //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.setLayout +import io.legado.app.utils.getPrefString +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.putPrefString +import io.legado.app.utils.setLayout import splitties.views.onClick diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index f4d4ab650..5916d5bee 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.SharedPreferences import android.os.Bundle @@ -8,25 +8,25 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.preference.ListPreference import androidx.preference.Preference -import io.legato.kazusa.R -import io.legato.kazusa.base.BasePrefDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.IntentHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.prefs.SwitchPreference -import io.legato.kazusa.lib.prefs.fragment.PreferenceFragment +import io.legado.app.R +import io.legado.app.base.BasePrefDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.help.IntentHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.prefs.SwitchPreference +import io.legado.app.lib.prefs.fragment.PreferenceFragment //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.showDialogFragment +import io.legado.app.model.ReadAloud +import io.legado.app.service.BaseReadAloudService +import io.legado.app.utils.GSON +import io.legado.app.utils.StringUtils +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.postEvent +import io.legado.app.utils.showDialogFragment class ReadAloudConfigDialog : BasePrefDialogFragment() { private val readAloudPreferTag = "readAloudPreferTag" diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt index b85aa7a29..631765bb2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor @@ -8,21 +8,21 @@ import android.os.Bundle import android.view.View import androidx.core.content.ContextCompat import com.google.android.material.slider.Slider -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogReadAloudBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogReadAloudBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.observeEvent +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadStyleDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadStyleDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt index 455d6763c..d158eb21d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadStyleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.DialogInterface import android.os.Bundle @@ -7,24 +7,24 @@ import android.view.View import android.view.ViewGroup import androidx.core.view.get import com.github.liuyueyi.quick.transfer.constants.TransType -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogReadBookStyleBinding -import io.legato.kazusa.databinding.ItemReadStyleBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.ChineseUtils -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogReadBookStyleBinding +import io.legado.app.databinding.ItemReadStyleBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.ChineseUtils +import io.legado.app.utils.dpToPx +import io.legado.app.utils.postEvent +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding class ReadStyleDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_book_style), FontSelectDialog.CallBack { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt index 3c6765fe0..38f9ae4eb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.Context import android.os.Bundle @@ -10,40 +10,38 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemHttpTtsBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.HttpTTS +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemHttpTtsBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.association.ImportHttpTtsDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.ui.association.ImportHttpTtsDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.gone +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineViewModel.kt similarity index 74% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineViewModel.kt index 74278c836..a43195b49 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/SpeakEngineViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineViewModel.kt @@ -1,17 +1,17 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.app.Application import android.net.Uri import android.speech.tts.TextToSpeech -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.HttpTTS -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.HttpTTS +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.DefaultData +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.readText +import io.legado.app.utils.toastOnUi class SpeakEngineViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/TipConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/TipConfigDialog.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/TipConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/TipConfigDialog.kt index a5dc99c85..c2d7b4a19 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/TipConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/TipConfigDialog.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.os.Bundle import android.view.View import com.google.android.material.chip.Chip import com.jaredrummler.android.colorpicker.ColorPickerDialog -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogTipConfigBinding -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ReadTipConfig -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.utils.hexString -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogTipConfigBinding +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ReadTipConfig +import io.legado.app.lib.dialogs.selector +import io.legado.app.utils.hexString +import io.legado.app.utils.observeEvent +import io.legado.app.utils.postEvent +import io.legado.app.utils.viewbindingdelegate.viewBinding class TipConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_tip_config) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ToolButtonConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ToolButtonConfigDialog.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/config/ToolButtonConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/book/read/config/ToolButtonConfigDialog.kt index 46754ef5a..fe955d5e7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ToolButtonConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ToolButtonConfigDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.config +package io.legado.app.ui.book.read.config import android.content.Context import android.content.DialogInterface @@ -10,12 +10,12 @@ import androidx.core.content.edit import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogToolButtonConfigBinding -import io.legato.kazusa.databinding.ItemToolButtonBinding -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogToolButtonConfigBinding +import io.legado.app.databinding.ItemToolButtonBinding +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding class ToolButtonConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_tool_button_config) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/AutoPager.kt b/app/src/main/java/io/legado/app/ui/book/read/page/AutoPager.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/AutoPager.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/AutoPager.kt index adddea26f..d3514b93b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/AutoPager.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/AutoPager.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.book.read.page +package io.legado.app.ui.book.read.page import android.graphics.Canvas import android.graphics.Paint import android.os.SystemClock import androidx.core.graphics.withClip -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.canvasrecorder.recordIfNeeded -import io.legato.kazusa.utils.themeColor +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.canvasrecorder.recordIfNeeded +import io.legado.app.utils.themeColor /** * 自动翻页 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ContentTextView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/ContentTextView.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt index c4ec1c11d..fa02606ef 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ContentTextView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page +package io.legado.app.ui.book.read.page import android.content.Context import android.graphics.Canvas @@ -6,28 +6,28 @@ import android.graphics.Paint import android.util.AttributeSet import android.view.MotionEvent import android.view.View -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.help.book.isOnLineTxt -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.delegate.PageDelegate -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.entities.TextPos -import io.legato.kazusa.ui.book.read.page.entities.column.BaseColumn -import io.legato.kazusa.ui.book.read.page.entities.column.ButtonColumn -import io.legato.kazusa.ui.book.read.page.entities.column.ImageColumn -import io.legato.kazusa.ui.book.read.page.entities.column.ReviewColumn -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.book.read.page.provider.TextPageFactory -import io.legato.kazusa.ui.widget.dialog.PhotoDialog -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.data.entities.Bookmark +import io.legado.app.help.book.isOnLineTxt +import io.legado.app.help.config.AppConfig +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.delegate.PageDelegate +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.TextPos +import io.legado.app.ui.book.read.page.entities.column.BaseColumn +import io.legado.app.ui.book.read.page.entities.column.ButtonColumn +import io.legado.app.ui.book.read.page.entities.column.ImageColumn +import io.legado.app.ui.book.read.page.entities.column.ReviewColumn +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.book.read.page.provider.TextPageFactory +import io.legado.app.ui.widget.dialog.PhotoDialog +import io.legado.app.utils.activity +import io.legado.app.utils.dpToPx +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi import java.util.concurrent.Executors import kotlin.math.max import kotlin.math.min diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/PageView.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt index af168514d..078c93ee8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/PageView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page +package io.legado.app.ui.book.read.page import android.annotation.SuppressLint import android.content.Context @@ -11,28 +11,28 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.isGone import androidx.core.view.isInvisible -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst.timeFormat -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.ViewBookPageBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.config.ReadTipConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.entities.TextPos -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.widget.BatteryView -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.applyStatusBarPadding -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.setTextIfNotEqual -import io.legato.kazusa.utils.statusBarHeight +import io.legado.app.R +import io.legado.app.constant.AppConst.timeFormat +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.ViewBookPageBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.config.ReadTipConfig +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.TextPos +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.widget.BatteryView +import io.legado.app.utils.activity +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.applyStatusBarPadding +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.setTextIfNotEqual +import io.legado.app.utils.statusBarHeight import splitties.views.backgroundColor import java.util.Date diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt index 90719e628..b0b55f9fb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page +package io.legado.app.ui.book.read.page import android.annotation.SuppressLint import android.content.Context @@ -10,37 +10,37 @@ import android.view.MotionEvent import android.view.ViewConfiguration import android.view.WindowInsets import android.widget.FrameLayout -import io.legato.kazusa.R -import io.legato.kazusa.constant.PageAnim -import io.legato.kazusa.data.entities.BookProgress -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ReadAloud -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.service.BaseReadAloudService -import io.legato.kazusa.ui.book.read.ContentEditDialog -import io.legato.kazusa.ui.book.read.page.api.DataSource -import io.legato.kazusa.ui.book.read.page.delegate.CoverPageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.HorizontalPageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.NoAnimPageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.PageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.ScrollPageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.SimulationPageDelegate -import io.legato.kazusa.ui.book.read.page.delegate.SlidePageDelegate -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.entities.TextPos -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.book.read.page.provider.LayoutProgressListener -import io.legato.kazusa.ui.book.read.page.provider.TextPageFactory -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.longToastOnUi -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.throttle +import io.legado.app.R +import io.legado.app.constant.PageAnim +import io.legado.app.data.entities.BookProgress +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ReadAloud +import io.legado.app.model.ReadBook +import io.legado.app.service.BaseReadAloudService +import io.legado.app.ui.book.read.ContentEditDialog +import io.legado.app.ui.book.read.page.api.DataSource +import io.legado.app.ui.book.read.page.delegate.CoverPageDelegate +import io.legado.app.ui.book.read.page.delegate.HorizontalPageDelegate +import io.legado.app.ui.book.read.page.delegate.NoAnimPageDelegate +import io.legado.app.ui.book.read.page.delegate.PageDelegate +import io.legado.app.ui.book.read.page.delegate.ScrollPageDelegate +import io.legado.app.ui.book.read.page.delegate.SimulationPageDelegate +import io.legado.app.ui.book.read.page.delegate.SlidePageDelegate +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.TextPos +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.book.read.page.provider.LayoutProgressListener +import io.legado.app.ui.book.read.page.provider.TextPageFactory +import io.legado.app.utils.activity +import io.legado.app.utils.invisible +import io.legado.app.utils.longToastOnUi +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.throttle import java.text.BreakIterator import java.util.Locale import kotlin.math.abs diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/api/DataSource.kt b/app/src/main/java/io/legado/app/ui/book/read/page/api/DataSource.kt similarity index 71% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/api/DataSource.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/api/DataSource.kt index a213300ab..ceddd279b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/api/DataSource.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/api/DataSource.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.book.read.page.api +package io.legado.app.ui.book.read.page.api -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.entities.TextChapter +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.entities.TextChapter interface DataSource { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/api/PageFactory.kt b/app/src/main/java/io/legado/app/ui/book/read/page/api/PageFactory.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/api/PageFactory.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/api/PageFactory.kt index d30701c17..ecf0e56a7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/api/PageFactory.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/api/PageFactory.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.api +package io.legado.app.ui.book.read.page.api abstract class PageFactory(protected val dataSource: DataSource) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/CoverPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/CoverPageDelegate.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/CoverPageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/CoverPageDelegate.kt index 53e531dca..5e8303312 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/CoverPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/CoverPageDelegate.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.graphics.Canvas import android.graphics.drawable.GradientDrawable import androidx.core.graphics.withClip import androidx.core.graphics.withTranslation -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.utils.screenshot +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.utils.screenshot class CoverPageDelegate(readView: ReadView) : HorizontalPageDelegate(readView) { private val shadowDrawableR: GradientDrawable diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/HorizontalPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/HorizontalPageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt index 99ad1d4d3..f6a4e3c3f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/HorizontalPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.view.MotionEvent -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.screenshot +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.screenshot abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readView) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/NoAnimPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/NoAnimPageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt index 154b93657..aaaa072d4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/NoAnimPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.graphics.Canvas -import io.legato.kazusa.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.ReadView class NoAnimPageDelegate(readView: ReadView) : HorizontalPageDelegate(readView) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/PageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/PageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt index 3de01f70e..374622a1b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/PageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.content.Context import android.graphics.Canvas @@ -7,10 +7,10 @@ import android.view.animation.LinearInterpolator import android.widget.Scroller import androidx.annotation.CallSuper import com.google.android.material.snackbar.Snackbar -import io.legato.kazusa.R -import io.legato.kazusa.ui.book.read.page.PageView -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection +import io.legado.app.R +import io.legado.app.ui.book.read.page.PageView +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection import kotlin.math.abs abstract class PageDelegate(protected val readView: ReadView) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/ScrollPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/ScrollPageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt index 0190b88f3..bec255657 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/ScrollPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.graphics.Canvas import android.view.MotionEvent import android.view.VelocityTracker -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider +import io.legado.app.data.entities.Book +import io.legado.app.help.book.isImage +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.provider.ChapterProvider class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SimulationPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/SimulationPageDelegate.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SimulationPageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/SimulationPageDelegate.kt index e23cec043..ebadb8dad 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SimulationPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/SimulationPageDelegate.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.graphics.Bitmap import android.graphics.Canvas @@ -12,10 +12,10 @@ import android.graphics.Region import android.graphics.drawable.GradientDrawable import android.os.Build import android.view.MotionEvent -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection -import io.legato.kazusa.utils.screenshot +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.utils.screenshot import kotlin.math.abs import kotlin.math.atan2 import kotlin.math.cos diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SlidePageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/SlidePageDelegate.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SlidePageDelegate.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/delegate/SlidePageDelegate.kt index ebcf5026b..33c6480cb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/delegate/SlidePageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/SlidePageDelegate.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.book.read.page.delegate +package io.legado.app.ui.book.read.page.delegate import android.graphics.Canvas import androidx.core.graphics.withTranslation -import io.legato.kazusa.ui.book.read.page.ReadView -import io.legato.kazusa.ui.book.read.page.entities.PageDirection +import io.legado.app.ui.book.read.page.ReadView +import io.legado.app.ui.book.read.page.entities.PageDirection class SlidePageDelegate(readView: ReadView) : HorizontalPageDelegate(readView) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/PageDirection.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/PageDirection.kt new file mode 100644 index 000000000..713c6bd67 --- /dev/null +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/PageDirection.kt @@ -0,0 +1,5 @@ +package io.legado.app.ui.book.read.page.entities + +enum class PageDirection { + NONE, PREV, NEXT +} \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextChapter.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextChapter.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt index 3523a9f88..9e5fbffbf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextChapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.book.read.page.entities +package io.legado.app.ui.book.read.page.entities import androidx.annotation.Keep -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.help.book.BookContent -import io.legato.kazusa.ui.book.read.page.provider.LayoutProgressListener -import io.legato.kazusa.ui.book.read.page.provider.TextChapterLayout -import io.legato.kazusa.utils.fastBinarySearchBy +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.help.book.BookContent +import io.legado.app.ui.book.read.page.provider.LayoutProgressListener +import io.legado.app.ui.book.read.page.provider.TextChapterLayout +import io.legado.app.utils.fastBinarySearchBy import kotlinx.coroutines.CoroutineScope import kotlin.math.abs import kotlin.math.min diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextLine.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextLine.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt index 5b579da7f..a8aa041f8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextLine.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.book.read.page.entities +package io.legado.app.ui.book.read.page.entities import android.annotation.SuppressLint import android.graphics.Canvas import android.graphics.Paint.FontMetrics import android.os.Build import androidx.annotation.Keep -import io.legato.kazusa.help.PaintPool -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextPage.Companion.emptyTextPage -import io.legato.kazusa.ui.book.read.page.entities.column.BaseColumn -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.canvasrecorder.recordIfNeededThenDraw -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.themeColor +import io.legado.app.help.PaintPool +import io.legado.app.help.book.isImage +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextPage.Companion.emptyTextPage +import io.legado.app.ui.book.read.page.entities.column.BaseColumn +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.canvasrecorder.recordIfNeededThenDraw +import io.legado.app.utils.dpToPx +import io.legado.app.utils.themeColor /** * 行信息 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPage.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPage.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt index 66f665a26..e6772f160 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPage.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.entities +package io.legado.app.ui.book.read.page.entities import android.graphics.Canvas import android.graphics.Paint @@ -7,17 +7,17 @@ import android.text.Layout import android.text.StaticLayout import androidx.annotation.Keep import androidx.core.graphics.withTranslation -import io.legato.kazusa.R -import io.legato.kazusa.help.PaintPool -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextChapter.Companion.emptyTextChapter -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.canvasrecorder.recordIfNeeded -import io.legato.kazusa.utils.dpToPx +import io.legado.app.R +import io.legado.app.help.PaintPool +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextChapter.Companion.emptyTextChapter +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.canvasrecorder.recordIfNeeded +import io.legado.app.utils.dpToPx import splitties.init.appCtx import java.text.DecimalFormat import kotlin.math.ceil diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextParagraph.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextParagraph.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextParagraph.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/TextParagraph.kt index 0898f140d..9af890ab5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextParagraph.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextParagraph.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.entities +package io.legado.app.ui.book.read.page.entities @Suppress("unused", "MemberVisibilityCanBePrivate") data class TextParagraph( diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPos.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPos.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt index fff1580df..e3599f20d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextPos.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPos.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.entities +package io.legado.app.ui.book.read.page.entities import androidx.annotation.Keep diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/BaseColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/BaseColumn.kt similarity index 61% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/BaseColumn.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/column/BaseColumn.kt index d7f10f926..ed86cd153 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/BaseColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/BaseColumn.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.ui.book.read.page.entities.column +package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextLine /** * 列基类 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ButtonColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt similarity index 54% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ButtonColumn.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt index acafdcc8a..abb3ac42a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ButtonColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ButtonColumn.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.read.page.entities.column +package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas import androidx.annotation.Keep -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextLine.Companion.emptyTextLine /** diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ImageColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ImageColumn.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt index 5940100f7..084d8d320 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ImageColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ImageColumn.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.book.read.page.entities.column +package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas import android.graphics.RectF import androidx.annotation.Keep -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.model.ImageProvider +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextLine.Companion.emptyTextLine +import io.legado.app.utils.toastOnUi import splitties.init.appCtx /** diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ReviewColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ReviewColumn.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt index 94c31a066..c1612fb2f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/ReviewColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/ReviewColumn.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.book.read.page.entities.column +package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas import android.graphics.Paint import android.graphics.Path import androidx.annotation.Keep -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextLine.Companion.emptyTextLine +import io.legado.app.ui.book.read.page.provider.ChapterProvider /** * 评论按钮列 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/TextColumn.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/TextColumn.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt index 21e9af00b..35e131731 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/TextColumn.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/column/TextColumn.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.book.read.page.entities.column +package io.legado.app.ui.book.read.page.entities.column import android.graphics.Canvas import android.os.Build import androidx.annotation.Keep -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.ui.book.read.page.ContentTextView -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.utils.themeColor +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.ui.book.read.page.ContentTextView +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextLine.Companion.emptyTextLine +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.utils.themeColor /** * 文字列 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ChapterProvider.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt index 0e5fab284..314b53fc3 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ChapterProvider.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider import android.annotation.SuppressLint import android.graphics.Paint.FontMetrics @@ -10,30 +10,30 @@ import android.text.StaticLayout import android.text.TextPaint import androidx.core.net.toUri import androidx.core.os.postDelayed -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.BookContent -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.entities.column.ImageColumn -import io.legato.kazusa.ui.book.read.page.entities.column.ReviewColumn -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.fastSum -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isPad -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.spToPx -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.textHeight +import io.legado.app.constant.AppPattern +import io.legado.app.constant.EventBus +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.BookContent +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ImageProvider +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.column.ImageColumn +import io.legado.app.ui.book.read.page.entities.column.ReviewColumn +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.dpToPx +import io.legado.app.utils.fastSum +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isPad +import io.legado.app.utils.postEvent +import io.legado.app.utils.spToPx +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.textHeight import kotlinx.coroutines.CoroutineScope import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/LayoutProgressListener.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/LayoutProgressListener.kt similarity index 73% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/LayoutProgressListener.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/LayoutProgressListener.kt index a8fd0235f..6e1908873 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/LayoutProgressListener.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/LayoutProgressListener.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider -import io.legato.kazusa.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.TextPage interface LayoutProgressListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextChapterLayout.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextChapterLayout.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextChapterLayout.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/TextChapterLayout.kt index 29fba8995..bb6a4101a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextChapterLayout.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextChapterLayout.kt @@ -1,34 +1,34 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider import android.graphics.Paint import android.text.Layout import android.text.StaticLayout import android.text.TextPaint import android.util.Size -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.AppPattern.noWordCountRegex -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.BookContent -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.getBookSource -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.entities.TextChapter -import io.legato.kazusa.ui.book.read.page.entities.TextLine -import io.legato.kazusa.ui.book.read.page.entities.TextPage -import io.legato.kazusa.ui.book.read.page.entities.column.ImageColumn -import io.legato.kazusa.ui.book.read.page.entities.column.TextColumn -import io.legato.kazusa.utils.StringUtils -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.fastSum -import io.legato.kazusa.utils.getTextWidthsCompat -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern +import io.legado.app.constant.AppPattern.noWordCountRegex +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.BookContent +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.getBookSource +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.model.ImageProvider +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.entities.TextChapter +import io.legado.app.ui.book.read.page.entities.TextLine +import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.column.ImageColumn +import io.legado.app.ui.book.read.page.entities.column.TextColumn +import io.legado.app.utils.StringUtils +import io.legado.app.utils.dpToPx +import io.legado.app.utils.fastSum +import io.legado.app.utils.getTextWidthsCompat +import io.legado.app.utils.splitNotBlank import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextMeasure.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextMeasure.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextMeasure.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/TextMeasure.kt index b33e69f8e..4c8e51e9b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextMeasure.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextMeasure.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider import android.text.TextPaint import android.util.SparseArray diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextPageFactory.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextPageFactory.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextPageFactory.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/TextPageFactory.kt index e98117476..e261bcc02 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/TextPageFactory.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/TextPageFactory.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider -import io.legato.kazusa.R -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.page.api.DataSource -import io.legato.kazusa.ui.book.read.page.api.PageFactory -import io.legato.kazusa.ui.book.read.page.entities.TextPage +import io.legado.app.R +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.page.api.DataSource +import io.legado.app.ui.book.read.page.api.PageFactory +import io.legado.app.ui.book.read.page.entities.TextPage import splitties.init.appCtx class TextPageFactory(dataSource: DataSource) : PageFactory(dataSource) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ZhLayout.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ZhLayout.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ZhLayout.kt rename to app/src/main/java/io/legado/app/ui/book/read/page/provider/ZhLayout.kt index 491231e47..c84646d71 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/provider/ZhLayout.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ZhLayout.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.read.page.provider +package io.legado.app.ui.book.read.page.provider import android.graphics.Paint import android.graphics.Rect diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/search/BookAdapter.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/search/BookAdapter.kt index e3f2d58f3..36bbd4b4c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/BookAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemSearchHistoryBinding -import io.legato.kazusa.utils.gone +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemSearchHistoryBinding +import io.legado.app.utils.gone class BookAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt b/app/src/main/java/io/legado/app/ui/book/search/HistoryKeyAdapter.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/search/HistoryKeyAdapter.kt index fa2d73425..5f31272e4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/HistoryKeyAdapter.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.SearchKeyword -import io.legato.kazusa.databinding.ItemSearchHistoryBinding -import io.legato.kazusa.ui.widget.anima.explosion_field.ExplosionField +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.SearchKeyword +import io.legado.app.databinding.ItemSearchHistoryBinding +import io.legado.app.ui.widget.anima.explosion_field.ExplosionField import splitties.views.onLongClick class HistoryKeyAdapter(activity: SearchActivity, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt rename to app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt index 284ecd83b..b0bf6a8d7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import android.annotation.SuppressLint import android.content.Context @@ -24,28 +24,28 @@ import androidx.transition.TransitionManager import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.material.search.SearchBar import com.google.android.material.search.SearchView -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.SearchKeyword -import io.legato.kazusa.databinding.ActivityBookSearchBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.book.source.manage.BookSourceActivity -import io.legato.kazusa.utils.applyNavigationBarMargin -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.SearchKeyword +import io.legado.app.databinding.ActivityBookSearchBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.book.source.manage.BookSourceActivity +import io.legado.app.utils.applyNavigationBarMargin +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.putPrefBoolean +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.awaitCancellation diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchAdapter.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/search/SearchAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt index 796262fb7..bc35b5715 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import android.content.Context import android.os.Bundle @@ -6,16 +6,16 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.core.view.isVisible import androidx.recyclerview.widget.DiffUtil -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.databinding.ItemSearchBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.widget.text.AccentBgTextView -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.SearchBook +import io.legado.app.databinding.ItemSearchBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.widget.text.AccentBgTextView +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.visible class SearchAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchScope.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchScope.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/search/SearchScope.kt rename to app/src/main/java/io/legado/app/ui/book/search/SearchScope.kt index a99f41656..7490b62f6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchScope.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchScope.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.splitNotBlank import splitties.init.appCtx /** diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchScopeDialog.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/search/SearchScopeDialog.kt rename to app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt index 1f36517e9..efef86c97 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchScopeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search //import io.legado.app.lib.theme.primaryColor import android.annotation.SuppressLint @@ -8,18 +8,18 @@ import android.view.ViewGroup import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.databinding.DialogSearchScopeBinding -import io.legato.kazusa.databinding.ItemCheckBoxBinding -import io.legato.kazusa.databinding.ItemRadioButtonBinding -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChange -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.constant.AppLog +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.databinding.DialogSearchScopeBinding +import io.legado.app.databinding.ItemCheckBoxBinding +import io.legado.app.databinding.ItemRadioButtonBinding +import io.legado.app.utils.flowWithLifecycleAndDatabaseChange +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchViewModel.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/search/SearchViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt index 332ee26c6..0be104149 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.book.search +package io.legado.app.ui.book.search import android.app.Application import android.os.Handler import android.os.Looper import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.data.entities.SearchKeyword -import io.legato.kazusa.help.book.isNotShelf -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.webBook.SearchModel -import io.legato.kazusa.utils.ConflateLiveData -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.SearchBook +import io.legado.app.data.entities.SearchKeyword +import io.legado.app.help.book.isNotShelf +import io.legado.app.help.config.AppConfig +import io.legado.app.model.webBook.SearchModel +import io.legado.app.utils.ConflateLiveData +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.mapLatest diff --git a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentActivity.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentActivity.kt rename to app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt index ced2765b2..aac4b5e20 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.searchContent +package io.legado.app.ui.book.searchContent //import io.legado.app.lib.theme.bottomBackground //import io.legado.app.lib.theme.getPrimaryTextColor @@ -15,28 +15,28 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.allViews import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.databinding.ActivitySearchContentBinding -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.ui.widget.recycler.UpLinearLayoutManager -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showSoftInput -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.databinding.ActivitySearchContentBinding +import io.legado.app.help.IntentData +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.ui.widget.recycler.UpLinearLayoutManager +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.invisible +import io.legado.app.utils.observeEvent +import io.legado.app.utils.postEvent +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showSoftInput +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentAdapter.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentAdapter.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentAdapter.kt index d5a24da14..17fb2bb9a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentAdapter.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.book.searchContent +package io.legado.app.ui.book.searchContent //import io.legado.app.lib.theme.accentColor import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.ItemSearchListBinding -import io.legato.kazusa.utils.hexString -import io.legato.kazusa.utils.themeColor +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.ItemSearchListBinding +import io.legado.app.utils.hexString +import io.legado.app.utils.themeColor class SearchContentAdapter(context: Context, val callback: Callback) : diff --git a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentViewModel.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentViewModel.kt index 2df7ec291..f5d774795 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentViewModel.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.book.searchContent +package io.legado.app.ui.book.searchContent import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.ChineseUtils +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.ChineseUtils import kotlinx.coroutines.ensureActive import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchResult.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchResult.kt rename to app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt index 0ceb91508..e1af0a911 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchResult.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.ui.book.searchContent +package io.legado.app.ui.book.searchContent import android.text.Spanned import androidx.core.text.HtmlCompat -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig data class SearchResult( val resultCount: Int = 0, diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugActivity.kt rename to app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt index d1fe58a3b..9874defb5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.debug +package io.legado.app.ui.book.source.debug import android.annotation.SuppressLint import android.os.Bundle @@ -8,24 +8,24 @@ import android.view.View import androidx.activity.viewModels import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.databinding.ActivitySourceDebugBinding -import io.legato.kazusa.help.source.clearExploreKindsCache -import io.legato.kazusa.help.source.exploreKinds -import io.legato.kazusa.lib.dialogs.selector +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.databinding.ActivitySourceDebugBinding +import io.legado.app.help.source.clearExploreKindsCache +import io.legado.app.help.source.exploreKinds +import io.legado.app.lib.dialogs.selector //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.gone +import io.legado.app.utils.launch +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.launch import splitties.views.onClick import splitties.views.onLongClick diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugAdapter.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugAdapter.kt index 402408f1b..dd93b0a59 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.source.debug +package io.legado.app.ui.book.source.debug import android.content.Context import android.view.View import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.ItemLogBinding +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.ItemLogBinding class BookSourceDebugAdapter(context: Context) : RecyclerAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugModel.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugModel.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugModel.kt rename to app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugModel.kt index d9785930c..b7efa3029 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/debug/BookSourceDebugModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.source.debug +package io.legado.app.ui.book.source.debug import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.model.Debug +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.model.Debug class BookSourceDebugModel(application: Application) : BaseViewModel(application), Debug.Callback { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditActivity.kt rename to app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index f2643e5c8..e110f4293 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.edit +package io.legado.app.ui.book.source.edit import android.content.Intent import android.os.Bundle @@ -9,48 +9,48 @@ import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import com.google.android.material.tabs.TabLayout import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.BookSourceType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.rule.BookInfoRule -import io.legato.kazusa.data.entities.rule.ContentRule -import io.legato.kazusa.data.entities.rule.ExploreRule -import io.legato.kazusa.data.entities.rule.SearchRule -import io.legato.kazusa.data.entities.rule.TocRule -import io.legato.kazusa.databinding.ActivityBookSourceEditBinding -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.BookSourceType +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.rule.BookInfoRule +import io.legado.app.data.entities.rule.ContentRule +import io.legado.app.data.entities.rule.ExploreRule +import io.legado.app.data.entities.rule.SearchRule +import io.legado.app.data.entities.rule.TocRule +import io.legado.app.databinding.ActivityBookSourceEditBinding +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.book.search.SearchScope -import io.legato.kazusa.ui.book.source.debug.BookSourceDebugActivity -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.dialog.UrlOptionDialog -import io.legato.kazusa.ui.widget.dialog.VariableDialog -import io.legato.kazusa.ui.widget.keyboard.KeyboardToolPop -import io.legato.kazusa.ui.widget.recycler.NoChildScrollLinearLayoutManager -import io.legato.kazusa.ui.widget.text.EditEntity -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.imeHeight -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.navigationBarHeight -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.shareWithQr -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.book.search.SearchScope +import io.legado.app.ui.book.source.debug.BookSourceDebugActivity +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.dialog.UrlOptionDialog +import io.legado.app.ui.widget.dialog.VariableDialog +import io.legado.app.ui.widget.keyboard.KeyboardToolPop +import io.legado.app.ui.widget.recycler.NoChildScrollLinearLayoutManager +import io.legado.app.ui.widget.text.EditEntity +import io.legado.app.utils.GSON +import io.legado.app.utils.imeHeight +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.launch +import io.legado.app.utils.navigationBarHeight +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.share +import io.legado.app.utils.shareWithQr +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt index 05da69894..b5b65be0a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.edit +package io.legado.app.ui.book.source.edit import android.annotation.SuppressLint import android.text.Editable @@ -7,13 +7,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ItemSourceEditBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.widget.code.addJsPattern -import io.legato.kazusa.ui.widget.code.addJsonPattern -import io.legato.kazusa.ui.widget.code.addLegadoPattern -import io.legato.kazusa.ui.widget.text.EditEntity +import io.legado.app.R +import io.legado.app.databinding.ItemSourceEditBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.widget.code.addJsPattern +import io.legado.app.ui.widget.code.addJsonPattern +import io.legado.app.ui.widget.code.addLegadoPattern +import io.legado.app.ui.widget.text.EditEntity class BookSourceEditAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt index a1199a45f..a629f497d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/edit/BookSourceEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt @@ -1,31 +1,31 @@ -package io.legato.kazusa.ui.book.source.edit +package io.legado.app.ui.book.source.edit import android.app.Application import android.content.Intent -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.RuleComplete -import io.legato.kazusa.help.config.SourceConfig -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.http.newCallStrResponse -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.help.source.clearExploreKindsCache -import io.legato.kazusa.help.storage.ImportOldData -import io.legato.kazusa.model.SharedJsScope -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getClipText -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.isJsonObject -import io.legato.kazusa.utils.jsonPath -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.RuleComplete +import io.legado.app.help.config.SourceConfig +import io.legado.app.help.http.CookieStore +import io.legado.app.help.http.newCallStrResponse +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.source.SourceHelp +import io.legado.app.help.source.clearExploreKindsCache +import io.legado.app.help.storage.ImportOldData +import io.legado.app.model.SharedJsScope +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getClipText +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.isJsonObject +import io.legado.app.utils.jsonPath +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceActivity.kt rename to app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 2ed7912a5..ee0d52ece 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.manage +package io.legado.app.ui.book.source.manage import android.annotation.SuppressLint import android.os.Bundle @@ -19,54 +19,54 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.ItemTouchHelper import com.google.android.material.snackbar.Snackbar -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.databinding.ActivityBookSourceBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.databinding.ActivityBookSourceBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.model.CheckSource -import io.legato.kazusa.model.Debug -import io.legato.kazusa.ui.association.ImportBookSourceDialog -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.book.search.SearchScope -import io.legato.kazusa.ui.book.source.debug.BookSourceDebugActivity -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.config.CheckSourceConfig -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChange -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChangeFirst -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.CheckSource +import io.legado.app.model.Debug +import io.legado.app.ui.association.ImportBookSourceDialog +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.book.search.SearchScope +import io.legado.app.ui.book.source.debug.BookSourceDebugActivity +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.config.CheckSourceConfig +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.cnCompare +import io.legado.app.utils.dpToPx +import io.legado.app.utils.flowWithLifecycleAndDatabaseChange +import io.legado.app.utils.flowWithLifecycleAndDatabaseChangeFirst +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.observeEvent +import io.legado.app.utils.sendToClip +import io.legado.app.utils.share +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt index 02eba86d5..dc5649f6c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.manage +package io.legado.app.ui.book.source.manage //import io.legado.app.lib.theme.backgroundColor import android.content.Context @@ -12,20 +12,20 @@ import androidx.core.view.doOnLayout import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.google.android.material.card.MaterialCardView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.databinding.ItemBookSourceBinding -import io.legato.kazusa.model.Debug -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.utils.buildMainHandler -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.databinding.ItemBookSourceBinding +import io.legado.app.model.Debug +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.utils.buildMainHandler +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.startActivity +import io.legado.app.utils.visible import java.util.Collections diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceSort.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceSort.kt similarity index 64% rename from app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceSort.kt rename to app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceSort.kt index dd04e3c10..285ae9a76 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceSort.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceSort.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.manage +package io.legado.app.ui.book.source.manage enum class BookSourceSort { Default, Name, Url, Weight, Update, Enable, Respond diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt index 9630ac0d6..ea1ceed39 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt @@ -1,22 +1,22 @@ -package io.legato.kazusa.ui.book.source.manage +package io.legado.app.ui.book.source.manage import android.app.Application import android.text.TextUtils -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.toBookSource -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.outputStream -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.writeToOutputStream +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.toBookSource +import io.legado.app.help.source.SourceHelp +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.cnCompare +import io.legado.app.utils.outputStream +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.writeToOutputStream import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/source/manage/GroupManageDialog.kt rename to app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt index 4d430e8bb..2dbc5362b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/source/manage/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.source.manage +package io.legado.app.ui.book.source.manage import android.annotation.SuppressLint import android.content.Context @@ -10,22 +10,21 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.appDb -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemGroupManageBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.appDb +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemGroupManageBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.requestInputMethod -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.requestInputMethod +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkAdapter.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/toc/BookmarkAdapter.kt index d002e56b5..e87865915 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.content.Context import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.ItemBookmarkBinding -import io.legato.kazusa.utils.gone +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.ItemBookmarkBinding +import io.legado.app.utils.gone import splitties.views.onClick import splitties.views.onLongClick diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkFragment.kt rename to app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt index 02292896a..a77fdf570 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/BookmarkFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.app.Activity import android.content.Intent @@ -6,18 +6,18 @@ import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Bookmark -import io.legato.kazusa.databinding.FragmentBookmarkBinding -import io.legato.kazusa.ui.book.bookmark.BookmarkDialog -import io.legato.kazusa.ui.widget.recycler.UpLinearLayoutManager -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Bookmark +import io.legado.app.databinding.FragmentBookmarkBinding +import io.legado.app.ui.book.bookmark.BookmarkDialog +import io.legado.app.ui.widget.recycler.UpLinearLayoutManager +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt index 594d4cac4..d2bdae394 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc //import io.legado.app.lib.theme.accentColor import android.content.Context @@ -7,18 +7,18 @@ import android.os.Looper import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.databinding.ItemChapterListBinding -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.theme.ThemeUtils -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.databinding.ItemChapterListBinding +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.theme.ThemeUtils +import io.legado.app.utils.gone +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListFragment.kt rename to app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt index 34dc1d763..b913ef994 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/ChapterListFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.animation.ArgbEvaluator import android.animation.ValueAnimator @@ -20,27 +20,27 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import com.google.android.material.transition.platform.MaterialFadeThrough -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookChapter -import io.legato.kazusa.databinding.FragmentChapterListBinding -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.simulatedTotalChapterNum -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.ui.widget.recycler.UpLinearLayoutManager -import io.legato.kazusa.utils.VibrationUtils -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookChapter +import io.legado.app.databinding.FragmentChapterListBinding +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.simulatedTotalChapterNum +import io.legado.app.model.CacheBook +import io.legado.app.ui.widget.recycler.UpLinearLayoutManager +import io.legado.app.utils.VibrationUtils +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.dpToPx +import io.legado.app.utils.gone +import io.legado.app.utils.observeEvent +import io.legado.app.utils.themeColor +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivity.kt rename to app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt index b776276bc..bb4e664b2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.annotation.SuppressLint import android.content.Intent @@ -13,28 +13,28 @@ import androidx.appcompat.widget.SearchView import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import com.google.android.material.tabs.TabLayout -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ActivityChapterListBinding -import io.legato.kazusa.databinding.DialogDownloadChoiceBinding -import io.legato.kazusa.help.book.isLocalTxt -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.model.CacheBook +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ActivityChapterListBinding +import io.legado.app.databinding.DialogDownloadChoiceBinding +import io.legado.app.help.book.isLocalTxt +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.model.CacheBook //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.toc.rule.TxtTocRuleDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.model.ReadBook +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.toc.rule.TxtTocRuleDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.gone +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible /** * 目录 diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivityResult.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivityResult.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivityResult.kt rename to app/src/main/java/io/legado/app/ui/book/toc/TocActivityResult.kt index 3331a7821..8cd5d47b0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocActivityResult.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivityResult.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.app.Activity.RESULT_OK import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocViewModel.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/TocViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt index 394dbe8bc..5ca389bbb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/TocViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt @@ -1,23 +1,23 @@ -package io.legato.kazusa.ui.book.toc +package io.legado.app.ui.book.toc import android.app.Application import android.net.Uri import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.localBook.LocalBook -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.createFileIfNotExist -import io.legato.kazusa.utils.openOutputStream -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.writeText +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.exception.NoStackTraceException +import io.legado.app.model.ReadBook +import io.legado.app.model.localBook.LocalBook +import io.legado.app.utils.FileDoc +import io.legado.app.utils.GSON +import io.legado.app.utils.createFileIfNotExist +import io.legado.app.utils.openOutputStream +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.writeText class TocViewModel(application: Application) : BaseViewModel(application) { var bookUrl: String = "" diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleActivity.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleActivity.kt rename to app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleActivity.kt index d5ea5e233..07adc3b77 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc.rule +package io.legado.app.ui.book.toc.rule import android.annotation.SuppressLint import android.os.Bundle @@ -8,34 +8,34 @@ import androidx.activity.viewModels import androidx.appcompat.widget.PopupMenu import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.databinding.ActivityTxtTocRuleBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.databinding.ActivityTxtTocRuleBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.association.ImportTxtTocRuleDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.association.ImportTxtTocRuleDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.readText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt index 291085b21..0ede64f68 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc.rule +package io.legado.app.ui.book.toc.rule import android.content.Context import android.os.Bundle @@ -8,14 +8,14 @@ import android.widget.PopupMenu import androidx.core.os.bundleOf import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.databinding.ItemTxtTocRuleBinding +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.databinding.ItemTxtTocRuleBinding //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback class TxtTocRuleAdapter(context: Context, private val callBack: CallBack) : RecyclerAdapter(context), diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleDialog.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleDialog.kt rename to app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt index 974410f31..391d8d13e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc.rule +package io.legado.app.ui.book.toc.rule import android.annotation.SuppressLint import android.content.Context @@ -13,35 +13,33 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogTocRegexBinding -import io.legato.kazusa.databinding.ItemTocRegexBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogTocRegexBinding +import io.legado.app.databinding.ItemTocRegexBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.association.ImportTxtTocRuleDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.association.ImportTxtTocRuleDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.readText +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleEditDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleEditDialog.kt rename to app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleEditDialog.kt index dc041ef04..a3a26e473 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleEditDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.book.toc.rule +package io.legado.app.ui.book.toc.rule import android.app.Application import android.os.Bundle @@ -7,17 +7,17 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.databinding.DialogTocRegexEditBinding -import io.legato.kazusa.exception.NoStackTraceException +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.databinding.DialogTocRegexEditBinding +import io.legado.app.exception.NoStackTraceException //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers import java.util.regex.Pattern import java.util.regex.PatternSyntaxException diff --git a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleViewModel.kt index a78eeae25..fd3597fde 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/toc/rule/TxtTocRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.book.toc.rule +package io.legado.app.ui.book.toc.rule import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.TxtTocRule -import io.legato.kazusa.help.DefaultData +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.TxtTocRule +import io.legado.app.help.DefaultData class TxtTocRuleViewModel(app: Application) : BaseViewModel(app) { diff --git a/app/src/main/java/io/legato/kazusa/ui/browser/WebViewActivity.kt b/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/browser/WebViewActivity.kt rename to app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt index e4c5a9834..b4c848e13 100644 --- a/app/src/main/java/io/legato/kazusa/ui/browser/WebViewActivity.kt +++ b/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.browser +package io.legado.app.ui.browser import android.annotation.SuppressLint import android.content.pm.ActivityInfo @@ -19,32 +19,32 @@ import android.webkit.WebViewClient import androidx.activity.addCallback import androidx.activity.viewModels import androidx.core.view.size -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.ActivityWebViewBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.help.source.SourceVerificationHelp -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppConst +import io.legado.app.databinding.ActivityWebViewBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.http.CookieStore +import io.legado.app.help.source.SourceVerificationHelp +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.model.Download -import io.legato.kazusa.ui.association.OnLineImportActivity -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.keepScreenOn -import io.legato.kazusa.utils.longSnackbar -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.setDarkeningAllowed -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toggleSystemBar -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.model.Download +import io.legado.app.ui.association.OnLineImportActivity +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.keepScreenOn +import io.legado.app.utils.longSnackbar +import io.legado.app.utils.openUrl +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setDarkeningAllowed +import io.legado.app.utils.startActivity +import io.legado.app.utils.toggleSystemBar +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import java.net.URLDecoder -import io.legato.kazusa.help.http.CookieManager as AppCookieManager +import io.legado.app.help.http.CookieManager as AppCookieManager class WebViewActivity : VMBaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/browser/WebViewModel.kt b/app/src/main/java/io/legado/app/ui/browser/WebViewModel.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/browser/WebViewModel.kt rename to app/src/main/java/io/legado/app/ui/browser/WebViewModel.kt index 6612287e9..cc740137e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/browser/WebViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/browser/WebViewModel.kt @@ -1,24 +1,24 @@ -package io.legato.kazusa.ui.browser +package io.legado.app.ui.browser import android.app.Application import android.content.Intent import android.util.Base64 import android.webkit.URLUtil import android.webkit.WebView -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst.imagePathKey -import io.legato.kazusa.constant.SourceType -import io.legato.kazusa.data.appDb -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.help.source.SourceVerificationHelp -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.ImageSaveUtils -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst.imagePathKey +import io.legado.app.constant.SourceType +import io.legado.app.data.appDb +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.source.SourceHelp +import io.legado.app.help.source.SourceVerificationHelp +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.ACache +import io.legado.app.utils.ImageSaveUtils +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.toastOnUi import org.apache.commons.text.StringEscapeUtils class WebViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/config/BackupConfigFragment.kt rename to app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index 8d819846c..a69495960 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.content.Context import android.content.SharedPreferences @@ -15,37 +15,37 @@ import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceManager -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogWebdavAuthBinding -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.AppWebDav.testWebDav -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.storage.Backup -import io.legato.kazusa.help.storage.BackupConfig -import io.legato.kazusa.help.storage.ImportOldData -import io.legato.kazusa.help.storage.Restore -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.lib.prefs.fragment.PreferenceFragment -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.FileDoc -import io.legato.kazusa.utils.checkWrite -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.toEditable -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogWebdavAuthBinding +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.AppWebDav.testWebDav +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.storage.Backup +import io.legado.app.help.storage.BackupConfig +import io.legado.app.help.storage.ImportOldData +import io.legado.app.help.storage.Restore +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.lib.prefs.fragment.PreferenceFragment +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.FileDoc +import io.legado.app.utils.checkWrite +import io.legado.app.utils.getPrefString +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.launch +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.toEditable +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job @@ -123,7 +123,7 @@ class BackupConfigFragment : PreferenceFragment(), upPreferenceSummary(PreferKey.webDavDir, AppConfig.webDavDir) upPreferenceSummary(PreferKey.webDavDeviceName, AppConfig.webDavDeviceName) upPreferenceSummary(PreferKey.backupPath, getPrefString(PreferKey.backupPath)) - findPreference("web_dav_restore") + findPreference("web_dav_restore") ?.onLongClick { restoreFromLocal() true diff --git a/app/src/main/java/io/legato/kazusa/ui/config/CheckSourceConfig.kt b/app/src/main/java/io/legado/app/ui/config/CheckSourceConfig.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/config/CheckSourceConfig.kt rename to app/src/main/java/io/legado/app/ui/config/CheckSourceConfig.kt index b92df9577..619df83b6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/CheckSourceConfig.kt +++ b/app/src/main/java/io/legado/app/ui/config/CheckSourceConfig.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.os.Bundle import android.view.View -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogCheckSourceConfigBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogCheckSourceConfigBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.CheckSource -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.CheckSource +import io.legado.app.utils.putPrefString +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick class CheckSourceConfig : BaseBottomSheetDialogFragment(R.layout.dialog_check_source_config) { diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/config/ConfigActivity.kt rename to app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt index d3688173d..98424c4e6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ConfigActivity.kt +++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.os.Bundle import androidx.activity.viewModels import androidx.fragment.app.Fragment -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.databinding.ActivityConfigBinding -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.databinding.ActivityConfigBinding +import io.legado.app.utils.viewbindingdelegate.viewBinding class ConfigActivity : VMBaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ConfigTag.kt b/app/src/main/java/io/legado/app/ui/config/ConfigTag.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/config/ConfigTag.kt rename to app/src/main/java/io/legado/app/ui/config/ConfigTag.kt index 64e949b0d..11b1c03a6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ConfigTag.kt +++ b/app/src/main/java/io/legado/app/ui/config/ConfigTag.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config object ConfigTag { diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ConfigViewModel.kt b/app/src/main/java/io/legado/app/ui/config/ConfigViewModel.kt similarity index 76% rename from app/src/main/java/io/legato/kazusa/ui/config/ConfigViewModel.kt rename to app/src/main/java/io/legado/app/ui/config/ConfigViewModel.kt index 8a86ace70..fa6372c2d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ConfigViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/config/ConfigViewModel.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.app.Application import android.content.Context -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.restart -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.utils.FileUtils +import io.legado.app.utils.restart +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.delay import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/ui/config/CoverConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/config/CoverConfigFragment.kt rename to app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt index a79822b5c..04c7b8e46 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/CoverConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.annotation.SuppressLint import android.content.SharedPreferences @@ -6,14 +6,14 @@ import android.net.Uri import android.os.Bundle import android.view.View import androidx.preference.Preference -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.lib.prefs.SwitchPreference -import io.legato.kazusa.lib.prefs.fragment.PreferenceFragment +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.lib.dialogs.selector +import io.legado.app.lib.prefs.SwitchPreference +import io.legado.app.lib.prefs.fragment.PreferenceFragment //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.utils.* +import io.legado.app.model.BookCover +import io.legado.app.utils.* import splitties.init.appCtx import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/ui/config/CoverRuleConfigDialog.kt b/app/src/main/java/io/legado/app/ui/config/CoverRuleConfigDialog.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/config/CoverRuleConfigDialog.kt rename to app/src/main/java/io/legado/app/ui/config/CoverRuleConfigDialog.kt index 6ffb75b9e..ad901e2c4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/CoverRuleConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/config/CoverRuleConfigDialog.kt @@ -1,20 +1,17 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.os.Bundle import android.util.Log import android.view.View -import android.view.ViewGroup import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.databinding.DialogCoverRuleConfigBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogCoverRuleConfigBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.model.BookCover +import io.legado.app.utils.GSON +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/config/DirectLinkUploadConfig.kt b/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/config/DirectLinkUploadConfig.kt rename to app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt index c2ef8bd45..9216d248a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/DirectLinkUploadConfig.kt +++ b/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt @@ -1,23 +1,23 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.os.Bundle import android.view.MenuItem import android.view.View import androidx.appcompat.widget.Toolbar -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.databinding.DialogDirectLinkUploadConfigBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogDirectLinkUploadConfigBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getClipText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.GSON +import io.legado.app.utils.applyTint +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getClipText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx import splitties.views.onClick diff --git a/app/src/main/java/io/legato/kazusa/ui/config/OtherConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/config/OtherConfigFragment.kt rename to app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt index b6afd6b90..b552f1bc4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/OtherConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config //import io.legado.app.lib.theme.primaryColor import android.annotation.SuppressLint @@ -16,31 +16,31 @@ import androidx.fragment.app.activityViewModels import androidx.preference.ListPreference import androidx.preference.Preference import com.jeremyliao.liveeventbus.LiveEventBus -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.AppFreezeMonitor -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.lib.prefs.fragment.PreferenceFragment -import io.legato.kazusa.model.CheckSource -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.receiver.SharedReceiverActivity -import io.legato.kazusa.service.WebService -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.utils.FirebaseManager -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.removePref -import io.legato.kazusa.utils.restart -import io.legato.kazusa.utils.showDialogFragment +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.AppFreezeMonitor +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.lib.prefs.fragment.PreferenceFragment +import io.legado.app.model.CheckSource +import io.legado.app.model.ImageProvider +import io.legado.app.receiver.SharedReceiverActivity +import io.legado.app.service.WebService +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.utils.FirebaseManager +import io.legado.app.utils.LogUtils +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.postEvent +import io.legado.app.utils.putPrefBoolean +import io.legado.app.utils.putPrefString +import io.legado.app.utils.removePref +import io.legado.app.utils.restart +import io.legado.app.utils.showDialogFragment import splitties.init.appCtx /** diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ReadConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ReadConfigFragment.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/config/ReadConfigFragment.kt rename to app/src/main/java/io/legado/app/ui/config/ReadConfigFragment.kt index 2dbf92f1d..e8677ba4a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ReadConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ReadConfigFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.annotation.SuppressLint import android.content.SharedPreferences @@ -7,20 +7,20 @@ import android.view.View import android.view.ViewConfiguration import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ReadBookConfig -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.read.config.PageKeyDialog -import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.removePref +import io.legado.app.R +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ReadBookConfig +import io.legado.app.model.ReadBook +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.read.config.PageKeyDialog +import io.legado.app.ui.book.read.page.provider.ChapterProvider +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.postEvent +import io.legado.app.utils.removePref class ReadConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/config/ThemeConfigFragment.kt rename to app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt index 5b09571bf..6663e729c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ThemeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config //import io.legado.app.lib.theme.primaryColor import android.annotation.SuppressLint @@ -14,42 +14,42 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.google.android.material.color.DynamicColors import com.google.android.material.color.DynamicColorsOptions -import io.legato.kazusa.R -import io.legato.kazusa.base.AppContextWrapper -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogImageBlurringBinding -import io.legato.kazusa.help.LauncherIconHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.lib.prefs.ColorPreference -import io.legato.kazusa.lib.prefs.ImagePreviewPreference -import io.legato.kazusa.lib.prefs.NameListPreference -import io.legato.kazusa.lib.prefs.ThemeCardPreference -import io.legato.kazusa.lib.prefs.ThemeModePreference -import io.legato.kazusa.lib.theme.ThemeStore -import io.legato.kazusa.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.ui.widget.seekbar.SeekBarChangeListener -import io.legato.kazusa.utils.ColorUtils -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.MD5Utils -import io.legato.kazusa.utils.SelectImageContract -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getPrefInt -import io.legato.kazusa.utils.getPrefString -import io.legato.kazusa.utils.inputStream -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.putPrefInt -import io.legato.kazusa.utils.putPrefString -import io.legato.kazusa.utils.readUri -import io.legato.kazusa.utils.removePref -import io.legato.kazusa.utils.restart -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.AppContextWrapper +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogImageBlurringBinding +import io.legado.app.help.LauncherIconHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.ThemeConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.lib.prefs.ColorPreference +import io.legado.app.lib.prefs.ImagePreviewPreference +import io.legado.app.lib.prefs.NameListPreference +import io.legado.app.lib.prefs.ThemeCardPreference +import io.legado.app.lib.prefs.ThemeModePreference +import io.legado.app.lib.theme.ThemeStore +import io.legado.app.lib.theme.primaryColor +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.ui.widget.seekbar.SeekBarChangeListener +import io.legado.app.utils.ColorUtils +import io.legado.app.utils.FileUtils +import io.legado.app.utils.MD5Utils +import io.legado.app.utils.SelectImageContract +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getPrefInt +import io.legado.app.utils.getPrefString +import io.legado.app.utils.inputStream +import io.legado.app.utils.postEvent +import io.legado.app.utils.putPrefInt +import io.legado.app.utils.putPrefString +import io.legado.app.utils.readUri +import io.legado.app.utils.removePref +import io.legado.app.utils.restart +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi import splitties.init.appCtx import java.io.FileOutputStream diff --git a/app/src/main/java/io/legato/kazusa/ui/config/ThemeListDialog.kt b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/config/ThemeListDialog.kt rename to app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt index 2c26e863d..3bca3cd6a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/config/ThemeListDialog.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.config +package io.legado.app.ui.config import android.content.Context import android.os.Bundle @@ -7,18 +7,18 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemThemeConfigBinding -import io.legato.kazusa.help.config.ThemeConfig -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemThemeConfigBinding +import io.legado.app.help.config.ThemeConfig +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding class ThemeListDialog : BaseBottomSheetDialogFragment(R.layout.dialog_recycler_view), Toolbar.OnMenuItemClickListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/DictDialog.kt b/app/src/main/java/io/legado/app/ui/dict/DictDialog.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/dict/DictDialog.kt rename to app/src/main/java/io/legado/app/ui/dict/DictDialog.kt index ac2e6154f..3374a17e9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/DictDialog.kt +++ b/app/src/main/java/io/legado/app/ui/dict/DictDialog.kt @@ -1,20 +1,19 @@ -package io.legato.kazusa.ui.dict +package io.legado.app.ui.dict import android.os.Bundle import android.text.method.LinkMovementMethod import android.view.View import androidx.fragment.app.viewModels -import androidx.transition.TransitionManager import com.google.android.material.tabs.TabLayout -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.databinding.DialogDictBinding -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.setHtml -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.data.entities.DictRule +import io.legado.app.databinding.DialogDictBinding +import io.legado.app.utils.gone +import io.legado.app.utils.setHtml +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible /** * 词典 diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/DictViewModel.kt b/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt similarity index 77% rename from app/src/main/java/io/legato/kazusa/ui/dict/DictViewModel.kt rename to app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt index 63fd525e1..f8c56d3aa 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/DictViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.dict +package io.legado.app.ui.dict import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.help.coroutine.Coroutine +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.help.coroutine.Coroutine class DictViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleActivity.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleActivity.kt rename to app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt index 727203c69..13cba82d8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.dict.rule +package io.legado.app.ui.dict.rule import android.annotation.SuppressLint import android.os.Bundle @@ -9,34 +9,34 @@ import androidx.appcompat.widget.PopupMenu import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.databinding.ActivityDictRuleBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.databinding.ActivityDictRuleBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.association.ImportDictRuleDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.association.ImportDictRuleDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.readText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleAdapter.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleAdapter.kt rename to app/src/main/java/io/legado/app/ui/dict/rule/DictRuleAdapter.kt index 25d7ac3af..f4bbd5dfd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.dict.rule +package io.legado.app.ui.dict.rule import android.content.Context import android.os.Bundle @@ -6,13 +6,13 @@ import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.databinding.ItemDictRuleBinding +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.DictRule +import io.legado.app.databinding.ItemDictRuleBinding //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback class DictRuleAdapter(context: Context, var callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleEditDialog.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleEditDialog.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleEditDialog.kt rename to app/src/main/java/io/legado/app/ui/dict/rule/DictRuleEditDialog.kt index 2675b5531..45e417d16 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleEditDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.dict.rule +package io.legado.app.ui.dict.rule import android.app.Application import android.os.Bundle @@ -8,15 +8,15 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.databinding.DialogDictRuleEditBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.databinding.DialogDictRuleEditBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding class DictRuleEditDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_dict_rule_edit), Toolbar.OnMenuItemClickListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt index bd2953630..e3f8bdbe1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/dict/rule/DictRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.dict.rule +package io.legado.app.ui.dict.rule import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.DictRule -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.DictRule +import io.legado.app.help.DefaultData +import io.legado.app.utils.toastOnUi class DictRuleViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/file/FileManageActivity.kt b/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/file/FileManageActivity.kt rename to app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt index fe4fe4812..f031f9620 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/FileManageActivity.kt +++ b/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.annotation.SuppressLint import android.os.Bundle @@ -11,21 +11,21 @@ import androidx.appcompat.widget.SearchView import androidx.core.content.FileProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.ActivityFileManageBinding -import io.legato.kazusa.databinding.ItemFileBinding -import io.legato.kazusa.databinding.ItemPathPickerBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppConst +import io.legado.app.databinding.ActivityFileManageBinding +import io.legado.app.databinding.ItemFileBinding +import io.legado.app.databinding.ItemPathPickerBinding //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.ui.file.utils.FilePickerIcon -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ConvertUtils -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.openFileUri -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.file.utils.FilePickerIcon +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ConvertUtils +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.openFileUri +import io.legado.app.utils.viewbindingdelegate.viewBinding import java.io.File class FileManageActivity : VMBaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/file/FileManageViewModel.kt b/app/src/main/java/io/legado/app/ui/file/FileManageViewModel.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/file/FileManageViewModel.kt rename to app/src/main/java/io/legado/app/ui/file/FileManageViewModel.kt index d0a66b9b1..5720f373d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/FileManageViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/file/FileManageViewModel.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.app.Application import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.utils.toastOnUi import java.io.File class FileManageViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/file/FilePickerDialog.kt b/app/src/main/java/io/legado/app/ui/file/FilePickerDialog.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/file/FilePickerDialog.kt rename to app/src/main/java/io/legado/app/ui/file/FilePickerDialog.kt index a2522336c..a0a5f401a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/FilePickerDialog.kt +++ b/app/src/main/java/io/legado/app/ui/file/FilePickerDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.annotation.SuppressLint import android.content.DialogInterface @@ -17,26 +17,26 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogFileChooserBinding -import io.legato.kazusa.databinding.ItemFilePickerBinding -import io.legato.kazusa.databinding.ItemPathPickerBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogFileChooserBinding +import io.legado.app.databinding.ItemFilePickerBinding +import io.legado.app.databinding.ItemPathPickerBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.getPrimaryDisabledTextColor //import io.legado.app.lib.theme.getPrimaryTextColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.file.HandleFileContract.Companion.FILE -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.file.HandleFileContract.Companion.FILE +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.FileUtils +import io.legado.app.utils.applyTint +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.setLayout +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/file/FilePickerViewModel.kt b/app/src/main/java/io/legado/app/ui/file/FilePickerViewModel.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/file/FilePickerViewModel.kt rename to app/src/main/java/io/legado/app/ui/file/FilePickerViewModel.kt index 284c16cbd..a480f04c0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/FilePickerViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/file/FilePickerViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.app.Application import android.os.Bundle import android.os.Environment import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.exception.NoStackTraceException +import io.legado.app.utils.toastOnUi import java.io.File class FilePickerViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileActivity.kt b/app/src/main/java/io/legado/app/ui/file/HandleFileActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/file/HandleFileActivity.kt rename to app/src/main/java/io/legado/app/ui/file/HandleFileActivity.kt index effece344..3f291866c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileActivity.kt +++ b/app/src/main/java/io/legado/app/ui/file/HandleFileActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.content.Intent import android.net.Uri @@ -8,23 +8,23 @@ import android.webkit.MimeTypeMap import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.databinding.ActivityTranslucenceBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat -import io.legato.kazusa.utils.checkWrite -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.getJsonArray -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.databinding.ActivityTranslucenceBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.IntentData +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat +import io.legado.app.utils.checkWrite +import io.legado.app.utils.externalFiles +import io.legado.app.utils.getJsonArray +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.launch +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileContract.kt b/app/src/main/java/io/legado/app/ui/file/HandleFileContract.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/file/HandleFileContract.kt rename to app/src/main/java/io/legado/app/ui/file/HandleFileContract.kt index 682fe16b5..fadd4e83b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileContract.kt +++ b/app/src/main/java/io/legado/app/ui/file/HandleFileContract.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.app.Activity.RESULT_OK import android.content.Context import android.content.Intent import android.net.Uri import androidx.activity.result.contract.ActivityResultContract -import io.legato.kazusa.help.IntentData -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.utils.RealPathUtil -import io.legato.kazusa.utils.externalFiles -import io.legato.kazusa.utils.putJson +import io.legado.app.help.IntentData +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.utils.RealPathUtil +import io.legado.app.utils.externalFiles +import io.legado.app.utils.putJson import splitties.init.appCtx @Suppress("unused") diff --git a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileViewModel.kt b/app/src/main/java/io/legado/app/ui/file/HandleFileViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/file/HandleFileViewModel.kt rename to app/src/main/java/io/legado/app/ui/file/HandleFileViewModel.kt index 8d850b245..6eb110db1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/HandleFileViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/file/HandleFileViewModel.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.file +package io.legado.app.ui.file import android.app.Application import android.net.Uri import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.utils.* +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.help.DirectLinkUpload +import io.legado.app.utils.* import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/file/utils/FilePickerIcon.java b/app/src/main/java/io/legado/app/ui/file/utils/FilePickerIcon.java similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/file/utils/FilePickerIcon.java rename to app/src/main/java/io/legado/app/ui/file/utils/FilePickerIcon.java index 446303980..138b2be3e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/file/utils/FilePickerIcon.java +++ b/app/src/main/java/io/legado/app/ui/file/utils/FilePickerIcon.java @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.file.utils; +package io.legado.app.ui.file.utils; /** * Generated by https://github.com/gzu-liyujiang/Image2ByteVar diff --git a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginActivity.kt b/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt similarity index 73% rename from app/src/main/java/io/legato/kazusa/ui/login/SourceLoginActivity.kt rename to app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt index 95a94bdc5..5a43f2196 100644 --- a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginActivity.kt +++ b/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.login +package io.legado.app.ui.login import android.os.Bundle import androidx.activity.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.databinding.ActivitySourceLoginBinding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.BaseSource +import io.legado.app.databinding.ActivitySourceLoginBinding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding class SourceLoginActivity : VMBaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginDialog.kt b/app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/login/SourceLoginDialog.kt rename to app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt index b8fc787f1..6f023689b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginDialog.kt +++ b/app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.login +package io.legado.app.ui.login //import io.legado.app.lib.theme.primaryColor import android.content.DialogInterface @@ -8,25 +8,25 @@ import android.view.View import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import com.script.rhino.runScriptWithContext -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.rule.RowUi -import io.legato.kazusa.databinding.DialogLoginBinding -import io.legato.kazusa.databinding.ItemFilletTextBinding -import io.legato.kazusa.databinding.ItemSourceEditBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.rule.RowUi +import io.legado.app.databinding.DialogLoginBinding +import io.legado.app.databinding.ItemFilletTextBinding +import io.legado.app.databinding.ItemSourceEditBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.utils.GSON +import io.legado.app.utils.applyTint +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.openUrl +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginViewModel.kt b/app/src/main/java/io/legado/app/ui/login/SourceLoginViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/login/SourceLoginViewModel.kt rename to app/src/main/java/io/legado/app/ui/login/SourceLoginViewModel.kt index 26d9f2cbf..73742fd47 100644 --- a/app/src/main/java/io/legato/kazusa/ui/login/SourceLoginViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/login/SourceLoginViewModel.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.login +package io.legado.app.ui.login import android.app.Application import android.content.Intent import com.script.rhino.runScriptWithContext -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.BaseSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.utils.toastOnUi class SourceLoginViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/login/WebViewLoginFragment.kt b/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/login/WebViewLoginFragment.kt rename to app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt index 06a20b383..ef3106c78 100644 --- a/app/src/main/java/io/legato/kazusa/ui/login/WebViewLoginFragment.kt +++ b/app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.login +package io.legado.app.ui.login import android.annotation.SuppressLint import android.graphics.Bitmap @@ -16,19 +16,19 @@ import android.webkit.WebSettings import android.webkit.WebView import android.webkit.WebViewClient import androidx.fragment.app.activityViewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseFragment -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.databinding.FragmentWebViewLoginBinding -import io.legato.kazusa.help.http.CookieStore +import io.legado.app.R +import io.legado.app.base.BaseFragment +import io.legado.app.constant.AppConst +import io.legado.app.data.entities.BaseSource +import io.legado.app.databinding.FragmentWebViewLoginBinding +import io.legado.app.help.http.CookieStore //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.longSnackbar -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.snackbar -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.gone +import io.legado.app.utils.longSnackbar +import io.legado.app.utils.openUrl +import io.legado.app.utils.snackbar +import io.legado.app.utils.viewbindingdelegate.viewBinding class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt rename to app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 5b1da3a51..f94fdcfb7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.main +package io.legado.app.ui.main import android.annotation.SuppressLint import android.content.res.Configuration @@ -26,43 +26,43 @@ import com.google.android.material.bottomnavigation.LabelVisibilityMode import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton import com.google.android.material.navigation.NavigationBarView import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppConst.appInfo -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.ActivityMainBinding -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.storage.Backup -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.about.CrashLogsDialog -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.main.bookshelf.BaseBookshelfFragment -import io.legato.kazusa.ui.main.bookshelf.books.BookshelfFragment1 -import io.legato.kazusa.ui.main.bookshelf.books.BookshelfFragment2 -import io.legato.kazusa.ui.main.bookshelf.books.BookshelfFragment3 -import io.legato.kazusa.ui.main.explore.ExploreFragment -import io.legato.kazusa.ui.main.my.MyFragment -import io.legato.kazusa.ui.main.rss.RssFragment -import io.legato.kazusa.ui.welcome.WelcomeActivity -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.setNavigationBarColorAuto -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.BuildConfig +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppConst.appInfo +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.ActivityMainBinding +import io.legado.app.help.AppWebDav +import io.legado.app.help.book.BookHelp +import io.legado.app.help.config.AppConfig +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.storage.Backup +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.about.CrashLogsDialog +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment +import io.legado.app.ui.main.bookshelf.books.BookshelfFragment1 +import io.legado.app.ui.main.bookshelf.books.BookshelfFragment2 +import io.legado.app.ui.main.bookshelf.books.BookshelfFragment3 +import io.legado.app.ui.main.explore.ExploreFragment +import io.legado.app.ui.main.my.MyFragment +import io.legado.app.ui.main.rss.RssFragment +import io.legado.app.ui.welcome.WelcomeActivity +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.gone +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.observeEvent +import io.legado.app.utils.setNavigationBarColorAuto +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.themeColor +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/main/MainFragmentInterface.kt b/app/src/main/java/io/legado/app/ui/main/MainFragmentInterface.kt similarity index 64% rename from app/src/main/java/io/legato/kazusa/ui/main/MainFragmentInterface.kt rename to app/src/main/java/io/legado/app/ui/main/MainFragmentInterface.kt index 52cec5f28..6b11b08fc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/MainFragmentInterface.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainFragmentInterface.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main +package io.legado.app.ui.main interface MainFragmentInterface { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/MainViewModel.kt b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/main/MainViewModel.kt rename to app/src/main/java/io/legado/app/ui/main/MainViewModel.kt index 05eb3c5e6..b7ac2e888 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/MainViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt @@ -1,32 +1,32 @@ -package io.legato.kazusa.ui.main +package io.legado.app.ui.main import android.app.Application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import androidx.recyclerview.widget.RecyclerView.RecycledViewPool -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.BookType -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.book.addType -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.book.isUpError -import io.legato.kazusa.help.book.removeType -import io.legato.kazusa.help.book.sync -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.CacheBook -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.service.CacheBookService -import io.legato.kazusa.utils.onEachParallel -import io.legato.kazusa.utils.postEvent +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.constant.BookType +import io.legado.app.constant.EventBus +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.help.AppWebDav +import io.legado.app.help.DefaultData +import io.legado.app.help.book.BookHelp +import io.legado.app.help.book.addType +import io.legado.app.help.book.isLocal +import io.legado.app.help.book.isUpError +import io.legado.app.help.book.removeType +import io.legado.app.help.book.sync +import io.legado.app.help.config.AppConfig +import io.legado.app.model.CacheBook +import io.legado.app.model.ReadBook +import io.legado.app.model.webBook.WebBook +import io.legado.app.service.CacheBookService +import io.legado.app.utils.onEachParallel +import io.legado.app.utils.postEvent import kotlinx.coroutines.Job import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BaseBookshelfFragment.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt index 8f8b4f982..f52ea20d1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BaseBookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf +package io.legado.app.ui.main.bookshelf import android.annotation.SuppressLint import android.view.Menu @@ -6,31 +6,31 @@ import android.view.MenuItem import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.lifecycle.LiveData -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.about.AppLogDialog -import io.legato.kazusa.ui.book.cache.CacheActivity -import io.legato.kazusa.ui.book.group.GroupManageDialog -import io.legato.kazusa.ui.book.import.local.ImportBookActivity -import io.legato.kazusa.ui.book.import.remote.RemoteBookActivity -import io.legato.kazusa.ui.book.manage.BookshelfManageActivity -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.main.MainFragmentInterface -import io.legato.kazusa.ui.main.MainViewModel -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.about.AppLogDialog +import io.legado.app.ui.book.cache.CacheActivity +import io.legado.app.ui.book.group.GroupManageDialog +import io.legado.app.ui.book.import.local.ImportBookActivity +import io.legado.app.ui.book.import.remote.RemoteBookActivity +import io.legado.app.ui.book.manage.BookshelfManageActivity +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.main.MainFragmentInterface +import io.legado.app.ui.main.MainViewModel +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.readText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment(layoutId), MainFragmentInterface { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfConfigBottomSheet.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfConfigBottomSheet.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfConfigBottomSheet.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfConfigBottomSheet.kt index 90b928a13..69c89be46 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfConfigBottomSheet.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfConfigBottomSheet.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.main.bookshelf +package io.legado.app.ui.main.bookshelf import android.content.res.Configuration import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import com.google.android.material.chip.Chip -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.databinding.DialogBookshelfConfigBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.main.MainViewModel -import io.legato.kazusa.ui.widget.number.NumberPickerDialog -import io.legato.kazusa.utils.bookshelfLayoutGrid -import io.legato.kazusa.utils.postEvent -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.constant.EventBus +import io.legado.app.databinding.DialogBookshelfConfigBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.main.MainViewModel +import io.legado.app.ui.widget.number.NumberPickerDialog +import io.legado.app.utils.bookshelfLayoutGrid +import io.legado.app.utils.postEvent +import io.legado.app.utils.viewbindingdelegate.viewBinding class BookshelfConfigBottomSheet : BaseBottomSheetDialogFragment(R.layout.dialog_bookshelf_config) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfViewModel.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfViewModel.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt index 5a61f732b..fbab5efcc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/BookshelfViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt @@ -1,30 +1,30 @@ -package io.legato.kazusa.ui.main.bookshelf +package io.legado.app.ui.main.bookshelf import android.app.Application import androidx.lifecycle.MutableLiveData import com.google.gson.stream.JsonWriter -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.http.decompressed -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.help.http.text -import io.legato.kazusa.model.webBook.WebBook -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.fromJsonArray -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.isJsonArray -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.config.AppConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.http.decompressed +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.help.http.text +import io.legado.app.model.webBook.WebBook +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.fromJsonArray +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.isJsonArray +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BooksFragment.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt index d6d07baa4..ae78258c2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BooksFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books +package io.legado.app.ui.main.bookshelf.books //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.primaryColor @@ -17,35 +17,35 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.FragmentBooksBinding -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.book.manga.ReadMangaActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.main.MainViewModel -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BaseBooksAdapter -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BooksAdapterGrid -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BooksAdapterGridCompact -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BooksAdapterGridCover -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BooksAdapterList -import io.legato.kazusa.ui.main.bookshelf.books.styleDefalut.BooksAdapterListCompact -import io.legato.kazusa.utils.bookshelfLayoutGrid -import io.legato.kazusa.utils.bookshelfLayoutMode -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChangeFirst -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.FragmentBooksBinding +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.book.manga.ReadMangaActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.main.MainViewModel +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BaseBooksAdapter +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BooksAdapterGrid +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BooksAdapterGridCompact +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BooksAdapterGridCover +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BooksAdapterList +import io.legado.app.ui.main.bookshelf.books.styleDefalut.BooksAdapterListCompact +import io.legado.app.utils.bookshelfLayoutGrid +import io.legado.app.utils.bookshelfLayoutMode +import io.legado.app.utils.cnCompare +import io.legado.app.utils.flowWithLifecycleAndDatabaseChangeFirst +import io.legado.app.utils.observeEvent +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment1.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment1.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment1.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment1.kt index 5fc18285e..0704c93a5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment1.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment1.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.main.bookshelf.books +package io.legado.app.ui.main.bookshelf.books import android.annotation.SuppressLint import android.os.Bundle @@ -10,18 +10,18 @@ import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.FragmentBookshelf1Binding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.group.GroupEditDialog -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.main.bookshelf.BaseBookshelfFragment -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.FragmentBookshelf1Binding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.group.GroupEditDialog +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlin.collections.set /** diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt index a7630d505..6801c9d3a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books +package io.legado.app.ui.main.bookshelf.books import android.annotation.SuppressLint import android.content.Intent @@ -13,37 +13,37 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.FragmentBookshelf2Binding -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.group.GroupEditDialog -import io.legato.kazusa.ui.book.info.BookInfoActivity -import io.legato.kazusa.ui.book.manga.ReadMangaActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.main.bookshelf.BaseBookshelfFragment -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BaseBooksAdapter -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BooksAdapterGrid -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BooksAdapterGridCompact -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BooksAdapterGridCover -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BooksAdapterList -import io.legato.kazusa.ui.main.bookshelf.books.styleFold.BooksAdapterListCompact -import io.legato.kazusa.utils.bookshelfLayoutGrid -import io.legato.kazusa.utils.bookshelfLayoutMode -import io.legato.kazusa.utils.cnCompare -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChangeFirst -import io.legato.kazusa.utils.observeEvent -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.constant.EventBus +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.FragmentBookshelf2Binding +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.group.GroupEditDialog +import io.legado.app.ui.book.info.BookInfoActivity +import io.legado.app.ui.book.manga.ReadMangaActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment +import io.legado.app.ui.main.bookshelf.books.styleFold.BaseBooksAdapter +import io.legado.app.ui.main.bookshelf.books.styleFold.BooksAdapterGrid +import io.legado.app.ui.main.bookshelf.books.styleFold.BooksAdapterGridCompact +import io.legado.app.ui.main.bookshelf.books.styleFold.BooksAdapterGridCover +import io.legado.app.ui.main.bookshelf.books.styleFold.BooksAdapterList +import io.legado.app.ui.main.bookshelf.books.styleFold.BooksAdapterListCompact +import io.legado.app.utils.bookshelfLayoutGrid +import io.legado.app.utils.bookshelfLayoutMode +import io.legado.app.utils.cnCompare +import io.legado.app.utils.flowWithLifecycleAndDatabaseChangeFirst +import io.legado.app.utils.observeEvent +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment3.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment3.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment3.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment3.kt index 6906f075f..37ad779f9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment3.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment3.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.main.bookshelf.books +package io.legado.app.ui.main.bookshelf.books import android.annotation.SuppressLint import android.os.Bundle @@ -10,15 +10,15 @@ import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayout -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.FragmentBookshelf3Binding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.main.bookshelf.BaseBookshelfFragment -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.FragmentBookshelf3Binding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlin.collections.set /** diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt index 9d77b80d0..1a2d14550 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BaseBooksAdapter.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.view.View import androidx.core.os.bundleOf import androidx.recyclerview.widget.DiffUtil import androidx.viewbinding.ViewBinding -import io.legato.kazusa.base.adapter.DiffRecyclerAdapter -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book +import io.legado.app.base.adapter.DiffRecyclerAdapter +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book abstract class BaseBooksAdapter(context: Context) : DiffRecyclerAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt index 81de31bbc..e1653deae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemBookshelfGridBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemBookshelfGridBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.visible class BooksAdapterGrid(context: Context, private val callBack: CallBack) : BaseBooksAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt index d85101f19..9f412dde7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle import android.view.View import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemBookshelfGridCompactBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemBookshelfGridCompactBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig class BooksAdapterGridCompact(context: Context, private val callBack: CallBack) : BaseBooksAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt index 047381b90..f6a103b95 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle import android.view.View import android.view.ViewGroup -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemBookshelfGridCompactBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemBookshelfGridCompactBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone class BooksAdapterGridCover(context: Context, private val callBack: CallBack) : BaseBooksAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt index 1182400aa..9071b8a73 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.ViewGroup import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemBookshelfListBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.toTimeAgo -import io.legato.kazusa.utils.visible +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemBookshelfListBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.toTimeAgo +import io.legado.app.utils.visible import splitties.views.onLongClick class BooksAdapterList( diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt index 984d26313..7fa432661 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut +package io.legado.app.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle @@ -6,15 +6,15 @@ import android.view.ViewGroup import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.databinding.ItemBookshelfListCompactBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.toTimeAgo -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.Book +import io.legado.app.databinding.ItemBookshelfListCompactBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.toTimeAgo +import io.legado.app.utils.visible import splitties.views.onLongClick class BooksAdapterListCompact( diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt index d7940c9fc..ef6bcbd12 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BaseBooksAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.view.LayoutInflater @@ -7,8 +7,8 @@ import androidx.core.os.bundleOf import androidx.recyclerview.widget.AsyncListDiffer import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup abstract class BaseBooksAdapter( val context: Context, diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt index 9579e29f2..943a0a82d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemBookshelfGridBinding -import io.legato.kazusa.databinding.ItemBookshelfGridGroupBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemBookshelfGridBinding +import io.legado.app.databinding.ItemBookshelfGridGroupBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone import splitties.views.onLongClick @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt index 3e4bf4f57..dbe9c8fe5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemBookshelfGridCompactBinding -import io.legato.kazusa.databinding.ItemBookshelfGridCompactGroupBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemBookshelfGridCompactBinding +import io.legado.app.databinding.ItemBookshelfGridCompactGroupBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone import splitties.views.onLongClick @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt index 7fdeb5598..4537c0576 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemBookshelfGridCompactBinding -import io.legato.kazusa.databinding.ItemBookshelfGridCompactGroupBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemBookshelfGridCompactBinding +import io.legado.app.databinding.ItemBookshelfGridCompactGroupBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone import splitties.views.onLongClick @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt index 8502ffb37..58d988b88 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.os.Bundle import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemBookshelfListBinding -import io.legato.kazusa.databinding.ItemBookshelfListGroupBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.toTimeAgo -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemBookshelfListBinding +import io.legado.app.databinding.ItemBookshelfListGroupBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.toTimeAgo +import io.legado.app.utils.visible import splitties.views.onLongClick @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt index 26216d927..998e254dd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.main.bookshelf.books.styleFold +package io.legado.app.ui.main.bookshelf.books.styleFold import android.content.Context import android.os.Bundle import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookGroup -import io.legato.kazusa.databinding.ItemBookshelfListCompactBinding -import io.legato.kazusa.databinding.ItemBookshelfListCompactGroupBinding -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.toTimeAgo -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookGroup +import io.legado.app.databinding.ItemBookshelfListCompactBinding +import io.legado.app.databinding.ItemBookshelfListCompactGroupBinding +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.gone +import io.legado.app.utils.toTimeAgo +import io.legado.app.utils.visible import splitties.views.onLongClick @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt rename to app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt index 8c43b0398..ab3a4a9de 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt @@ -1,32 +1,31 @@ -package io.legato.kazusa.ui.main.explore +package io.legado.app.ui.main.explore import android.content.Context import android.view.View import android.view.ViewGroup import android.widget.PopupMenu import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.core.view.children import com.google.android.flexbox.FlexboxLayout import com.google.android.material.card.MaterialCardView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.data.entities.rule.ExploreKind -import io.legato.kazusa.databinding.ItemFilletTextBinding -import io.legato.kazusa.databinding.ItemFindBookBinding -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.source.clearExploreKindsCache -import io.legato.kazusa.help.source.exploreKinds -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.removeLastElement -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.data.entities.rule.ExploreKind +import io.legado.app.databinding.ItemFilletTextBinding +import io.legado.app.databinding.ItemFindBookBinding +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.source.clearExploreKindsCache +import io.legado.app.help.source.exploreKinds +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.activity +import io.legado.app.utils.gone +import io.legado.app.utils.removeLastElement +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.startActivity +import io.legado.app.utils.visible import kotlinx.coroutines.CoroutineScope import splitties.views.onLongClick diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreDiffItemCallBack.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreDiffItemCallBack.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreDiffItemCallBack.kt rename to app/src/main/java/io/legado/app/ui/main/explore/ExploreDiffItemCallBack.kt index cf69402e7..164da8bc0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreDiffItemCallBack.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreDiffItemCallBack.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.main.explore +package io.legado.app.ui.main.explore import androidx.recyclerview.widget.DiffUtil -import io.legato.kazusa.data.entities.BookSourcePart +import io.legado.app.data.entities.BookSourcePart class ExploreDiffItemCallBack : DiffUtil.ItemCallback() { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt rename to app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt index a90fe7741..39f1c5bc1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.explore +package io.legado.app.ui.main.explore //import io.legado.app.lib.theme.primaryColor //import io.legado.app.lib.theme.primaryTextColor @@ -19,24 +19,24 @@ import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionManager import com.google.android.material.search.SearchBar import com.google.android.material.search.SearchView -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.databinding.FragmentExploreBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.book.explore.ExploreShowActivity -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.ui.book.search.SearchScope -import io.legato.kazusa.ui.book.source.edit.BookSourceEditActivity -import io.legato.kazusa.ui.main.MainFragmentInterface -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChange -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.databinding.FragmentExploreBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.book.explore.ExploreShowActivity +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.ui.book.search.SearchScope +import io.legado.app.ui.book.source.edit.BookSourceEditActivity +import io.legado.app.ui.main.MainFragmentInterface +import io.legado.app.utils.flowWithLifecycleAndDatabaseChange +import io.legado.app.utils.startActivity +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreViewModel.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreViewModel.kt similarity index 69% rename from app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreViewModel.kt rename to app/src/main/java/io/legado/app/ui/main/explore/ExploreViewModel.kt index b98593539..41e2e3230 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreViewModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.main.explore +package io.legado.app.ui.main.explore import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.BookSourcePart -import io.legato.kazusa.help.source.SourceHelp +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.BookSourcePart +import io.legado.app.help.source.SourceHelp class ExploreViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/my/MyFragment.kt b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt similarity index 78% rename from app/src/main/java/io/legato/kazusa/ui/main/my/MyFragment.kt rename to app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt index 93db8d257..74fd8288f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/my/MyFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.my +package io.legado.app.ui.main.my import android.content.SharedPreferences import android.os.Bundle @@ -6,36 +6,36 @@ import android.view.Menu import android.view.MenuItem import android.view.View import androidx.preference.Preference -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseFragment -import io.legato.kazusa.constant.EventBus -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.FragmentMyConfigBinding -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.lib.prefs.SwitchPreference -import io.legato.kazusa.lib.prefs.fragment.PreferenceFragment +import io.legado.app.R +import io.legado.app.base.BaseFragment +import io.legado.app.constant.EventBus +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.FragmentMyConfigBinding +import io.legado.app.lib.dialogs.selector +import io.legado.app.lib.prefs.SwitchPreference +import io.legado.app.lib.prefs.fragment.PreferenceFragment //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.service.WebService -import io.legato.kazusa.ui.about.AboutActivity -import io.legato.kazusa.ui.about.ReadRecordActivity -import io.legato.kazusa.ui.book.bookmark.AllBookmarkActivity -import io.legato.kazusa.ui.book.source.manage.BookSourceActivity -import io.legato.kazusa.ui.book.toc.rule.TxtTocRuleActivity -import io.legato.kazusa.ui.config.ConfigActivity -import io.legato.kazusa.ui.config.ConfigTag -import io.legato.kazusa.ui.dict.rule.DictRuleActivity -import io.legato.kazusa.ui.file.FileManageActivity -import io.legato.kazusa.ui.main.MainFragmentInterface -import io.legato.kazusa.ui.replace.ReplaceRuleActivity -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.getPrefBoolean -import io.legato.kazusa.utils.observeEventSticky -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.putPrefBoolean -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.service.WebService +import io.legado.app.ui.about.AboutActivity +import io.legado.app.ui.about.ReadRecordActivity +import io.legado.app.ui.book.bookmark.AllBookmarkActivity +import io.legado.app.ui.book.source.manage.BookSourceActivity +import io.legado.app.ui.book.toc.rule.TxtTocRuleActivity +import io.legado.app.ui.config.ConfigActivity +import io.legado.app.ui.config.ConfigTag +import io.legado.app.ui.dict.rule.DictRuleActivity +import io.legado.app.ui.file.FileManageActivity +import io.legado.app.ui.main.MainFragmentInterface +import io.legado.app.ui.replace.ReplaceRuleActivity +import io.legado.app.utils.LogUtils +import io.legado.app.utils.getPrefBoolean +import io.legado.app.utils.observeEventSticky +import io.legado.app.utils.openUrl +import io.legado.app.utils.putPrefBoolean +import io.legado.app.utils.sendToClip +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding class MyFragment() : BaseFragment(R.layout.fragment_my_config), MainFragmentInterface { diff --git a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssAdapter.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/main/rss/RssAdapter.kt rename to app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt index 3630524a8..71b04d480 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.rss +package io.legado.app.ui.main.rss import android.content.Context import android.view.View @@ -7,13 +7,13 @@ import androidx.appcompat.widget.PopupMenu import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import com.bumptech.glide.request.RequestOptions -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.ItemRssBinding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.ItemRssBinding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader import splitties.views.onLongClick class RssAdapter( diff --git a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt rename to app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt index e02a4c155..e9ae2fcdb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.main.rss +package io.legado.app.ui.main.rss import android.os.Bundle import android.transition.TransitionManager @@ -14,29 +14,29 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import com.google.android.material.search.SearchBar import com.google.android.material.search.SearchView -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.AppDatabase -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.FragmentRssBinding -import io.legato.kazusa.databinding.ItemRssBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.AppDatabase +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.FragmentRssBinding +import io.legado.app.databinding.ItemRssBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor //import io.legado.app.lib.theme.primaryTextColor -import io.legato.kazusa.ui.main.MainFragmentInterface -import io.legato.kazusa.ui.rss.article.RssSortActivity -import io.legato.kazusa.ui.rss.favorites.RssFavoritesActivity -import io.legato.kazusa.ui.rss.read.ReadRssActivity -import io.legato.kazusa.ui.rss.source.edit.RssSourceEditActivity -import io.legato.kazusa.ui.rss.source.manage.RssSourceActivity -import io.legato.kazusa.ui.rss.subscription.RuleSubActivity -import io.legato.kazusa.utils.flowWithLifecycleAndDatabaseChange -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.main.MainFragmentInterface +import io.legado.app.ui.rss.article.RssSortActivity +import io.legado.app.ui.rss.favorites.RssFavoritesActivity +import io.legado.app.ui.rss.read.ReadRssActivity +import io.legado.app.ui.rss.source.edit.RssSourceEditActivity +import io.legado.app.ui.rss.source.manage.RssSourceActivity +import io.legado.app.ui.rss.subscription.RuleSubActivity +import io.legado.app.utils.flowWithLifecycleAndDatabaseChange +import io.legado.app.utils.openUrl +import io.legado.app.utils.startActivity +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssViewModel.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/main/rss/RssViewModel.kt rename to app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt index b55f2108b..ace716925 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.main.rss +package io.legado.app.ui.main.rss import android.app.Application import com.script.rhino.runScriptWithContext -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.help.source.SourceHelp +import io.legado.app.utils.toastOnUi class RssViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeActivity.kt b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeActivity.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeActivity.kt rename to app/src/main/java/io/legado/app/ui/qrcode/QrCodeActivity.kt index 35e2fcfe4..6119e17d4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.qrcode +package io.legado.app.ui.qrcode import android.content.Intent import android.graphics.BitmapFactory @@ -6,14 +6,14 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import com.google.zxing.Result -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.databinding.ActivityQrcodeCaptureBinding -import io.legato.kazusa.utils.QRCodeUtils -import io.legato.kazusa.utils.SelectImageContract -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readBytes -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseActivity +import io.legado.app.databinding.ActivityQrcodeCaptureBinding +import io.legado.app.utils.QRCodeUtils +import io.legado.app.utils.SelectImageContract +import io.legado.app.utils.launch +import io.legado.app.utils.readBytes +import io.legado.app.utils.viewbindingdelegate.viewBinding class QrCodeActivity : BaseActivity(), ScanResultCallback { diff --git a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeFragment.kt b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeFragment.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeFragment.kt rename to app/src/main/java/io/legado/app/ui/qrcode/QrCodeFragment.kt index 585d2fc8e..8f661d5d9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeFragment.kt +++ b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.qrcode +package io.legado.app.ui.qrcode import com.google.zxing.Result import com.king.camera.scan.AnalyzeResult diff --git a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeResult.kt b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeResult.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeResult.kt rename to app/src/main/java/io/legado/app/ui/qrcode/QrCodeResult.kt index eaef43673..d93184ca3 100644 --- a/app/src/main/java/io/legato/kazusa/ui/qrcode/QrCodeResult.kt +++ b/app/src/main/java/io/legado/app/ui/qrcode/QrCodeResult.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.qrcode +package io.legado.app.ui.qrcode import android.app.Activity.RESULT_OK import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/ui/qrcode/ScanResultCallback.kt b/app/src/main/java/io/legado/app/ui/qrcode/ScanResultCallback.kt similarity index 76% rename from app/src/main/java/io/legato/kazusa/ui/qrcode/ScanResultCallback.kt rename to app/src/main/java/io/legado/app/ui/qrcode/ScanResultCallback.kt index b0ddb0a34..9cb61d58e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/qrcode/ScanResultCallback.kt +++ b/app/src/main/java/io/legado/app/ui/qrcode/ScanResultCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.qrcode +package io.legado.app.ui.qrcode import com.google.zxing.Result diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/replace/GroupManageDialog.kt rename to app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt index 3f262520d..9f593cc29 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.replace +package io.legado.app.ui.replace import android.annotation.SuppressLint import android.content.Context @@ -10,22 +10,22 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.appDb -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemGroupManageBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.appDb +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemGroupManageBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.requestInputMethod -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.applyTint +import io.legado.app.utils.requestInputMethod +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleActivity.kt rename to app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt index 80e047a8e..8c47f1eae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.replace +package io.legado.app.ui.replace import android.annotation.SuppressLint import android.os.Bundle @@ -13,39 +13,39 @@ import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.databinding.ActivityReplaceRuleBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.help.book.ContentProcessor -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.association.ImportReplaceRuleDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.replace.edit.ReplaceEditActivity -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.databinding.ActivityReplaceRuleBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.help.book.ContentProcessor +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.association.ImportReplaceRuleDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.replace.edit.ReplaceEditActivity +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.GSON +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.readText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleAdapter.kt rename to app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt index 5152e879f..c4a689d4b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.replace +package io.legado.app.ui.replace import android.content.Context import android.os.Bundle @@ -8,14 +8,14 @@ import android.widget.PopupMenu import androidx.core.os.bundleOf import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.databinding.ItemReplaceRuleBinding +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.databinding.ItemReplaceRuleBinding //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback class ReplaceRuleAdapter(context: Context, var callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleViewModel.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleViewModel.kt rename to app/src/main/java/io/legado/app/ui/replace/ReplaceRuleViewModel.kt index 2d14c29c9..f504c8905 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/ReplaceRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleViewModel.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.replace +package io.legado.app.ui.replace import android.app.Application import android.text.TextUtils -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.utils.splitNotBlank +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.utils.splitNotBlank /** * 替换规则数据修改 diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditActivity.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditActivity.kt rename to app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt index 3ec543f67..8ba5071c0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.replace.edit +package io.legado.app.ui.replace.edit import android.content.Context import android.content.Intent @@ -8,18 +8,18 @@ import android.view.MenuItem import android.widget.EditText import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.databinding.ActivityReplaceEditBinding -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.ui.widget.keyboard.KeyboardToolPop -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.imeHeight -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.databinding.ActivityReplaceEditBinding +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.ui.widget.keyboard.KeyboardToolPop +import io.legado.app.utils.GSON +import io.legado.app.utils.imeHeight +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.showHelp +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 编辑替换规则 diff --git a/app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditViewModel.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditViewModel.kt rename to app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditViewModel.kt index 34fb068df..36dc19f1d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/replace/edit/ReplaceEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditViewModel.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.replace.edit +package io.legado.app.ui.replace.edit import android.app.Application import android.content.Intent -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.ReplaceRule -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.utils.* +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.ReplaceRule +import io.legado.app.exception.NoStackTraceException +import io.legado.app.utils.* import kotlinx.coroutines.Dispatchers class ReplaceEditViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/BaseRssArticlesAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/article/BaseRssArticlesAdapter.kt similarity index 70% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/BaseRssArticlesAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/article/BaseRssArticlesAdapter.kt index d9a0c5eae..69eb4ccd6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/BaseRssArticlesAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/BaseRssArticlesAdapter.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.content.Context import androidx.viewbinding.ViewBinding -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RssArticle +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RssArticle abstract class BaseRssArticlesAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/ReadRecordDialog.kt b/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/ReadRecordDialog.kt rename to app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt index cb72f3ef3..be7562926 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/ReadRecordDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.content.Context import android.os.Bundle @@ -8,17 +8,17 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RssReadRecord -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemRssReadRecordBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RssReadRecord +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemRssReadRecordBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding class ReadRecordDialog : BaseDialogFragment(R.layout.dialog_recycler_view), Toolbar.OnMenuItemClickListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt index a547a92ca..547e05205 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.annotation.SuppressLint import android.content.Context @@ -9,16 +9,15 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.ItemRssArticleBinding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.ItemRssArticleBinding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.utils.gone +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible class RssArticlesAdapter(context: Context, callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter1.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter1.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt index ef3d32410..de142b6d0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter1.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter1.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.annotation.SuppressLint import android.content.Context @@ -9,14 +9,14 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.ItemRssArticle1Binding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.ItemRssArticle1Binding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.utils.gone +import io.legado.app.utils.visible class RssArticlesAdapter1(context: Context, callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter2.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter2.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt index 08067026a..2fb6ab6d9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter2.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter2.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.annotation.SuppressLint import android.content.Context @@ -9,16 +9,15 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.ItemRssArticle2Binding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.ItemRssArticle2Binding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.utils.gone +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible class RssArticlesAdapter2(context: Context, callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter3.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter3.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter3.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter3.kt index f0b8be6fc..94533bfa8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesAdapter3.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter3.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.annotation.SuppressLint import android.content.Context @@ -9,15 +9,15 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.ItemRssArticle3Binding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.ItemRssArticle3Binding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.utils.gone +import io.legado.app.utils.themeColor +import io.legado.app.utils.visible class RssArticlesAdapter3(context: Context, callBack: CallBack) : BaseRssArticlesAdapter(context, callBack) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesFragment.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesFragment.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt index 372731e7d..29fd0e4a4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesFragment.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.os.Bundle @@ -12,21 +12,20 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.FragmentRssArticlesBinding -import io.legato.kazusa.databinding.ViewLoadMoreBinding +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.FragmentRssArticlesBinding +import io.legado.app.databinding.ViewLoadMoreBinding //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.rss.read.ReadRssActivity -import io.legato.kazusa.ui.widget.recycler.LoadMoreView -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.rss.read.ReadRssActivity +import io.legado.app.ui.widget.recycler.LoadMoreView +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.cancel diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt index d24627851..18b39c8ba 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssArticlesViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.app.Application import android.os.Bundle import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.model.rss.Rss -import io.legato.kazusa.utils.stackTraceStr +import io.legado.app.base.BaseViewModel +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssSource +import io.legado.app.model.rss.Rss +import io.legado.app.utils.stackTraceStr import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt index cbdcb81e3..4668ef3be 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -14,15 +14,15 @@ import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope import androidx.viewpager2.adapter.FragmentStateAdapter import com.google.android.material.tabs.TabLayoutMediator -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.databinding.ActivityRssArtivlesBinding -import io.legato.kazusa.help.source.sortUrls -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.rss.source.edit.RssSourceEditActivity -import io.legato.kazusa.ui.widget.dialog.VariableDialog -import io.legato.kazusa.utils.* -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.databinding.ActivityRssArtivlesBinding +import io.legado.app.help.source.sortUrls +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.rss.source.edit.RssSourceEditActivity +import io.legado.app.ui.widget.dialog.VariableDialog +import io.legado.app.utils.* +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt index 63a521843..3b9ad8468 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.rss.article +package io.legado.app.ui.rss.article import android.app.Application import android.content.Intent import androidx.lifecycle.MutableLiveData -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssReadRecord -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.help.source.removeSortCache +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssReadRecord +import io.legado.app.data.entities.RssSource +import io.legado.app.help.source.removeSortCache class RssSortViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesActivity.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt index 562891158..1759cd482 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package io.legato.kazusa.ui.rss.favorites +package io.legado.app.ui.rss.favorites import android.os.Bundle import android.view.Menu @@ -10,16 +10,16 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import androidx.lifecycle.lifecycleScope import androidx.viewpager.widget.ViewPager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.databinding.ActivityRssFavoritesBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.databinding.ActivityRssFavoritesBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.utils.gone +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.delay import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt index 2e6d5bd18..f6b5e525b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.favorites +package io.legado.app.ui.rss.favorites import android.content.Context import android.graphics.drawable.Drawable @@ -8,14 +8,14 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RssStar -import io.legato.kazusa.databinding.ItemRssArticleBinding -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RssStar +import io.legado.app.databinding.ItemRssArticleBinding +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.utils.gone +import io.legado.app.utils.visible class RssFavoritesAdapter(context: Context, val callBack: CallBack) : diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesDialog.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesDialog.kt rename to app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt index 56c5fdd1a..5d62237f8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesDialog.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.rss.favorites +package io.legado.app.ui.rss.favorites import android.os.Bundle import android.view.View import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.databinding.DialogRssFavoriteConfigBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.data.entities.RssArticle +import io.legado.app.databinding.DialogRssFavoriteConfigBinding //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding class RssFavoritesDialog() : BaseDialogFragment(R.layout.dialog_rss_favorite_config, true) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesFragment.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesFragment.kt similarity index 79% rename from app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesFragment.kt rename to app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesFragment.kt index fde57faae..246fd646a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesFragment.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.favorites +package io.legado.app.ui.rss.favorites import android.os.Bundle @@ -6,19 +6,19 @@ import android.view.View import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssStar -import io.legato.kazusa.databinding.FragmentRssArticlesBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssStar +import io.legado.app.databinding.FragmentRssArticlesBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.rss.read.ReadRssActivity -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.rss.read.ReadRssActivity +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesViewModel.kt similarity index 58% rename from app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesViewModel.kt index bc56dc8df..bc028698a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/favorites/RssFavoritesViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesViewModel.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.ui.rss.favorites +package io.legado.app.ui.rss.favorites import android.app.Application -import io.legato.kazusa.base.BaseViewModel +import io.legado.app.base.BaseViewModel class RssFavoritesViewModel(application: Application) : BaseViewModel(application) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index efd526f4a..64ff6b5f2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.read +package io.legado.app.ui.rss.read import android.annotation.SuppressLint import android.content.pm.ActivityInfo @@ -27,38 +27,38 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.size import androidx.lifecycle.lifecycleScope import com.script.rhino.runScriptWithContext -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.ActivityRssReadBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.http.CookieManager -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.model.Download -import io.legato.kazusa.ui.association.OnLineImportActivity -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.rss.favorites.RssFavoritesDialog -import io.legato.kazusa.utils.NetworkUtils -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.isTrue -import io.legato.kazusa.utils.keepScreenOn -import io.legato.kazusa.utils.longSnackbar -import io.legato.kazusa.utils.openUrl -import io.legato.kazusa.utils.setDarkeningAllowed -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.textArray -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.toggleSystemBar -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.ActivityRssReadBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.help.http.CookieManager +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.selector +import io.legado.app.model.Download +import io.legado.app.ui.association.OnLineImportActivity +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.rss.favorites.RssFavoritesDialog +import io.legado.app.utils.NetworkUtils +import io.legado.app.utils.gone +import io.legado.app.utils.invisible +import io.legado.app.utils.isTrue +import io.legado.app.utils.keepScreenOn +import io.legado.app.utils.longSnackbar +import io.legado.app.utils.openUrl +import io.legado.app.utils.setDarkeningAllowed +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.share +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.startActivity +import io.legado.app.utils.textArray +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.toggleSystemBar +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.launch import org.apache.commons.text.StringEscapeUtils import org.jsoup.Jsoup diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt index e97b7b4c4..834b68d42 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/read/ReadRssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.read +package io.legado.app.ui.rss.read import android.app.Application import android.content.Intent @@ -7,19 +7,19 @@ import android.webkit.URLUtil import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.script.rhino.runScriptWithContext -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssArticle -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.data.entities.RssStar -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.TTS -import io.legato.kazusa.help.http.newCallResponseBody -import io.legato.kazusa.help.http.okHttpClient -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.rss.Rss -import io.legato.kazusa.utils.ImageSaveUtils -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssArticle +import io.legado.app.data.entities.RssSource +import io.legado.app.data.entities.RssStar +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.TTS +import io.legado.app.help.http.newCallResponseBody +import io.legado.app.help.http.okHttpClient +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.rss.Rss +import io.legado.app.utils.ImageSaveUtils +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import splitties.init.appCtx import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/read/RssJsExtensions.kt b/app/src/main/java/io/legado/app/ui/rss/read/RssJsExtensions.kt similarity index 56% rename from app/src/main/java/io/legato/kazusa/ui/rss/read/RssJsExtensions.kt rename to app/src/main/java/io/legado/app/ui/rss/read/RssJsExtensions.kt index 6d051c9cd..5df98b9b7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/read/RssJsExtensions.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/RssJsExtensions.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.rss.read +package io.legado.app.ui.rss.read -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.help.JsExtensions -import io.legato.kazusa.ui.association.AddToBookshelfDialog -import io.legato.kazusa.ui.book.search.SearchActivity -import io.legato.kazusa.utils.showDialogFragment +import io.legado.app.data.entities.BaseSource +import io.legado.app.help.JsExtensions +import io.legado.app.ui.association.AddToBookshelfDialog +import io.legado.app.ui.book.search.SearchActivity +import io.legado.app.utils.showDialogFragment @Suppress("unused") class RssJsExtensions(private val activity: ReadRssActivity) : JsExtensions { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/read/VisibleWebView.kt b/app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/rss/read/VisibleWebView.kt rename to app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt index 3c7997ffd..0e6e1b40b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/read/VisibleWebView.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.read +package io.legado.app.ui.rss.read import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt index 43566d72e..46131d471 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.debug +package io.legado.app.ui.rss.source.debug import android.os.Bundle import android.view.Menu @@ -6,18 +6,18 @@ import android.view.MenuItem import android.widget.SearchView import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.databinding.ActivitySourceDebugBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.databinding.ActivitySourceDebugBinding //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.dialog.TextDialog -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.dialog.TextDialog +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.gone +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugAdapter.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugAdapter.kt index 4c668a814..dc92e12d6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugAdapter.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.ui.rss.source.debug +package io.legado.app.ui.rss.source.debug import android.content.Context import android.view.View import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.ItemLogBinding +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.ItemLogBinding class RssSourceDebugAdapter(context: Context) : RecyclerAdapter(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugModel.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugModel.kt rename to app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugModel.kt index 1ca350861..b992ab8ca 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/debug/RssSourceDebugModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugModel.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.rss.source.debug +package io.legado.app.ui.rss.source.debug import android.app.Application -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.model.Debug +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.model.Debug class RssSourceDebugModel(application: Application) : BaseViewModel(application), Debug.Callback { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index b7503ed1c..8ad05afcb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.edit +package io.legado.app.ui.rss.source.edit import android.os.Bundle import android.view.Menu @@ -8,38 +8,38 @@ import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import com.google.android.material.tabs.TabLayout import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.ActivityRssSourceEditBinding -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.ActivityRssSourceEditBinding +import io.legado.app.help.config.LocalConfig +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.login.SourceLoginActivity -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.rss.source.debug.RssSourceDebugActivity -import io.legato.kazusa.ui.widget.dialog.UrlOptionDialog -import io.legato.kazusa.ui.widget.dialog.VariableDialog -import io.legato.kazusa.ui.widget.keyboard.KeyboardToolPop -import io.legato.kazusa.ui.widget.text.EditEntity -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.imeHeight -import io.legato.kazusa.utils.isContentScheme -import io.legato.kazusa.utils.isTrue -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.navigationBarHeight -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.shareWithQr -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.login.SourceLoginActivity +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.rss.source.debug.RssSourceDebugActivity +import io.legado.app.ui.widget.dialog.UrlOptionDialog +import io.legado.app.ui.widget.dialog.VariableDialog +import io.legado.app.ui.widget.keyboard.KeyboardToolPop +import io.legado.app.ui.widget.text.EditEntity +import io.legado.app.utils.GSON +import io.legado.app.utils.imeHeight +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.isTrue +import io.legado.app.utils.launch +import io.legado.app.utils.navigationBarHeight +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.share +import io.legado.app.utils.shareWithQr +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt index d26ef0910..3192fa65e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.edit +package io.legado.app.ui.rss.source.edit import android.annotation.SuppressLint import android.text.Editable @@ -7,15 +7,15 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ItemSourceEditBinding -import io.legato.kazusa.databinding.ItemSourceEditCheckBoxBinding -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.widget.code.addJsPattern -import io.legato.kazusa.ui.widget.code.addJsonPattern -import io.legato.kazusa.ui.widget.code.addLegadoPattern -import io.legato.kazusa.ui.widget.text.EditEntity -import io.legato.kazusa.utils.isTrue +import io.legado.app.R +import io.legado.app.databinding.ItemSourceEditBinding +import io.legado.app.databinding.ItemSourceEditCheckBoxBinding +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.widget.code.addJsPattern +import io.legado.app.ui.widget.code.addJsonPattern +import io.legado.app.ui.widget.code.addLegadoPattern +import io.legado.app.ui.widget.text.EditEntity +import io.legado.app.utils.isTrue class RssSourceEditAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt index 710899911..5db8e4b34 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/edit/RssSourceEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt @@ -1,21 +1,21 @@ -package io.legato.kazusa.ui.rss.source.edit +package io.legado.app.ui.rss.source.edit import android.app.Application import android.content.Intent -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppCacheManager -import io.legato.kazusa.help.RuleComplete -import io.legato.kazusa.help.http.CookieStore -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.getClipText -import io.legato.kazusa.utils.printOnDebug -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.R +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppCacheManager +import io.legado.app.help.RuleComplete +import io.legado.app.help.http.CookieStore +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getClipText +import io.legado.app.utils.printOnDebug +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/manage/GroupManageDialog.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt index 39d6b9af4..7d635acaf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.manage +package io.legado.app.ui.rss.source.manage import android.annotation.SuppressLint import android.content.Context @@ -10,23 +10,22 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.appDb -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemGroupManageBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.appDb +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemGroupManageBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.requestInputMethod -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.requestInputMethod +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt index 0e2f699fb..291aa68ef 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.manage +package io.legado.app.ui.rss.source.manage import android.annotation.SuppressLint import android.os.Bundle @@ -11,39 +11,39 @@ import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.SearchView import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper -import io.legato.kazusa.R -import io.legato.kazusa.base.VMBaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.ActivityRssSourceBinding -import io.legato.kazusa.databinding.DialogEditTextBinding -import io.legato.kazusa.help.DirectLinkUpload -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.association.ImportRssSourceDialog -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.qrcode.QrCodeResult -import io.legato.kazusa.ui.rss.source.edit.RssSourceEditActivity -import io.legato.kazusa.ui.widget.SelectActionBar -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.ACache -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.hideSoftInput -import io.legato.kazusa.utils.isAbsUrl -import io.legato.kazusa.utils.launch -import io.legato.kazusa.utils.readText -import io.legato.kazusa.utils.sendToClip -import io.legato.kazusa.utils.share -import io.legato.kazusa.utils.shouldHideSoftInput -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.showHelp -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.transaction -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.ActivityRssSourceBinding +import io.legado.app.databinding.DialogEditTextBinding +import io.legado.app.help.DirectLinkUpload +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.association.ImportRssSourceDialog +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.qrcode.QrCodeResult +import io.legado.app.ui.rss.source.edit.RssSourceEditActivity +import io.legado.app.ui.widget.SelectActionBar +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.ACache +import io.legado.app.utils.dpToPx +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.isAbsUrl +import io.legado.app.utils.launch +import io.legado.app.utils.readText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.share +import io.legado.app.utils.shouldHideSoftInput +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.transaction +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt index 689773257..ef7dd7fe8 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.source.manage +package io.legado.app.ui.rss.source.manage import android.content.Context import android.os.Bundle @@ -8,14 +8,14 @@ import android.widget.PopupMenu import androidx.core.os.bundleOf import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.databinding.ItemRssSourceBinding +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RssSource +import io.legado.app.databinding.ItemRssSourceBinding //import io.legado.app.lib.theme.backgroundColor -import io.legato.kazusa.ui.widget.recycler.DragSelectTouchHelper -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.DragSelectTouchHelper +import io.legado.app.ui.widget.recycler.ItemTouchCallback import java.util.Collections diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceViewModel.kt rename to app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt index 2af42c247..3158e4535 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/source/manage/RssSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt @@ -1,17 +1,17 @@ -package io.legato.kazusa.ui.rss.source.manage +package io.legado.app.ui.rss.source.manage import android.app.Application import android.text.TextUtils -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RssSource -import io.legato.kazusa.help.DefaultData -import io.legato.kazusa.help.source.SourceHelp -import io.legato.kazusa.utils.FileUtils -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.splitNotBlank -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.utils.toastOnUi +import io.legado.app.base.BaseViewModel +import io.legado.app.data.appDb +import io.legado.app.data.entities.RssSource +import io.legado.app.help.DefaultData +import io.legado.app.help.source.SourceHelp +import io.legado.app.utils.FileUtils +import io.legado.app.utils.GSON +import io.legado.app.utils.splitNotBlank +import io.legado.app.utils.stackTraceStr +import io.legado.app.utils.toastOnUi import java.io.File /** diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubActivity.kt b/app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubActivity.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubActivity.kt rename to app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubActivity.kt index 675b2c5cb..82d20dea3 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubActivity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.rss.subscription +package io.legado.app.ui.rss.subscription import android.os.Bundle import android.view.Menu @@ -6,22 +6,22 @@ import android.view.MenuItem import androidx.core.view.isGone import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.RuleSub -import io.legato.kazusa.databinding.ActivityRuleSubBinding -import io.legato.kazusa.databinding.DialogRuleSubEditBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.ui.association.ImportBookSourceDialog -import io.legato.kazusa.ui.association.ImportReplaceRuleDialog -import io.legato.kazusa.ui.association.ImportRssSourceDialog -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.utils.applyNavigationBarPadding -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseActivity +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.RuleSub +import io.legado.app.databinding.ActivityRuleSubBinding +import io.legado.app.databinding.DialogRuleSubEditBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.ui.association.ImportBookSourceDialog +import io.legado.app.ui.association.ImportReplaceRuleDialog +import io.legado.app.ui.association.ImportRssSourceDialog +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.utils.applyNavigationBarPadding +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.conflate diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubAdapter.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubAdapter.kt rename to app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubAdapter.kt index 581e7033f..2bb5560be 100644 --- a/app/src/main/java/io/legato/kazusa/ui/rss/subscription/RuleSubAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/subscription/RuleSubAdapter.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.rss.subscription +package io.legado.app.ui.rss.subscription import android.content.Context import android.view.View import android.view.ViewGroup import android.widget.PopupMenu import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.data.entities.RuleSub -import io.legato.kazusa.databinding.ItemRuleSubBinding -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.data.entities.RuleSub +import io.legado.app.databinding.ItemRuleSubBinding +import io.legado.app.ui.widget.recycler.ItemTouchCallback class RuleSubAdapter(context: Context, val callBack: Callback) : diff --git a/app/src/main/java/io/legato/kazusa/ui/welcome/PrivacyFragment.kt b/app/src/main/java/io/legado/app/ui/welcome/PrivacyFragment.kt similarity index 69% rename from app/src/main/java/io/legato/kazusa/ui/welcome/PrivacyFragment.kt rename to app/src/main/java/io/legado/app/ui/welcome/PrivacyFragment.kt index 1bcbd08e2..4beafa3b5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/welcome/PrivacyFragment.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/PrivacyFragment.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.welcome +package io.legado.app.ui.welcome import android.os.Bundle import android.view.View -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseFragment -import io.legato.kazusa.databinding.FragmentPrivacyBinding -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseFragment +import io.legado.app.databinding.FragmentPrivacyBinding +import io.legado.app.utils.viewbindingdelegate.viewBinding class PrivacyFragment : BaseFragment(R.layout.fragment_privacy) { diff --git a/app/src/main/java/io/legato/kazusa/ui/welcome/ThemeFragment.kt b/app/src/main/java/io/legado/app/ui/welcome/ThemeFragment.kt similarity index 75% rename from app/src/main/java/io/legato/kazusa/ui/welcome/ThemeFragment.kt rename to app/src/main/java/io/legado/app/ui/welcome/ThemeFragment.kt index 432ce689d..d4d44d0dd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/welcome/ThemeFragment.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/ThemeFragment.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.welcome +package io.legado.app.ui.welcome import android.os.Bundle import androidx.preference.PreferenceFragmentCompat -import io.legato.kazusa.R -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.lib.prefs.ThemeCardPreference -import io.legato.kazusa.lib.prefs.ThemeModePreference +import io.legado.app.R +import io.legado.app.constant.PreferKey +import io.legado.app.lib.prefs.ThemeCardPreference +import io.legado.app.lib.prefs.ThemeModePreference class ThemeFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/io/legato/kazusa/ui/welcome/WebDavFragment.kt b/app/src/main/java/io/legado/app/ui/welcome/WebDavFragment.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/ui/welcome/WebDavFragment.kt rename to app/src/main/java/io/legado/app/ui/welcome/WebDavFragment.kt index 9f145eca4..9f641eadf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/welcome/WebDavFragment.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/WebDavFragment.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.welcome +package io.legado.app.ui.welcome import android.content.Context import android.os.Bundle @@ -11,24 +11,24 @@ import androidx.core.content.edit import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseFragment -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.PreferKey -import io.legato.kazusa.databinding.FragmentWebdavAuthBinding -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.help.AppWebDav -import io.legato.kazusa.help.AppWebDav.testWebDav -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.help.storage.Restore -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.ui.file.HandleFileContract -import io.legato.kazusa.ui.widget.dialog.WaitDialog -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.toastOnUi -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.base.BaseFragment +import io.legado.app.constant.AppLog +import io.legado.app.constant.PreferKey +import io.legado.app.databinding.FragmentWebdavAuthBinding +import io.legado.app.exception.NoStackTraceException +import io.legado.app.help.AppWebDav +import io.legado.app.help.AppWebDav.testWebDav +import io.legado.app.help.config.LocalConfig +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.help.storage.Restore +import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.dialogs.selector +import io.legado.app.ui.file.HandleFileContract +import io.legado.app.ui.widget.dialog.WaitDialog +import io.legado.app.utils.gone +import io.legado.app.utils.toastOnUi +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job diff --git a/app/src/main/java/io/legato/kazusa/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/welcome/WelcomeActivity.kt rename to app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt index 16cbae0c3..f7e3050c7 100644 --- a/app/src/main/java/io/legato/kazusa/ui/welcome/WelcomeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt @@ -1,16 +1,16 @@ -package io.legato.kazusa.ui.welcome +package io.legado.app.ui.welcome import android.os.Bundle import androidx.activity.addCallback import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 -import io.legato.kazusa.base.BaseActivity -import io.legato.kazusa.databinding.ActivityWelcomeBinding -import io.legato.kazusa.help.config.LocalConfig -import io.legato.kazusa.ui.main.MainActivity -import io.legato.kazusa.utils.startActivity -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.base.BaseActivity +import io.legado.app.databinding.ActivityWelcomeBinding +import io.legado.app.help.config.LocalConfig +import io.legado.app.ui.main.MainActivity +import io.legado.app.utils.startActivity +import io.legado.app.utils.viewbindingdelegate.viewBinding class WelcomeActivity : BaseActivity() { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/BatteryView.kt b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/widget/BatteryView.kt rename to app/src/main/java/io/legado/app/ui/widget/BatteryView.kt index 193b43b1c..1ff8f6fa3 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/BatteryView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.annotation.SuppressLint import android.content.Context @@ -11,10 +11,10 @@ import android.text.StaticLayout import android.util.AttributeSet import androidx.annotation.ColorInt import androidx.appcompat.widget.AppCompatTextView -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory -import io.legato.kazusa.utils.canvasrecorder.recordIfNeededThenDraw -import io.legato.kazusa.utils.dpToPx +import io.legado.app.help.config.AppConfig +import io.legado.app.utils.canvasrecorder.CanvasRecorderFactory +import io.legado.app.utils.canvasrecorder.recordIfNeededThenDraw +import io.legado.app.utils.dpToPx class BatteryView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/DetailSeekBar.kt b/app/src/main/java/io/legado/app/ui/widget/DetailSeekBar.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/widget/DetailSeekBar.kt rename to app/src/main/java/io/legado/app/ui/widget/DetailSeekBar.kt index 443deb020..8c864b15a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/DetailSeekBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/DetailSeekBar.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.annotation.SuppressLint import android.content.Context @@ -8,9 +8,9 @@ import android.widget.FrameLayout import android.widget.SeekBar import androidx.appcompat.widget.TooltipCompat import com.google.android.material.slider.Slider -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ViewDetailSeekBarBinding -import io.legato.kazusa.ui.widget.seekbar.SeekBarChangeListener +import io.legado.app.R +import io.legado.app.databinding.ViewDetailSeekBarBinding +import io.legado.app.ui.widget.seekbar.SeekBarChangeListener @SuppressLint("ClickableViewAccessibility") class DetailSeekBar @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/EmptyMessageView.kt b/app/src/main/java/io/legado/app/ui/widget/EmptyMessageView.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/EmptyMessageView.kt rename to app/src/main/java/io/legado/app/ui/widget/EmptyMessageView.kt index fbc924ebe..94a3337bb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/EmptyMessageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/EmptyMessageView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.util.AttributeSet @@ -6,8 +6,8 @@ import android.view.Gravity import android.widget.LinearLayout import android.widget.TextView import androidx.annotation.StringRes -import io.legato.kazusa.R -import io.legato.kazusa.utils.dpToPx +import io.legado.app.R +import io.legado.app.utils.dpToPx import androidx.core.content.withStyledAttributes class EmptyMessageView @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt rename to app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt index 4bd63b040..9f3fafb9a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/LabelsBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup -import io.legato.kazusa.utils.themeColor +import io.legado.app.utils.themeColor @Suppress("unused", "MemberVisibilityCanBePrivate") class LabelsBar @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/NestedScrollableHost.kt b/app/src/main/java/io/legado/app/ui/widget/NestedScrollableHost.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/NestedScrollableHost.kt rename to app/src/main/java/io/legado/app/ui/widget/NestedScrollableHost.kt index 5a9c5ecd2..9eb9d230b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/NestedScrollableHost.kt +++ b/app/src/main/java/io/legado/app/ui/widget/NestedScrollableHost.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/NoChildScrollNestedScrollView.kt b/app/src/main/java/io/legado/app/ui/widget/NoChildScrollNestedScrollView.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/ui/widget/NoChildScrollNestedScrollView.kt rename to app/src/main/java/io/legado/app/ui/widget/NoChildScrollNestedScrollView.kt index 10047c6d7..4b5ca03e6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/NoChildScrollNestedScrollView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/NoChildScrollNestedScrollView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/PopupAction.kt b/app/src/main/java/io/legado/app/ui/widget/PopupAction.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/widget/PopupAction.kt rename to app/src/main/java/io/legado/app/ui/widget/PopupAction.kt index 28c59306e..7f60a43de 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/PopupAction.kt +++ b/app/src/main/java/io/legado/app/ui/widget/PopupAction.kt @@ -1,14 +1,14 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.view.ViewGroup import android.widget.PopupWindow -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.ItemTextBinding -import io.legato.kazusa.databinding.PopupActionBinding -import io.legato.kazusa.lib.dialogs.SelectItem +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.ItemTextBinding +import io.legado.app.databinding.PopupActionBinding +import io.legado.app.lib.dialogs.SelectItem import splitties.systemservices.layoutInflater class PopupAction(private val context: Context) : diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/ReaderInfoBarView.kt b/app/src/main/java/io/legado/app/ui/widget/ReaderInfoBarView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/ReaderInfoBarView.kt rename to app/src/main/java/io/legado/app/ui/widget/ReaderInfoBarView.kt index 80d764ea5..fdd3758bc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/ReaderInfoBarView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/ReaderInfoBarView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.BroadcastReceiver import android.content.Context @@ -15,8 +15,8 @@ import androidx.core.content.ContextCompat import androidx.core.content.res.use import androidx.core.graphics.ColorUtils import androidx.core.view.WindowInsetsCompat -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.utils.dpToPx +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat import java.text.SimpleDateFormat import java.util.Date import kotlin.math.min diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/SearchView.kt b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/SearchView.kt rename to app/src/main/java/io/legado/app/ui/widget/SearchView.kt index 32e4a4c8d..ee46f307b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/SearchView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.annotation.SuppressLint import android.app.SearchableInfo @@ -14,8 +14,8 @@ import android.util.AttributeSet import android.view.Gravity import android.widget.TextView import androidx.appcompat.widget.SearchView -import io.legato.kazusa.R -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.R +import io.legado.app.utils.printOnDebug import androidx.core.graphics.withTranslation diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt rename to app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt index f2e38c3c6..bc47cb8a2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.util.AttributeSet @@ -8,8 +8,8 @@ import android.widget.FrameLayout import androidx.annotation.MenuRes import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu -import io.legato.kazusa.databinding.ViewSelectActionBarBinding -import io.legato.kazusa.utils.visible +import io.legado.app.databinding.ViewSelectActionBarBinding +import io.legado.app.utils.visible @Suppress("unused") diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/ShadowLayout.kt b/app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/ShadowLayout.kt rename to app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt index c5404b21d..95e54ac63 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/ShadowLayout.kt +++ b/app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.graphics.Canvas @@ -8,8 +8,8 @@ import android.graphics.RectF import android.util.AttributeSet import android.view.View import android.widget.RelativeLayout -import io.legato.kazusa.R -import io.legato.kazusa.utils.getCompatColor +import io.legado.app.R +import io.legado.app.utils.getCompatColor /** * ShadowLayout.java diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/SimpleCounterView.kt b/app/src/main/java/io/legado/app/ui/widget/SimpleCounterView.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/widget/SimpleCounterView.kt rename to app/src/main/java/io/legado/app/ui/widget/SimpleCounterView.kt index ebad0f015..a8079a0ae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/SimpleCounterView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SimpleCounterView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.annotation.SuppressLint import android.content.Context @@ -10,11 +10,11 @@ import android.view.MotionEvent import android.widget.FrameLayout import android.widget.TextView import androidx.appcompat.widget.TooltipCompat -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ViewSimpleCounterBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.databinding.ViewSimpleCounterBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.gone +import io.legado.app.utils.visible @SuppressLint("ViewConstructor", "ClickableViewAccessibility") class SimpleCounterView @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt rename to app/src/main/java/io/legado/app/ui/widget/TitleBar.kt index 137b565c3..1457776dd 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget +package io.legado.app.ui.widget import android.content.Context import android.content.res.ColorStateList @@ -8,9 +8,9 @@ import android.view.View import androidx.core.view.WindowInsetsCompat import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.MaterialToolbar -import io.legato.kazusa.R -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.setOnApplyWindowInsetsListenerCompat +import io.legado.app.R +import io.legado.app.utils.activity +import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat import splitties.views.bottomPadding import splitties.views.topPadding diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionAnimator.kt b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionAnimator.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionAnimator.kt rename to app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionAnimator.kt index bae466aef..582f7239c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionAnimator.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionAnimator.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.legato.kazusa.ui.widget.anima.explosion_field +package io.legado.app.ui.widget.anima.explosion_field import android.animation.ValueAnimator import android.annotation.SuppressLint diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionField.kt b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionField.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionField.kt rename to app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionField.kt index 834a3bf04..9b014b7d2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionField.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionField.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.anima.explosion_field +package io.legado.app.ui.widget.anima.explosion_field import android.app.Activity import android.view.View diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionView.kt b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionView.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionView.kt rename to app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionView.kt index 1409dfee1..39bd13780 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/ExplosionView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionView.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.legato.kazusa.ui.widget.anima.explosion_field +package io.legado.app.ui.widget.anima.explosion_field import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -25,7 +25,7 @@ import android.graphics.Rect import android.media.MediaPlayer import android.util.AttributeSet import android.view.View -import io.legato.kazusa.utils.DebugLog +import io.legado.app.utils.DebugLog import java.util.* diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/OnAnimatorListener.kt b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/OnAnimatorListener.kt similarity index 72% rename from app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/OnAnimatorListener.kt rename to app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/OnAnimatorListener.kt index 272cd44b3..13a04c670 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/OnAnimatorListener.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/OnAnimatorListener.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.anima.explosion_field +package io.legado.app.ui.widget.anima.explosion_field import android.animation.Animator import android.view.View diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/Utils.kt b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/Utils.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/Utils.kt rename to app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/Utils.kt index 1d3e5a407..0c2446e05 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/anima/explosion_field/Utils.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/Utils.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.legato.kazusa.ui.widget.anima.explosion_field +package io.legado.app.ui.widget.anima.explosion_field import android.content.res.Resources @@ -22,7 +22,7 @@ import android.graphics.Canvas import android.graphics.drawable.BitmapDrawable import android.view.View import android.widget.ImageView -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.printOnDebug import kotlin.math.roundToInt diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/code/CodeView.kt b/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/code/CodeView.kt rename to app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt index 74914c797..bbf4edc9f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/code/CodeView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.code +package io.legado.app.ui.widget.code import android.content.Context import android.graphics.Canvas @@ -13,7 +13,7 @@ import android.text.style.ForegroundColorSpan import android.text.style.ReplacementSpan import android.util.AttributeSet import androidx.annotation.ColorInt -import io.legato.kazusa.ui.widget.text.ScrollMultiAutoCompleteTextView +import io.legado.app.ui.widget.text.ScrollMultiAutoCompleteTextView import java.util.* import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/code/CodeViewExtensions.kt b/app/src/main/java/io/legado/app/ui/widget/code/CodeViewExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/ui/widget/code/CodeViewExtensions.kt rename to app/src/main/java/io/legado/app/ui/widget/code/CodeViewExtensions.kt index 58cbc4454..afefa8cd9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/code/CodeViewExtensions.kt +++ b/app/src/main/java/io/legado/app/ui/widget/code/CodeViewExtensions.kt @@ -1,10 +1,10 @@ @file:Suppress("unused") -package io.legato.kazusa.ui.widget.code +package io.legado.app.ui.widget.code import android.content.Context import android.widget.ArrayAdapter -import io.legato.kazusa.R +import io.legado.app.R import splitties.init.appCtx import splitties.resources.color import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/code/KeywordTokenizer.kt b/app/src/main/java/io/legado/app/ui/widget/code/KeywordTokenizer.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/code/KeywordTokenizer.kt rename to app/src/main/java/io/legado/app/ui/widget/code/KeywordTokenizer.kt index 036ee62f2..607fc9b9c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/code/KeywordTokenizer.kt +++ b/app/src/main/java/io/legado/app/ui/widget/code/KeywordTokenizer.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.code +package io.legado.app.ui.widget.code import android.widget.MultiAutoCompleteTextView import kotlin.math.max diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/CodeDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/CodeDialog.kt similarity index 78% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/CodeDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/CodeDialog.kt index c404c3116..d4dcc79ab 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/CodeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/CodeDialog.kt @@ -1,20 +1,20 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.os.Bundle import android.view.View import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.databinding.DialogCodeViewBinding -import io.legato.kazusa.help.IntentData +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.databinding.DialogCodeViewBinding +import io.legado.app.help.IntentData //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.code.addJsPattern -import io.legato.kazusa.ui.widget.code.addJsonPattern -import io.legato.kazusa.ui.widget.code.addLegadoPattern -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.disableEdit -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.ui.widget.code.addJsPattern +import io.legado.app.ui.widget.code.addJsonPattern +import io.legado.app.ui.widget.code.addLegadoPattern +import io.legado.app.utils.applyTint +import io.legado.app.utils.disableEdit +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding class CodeDialog() : BaseDialogFragment(R.layout.dialog_code_view) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/PhotoDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/PhotoDialog.kt similarity index 74% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/PhotoDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/PhotoDialog.kt index 7aa6106a8..9bebadcae 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/PhotoDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/PhotoDialog.kt @@ -1,24 +1,21 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.View -import android.view.ViewGroup import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy import com.bumptech.glide.request.RequestOptions -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.databinding.DialogPhotoViewBinding -import io.legato.kazusa.help.book.BookHelp -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.model.ImageProvider -import io.legato.kazusa.model.ReadBook -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogPhotoViewBinding +import io.legado.app.help.book.BookHelp +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader +import io.legado.app.model.BookCover +import io.legado.app.model.ImageProvider +import io.legado.app.model.ReadBook +import io.legado.app.utils.viewbindingdelegate.viewBinding /** * 显示图片 diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt index 942452ea5..794aaa6a4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt @@ -1,27 +1,22 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.os.Build import android.os.Bundle import android.view.View -import android.view.ViewGroup import android.view.textclassifier.TextClassifier import androidx.lifecycle.lifecycleScope -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.databinding.DialogTextViewBinding -import io.legato.kazusa.help.IntentData +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.databinding.DialogTextViewBinding +import io.legado.app.help.IntentData //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setHtml -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.setHtml +import io.legado.app.utils.viewbindingdelegate.viewBinding import io.noties.markwon.Markwon import io.noties.markwon.ext.tables.TablePlugin import io.noties.markwon.html.HtmlPlugin import io.noties.markwon.image.glide.GlideImagesPlugin import kotlinx.coroutines.Dispatchers.IO -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextListDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/TextListDialog.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextListDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/TextListDialog.kt index bae873341..0c4825f0a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/TextListDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/TextListDialog.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.content.Context import android.os.Bundle import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.ItemLogBinding -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.ItemLogBinding +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding @Suppress("unused") class TextListDialog() : BaseDialogFragment(R.layout.dialog_recycler_view) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/UrlOptionDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/UrlOptionDialog.kt similarity index 84% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/UrlOptionDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/UrlOptionDialog.kt index 521b8e125..2b4a02bb2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/UrlOptionDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/UrlOptionDialog.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.app.Dialog import android.content.Context import android.os.Bundle import android.view.ViewGroup -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.databinding.DialogUrlOptionEditBinding -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.setLayout +import io.legado.app.R +import io.legado.app.constant.AppConst +import io.legado.app.databinding.DialogUrlOptionEditBinding +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.GSON +import io.legado.app.utils.setLayout class UrlOptionDialog(context: Context, private val success: (String) -> Unit) : Dialog(context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/VariableDialog.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/VariableDialog.kt index 667799e98..47b2cc024 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/VariableDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog //import io.legado.app.lib.theme.primaryColor import android.app.Application @@ -8,13 +8,13 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseBottomSheetDialogFragment -import io.legato.kazusa.base.BaseViewModel -import io.legato.kazusa.databinding.DialogVariableBinding -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legado.app.R +import io.legado.app.base.BaseBottomSheetDialogFragment +import io.legado.app.base.BaseViewModel +import io.legado.app.databinding.DialogVariableBinding +import io.legado.app.utils.applyTint +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding class VariableDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_variable), Toolbar.OnMenuItemClickListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/WaitDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/WaitDialog.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/ui/widget/dialog/WaitDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/dialog/WaitDialog.kt index 4fc095a1d..3c3d61480 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/WaitDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dialog/WaitDialog.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.ui.widget.dialog +package io.legado.app.ui.widget.dialog import android.app.Dialog import android.content.Context import android.view.LayoutInflater import com.google.android.material.dialog.MaterialAlertDialogBuilder -import io.legato.kazusa.R -import io.legato.kazusa.databinding.DialogWaitBinding +import io.legado.app.R +import io.legado.app.databinding.DialogWaitBinding class WaitDialog(context: Context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/DynamicFrameLayout.kt b/app/src/main/java/io/legado/app/ui/widget/dynamiclayout/DynamicFrameLayout.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/DynamicFrameLayout.kt rename to app/src/main/java/io/legado/app/ui/widget/dynamiclayout/DynamicFrameLayout.kt index 8357e8517..c2a45147f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/DynamicFrameLayout.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dynamiclayout/DynamicFrameLayout.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.dynamiclayout +package io.legado.app.ui.widget.dynamiclayout import android.content.Context import android.graphics.drawable.Drawable @@ -10,7 +10,7 @@ import android.widget.ProgressBar import androidx.appcompat.widget.AppCompatButton import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatTextView -import io.legato.kazusa.R +import io.legado.app.R @Suppress("unused") class DynamicFrameLayout @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/ViewSwitcher.kt b/app/src/main/java/io/legado/app/ui/widget/dynamiclayout/ViewSwitcher.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/ViewSwitcher.kt rename to app/src/main/java/io/legado/app/ui/widget/dynamiclayout/ViewSwitcher.kt index f2e71f010..dbcc0f132 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dynamiclayout/ViewSwitcher.kt +++ b/app/src/main/java/io/legado/app/ui/widget/dynamiclayout/ViewSwitcher.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.dynamiclayout +package io.legado.app.ui.widget.dynamiclayout import androidx.annotation.IntDef import androidx.annotation.StringRes diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/ArcView.kt b/app/src/main/java/io/legado/app/ui/widget/image/ArcView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/ArcView.kt rename to app/src/main/java/io/legado/app/ui/widget/image/ArcView.kt index 92883f2a8..b2bfc241a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/ArcView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/ArcView.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.ui.widget.image +package io.legado.app.ui.widget.image import android.content.Context import android.graphics.* import android.util.AttributeSet import android.view.View -import io.legato.kazusa.R +import io.legado.app.R /** * 弧形View diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/CoverImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/CoverImageView.kt rename to app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt index 28c4b67fe..06897489a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/CoverImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image +package io.legado.app.ui.widget.image import android.content.Context import android.graphics.Canvas @@ -18,16 +18,16 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.glide.ImageLoader -import io.legato.kazusa.help.glide.OkHttpModelLoader +import io.legado.app.constant.AppPattern +import io.legado.app.help.config.AppConfig +import io.legado.app.help.glide.ImageLoader +import io.legado.app.help.glide.OkHttpModelLoader //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.model.BookCover -import io.legato.kazusa.utils.spToPx -import io.legato.kazusa.utils.textHeight -import io.legato.kazusa.utils.themeColor -import io.legato.kazusa.utils.toStringArray +import io.legado.app.model.BookCover +import io.legado.app.utils.spToPx +import io.legado.app.utils.textHeight +import io.legado.app.utils.themeColor +import io.legado.app.utils.toStringArray /** * 封面 diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/FilletImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/FilletImageView.kt rename to app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt index fa50362ef..f8f0b1807 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/FilletImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image +package io.legado.app.ui.widget.image import android.annotation.SuppressLint import android.content.Context @@ -6,8 +6,8 @@ import android.graphics.Canvas import android.graphics.Path import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView -import io.legato.kazusa.R -import io.legato.kazusa.utils.dpToPx +import io.legado.app.R +import io.legado.app.utils.dpToPx import kotlin.math.max class FilletImageView @JvmOverloads constructor( diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/ImageButton.kt b/app/src/main/java/io/legado/app/ui/widget/image/ImageButton.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/ImageButton.kt rename to app/src/main/java/io/legado/app/ui/widget/image/ImageButton.kt index 66de8618e..e21d00834 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/ImageButton.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/ImageButton.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image +package io.legado.app.ui.widget.image import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/PhotoView.kt b/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/PhotoView.kt rename to app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt index 977b8f7ae..d3cc1db4f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/PhotoView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image +package io.legado.app.ui.widget.image import android.annotation.SuppressLint import android.content.Context @@ -22,9 +22,9 @@ import android.widget.ImageView import android.widget.OverScroller import android.widget.Scroller import androidx.appcompat.widget.AppCompatImageView -import io.legato.kazusa.ui.widget.image.photo.Info -import io.legato.kazusa.ui.widget.image.photo.OnRotateListener -import io.legato.kazusa.ui.widget.image.photo.RotateGestureDetector +import io.legado.app.ui.widget.image.photo.Info +import io.legado.app.ui.widget.image.photo.OnRotateListener +import io.legado.app.ui.widget.image.photo.RotateGestureDetector import kotlin.math.abs import kotlin.math.roundToInt diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/photo/Info.kt b/app/src/main/java/io/legado/app/ui/widget/image/photo/Info.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/photo/Info.kt rename to app/src/main/java/io/legado/app/ui/widget/image/photo/Info.kt index d903b0214..6ce1adfc6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/photo/Info.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/photo/Info.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image.photo +package io.legado.app.ui.widget.image.photo import android.graphics.PointF diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/image/photo/RotateGestureDetector.kt b/app/src/main/java/io/legado/app/ui/widget/image/photo/RotateGestureDetector.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/image/photo/RotateGestureDetector.kt rename to app/src/main/java/io/legado/app/ui/widget/image/photo/RotateGestureDetector.kt index 863bc7f1b..7dddbebbf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/image/photo/RotateGestureDetector.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/photo/RotateGestureDetector.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.image.photo +package io.legado.app.ui.widget.image.photo import android.view.MotionEvent import kotlin.math.abs diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardAssistsConfig.kt b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardAssistsConfig.kt rename to app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt index d6260793f..2d2bceadb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardAssistsConfig.kt +++ b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardAssistsConfig.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.keyboard +package io.legado.app.ui.widget.keyboard import android.content.Context import android.os.Bundle @@ -11,26 +11,26 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.KeyboardAssist -import io.legato.kazusa.databinding.DialogMultipleEditTextBinding -import io.legato.kazusa.databinding.DialogRecyclerViewBinding -import io.legato.kazusa.databinding.Item1lineTextAndDelBinding -import io.legato.kazusa.lib.dialogs.alert +import io.legado.app.R +import io.legado.app.base.BaseDialogFragment +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.KeyboardAssist +import io.legado.app.databinding.DialogMultipleEditTextBinding +import io.legado.app.databinding.DialogRecyclerViewBinding +import io.legado.app.databinding.Item1lineTextAndDelBinding +import io.legado.app.lib.dialogs.alert //import io.legado.app.lib.theme.backgroundColor //import io.legado.app.lib.theme.primaryColor -import io.legato.kazusa.ui.widget.recycler.ItemTouchCallback -import io.legato.kazusa.ui.widget.recycler.VerticalDivider -import io.legato.kazusa.utils.applyTint -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.setLayout -import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -import io.legato.kazusa.utils.visible +import io.legado.app.ui.widget.recycler.ItemTouchCallback +import io.legado.app.ui.widget.recycler.VerticalDivider +import io.legado.app.utils.applyTint +import io.legado.app.utils.dpToPx +import io.legado.app.utils.setLayout +import io.legado.app.utils.viewbindingdelegate.viewBinding +import io.legado.app.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardToolPop.kt b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardToolPop.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardToolPop.kt rename to app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardToolPop.kt index 5fbee0777..62739bfd0 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/keyboard/KeyboardToolPop.kt +++ b/app/src/main/java/io/legado/app/ui/widget/keyboard/KeyboardToolPop.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.keyboard +package io.legado.app.ui.widget.keyboard import android.content.Context import android.graphics.Rect @@ -9,19 +9,19 @@ import android.view.ViewGroup import android.view.ViewTreeObserver import android.view.Window import android.widget.PopupWindow -import io.legato.kazusa.R -import io.legato.kazusa.base.adapter.ItemViewHolder -import io.legato.kazusa.base.adapter.RecyclerAdapter -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.appDb -import io.legato.kazusa.data.entities.KeyboardAssist -import io.legato.kazusa.databinding.ItemFilletTextBinding -import io.legato.kazusa.databinding.PopupKeyboardToolBinding -import io.legato.kazusa.lib.dialogs.SelectItem -import io.legato.kazusa.lib.dialogs.selector -import io.legato.kazusa.utils.activity -import io.legato.kazusa.utils.showDialogFragment -import io.legato.kazusa.utils.windowSize +import io.legado.app.R +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter +import io.legado.app.constant.AppLog +import io.legado.app.data.appDb +import io.legado.app.data.entities.KeyboardAssist +import io.legado.app.databinding.ItemFilletTextBinding +import io.legado.app.databinding.PopupKeyboardToolBinding +import io.legado.app.lib.dialogs.SelectItem +import io.legado.app.lib.dialogs.selector +import io.legado.app.utils.activity +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.windowSize import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.flow.catch diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/number/NumberPickerDialog.kt b/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/number/NumberPickerDialog.kt rename to app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt index f72994adb..12f35c1c9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/number/NumberPickerDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.number +package io.legado.app.ui.widget.number import android.app.AlertDialog import android.content.Context @@ -8,7 +8,7 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import io.legato.kazusa.R +import io.legado.app.R class NumberPickerDialog(context: Context) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/DividerNoLast.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/DividerNoLast.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/DividerNoLast.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/DividerNoLast.kt index 87ad8e96c..9ac09b0cf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/DividerNoLast.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/DividerNoLast.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import android.graphics.Canvas @@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable import android.view.View import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.utils.DebugLog +import io.legado.app.utils.DebugLog import kotlin.math.roundToInt diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/DragSelectTouchHelper.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/DragSelectTouchHelper.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt index 5e2c35879..e125fb199 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/DragSelectTouchHelper.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.res.Resources import android.text.TextUtils @@ -25,8 +25,8 @@ import androidx.core.view.ViewCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.utils.DebugLog +import io.legado.app.BuildConfig +import io.legado.app.utils.DebugLog import java.util.Locale import kotlin.math.max import kotlin.math.min diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/HeaderAdapterDataObserver.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/HeaderAdapterDataObserver.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/HeaderAdapterDataObserver.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/HeaderAdapterDataObserver.kt index 05ea3fe33..b112fa07f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/HeaderAdapterDataObserver.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/HeaderAdapterDataObserver.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/ItemTouchCallback.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/ItemTouchCallback.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/ItemTouchCallback.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/ItemTouchCallback.kt index 0c375a9bb..be45df2cf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/ItemTouchCallback.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/ItemTouchCallback.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import androidx.recyclerview.widget.GridLayoutManager diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/LoadMoreView.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/LoadMoreView.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt index 6e8215598..8d9c2b6a3 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/LoadMoreView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt @@ -1,19 +1,15 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import android.widget.FrameLayout -import androidx.annotation.ColorRes -import androidx.core.view.isInvisible -import androidx.core.view.isVisible -import io.legato.kazusa.R -import io.legato.kazusa.databinding.ViewLoadMoreBinding -import io.legato.kazusa.lib.dialogs.alert -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.databinding.ViewLoadMoreBinding +import io.legado.app.lib.dialogs.alert +import io.legado.app.utils.invisible +import io.legado.app.utils.visible @Suppress("unused") class LoadMoreView(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt index afdfdf26d..55435ce1a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/RecyclerViewAtPager2.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/RecyclerViewAtPager2.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/RecyclerViewAtPager2.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/RecyclerViewAtPager2.kt index f50fe5893..1dc4d7b5f 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/RecyclerViewAtPager2.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/RecyclerViewAtPager2.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/UpLinearLayoutManager.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/UpLinearLayoutManager.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/UpLinearLayoutManager.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/UpLinearLayoutManager.kt index f84e7325b..f0236bbea 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/UpLinearLayoutManager.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/UpLinearLayoutManager.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import androidx.recyclerview.widget.LinearLayoutManager diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/VerticalDivider.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/VerticalDivider.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/VerticalDivider.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/VerticalDivider.kt index 9aa05bb66..2ea450d4c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/VerticalDivider.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/VerticalDivider.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DividerItemDecoration -import io.legato.kazusa.R +import io.legado.app.R class VerticalDivider(context: Context) : DividerItemDecoration(context, VERTICAL) { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/ViewPager2Container.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/ViewPager2Container.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/ViewPager2Container.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/ViewPager2Container.kt index f8cc441b5..448e08286 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/ViewPager2Container.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/ViewPager2Container.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler +package io.legado.app.ui.widget.recycler import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollRecyclerView.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollRecyclerView.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollRecyclerView.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollRecyclerView.kt index 50a673ecc..d75f4f645 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollRecyclerView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollRecyclerView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler.scroller +package io.legado.app.ui.widget.recycler.scroller import android.content.Context import android.util.AttributeSet @@ -9,7 +9,7 @@ import androidx.annotation.ColorInt import androidx.constraintlayout.widget.ConstraintLayout import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.recyclerview.widget.RecyclerView -import io.legato.kazusa.R +import io.legado.app.R @Suppress("MemberVisibilityCanBePrivate", "unused") class FastScrollRecyclerView : RecyclerView { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt index 3a4e32275..55afa8370 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScrollStateChangeListener.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler.scroller +package io.legado.app.ui.widget.recycler.scroller interface FastScrollStateChangeListener { diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScroller.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScroller.kt rename to app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt index 01a269f3b..7d109292e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/recycler/scroller/FastScroller.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.recycler.scroller +package io.legado.app.ui.widget.recycler.scroller //import io.legado.app.lib.theme.accentColor import android.animation.Animator @@ -29,7 +29,7 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import io.legato.kazusa.R +import io.legado.app.R import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/SeekBarChangeListener.kt b/app/src/main/java/io/legado/app/ui/widget/seekbar/SeekBarChangeListener.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/ui/widget/seekbar/SeekBarChangeListener.kt rename to app/src/main/java/io/legado/app/ui/widget/seekbar/SeekBarChangeListener.kt index ad0fb2d3d..eaa159029 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/SeekBarChangeListener.kt +++ b/app/src/main/java/io/legado/app/ui/widget/seekbar/SeekBarChangeListener.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.seekbar +package io.legado.app.ui.widget.seekbar import android.widget.SeekBar diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBar.kt b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBar.kt rename to app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt index 396779698..214c7c12e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.seekbar +package io.legado.app.ui.widget.seekbar import android.annotation.SuppressLint import android.content.Context @@ -10,7 +10,7 @@ import android.view.MotionEvent import android.widget.ProgressBar import androidx.appcompat.widget.AppCompatSeekBar import androidx.core.view.ViewCompat -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor import java.lang.reflect.InvocationTargetException import java.lang.reflect.Method diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBarWrapper.kt b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBarWrapper.kt rename to app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt index dd148a0f9..a22f3a568 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/seekbar/VerticalSeekBarWrapper.kt +++ b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.seekbar +package io.legado.app.ui.widget.seekbar import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentBgTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/AccentBgTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt index d85e9a581..bd685c666 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentBgTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet import android.view.Gravity import com.google.android.material.textview.MaterialTextView -import io.legato.kazusa.lib.theme.Selector -import io.legato.kazusa.utils.ColorUtils -import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.themeColor +import io.legado.app.lib.theme.Selector +import io.legado.app.utils.ColorUtils +import io.legado.app.utils.dpToPx +import io.legado.app.utils.themeColor class AccentBgTextView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentStrokeTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentStrokeTextView.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/AccentStrokeTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/AccentStrokeTextView.kt index 3cca8b74e..d90806915 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentStrokeTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentStrokeTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/AccentTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt index 8eba90192..79475597d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/AccentTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/AutoCompleteTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/AutoCompleteTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt index f0e3f974f..e447d3e1b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/AutoCompleteTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text //import io.legado.app.lib.theme.accentColor import android.annotation.SuppressLint @@ -13,9 +13,9 @@ import android.widget.ArrayAdapter import android.widget.TextView import com.google.android.material.button.MaterialButton import com.google.android.material.textfield.MaterialAutoCompleteTextView -import io.legato.kazusa.R -import io.legato.kazusa.utils.gone -import io.legato.kazusa.utils.visible +import io.legado.app.R +import io.legado.app.utils.gone +import io.legado.app.utils.visible @Suppress("unused") diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/BadgeView.kt b/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/BadgeView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt index e08a0b023..631744ea1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/BadgeView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.graphics.Color @@ -13,12 +13,12 @@ import android.view.ViewGroup import android.widget.FrameLayout import android.widget.FrameLayout.LayoutParams import androidx.appcompat.widget.AppCompatTextView -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor -import io.legato.kazusa.utils.ColorUtils -import io.legato.kazusa.utils.getCompatColor -import io.legato.kazusa.utils.invisible -import io.legato.kazusa.utils.visible +import io.legado.app.utils.ColorUtils +import io.legado.app.utils.getCompatColor +import io.legado.app.utils.invisible +import io.legado.app.utils.visible /** diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/BevelLabelView.kt b/app/src/main/java/io/legado/app/ui/widget/text/BevelLabelView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/BevelLabelView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/BevelLabelView.kt index 41bd25318..dff2cd36e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/BevelLabelView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/BevelLabelView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.graphics.Canvas @@ -10,7 +10,7 @@ import android.util.TypedValue import android.view.View import androidx.annotation.ColorInt import androidx.annotation.IntDef -import io.legato.kazusa.R +import io.legado.app.R //import io.legado.app.lib.theme.accentColor /** diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/EditEntity.kt b/app/src/main/java/io/legado/app/ui/widget/text/EditEntity.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/EditEntity.kt rename to app/src/main/java/io/legado/app/ui/widget/text/EditEntity.kt index fdfb535d1..e715b69c1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/EditEntity.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/EditEntity.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/MultilineTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/MultilineTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt index 84cc07ccc..acaa6aa0a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/MultilineTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.os.Build diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/PrimaryTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/PrimaryTextView.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/PrimaryTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/PrimaryTextView.kt index c04c92575..76a23f508 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/PrimaryTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/PrimaryTextView.kt @@ -1,9 +1,8 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import io.legato.kazusa.lib.theme.ThemeStore /** * @author Aidan Follestad (afollestad) diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollMultiAutoCompleteTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollMultiAutoCompleteTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt index f0ac1075f..25ba34714 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollMultiAutoCompleteTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt index fe8abd4e9..6d79c2ec9 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/ScrollTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/SecondaryTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/SecondaryTextView.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/SecondaryTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/SecondaryTextView.kt index 830d1ad5b..33e9d2b4b 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/SecondaryTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/SecondaryTextView.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/text/TextInputLayout.kt b/app/src/main/java/io/legado/app/ui/widget/text/TextInputLayout.kt similarity index 85% rename from app/src/main/java/io/legato/kazusa/ui/widget/text/TextInputLayout.kt rename to app/src/main/java/io/legado/app/ui/widget/text/TextInputLayout.kt index 50274a5c8..f17c4578a 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/text/TextInputLayout.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/TextInputLayout.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.ui.widget.text +package io.legado.app.ui.widget.text import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/legato/kazusa/utils/ACache.kt b/app/src/main/java/io/legado/app/utils/ACache.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/ACache.kt rename to app/src/main/java/io/legado/app/utils/ACache.kt index 427ab79e2..214d11ad2 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ACache.kt +++ b/app/src/main/java/io/legado/app/utils/ACache.kt @@ -1,5 +1,5 @@ //Copyright (c) 2017. 章钦豪. All rights reserved. -package io.legato.kazusa.utils +package io.legado.app.utils import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/io/legato/kazusa/utils/ActivityExtensions.kt b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/ActivityExtensions.kt rename to app/src/main/java/io/legado/app/utils/ActivityExtensions.kt index ad7635700..2cfe99ea9 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ActivityExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.app.Activity @@ -21,8 +21,8 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE import androidx.fragment.app.DialogFragment -import io.legato.kazusa.R -import io.legato.kazusa.ui.widget.dialog.TextDialog +import io.legado.app.R +import io.legado.app.ui.widget.dialog.TextDialog inline fun AppCompatActivity.showDialogFragment( arguments: Bundle.() -> Unit = {} diff --git a/app/src/main/java/io/legato/kazusa/utils/ActivityResult.kt b/app/src/main/java/io/legado/app/utils/ActivityResult.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/ActivityResult.kt rename to app/src/main/java/io/legado/app/utils/ActivityResult.kt index accc03c1f..06d6dc47a 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ActivityResult.kt +++ b/app/src/main/java/io/legado/app/utils/ActivityResult.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.activity.result.contract.ActivityResultContract import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/io/legato/kazusa/utils/ActivityResultContracts.kt b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/ActivityResultContracts.kt rename to app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt index 704dd9153..5b656dbf3 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ActivityResultContracts.kt +++ b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.app.Activity.RESULT_OK import android.content.Context diff --git a/app/src/main/java/io/legato/kazusa/utils/AlphanumComparator.kt b/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/AlphanumComparator.kt rename to app/src/main/java/io/legado/app/utils/AlphanumComparator.kt index 9a2104400..9f92be3f7 100644 --- a/app/src/main/java/io/legato/kazusa/utils/AlphanumComparator.kt +++ b/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils /** diff --git a/app/src/main/java/io/legato/kazusa/utils/AnimationExtensions.kt b/app/src/main/java/io/legado/app/utils/AnimationExtensions.kt similarity index 82% rename from app/src/main/java/io/legato/kazusa/utils/AnimationExtensions.kt rename to app/src/main/java/io/legado/app/utils/AnimationExtensions.kt index bca63a1df..d862306f3 100644 --- a/app/src/main/java/io/legato/kazusa/utils/AnimationExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/AnimationExtensions.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import android.view.animation.Animation import android.view.animation.AnimationUtils import androidx.annotation.AnimRes -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig fun loadAnimation(context: Context, @AnimRes id: Int): Animation { val animation = AnimationUtils.loadAnimation(context, id) diff --git a/app/src/main/java/io/legato/kazusa/utils/ArchiveUtils.kt b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/ArchiveUtils.kt rename to app/src/main/java/io/legado/app/utils/ArchiveUtils.kt index 9615036d9..516725174 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ArchiveUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.net.Uri import androidx.documentfile.provider.DocumentFile -import io.legato.kazusa.constant.AppPattern.archiveFileRegex -import io.legato.kazusa.utils.compress.LibArchiveUtils +import io.legado.app.constant.AppPattern.archiveFileRegex +import io.legado.app.utils.compress.LibArchiveUtils import splitties.init.appCtx import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/utils/AsyncFileHandler.kt b/app/src/main/java/io/legado/app/utils/AsyncFileHandler.kt similarity index 81% rename from app/src/main/java/io/legato/kazusa/utils/AsyncFileHandler.kt rename to app/src/main/java/io/legado/app/utils/AsyncFileHandler.kt index 49346595f..746afc08a 100644 --- a/app/src/main/java/io/legato/kazusa/utils/AsyncFileHandler.kt +++ b/app/src/main/java/io/legado/app/utils/AsyncFileHandler.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.help.globalExecutor +import io.legado.app.help.globalExecutor import java.util.logging.FileHandler import java.util.logging.LogRecord diff --git a/app/src/main/java/io/legato/kazusa/utils/BitmapUtils.kt b/app/src/main/java/io/legado/app/utils/BitmapUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/BitmapUtils.kt rename to app/src/main/java/io/legado/app/utils/BitmapUtils.kt index 2275fee94..98d0b28c5 100644 --- a/app/src/main/java/io/legato/kazusa/utils/BitmapUtils.kt +++ b/app/src/main/java/io/legado/app/utils/BitmapUtils.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/io/legato/kazusa/utils/BookChapterExtensions.kt b/app/src/main/java/io/legado/app/utils/BookChapterExtensions.kt similarity index 53% rename from app/src/main/java/io/legato/kazusa/utils/BookChapterExtensions.kt rename to app/src/main/java/io/legado/app/utils/BookChapterExtensions.kt index 68bf10602..890062f6a 100644 --- a/app/src/main/java/io/legato/kazusa/utils/BookChapterExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/BookChapterExtensions.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.data.entities.BookChapter +import io.legado.app.data.entities.BookChapter fun BookChapter.internString() { title = title.intern() diff --git a/app/src/main/java/io/legato/kazusa/utils/ByteArrayExtensions.kt b/app/src/main/java/io/legado/app/utils/ByteArrayExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/ByteArrayExtensions.kt rename to app/src/main/java/io/legado/app/utils/ByteArrayExtensions.kt index 121ef887f..3ab51443d 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ByteArrayExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ByteArrayExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils /** diff --git a/app/src/main/java/io/legato/kazusa/utils/ChineseUtils.kt b/app/src/main/java/io/legado/app/utils/ChineseUtils.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/ChineseUtils.kt rename to app/src/main/java/io/legado/app/utils/ChineseUtils.kt index fbf1f5af0..a363f47d6 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ChineseUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ChineseUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import com.github.liuyueyi.quick.transfer.ChineseUtils import com.github.liuyueyi.quick.transfer.constants.TransType diff --git a/app/src/main/java/io/legato/kazusa/utils/CollectionExtensions.kt b/app/src/main/java/io/legado/app/utils/CollectionExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/CollectionExtensions.kt rename to app/src/main/java/io/legado/app/utils/CollectionExtensions.kt index 870fc9673..f64df9239 100644 --- a/app/src/main/java/io/legato/kazusa/utils/CollectionExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/CollectionExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils fun List.fastSum(): Float { var sum = 0f diff --git a/app/src/main/java/io/legato/kazusa/utils/ColorUtils.kt b/app/src/main/java/io/legado/app/utils/ColorUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/ColorUtils.kt rename to app/src/main/java/io/legado/app/utils/ColorUtils.kt index 1ef1281b1..02d6ba8e4 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ColorUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ColorUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.graphics.Color import androidx.annotation.ColorInt diff --git a/app/src/main/java/io/legato/kazusa/utils/ConfigurationExtensions.kt b/app/src/main/java/io/legado/app/utils/ConfigurationExtensions.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/utils/ConfigurationExtensions.kt rename to app/src/main/java/io/legado/app/utils/ConfigurationExtensions.kt index 4832d24cf..186e8ae69 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ConfigurationExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ConfigurationExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.res.Configuration import android.content.res.Resources diff --git a/app/src/main/java/io/legato/kazusa/utils/ConflateLiveData.kt b/app/src/main/java/io/legado/app/utils/ConflateLiveData.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/ConflateLiveData.kt rename to app/src/main/java/io/legado/app/utils/ConflateLiveData.kt index 8adac94c4..6e30ba16e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ConflateLiveData.kt +++ b/app/src/main/java/io/legado/app/utils/ConflateLiveData.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/io/legato/kazusa/utils/ConstraintModify.kt b/app/src/main/java/io/legado/app/utils/ConstraintModify.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/ConstraintModify.kt rename to app/src/main/java/io/legado/app/utils/ConstraintModify.kt index 0a1bab405..9b092a809 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ConstraintModify.kt +++ b/app/src/main/java/io/legado/app/utils/ConstraintModify.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.annotation.IdRes import androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/java/io/legato/kazusa/utils/ContextExtensions.kt b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/ContextExtensions.kt rename to app/src/main/java/io/legado/app/utils/ContextExtensions.kt index c1171f9c9..a73826b7e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ContextExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused", "UnusedReceiverParameter") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.app.Activity @@ -39,17 +39,17 @@ import androidx.core.net.toUri import androidx.datastore.preferences.preferencesDataStore import androidx.preference.PreferenceManager import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.help.IntentHelp -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.manga.ReadMangaActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity +import io.legado.app.R +import io.legado.app.constant.AppConst +import io.legado.app.data.entities.Book +import io.legado.app.help.IntentHelp +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.manga.ReadMangaActivity +import io.legado.app.ui.book.read.ReadBookActivity import splitties.systemservices.clipboardManager import splitties.systemservices.connectivityManager import splitties.systemservices.uiModeManager diff --git a/app/src/main/java/io/legato/kazusa/utils/ConvertExtensions.kt b/app/src/main/java/io/legado/app/utils/ConvertExtensions.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/ConvertExtensions.kt rename to app/src/main/java/io/legado/app/utils/ConvertExtensions.kt index 59991237a..167664327 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ConvertExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ConvertExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.res.Resources import android.graphics.Bitmap diff --git a/app/src/main/java/io/legato/kazusa/utils/CookieManagerExtensions.kt b/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/CookieManagerExtensions.kt rename to app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt index 44e62518b..ba57149e6 100644 --- a/app/src/main/java/io/legato/kazusa/utils/CookieManagerExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("UnusedReceiverParameter") -package io.legato.kazusa.utils +package io.legado.app.utils import android.webkit.CookieManager diff --git a/app/src/main/java/io/legato/kazusa/utils/CoroutineExtensions.kt b/app/src/main/java/io/legado/app/utils/CoroutineExtensions.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/CoroutineExtensions.kt rename to app/src/main/java/io/legado/app/utils/CoroutineExtensions.kt index 94c8dbe3a..abe990bce 100644 --- a/app/src/main/java/io/legato/kazusa/utils/CoroutineExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/CoroutineExtensions.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.help.coroutine.Coroutine +import io.legado.app.help.coroutine.Coroutine import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay diff --git a/app/src/main/java/io/legato/kazusa/utils/CustomExportUtils.kt b/app/src/main/java/io/legado/app/utils/CustomExportUtils.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/utils/CustomExportUtils.kt rename to app/src/main/java/io/legado/app/utils/CustomExportUtils.kt index 7f3df4b27..80fdf2c70 100644 --- a/app/src/main/java/io/legato/kazusa/utils/CustomExportUtils.kt +++ b/app/src/main/java/io/legado/app/utils/CustomExportUtils.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig // 匹配待“输入的章节”字符串 private val regexEpisode = Regex("\\d+(-\\d+)?(,\\d+(-\\d+)?)*") diff --git a/app/src/main/java/io/legato/kazusa/utils/DataStoreUtil.kt b/app/src/main/java/io/legado/app/utils/DataStoreUtil.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/DataStoreUtil.kt rename to app/src/main/java/io/legado/app/utils/DataStoreUtil.kt index 48cdf6292..2d1af6311 100644 --- a/app/src/main/java/io/legato/kazusa/utils/DataStoreUtil.kt +++ b/app/src/main/java/io/legado/app/utils/DataStoreUtil.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import androidx.datastore.preferences.core.booleanPreferencesKey diff --git a/app/src/main/java/io/legato/kazusa/utils/Debounce.kt b/app/src/main/java/io/legado/app/utils/Debounce.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/Debounce.kt rename to app/src/main/java/io/legado/app/utils/Debounce.kt index ef4a86e47..ab1e4cc3f 100644 --- a/app/src/main/java/io/legato/kazusa/utils/Debounce.kt +++ b/app/src/main/java/io/legado/app/utils/Debounce.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.SystemClock import kotlin.math.max diff --git a/app/src/main/java/io/legato/kazusa/utils/DebugLog.kt b/app/src/main/java/io/legado/app/utils/DebugLog.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/DebugLog.kt rename to app/src/main/java/io/legado/app/utils/DebugLog.kt index fe744d6d5..07295b45f 100644 --- a/app/src/main/java/io/legato/kazusa/utils/DebugLog.kt +++ b/app/src/main/java/io/legado/app/utils/DebugLog.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.util.Log -import io.legato.kazusa.BuildConfig +import io.legado.app.BuildConfig object DebugLog { diff --git a/app/src/main/java/io/legato/kazusa/utils/DialogExtensions.kt b/app/src/main/java/io/legado/app/utils/DialogExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/DialogExtensions.kt rename to app/src/main/java/io/legado/app/utils/DialogExtensions.kt index b55e9d1e5..456dc334c 100644 --- a/app/src/main/java/io/legato/kazusa/utils/DialogExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/DialogExtensions.kt @@ -1,12 +1,9 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.app.Dialog import android.view.WindowManager import androidx.appcompat.app.AlertDialog -import androidx.core.view.forEach import androidx.fragment.app.DialogFragment -import io.legato.kazusa.lib.theme.Selector -import io.legato.kazusa.lib.theme.ThemeStore //import io.legado.app.lib.theme.accentColor //import io.legado.app.lib.theme.filletBackground import splitties.systemservices.windowManager diff --git a/app/src/main/java/io/legato/kazusa/utils/DocumentUtils.kt b/app/src/main/java/io/legado/app/utils/DocumentUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/DocumentUtils.kt rename to app/src/main/java/io/legado/app/utils/DocumentUtils.kt index a5d28426c..827e6c5c2 100644 --- a/app/src/main/java/io/legato/kazusa/utils/DocumentUtils.kt +++ b/app/src/main/java/io/legado/app/utils/DocumentUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.documentfile.provider.DocumentFile diff --git a/app/src/main/java/io/legato/kazusa/utils/DrawableUtils.kt b/app/src/main/java/io/legado/app/utils/DrawableUtils.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/DrawableUtils.kt rename to app/src/main/java/io/legado/app/utils/DrawableUtils.kt index 5cc238923..8b49667d9 100644 --- a/app/src/main/java/io/legato/kazusa/utils/DrawableUtils.kt +++ b/app/src/main/java/io/legado/app/utils/DrawableUtils.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.res.ColorStateList import android.graphics.PorterDuff diff --git a/app/src/main/java/io/legato/kazusa/utils/EncoderUtils.kt b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/EncoderUtils.kt rename to app/src/main/java/io/legado/app/utils/EncoderUtils.kt index 1f478352b..97f4d1dca 100644 --- a/app/src/main/java/io/legato/kazusa/utils/EncoderUtils.kt +++ b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.util.Base64 diff --git a/app/src/main/java/io/legato/kazusa/utils/EncodingDetect.kt b/app/src/main/java/io/legado/app/utils/EncodingDetect.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/EncodingDetect.kt rename to app/src/main/java/io/legado/app/utils/EncodingDetect.kt index 035ba3774..23eceb85a 100644 --- a/app/src/main/java/io/legato/kazusa/utils/EncodingDetect.kt +++ b/app/src/main/java/io/legado/app/utils/EncodingDetect.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.text.TextUtils -import io.legato.kazusa.lib.icu4j.CharsetDetector +import io.legado.app.lib.icu4j.CharsetDetector import org.jsoup.Jsoup import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/utils/EventBusExtensions.kt b/app/src/main/java/io/legado/app/utils/EventBusExtensions.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/EventBusExtensions.kt rename to app/src/main/java/io/legado/app/utils/EventBusExtensions.kt index ae8239342..13947c893 100644 --- a/app/src/main/java/io/legato/kazusa/utils/EventBusExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/EventBusExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment diff --git a/app/src/main/java/io/legato/kazusa/utils/FileDocExtensions.kt b/app/src/main/java/io/legado/app/utils/FileDocExtensions.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/FileDocExtensions.kt rename to app/src/main/java/io/legado/app/utils/FileDocExtensions.kt index 2762138a2..2f8026e94 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FileDocExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FileDocExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.app.DownloadManager import android.content.Context @@ -10,7 +10,7 @@ import android.os.ParcelFileDescriptor import android.provider.DocumentsContract import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile -import io.legato.kazusa.exception.NoStackTraceException +import io.legado.app.exception.NoStackTraceException import splitties.init.appCtx import splitties.systemservices.downloadManager import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/utils/FileExtensions.kt b/app/src/main/java/io/legado/app/utils/FileExtensions.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/FileExtensions.kt rename to app/src/main/java/io/legado/app/utils/FileExtensions.kt index 55df3dfce..1bdf2d7d7 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FileExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FileExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.net.Uri import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/utils/FileUtils.kt b/app/src/main/java/io/legado/app/utils/FileUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/FileUtils.kt rename to app/src/main/java/io/legado/app/utils/FileUtils.kt index 2a321df95..6cf3255d2 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FileUtils.kt +++ b/app/src/main/java/io/legado/app/utils/FileUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.Environment import android.webkit.MimeTypeMap diff --git a/app/src/main/java/io/legato/kazusa/utils/FirebaseManager.kt b/app/src/main/java/io/legado/app/utils/FirebaseManager.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/FirebaseManager.kt rename to app/src/main/java/io/legado/app/utils/FirebaseManager.kt index 1b3be3a30..3b1362825 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FirebaseManager.kt +++ b/app/src/main/java/io/legado/app/utils/FirebaseManager.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import com.google.firebase.FirebaseApp import com.google.firebase.analytics.FirebaseAnalytics -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig object FirebaseManager { diff --git a/app/src/main/java/io/legato/kazusa/utils/FlowExtensions.kt b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/FlowExtensions.kt rename to app/src/main/java/io/legado/app/utils/FlowExtensions.kt index 723517033..494ff0a5e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FlowExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FlowExtensions.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle -import io.legato.kazusa.data.appDb +import io.legado.app.data.appDb import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.async import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/io/legato/kazusa/utils/FragmentExtensions.kt b/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/utils/FragmentExtensions.kt rename to app/src/main/java/io/legado/app/utils/FragmentExtensions.kt index 48e05afd9..10aa12948 100644 --- a/app/src/main/java/io/legato/kazusa/utils/FragmentExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.app.Activity import android.content.Intent @@ -13,16 +13,16 @@ import androidx.core.content.edit import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.help.book.isAudio -import io.legato.kazusa.help.book.isImage -import io.legato.kazusa.help.book.isLocal -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.ui.book.audio.AudioPlayActivity -import io.legato.kazusa.ui.book.manga.ReadMangaActivity -import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.ui.widget.dialog.TextDialog +import io.legado.app.R +import io.legado.app.data.entities.Book +import io.legado.app.help.book.isAudio +import io.legado.app.help.book.isImage +import io.legado.app.help.book.isLocal +import io.legado.app.help.config.AppConfig +import io.legado.app.ui.book.audio.AudioPlayActivity +import io.legado.app.ui.book.manga.ReadMangaActivity +import io.legado.app.ui.book.read.ReadBookActivity +import io.legado.app.ui.widget.dialog.TextDialog inline fun Fragment.showDialogFragment( arguments: Bundle.() -> Unit = {} diff --git a/app/src/main/java/io/legato/kazusa/utils/GsonExtensions.kt b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/GsonExtensions.kt rename to app/src/main/java/io/legado/app/utils/GsonExtensions.kt index 9d1003fe0..9dc133090 100644 --- a/app/src/main/java/io/legato/kazusa/utils/GsonExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import com.google.gson.Gson import com.google.gson.GsonBuilder @@ -12,12 +12,12 @@ import com.google.gson.ToNumberPolicy import com.google.gson.internal.LinkedTreeMap import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonWriter -import io.legato.kazusa.data.entities.rule.BookInfoRule -import io.legato.kazusa.data.entities.rule.ContentRule -import io.legato.kazusa.data.entities.rule.ExploreRule -import io.legato.kazusa.data.entities.rule.ReviewRule -import io.legato.kazusa.data.entities.rule.SearchRule -import io.legato.kazusa.data.entities.rule.TocRule +import io.legado.app.data.entities.rule.BookInfoRule +import io.legado.app.data.entities.rule.ContentRule +import io.legado.app.data.entities.rule.ExploreRule +import io.legado.app.data.entities.rule.ReviewRule +import io.legado.app.data.entities.rule.SearchRule +import io.legado.app.data.entities.rule.TocRule import java.io.InputStream import java.io.InputStreamReader import java.io.OutputStream diff --git a/app/src/main/java/io/legato/kazusa/utils/HandlerUtils.kt b/app/src/main/java/io/legado/app/utils/HandlerUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/HandlerUtils.kt rename to app/src/main/java/io/legado/app/utils/HandlerUtils.kt index 243d76966..5da7da425 100644 --- a/app/src/main/java/io/legato/kazusa/utils/HandlerUtils.kt +++ b/app/src/main/java/io/legado/app/utils/HandlerUtils.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.Build.VERSION.SDK_INT import android.os.Handler diff --git a/app/src/main/java/io/legato/kazusa/utils/HtmlFormatter.kt b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/HtmlFormatter.kt rename to app/src/main/java/io/legado/app/utils/HtmlFormatter.kt index 14e10c722..5b67b4ad1 100644 --- a/app/src/main/java/io/legato/kazusa/utils/HtmlFormatter.kt +++ b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt @@ -1,6 +1,6 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.AnalyzeUrl import java.net.URL import java.util.regex.Pattern diff --git a/app/src/main/java/io/legato/kazusa/utils/ImageSaveUtils.kt b/app/src/main/java/io/legado/app/utils/ImageSaveUtils.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/ImageSaveUtils.kt rename to app/src/main/java/io/legado/app/utils/ImageSaveUtils.kt index a7d20e5ef..900a7c3e1 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ImageSaveUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ImageSaveUtils.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.ContentValues import android.content.Context import android.os.Build import android.provider.MediaStore -import io.legato.kazusa.constant.AppConst +import io.legado.app.constant.AppConst import java.util.Date object ImageSaveUtils { diff --git a/app/src/main/java/io/legato/kazusa/utils/ImageUtils.kt b/app/src/main/java/io/legado/app/utils/ImageUtils.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/utils/ImageUtils.kt rename to app/src/main/java/io/legado/app/utils/ImageUtils.kt index 955f49cce..5cae6f371 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ImageUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ImageUtils.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.data.entities.BaseSource -import io.legato.kazusa.data.entities.Book -import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.RssSource +import io.legado.app.constant.AppLog +import io.legado.app.data.entities.BaseSource +import io.legado.app.data.entities.Book +import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.RssSource import java.io.ByteArrayInputStream import java.io.InputStream diff --git a/app/src/main/java/io/legato/kazusa/utils/InputStreamExtensions.kt b/app/src/main/java/io/legado/app/utils/InputStreamExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/InputStreamExtensions.kt rename to app/src/main/java/io/legado/app/utils/InputStreamExtensions.kt index 3beeaf805..e36814f8e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/InputStreamExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/InputStreamExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import java.io.InputStream import java.util.* diff --git a/app/src/main/java/io/legato/kazusa/utils/IntentExtensions.kt b/app/src/main/java/io/legado/app/utils/IntentExtensions.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/IntentExtensions.kt rename to app/src/main/java/io/legado/app/utils/IntentExtensions.kt index 4a66241d7..3edc732bd 100644 --- a/app/src/main/java/io/legato/kazusa/utils/IntentExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/IntentExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Intent diff --git a/app/src/main/java/io/legato/kazusa/utils/IntentType.kt b/app/src/main/java/io/legado/app/utils/IntentType.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/IntentType.kt rename to app/src/main/java/io/legado/app/utils/IntentType.kt index 6026b8aca..90385292d 100644 --- a/app/src/main/java/io/legato/kazusa/utils/IntentType.kt +++ b/app/src/main/java/io/legado/app/utils/IntentType.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.net.Uri import java.io.File diff --git a/app/src/main/java/io/legato/kazusa/utils/JsURL.kt b/app/src/main/java/io/legado/app/utils/JsURL.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/JsURL.kt rename to app/src/main/java/io/legado/app/utils/JsURL.kt index acd1300a0..fbd6a39db 100644 --- a/app/src/main/java/io/legato/kazusa/utils/JsURL.kt +++ b/app/src/main/java/io/legado/app/utils/JsURL.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.annotation.Keep import java.net.URL diff --git a/app/src/main/java/io/legato/kazusa/utils/JsonExtensions.kt b/app/src/main/java/io/legado/app/utils/JsonExtensions.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/JsonExtensions.kt rename to app/src/main/java/io/legado/app/utils/JsonExtensions.kt index cbdaac5fb..1e9a0289d 100644 --- a/app/src/main/java/io/legato/kazusa/utils/JsonExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/JsonExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import com.jayway.jsonpath.* diff --git a/app/src/main/java/io/legato/kazusa/utils/JsoupExtensions.kt b/app/src/main/java/io/legado/app/utils/JsoupExtensions.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/JsoupExtensions.kt rename to app/src/main/java/io/legado/app/utils/JsoupExtensions.kt index 100bf7a95..b86ca225d 100644 --- a/app/src/main/java/io/legato/kazusa/utils/JsoupExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/JsoupExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import org.jsoup.internal.StringUtil import org.jsoup.nodes.CDataNode diff --git a/app/src/main/java/io/legato/kazusa/utils/LogUtils.kt b/app/src/main/java/io/legado/app/utils/LogUtils.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/LogUtils.kt rename to app/src/main/java/io/legado/app/utils/LogUtils.kt index 661699e31..2f04c259b 100644 --- a/app/src/main/java/io/legato/kazusa/utils/LogUtils.kt +++ b/app/src/main/java/io/legado/app/utils/LogUtils.kt @@ -1,16 +1,16 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.content.Context import android.os.Build import android.webkit.WebSettings -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.constant.AppConst -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.help.globalExecutor +import io.legado.app.BuildConfig +import io.legado.app.constant.AppConst +import io.legado.app.constant.AppLog +import io.legado.app.help.config.AppConfig +import io.legado.app.help.globalExecutor import splitties.init.appCtx import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/io/legato/kazusa/utils/MD5Utils.kt b/app/src/main/java/io/legado/app/utils/MD5Utils.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/MD5Utils.kt rename to app/src/main/java/io/legado/app/utils/MD5Utils.kt index a61bd3d8c..261626aa8 100644 --- a/app/src/main/java/io/legato/kazusa/utils/MD5Utils.kt +++ b/app/src/main/java/io/legado/app/utils/MD5Utils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import cn.hutool.crypto.digest.DigestUtil import cn.hutool.crypto.digest.Digester diff --git a/app/src/main/java/io/legato/kazusa/utils/MapExtensions.kt b/app/src/main/java/io/legado/app/utils/MapExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/MapExtensions.kt rename to app/src/main/java/io/legado/app/utils/MapExtensions.kt index 36901031b..d035b2a73 100644 --- a/app/src/main/java/io/legato/kazusa/utils/MapExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/MapExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils fun HashMap.has(key: String, ignoreCase: Boolean = false): Boolean { for (item in this) { diff --git a/app/src/main/java/io/legato/kazusa/utils/MenuExtensions.kt b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/MenuExtensions.kt rename to app/src/main/java/io/legado/app/utils/MenuExtensions.kt index 14d0f6ec1..376bbc1da 100644 --- a/app/src/main/java/io/legato/kazusa/utils/MenuExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.content.Context @@ -8,8 +8,8 @@ import android.view.Menu import android.view.View import android.widget.ImageButton import androidx.appcompat.view.menu.MenuBuilder -import io.legato.kazusa.R -import io.legato.kazusa.constant.Theme +import io.legado.app.R +import io.legado.app.constant.Theme //import io.legado.app.lib.theme.primaryTextColor import java.lang.reflect.Method diff --git a/app/src/main/java/io/legato/kazusa/utils/MutableLiveDataExtensions.kt b/app/src/main/java/io/legado/app/utils/MutableLiveDataExtensions.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/utils/MutableLiveDataExtensions.kt rename to app/src/main/java/io/legado/app/utils/MutableLiveDataExtensions.kt index 7e35ff6b0..c4fc6be6e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/MutableLiveDataExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/MutableLiveDataExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/io/legato/kazusa/utils/NavigationViewUtils.kt b/app/src/main/java/io/legado/app/utils/NavigationViewUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/NavigationViewUtils.kt rename to app/src/main/java/io/legado/app/utils/NavigationViewUtils.kt index ba223e781..6f68d090f 100644 --- a/app/src/main/java/io/legato/kazusa/utils/NavigationViewUtils.kt +++ b/app/src/main/java/io/legado/app/utils/NavigationViewUtils.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.res.ColorStateList import androidx.annotation.ColorInt diff --git a/app/src/main/java/io/legato/kazusa/utils/NetworkUtils.kt b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/NetworkUtils.kt rename to app/src/main/java/io/legado/app/utils/NetworkUtils.kt index b05c8a614..0be4bda13 100644 --- a/app/src/main/java/io/legato/kazusa/utils/NetworkUtils.kt +++ b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.net.ConnectivityManager import android.net.NetworkCapabilities import android.os.Build import cn.hutool.core.lang.Validator -import io.legato.kazusa.constant.AppLog +import io.legado.app.constant.AppLog import okhttp3.internal.publicsuffix.PublicSuffixDatabase import splitties.systemservices.connectivityManager import java.net.InetAddress diff --git a/app/src/main/java/io/legato/kazusa/utils/PaintExtensions.kt b/app/src/main/java/io/legado/app/utils/PaintExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/PaintExtensions.kt rename to app/src/main/java/io/legado/app/utils/PaintExtensions.kt index ac00d17ea..ae4505aa4 100644 --- a/app/src/main/java/io/legato/kazusa/utils/PaintExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/PaintExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.os.Build import android.text.TextPaint diff --git a/app/src/main/java/io/legato/kazusa/utils/ParcelFileDescriptorChannel.kt b/app/src/main/java/io/legado/app/utils/ParcelFileDescriptorChannel.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/ParcelFileDescriptorChannel.kt rename to app/src/main/java/io/legado/app/utils/ParcelFileDescriptorChannel.kt index 4707e7fae..bd0a5ed22 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ParcelFileDescriptorChannel.kt +++ b/app/src/main/java/io/legado/app/utils/ParcelFileDescriptorChannel.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.os.ParcelFileDescriptor diff --git a/app/src/main/java/io/legato/kazusa/utils/PreferencesExtensions.kt b/app/src/main/java/io/legado/app/utils/PreferencesExtensions.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/PreferencesExtensions.kt rename to app/src/main/java/io/legado/app/utils/PreferencesExtensions.kt index 66b4a8932..9e128e03a 100644 --- a/app/src/main/java/io/legato/kazusa/utils/PreferencesExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/PreferencesExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/io/legato/kazusa/utils/QRCodeUtils.kt b/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/QRCodeUtils.kt rename to app/src/main/java/io/legado/app/utils/QRCodeUtils.kt index 2edcd8117..a51eb1315 100644 --- a/app/src/main/java/io/legato/kazusa/utils/QRCodeUtils.kt +++ b/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/io/legato/kazusa/utils/RandomColor.kt b/app/src/main/java/io/legado/app/utils/RandomColor.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/RandomColor.kt rename to app/src/main/java/io/legado/app/utils/RandomColor.kt index 12897debb..526afa6cc 100644 --- a/app/src/main/java/io/legato/kazusa/utils/RandomColor.kt +++ b/app/src/main/java/io/legado/app/utils/RandomColor.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.graphics.Color import java.util.* diff --git a/app/src/main/java/io/legato/kazusa/utils/RealPathUtil.kt b/app/src/main/java/io/legado/app/utils/RealPathUtil.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/RealPathUtil.kt rename to app/src/main/java/io/legado/app/utils/RealPathUtil.kt index 813d7ee5e..a2f5f317b 100644 --- a/app/src/main/java/io/legato/kazusa/utils/RealPathUtil.kt +++ b/app/src/main/java/io/legado/app/utils/RealPathUtil.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.content.ContentUris diff --git a/app/src/main/java/io/legato/kazusa/utils/RecyclerViewExtensions.kt b/app/src/main/java/io/legado/app/utils/RecyclerViewExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/RecyclerViewExtensions.kt rename to app/src/main/java/io/legado/app/utils/RecyclerViewExtensions.kt index b86afa7fb..f8c308a26 100644 --- a/app/src/main/java/io/legato/kazusa/utils/RecyclerViewExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/RecyclerViewExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/io/legato/kazusa/utils/RegexExtensions.kt b/app/src/main/java/io/legado/app/utils/RegexExtensions.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/RegexExtensions.kt rename to app/src/main/java/io/legado/app/utils/RegexExtensions.kt index f02b283f3..b379c62f7 100644 --- a/app/src/main/java/io/legato/kazusa/utils/RegexExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/RegexExtensions.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.core.os.postDelayed import com.script.ScriptBindings import com.script.rhino.RhinoScriptEngine -import io.legato.kazusa.exception.RegexTimeoutException -import io.legato.kazusa.help.CrashHandler -import io.legato.kazusa.help.coroutine.Coroutine +import io.legado.app.exception.RegexTimeoutException +import io.legado.app.help.CrashHandler +import io.legado.app.help.coroutine.Coroutine import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.runBlocking import kotlinx.coroutines.suspendCancellableCoroutine diff --git a/app/src/main/java/io/legato/kazusa/utils/RequestManagerExtensions.kt b/app/src/main/java/io/legado/app/utils/RequestManagerExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/RequestManagerExtensions.kt rename to app/src/main/java/io/legado/app/utils/RequestManagerExtensions.kt index 2a408d5cd..647fe0524 100644 --- a/app/src/main/java/io/legato/kazusa/utils/RequestManagerExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/RequestManagerExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.Lifecycle diff --git a/app/src/main/java/io/legato/kazusa/utils/Snackbars.kt b/app/src/main/java/io/legado/app/utils/Snackbars.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/Snackbars.kt rename to app/src/main/java/io/legado/app/utils/Snackbars.kt index 8b522830a..1adeeabda 100644 --- a/app/src/main/java/io/legato/kazusa/utils/Snackbars.kt +++ b/app/src/main/java/io/legado/app/utils/Snackbars.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.view.View import androidx.annotation.StringRes diff --git a/app/src/main/java/io/legato/kazusa/utils/StringExtensions.kt b/app/src/main/java/io/legado/app/utils/StringExtensions.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/StringExtensions.kt rename to app/src/main/java/io/legado/app/utils/StringExtensions.kt index 6aac17e2e..483ef96e3 100644 --- a/app/src/main/java/io/legato/kazusa/utils/StringExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/StringExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.icu.text.Collator @@ -8,8 +8,8 @@ import android.icu.util.ULocale import android.net.Uri import android.text.Editable import cn.hutool.core.net.URLEncodeUtil -import io.legato.kazusa.constant.AppPattern -import io.legato.kazusa.constant.AppPattern.dataUriRegex +import io.legado.app.constant.AppPattern +import io.legado.app.constant.AppPattern.dataUriRegex import java.io.File import java.lang.Character.codePointCount import java.lang.Character.offsetByCodePoints diff --git a/app/src/main/java/io/legato/kazusa/utils/StringUtils.kt b/app/src/main/java/io/legado/app/utils/StringUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/StringUtils.kt rename to app/src/main/java/io/legado/app/utils/StringUtils.kt index 6b44bdf03..acc118d12 100644 --- a/app/src/main/java/io/legato/kazusa/utils/StringUtils.kt +++ b/app/src/main/java/io/legado/app/utils/StringUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.text.TextUtils.isEmpty diff --git a/app/src/main/java/io/legato/kazusa/utils/SvgUtils.kt b/app/src/main/java/io/legado/app/utils/SvgUtils.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/SvgUtils.kt rename to app/src/main/java/io/legado/app/utils/SvgUtils.kt index 6df869be3..d1906e46e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/SvgUtils.kt +++ b/app/src/main/java/io/legado/app/utils/SvgUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.graphics.Canvas import android.graphics.Bitmap diff --git a/app/src/main/java/io/legato/kazusa/utils/SyncedRenderer.kt b/app/src/main/java/io/legado/app/utils/SyncedRenderer.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/SyncedRenderer.kt rename to app/src/main/java/io/legado/app/utils/SyncedRenderer.kt index c1cfd7034..8ec825221 100644 --- a/app/src/main/java/io/legato/kazusa/utils/SyncedRenderer.kt +++ b/app/src/main/java/io/legado/app/utils/SyncedRenderer.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.view.Choreographer diff --git a/app/src/main/java/io/legato/kazusa/utils/SystemUtils.kt b/app/src/main/java/io/legado/app/utils/SystemUtils.kt similarity index 98% rename from app/src/main/java/io/legato/kazusa/utils/SystemUtils.kt rename to app/src/main/java/io/legado/app/utils/SystemUtils.kt index 87478c904..f397eb375 100644 --- a/app/src/main/java/io/legato/kazusa/utils/SystemUtils.kt +++ b/app/src/main/java/io/legado/app/utils/SystemUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/io/legato/kazusa/utils/Throttle.kt b/app/src/main/java/io/legado/app/utils/Throttle.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/utils/Throttle.kt rename to app/src/main/java/io/legado/app/utils/Throttle.kt index 759f4b297..bd8cc8266 100644 --- a/app/src/main/java/io/legato/kazusa/utils/Throttle.kt +++ b/app/src/main/java/io/legado/app/utils/Throttle.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils @Suppress("unused") class Throttle( diff --git a/app/src/main/java/io/legato/kazusa/utils/ThrowableExtensions.kt b/app/src/main/java/io/legado/app/utils/ThrowableExtensions.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/ThrowableExtensions.kt rename to app/src/main/java/io/legado/app/utils/ThrowableExtensions.kt index 3a7f27aed..4163b8211 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ThrowableExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ThrowableExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import java.io.IOException diff --git a/app/src/main/java/io/legato/kazusa/utils/TimeUtils.kt b/app/src/main/java/io/legado/app/utils/TimeUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/TimeUtils.kt rename to app/src/main/java/io/legado/app/utils/TimeUtils.kt index 3b28001b5..4e15c0f17 100644 --- a/app/src/main/java/io/legato/kazusa/utils/TimeUtils.kt +++ b/app/src/main/java/io/legado/app/utils/TimeUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import kotlin.math.abs diff --git a/app/src/main/java/io/legato/kazusa/utils/ToastUtils.kt b/app/src/main/java/io/legado/app/utils/ToastUtils.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/ToastUtils.kt rename to app/src/main/java/io/legado/app/utils/ToastUtils.kt index 16949c429..9af8d7628 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ToastUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ToastUtils.kt @@ -1,13 +1,13 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import android.widget.Toast import androidx.fragment.app.Fragment -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.databinding.ViewToastBinding -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.BuildConfig +import io.legado.app.databinding.ViewToastBinding +import io.legado.app.help.config.AppConfig import splitties.systemservices.layoutInflater private var toastForJs: Toast? = null diff --git a/app/src/main/java/io/legato/kazusa/utils/ToolbarUtils.kt b/app/src/main/java/io/legado/app/utils/ToolbarUtils.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/ToolbarUtils.kt rename to app/src/main/java/io/legado/app/utils/ToolbarUtils.kt index e21f85bf1..27104e314 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ToolbarUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ToolbarUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.graphics.PorterDuff @@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat import androidx.core.view.get import androidx.core.view.size import com.google.android.material.appbar.MaterialToolbar -import io.legato.kazusa.R +import io.legado.app.R object ToolbarUtils { @JvmStatic diff --git a/app/src/main/java/io/legato/kazusa/utils/UriExtensions.kt b/app/src/main/java/io/legado/app/utils/UriExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/UriExtensions.kt rename to app/src/main/java/io/legado/app/utils/UriExtensions.kt index ac3c818ed..17a760bf6 100644 --- a/app/src/main/java/io/legato/kazusa/utils/UriExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/UriExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import android.content.Intent @@ -8,11 +8,11 @@ import android.os.ParcelFileDescriptor import androidx.appcompat.app.AppCompatActivity import androidx.documentfile.provider.DocumentFile import androidx.fragment.app.Fragment -import io.legato.kazusa.R -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.exception.NoStackTraceException -import io.legato.kazusa.lib.permission.Permissions -import io.legato.kazusa.lib.permission.PermissionsCompat +import io.legado.app.R +import io.legado.app.constant.AppLog +import io.legado.app.exception.NoStackTraceException +import io.legado.app.lib.permission.Permissions +import io.legado.app.lib.permission.PermissionsCompat import okhttp3.MediaType import okhttp3.RequestBody import okio.BufferedSink diff --git a/app/src/main/java/io/legato/kazusa/utils/UrlUtil.kt b/app/src/main/java/io/legado/app/utils/UrlUtil.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/UrlUtil.kt rename to app/src/main/java/io/legado/app/utils/UrlUtil.kt index bbd4947ef..eb5425cb2 100644 --- a/app/src/main/java/io/legato/kazusa/utils/UrlUtil.kt +++ b/app/src/main/java/io/legado/app/utils/UrlUtil.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.utils +package io.legado.app.utils -import io.legato.kazusa.BuildConfig -import io.legato.kazusa.constant.AppLog -import io.legato.kazusa.constant.AppPattern.semicolonRegex -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.analyzeRule.AnalyzeUrl -import io.legato.kazusa.model.analyzeRule.CustomUrl +import io.legado.app.BuildConfig +import io.legado.app.constant.AppLog +import io.legado.app.constant.AppPattern.semicolonRegex +import io.legado.app.help.config.AppConfig +import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.model.analyzeRule.CustomUrl import java.net.HttpURLConnection import java.net.URL import java.net.URLDecoder diff --git a/app/src/main/java/io/legato/kazusa/utils/Utf8BomUtils.kt b/app/src/main/java/io/legado/app/utils/Utf8BomUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/Utf8BomUtils.kt rename to app/src/main/java/io/legado/app/utils/Utf8BomUtils.kt index 0e946a79c..1de5e9421 100644 --- a/app/src/main/java/io/legato/kazusa/utils/Utf8BomUtils.kt +++ b/app/src/main/java/io/legado/app/utils/Utf8BomUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils @Suppress("unused") object Utf8BomUtils { diff --git a/app/src/main/java/io/legato/kazusa/utils/VibrationUtils.kt b/app/src/main/java/io/legado/app/utils/VibrationUtils.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/VibrationUtils.kt rename to app/src/main/java/io/legado/app/utils/VibrationUtils.kt index f215fefef..8bda5a5e9 100644 --- a/app/src/main/java/io/legato/kazusa/utils/VibrationUtils.kt +++ b/app/src/main/java/io/legado/app/utils/VibrationUtils.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.content.Context import android.os.Build diff --git a/app/src/main/java/io/legato/kazusa/utils/ViewExtensions.kt b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/ViewExtensions.kt rename to app/src/main/java/io/legado/app/utils/ViewExtensions.kt index 51393bf71..5a6b4a84d 100644 --- a/app/src/main/java/io/legato/kazusa/utils/ViewExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.content.Context @@ -39,10 +39,10 @@ import androidx.core.view.marginBottom import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.lib.theme.TintHelper -import io.legato.kazusa.utils.canvasrecorder.CanvasRecorder -import io.legato.kazusa.utils.canvasrecorder.record +import io.legado.app.help.config.AppConfig +import io.legado.app.lib.theme.TintHelper +import io.legado.app.utils.canvasrecorder.CanvasRecorder +import io.legado.app.utils.canvasrecorder.record import splitties.systemservices.inputMethodManager import splitties.views.bottomPadding import splitties.views.topPadding diff --git a/app/src/main/java/io/legato/kazusa/utils/WebSettingsExtensions.kt b/app/src/main/java/io/legado/app/utils/WebSettingsExtensions.kt similarity index 93% rename from app/src/main/java/io/legato/kazusa/utils/WebSettingsExtensions.kt rename to app/src/main/java/io/legado/app/utils/WebSettingsExtensions.kt index ec6ad1410..7c0623f91 100644 --- a/app/src/main/java/io/legato/kazusa/utils/WebSettingsExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/WebSettingsExtensions.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import android.annotation.SuppressLint import android.os.Build import android.webkit.WebSettings import androidx.webkit.WebSettingsCompat import androidx.webkit.WebViewFeature -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig /** * 设置是否夜间模式 diff --git a/app/src/main/java/io/legato/kazusa/utils/WindowInsetsExtensions.kt b/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt similarity index 90% rename from app/src/main/java/io/legato/kazusa/utils/WindowInsetsExtensions.kt rename to app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt index 5a4826390..789610d47 100644 --- a/app/src/main/java/io/legato/kazusa/utils/WindowInsetsExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils +package io.legado.app.utils import androidx.core.view.WindowInsetsCompat diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/BaseCanvasRecorder.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/BaseCanvasRecorder.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/BaseCanvasRecorder.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/BaseCanvasRecorder.kt index 740b8966a..ee521b0b4 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/BaseCanvasRecorder.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/BaseCanvasRecorder.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import androidx.annotation.CallSuper diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorder.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorder.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorder.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorder.kt index 9fb774bd2..904d1bf56 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorder.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorder.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Canvas diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi23Impl.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi23Impl.kt similarity index 86% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi23Impl.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi23Impl.kt index 5c849e7ff..bc0964f53 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi23Impl.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi23Impl.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Canvas import android.graphics.Picture -import io.legato.kazusa.utils.canvasrecorder.pools.PicturePool -import io.legato.kazusa.utils.objectpool.synchronized +import io.legado.app.utils.canvasrecorder.pools.PicturePool +import io.legado.app.utils.objectpool.synchronized class CanvasRecorderApi23Impl : BaseCanvasRecorder() { diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi29Impl.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi29Impl.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi29Impl.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi29Impl.kt index 5901a8dc1..ce7205c88 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderApi29Impl.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderApi29Impl.kt @@ -1,13 +1,13 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Canvas import android.graphics.Picture import android.graphics.RenderNode import android.os.Build import androidx.annotation.RequiresApi -import io.legato.kazusa.utils.objectpool.synchronized -import io.legato.kazusa.utils.canvasrecorder.pools.PicturePool -import io.legato.kazusa.utils.canvasrecorder.pools.RenderNodePool +import io.legado.app.utils.objectpool.synchronized +import io.legado.app.utils.canvasrecorder.pools.PicturePool +import io.legado.app.utils.canvasrecorder.pools.RenderNodePool @RequiresApi(Build.VERSION_CODES.Q) class CanvasRecorderApi29Impl : BaseCanvasRecorder() { diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderExtensions.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderExtensions.kt similarity index 95% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderExtensions.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderExtensions.kt index 18f0851f2..17b905bf5 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderExtensions.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Canvas import android.view.View diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderFactory.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderFactory.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderFactory.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderFactory.kt index 84d64cf71..f6c550372 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderFactory.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderFactory.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.os.Build -import io.legato.kazusa.help.config.AppConfig +import io.legado.app.help.config.AppConfig object CanvasRecorderFactory { diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderImpl.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderImpl.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderImpl.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderImpl.kt index 3e069becb..08bcd9ecd 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderImpl.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderImpl.kt @@ -1,10 +1,10 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Color import com.bumptech.glide.Glide -import io.legato.kazusa.utils.canvasrecorder.pools.CanvasPool +import io.legado.app.utils.canvasrecorder.pools.CanvasPool import splitties.init.appCtx class CanvasRecorderImpl : BaseCanvasRecorder() { diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderLocked.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderLocked.kt similarity index 96% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderLocked.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderLocked.kt index 6873dceff..e3b672e3e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/CanvasRecorderLocked.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/CanvasRecorderLocked.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.canvasrecorder +package io.legado.app.utils.canvasrecorder import android.graphics.Canvas import java.util.concurrent.locks.ReentrantLock diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/CanvasPool.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/CanvasPool.kt similarity index 88% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/CanvasPool.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/pools/CanvasPool.kt index 4c226fd4f..2f3d625e7 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/CanvasPool.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/CanvasPool.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.canvasrecorder.pools +package io.legado.app.utils.canvasrecorder.pools import android.graphics.Canvas import androidx.core.util.Pools diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/PicturePool.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/PicturePool.kt similarity index 55% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/PicturePool.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/pools/PicturePool.kt index 765821413..cdf35774c 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/PicturePool.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/PicturePool.kt @@ -1,7 +1,7 @@ -package io.legato.kazusa.utils.canvasrecorder.pools +package io.legado.app.utils.canvasrecorder.pools import android.graphics.Picture -import io.legato.kazusa.utils.objectpool.BaseObjectPool +import io.legado.app.utils.objectpool.BaseObjectPool class PicturePool : BaseObjectPool(64) { diff --git a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/RenderNodePool.kt b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/RenderNodePool.kt similarity index 78% rename from app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/RenderNodePool.kt rename to app/src/main/java/io/legado/app/utils/canvasrecorder/pools/RenderNodePool.kt index 87be8940f..b7a9e8ca0 100644 --- a/app/src/main/java/io/legato/kazusa/utils/canvasrecorder/pools/RenderNodePool.kt +++ b/app/src/main/java/io/legado/app/utils/canvasrecorder/pools/RenderNodePool.kt @@ -1,9 +1,9 @@ -package io.legato.kazusa.utils.canvasrecorder.pools +package io.legado.app.utils.canvasrecorder.pools import android.graphics.RenderNode import android.os.Build import androidx.annotation.RequiresApi -import io.legato.kazusa.utils.objectpool.BaseObjectPool +import io.legado.app.utils.objectpool.BaseObjectPool @RequiresApi(Build.VERSION_CODES.Q) class RenderNodePool : BaseObjectPool(64) { diff --git a/app/src/main/java/io/legato/kazusa/utils/compress/LibArchiveUtils.kt b/app/src/main/java/io/legado/app/utils/compress/LibArchiveUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/compress/LibArchiveUtils.kt rename to app/src/main/java/io/legado/app/utils/compress/LibArchiveUtils.kt index 357d347d2..d52719a86 100644 --- a/app/src/main/java/io/legato/kazusa/utils/compress/LibArchiveUtils.kt +++ b/app/src/main/java/io/legado/app/utils/compress/LibArchiveUtils.kt @@ -1,11 +1,11 @@ -package io.legato.kazusa.utils.compress +package io.legado.app.utils.compress import android.os.ParcelFileDescriptor import android.system.ErrnoException import android.system.Os import android.system.OsConstants import android.system.OsConstants.S_ISDIR -import io.legato.kazusa.lib.icu4j.CharsetDetector +import io.legado.app.lib.icu4j.CharsetDetector import me.zhanghai.android.libarchive.Archive import me.zhanghai.android.libarchive.ArchiveEntry import me.zhanghai.android.libarchive.ArchiveException diff --git a/app/src/main/java/io/legato/kazusa/utils/compress/ZipUtils.kt b/app/src/main/java/io/legado/app/utils/compress/ZipUtils.kt similarity index 99% rename from app/src/main/java/io/legato/kazusa/utils/compress/ZipUtils.kt rename to app/src/main/java/io/legado/app/utils/compress/ZipUtils.kt index e30cfb01b..152421c9e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/compress/ZipUtils.kt +++ b/app/src/main/java/io/legado/app/utils/compress/ZipUtils.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.utils.compress +package io.legado.app.utils.compress import android.annotation.SuppressLint -import io.legato.kazusa.utils.DebugLog -import io.legato.kazusa.utils.printOnDebug +import io.legado.app.utils.DebugLog +import io.legado.app.utils.printOnDebug import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext import java.io.* diff --git a/app/src/main/java/io/legato/kazusa/utils/objectpool/BaseObjectPool.kt b/app/src/main/java/io/legado/app/utils/objectpool/BaseObjectPool.kt similarity index 89% rename from app/src/main/java/io/legato/kazusa/utils/objectpool/BaseObjectPool.kt rename to app/src/main/java/io/legado/app/utils/objectpool/BaseObjectPool.kt index 6c6674e22..b40201f70 100644 --- a/app/src/main/java/io/legato/kazusa/utils/objectpool/BaseObjectPool.kt +++ b/app/src/main/java/io/legado/app/utils/objectpool/BaseObjectPool.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.objectpool +package io.legado.app.utils.objectpool import androidx.annotation.CallSuper import androidx.core.util.Pools diff --git a/app/src/main/java/io/legato/kazusa/utils/objectpool/BaseSafeObjectPool.kt b/app/src/main/java/io/legado/app/utils/objectpool/BaseSafeObjectPool.kt similarity index 80% rename from app/src/main/java/io/legato/kazusa/utils/objectpool/BaseSafeObjectPool.kt rename to app/src/main/java/io/legado/app/utils/objectpool/BaseSafeObjectPool.kt index 8e40c5701..d5fb1eca6 100644 --- a/app/src/main/java/io/legato/kazusa/utils/objectpool/BaseSafeObjectPool.kt +++ b/app/src/main/java/io/legado/app/utils/objectpool/BaseSafeObjectPool.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.objectpool +package io.legado.app.utils.objectpool import androidx.core.util.Pools diff --git a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPool.kt b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPool.kt similarity index 70% rename from app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPool.kt rename to app/src/main/java/io/legado/app/utils/objectpool/ObjectPool.kt index 9fd6ebac9..f63a14d79 100644 --- a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPool.kt +++ b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPool.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.objectpool +package io.legado.app.utils.objectpool interface ObjectPool { diff --git a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolExtensions.kt b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolExtensions.kt similarity index 65% rename from app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolExtensions.kt rename to app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolExtensions.kt index 1af65ff78..a38c4d521 100644 --- a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolExtensions.kt @@ -1,3 +1,3 @@ -package io.legato.kazusa.utils.objectpool +package io.legado.app.utils.objectpool fun ObjectPool.synchronized(): ObjectPool = ObjectPoolLocked(this) diff --git a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolLocked.kt b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolLocked.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolLocked.kt rename to app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolLocked.kt index 3153c9ea7..890067b6e 100644 --- a/app/src/main/java/io/legato/kazusa/utils/objectpool/ObjectPoolLocked.kt +++ b/app/src/main/java/io/legado/app/utils/objectpool/ObjectPoolLocked.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.utils.objectpool +package io.legado.app.utils.objectpool class ObjectPoolLocked(private val delegate: ObjectPool) : ObjectPool by delegate { diff --git a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ActivityViewBindings.kt b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/ActivityViewBindings.kt similarity index 92% rename from app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ActivityViewBindings.kt rename to app/src/main/java/io/legado/app/utils/viewbindingdelegate/ActivityViewBindings.kt index aeb2ee0dc..321181022 100644 --- a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ActivityViewBindings.kt +++ b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/ActivityViewBindings.kt @@ -1,6 +1,6 @@ @file:Suppress("RedundantVisibilityModifier", "unused") -package io.legato.kazusa.utils.viewbindingdelegate +package io.legado.app.utils.viewbindingdelegate import android.view.LayoutInflater import androidx.core.app.ComponentActivity diff --git a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/FragmentViewBindings.kt b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/FragmentViewBindings.kt rename to app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt index f23a8d34c..fb713cd66 100644 --- a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/FragmentViewBindings.kt +++ b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt @@ -1,7 +1,7 @@ @file:Suppress("RedundantVisibilityModifier", "unused", "UnusedReceiverParameter") @file:JvmName("ReflectionFragmentViewBindings") -package io.legato.kazusa.utils.viewbindingdelegate +package io.legado.app.utils.viewbindingdelegate import android.view.View import androidx.annotation.IdRes diff --git a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ViewBindingProperty.kt b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/ViewBindingProperty.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ViewBindingProperty.kt rename to app/src/main/java/io/legado/app/utils/viewbindingdelegate/ViewBindingProperty.kt index 491886c24..10a23ce3c 100644 --- a/app/src/main/java/io/legato/kazusa/utils/viewbindingdelegate/ViewBindingProperty.kt +++ b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/ViewBindingProperty.kt @@ -1,6 +1,6 @@ @file:Suppress("RedundantVisibilityModifier") -package io.legato.kazusa.utils.viewbindingdelegate +package io.legado.app.utils.viewbindingdelegate import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/io/legato/kazusa/web/HttpServer.kt b/app/src/main/java/io/legado/app/web/HttpServer.kt similarity index 91% rename from app/src/main/java/io/legato/kazusa/web/HttpServer.kt rename to app/src/main/java/io/legado/app/web/HttpServer.kt index 796fb8328..201aa17d6 100644 --- a/app/src/main/java/io/legato/kazusa/web/HttpServer.kt +++ b/app/src/main/java/io/legado/app/web/HttpServer.kt @@ -1,18 +1,18 @@ -package io.legato.kazusa.web +package io.legado.app.web import android.graphics.Bitmap import fi.iki.elonen.NanoHTTPD -import io.legato.kazusa.api.ReturnData -import io.legato.kazusa.api.controller.BookController -import io.legato.kazusa.api.controller.BookSourceController -import io.legato.kazusa.api.controller.ReplaceRuleController -import io.legato.kazusa.api.controller.RssSourceController -import io.legato.kazusa.help.coroutine.Coroutine -import io.legato.kazusa.service.WebService -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.LogUtils -import io.legato.kazusa.utils.stackTraceStr -import io.legato.kazusa.web.utils.AssetsWeb +import io.legado.app.api.ReturnData +import io.legado.app.api.controller.BookController +import io.legado.app.api.controller.BookSourceController +import io.legado.app.api.controller.ReplaceRuleController +import io.legado.app.api.controller.RssSourceController +import io.legado.app.help.coroutine.Coroutine +import io.legado.app.service.WebService +import io.legado.app.utils.GSON +import io.legado.app.utils.LogUtils +import io.legado.app.utils.stackTraceStr +import io.legado.app.web.utils.AssetsWeb import kotlinx.coroutines.runBlocking import okio.Pipe import okio.buffer diff --git a/app/src/main/java/io/legato/kazusa/web/ReadMe.md b/app/src/main/java/io/legado/app/web/ReadMe.md similarity index 100% rename from app/src/main/java/io/legato/kazusa/web/ReadMe.md rename to app/src/main/java/io/legado/app/web/ReadMe.md diff --git a/app/src/main/java/io/legato/kazusa/web/WebSocketServer.kt b/app/src/main/java/io/legado/app/web/WebSocketServer.kt similarity index 83% rename from app/src/main/java/io/legato/kazusa/web/WebSocketServer.kt rename to app/src/main/java/io/legado/app/web/WebSocketServer.kt index f9db14940..f2c7c27a0 100644 --- a/app/src/main/java/io/legato/kazusa/web/WebSocketServer.kt +++ b/app/src/main/java/io/legado/app/web/WebSocketServer.kt @@ -1,8 +1,8 @@ -package io.legato.kazusa.web +package io.legado.app.web import fi.iki.elonen.NanoWSD -import io.legato.kazusa.service.WebService -import io.legato.kazusa.web.socket.* +import io.legado.app.service.WebService +import io.legado.app.web.socket.* class WebSocketServer(port: Int) : NanoWSD(port) { diff --git a/app/src/main/java/io/legato/kazusa/web/socket/BookSearchWebSocket.kt b/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt similarity index 87% rename from app/src/main/java/io/legato/kazusa/web/socket/BookSearchWebSocket.kt rename to app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt index b61fe77be..7187a1f0c 100644 --- a/app/src/main/java/io/legato/kazusa/web/socket/BookSearchWebSocket.kt +++ b/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt @@ -1,15 +1,15 @@ -package io.legato.kazusa.web.socket +package io.legado.app.web.socket import fi.iki.elonen.NanoHTTPD import fi.iki.elonen.NanoWSD -import io.legato.kazusa.R -import io.legato.kazusa.data.entities.SearchBook -import io.legato.kazusa.help.config.AppConfig -import io.legato.kazusa.model.webBook.SearchModel -import io.legato.kazusa.ui.book.search.SearchScope -import io.legato.kazusa.utils.GSON -import io.legato.kazusa.utils.fromJsonObject -import io.legato.kazusa.utils.isJson +import io.legado.app.R +import io.legado.app.data.entities.SearchBook +import io.legado.app.help.config.AppConfig +import io.legado.app.model.webBook.SearchModel +import io.legado.app.ui.book.search.SearchScope +import io.legado.app.utils.GSON +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.isJson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.MainScope diff --git a/app/src/main/java/io/legato/kazusa/web/socket/BookSourceDebugWebSocket.kt b/app/src/main/java/io/legado/app/web/socket/BookSourceDebugWebSocket.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/web/socket/BookSourceDebugWebSocket.kt rename to app/src/main/java/io/legado/app/web/socket/BookSourceDebugWebSocket.kt index a24e4e95d..1e158399d 100644 --- a/app/src/main/java/io/legato/kazusa/web/socket/BookSourceDebugWebSocket.kt +++ b/app/src/main/java/io/legado/app/web/socket/BookSourceDebugWebSocket.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.web.socket +package io.legado.app.web.socket import fi.iki.elonen.NanoHTTPD import fi.iki.elonen.NanoWSD -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.model.Debug -import io.legato.kazusa.utils.* +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.model.Debug +import io.legado.app.utils.* import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/web/socket/RssSourceDebugWebSocket.kt b/app/src/main/java/io/legado/app/web/socket/RssSourceDebugWebSocket.kt similarity index 94% rename from app/src/main/java/io/legato/kazusa/web/socket/RssSourceDebugWebSocket.kt rename to app/src/main/java/io/legado/app/web/socket/RssSourceDebugWebSocket.kt index 755d8e6b4..6eae0d39b 100644 --- a/app/src/main/java/io/legato/kazusa/web/socket/RssSourceDebugWebSocket.kt +++ b/app/src/main/java/io/legado/app/web/socket/RssSourceDebugWebSocket.kt @@ -1,12 +1,12 @@ -package io.legato.kazusa.web.socket +package io.legado.app.web.socket import fi.iki.elonen.NanoHTTPD import fi.iki.elonen.NanoWSD -import io.legato.kazusa.R -import io.legato.kazusa.data.appDb -import io.legato.kazusa.model.Debug -import io.legato.kazusa.utils.* +import io.legado.app.R +import io.legado.app.data.appDb +import io.legado.app.model.Debug +import io.legado.app.utils.* import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO import splitties.init.appCtx diff --git a/app/src/main/java/io/legato/kazusa/web/utils/AssetsWeb.kt b/app/src/main/java/io/legado/app/web/utils/AssetsWeb.kt similarity index 97% rename from app/src/main/java/io/legato/kazusa/web/utils/AssetsWeb.kt rename to app/src/main/java/io/legado/app/web/utils/AssetsWeb.kt index 22d3a8164..2e07979f5 100644 --- a/app/src/main/java/io/legato/kazusa/web/utils/AssetsWeb.kt +++ b/app/src/main/java/io/legado/app/web/utils/AssetsWeb.kt @@ -1,4 +1,4 @@ -package io.legato.kazusa.web.utils +package io.legado.app.web.utils import android.content.res.AssetManager import android.text.TextUtils diff --git a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeModel.kt b/app/src/main/java/io/legato/kazusa/lib/theme/ThemeModel.kt deleted file mode 100644 index fe0561bc7..000000000 --- a/app/src/main/java/io/legato/kazusa/lib/theme/ThemeModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package io.legato.kazusa.lib.theme - - diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/PageDirection.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/PageDirection.kt deleted file mode 100644 index 37941aef8..000000000 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/PageDirection.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.legato.kazusa.ui.book.read.page.entities - -enum class PageDirection { - NONE, PREV, NEXT -} \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml index 6d671073c..d5025b7b9 100644 --- a/app/src/main/res/layout-land/activity_book_info.xml +++ b/app/src/main/res/layout-land/activity_book_info.xml @@ -94,7 +94,7 @@ app:layout_constraintWidth_percent="0.5" app:strokeWidth="0dp"> - - - + - - - + + tools:context="io.legado.app.ui.about.AboutActivity"> - - - - - - - - @@ -32,13 +32,13 @@ android:src="@drawable/ic_cursor_right" android:visibility="invisible" /> - - - - - - diff --git a/app/src/main/res/layout/activity_book_source_edit.xml b/app/src/main/res/layout/activity_book_source_edit.xml index aaeb36fe8..cb379ff40 100644 --- a/app/src/main/res/layout/activity_book_source_edit.xml +++ b/app/src/main/res/layout/activity_book_source_edit.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - - diff --git a/app/src/main/res/layout/activity_donate.xml b/app/src/main/res/layout/activity_donate.xml index 5e4ee256c..522b6af92 100644 --- a/app/src/main/res/layout/activity_donate.xml +++ b/app/src/main/res/layout/activity_donate.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_file_manage.xml b/app/src/main/res/layout/activity_file_manage.xml index 2e9a5ef20..e0376830b 100644 --- a/app/src/main/res/layout/activity_file_manage.xml +++ b/app/src/main/res/layout/activity_file_manage.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - + - - - - - - - @@ -71,7 +71,7 @@ android:orientation="horizontal" android:gravity="center_vertical"> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_replace_rule.xml b/app/src/main/res/layout/activity_replace_rule.xml index 5d71c9d54..eeb2a26f9 100644 --- a/app/src/main/res/layout/activity_replace_rule.xml +++ b/app/src/main/res/layout/activity_replace_rule.xml @@ -7,7 +7,7 @@ android:orientation="vertical" tools:context=".ui.replace.ReplaceRuleActivity"> - - - diff --git a/app/src/main/res/layout/activity_rss_favorites.xml b/app/src/main/res/layout/activity_rss_favorites.xml index 3edfd4e5b..59e3ab0fa 100644 --- a/app/src/main/res/layout/activity_rss_favorites.xml +++ b/app/src/main/res/layout/activity_rss_favorites.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"> - - - - - - diff --git a/app/src/main/res/layout/activity_rss_source_edit.xml b/app/src/main/res/layout/activity_rss_source_edit.xml index cf2927230..8eac6396f 100644 --- a/app/src/main/res/layout/activity_rss_source_edit.xml +++ b/app/src/main/res/layout/activity_rss_source_edit.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - @@ -36,7 +36,7 @@ app:layout_constraintTop_toBottomOf="@+id/title_bar" app:loading_width="2dp" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_txt_toc_rule.xml b/app/src/main/res/layout/activity_txt_toc_rule.xml index d63c3714c..d587b864d 100644 --- a/app/src/main/res/layout/activity_txt_toc_rule.xml +++ b/app/src/main/res/layout/activity_txt_toc_rule.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml index 4e7ed246a..25944bde5 100644 --- a/app/src/main/res/layout/activity_web_view.xml +++ b/app/src/main/res/layout/activity_web_view.xml @@ -11,13 +11,13 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_custom_group.xml b/app/src/main/res/layout/dialog_custom_group.xml index 55a130e43..e55fbcbea 100644 --- a/app/src/main/res/layout/dialog_custom_group.xml +++ b/app/src/main/res/layout/dialog_custom_group.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:paddingTop="8dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - + - - - + @@ -74,7 +74,7 @@ app:flexWrap="wrap" app:justifyContent="space_between"> - - - - - - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_search_scope.xml b/app/src/main/res/layout/dialog_search_scope.xml index 77a46c2a1..80c52cc62 100644 --- a/app/src/main/res/layout/dialog_search_scope.xml +++ b/app/src/main/res/layout/dialog_search_scope.xml @@ -49,7 +49,7 @@ - - - - + - - - + - - - + diff --git a/app/src/main/res/layout/dialog_source_picker.xml b/app/src/main/res/layout/dialog_source_picker.xml index 49d281047..7d79f6dc0 100644 --- a/app/src/main/res/layout/dialog_source_picker.xml +++ b/app/src/main/res/layout/dialog_source_picker.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + diff --git a/app/src/main/res/layout/dialog_webdav_server.xml b/app/src/main/res/layout/dialog_webdav_server.xml index f525608a6..37fc8ce11 100644 --- a/app/src/main/res/layout/dialog_webdav_server.xml +++ b/app/src/main/res/layout/dialog_webdav_server.xml @@ -26,18 +26,18 @@ app:displayHomeAsUp="false" app:fitStatusBar="false" /> - - - + - - - - - - @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="8dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bookshelf3.xml b/app/src/main/res/layout/fragment_bookshelf3.xml index 315b6767d..74f984419 100644 --- a/app/src/main/res/layout/fragment_bookshelf3.xml +++ b/app/src/main/res/layout/fragment_bookshelf3.xml @@ -35,7 +35,7 @@ - @@ -44,6 +44,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="8dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chapter_list.xml b/app/src/main/res/layout/fragment_chapter_list.xml index 3ed79276b..06f164c80 100644 --- a/app/src/main/res/layout/fragment_chapter_list.xml +++ b/app/src/main/res/layout/fragment_chapter_list.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:descendantFocusability="blocksDescendants"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_rss.xml b/app/src/main/res/layout/item_rss.xml index 698550526..0a5572206 100644 --- a/app/src/main/res/layout/item_rss.xml +++ b/app/src/main/res/layout/item_rss.xml @@ -17,7 +17,7 @@ android:padding="12dp" android:scrollbars="none"> - - - - - - - - - - - - - - - - - - - - + - - - + - - - + - - - - - - - - - diff --git a/app/src/main/res/xml/pref_config_aloud.xml b/app/src/main/res/xml/pref_config_aloud.xml index d1db44b2f..3aeaf13c2 100644 --- a/app/src/main/res/xml/pref_config_aloud.xml +++ b/app/src/main/res/xml/pref_config_aloud.xml @@ -2,71 +2,71 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml index 68cd5197c..3a52532c6 100644 --- a/app/src/main/res/xml/pref_config_backup.xml +++ b/app/src/main/res/xml/pref_config_backup.xml @@ -2,46 +2,46 @@ - - - - - - - - - + - - - - - - - - + diff --git a/app/src/main/res/xml/pref_config_cover.xml b/app/src/main/res/xml/pref_config_cover.xml index eeec82caa..1d8db29ed 100644 --- a/app/src/main/res/xml/pref_config_cover.xml +++ b/app/src/main/res/xml/pref_config_cover.xml @@ -2,13 +2,13 @@ - - - - - - - - + - - - - - + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_config_other.xml b/app/src/main/res/xml/pref_config_other.xml index 4bf8beb2c..77c46cbca 100644 --- a/app/src/main/res/xml/pref_config_other.xml +++ b/app/src/main/res/xml/pref_config_other.xml @@ -2,14 +2,14 @@ - - - - - - + - - - - - - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml index e48b64c61..51bd176a1 100644 --- a/app/src/main/res/xml/pref_config_read.xml +++ b/app/src/main/res/xml/pref_config_read.xml @@ -2,12 +2,12 @@ - - - - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - - - - + diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml index 75508b4f6..7fef73980 100644 --- a/app/src/main/res/xml/pref_config_theme.xml +++ b/app/src/main/res/xml/pref_config_theme.xml @@ -2,7 +2,7 @@ - - - - - - - - - - - - + - - - - - - - - + - - - - + - - - - + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml index 01b364543..bd6858f48 100644 --- a/app/src/main/res/xml/pref_main.xml +++ b/app/src/main/res/xml/pref_main.xml @@ -4,14 +4,14 @@ android:divider="@color/transparent" app:allowDividerBelow="false"> - - - - - - - - + - - - - - + - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/xml/pref_strat_theme.xml b/app/src/main/res/xml/pref_strat_theme.xml index 0d0a8f07e..ff3c8b2da 100644 --- a/app/src/main/res/xml/pref_strat_theme.xml +++ b/app/src/main/res/xml/pref_strat_theme.xml @@ -1,12 +1,12 @@ - -