From 8f1966d10a1208446d7ea255a6df3d104e584a1b Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 21 Sep 2023 08:26:29 -0500 Subject: [PATCH] refactor(*): move package (#465) Initial reorganization of the package structure, there may be missing files, I'll check them one by one later on --- .../2.json | 321 --------------- .../3.json | 364 ----------------- .../4.json | 371 ------------------ .../2.json | 321 --------------- .../5.json | 0 .../me/ash/reader/ExampleInstrumentedTest.kt | 8 +- .../main/java/me/ash/reader/MainActivity.kt | 8 +- app/src/main/java/me/ash/reader/RYApp.kt | 12 +- .../{data => domain}/model/account/Account.kt | 6 +- .../model/account/AccountType.kt | 2 +- .../model/account/KeepArchivedConverters.kt | 4 +- .../model/account/SyncBlockListConverters.kt | 6 +- .../model/account/SyncIntervalConverters.kt | 4 +- .../model/account/SyncOnStartConverters.kt | 4 +- .../model/account/SyncOnlyOnWiFiConverters.kt | 4 +- .../account/SyncOnlyWhenChargingConverters.kt | 4 +- .../model/account/security/DESUtils.kt | 2 +- .../account/security/FeverSecurityKey.kt | 2 +- .../security/GoogleReaderSecurityKey.kt | 2 +- .../account/security/LocalSecurityKey.kt | 2 +- .../model/account/security/SecurityKey.kt | 2 +- .../{data => domain}/model/article/Article.kt | 4 +- .../model/article/ArticleFlowItem.kt | 4 +- .../model/article/ArticleMeta.kt | 2 +- .../model/article/ArticleWithFeed.kt | 4 +- .../model}/constant/ElevationTokens.kt | 2 +- .../{data => domain}/model/feed/Feed.kt | 4 +- .../model/feed/FeedWithArticle.kt | 4 +- .../model/feed/FeedWithGroup.kt | 4 +- .../model/feed/ImportantNum.kt | 2 +- .../{data => domain}/model/general/Filter.kt | 8 +- .../model/general/MarkAsReadConditions.kt | 5 +- .../{data => domain}/model/general/Version.kt | 2 +- .../{data => domain}/model/group/Group.kt | 2 +- .../model/group/GroupWithFeed.kt | 4 +- .../dao => domain/repository}/AccountDao.kt | 4 +- .../dao => domain/repository}/ArticleDao.kt | 14 +- .../dao => domain/repository}/FeedDao.kt | 6 +- .../dao => domain/repository}/GroupDao.kt | 8 +- .../service}/AbstractRssRepository.kt | 28 +- .../service}/AccountRepository.kt | 16 +- .../service}/FeverRssRepository.kt | 36 +- .../service}/LocalRssRepository.kt | 14 +- .../service}/NotificationHelper.kt | 4 +- .../service}/OpmlRepository.kt | 12 +- .../service}/RYRepository.kt | 18 +- .../service}/RssHelper.kt | 12 +- .../service}/RssRepository.kt | 4 +- .../service}/StringsRepository.kt | 2 +- .../service}/SyncWorker.kt | 8 +- .../di}/ApplicationScope.kt | 2 +- .../di}/CoroutineDispatcherModule.kt | 2 +- .../di}/CoroutineQualifier.kt | 2 +- .../di}/CoroutineScopeModule.kt | 2 +- .../di}/DatabaseModule.kt | 12 +- .../di}/ImageLoaderModule.kt | 2 +- .../di}/OkHttpClientModule.kt | 2 +- .../di}/RetrofitModule.kt | 4 +- .../di}/WorkerModule.kt | 2 +- .../preference/AccountSettings.kt | 7 +- .../preference/AmoledDarkThemePreference.kt | 2 +- .../preference/BasicFontsPreference.kt | 2 +- .../CustomPrimaryColorPreference.kt | 2 +- .../preference/DarkThemePreference.kt | 2 +- .../FeedsFilterBarFilledPreference.kt | 2 +- .../FeedsFilterBarPaddingPreference.kt | 2 +- .../FeedsFilterBarStylePreference.kt | 2 +- .../FeedsFilterBarTonalElevationPreference.kt | 4 +- .../FeedsGroupListExpandPreference.kt | 2 +- .../FeedsGroupListTonalElevationPreference.kt | 4 +- .../FeedsTopBarTonalElevationPreference.kt | 4 +- ...owArticleListDateStickyHeaderPreference.kt | 2 +- .../FlowArticleListDescPreference.kt | 2 +- .../FlowArticleListFeedIconPreference.kt | 2 +- .../FlowArticleListFeedNamePreference.kt | 2 +- .../FlowArticleListImagePreference.kt | 2 +- .../FlowArticleListTimePreference.kt | 2 +- ...FlowArticleListTonalElevationPreference.kt | 4 +- .../FlowFilterBarFilledPreference.kt | 2 +- .../FlowFilterBarPaddingPreference.kt | 2 +- .../FlowFilterBarStylePreference.kt | 2 +- .../FlowFilterBarTonalElevationPreference.kt | 4 +- .../FlowTopBarTonalElevationPreference.kt | 4 +- .../preference/InitialFilterPreference.kt | 2 +- .../preference/InitialPagePreference.kt | 2 +- .../preference/KeepArchivedPreference.kt | 2 +- .../preference/LanguagesPreference.kt | 9 +- .../NewVersionDownloadUrlPreference.kt | 2 +- .../preference/NewVersionLogPreference.kt | 2 +- .../preference/NewVersionNumberPreference.kt | 6 +- .../NewVersionPublishDatePreference.kt | 2 +- .../preference/NewVersionSizePreference.kt | 2 +- .../preference/OpenLinkPreference.kt | 3 +- .../OpenLinkSpecificBrowserPreference.kt | 2 +- .../preference/Preference.kt | 2 +- .../ReadingAutoHideToolbarPreference.kt | 2 +- .../preference/ReadingDarkThemePreference.kt | 2 +- .../preference/ReadingFontsPreference.kt | 2 +- ...ReadingImageHorizontalPaddingPreference.kt | 2 +- .../ReadingImageMaximizePreference.kt | 2 +- .../ReadingImageRoundedCornersPreference.kt | 2 +- .../ReadingLetterSpacingPreference.kt | 2 +- .../ReadingPageTonalElevationPreference.kt | 4 +- .../ReadingSubheadAlignPreference.kt | 2 +- .../ReadingSubheadBoldPreference.kt | 2 +- .../ReadingSubheadUpperCasePreference.kt | 2 +- .../preference/ReadingTextAlignPreference.kt | 3 +- .../preference/ReadingTextBoldPreference.kt | 2 +- .../ReadingTextFontSizePreference.kt | 2 +- .../ReadingTextHorizontalPaddingPreference.kt | 2 +- .../preference/ReadingThemePreference.kt | 2 +- .../preference/ReadingTitleAlignPreference.kt | 2 +- .../preference/ReadingTitleBoldPreference.kt | 2 +- .../ReadingTitleUpperCasePreference.kt | 2 +- .../preference/Settings.kt | 4 +- .../preference/SkipVersionNumberPreference.kt | 6 +- .../preference/SyncBlockListPreference.kt | 2 +- .../preference/SyncIntervalPreference.kt | 4 +- .../preference/SyncOnStartPreference.kt | 2 +- .../preference/SyncOnlyOnWiFiPreference.kt | 2 +- .../SyncOnlyWhenChargingPreference.kt | 2 +- .../preference/ThemeIndexPreference.kt | 2 +- .../provider/BaseAPI.kt | 6 +- .../provider/fever/FeverAPI.kt | 4 +- .../provider/fever/FeverDTO.kt | 2 +- .../source/GoogleReaderApiDto.kt | 4 +- .../source/OPMLDataSource.kt | 10 +- .../source/RYDatabase.kt | 22 +- .../source/RYNetworkDataSource.kt | 2 +- .../me/ash/reader/ui/component/FilterBar.kt | 6 +- .../reader/ui/component/ReadingThemePrev.kt | 8 +- .../reader/ui/component/base/AnimatedPopup.kt | 1 - .../reader/ui/component/base/DisplayText.kt | 3 +- .../ui/component/base/DynamicSVGImage.kt | 2 +- .../component/base/RYExtensibleVisibility.kt | 2 + .../reader/ui/component/base/RYScaffold.kt | 7 +- .../ash/reader/ui/component/base/WebView.kt | 6 +- .../ui/component/reader/HtmlToComposable.kt | 2 +- .../ash/reader/ui/component/reader/Reader.kt | 9 +- .../ash/reader/ui/component/reader/Styles.kt | 11 +- .../ui/component/reader/TextComposer.kt | 2 +- .../java/me/ash/reader/ui/ext/ContextExt.kt | 12 +- .../me/ash/reader/ui/page/common/HomeEntry.kt | 6 +- .../ash/reader/ui/page/home/HomeViewModel.kt | 20 +- .../ash/reader/ui/page/home/feeds/FeedItem.kt | 6 +- .../ui/page/home/feeds/FeedOptionView.kt | 6 +- .../reader/ui/page/home/feeds/FeedsPage.kt | 8 +- .../ui/page/home/feeds/FeedsViewModel.kt | 16 +- .../reader/ui/page/home/feeds/GroupItem.kt | 4 +- .../page/home/feeds/accounts/AccountsTab.kt | 2 +- .../feeds/drawer/feed/FeedOptionDrawer.kt | 4 +- .../feeds/drawer/feed/FeedOptionViewModel.kt | 10 +- .../feeds/drawer/group/GroupOptionDrawer.kt | 2 +- .../drawer/group/GroupOptionViewModel.kt | 8 +- .../feeds/subscribe/SubscribeViewModel.kt | 14 +- .../reader/ui/page/home/flow/ArticleItem.kt | 14 +- .../reader/ui/page/home/flow/ArticleList.kt | 4 +- .../ash/reader/ui/page/home/flow/FlowPage.kt | 11 +- .../reader/ui/page/home/flow/FlowViewModel.kt | 6 +- .../reader/ui/page/home/flow/MarkAsReadBar.kt | 2 +- .../ash/reader/ui/page/home/flow/SearchBar.kt | 4 +- .../reader/ui/page/home/reading/BottomBar.kt | 4 +- .../reader/ui/page/home/reading/Content.kt | 8 +- .../reader/ui/page/home/reading/Metadata.kt | 7 +- .../ui/page/home/reading/ReadingPage.kt | 4 +- .../ui/page/home/reading/ReadingViewModel.kt | 8 +- .../ash/reader/ui/page/home/reading/TopBar.kt | 5 +- .../reader/ui/page/settings/SettingsPage.kt | 4 +- .../settings/accounts/AccountDetailsPage.kt | 5 +- .../settings/accounts/AccountViewModel.kt | 14 +- .../addition/AddFeverAccountDialog.kt | 11 +- .../addition/AddLocalAccountDialog.kt | 4 +- .../accounts/addition/AdditionViewModel.kt | 8 +- .../accounts/connection/AccountConnection.kt | 4 +- .../accounts/connection/FeverConnection.kt | 4 +- .../page/settings/color/ColorAndStylePage.kt | 2 +- .../ui/page/settings/color/DarkThemePage.kt | 8 +- .../settings/color/feeds/FeedsPagePreview.kt | 12 +- .../color/feeds/FeedsPageStylePage.kt | 2 +- .../settings/color/flow/FlowPagePreview.kt | 12 +- .../settings/color/flow/FlowPageStylePage.kt | 2 +- .../color/reading/ReadingDarkThemePage.kt | 4 +- .../color/reading/ReadingImagePage.kt | 2 +- .../color/reading/ReadingStylePage.kt | 2 +- .../settings/color/reading/ReadingTextPage.kt | 2 +- .../color/reading/ReadingTitlePage.kt | 2 +- .../color/reading/TitleAndTextPreview.kt | 2 +- .../settings/interaction/InteractionPage.kt | 14 +- .../page/settings/languages/LanguagesPage.kt | 8 +- .../page/settings/tips/TipsAndSupportPage.kt | 4 +- .../ui/page/settings/tips/UpdateDialog.kt | 4 +- .../ui/page/settings/tips/UpdateViewModel.kt | 4 +- .../main/java/me/ash/reader/ui/theme/Theme.kt | 4 +- .../ui/theme/palette/DynamicTonalPalette.kt | 4 +- .../theme/palette/dynamic/WallpaperColors.kt | 2 +- .../java/me/ash/reader/ExampleUnitTest.kt | 5 +- gradle.properties | 2 +- 197 files changed, 462 insertions(+), 1881 deletions(-) delete mode 100644 app/schemas/me.ash.reader.data.source.RYDatabase/2.json delete mode 100644 app/schemas/me.ash.reader.data.source.RYDatabase/3.json delete mode 100644 app/schemas/me.ash.reader.data.source.RYDatabase/4.json delete mode 100644 app/schemas/me.ash.reader.data.source.ReaderDatabase/2.json rename app/schemas/{me.ash.reader.data.source.RYDatabase => me.ash.reader.infrastructure.source.RYDatabase}/5.json (100%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/Account.kt (89%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/AccountType.kt (98%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/KeepArchivedConverters.kt (82%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/SyncBlockListConverters.kt (72%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/SyncIntervalConverters.kt (82%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/SyncOnStartConverters.kt (82%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/SyncOnlyOnWiFiConverters.kt (82%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/SyncOnlyWhenChargingConverters.kt (84%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/security/DESUtils.kt (94%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/security/FeverSecurityKey.kt (92%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/security/GoogleReaderSecurityKey.kt (92%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/security/LocalSecurityKey.kt (79%) rename app/src/main/java/me/ash/reader/{data => domain}/model/account/security/SecurityKey.kt (90%) rename app/src/main/java/me/ash/reader/{data => domain}/model/article/Article.kt (92%) rename app/src/main/java/me/ash/reader/{data => domain}/model/article/ArticleFlowItem.kt (94%) rename app/src/main/java/me/ash/reader/{data => domain}/model/article/ArticleMeta.kt (87%) rename app/src/main/java/me/ash/reader/{data => domain}/model/article/ArticleWithFeed.kt (74%) rename app/src/main/java/me/ash/reader/{data => domain/model}/constant/ElevationTokens.kt (86%) rename app/src/main/java/me/ash/reader/{data => domain}/model/feed/Feed.kt (95%) rename app/src/main/java/me/ash/reader/{data => domain}/model/feed/FeedWithArticle.kt (74%) rename app/src/main/java/me/ash/reader/{data => domain}/model/feed/FeedWithGroup.kt (74%) rename app/src/main/java/me/ash/reader/{data => domain}/model/feed/ImportantNum.kt (89%) rename app/src/main/java/me/ash/reader/{data => domain}/model/general/Filter.kt (90%) rename app/src/main/java/me/ash/reader/{data => domain}/model/general/MarkAsReadConditions.kt (87%) rename app/src/main/java/me/ash/reader/{data => domain}/model/general/Version.kt (97%) rename app/src/main/java/me/ash/reader/{data => domain}/model/group/Group.kt (90%) rename app/src/main/java/me/ash/reader/{data => domain}/model/group/GroupWithFeed.kt (75%) rename app/src/main/java/me/ash/reader/{data/dao => domain/repository}/AccountDao.kt (90%) rename app/src/main/java/me/ash/reader/{data/dao => domain/repository}/ArticleDao.kt (98%) rename app/src/main/java/me/ash/reader/{data/dao => domain/repository}/FeedDao.kt (94%) rename app/src/main/java/me/ash/reader/{data/dao => domain/repository}/GroupDao.kt (88%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/AbstractRssRepository.kt (94%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/AccountRepository.kt (89%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/FeverRssRepository.kt (91%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/LocalRssRepository.kt (72%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/NotificationHelper.kt (97%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/OpmlRepository.kt (92%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/RYRepository.kt (88%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/RssHelper.kt (96%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/RssRepository.kt (90%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/StringsRepository.kt (95%) rename app/src/main/java/me/ash/reader/{data/repository => domain/service}/SyncWorker.kt (90%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/ApplicationScope.kt (87%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/CoroutineDispatcherModule.kt (95%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/CoroutineQualifier.kt (94%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/CoroutineScopeModule.kt (94%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/DatabaseModule.kt (78%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/ImageLoaderModule.kt (97%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/OkHttpClientModule.kt (98%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/RetrofitModule.kt (82%) rename app/src/main/java/me/ash/reader/{data/module => infrastructure/di}/WorkerModule.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/AccountSettings.kt (91%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/AmoledDarkThemePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/BasicFontsPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/CustomPrimaryColorPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/DarkThemePreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsFilterBarFilledPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsFilterBarPaddingPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsFilterBarStylePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsFilterBarTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsGroupListExpandPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsGroupListTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FeedsTopBarTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListDateStickyHeaderPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListDescPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListFeedIconPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListFeedNamePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListImagePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListTimePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowArticleListTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowFilterBarFilledPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowFilterBarPaddingPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowFilterBarStylePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowFilterBarTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/FlowTopBarTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/InitialFilterPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/InitialPagePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/KeepArchivedPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/LanguagesPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/NewVersionDownloadUrlPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/NewVersionLogPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/NewVersionNumberPreference.kt (82%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/NewVersionPublishDatePreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/NewVersionSizePreference.kt (94%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/OpenLinkPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/OpenLinkSpecificBrowserPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/Preference.kt (99%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingAutoHideToolbarPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingDarkThemePreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingFontsPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingImageHorizontalPaddingPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingImageMaximizePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingImageRoundedCornersPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingLetterSpacingPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingPageTonalElevationPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingSubheadAlignPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingSubheadBoldPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingSubheadUpperCasePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTextAlignPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTextBoldPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTextFontSizePreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTextHorizontalPaddingPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingThemePreference.kt (99%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTitleAlignPreference.kt (97%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTitleBoldPreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ReadingTitleUpperCasePreference.kt (96%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/Settings.kt (99%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SkipVersionNumberPreference.kt (82%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SyncBlockListPreference.kt (92%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SyncIntervalPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SyncOnStartPreference.kt (94%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SyncOnlyOnWiFiPreference.kt (94%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/SyncOnlyWhenChargingPreference.kt (95%) rename app/src/main/java/me/ash/reader/{data/model => infrastructure}/preference/ThemeIndexPreference.kt (93%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/provider/BaseAPI.kt (73%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/provider/fever/FeverAPI.kt (97%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/provider/fever/FeverDTO.kt (99%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/source/GoogleReaderApiDto.kt (97%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/source/OPMLDataSource.kt (94%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/source/RYDatabase.kt (88%) rename app/src/main/java/me/ash/reader/{data => infrastructure}/source/RYNetworkDataSource.kt (98%) diff --git a/app/schemas/me.ash.reader.data.source.RYDatabase/2.json b/app/schemas/me.ash.reader.data.source.RYDatabase/2.json deleted file mode 100644 index 5690ca55..00000000 --- a/app/schemas/me.ash.reader.data.source.RYDatabase/2.json +++ /dev/null @@ -1,321 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "98462c2e9c32394054102313366e7262", - "entities": [ - { - "tableName": "account", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `updateAt` INTEGER)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "feed", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `icon` TEXT, `url` TEXT NOT NULL, `groupId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isNotification` INTEGER NOT NULL DEFAULT false, `isFullContent` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`), FOREIGN KEY(`groupId`) REFERENCES `group`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "icon", - "columnName": "icon", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "groupId", - "columnName": "groupId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isNotification", - "columnName": "isNotification", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - }, - { - "fieldPath": "isFullContent", - "columnName": "isFullContent", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_feed_groupId", - "unique": false, - "columnNames": [ - "groupId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_groupId` ON `${TABLE_NAME}` (`groupId`)" - }, - { - "name": "index_feed_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "group", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "groupId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "article", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `date` INTEGER NOT NULL, `title` TEXT NOT NULL, `author` TEXT, `rawDescription` TEXT NOT NULL, `shortDescription` TEXT NOT NULL, `fullContent` TEXT, `img` TEXT, `link` TEXT NOT NULL, `feedId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isUnread` INTEGER NOT NULL DEFAULT true, `isStarred` INTEGER NOT NULL DEFAULT false, `isReadLater` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`), FOREIGN KEY(`feedId`) REFERENCES `feed`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "date", - "columnName": "date", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "author", - "columnName": "author", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "rawDescription", - "columnName": "rawDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "shortDescription", - "columnName": "shortDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "fullContent", - "columnName": "fullContent", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "img", - "columnName": "img", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "link", - "columnName": "link", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "feedId", - "columnName": "feedId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isUnread", - "columnName": "isUnread", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "true" - }, - { - "fieldPath": "isStarred", - "columnName": "isStarred", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - }, - { - "fieldPath": "isReadLater", - "columnName": "isReadLater", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_article_feedId", - "unique": false, - "columnNames": [ - "feedId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_feedId` ON `${TABLE_NAME}` (`feedId`)" - }, - { - "name": "index_article_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "feed", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "feedId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "group", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `accountId` INTEGER NOT NULL, PRIMARY KEY(`id`))", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_group_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_group_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '98462c2e9c32394054102313366e7262')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/me.ash.reader.data.source.RYDatabase/3.json b/app/schemas/me.ash.reader.data.source.RYDatabase/3.json deleted file mode 100644 index bfd5d885..00000000 --- a/app/schemas/me.ash.reader.data.source.RYDatabase/3.json +++ /dev/null @@ -1,364 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 3, - "identityHash": "b13c17e4d1ff644caeecce9fc365db2e", - "entities": [ - { - "tableName": "account", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `updateAt` INTEGER, `syncInterval` INTEGER NOT NULL DEFAULT 30, `syncOnStart` INTEGER NOT NULL DEFAULT 0, `syncOnlyOnWiFi` INTEGER NOT NULL DEFAULT 0, `syncOnlyWhenCharging` INTEGER NOT NULL DEFAULT 0, `keepArchived` INTEGER NOT NULL DEFAULT 2592000000, `syncBlockList` TEXT NOT NULL DEFAULT '')", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "syncInterval", - "columnName": "syncInterval", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "30" - }, - { - "fieldPath": "syncOnStart", - "columnName": "syncOnStart", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "syncOnlyOnWiFi", - "columnName": "syncOnlyOnWiFi", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "syncOnlyWhenCharging", - "columnName": "syncOnlyWhenCharging", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "keepArchived", - "columnName": "keepArchived", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "2592000000" - }, - { - "fieldPath": "syncBlockList", - "columnName": "syncBlockList", - "affinity": "TEXT", - "notNull": true, - "defaultValue": "''" - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "feed", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `icon` TEXT, `url` TEXT NOT NULL, `groupId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isNotification` INTEGER NOT NULL, `isFullContent` INTEGER NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`groupId`) REFERENCES `group`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "icon", - "columnName": "icon", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "groupId", - "columnName": "groupId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isNotification", - "columnName": "isNotification", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isFullContent", - "columnName": "isFullContent", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_feed_groupId", - "unique": false, - "columnNames": [ - "groupId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_groupId` ON `${TABLE_NAME}` (`groupId`)" - }, - { - "name": "index_feed_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "group", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "groupId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "article", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `date` INTEGER NOT NULL, `title` TEXT NOT NULL, `author` TEXT, `rawDescription` TEXT NOT NULL, `shortDescription` TEXT NOT NULL, `fullContent` TEXT, `img` TEXT, `link` TEXT NOT NULL, `feedId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isUnread` INTEGER NOT NULL, `isStarred` INTEGER NOT NULL, `isReadLater` INTEGER NOT NULL, `updateAt` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`feedId`) REFERENCES `feed`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "date", - "columnName": "date", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "author", - "columnName": "author", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "rawDescription", - "columnName": "rawDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "shortDescription", - "columnName": "shortDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "fullContent", - "columnName": "fullContent", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "img", - "columnName": "img", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "link", - "columnName": "link", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "feedId", - "columnName": "feedId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isUnread", - "columnName": "isUnread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isStarred", - "columnName": "isStarred", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isReadLater", - "columnName": "isReadLater", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_article_feedId", - "unique": false, - "columnNames": [ - "feedId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_feedId` ON `${TABLE_NAME}` (`feedId`)" - }, - { - "name": "index_article_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "feed", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "feedId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "group", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `accountId` INTEGER NOT NULL, PRIMARY KEY(`id`))", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_group_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_group_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b13c17e4d1ff644caeecce9fc365db2e')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/me.ash.reader.data.source.RYDatabase/4.json b/app/schemas/me.ash.reader.data.source.RYDatabase/4.json deleted file mode 100644 index e3778bd4..00000000 --- a/app/schemas/me.ash.reader.data.source.RYDatabase/4.json +++ /dev/null @@ -1,371 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 4, - "identityHash": "ff6225eee095fd62d3d3bff48aa0be8e", - "entities": [ - { - "tableName": "account", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `updateAt` INTEGER, `syncInterval` INTEGER NOT NULL DEFAULT 30, `syncOnStart` INTEGER NOT NULL DEFAULT 0, `syncOnlyOnWiFi` INTEGER NOT NULL DEFAULT 0, `syncOnlyWhenCharging` INTEGER NOT NULL DEFAULT 0, `keepArchived` INTEGER NOT NULL DEFAULT 2592000000, `syncBlockList` TEXT NOT NULL DEFAULT '', `securityKey` TEXT DEFAULT 'CvJ1PKM8EW8=')", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "syncInterval", - "columnName": "syncInterval", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "30" - }, - { - "fieldPath": "syncOnStart", - "columnName": "syncOnStart", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "syncOnlyOnWiFi", - "columnName": "syncOnlyOnWiFi", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "syncOnlyWhenCharging", - "columnName": "syncOnlyWhenCharging", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "0" - }, - { - "fieldPath": "keepArchived", - "columnName": "keepArchived", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "2592000000" - }, - { - "fieldPath": "syncBlockList", - "columnName": "syncBlockList", - "affinity": "TEXT", - "notNull": true, - "defaultValue": "''" - }, - { - "fieldPath": "securityKey", - "columnName": "securityKey", - "affinity": "TEXT", - "notNull": false, - "defaultValue": "'CvJ1PKM8EW8='" - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "feed", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `icon` TEXT, `url` TEXT NOT NULL, `groupId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isNotification` INTEGER NOT NULL, `isFullContent` INTEGER NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`groupId`) REFERENCES `group`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "icon", - "columnName": "icon", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "groupId", - "columnName": "groupId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isNotification", - "columnName": "isNotification", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isFullContent", - "columnName": "isFullContent", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_feed_groupId", - "unique": false, - "columnNames": [ - "groupId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_groupId` ON `${TABLE_NAME}` (`groupId`)" - }, - { - "name": "index_feed_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "group", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "groupId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "article", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `date` INTEGER NOT NULL, `title` TEXT NOT NULL, `author` TEXT, `rawDescription` TEXT NOT NULL, `shortDescription` TEXT NOT NULL, `fullContent` TEXT, `img` TEXT, `link` TEXT NOT NULL, `feedId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isUnread` INTEGER NOT NULL, `isStarred` INTEGER NOT NULL, `isReadLater` INTEGER NOT NULL, `updateAt` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`feedId`) REFERENCES `feed`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "date", - "columnName": "date", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "author", - "columnName": "author", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "rawDescription", - "columnName": "rawDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "shortDescription", - "columnName": "shortDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "fullContent", - "columnName": "fullContent", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "img", - "columnName": "img", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "link", - "columnName": "link", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "feedId", - "columnName": "feedId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isUnread", - "columnName": "isUnread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isStarred", - "columnName": "isStarred", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isReadLater", - "columnName": "isReadLater", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_article_feedId", - "unique": false, - "columnNames": [ - "feedId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_feedId` ON `${TABLE_NAME}` (`feedId`)" - }, - { - "name": "index_article_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "feed", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "feedId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "group", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `accountId` INTEGER NOT NULL, PRIMARY KEY(`id`))", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_group_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_group_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ff6225eee095fd62d3d3bff48aa0be8e')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/me.ash.reader.data.source.ReaderDatabase/2.json b/app/schemas/me.ash.reader.data.source.ReaderDatabase/2.json deleted file mode 100644 index 5690ca55..00000000 --- a/app/schemas/me.ash.reader.data.source.ReaderDatabase/2.json +++ /dev/null @@ -1,321 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "98462c2e9c32394054102313366e7262", - "entities": [ - { - "tableName": "account", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `updateAt` INTEGER)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateAt", - "columnName": "updateAt", - "affinity": "INTEGER", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "feed", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `icon` TEXT, `url` TEXT NOT NULL, `groupId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isNotification` INTEGER NOT NULL DEFAULT false, `isFullContent` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`), FOREIGN KEY(`groupId`) REFERENCES `group`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "icon", - "columnName": "icon", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "groupId", - "columnName": "groupId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isNotification", - "columnName": "isNotification", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - }, - { - "fieldPath": "isFullContent", - "columnName": "isFullContent", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_feed_groupId", - "unique": false, - "columnNames": [ - "groupId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_groupId` ON `${TABLE_NAME}` (`groupId`)" - }, - { - "name": "index_feed_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "group", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "groupId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "article", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `date` INTEGER NOT NULL, `title` TEXT NOT NULL, `author` TEXT, `rawDescription` TEXT NOT NULL, `shortDescription` TEXT NOT NULL, `fullContent` TEXT, `img` TEXT, `link` TEXT NOT NULL, `feedId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `isUnread` INTEGER NOT NULL DEFAULT true, `isStarred` INTEGER NOT NULL DEFAULT false, `isReadLater` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`), FOREIGN KEY(`feedId`) REFERENCES `feed`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "date", - "columnName": "date", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "author", - "columnName": "author", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "rawDescription", - "columnName": "rawDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "shortDescription", - "columnName": "shortDescription", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "fullContent", - "columnName": "fullContent", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "img", - "columnName": "img", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "link", - "columnName": "link", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "feedId", - "columnName": "feedId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isUnread", - "columnName": "isUnread", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "true" - }, - { - "fieldPath": "isStarred", - "columnName": "isStarred", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - }, - { - "fieldPath": "isReadLater", - "columnName": "isReadLater", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "false" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_article_feedId", - "unique": false, - "columnNames": [ - "feedId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_feedId` ON `${TABLE_NAME}` (`feedId`)" - }, - { - "name": "index_article_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_article_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "feed", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "feedId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "group", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `accountId` INTEGER NOT NULL, PRIMARY KEY(`id`))", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_group_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_group_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '98462c2e9c32394054102313366e7262')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/me.ash.reader.data.source.RYDatabase/5.json b/app/schemas/me.ash.reader.infrastructure.source.RYDatabase/5.json similarity index 100% rename from app/schemas/me.ash.reader.data.source.RYDatabase/5.json rename to app/schemas/me.ash.reader.infrastructure.source.RYDatabase/5.json diff --git a/app/src/androidTest/java/me/ash/reader/ExampleInstrumentedTest.kt b/app/src/androidTest/java/me/ash/reader/ExampleInstrumentedTest.kt index 639117b1..2ad65af8 100644 --- a/app/src/androidTest/java/me/ash/reader/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/me/ash/reader/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package me.ash.reader -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -21,4 +19,4 @@ class ExampleInstrumentedTest { val appContext = InstrumentationRegistry.getInstrumentation().targetContext assertEquals("me.ash.reader", appContext.packageName) } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/MainActivity.kt b/app/src/main/java/me/ash/reader/MainActivity.kt index e92f7d64..e0966629 100644 --- a/app/src/main/java/me/ash/reader/MainActivity.kt +++ b/app/src/main/java/me/ash/reader/MainActivity.kt @@ -13,10 +13,10 @@ import androidx.profileinstaller.ProfileInstallerInitializer import coil.ImageLoader import coil.compose.LocalImageLoader import dagger.hilt.android.AndroidEntryPoint -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.model.preference.AccountSettingsProvider -import me.ash.reader.data.model.preference.LanguagesPreference -import me.ash.reader.data.model.preference.SettingsProvider +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.infrastructure.preference.AccountSettingsProvider +import me.ash.reader.infrastructure.preference.LanguagesPreference +import me.ash.reader.infrastructure.preference.SettingsProvider import me.ash.reader.ui.ext.languages import me.ash.reader.ui.page.common.HomeEntry import javax.inject.Inject diff --git a/app/src/main/java/me/ash/reader/RYApp.kt b/app/src/main/java/me/ash/reader/RYApp.kt index 7c7ef00c..57442255 100644 --- a/app/src/main/java/me/ash/reader/RYApp.kt +++ b/app/src/main/java/me/ash/reader/RYApp.kt @@ -10,12 +10,12 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import me.ash.reader.data.module.ApplicationScope -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.repository.* -import me.ash.reader.data.source.OPMLDataSource -import me.ash.reader.data.source.RYDatabase -import me.ash.reader.data.source.RYNetworkDataSource +import me.ash.reader.domain.service.* +import me.ash.reader.infrastructure.di.ApplicationScope +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.source.OPMLDataSource +import me.ash.reader.infrastructure.source.RYDatabase +import me.ash.reader.infrastructure.source.RYNetworkDataSource import me.ash.reader.ui.ext.del import me.ash.reader.ui.ext.getLatestApk import me.ash.reader.ui.ext.isFdroid diff --git a/app/src/main/java/me/ash/reader/data/model/account/Account.kt b/app/src/main/java/me/ash/reader/domain/model/account/Account.kt similarity index 89% rename from app/src/main/java/me/ash/reader/data/model/account/Account.kt rename to app/src/main/java/me/ash/reader/domain/model/account/Account.kt index 3d8d703e..0ecbd987 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/Account.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/Account.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import me.ash.reader.data.model.account.security.DESUtils -import me.ash.reader.data.model.preference.* +import me.ash.reader.domain.model.account.security.DESUtils +import me.ash.reader.infrastructure.preference.* import java.util.* /** diff --git a/app/src/main/java/me/ash/reader/data/model/account/AccountType.kt b/app/src/main/java/me/ash/reader/domain/model/account/AccountType.kt similarity index 98% rename from app/src/main/java/me/ash/reader/data/model/account/AccountType.kt rename to app/src/main/java/me/ash/reader/domain/model/account/AccountType.kt index 9eddaff2..f1e7068d 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/AccountType.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/AccountType.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import android.content.Context import androidx.compose.material.icons.Icons diff --git a/app/src/main/java/me/ash/reader/data/model/account/KeepArchivedConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/KeepArchivedConverters.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/account/KeepArchivedConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/KeepArchivedConverters.kt index 1c96a67b..73de3b9d 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/KeepArchivedConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/KeepArchivedConverters.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.KeepArchivedPreference +import me.ash.reader.infrastructure.preference.KeepArchivedPreference /** * Provide [TypeConverter] of [KeepArchivedPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/SyncBlockListConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/SyncBlockListConverters.kt similarity index 72% rename from app/src/main/java/me/ash/reader/data/model/account/SyncBlockListConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/SyncBlockListConverters.kt index cb9c400c..5d032547 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/SyncBlockListConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/SyncBlockListConverters.kt @@ -1,9 +1,9 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.SyncBlockList -import me.ash.reader.data.model.preference.SyncBlockListPreference +import me.ash.reader.infrastructure.preference.SyncBlockList +import me.ash.reader.infrastructure.preference.SyncBlockListPreference /** * Provide [TypeConverter] of [SyncBlockListPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/SyncIntervalConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/SyncIntervalConverters.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/account/SyncIntervalConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/SyncIntervalConverters.kt index 9d41398f..3c954b5e 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/SyncIntervalConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/SyncIntervalConverters.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.SyncIntervalPreference +import me.ash.reader.infrastructure.preference.SyncIntervalPreference /** * Provide [TypeConverter] of [SyncIntervalPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/SyncOnStartConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnStartConverters.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/account/SyncOnStartConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/SyncOnStartConverters.kt index ac81c1e3..fe4d467b 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/SyncOnStartConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnStartConverters.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.SyncOnStartPreference +import me.ash.reader.infrastructure.preference.SyncOnStartPreference /** * Provide [TypeConverter] of [SyncOnStartPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/SyncOnlyOnWiFiConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyOnWiFiConverters.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/account/SyncOnlyOnWiFiConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyOnWiFiConverters.kt index 0ea1b3dc..4138f236 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/SyncOnlyOnWiFiConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyOnWiFiConverters.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.SyncOnlyOnWiFiPreference +import me.ash.reader.infrastructure.preference.SyncOnlyOnWiFiPreference /** * Provide [TypeConverter] of [SyncOnlyOnWiFiPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/SyncOnlyWhenChargingConverters.kt b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyWhenChargingConverters.kt similarity index 84% rename from app/src/main/java/me/ash/reader/data/model/account/SyncOnlyWhenChargingConverters.kt rename to app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyWhenChargingConverters.kt index 2ea4f546..91da0dcc 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/SyncOnlyWhenChargingConverters.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/SyncOnlyWhenChargingConverters.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.account +package me.ash.reader.domain.model.account import androidx.room.RoomDatabase import androidx.room.TypeConverter -import me.ash.reader.data.model.preference.SyncOnlyWhenChargingPreference +import me.ash.reader.infrastructure.preference.SyncOnlyWhenChargingPreference /** * Provide [TypeConverter] of [SyncOnlyWhenChargingPreference] for [RoomDatabase]. diff --git a/app/src/main/java/me/ash/reader/data/model/account/security/DESUtils.kt b/app/src/main/java/me/ash/reader/domain/model/account/security/DESUtils.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/model/account/security/DESUtils.kt rename to app/src/main/java/me/ash/reader/domain/model/account/security/DESUtils.kt index 8d3329a7..a2fa1e03 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/security/DESUtils.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/security/DESUtils.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account.security +package me.ash.reader.domain.model.account.security import android.util.Base64 import javax.crypto.Cipher diff --git a/app/src/main/java/me/ash/reader/data/model/account/security/FeverSecurityKey.kt b/app/src/main/java/me/ash/reader/domain/model/account/security/FeverSecurityKey.kt similarity index 92% rename from app/src/main/java/me/ash/reader/data/model/account/security/FeverSecurityKey.kt rename to app/src/main/java/me/ash/reader/domain/model/account/security/FeverSecurityKey.kt index ac1ec23c..6f715c13 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/security/FeverSecurityKey.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/security/FeverSecurityKey.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account.security +package me.ash.reader.domain.model.account.security class FeverSecurityKey private constructor() : SecurityKey() { diff --git a/app/src/main/java/me/ash/reader/data/model/account/security/GoogleReaderSecurityKey.kt b/app/src/main/java/me/ash/reader/domain/model/account/security/GoogleReaderSecurityKey.kt similarity index 92% rename from app/src/main/java/me/ash/reader/data/model/account/security/GoogleReaderSecurityKey.kt rename to app/src/main/java/me/ash/reader/domain/model/account/security/GoogleReaderSecurityKey.kt index f7686806..b0104e49 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/security/GoogleReaderSecurityKey.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/security/GoogleReaderSecurityKey.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account.security +package me.ash.reader.domain.model.account.security class GoogleReaderSecurityKey private constructor() : SecurityKey() { diff --git a/app/src/main/java/me/ash/reader/data/model/account/security/LocalSecurityKey.kt b/app/src/main/java/me/ash/reader/domain/model/account/security/LocalSecurityKey.kt similarity index 79% rename from app/src/main/java/me/ash/reader/data/model/account/security/LocalSecurityKey.kt rename to app/src/main/java/me/ash/reader/domain/model/account/security/LocalSecurityKey.kt index 224ca20a..4cedec6e 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/security/LocalSecurityKey.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/security/LocalSecurityKey.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account.security +package me.ash.reader.domain.model.account.security class LocalSecurityKey private constructor() : SecurityKey() { diff --git a/app/src/main/java/me/ash/reader/data/model/account/security/SecurityKey.kt b/app/src/main/java/me/ash/reader/domain/model/account/security/SecurityKey.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/model/account/security/SecurityKey.kt rename to app/src/main/java/me/ash/reader/domain/model/account/security/SecurityKey.kt index 78f564be..fb44d19d 100644 --- a/app/src/main/java/me/ash/reader/data/model/account/security/SecurityKey.kt +++ b/app/src/main/java/me/ash/reader/domain/model/account/security/SecurityKey.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.account.security +package me.ash.reader.domain.model.account.security import com.google.gson.Gson diff --git a/app/src/main/java/me/ash/reader/data/model/article/Article.kt b/app/src/main/java/me/ash/reader/domain/model/article/Article.kt similarity index 92% rename from app/src/main/java/me/ash/reader/data/model/article/Article.kt rename to app/src/main/java/me/ash/reader/domain/model/article/Article.kt index 37cfd958..414ede34 100644 --- a/app/src/main/java/me/ash/reader/data/model/article/Article.kt +++ b/app/src/main/java/me/ash/reader/domain/model/article/Article.kt @@ -1,7 +1,7 @@ -package me.ash.reader.data.model.article +package me.ash.reader.domain.model.article import androidx.room.* -import me.ash.reader.data.model.feed.Feed +import me.ash.reader.domain.model.feed.Feed import java.util.* /** diff --git a/app/src/main/java/me/ash/reader/data/model/article/ArticleFlowItem.kt b/app/src/main/java/me/ash/reader/domain/model/article/ArticleFlowItem.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/model/article/ArticleFlowItem.kt rename to app/src/main/java/me/ash/reader/domain/model/article/ArticleFlowItem.kt index bf456ed9..423433bd 100644 --- a/app/src/main/java/me/ash/reader/data/model/article/ArticleFlowItem.kt +++ b/app/src/main/java/me/ash/reader/domain/model/article/ArticleFlowItem.kt @@ -1,9 +1,9 @@ -package me.ash.reader.data.model.article +package me.ash.reader.domain.model.article import androidx.paging.PagingData import androidx.paging.insertSeparators import androidx.paging.map -import me.ash.reader.data.repository.StringsRepository +import me.ash.reader.domain.service.StringsRepository /** * Provide paginated and inserted separator data types for article list view. diff --git a/app/src/main/java/me/ash/reader/data/model/article/ArticleMeta.kt b/app/src/main/java/me/ash/reader/domain/model/article/ArticleMeta.kt similarity index 87% rename from app/src/main/java/me/ash/reader/data/model/article/ArticleMeta.kt rename to app/src/main/java/me/ash/reader/domain/model/article/ArticleMeta.kt index 83dc8b50..addd94b2 100644 --- a/app/src/main/java/me/ash/reader/data/model/article/ArticleMeta.kt +++ b/app/src/main/java/me/ash/reader/domain/model/article/ArticleMeta.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.article +package me.ash.reader.domain.model.article import androidx.room.ColumnInfo import androidx.room.PrimaryKey diff --git a/app/src/main/java/me/ash/reader/data/model/article/ArticleWithFeed.kt b/app/src/main/java/me/ash/reader/domain/model/article/ArticleWithFeed.kt similarity index 74% rename from app/src/main/java/me/ash/reader/data/model/article/ArticleWithFeed.kt rename to app/src/main/java/me/ash/reader/domain/model/article/ArticleWithFeed.kt index a32dfa01..f9a7e350 100644 --- a/app/src/main/java/me/ash/reader/data/model/article/ArticleWithFeed.kt +++ b/app/src/main/java/me/ash/reader/domain/model/article/ArticleWithFeed.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.article +package me.ash.reader.domain.model.article import androidx.room.Embedded import androidx.room.Relation -import me.ash.reader.data.model.feed.Feed +import me.ash.reader.domain.model.feed.Feed /** * An [article] contains a [feed]. diff --git a/app/src/main/java/me/ash/reader/data/constant/ElevationTokens.kt b/app/src/main/java/me/ash/reader/domain/model/constant/ElevationTokens.kt similarity index 86% rename from app/src/main/java/me/ash/reader/data/constant/ElevationTokens.kt rename to app/src/main/java/me/ash/reader/domain/model/constant/ElevationTokens.kt index bdce6d8f..c9685448 100644 --- a/app/src/main/java/me/ash/reader/data/constant/ElevationTokens.kt +++ b/app/src/main/java/me/ash/reader/domain/model/constant/ElevationTokens.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.constant +package me.ash.reader.domain.model.constant /** * The tonal elevation tokens. diff --git a/app/src/main/java/me/ash/reader/data/model/feed/Feed.kt b/app/src/main/java/me/ash/reader/domain/model/feed/Feed.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/feed/Feed.kt rename to app/src/main/java/me/ash/reader/domain/model/feed/Feed.kt index 98a8a75e..8b479656 100644 --- a/app/src/main/java/me/ash/reader/data/model/feed/Feed.kt +++ b/app/src/main/java/me/ash/reader/domain/model/feed/Feed.kt @@ -1,7 +1,7 @@ -package me.ash.reader.data.model.feed +package me.ash.reader.domain.model.feed import androidx.room.* -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.group.Group /** * TODO: Add class description diff --git a/app/src/main/java/me/ash/reader/data/model/feed/FeedWithArticle.kt b/app/src/main/java/me/ash/reader/domain/model/feed/FeedWithArticle.kt similarity index 74% rename from app/src/main/java/me/ash/reader/data/model/feed/FeedWithArticle.kt rename to app/src/main/java/me/ash/reader/domain/model/feed/FeedWithArticle.kt index 75d6d844..c35f788d 100644 --- a/app/src/main/java/me/ash/reader/data/model/feed/FeedWithArticle.kt +++ b/app/src/main/java/me/ash/reader/domain/model/feed/FeedWithArticle.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.feed +package me.ash.reader.domain.model.feed import androidx.room.Embedded import androidx.room.Relation -import me.ash.reader.data.model.article.Article +import me.ash.reader.domain.model.article.Article /** * A [feed] contains many [articles]. diff --git a/app/src/main/java/me/ash/reader/data/model/feed/FeedWithGroup.kt b/app/src/main/java/me/ash/reader/domain/model/feed/FeedWithGroup.kt similarity index 74% rename from app/src/main/java/me/ash/reader/data/model/feed/FeedWithGroup.kt rename to app/src/main/java/me/ash/reader/domain/model/feed/FeedWithGroup.kt index b54f6cd6..8d7ddbe6 100644 --- a/app/src/main/java/me/ash/reader/data/model/feed/FeedWithGroup.kt +++ b/app/src/main/java/me/ash/reader/domain/model/feed/FeedWithGroup.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.feed +package me.ash.reader.domain.model.feed import androidx.room.Embedded import androidx.room.Relation -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.group.Group /** * A [feed] contains a [group]. diff --git a/app/src/main/java/me/ash/reader/data/model/feed/ImportantNum.kt b/app/src/main/java/me/ash/reader/domain/model/feed/ImportantNum.kt similarity index 89% rename from app/src/main/java/me/ash/reader/data/model/feed/ImportantNum.kt rename to app/src/main/java/me/ash/reader/domain/model/feed/ImportantNum.kt index fbeb1e67..43a89e75 100644 --- a/app/src/main/java/me/ash/reader/data/model/feed/ImportantNum.kt +++ b/app/src/main/java/me/ash/reader/domain/model/feed/ImportantNum.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.feed +package me.ash.reader.domain.model.feed /** * Counting the [important] number of articles in feeds and groups is generally diff --git a/app/src/main/java/me/ash/reader/data/model/general/Filter.kt b/app/src/main/java/me/ash/reader/domain/model/general/Filter.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/model/general/Filter.kt rename to app/src/main/java/me/ash/reader/domain/model/general/Filter.kt index 691d6bcb..edce46af 100644 --- a/app/src/main/java/me/ash/reader/data/model/general/Filter.kt +++ b/app/src/main/java/me/ash/reader/domain/model/general/Filter.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.general +package me.ash.reader.domain.model.general import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.FiberManualRecord @@ -13,9 +13,9 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import me.ash.reader.R -import me.ash.reader.data.model.general.Filter.Companion.All -import me.ash.reader.data.model.general.Filter.Companion.Starred -import me.ash.reader.data.model.general.Filter.Companion.Unread +import me.ash.reader.domain.model.general.Filter.Companion.All +import me.ash.reader.domain.model.general.Filter.Companion.Starred +import me.ash.reader.domain.model.general.Filter.Companion.Unread /** * Indicates filter conditions. diff --git a/app/src/main/java/me/ash/reader/data/model/general/MarkAsReadConditions.kt b/app/src/main/java/me/ash/reader/domain/model/general/MarkAsReadConditions.kt similarity index 87% rename from app/src/main/java/me/ash/reader/data/model/general/MarkAsReadConditions.kt rename to app/src/main/java/me/ash/reader/domain/model/general/MarkAsReadConditions.kt index b7d86175..256ddc0a 100644 --- a/app/src/main/java/me/ash/reader/data/model/general/MarkAsReadConditions.kt +++ b/app/src/main/java/me/ash/reader/domain/model/general/MarkAsReadConditions.kt @@ -1,6 +1,6 @@ -package me.ash.reader.data.model.general +package me.ash.reader.domain.model.general -import me.ash.reader.data.model.general.MarkAsReadConditions.* +import me.ash.reader.domain.model.general.MarkAsReadConditions.* import java.util.* /** @@ -12,6 +12,7 @@ import java.util.* * - [All]: Mark all as read */ enum class MarkAsReadConditions { + SevenDays, ThreeDays, OneDay, diff --git a/app/src/main/java/me/ash/reader/data/model/general/Version.kt b/app/src/main/java/me/ash/reader/domain/model/general/Version.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/general/Version.kt rename to app/src/main/java/me/ash/reader/domain/model/general/Version.kt index f33b6bef..132a8481 100644 --- a/app/src/main/java/me/ash/reader/data/model/general/Version.kt +++ b/app/src/main/java/me/ash/reader/domain/model/general/Version.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.general +package me.ash.reader.domain.model.general /** * Application version number, consisting of three fields. diff --git a/app/src/main/java/me/ash/reader/data/model/group/Group.kt b/app/src/main/java/me/ash/reader/domain/model/group/Group.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/model/group/Group.kt rename to app/src/main/java/me/ash/reader/domain/model/group/Group.kt index 025a69e4..7bd3e58d 100644 --- a/app/src/main/java/me/ash/reader/data/model/group/Group.kt +++ b/app/src/main/java/me/ash/reader/domain/model/group/Group.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.group +package me.ash.reader.domain.model.group import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/me/ash/reader/data/model/group/GroupWithFeed.kt b/app/src/main/java/me/ash/reader/domain/model/group/GroupWithFeed.kt similarity index 75% rename from app/src/main/java/me/ash/reader/data/model/group/GroupWithFeed.kt rename to app/src/main/java/me/ash/reader/domain/model/group/GroupWithFeed.kt index 79230548..c26171fb 100644 --- a/app/src/main/java/me/ash/reader/data/model/group/GroupWithFeed.kt +++ b/app/src/main/java/me/ash/reader/domain/model/group/GroupWithFeed.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.model.group +package me.ash.reader.domain.model.group import androidx.room.Embedded import androidx.room.Relation -import me.ash.reader.data.model.feed.Feed +import me.ash.reader.domain.model.feed.Feed /** * A [group] contains many [feeds]. diff --git a/app/src/main/java/me/ash/reader/data/dao/AccountDao.kt b/app/src/main/java/me/ash/reader/domain/repository/AccountDao.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/dao/AccountDao.kt rename to app/src/main/java/me/ash/reader/domain/repository/AccountDao.kt index a4fb1d51..a2f9c75a 100644 --- a/app/src/main/java/me/ash/reader/data/dao/AccountDao.kt +++ b/app/src/main/java/me/ash/reader/domain/repository/AccountDao.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.dao +package me.ash.reader.domain.repository import androidx.room.* import kotlinx.coroutines.flow.Flow -import me.ash.reader.data.model.account.Account +import me.ash.reader.domain.model.account.Account @Dao interface AccountDao { diff --git a/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt b/app/src/main/java/me/ash/reader/domain/repository/ArticleDao.kt similarity index 98% rename from app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt rename to app/src/main/java/me/ash/reader/domain/repository/ArticleDao.kt index 6540efe1..4885512a 100644 --- a/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt +++ b/app/src/main/java/me/ash/reader/domain/repository/ArticleDao.kt @@ -1,12 +1,12 @@ -package me.ash.reader.data.dao +package me.ash.reader.domain.repository import androidx.paging.PagingSource import androidx.room.* import kotlinx.coroutines.flow.Flow -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.article.ArticleMeta -import me.ash.reader.data.model.article.ArticleWithFeed -import me.ash.reader.data.model.feed.ImportantNum +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.article.ArticleMeta +import me.ash.reader.domain.model.article.ArticleWithFeed +import me.ash.reader.domain.model.feed.ImportantNum import java.util.* @Dao @@ -556,14 +556,14 @@ interface ArticleDao { @Transaction @Query( - """ + """ SELECT id, isUnread, isStarred FROM article WHERE accountId = :accountId ORDER BY date DESC """ ) fun queryArticleMetadataAll( - accountId: Int + accountId: Int, ): List @Insert(onConflict = OnConflictStrategy.REPLACE) diff --git a/app/src/main/java/me/ash/reader/data/dao/FeedDao.kt b/app/src/main/java/me/ash/reader/domain/repository/FeedDao.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/dao/FeedDao.kt rename to app/src/main/java/me/ash/reader/domain/repository/FeedDao.kt index b189bb1c..526dee6d 100644 --- a/app/src/main/java/me/ash/reader/data/dao/FeedDao.kt +++ b/app/src/main/java/me/ash/reader/domain/repository/FeedDao.kt @@ -1,7 +1,7 @@ -package me.ash.reader.data.dao +package me.ash.reader.domain.repository import androidx.room.* -import me.ash.reader.data.model.feed.Feed +import me.ash.reader.domain.model.feed.Feed @Dao interface FeedDao { @@ -99,7 +99,7 @@ interface FeedDao { @Delete suspend fun delete(vararg feed: Feed) - suspend fun insertOrUpdate(feeds: List) { + suspend fun insertOrUpdate(feeds: List) { feeds.forEach { val feed = queryById(it.id) if (feed == null) { diff --git a/app/src/main/java/me/ash/reader/data/dao/GroupDao.kt b/app/src/main/java/me/ash/reader/domain/repository/GroupDao.kt similarity index 88% rename from app/src/main/java/me/ash/reader/data/dao/GroupDao.kt rename to app/src/main/java/me/ash/reader/domain/repository/GroupDao.kt index dcc2c7b1..870cf396 100644 --- a/app/src/main/java/me/ash/reader/data/dao/GroupDao.kt +++ b/app/src/main/java/me/ash/reader/domain/repository/GroupDao.kt @@ -1,9 +1,9 @@ -package me.ash.reader.data.dao +package me.ash.reader.domain.repository import androidx.room.* import kotlinx.coroutines.flow.Flow -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.model.group.GroupWithFeed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.model.group.GroupWithFeed @Dao interface GroupDao { @@ -67,7 +67,7 @@ interface GroupDao { @Delete suspend fun delete(vararg group: Group) - suspend fun insertOrUpdate(groups: List) { + suspend fun insertOrUpdate(groups: List) { groups.forEach { val group = queryById(it.id) if (group == null) { diff --git a/app/src/main/java/me/ash/reader/data/repository/AbstractRssRepository.kt b/app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/repository/AbstractRssRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt index 65399d01..e193e918 100644 --- a/app/src/main/java/me/ash/reader/data/repository/AbstractRssRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.util.Log @@ -13,23 +13,23 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.supervisorScope -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.article.ArticleWithFeed -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.feed.FeedWithArticle -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.model.group.GroupWithFeed -import me.ash.reader.data.model.preference.KeepArchivedPreference -import me.ash.reader.data.model.preference.SyncIntervalPreference +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.article.ArticleWithFeed +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.feed.FeedWithArticle +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.model.group.GroupWithFeed +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.preference.KeepArchivedPreference +import me.ash.reader.infrastructure.preference.SyncIntervalPreference import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.ext.spacerDollar import java.util.* -abstract class AbstractRssRepository constructor( +abstract class AbstractRssRepository( private val context: Context, private val accountDao: AccountDao, private val articleDao: ArticleDao, diff --git a/app/src/main/java/me/ash/reader/data/repository/AccountRepository.kt b/app/src/main/java/me/ash/reader/domain/service/AccountRepository.kt similarity index 89% rename from app/src/main/java/me/ash/reader/data/repository/AccountRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/AccountRepository.kt index e6f10758..ee002357 100644 --- a/app/src/main/java/me/ash/reader/data/repository/AccountRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/AccountRepository.kt @@ -1,17 +1,17 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.os.Looper import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.Flow import me.ash.reader.R -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.model.account.AccountType -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.model.account.AccountType +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao import me.ash.reader.ui.ext.* import javax.inject.Inject diff --git a/app/src/main/java/me/ash/reader/data/repository/FeverRssRepository.kt b/app/src/main/java/me/ash/reader/domain/service/FeverRssRepository.kt similarity index 91% rename from app/src/main/java/me/ash/reader/data/repository/FeverRssRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/FeverRssRepository.kt index d99e4e07..7ce55dcc 100644 --- a/app/src/main/java/me/ash/reader/data/repository/FeverRssRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/FeverRssRepository.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.text.Html @@ -11,20 +11,20 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withContext import me.ash.reader.R -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.model.account.security.FeverSecurityKey -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.article.ArticleMeta -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.module.DefaultDispatcher -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.module.MainDispatcher -import me.ash.reader.data.provider.fever.FeverAPI -import me.ash.reader.data.provider.fever.FeverDTO +import me.ash.reader.domain.model.account.security.FeverSecurityKey +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.article.ArticleMeta +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.di.DefaultDispatcher +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.di.MainDispatcher +import me.ash.reader.infrastructure.provider.fever.FeverAPI +import me.ash.reader.infrastructure.provider.fever.FeverDTO import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.ext.dollarLast import me.ash.reader.ui.ext.showToast @@ -182,10 +182,10 @@ class FeverRssRepository @Inject constructor( val shouldBeUnread = unreadArticleIds?.contains(articleId) val shouldBeStarred = starredArticleIds?.contains(articleId) if (meta.isUnread != shouldBeUnread) { - articleDao.markAsReadByArticleId(accountId, meta.id, shouldBeUnread?:true) + articleDao.markAsReadByArticleId(accountId, meta.id, shouldBeUnread ?: true) } - if (meta.isStarred != shouldBeStarred){ - articleDao.markAsStarredByArticleId(accountId, meta.id, shouldBeStarred?:false) + if (meta.isStarred != shouldBeStarred) { + articleDao.markAsStarredByArticleId(accountId, meta.id, shouldBeStarred ?: false) } } diff --git a/app/src/main/java/me/ash/reader/data/repository/LocalRssRepository.kt b/app/src/main/java/me/ash/reader/domain/service/LocalRssRepository.kt similarity index 72% rename from app/src/main/java/me/ash/reader/data/repository/LocalRssRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/LocalRssRepository.kt index d880b60b..34d4f7e3 100644 --- a/app/src/main/java/me/ash/reader/data/repository/LocalRssRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/LocalRssRepository.kt @@ -1,15 +1,15 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import androidx.work.WorkManager import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineDispatcher -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.module.DefaultDispatcher -import me.ash.reader.data.module.IODispatcher +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.di.DefaultDispatcher +import me.ash.reader.infrastructure.di.IODispatcher import javax.inject.Inject class LocalRssRepository @Inject constructor( diff --git a/app/src/main/java/me/ash/reader/data/repository/NotificationHelper.kt b/app/src/main/java/me/ash/reader/domain/service/NotificationHelper.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/repository/NotificationHelper.kt rename to app/src/main/java/me/ash/reader/domain/service/NotificationHelper.kt index 30840097..a75a303d 100644 --- a/app/src/main/java/me/ash/reader/data/repository/NotificationHelper.kt +++ b/app/src/main/java/me/ash/reader/domain/service/NotificationHelper.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.app.* import android.content.Context @@ -9,7 +9,7 @@ import androidx.core.app.NotificationManagerCompat import dagger.hilt.android.qualifiers.ApplicationContext import me.ash.reader.MainActivity import me.ash.reader.R -import me.ash.reader.data.model.feed.FeedWithArticle +import me.ash.reader.domain.model.feed.FeedWithArticle import me.ash.reader.ui.page.common.ExtraName import me.ash.reader.ui.page.common.NotificationGroupName import java.util.* diff --git a/app/src/main/java/me/ash/reader/data/repository/OpmlRepository.kt b/app/src/main/java/me/ash/reader/domain/service/OpmlRepository.kt similarity index 92% rename from app/src/main/java/me/ash/reader/data/repository/OpmlRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/OpmlRepository.kt index 98ff99ab..238ec222 100644 --- a/app/src/main/java/me/ash/reader/data/repository/OpmlRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/OpmlRepository.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import be.ceau.opml.OpmlWriter @@ -7,11 +7,11 @@ import be.ceau.opml.entity.Head import be.ceau.opml.entity.Opml import be.ceau.opml.entity.Outline import dagger.hilt.android.qualifiers.ApplicationContext -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.source.OPMLDataSource +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.source.OPMLDataSource import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.ext.getDefaultGroupId import java.io.InputStream diff --git a/app/src/main/java/me/ash/reader/data/repository/RYRepository.kt b/app/src/main/java/me/ash/reader/domain/service/RYRepository.kt similarity index 88% rename from app/src/main/java/me/ash/reader/data/repository/RYRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/RYRepository.kt index a3d4af17..6156014e 100644 --- a/app/src/main/java/me/ash/reader/data/repository/RYRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/RYRepository.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.util.Log @@ -8,14 +8,14 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.withContext import me.ash.reader.R -import me.ash.reader.data.model.general.toVersion -import me.ash.reader.data.model.preference.* -import me.ash.reader.data.model.preference.NewVersionSizePreference.formatSize -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.module.MainDispatcher -import me.ash.reader.data.source.Download -import me.ash.reader.data.source.RYNetworkDataSource -import me.ash.reader.data.source.downloadToFileWithProgress +import me.ash.reader.domain.model.general.toVersion +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.di.MainDispatcher +import me.ash.reader.infrastructure.preference.* +import me.ash.reader.infrastructure.preference.NewVersionSizePreference.formatSize +import me.ash.reader.infrastructure.source.Download +import me.ash.reader.infrastructure.source.RYNetworkDataSource +import me.ash.reader.infrastructure.source.downloadToFileWithProgress import me.ash.reader.ui.ext.getCurrentVersion import me.ash.reader.ui.ext.getLatestApk import me.ash.reader.ui.ext.showToast diff --git a/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt b/app/src/main/java/me/ash/reader/domain/service/RssHelper.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/repository/RssHelper.kt rename to app/src/main/java/me/ash/reader/domain/service/RssHelper.kt index 30d84d55..cdc546be 100644 --- a/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt +++ b/app/src/main/java/me/ash/reader/domain/service/RssHelper.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.text.Html @@ -9,11 +9,11 @@ import com.rometools.rome.io.XmlReader import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.feed.FeedWithArticle -import me.ash.reader.data.module.IODispatcher +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.feed.FeedWithArticle +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.infrastructure.di.IODispatcher import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.ext.spacerDollar import net.dankito.readability4j.extended.Readability4JExtended diff --git a/app/src/main/java/me/ash/reader/data/repository/RssRepository.kt b/app/src/main/java/me/ash/reader/domain/service/RssRepository.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/repository/RssRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/RssRepository.kt index b536e521..98716fe5 100644 --- a/app/src/main/java/me/ash/reader/data/repository/RssRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/RssRepository.kt @@ -1,8 +1,8 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import me.ash.reader.data.model.account.AccountType +import me.ash.reader.domain.model.account.AccountType import me.ash.reader.ui.ext.currentAccountType import javax.inject.Inject diff --git a/app/src/main/java/me/ash/reader/data/repository/StringsRepository.kt b/app/src/main/java/me/ash/reader/domain/service/StringsRepository.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/repository/StringsRepository.kt rename to app/src/main/java/me/ash/reader/domain/service/StringsRepository.kt index 771b1bee..24d83232 100644 --- a/app/src/main/java/me/ash/reader/data/repository/StringsRepository.kt +++ b/app/src/main/java/me/ash/reader/domain/service/StringsRepository.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/me/ash/reader/data/repository/SyncWorker.kt b/app/src/main/java/me/ash/reader/domain/service/SyncWorker.kt similarity index 90% rename from app/src/main/java/me/ash/reader/data/repository/SyncWorker.kt rename to app/src/main/java/me/ash/reader/domain/service/SyncWorker.kt index f415548d..9e2f8603 100644 --- a/app/src/main/java/me/ash/reader/data/repository/SyncWorker.kt +++ b/app/src/main/java/me/ash/reader/domain/service/SyncWorker.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.repository +package me.ash.reader.domain.service import android.content.Context import android.util.Log @@ -8,9 +8,9 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import me.ash.reader.data.model.preference.SyncIntervalPreference -import me.ash.reader.data.model.preference.SyncOnlyOnWiFiPreference -import me.ash.reader.data.model.preference.SyncOnlyWhenChargingPreference +import me.ash.reader.infrastructure.preference.SyncIntervalPreference +import me.ash.reader.infrastructure.preference.SyncOnlyOnWiFiPreference +import me.ash.reader.infrastructure.preference.SyncOnlyWhenChargingPreference import java.util.* import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/ash/reader/data/module/ApplicationScope.kt b/app/src/main/java/me/ash/reader/infrastructure/di/ApplicationScope.kt similarity index 87% rename from app/src/main/java/me/ash/reader/data/module/ApplicationScope.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/ApplicationScope.kt index dd662f9f..a7b2f251 100644 --- a/app/src/main/java/me/ash/reader/data/module/ApplicationScope.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/ApplicationScope.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import kotlinx.coroutines.CoroutineScope import javax.inject.Qualifier diff --git a/app/src/main/java/me/ash/reader/data/module/CoroutineDispatcherModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineDispatcherModule.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/module/CoroutineDispatcherModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/CoroutineDispatcherModule.kt index dc8da993..e69d1e02 100644 --- a/app/src/main/java/me/ash/reader/data/module/CoroutineDispatcherModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineDispatcherModule.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import dagger.Module import dagger.Provides diff --git a/app/src/main/java/me/ash/reader/data/module/CoroutineQualifier.kt b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineQualifier.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/module/CoroutineQualifier.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/CoroutineQualifier.kt index 71eb31bb..efe0af98 100644 --- a/app/src/main/java/me/ash/reader/data/module/CoroutineQualifier.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineQualifier.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import javax.inject.Qualifier diff --git a/app/src/main/java/me/ash/reader/data/module/CoroutineScopeModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineScopeModule.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/module/CoroutineScopeModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/CoroutineScopeModule.kt index c2eeef76..a528fab8 100644 --- a/app/src/main/java/me/ash/reader/data/module/CoroutineScopeModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/CoroutineScopeModule.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import dagger.Module import dagger.Provides diff --git a/app/src/main/java/me/ash/reader/data/module/DatabaseModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/DatabaseModule.kt similarity index 78% rename from app/src/main/java/me/ash/reader/data/module/DatabaseModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/DatabaseModule.kt index 28aab8f0..f73c2fe4 100644 --- a/app/src/main/java/me/ash/reader/data/module/DatabaseModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/DatabaseModule.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import android.content.Context import dagger.Module @@ -6,11 +6,11 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.source.RYDatabase +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.source.RYDatabase import javax.inject.Singleton /** diff --git a/app/src/main/java/me/ash/reader/data/module/ImageLoaderModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/ImageLoaderModule.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/module/ImageLoaderModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/ImageLoaderModule.kt index 72e75888..bd33819c 100644 --- a/app/src/main/java/me/ash/reader/data/module/ImageLoaderModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/ImageLoaderModule.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import android.content.Context import android.os.Build diff --git a/app/src/main/java/me/ash/reader/data/module/OkHttpClientModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/OkHttpClientModule.kt similarity index 98% rename from app/src/main/java/me/ash/reader/data/module/OkHttpClientModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/OkHttpClientModule.kt index da1b28c0..c83794a3 100644 --- a/app/src/main/java/me/ash/reader/data/module/OkHttpClientModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/OkHttpClientModule.kt @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import android.content.Context import dagger.Module diff --git a/app/src/main/java/me/ash/reader/data/module/RetrofitModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/RetrofitModule.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/module/RetrofitModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/RetrofitModule.kt index b1f33a71..eea7d932 100644 --- a/app/src/main/java/me/ash/reader/data/module/RetrofitModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/RetrofitModule.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import me.ash.reader.data.source.RYNetworkDataSource +import me.ash.reader.infrastructure.source.RYNetworkDataSource import javax.inject.Singleton /** diff --git a/app/src/main/java/me/ash/reader/data/module/WorkerModule.kt b/app/src/main/java/me/ash/reader/infrastructure/di/WorkerModule.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/module/WorkerModule.kt rename to app/src/main/java/me/ash/reader/infrastructure/di/WorkerModule.kt index 227518ca..62780582 100644 --- a/app/src/main/java/me/ash/reader/data/module/WorkerModule.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/di/WorkerModule.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.module +package me.ash.reader.infrastructure.di import android.content.Context import androidx.work.WorkManager diff --git a/app/src/main/java/me/ash/reader/data/model/preference/AccountSettings.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/AccountSettings.kt similarity index 91% rename from app/src/main/java/me/ash/reader/data/model/preference/AccountSettings.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/AccountSettings.kt index 92e41d41..0921d82c 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/AccountSettings.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/AccountSettings.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.compositionLocalOf import androidx.compose.ui.platform.LocalContext -import me.ash.reader.data.dao.AccountDao +import me.ash.reader.domain.repository.AccountDao import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.currentAccountId @@ -30,7 +30,8 @@ fun AccountSettingsProvider( LocalSyncInterval provides (accountSettings?.syncInterval ?: SyncIntervalPreference.default), LocalSyncOnStart provides (accountSettings?.syncOnStart ?: SyncOnStartPreference.default), LocalSyncOnlyOnWiFi provides (accountSettings?.syncOnlyOnWiFi ?: SyncOnlyOnWiFiPreference.default), - LocalSyncOnlyWhenCharging provides (accountSettings?.syncOnlyWhenCharging ?: SyncOnlyWhenChargingPreference.default), + LocalSyncOnlyWhenCharging provides (accountSettings?.syncOnlyWhenCharging + ?: SyncOnlyWhenChargingPreference.default), LocalKeepArchived provides (accountSettings?.keepArchived ?: KeepArchivedPreference.default), LocalSyncBlockList provides (accountSettings?.syncBlockList ?: SyncBlockListPreference.default), ) { diff --git a/app/src/main/java/me/ash/reader/data/model/preference/AmoledDarkThemePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/AmoledDarkThemePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/AmoledDarkThemePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/AmoledDarkThemePreference.kt index 12cfd872..87c87884 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/AmoledDarkThemePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/AmoledDarkThemePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/BasicFontsPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/BasicFontsPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/BasicFontsPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/BasicFontsPreference.kt index 64f4b6e7..9126215e 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/BasicFontsPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/BasicFontsPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.material3.Typography diff --git a/app/src/main/java/me/ash/reader/data/model/preference/CustomPrimaryColorPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/CustomPrimaryColorPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/CustomPrimaryColorPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/CustomPrimaryColorPreference.kt index 7762f5f3..8eb16bcf 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/CustomPrimaryColorPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/CustomPrimaryColorPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/DarkThemePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/DarkThemePreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/DarkThemePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/DarkThemePreference.kt index 48aa8b84..91bd776b 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/DarkThemePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/DarkThemePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.foundation.isSystemInDarkTheme diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarFilledPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarFilledPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarFilledPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarFilledPreference.kt index 998e093e..658d8a0b 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarFilledPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarFilledPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarPaddingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarPaddingPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarPaddingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarPaddingPreference.kt index bcc78dc9..c8ff6a09 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarPaddingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarPaddingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarStylePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarStylePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarStylePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarStylePreference.kt index 22ff15c0..09ade629 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarStylePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarStylePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarTonalElevationPreference.kt index 46cec9f8..3d7bb965 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsFilterBarTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsFilterBarTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListExpandPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListExpandPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListExpandPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListExpandPreference.kt index c21da446..29212850 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListExpandPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListExpandPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListTonalElevationPreference.kt index 7626e0f8..6bba0b79 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsGroupListTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsGroupListTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FeedsTopBarTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsTopBarTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FeedsTopBarTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FeedsTopBarTonalElevationPreference.kt index e0a3ae96..c756ab0e 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FeedsTopBarTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FeedsTopBarTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDateStickyHeaderPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDateStickyHeaderPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDateStickyHeaderPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDateStickyHeaderPreference.kt index d650f09d..30baf3a4 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDateStickyHeaderPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDateStickyHeaderPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDescPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDescPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDescPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDescPreference.kt index f50ee5f2..ac6b3e89 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListDescPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListDescPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedIconPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedIconPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedIconPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedIconPreference.kt index 37271662..21819b91 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedIconPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedIconPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedNamePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedNamePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedNamePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedNamePreference.kt index fac433f3..c61966fb 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListFeedNamePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListFeedNamePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListImagePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListImagePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListImagePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListImagePreference.kt index 526923aa..781ae2be 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListImagePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListImagePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTimePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTimePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTimePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTimePreference.kt index 7d59c0f2..2b9f8b68 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTimePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTimePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTonalElevationPreference.kt index ee6121fe..41fc7639 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowArticleListTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowArticleListTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarFilledPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarFilledPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarFilledPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarFilledPreference.kt index 99f3c949..0cab1765 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarFilledPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarFilledPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarPaddingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarPaddingPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarPaddingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarPaddingPreference.kt index 938e1d84..4dddaad2 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarPaddingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarPaddingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarStylePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarStylePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarStylePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarStylePreference.kt index 3cf4a900..36ec0d9d 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarStylePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarStylePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarTonalElevationPreference.kt index d5695803..f2206c16 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowFilterBarTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowFilterBarTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/FlowTopBarTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowTopBarTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/FlowTopBarTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/FlowTopBarTonalElevationPreference.kt index 88446468..dc1a60d4 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/FlowTopBarTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/FlowTopBarTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/InitialFilterPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/InitialFilterPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/InitialFilterPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/InitialFilterPreference.kt index c0ff03cf..c8bdbf81 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/InitialFilterPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/InitialFilterPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/InitialPagePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/InitialPagePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/InitialPagePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/InitialPagePreference.kt index 253ac3e3..a380579e 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/InitialPagePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/InitialPagePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/KeepArchivedPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/KeepArchivedPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/KeepArchivedPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/KeepArchivedPreference.kt index db6f2a37..bd435725 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/KeepArchivedPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/KeepArchivedPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import me.ash.reader.R diff --git a/app/src/main/java/me/ash/reader/data/model/preference/LanguagesPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/LanguagesPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt index aaa0caa3..a5349b38 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/LanguagesPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/LanguagesPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import android.os.LocaleList @@ -96,7 +96,8 @@ sealed class LanguagesPreference(val value: Int) : Preference() { companion object { val default = UseDeviceLanguages - val values = listOf(UseDeviceLanguages, + val values = listOf( + UseDeviceLanguages, English, ChineseSimplified, German, @@ -125,7 +126,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() { 8 -> Spanish 9 -> Polish 10 -> Russian - 11 -> Basque + 11 -> Basque 12 -> Indonesian 13 -> ChineseTraditional else -> default @@ -144,7 +145,7 @@ sealed class LanguagesPreference(val value: Int) : Preference() { 8 -> Spanish 9 -> Polish 10 -> Russian - 11 -> Basque + 11 -> Basque 12 -> Indonesian 13 -> ChineseTraditional else -> default diff --git a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionDownloadUrlPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionDownloadUrlPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/NewVersionDownloadUrlPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionDownloadUrlPreference.kt index 0f75a99e..94d41fc4 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionDownloadUrlPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionDownloadUrlPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionLogPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionLogPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/NewVersionLogPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionLogPreference.kt index cf44968a..3a78291a 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionLogPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionLogPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionNumberPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionNumberPreference.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/preference/NewVersionNumberPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionNumberPreference.kt index 96c5ce15..dc589f59 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionNumberPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionNumberPreference.kt @@ -1,12 +1,12 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import me.ash.reader.data.model.general.Version -import me.ash.reader.data.model.general.toVersion +import me.ash.reader.domain.model.general.Version +import me.ash.reader.domain.model.general.toVersion import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionPublishDatePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionPublishDatePreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/NewVersionPublishDatePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionPublishDatePreference.kt index 3218fe3d..af7a45c7 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionPublishDatePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionPublishDatePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionSizePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionSizePreference.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/model/preference/NewVersionSizePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionSizePreference.kt index 94179e99..ac7a2a43 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/NewVersionSizePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/NewVersionSizePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/OpenLinkPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/OpenLinkPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkPreference.kt index 7addae17..60412001 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/OpenLinkPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkPreference.kt @@ -1,7 +1,6 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context -import androidx.compose.ui.text.style.Hyphens.Companion.Auto import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/me/ash/reader/data/model/preference/OpenLinkSpecificBrowserPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkSpecificBrowserPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/OpenLinkSpecificBrowserPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkSpecificBrowserPreference.kt index 7a3bc8ca..883b2960 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/OpenLinkSpecificBrowserPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/OpenLinkSpecificBrowserPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import android.content.pm.PackageManager diff --git a/app/src/main/java/me/ash/reader/data/model/preference/Preference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/Preference.kt similarity index 99% rename from app/src/main/java/me/ash/reader/data/model/preference/Preference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/Preference.kt index f07c1654..9ca55f2f 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/Preference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/Preference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingAutoHideToolbarPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingAutoHideToolbarPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingAutoHideToolbarPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingAutoHideToolbarPreference.kt index d918632d..2edfb244 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingAutoHideToolbarPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingAutoHideToolbarPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingDarkThemePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingDarkThemePreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingDarkThemePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingDarkThemePreference.kt index 71dee4d3..07b36d03 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingDarkThemePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingDarkThemePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.runtime.Composable diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingFontsPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingFontsPreference.kt index b991f1d8..c2b7405e 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingFontsPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.ui.text.font.FontFamily diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageHorizontalPaddingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageHorizontalPaddingPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingImageHorizontalPaddingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageHorizontalPaddingPreference.kt index 40eeaef8..b7ae3f9d 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageHorizontalPaddingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageHorizontalPaddingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageMaximizePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageMaximizePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingImageMaximizePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageMaximizePreference.kt index 2a37938c..63623930 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageMaximizePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageMaximizePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageRoundedCornersPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageRoundedCornersPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingImageRoundedCornersPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageRoundedCornersPreference.kt index 0b2de797..175fbf78 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingImageRoundedCornersPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingImageRoundedCornersPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingLetterSpacingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingLetterSpacingPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingLetterSpacingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingLetterSpacingPreference.kt index a81bb3e0..35d68bc8 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingLetterSpacingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingLetterSpacingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingPageTonalElevationPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingPageTonalElevationPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingPageTonalElevationPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingPageTonalElevationPreference.kt index b288d4ce..d7920eef 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingPageTonalElevationPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingPageTonalElevationPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadAlignPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadAlignPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadAlignPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadAlignPreference.kt index 35aefe61..f368934d 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadAlignPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadAlignPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.ui.text.style.TextAlign diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadBoldPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadBoldPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadBoldPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadBoldPreference.kt index 1d79acdf..14b47fe6 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadBoldPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadBoldPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadUpperCasePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadUpperCasePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadUpperCasePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadUpperCasePreference.kt index a574dd48..08308f3d 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingSubheadUpperCasePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingSubheadUpperCasePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextAlignPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextAlignPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTextAlignPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextAlignPreference.kt index b541b8e4..c78356e5 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextAlignPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextAlignPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.ui.Alignment @@ -41,6 +41,7 @@ sealed class ReadingTextAlignPreference(val value: Int) : Preference() { Center -> TextAlign.Center Justify -> TextAlign.Justify } + fun toAlignment(): Alignment.Horizontal = when (this) { Left -> Alignment.Start diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextBoldPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextBoldPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTextBoldPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextBoldPreference.kt index b8d1103a..404b5740 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextBoldPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextBoldPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextFontSizePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextFontSizePreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTextFontSizePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextFontSizePreference.kt index 85ff1c9c..cb9a4496 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextFontSizePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextFontSizePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextHorizontalPaddingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextHorizontalPaddingPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTextHorizontalPaddingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextHorizontalPaddingPreference.kt index 2c5524f7..5c4ab542 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTextHorizontalPaddingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTextHorizontalPaddingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingThemePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingThemePreference.kt similarity index 99% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingThemePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingThemePreference.kt index 19be8c6b..af2e27d5 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingThemePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingThemePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleAlignPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleAlignPreference.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleAlignPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleAlignPreference.kt index a38f2dc9..84321e08 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleAlignPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleAlignPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.compose.runtime.Stable diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleBoldPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleBoldPreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleBoldPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleBoldPreference.kt index 599daa8f..54f87a14 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleBoldPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleBoldPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleUpperCasePreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleUpperCasePreference.kt similarity index 96% rename from app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleUpperCasePreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleUpperCasePreference.kt index e2f66c73..487fb9ae 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingTitleUpperCasePreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ReadingTitleUpperCasePreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/model/preference/Settings.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/Settings.kt similarity index 99% rename from app/src/main/java/me/ash/reader/data/model/preference/Settings.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/Settings.kt index 3ed1f61d..0f27883a 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/Settings.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/Settings.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.util.Log import androidx.compose.runtime.Composable @@ -7,7 +7,7 @@ import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import kotlinx.coroutines.flow.map -import me.ash.reader.data.model.general.Version +import me.ash.reader.domain.model.general.Version import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.dataStore diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SkipVersionNumberPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SkipVersionNumberPreference.kt similarity index 82% rename from app/src/main/java/me/ash/reader/data/model/preference/SkipVersionNumberPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SkipVersionNumberPreference.kt index 5924b13a..95096702 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SkipVersionNumberPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SkipVersionNumberPreference.kt @@ -1,12 +1,12 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import me.ash.reader.data.model.general.Version -import me.ash.reader.data.model.general.toVersion +import me.ash.reader.domain.model.general.Version +import me.ash.reader.domain.model.general.toVersion import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SyncBlockListPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncBlockListPreference.kt similarity index 92% rename from app/src/main/java/me/ash/reader/data/model/preference/SyncBlockListPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SyncBlockListPreference.kt index 9ee98ca2..da00e866 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SyncBlockListPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncBlockListPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import me.ash.reader.ui.page.settings.accounts.AccountViewModel diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SyncIntervalPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncIntervalPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/SyncIntervalPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SyncIntervalPreference.kt index 89fe30f7..ee721c39 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SyncIntervalPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncIntervalPreference.kt @@ -1,10 +1,10 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.work.PeriodicWorkRequest import androidx.work.PeriodicWorkRequestBuilder import me.ash.reader.R -import me.ash.reader.data.repository.SyncWorker +import me.ash.reader.domain.service.SyncWorker import me.ash.reader.ui.page.settings.accounts.AccountViewModel import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnStartPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnStartPreference.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/model/preference/SyncOnStartPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnStartPreference.kt index 2eb14e06..6bee3ed4 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnStartPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnStartPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import me.ash.reader.R diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyOnWiFiPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyOnWiFiPreference.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyOnWiFiPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyOnWiFiPreference.kt index ace32e13..d52f31ef 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyOnWiFiPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyOnWiFiPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import me.ash.reader.R diff --git a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyWhenChargingPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyWhenChargingPreference.kt similarity index 95% rename from app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyWhenChargingPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyWhenChargingPreference.kt index c205f783..1d84a5c8 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/SyncOnlyWhenChargingPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/SyncOnlyWhenChargingPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import me.ash.reader.R diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ThemeIndexPreference.kt b/app/src/main/java/me/ash/reader/infrastructure/preference/ThemeIndexPreference.kt similarity index 93% rename from app/src/main/java/me/ash/reader/data/model/preference/ThemeIndexPreference.kt rename to app/src/main/java/me/ash/reader/infrastructure/preference/ThemeIndexPreference.kt index 2113fe4f..ef5f33de 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ThemeIndexPreference.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/preference/ThemeIndexPreference.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.model.preference +package me.ash.reader.infrastructure.preference import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/app/src/main/java/me/ash/reader/data/provider/BaseAPI.kt b/app/src/main/java/me/ash/reader/infrastructure/provider/BaseAPI.kt similarity index 73% rename from app/src/main/java/me/ash/reader/data/provider/BaseAPI.kt rename to app/src/main/java/me/ash/reader/infrastructure/provider/BaseAPI.kt index b938bbed..77117fc6 100644 --- a/app/src/main/java/me/ash/reader/data/provider/BaseAPI.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/provider/BaseAPI.kt @@ -1,9 +1,9 @@ -package me.ash.reader.data.provider +package me.ash.reader.infrastructure.provider import com.google.gson.Gson import com.google.gson.GsonBuilder -import me.ash.reader.data.module.UserAgentInterceptor -import me.ash.reader.data.module.cachingHttpClient +import me.ash.reader.infrastructure.di.UserAgentInterceptor +import me.ash.reader.infrastructure.di.cachingHttpClient import okhttp3.OkHttpClient abstract class BaseAPI { diff --git a/app/src/main/java/me/ash/reader/data/provider/fever/FeverAPI.kt b/app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverAPI.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/provider/fever/FeverAPI.kt rename to app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverAPI.kt index f269fb27..dc7c4893 100644 --- a/app/src/main/java/me/ash/reader/data/provider/fever/FeverAPI.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverAPI.kt @@ -1,6 +1,6 @@ -package me.ash.reader.data.provider.fever +package me.ash.reader.infrastructure.provider.fever -import me.ash.reader.data.provider.BaseAPI +import me.ash.reader.infrastructure.provider.BaseAPI import me.ash.reader.ui.ext.encodeBase64 import me.ash.reader.ui.ext.md5 import okhttp3.FormBody diff --git a/app/src/main/java/me/ash/reader/data/provider/fever/FeverDTO.kt b/app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverDTO.kt similarity index 99% rename from app/src/main/java/me/ash/reader/data/provider/fever/FeverDTO.kt rename to app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverDTO.kt index 25414ecd..f9f274e8 100644 --- a/app/src/main/java/me/ash/reader/data/provider/fever/FeverDTO.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/provider/fever/FeverDTO.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.provider.fever +package me.ash.reader.infrastructure.provider.fever object FeverDTO { diff --git a/app/src/main/java/me/ash/reader/data/source/GoogleReaderApiDto.kt b/app/src/main/java/me/ash/reader/infrastructure/source/GoogleReaderApiDto.kt similarity index 97% rename from app/src/main/java/me/ash/reader/data/source/GoogleReaderApiDto.kt rename to app/src/main/java/me/ash/reader/infrastructure/source/GoogleReaderApiDto.kt index 7823d2cb..706f43a9 100644 --- a/app/src/main/java/me/ash/reader/data/source/GoogleReaderApiDto.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/source/GoogleReaderApiDto.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.source +package me.ash.reader.infrastructure.source object GoogleReaderApiDto { // subscription/list?output=json @@ -75,4 +75,4 @@ object GoogleReaderApiDto { val streamId: String? = null, val title: String? = null, ) -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/data/source/OPMLDataSource.kt b/app/src/main/java/me/ash/reader/infrastructure/source/OPMLDataSource.kt similarity index 94% rename from app/src/main/java/me/ash/reader/data/source/OPMLDataSource.kt rename to app/src/main/java/me/ash/reader/infrastructure/source/OPMLDataSource.kt index 1138e0a9..67290420 100644 --- a/app/src/main/java/me/ash/reader/data/source/OPMLDataSource.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/source/OPMLDataSource.kt @@ -1,14 +1,14 @@ -package me.ash.reader.data.source +package me.ash.reader.infrastructure.source import android.content.Context import be.ceau.opml.OpmlParser import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.model.group.GroupWithFeed -import me.ash.reader.data.module.IODispatcher +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.model.group.GroupWithFeed +import me.ash.reader.infrastructure.di.IODispatcher import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.ext.spacerDollar import java.io.InputStream diff --git a/app/src/main/java/me/ash/reader/data/source/RYDatabase.kt b/app/src/main/java/me/ash/reader/infrastructure/source/RYDatabase.kt similarity index 88% rename from app/src/main/java/me/ash/reader/data/source/RYDatabase.kt rename to app/src/main/java/me/ash/reader/infrastructure/source/RYDatabase.kt index 8653700a..6fdc5b00 100644 --- a/app/src/main/java/me/ash/reader/data/source/RYDatabase.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/source/RYDatabase.kt @@ -1,19 +1,19 @@ -package me.ash.reader.data.source +package me.ash.reader.infrastructure.source import android.content.Context import androidx.room.* import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import me.ash.reader.data.dao.AccountDao -import me.ash.reader.data.dao.ArticleDao -import me.ash.reader.data.dao.FeedDao -import me.ash.reader.data.dao.GroupDao -import me.ash.reader.data.model.account.* -import me.ash.reader.data.model.account.security.DESUtils -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.model.preference.* +import me.ash.reader.domain.model.account.* +import me.ash.reader.domain.model.account.security.DESUtils +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.repository.AccountDao +import me.ash.reader.domain.repository.ArticleDao +import me.ash.reader.domain.repository.FeedDao +import me.ash.reader.domain.repository.GroupDao +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.ext.toInt import java.util.* diff --git a/app/src/main/java/me/ash/reader/data/source/RYNetworkDataSource.kt b/app/src/main/java/me/ash/reader/infrastructure/source/RYNetworkDataSource.kt similarity index 98% rename from app/src/main/java/me/ash/reader/data/source/RYNetworkDataSource.kt rename to app/src/main/java/me/ash/reader/infrastructure/source/RYNetworkDataSource.kt index 45454e26..3c49c34f 100644 --- a/app/src/main/java/me/ash/reader/data/source/RYNetworkDataSource.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/source/RYNetworkDataSource.kt @@ -1,4 +1,4 @@ -package me.ash.reader.data.source +package me.ash.reader.infrastructure.source import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/me/ash/reader/ui/component/FilterBar.kt b/app/src/main/java/me/ash/reader/ui/component/FilterBar.kt index a7e7d773..249d1f2a 100644 --- a/app/src/main/java/me/ash/reader/ui/component/FilterBar.kt +++ b/app/src/main/java/me/ash/reader/ui/component/FilterBar.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalView import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp -import me.ash.reader.data.model.general.Filter -import me.ash.reader.data.model.preference.FlowFilterBarStylePreference -import me.ash.reader.data.model.preference.LocalThemeIndex +import me.ash.reader.domain.model.general.Filter +import me.ash.reader.infrastructure.preference.FlowFilterBarStylePreference +import me.ash.reader.infrastructure.preference.LocalThemeIndex import me.ash.reader.ui.ext.surfaceColorAtElevation import me.ash.reader.ui.theme.palette.onDark diff --git a/app/src/main/java/me/ash/reader/ui/component/ReadingThemePrev.kt b/app/src/main/java/me/ash/reader/ui/component/ReadingThemePrev.kt index 9df4db44..664d232c 100644 --- a/app/src/main/java/me/ash/reader/ui/component/ReadingThemePrev.kt +++ b/app/src/main/java/me/ash/reader/ui/component/ReadingThemePrev.kt @@ -20,10 +20,10 @@ import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import me.ash.reader.data.model.preference.LocalReadingImageHorizontalPadding -import me.ash.reader.data.model.preference.LocalReadingImageRoundedCorners -import me.ash.reader.data.model.preference.LocalReadingTextAlign -import me.ash.reader.data.model.preference.ReadingThemePreference +import me.ash.reader.infrastructure.preference.LocalReadingImageHorizontalPadding +import me.ash.reader.infrastructure.preference.LocalReadingImageRoundedCorners +import me.ash.reader.infrastructure.preference.LocalReadingTextAlign +import me.ash.reader.infrastructure.preference.ReadingThemePreference import me.ash.reader.ui.theme.Shape24 import me.ash.reader.ui.theme.palette.onDark import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/component/base/AnimatedPopup.kt b/app/src/main/java/me/ash/reader/ui/component/base/AnimatedPopup.kt index 7192863a..7fff7a66 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/AnimatedPopup.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/AnimatedPopup.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.component.base -import RYExtensibleVisibility import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.statusBars import androidx.compose.runtime.Composable diff --git a/app/src/main/java/me/ash/reader/ui/component/base/DisplayText.kt b/app/src/main/java/me/ash/reader/ui/component/base/DisplayText.kt index 56ee1a5a..e268abea 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/DisplayText.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/DisplayText.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.component.base -import RYExtensibleVisibility import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -54,4 +53,4 @@ fun DisplayText( ) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/component/base/DynamicSVGImage.kt b/app/src/main/java/me/ash/reader/ui/component/base/DynamicSVGImage.kt index 4f747d70..c22ed8d6 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/DynamicSVGImage.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/DynamicSVGImage.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.unit.IntSize import com.caverock.androidsvg.SVG -import me.ash.reader.data.model.preference.LocalDarkTheme +import me.ash.reader.infrastructure.preference.LocalDarkTheme import me.ash.reader.ui.svg.parseDynamicColor import me.ash.reader.ui.theme.palette.LocalTonalPalettes diff --git a/app/src/main/java/me/ash/reader/ui/component/base/RYExtensibleVisibility.kt b/app/src/main/java/me/ash/reader/ui/component/base/RYExtensibleVisibility.kt index 609c09b4..27bce842 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/RYExtensibleVisibility.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/RYExtensibleVisibility.kt @@ -1,3 +1,5 @@ +package me.ash.reader.ui.component.base + import androidx.compose.animation.* import androidx.compose.runtime.Composable diff --git a/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt b/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt index 2a8f4d9f..103a708c 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt @@ -1,7 +1,10 @@ package me.ash.reader.ui.component.base import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -56,4 +59,4 @@ fun RYScaffold( bottomBar = { bottomBar?.invoke() }, floatingActionButton = { floatingActionButton?.invoke() }, ) -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt b/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt index da086075..d5da58db 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt @@ -1,7 +1,5 @@ package me.ash.reader.ui.component.base -import android.content.Intent -import android.net.Uri import android.net.http.SslError import android.util.Log import android.webkit.* @@ -11,8 +9,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.viewinterop.AndroidView -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser +import me.ash.reader.infrastructure.preference.LocalOpenLink +import me.ash.reader.infrastructure.preference.LocalOpenLinkSpecificBrowser import me.ash.reader.ui.ext.openURL const val INJECTION_TOKEN = "/android_asset_font/" diff --git a/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt b/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt index 76813212..95964a89 100644 --- a/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt +++ b/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt @@ -52,7 +52,7 @@ import coil.size.Precision import coil.size.Size import coil.size.pxOrElse import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalReadingImageMaximize +import me.ash.reader.infrastructure.preference.LocalReadingImageMaximize import me.ash.reader.ui.component.base.RYAsyncImage import org.jsoup.Jsoup import org.jsoup.helper.StringUtil diff --git a/app/src/main/java/me/ash/reader/ui/component/reader/Reader.kt b/app/src/main/java/me/ash/reader/ui/component/reader/Reader.kt index e251a498..10b9d99d 100644 --- a/app/src/main/java/me/ash/reader/ui/component/reader/Reader.kt +++ b/app/src/main/java/me/ash/reader/ui/component/reader/Reader.kt @@ -21,17 +21,10 @@ package me.ash.reader.ui.component.reader import android.content.Context -import android.content.Intent -import android.net.Uri import android.util.Log import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.runtime.Composable import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser -import me.ash.reader.data.model.preference.OpenLinkPreference -import me.ash.reader.data.model.preference.OpenLinkSpecificBrowserPreference -import me.ash.reader.ui.ext.openURL + @Suppress("FunctionName") fun LazyListScope.Reader( context: Context, diff --git a/app/src/main/java/me/ash/reader/ui/component/reader/Styles.kt b/app/src/main/java/me/ash/reader/ui/component/reader/Styles.kt index 61dcb939..eedbab4c 100644 --- a/app/src/main/java/me/ash/reader/ui/component/reader/Styles.kt +++ b/app/src/main/java/me/ash/reader/ui/component/reader/Styles.kt @@ -36,16 +36,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import me.ash.reader.data.model.preference.LocalReadingFonts -import me.ash.reader.data.model.preference.LocalReadingImageHorizontalPadding -import me.ash.reader.data.model.preference.LocalReadingImageRoundedCorners -import me.ash.reader.data.model.preference.LocalReadingLetterSpacing -import me.ash.reader.data.model.preference.LocalReadingSubheadAlign -import me.ash.reader.data.model.preference.LocalReadingSubheadBold -import me.ash.reader.data.model.preference.LocalReadingTextAlign -import me.ash.reader.data.model.preference.LocalReadingTextBold -import me.ash.reader.data.model.preference.LocalReadingTextFontSize -import me.ash.reader.data.model.preference.LocalReadingTextHorizontalPadding +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.ext.alphaLN const val MAX_CONTENT_WIDTH = 840.0 diff --git a/app/src/main/java/me/ash/reader/ui/component/reader/TextComposer.kt b/app/src/main/java/me/ash/reader/ui/component/reader/TextComposer.kt index b1c1c8fd..7668b20e 100644 --- a/app/src/main/java/me/ash/reader/ui/component/reader/TextComposer.kt +++ b/app/src/main/java/me/ash/reader/ui/component/reader/TextComposer.kt @@ -81,7 +81,7 @@ class TextComposer( ) -> R, ): R { val url = link ?: findClosestLink() - //builder.ensureDoubleNewline() + // builder.ensureDoubleNewline() terminateCurrentText() val onClick: (() -> Unit)? = if (url?.isNotBlank() == true) { { diff --git a/app/src/main/java/me/ash/reader/ui/ext/ContextExt.kt b/app/src/main/java/me/ash/reader/ui/ext/ContextExt.kt index 89f7cabc..6910acc2 100644 --- a/app/src/main/java/me/ash/reader/ui/ext/ContextExt.kt +++ b/app/src/main/java/me/ash/reader/ui/ext/ContextExt.kt @@ -12,17 +12,13 @@ import android.util.Log import android.widget.Toast import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION -import androidx.browser.customtabs.CustomTabsService.START_REDELIVER_INTENT -import androidx.core.content.ContextCompat import androidx.core.content.FileProvider -import androidx.core.content.PackageManagerCompat import androidx.core.net.toUri -import androidx.work.impl.utils.PackageManagerHelper import me.ash.reader.R -import me.ash.reader.data.model.general.Version -import me.ash.reader.data.model.general.toVersion -import me.ash.reader.data.model.preference.OpenLinkPreference -import me.ash.reader.data.model.preference.OpenLinkSpecificBrowserPreference +import me.ash.reader.domain.model.general.Version +import me.ash.reader.domain.model.general.toVersion +import me.ash.reader.infrastructure.preference.OpenLinkPreference +import me.ash.reader.infrastructure.preference.OpenLinkSpecificBrowserPreference import java.io.File diff --git a/app/src/main/java/me/ash/reader/ui/page/common/HomeEntry.kt b/app/src/main/java/me/ash/reader/ui/page/common/HomeEntry.kt index 1ff2518b..5bb4e91f 100644 --- a/app/src/main/java/me/ash/reader/ui/page/common/HomeEntry.kt +++ b/app/src/main/java/me/ash/reader/ui/page/common/HomeEntry.kt @@ -15,9 +15,9 @@ import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest -import me.ash.reader.data.model.general.Filter -import me.ash.reader.data.model.preference.LocalDarkTheme -import me.ash.reader.data.model.preference.LocalReadingDarkTheme +import me.ash.reader.domain.model.general.Filter +import me.ash.reader.infrastructure.preference.LocalDarkTheme +import me.ash.reader.infrastructure.preference.LocalReadingDarkTheme import me.ash.reader.ui.ext.* import me.ash.reader.ui.page.home.HomeViewModel import me.ash.reader.ui.page.home.feeds.FeedsPage diff --git a/app/src/main/java/me/ash/reader/ui/page/home/HomeViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/HomeViewModel.kt index 910bf93a..2ac6ad77 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/HomeViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/HomeViewModel.kt @@ -12,16 +12,16 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch -import me.ash.reader.data.model.article.ArticleFlowItem -import me.ash.reader.data.model.article.mapPagingFlowItem -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.general.Filter -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.module.ApplicationScope -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.repository.RssRepository -import me.ash.reader.data.repository.StringsRepository -import me.ash.reader.data.repository.SyncWorker +import me.ash.reader.domain.model.article.ArticleFlowItem +import me.ash.reader.domain.model.article.mapPagingFlowItem +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.general.Filter +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.domain.service.StringsRepository +import me.ash.reader.domain.service.SyncWorker +import me.ash.reader.infrastructure.di.ApplicationScope +import me.ash.reader.infrastructure.di.IODispatcher import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedItem.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedItem.kt index 120e5af1..bd9ae22c 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedItem.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedItem.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.page.home.feeds -import RYExtensibleVisibility import android.view.HapticFeedbackConstants import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -23,8 +22,9 @@ import androidx.compose.ui.platform.LocalView import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import me.ash.reader.data.model.feed.Feed +import me.ash.reader.domain.model.feed.Feed import me.ash.reader.ui.component.FeedIcon +import me.ash.reader.ui.component.base.RYExtensibleVisibility import me.ash.reader.ui.page.home.feeds.drawer.feed.FeedOptionViewModel import me.ash.reader.ui.theme.ShapeBottom32 @@ -98,4 +98,4 @@ fun FeedItem( } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedOptionView.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedOptionView.kt index 88bb30e7..a75896e4 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedOptionView.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedOptionView.kt @@ -25,7 +25,7 @@ import com.google.accompanist.flowlayout.FlowCrossAxisAlignment import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.MainAxisAlignment import me.ash.reader.R -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.group.Group import me.ash.reader.ui.component.base.RYSelectionChip import me.ash.reader.ui.component.base.Subtitle import me.ash.reader.ui.theme.palette.alwaysLight @@ -38,8 +38,8 @@ fun FeedOptionView( selectedAllowNotificationPreset: Boolean = false, selectedParseFullContentPreset: Boolean = false, isMoveToGroup: Boolean = false, - showGroup:Boolean = true, - showUnsubscribe:Boolean = true, + showGroup: Boolean = true, + showUnsubscribe: Boolean = true, notSubscribeMode: Boolean = false, selectedGroupId: String = "", allowNotificationPresetOnClick: () -> Unit = {}, diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt index ce65236e..8deec82f 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt @@ -25,10 +25,13 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import androidx.work.WorkInfo import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.FilterBar import me.ash.reader.ui.component.base.* -import me.ash.reader.ui.ext.* +import me.ash.reader.ui.ext.alphaLN +import me.ash.reader.ui.ext.collectAsStateValue +import me.ash.reader.ui.ext.findActivity +import me.ash.reader.ui.ext.getCurrentVersion import me.ash.reader.ui.page.common.RouteName import me.ash.reader.ui.page.home.FilterState import me.ash.reader.ui.page.home.HomeViewModel @@ -38,6 +41,7 @@ import me.ash.reader.ui.page.home.feeds.drawer.group.GroupOptionDrawer import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeDialog import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewModel import me.ash.reader.ui.page.settings.accounts.AccountViewModel +import kotlin.collections.set import kotlin.math.ln @OptIn( diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt index 429bf276..d480d3b8 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt @@ -10,12 +10,12 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.module.DefaultDispatcher -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.repository.AccountRepository -import me.ash.reader.data.repository.RssRepository -import me.ash.reader.data.repository.StringsRepository +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.service.AccountRepository +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.domain.service.StringsRepository +import me.ash.reader.infrastructure.di.DefaultDispatcher +import me.ash.reader.infrastructure.di.IODispatcher import me.ash.reader.ui.page.home.FilterState import javax.inject.Inject @@ -108,6 +108,6 @@ data class FeedsUiState( ) sealed class GroupFeedsView { - class Group(val group: me.ash.reader.data.model.group.Group) : GroupFeedsView() - class Feed(val feed: me.ash.reader.data.model.feed.Feed) : GroupFeedsView() + class Group(val group: me.ash.reader.domain.model.group.Group) : GroupFeedsView() + class Feed(val feed: me.ash.reader.domain.model.feed.Feed) : GroupFeedsView() } diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt index 4ff197bc..abef8721 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import me.ash.reader.R -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.group.Group import me.ash.reader.ui.page.home.feeds.drawer.group.GroupOptionViewModel import me.ash.reader.ui.theme.Shape32 import me.ash.reader.ui.theme.ShapeTop32 @@ -96,4 +96,4 @@ fun GroupItem( } Spacer(modifier = Modifier.height(22.dp)) } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/accounts/AccountsTab.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/accounts/AccountsTab.kt index 6836e22c..d3039c2b 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/accounts/AccountsTab.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/accounts/AccountsTab.kt @@ -25,7 +25,7 @@ import com.google.accompanist.flowlayout.FlowCrossAxisAlignment import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.MainAxisAlignment import me.ash.reader.R -import me.ash.reader.data.model.account.Account +import me.ash.reader.domain.model.account.Account import me.ash.reader.ui.component.base.RYDialog import me.ash.reader.ui.ext.currentAccountId import me.ash.reader.ui.theme.palette.alwaysLight diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionDrawer.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionDrawer.kt index eec70dcb..bf3570f4 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionDrawer.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionDrawer.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser +import me.ash.reader.infrastructure.preference.LocalOpenLink +import me.ash.reader.infrastructure.preference.LocalOpenLinkSpecificBrowser import me.ash.reader.ui.component.ChangeUrlDialog import me.ash.reader.ui.component.FeedIcon import me.ash.reader.ui.component.RenameDialog diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionViewModel.kt index 864e6296..3a909ab3 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionViewModel.kt @@ -14,11 +14,11 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.module.MainDispatcher -import me.ash.reader.data.repository.RssRepository +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.di.MainDispatcher import javax.inject.Inject @OptIn(ExperimentalMaterialApi::class) diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionDrawer.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionDrawer.kt index 9026008e..efa5d89d 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionDrawer.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionDrawer.kt @@ -31,7 +31,7 @@ import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.MainAxisAlignment import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.data.model.group.Group +import me.ash.reader.domain.model.group.Group import me.ash.reader.ui.component.RenameDialog import me.ash.reader.ui.component.base.BottomDrawer import me.ash.reader.ui.component.base.RYSelectionChip diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionViewModel.kt index 33d5c445..356cab07 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionViewModel.kt @@ -14,10 +14,10 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.module.MainDispatcher -import me.ash.reader.data.repository.RssRepository +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.di.MainDispatcher import javax.inject.Inject @OptIn(ExperimentalMaterialApi::class) diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeViewModel.kt index 8f7e51f7..5fe53c55 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeViewModel.kt @@ -8,13 +8,13 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.repository.OpmlRepository -import me.ash.reader.data.repository.RssHelper -import me.ash.reader.data.repository.RssRepository -import me.ash.reader.data.repository.StringsRepository +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.group.Group +import me.ash.reader.domain.service.OpmlRepository +import me.ash.reader.domain.service.RssHelper +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.domain.service.StringsRepository import me.ash.reader.ui.ext.formatUrl import java.io.InputStream import javax.inject.Inject diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt index 210efea6..a8cb97d8 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt @@ -14,11 +14,7 @@ import androidx.compose.material.rememberDismissState import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue +import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -32,14 +28,12 @@ import androidx.compose.ui.unit.dp import coil.size.Precision import coil.size.Scale import me.ash.reader.R -import me.ash.reader.data.model.article.ArticleWithFeed -import me.ash.reader.data.model.preference.* +import me.ash.reader.domain.model.article.ArticleWithFeed +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.FeedIcon import me.ash.reader.ui.component.base.RYAsyncImage import me.ash.reader.ui.component.base.SIZE_1000 import me.ash.reader.ui.theme.Shape20 -import me.ash.reader.data.model.preference.LocalDarkTheme -import me.ash.reader.data.model.preference.LocalAmoledDarkTheme @Composable fun ArticleItem( @@ -229,4 +223,4 @@ fun swipeToDismiss( directions = setOf(DismissDirection.StartToEnd), ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt index b5082fa0..cc64423d 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt @@ -8,8 +8,8 @@ import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.paging.compose.LazyPagingItems -import me.ash.reader.data.model.article.ArticleFlowItem -import me.ash.reader.data.model.article.ArticleWithFeed +import me.ash.reader.domain.model.article.ArticleFlowItem +import me.ash.reader.domain.model.article.ArticleWithFeed @Suppress("FunctionName") @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class) diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt index 6a31712b..50dc5ee9 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.page.home.flow -import RYExtensibleVisibility import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn @@ -24,14 +23,10 @@ import androidx.work.WorkInfo import kotlinx.coroutines.delay import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.data.model.general.MarkAsReadConditions -import me.ash.reader.data.model.preference.* -import me.ash.reader.data.repository.SyncWorker.Companion.getIsSyncing +import me.ash.reader.domain.model.general.MarkAsReadConditions +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.FilterBar -import me.ash.reader.ui.component.base.DisplayText -import me.ash.reader.ui.component.base.FeedbackIconButton -import me.ash.reader.ui.component.base.RYScaffold -import me.ash.reader.ui.component.base.SwipeRefresh +import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.page.common.RouteName import me.ash.reader.ui.page.home.HomeViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowViewModel.kt index 3225d463..1cea8eb1 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowViewModel.kt @@ -9,9 +9,9 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -import me.ash.reader.data.model.general.MarkAsReadConditions -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.repository.RssRepository +import me.ash.reader.domain.model.general.MarkAsReadConditions +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.infrastructure.di.IODispatcher import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/MarkAsReadBar.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/MarkAsReadBar.kt index fc4d1c73..c1fe26b3 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/MarkAsReadBar.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/MarkAsReadBar.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.model.general.MarkAsReadConditions +import me.ash.reader.domain.model.general.MarkAsReadConditions import me.ash.reader.ui.component.base.AnimatedPopup import me.ash.reader.ui.theme.palette.alwaysLight diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/SearchBar.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/SearchBar.kt index 198e1257..95ebce83 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/flow/SearchBar.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/flow/SearchBar.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.constant.ElevationTokens +import me.ash.reader.domain.model.constant.ElevationTokens @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -99,4 +99,4 @@ fun SearchBar( } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/BottomBar.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/BottomBar.kt index 62481169..3272ec40 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/BottomBar.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/BottomBar.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.page.home.reading -import RYExtensibleVisibility import android.view.HapticFeedbackConstants import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons @@ -22,8 +21,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalReadingPageTonalElevation +import me.ash.reader.infrastructure.preference.LocalReadingPageTonalElevation import me.ash.reader.ui.component.base.CanBeDisabledIconButton +import me.ash.reader.ui.component.base.RYExtensibleVisibility @Composable fun BottomBar( diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/Content.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/Content.kt index 5c7af9f2..c48850ad 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/Content.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/Content.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.page.home.reading -import RYExtensibleVisibility import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState @@ -13,9 +12,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser -import me.ash.reader.data.model.preference.LocalReadingSubheadUpperCase +import me.ash.reader.infrastructure.preference.LocalOpenLink +import me.ash.reader.infrastructure.preference.LocalOpenLinkSpecificBrowser +import me.ash.reader.infrastructure.preference.LocalReadingSubheadUpperCase +import me.ash.reader.ui.component.base.RYExtensibleVisibility import me.ash.reader.ui.component.reader.Reader import me.ash.reader.ui.ext.drawVerticalScrollbar import me.ash.reader.ui.ext.openURL diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/Metadata.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/Metadata.kt index 3520f38d..fb865e65 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/Metadata.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/Metadata.kt @@ -12,12 +12,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser -import me.ash.reader.data.model.preference.LocalReadingFonts -import me.ash.reader.data.model.preference.LocalReadingTitleAlign -import me.ash.reader.data.model.preference.LocalReadingTitleBold -import me.ash.reader.data.model.preference.LocalReadingTitleUpperCase +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.ext.formatAsString import me.ash.reader.ui.ext.openURL import me.ash.reader.ui.ext.roundClick diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingPage.kt index 931b7d61..66f791ef 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingPage.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import androidx.paging.compose.collectAsLazyPagingItems -import me.ash.reader.data.model.preference.LocalReadingAutoHideToolbar -import me.ash.reader.data.model.preference.LocalReadingPageTonalElevation +import me.ash.reader.infrastructure.preference.LocalReadingAutoHideToolbar +import me.ash.reader.infrastructure.preference.LocalReadingPageTonalElevation import me.ash.reader.ui.component.base.RYScaffold import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.isScrollDown diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingViewModel.kt index 876d03a3..da5e0021 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/ReadingViewModel.kt @@ -12,10 +12,10 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import me.ash.reader.data.model.article.ArticleFlowItem -import me.ash.reader.data.model.article.ArticleWithFeed -import me.ash.reader.data.repository.RssHelper -import me.ash.reader.data.repository.RssRepository +import me.ash.reader.domain.model.article.ArticleFlowItem +import me.ash.reader.domain.model.article.ArticleWithFeed +import me.ash.reader.domain.service.RssHelper +import me.ash.reader.domain.service.RssRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/home/reading/TopBar.kt b/app/src/main/java/me/ash/reader/ui/page/home/reading/TopBar.kt index f4a427f9..8332d7e7 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/reading/TopBar.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/reading/TopBar.kt @@ -1,6 +1,5 @@ package me.ash.reader.ui.page.home.reading -import RYExtensibleVisibility import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize @@ -16,15 +15,15 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalReadingPageTonalElevation +import me.ash.reader.infrastructure.preference.LocalReadingPageTonalElevation import me.ash.reader.ui.component.base.FeedbackIconButton +import me.ash.reader.ui.component.base.RYExtensibleVisibility import me.ash.reader.ui.ext.share import me.ash.reader.ui.page.common.RouteName diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt index 02108816..2a0a60be 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.zIndex import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalNewVersionNumber -import me.ash.reader.data.model.preference.LocalSkipVersionNumber +import me.ash.reader.infrastructure.preference.LocalNewVersionNumber +import me.ash.reader.infrastructure.preference.LocalSkipVersionNumber import me.ash.reader.ui.component.base.Banner import me.ash.reader.ui.component.base.DisplayText import me.ash.reader.ui.component.base.FeedbackIconButton diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountDetailsPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountDetailsPage.kt index f10b90df..43fa0fba 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountDetailsPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountDetailsPage.kt @@ -22,7 +22,10 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.KeepArchivedPreference +import me.ash.reader.infrastructure.preference.SyncBlockListPreference +import me.ash.reader.infrastructure.preference.SyncIntervalPreference +import me.ash.reader.infrastructure.preference.not import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.showToast diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountViewModel.kt index edbe3b64..f585a90f 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/AccountViewModel.kt @@ -8,13 +8,13 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.module.DefaultDispatcher -import me.ash.reader.data.module.IODispatcher -import me.ash.reader.data.module.MainDispatcher -import me.ash.reader.data.repository.AccountRepository -import me.ash.reader.data.repository.OpmlRepository -import me.ash.reader.data.repository.RssRepository +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.service.AccountRepository +import me.ash.reader.domain.service.OpmlRepository +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.infrastructure.di.DefaultDispatcher +import me.ash.reader.infrastructure.di.IODispatcher +import me.ash.reader.infrastructure.di.MainDispatcher import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt index e53b2ac2..2a5b1b4d 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt @@ -12,8 +12,11 @@ import androidx.compose.material.icons.rounded.RssFeed import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager @@ -25,9 +28,9 @@ import androidx.compose.ui.window.DialogProperties import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.model.account.AccountType -import me.ash.reader.data.model.account.security.FeverSecurityKey +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.model.account.AccountType +import me.ash.reader.domain.model.account.security.FeverSecurityKey import me.ash.reader.ui.component.base.RYDialog import me.ash.reader.ui.component.base.RYOutlineTextField import me.ash.reader.ui.ext.collectAsStateValue diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddLocalAccountDialog.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddLocalAccountDialog.kt index 421ddfe1..b3697b0a 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddLocalAccountDialog.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddLocalAccountDialog.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.window.DialogProperties import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.model.account.AccountType +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.model.account.AccountType import me.ash.reader.ui.component.base.RYDialog import me.ash.reader.ui.component.base.RYOutlineTextField import me.ash.reader.ui.ext.collectAsStateValue diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AdditionViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AdditionViewModel.kt index f291d5bc..9c3291c1 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AdditionViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AdditionViewModel.kt @@ -6,10 +6,10 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update -import me.ash.reader.data.repository.OpmlRepository -import me.ash.reader.data.repository.RssHelper -import me.ash.reader.data.repository.RssRepository -import me.ash.reader.data.repository.StringsRepository +import me.ash.reader.domain.service.OpmlRepository +import me.ash.reader.domain.service.RssHelper +import me.ash.reader.domain.service.RssRepository +import me.ash.reader.domain.service.StringsRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/AccountConnection.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/AccountConnection.kt index 1899b3ab..d9418368 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/AccountConnection.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/AccountConnection.kt @@ -9,8 +9,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.model.account.AccountType +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.model.account.AccountType import me.ash.reader.ui.component.base.Subtitle @Composable diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt index c1dd8385..d92a409d 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.* import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import me.ash.reader.R -import me.ash.reader.data.model.account.Account -import me.ash.reader.data.model.account.security.FeverSecurityKey +import me.ash.reader.domain.model.account.Account +import me.ash.reader.domain.model.account.security.FeverSecurityKey import me.ash.reader.ui.component.base.TextFieldDialog import me.ash.reader.ui.ext.mask import me.ash.reader.ui.page.settings.SettingItem diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/ColorAndStylePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/ColorAndStylePage.kt index c05abe47..0eae8468 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/ColorAndStylePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/ColorAndStylePage.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.ExternalFonts import me.ash.reader.ui.page.common.RouteName diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/DarkThemePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/DarkThemePage.kt index e558edfa..a6da35a4 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/DarkThemePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/DarkThemePage.kt @@ -15,10 +15,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.DarkThemePreference -import me.ash.reader.data.model.preference.LocalAmoledDarkTheme -import me.ash.reader.data.model.preference.LocalDarkTheme -import me.ash.reader.data.model.preference.not +import me.ash.reader.infrastructure.preference.DarkThemePreference +import me.ash.reader.infrastructure.preference.LocalAmoledDarkTheme +import me.ash.reader.infrastructure.preference.LocalDarkTheme +import me.ash.reader.infrastructure.preference.not import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPagePreview.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPagePreview.kt index 77087866..abefbc3e 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPagePreview.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPagePreview.kt @@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.general.Filter -import me.ash.reader.data.model.group.Group -import me.ash.reader.data.model.preference.FeedsGroupListExpandPreference -import me.ash.reader.data.model.preference.FeedsGroupListTonalElevationPreference -import me.ash.reader.data.model.preference.FeedsTopBarTonalElevationPreference +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.general.Filter +import me.ash.reader.domain.model.group.Group +import me.ash.reader.infrastructure.preference.FeedsGroupListExpandPreference +import me.ash.reader.infrastructure.preference.FeedsGroupListTonalElevationPreference +import me.ash.reader.infrastructure.preference.FeedsTopBarTonalElevationPreference import me.ash.reader.ui.component.FilterBar import me.ash.reader.ui.component.base.FeedbackIconButton import me.ash.reader.ui.ext.alphaLN diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPageStylePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPageStylePage.kt index 73e24cff..00bcd458 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPageStylePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPageStylePage.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPagePreview.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPagePreview.kt index d96c3083..a0e20421 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPagePreview.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPagePreview.kt @@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.model.article.Article -import me.ash.reader.data.model.article.ArticleWithFeed -import me.ash.reader.data.model.feed.Feed -import me.ash.reader.data.model.general.Filter -import me.ash.reader.data.model.preference.FlowArticleListTonalElevationPreference -import me.ash.reader.data.model.preference.FlowTopBarTonalElevationPreference +import me.ash.reader.domain.model.article.Article +import me.ash.reader.domain.model.article.ArticleWithFeed +import me.ash.reader.domain.model.feed.Feed +import me.ash.reader.domain.model.general.Filter +import me.ash.reader.infrastructure.preference.FlowArticleListTonalElevationPreference +import me.ash.reader.infrastructure.preference.FlowTopBarTonalElevationPreference import me.ash.reader.ui.component.FilterBar import me.ash.reader.ui.component.base.FeedbackIconButton import me.ash.reader.ui.ext.surfaceColorAtElevation diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPageStylePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPageStylePage.kt index c942a1f8..69d424e9 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPageStylePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPageStylePage.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingDarkThemePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingDarkThemePage.kt index dffbbc53..6c2a3350 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingDarkThemePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingDarkThemePage.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.LocalReadingDarkTheme -import me.ash.reader.data.model.preference.ReadingDarkThemePreference +import me.ash.reader.infrastructure.preference.LocalReadingDarkTheme +import me.ash.reader.infrastructure.preference.ReadingDarkThemePreference import me.ash.reader.ui.component.base.DisplayText import me.ash.reader.ui.component.base.FeedbackIconButton import me.ash.reader.ui.component.base.RYScaffold diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingImagePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingImagePage.kt index a259019e..2b0924bf 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingImagePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingImagePage.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingStylePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingStylePage.kt index 73c606d2..2ba49dc7 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingStylePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingStylePage.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.ReadingThemePrev import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.ExternalFonts diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTextPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTextPage.kt index aeb4d630..aa1f4f41 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTextPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTextPage.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTitlePage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTitlePage.kt index 6be85a15..2bf2a402 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTitlePage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/ReadingTitlePage.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.theme.palette.onLight diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/TitleAndTextPreview.kt b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/TitleAndTextPreview.kt index b2d8795f..5403ef65 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/TitleAndTextPreview.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/color/reading/TitleAndTextPreview.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import me.ash.reader.R -import me.ash.reader.data.model.preference.* +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.reader.bodyStyle import me.ash.reader.ui.component.reader.h3Style import me.ash.reader.ui.component.reader.textHorizontalPadding diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/interaction/InteractionPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/interaction/InteractionPage.kt index 322af599..43fa8162 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/interaction/InteractionPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/interaction/InteractionPage.kt @@ -1,11 +1,5 @@ package me.ash.reader.ui.page.settings.interaction -import android.content.Context -import android.content.Intent -import android.content.pm.PackageManager -import android.content.pm.ResolveInfo -import android.os.Build -import android.util.Log import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons @@ -18,13 +12,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.InitialFilterPreference -import me.ash.reader.data.model.preference.OpenLinkPreference -import me.ash.reader.data.model.preference.InitialPagePreference -import me.ash.reader.data.model.preference.LocalInitialFilter -import me.ash.reader.data.model.preference.LocalOpenLink -import me.ash.reader.data.model.preference.LocalOpenLinkSpecificBrowser -import me.ash.reader.data.model.preference.LocalInitialPage +import me.ash.reader.infrastructure.preference.* import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.getBrowserAppList import me.ash.reader.ui.page.settings.SettingItem diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt index ac5702cf..026e7c65 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/languages/LanguagesPage.kt @@ -1,7 +1,5 @@ package me.ash.reader.ui.page.settings.languages -import android.content.Intent -import android.net.Uri import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons @@ -20,9 +18,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.LanguagesPreference -import me.ash.reader.data.model.preference.LocalLanguages -import me.ash.reader.data.model.preference.OpenLinkPreference +import me.ash.reader.infrastructure.preference.LanguagesPreference +import me.ash.reader.infrastructure.preference.LocalLanguages +import me.ash.reader.infrastructure.preference.OpenLinkPreference import me.ash.reader.ui.component.base.Banner import me.ash.reader.ui.component.base.DisplayText import me.ash.reader.ui.component.base.FeedbackIconButton diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupportPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupportPage.kt index 543874fb..d144b261 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupportPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupportPage.kt @@ -1,7 +1,5 @@ package me.ash.reader.ui.page.settings.tips -import android.content.Intent -import android.net.Uri import android.view.HapticFeedbackConstants import android.view.SoundEffectConstants import androidx.compose.animation.animateContentSize @@ -36,7 +34,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import me.ash.reader.R -import me.ash.reader.data.model.preference.OpenLinkPreference +import me.ash.reader.infrastructure.preference.OpenLinkPreference import me.ash.reader.ui.component.base.CurlyCornerShape import me.ash.reader.ui.component.base.FeedbackIconButton import me.ash.reader.ui.component.base.RYScaffold diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateDialog.kt b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateDialog.kt index 35e94c60..d2cbec4b 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateDialog.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateDialog.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.coroutines.Dispatchers import me.ash.reader.R -import me.ash.reader.data.model.preference.* -import me.ash.reader.data.source.Download +import me.ash.reader.infrastructure.preference.* +import me.ash.reader.infrastructure.source.Download import me.ash.reader.ui.component.base.RYDialog import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.installLatestApk diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt index efc5030b..fec147a2 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt @@ -5,8 +5,8 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch -import me.ash.reader.data.repository.RYRepository -import me.ash.reader.data.source.Download +import me.ash.reader.domain.service.RYRepository +import me.ash.reader.infrastructure.source.Download import me.ash.reader.ui.ext.notFdroid import javax.inject.Inject diff --git a/app/src/main/java/me/ash/reader/ui/theme/Theme.kt b/app/src/main/java/me/ash/reader/ui/theme/Theme.kt index 3eb933c5..da1984e3 100644 --- a/app/src/main/java/me/ash/reader/ui/theme/Theme.kt +++ b/app/src/main/java/me/ash/reader/ui/theme/Theme.kt @@ -5,8 +5,8 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.platform.LocalContext -import me.ash.reader.data.model.preference.LocalBasicFonts -import me.ash.reader.data.model.preference.LocalThemeIndex +import me.ash.reader.infrastructure.preference.LocalBasicFonts +import me.ash.reader.infrastructure.preference.LocalThemeIndex import me.ash.reader.ui.theme.palette.LocalTonalPalettes import me.ash.reader.ui.theme.palette.TonalPalettes import me.ash.reader.ui.theme.palette.core.ProvideZcamViewingConditions diff --git a/app/src/main/java/me/ash/reader/ui/theme/palette/DynamicTonalPalette.kt b/app/src/main/java/me/ash/reader/ui/theme/palette/DynamicTonalPalette.kt index 74685c3d..4cdc2894 100644 --- a/app/src/main/java/me/ash/reader/ui/theme/palette/DynamicTonalPalette.kt +++ b/app/src/main/java/me/ash/reader/ui/theme/palette/DynamicTonalPalette.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.Stable import androidx.compose.ui.graphics.Color -import me.ash.reader.data.model.preference.LocalAmoledDarkTheme -import me.ash.reader.data.model.preference.LocalDarkTheme +import me.ash.reader.infrastructure.preference.LocalAmoledDarkTheme +import me.ash.reader.infrastructure.preference.LocalDarkTheme @Composable fun dynamicLightColorScheme(): ColorScheme { diff --git a/app/src/main/java/me/ash/reader/ui/theme/palette/dynamic/WallpaperColors.kt b/app/src/main/java/me/ash/reader/ui/theme/palette/dynamic/WallpaperColors.kt index 487b5de7..e0493390 100644 --- a/app/src/main/java/me/ash/reader/ui/theme/palette/dynamic/WallpaperColors.kt +++ b/app/src/main/java/me/ash/reader/ui/theme/palette/dynamic/WallpaperColors.kt @@ -15,7 +15,7 @@ import androidx.compose.runtime.Stable import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView -import me.ash.reader.data.model.preference.LocalCustomPrimaryColor +import me.ash.reader.infrastructure.preference.LocalCustomPrimaryColor import me.ash.reader.ui.theme.palette.TonalPalettes import me.ash.reader.ui.theme.palette.TonalPalettes.Companion.getSystemTonalPalettes import me.ash.reader.ui.theme.palette.TonalPalettes.Companion.toTonalPalettes diff --git a/app/src/test/java/me/ash/reader/ExampleUnitTest.kt b/app/src/test/java/me/ash/reader/ExampleUnitTest.kt index b61faf7d..3e66960b 100644 --- a/app/src/test/java/me/ash/reader/ExampleUnitTest.kt +++ b/app/src/test/java/me/ash/reader/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package me.ash.reader +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * @@ -14,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 29e09e0d..d16cacd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.parallel=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true