diff --git a/api/build.gradle b/api/build.gradle index c4a4697c..6eec4de3 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -37,7 +37,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':readropsdb') + implementation project(':db') // xpp3 has a conflict with kxml when running connectedCheck task configurations { diff --git a/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java b/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java index 6e787bdf..3c0ef7cf 100644 --- a/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java +++ b/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.readrops.readropslibrary.test", appContext.getPackageName()); + assertEquals("com.readrops.api.test", appContext.getPackageName()); } } diff --git a/api/src/main/java/com/readrops/api/services/Credentials.java b/api/src/main/java/com/readrops/api/services/Credentials.java index c00d536d..53fee513 100644 --- a/api/src/main/java/com/readrops/api/services/Credentials.java +++ b/api/src/main/java/com/readrops/api/services/Credentials.java @@ -2,7 +2,7 @@ package com.readrops.api.services; import androidx.annotation.Nullable; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; import com.readrops.api.services.freshrss.FreshRSSCredentials; import com.readrops.api.services.nextcloudnews.NextNewsCredentials; diff --git a/api/src/main/java/com/readrops/api/services/SyncResult.kt b/api/src/main/java/com/readrops/api/services/SyncResult.kt index 7cae8f46..daf97a5d 100644 --- a/api/src/main/java/com/readrops/api/services/SyncResult.kt +++ b/api/src/main/java/com/readrops/api/services/SyncResult.kt @@ -1,8 +1,8 @@ package com.readrops.api.services -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.Folder -import com.readrops.readropsdb.entities.Item +import com.readrops.db.entities.Feed +import com.readrops.db.entities.Folder +import com.readrops.db.entities.Item class SyncResult { diff --git a/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java index b79bb71f..86fccf7d 100644 --- a/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java +++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java @@ -3,9 +3,9 @@ package com.readrops.api.services.freshrss; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; import com.readrops.api.services.API; import com.readrops.api.services.Credentials; import com.readrops.api.services.SyncResult; diff --git a/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java index 424adb9b..321a4164 100644 --- a/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java +++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java @@ -1,8 +1,8 @@ package com.readrops.api.services.freshrss; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; import com.readrops.api.services.freshrss.json.FreshRSSUserInfo; import java.util.List; diff --git a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt index c64f151e..e0c19853 100644 --- a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.freshrss.adapters import android.annotation.SuppressLint -import com.readrops.readropsdb.entities.Feed +import com.readrops.db.entities.Feed import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader import com.squareup.moshi.ToJson diff --git a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt index 76fa0780..8574f990 100644 --- a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.freshrss.adapters import android.annotation.SuppressLint -import com.readrops.readropsdb.entities.Folder +import com.readrops.db.entities.Folder import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader import com.squareup.moshi.ToJson diff --git a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt index ccd89154..8667fa51 100644 --- a/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.freshrss.adapters import android.util.TimingLogger -import com.readrops.readropsdb.entities.Item +import com.readrops.db.entities.Item import com.readrops.api.services.freshrss.FreshRSSAPI.GOOGLE_READ import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java index 2a40a2d8..eb9d8d16 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java @@ -5,9 +5,9 @@ import android.content.res.Resources; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; import com.readrops.api.services.API; import com.readrops.api.services.Credentials; import com.readrops.api.services.SyncResult; diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java index f8b3af96..ad37b4fa 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java @@ -1,8 +1,8 @@ package com.readrops.api.services.nextcloudnews; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; import com.readrops.api.services.nextcloudnews.json.NextNewsUser; import java.util.List; diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt index 28a9ea73..4bfc3832 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.nextcloudnews.adapters import android.annotation.SuppressLint -import com.readrops.readropsdb.entities.Feed +import com.readrops.db.entities.Feed import com.readrops.api.utils.nextNullableString import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt index fe77a2ef..e3f70f7b 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.nextcloudnews.adapters import android.annotation.SuppressLint -import com.readrops.readropsdb.entities.Folder +import com.readrops.db.entities.Folder import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader import com.squareup.moshi.ToJson diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt index 0c43dbee..992a1e44 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt @@ -1,7 +1,7 @@ package com.readrops.api.services.nextcloudnews.adapters import android.annotation.SuppressLint -import com.readrops.readropsdb.entities.Item +import com.readrops.db.entities.Item import com.readrops.api.utils.LibUtils import com.readrops.api.utils.nextNullableString import com.squareup.moshi.JsonAdapter diff --git a/app/build.gradle b/app/build.gradle index e1845dc5..95e132f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':api') - implementation project(':readropsdb') + implementation project(':db') implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt index eaf63d53..9b3d9b4f 100644 --- a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt +++ b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt @@ -5,11 +5,11 @@ import androidx.room.Room import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.app.utils.SyncResultAnalyser -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.Item -import com.readrops.readropsdb.entities.account.Account -import com.readrops.readropsdb.entities.account.AccountType +import com.readrops.db.Database +import com.readrops.db.entities.Feed +import com.readrops.db.entities.Item +import com.readrops.db.entities.account.Account +import com.readrops.db.entities.account.AccountType import com.readrops.api.services.SyncResult import org.joda.time.LocalDateTime import org.junit.After diff --git a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java b/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java index 58f9717f..5f971bed 100644 --- a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java @@ -21,8 +21,8 @@ import com.readrops.app.adapters.AccountTypeListAdapter; import com.readrops.app.databinding.ActivityAccountTypeListBinding; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.AccountViewModel; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.entities.account.Account; +import com.readrops.db.entities.account.AccountType; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java b/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java index 91c26d88..c9167725 100644 --- a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java @@ -15,8 +15,8 @@ import com.readrops.app.databinding.ActivityAddAccountBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.AccountViewModel; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.entities.account.Account; +import com.readrops.db.entities.account.AccountType; import io.reactivex.Completable; import io.reactivex.CompletableObserver; diff --git a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java b/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java index e04bd945..912e90c3 100644 --- a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java @@ -31,8 +31,8 @@ import com.readrops.app.utils.ReadropsItemTouchCallback; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.AddFeedsViewModel; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.account.Account; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/readrops/app/activities/ItemActivity.java b/app/src/main/java/com/readrops/app/activities/ItemActivity.java index 343e86ca..59b2add3 100644 --- a/app/src/main/java/com/readrops/app/activities/ItemActivity.java +++ b/app/src/main/java/com/readrops/app/activities/ItemActivity.java @@ -46,8 +46,8 @@ import com.readrops.app.utils.ReadropsWebView; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ItemViewModel; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.entities.Item; +import com.readrops.db.pojo.ItemWithFeed; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/readrops/app/activities/MainActivity.java b/app/src/main/java/com/readrops/app/activities/MainActivity.java index c0749299..81107400 100644 --- a/app/src/main/java/com/readrops/app/activities/MainActivity.java +++ b/app/src/main/java/com/readrops/app/activities/MainActivity.java @@ -48,12 +48,12 @@ import com.readrops.app.utils.ReadropsItemTouchCallback; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.MainViewModel; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.filters.FilterType; -import com.readrops.readropsdb.filters.ListSortType; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.filters.FilterType; +import com.readrops.db.filters.ListSortType; +import com.readrops.db.pojo.ItemWithFeed; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java index 498a2aa8..4b833b78 100644 --- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java +++ b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java @@ -18,8 +18,8 @@ import com.readrops.app.fragments.FeedsFragment; import com.readrops.app.fragments.FoldersFragment; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; import com.readrops.api.utils.ConflictException; import com.readrops.api.utils.UnknownFormatException; diff --git a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt b/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt index 9000461d..eedd6171 100644 --- a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt +++ b/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt @@ -16,8 +16,8 @@ import com.readrops.app.utils.ReadropsKeys.ACCOUNT_ID import com.readrops.app.utils.SharedPreferencesManager import com.readrops.app.utils.Utils import com.readrops.app.viewmodels.NotificationPermissionViewModel -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.account.Account +import com.readrops.db.entities.Feed +import com.readrops.db.entities.account.Account import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/readrops/app/activities/SettingsActivity.java b/app/src/main/java/com/readrops/app/activities/SettingsActivity.java index b2ac92ec..0a259894 100644 --- a/app/src/main/java/com/readrops/app/activities/SettingsActivity.java +++ b/app/src/main/java/com/readrops/app/activities/SettingsActivity.java @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import com.readrops.app.R; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; import com.readrops.app.fragments.settings.AccountSettingsFragment; import com.readrops.app.fragments.settings.SettingsFragment; diff --git a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java b/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java index b13de9f4..d2369167 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.readrops.app.R; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java b/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java index 3faac014..8eea5135 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.readrops.app.databinding.AccountTypeItemBinding; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.entities.account.AccountType; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java b/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java index 1f983c32..6050ea3b 100644 --- a/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.readrops.app.R; -import com.readrops.readropsdb.pojo.FeedWithFolder; +import com.readrops.db.pojo.FeedWithFolder; import com.readrops.app.utils.GlideApp; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java b/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java index bc4472e7..f4a0f266 100644 --- a/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java @@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.readrops.app.R; import com.readrops.app.databinding.FolderLayoutBinding; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.pojo.FolderWithFeedCount; +import com.readrops.db.entities.Folder; +import com.readrops.db.pojo.FolderWithFeedCount; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java b/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java index a9335337..a818387c 100644 --- a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java @@ -26,8 +26,8 @@ import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.transition.DrawableCrossFadeFactory; import com.bumptech.glide.util.ViewPreloadSizeProvider; import com.readrops.app.R; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.entities.Item; +import com.readrops.db.pojo.ItemWithFeed; import com.readrops.app.databinding.ListItemBinding; import com.readrops.app.utils.DateUtils; import com.readrops.app.utils.GlideRequests; diff --git a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt b/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt index f606b081..9d8e019c 100644 --- a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt +++ b/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt @@ -9,7 +9,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.readrops.app.R import com.readrops.app.databinding.NotificationPermissionLayoutBinding import com.readrops.app.utils.GlideApp -import com.readrops.readropsdb.entities.Feed +import com.readrops.db.entities.Feed class NotificationPermissionListAdapter(var enableAll: Boolean, val listener: (feed: Feed) -> Unit) : ListAdapter(DIFF_CALLBACK) { diff --git a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java b/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java index 5da705a3..16bfc365 100644 --- a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java @@ -16,10 +16,10 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textfield.TextInputEditText; import com.readrops.app.R; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FeedWithFolder; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.pojo.FeedWithFolder; import java.util.ArrayList; import java.util.Map; diff --git a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt index eb8b08bb..ac7b9736 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt @@ -9,8 +9,8 @@ import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.readrops.app.databinding.FeedOptionsLayoutBinding import com.readrops.app.utils.ReadropsKeys.ACCOUNT -import com.readrops.readropsdb.entities.account.Account -import com.readrops.readropsdb.pojo.FeedWithFolder +import com.readrops.db.entities.account.Account +import com.readrops.db.pojo.FeedWithFolder class FeedOptionsDialogFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java index 7cf97fda..f07f66b9 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java @@ -20,9 +20,9 @@ import com.readrops.app.databinding.FragmentFeedsBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FeedWithFolder; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.account.Account; +import com.readrops.db.pojo.FeedWithFolder; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.observers.DisposableCompletableObserver; diff --git a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt index 9b0f783b..ce04a350 100644 --- a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.readrops.app.databinding.FolderOptionsLayoutBinding -import com.readrops.readropsdb.entities.Folder +import com.readrops.db.entities.Folder class FolderOptionsDialogFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java index 3e9827fd..9019a09c 100644 --- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java @@ -20,8 +20,8 @@ import com.readrops.app.databinding.FragmentFoldersBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; import com.readrops.api.utils.ConflictException; import com.readrops.api.utils.UnknownFormatException; diff --git a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java index 745c80ac..9cf70c46 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java @@ -32,8 +32,8 @@ import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.utils.matchers.OPMLMatcher; import com.readrops.app.viewmodels.AccountViewModel; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.entities.account.Account; +import com.readrops.db.entities.account.AccountType; import com.readrops.api.opml.OPMLParser; import com.readrops.api.opml.model.OPML; diff --git a/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java b/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java index e9c821c4..ce84fd77 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java @@ -17,7 +17,7 @@ import androidx.work.WorkManager; import com.readrops.app.R; import com.readrops.app.utils.SyncWorker; import com.readrops.app.utils.feedscolors.FeedsColorsIntentService; -import com.readrops.readropsdb.Database; +import com.readrops.db.Database; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/readrops/app/repositories/ARepository.java b/app/src/main/java/com/readrops/app/repositories/ARepository.java index d6ce25d9..746b6dd9 100644 --- a/app/src/main/java/com/readrops/app/repositories/ARepository.java +++ b/app/src/main/java/com/readrops/app/repositories/ARepository.java @@ -10,12 +10,12 @@ import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.feedscolors.FeedColorsKt; import com.readrops.app.utils.feedscolors.FeedsColorsIntentService; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.Database; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; +import com.readrops.db.entities.account.Account; +import com.readrops.db.entities.account.AccountType; import com.readrops.api.services.SyncResult; import java.util.ArrayList; diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java index 1980bad8..744e80f6 100644 --- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java @@ -10,10 +10,10 @@ import androidx.annotation.Nullable; import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.Utils; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; +import com.readrops.db.entities.account.Account; import com.readrops.api.services.Credentials; import com.readrops.api.services.SyncType; import com.readrops.api.services.freshrss.FreshRSSAPI; diff --git a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java index ab2fded6..e3d9651d 100644 --- a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java @@ -13,9 +13,9 @@ import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.utils.matchers.FeedMatcher; import com.readrops.app.utils.matchers.ItemMatcher; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Item; +import com.readrops.db.entities.account.Account; import com.readrops.api.localfeed.AFeed; import com.readrops.api.localfeed.RSSQuery; import com.readrops.api.localfeed.RSSQueryResult; diff --git a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java index af564ae4..89ec9bf5 100644 --- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java @@ -10,10 +10,10 @@ import androidx.annotation.Nullable; import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.Utils; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; +import com.readrops.db.entities.account.Account; import com.readrops.api.services.Credentials; import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncType; diff --git a/app/src/main/java/com/readrops/app/utils/DrawerManager.java b/app/src/main/java/com/readrops/app/utils/DrawerManager.java index fab1f6a6..570acee8 100644 --- a/app/src/main/java/com/readrops/app/utils/DrawerManager.java +++ b/app/src/main/java/com/readrops/app/utils/DrawerManager.java @@ -26,9 +26,9 @@ import com.mikepenz.materialdrawer.model.SecondaryDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IProfile; import com.readrops.app.R; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java b/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java index 4a6bbf8d..1ffb4976 100644 --- a/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java +++ b/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java @@ -10,7 +10,7 @@ import androidx.annotation.StringRes; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.items.AbstractItem; import com.readrops.app.R; -import com.readrops.readropsdb.entities.Feed; +import com.readrops.db.entities.Feed; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/readrops/app/utils/ParsingResult.java b/app/src/main/java/com/readrops/app/utils/ParsingResult.java index 691c8dbf..c5b594c1 100644 --- a/app/src/main/java/com/readrops/app/utils/ParsingResult.java +++ b/app/src/main/java/com/readrops/app/utils/ParsingResult.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.items.AbstractItem; import com.readrops.app.R; -import com.readrops.readropsdb.entities.Feed; +import com.readrops.db.entities.Feed; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java index 6aa661d6..554503d8 100644 --- a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java +++ b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java @@ -12,7 +12,7 @@ import androidx.annotation.ColorInt; import androidx.annotation.Nullable; import com.readrops.app.R; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.pojo.ItemWithFeed; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt index 95a9f200..497c24fe 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt +++ b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt @@ -4,10 +4,10 @@ import android.content.Context import androidx.core.content.ContextCompat import com.bumptech.glide.load.engine.DiskCacheStrategy import com.readrops.app.R -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.Item -import com.readrops.readropsdb.entities.account.Account +import com.readrops.db.Database +import com.readrops.db.entities.Feed +import com.readrops.db.entities.Item +import com.readrops.db.entities.account.Account import com.readrops.api.services.SyncResult /** diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt b/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt index 00cfebbb..5018b464 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt +++ b/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt @@ -1,10 +1,10 @@ package com.readrops.app.utils import android.content.Context -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Item -import com.readrops.readropsdb.entities.account.Account -import com.readrops.readropsdb.entities.account.AccountType +import com.readrops.db.Database +import com.readrops.db.entities.Item +import com.readrops.db.entities.account.Account +import com.readrops.db.entities.account.AccountType import com.readrops.api.services.SyncResult import org.jetbrains.annotations.TestOnly diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt b/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt index 454b8dc1..3552e1c6 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt +++ b/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt @@ -1,7 +1,7 @@ package com.readrops.app.utils import android.graphics.Bitmap -import com.readrops.readropsdb.entities.Item +import com.readrops.db.entities.Item class SyncResultNotifContent { var title: String? = null diff --git a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt b/app/src/main/java/com/readrops/app/utils/SyncWorker.kt index eb3b41ff..0fc8d24b 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt +++ b/app/src/main/java/com/readrops/app/utils/SyncWorker.kt @@ -13,9 +13,9 @@ import com.readrops.app.R import com.readrops.app.ReadropsApp import com.readrops.app.activities.MainActivity import com.readrops.app.repositories.ARepository -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Item -import com.readrops.readropsdb.entities.account.Account +import com.readrops.db.Database +import com.readrops.db.entities.Item +import com.readrops.db.entities.account.Account import com.readrops.api.services.SyncResult import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/readrops/app/utils/feedscolors/FeedColors.kt b/app/src/main/java/com/readrops/app/utils/feedscolors/FeedColors.kt index cd049c3e..1c02a659 100644 --- a/app/src/main/java/com/readrops/app/utils/feedscolors/FeedColors.kt +++ b/app/src/main/java/com/readrops/app/utils/feedscolors/FeedColors.kt @@ -1,7 +1,7 @@ package com.readrops.app.utils.feedscolors import androidx.palette.graphics.Palette -import com.readrops.readropsdb.entities.Feed +import com.readrops.db.entities.Feed import com.readrops.app.utils.HtmlParser import com.readrops.app.utils.Utils diff --git a/app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt b/app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt index 80de257e..880eb4c9 100644 --- a/app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt +++ b/app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt @@ -6,8 +6,8 @@ import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import com.readrops.app.R import com.readrops.app.ReadropsApp -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Feed +import com.readrops.db.Database +import com.readrops.db.entities.Feed import com.readrops.app.utils.ReadropsKeys.FEEDS class FeedsColorsIntentService : IntentService("FeedsColorsIntentService") { diff --git a/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java b/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java index 21fc89e3..bb07ae91 100644 --- a/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java +++ b/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java @@ -1,6 +1,6 @@ package com.readrops.app.utils.matchers; -import com.readrops.readropsdb.entities.Feed; +import com.readrops.db.entities.Feed; import com.readrops.api.localfeed.atom.ATOMFeed; import com.readrops.api.localfeed.json.JSONFeed; import com.readrops.api.localfeed.rss.RSSChannel; diff --git a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java index 2eabf35b..096134c6 100644 --- a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java +++ b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java @@ -2,8 +2,8 @@ package com.readrops.app.utils.matchers; import com.readrops.app.utils.DateUtils; import com.readrops.app.utils.Utils; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Item; import com.readrops.api.localfeed.atom.ATOMEntry; import com.readrops.api.localfeed.json.JSONItem; import com.readrops.api.localfeed.rss.RSSEnclosure; diff --git a/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt b/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt index 31fe2b9d..d0cd1e42 100644 --- a/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt +++ b/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt @@ -2,8 +2,8 @@ package com.readrops.app.utils.matchers import android.content.Context import com.readrops.app.R -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.Folder +import com.readrops.db.entities.Feed +import com.readrops.db.entities.Folder import com.readrops.api.opml.model.Body import com.readrops.api.opml.model.Head import com.readrops.api.opml.model.OPML diff --git a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java index 3243797e..40fc04dc 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java @@ -7,11 +7,11 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.Database; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.entities.account.AccountType; import com.readrops.app.repositories.ARepository; import com.readrops.app.utils.matchers.OPMLMatcher; import com.readrops.api.opml.OPMLParser; diff --git a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java index fb2bfc22..804ae2eb 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java @@ -7,8 +7,8 @@ import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.Database; +import com.readrops.db.entities.account.Account; import com.readrops.app.repositories.ARepository; import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.HtmlParser; diff --git a/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java index f83cb31c..a6243e99 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java @@ -9,9 +9,9 @@ import androidx.core.content.FileProvider; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.dao.ItemDao; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.Database; +import com.readrops.db.dao.ItemDao; +import com.readrops.db.pojo.ItemWithFeed; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java index 26829025..621f94b0 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java @@ -9,15 +9,15 @@ import androidx.lifecycle.MediatorLiveData; import androidx.paging.LivePagedListBuilder; import androidx.paging.PagedList; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.ItemsListQueryBuilder; -import com.readrops.readropsdb.RoomFactoryWrapper; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.filters.FilterType; -import com.readrops.readropsdb.filters.ListSortType; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.Database; +import com.readrops.db.ItemsListQueryBuilder; +import com.readrops.db.RoomFactoryWrapper; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.filters.FilterType; +import com.readrops.db.filters.ListSortType; +import com.readrops.db.pojo.ItemWithFeed; import com.readrops.app.repositories.ARepository; import java.util.ArrayList; diff --git a/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java index de1b188e..7a357449 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java @@ -6,12 +6,12 @@ import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; -import com.readrops.readropsdb.Database; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FeedWithFolder; -import com.readrops.readropsdb.pojo.FolderWithFeedCount; +import com.readrops.db.Database; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.pojo.FeedWithFolder; +import com.readrops.db.pojo.FolderWithFeedCount; import com.readrops.app.repositories.ARepository; import java.util.List; diff --git a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt b/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt index 88ed2612..b425e70e 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt +++ b/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt @@ -3,9 +3,9 @@ package com.readrops.app.viewmodels import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData -import com.readrops.readropsdb.Database -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.account.Account +import com.readrops.db.Database +import com.readrops.db.entities.Feed +import com.readrops.db.entities.account.Account import io.reactivex.Completable class NotificationPermissionViewModel(application: Application) : AndroidViewModel(application) { diff --git a/db/schemas/com.readrops.db.Database/2.json b/db/schemas/com.readrops.db.Database/2.json new file mode 100644 index 00000000..ad240f05 --- /dev/null +++ b/db/schemas/com.readrops.db.Database/2.json @@ -0,0 +1,431 @@ +{ + "formatVersion": 1, + "database": { + "version": 2, + "identityHash": "09ffedb5d59c0709ed6662d9f068c91f", + "entities": [ + { + "tableName": "Feed", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `description` TEXT, `url` TEXT, `siteUrl` TEXT, `lastUpdated` TEXT, `text_color` INTEGER NOT NULL, `background_color` INTEGER NOT NULL, `icon_url` TEXT, `etag` TEXT, `last_modified` TEXT, `folder_id` INTEGER, `remoteId` TEXT, `account_id` INTEGER NOT NULL, `notification_enabled` INTEGER NOT NULL DEFAULT 1, FOREIGN KEY(`folder_id`) REFERENCES `Folder`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "siteUrl", + "columnName": "siteUrl", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastUpdated", + "columnName": "lastUpdated", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "textColor", + "columnName": "text_color", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "backgroundColor", + "columnName": "background_color", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "iconUrl", + "columnName": "icon_url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "etag", + "columnName": "etag", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastModified", + "columnName": "last_modified", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "folderId", + "columnName": "folder_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "remoteId", + "columnName": "remoteId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "accountId", + "columnName": "account_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "notificationEnabled", + "columnName": "notification_enabled", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "1" + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_Feed_folder_id", + "unique": false, + "columnNames": [ + "folder_id" + ], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Feed_folder_id` ON `${TABLE_NAME}` (`folder_id`)" + }, + { + "name": "index_Feed_account_id", + "unique": false, + "columnNames": [ + "account_id" + ], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Feed_account_id` ON `${TABLE_NAME}` (`account_id`)" + } + ], + "foreignKeys": [ + { + "table": "Folder", + "onDelete": "SET NULL", + "onUpdate": "NO ACTION", + "columns": [ + "folder_id" + ], + "referencedColumns": [ + "id" + ] + }, + { + "table": "Account", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "account_id" + ], + "referencedColumns": [ + "id" + ] + } + ] + }, + { + "tableName": "Item", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT, `description` TEXT, `clean_description` TEXT, `link` TEXT, `image_link` TEXT, `author` TEXT, `pub_date` INTEGER, `content` TEXT, `feed_id` INTEGER NOT NULL, `guid` TEXT, `read_time` REAL NOT NULL, `read` INTEGER NOT NULL, `read_changed` INTEGER NOT NULL, `read_it_later` INTEGER NOT NULL, `remoteId` TEXT, FOREIGN KEY(`feed_id`) REFERENCES `Feed`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "cleanDescription", + "columnName": "clean_description", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "link", + "columnName": "link", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "imageLink", + "columnName": "image_link", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "author", + "columnName": "author", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "pubDate", + "columnName": "pub_date", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "content", + "columnName": "content", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "feedId", + "columnName": "feed_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "guid", + "columnName": "guid", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "readTime", + "columnName": "read_time", + "affinity": "REAL", + "notNull": true + }, + { + "fieldPath": "read", + "columnName": "read", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "readChanged", + "columnName": "read_changed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "readItLater", + "columnName": "read_it_later", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "remoteId", + "columnName": "remoteId", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_Item_feed_id", + "unique": false, + "columnNames": [ + "feed_id" + ], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Item_feed_id` ON `${TABLE_NAME}` (`feed_id`)" + }, + { + "name": "index_Item_guid", + "unique": false, + "columnNames": [ + "guid" + ], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Item_guid` ON `${TABLE_NAME}` (`guid`)" + } + ], + "foreignKeys": [ + { + "table": "Feed", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "feed_id" + ], + "referencedColumns": [ + "id" + ] + } + ] + }, + { + "tableName": "Folder", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `remoteId` TEXT, `account_id` INTEGER NOT NULL, FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "remoteId", + "columnName": "remoteId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "accountId", + "columnName": "account_id", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_Folder_account_id", + "unique": false, + "columnNames": [ + "account_id" + ], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Folder_account_id` ON `${TABLE_NAME}` (`account_id`)" + } + ], + "foreignKeys": [ + { + "table": "Account", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "account_id" + ], + "referencedColumns": [ + "id" + ] + } + ] + }, + { + "tableName": "Account", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT, `account_name` TEXT, `displayed_name` TEXT, `account_type` INTEGER, `last_modified` INTEGER NOT NULL, `current_account` INTEGER NOT NULL, `token` TEXT, `writeToken` TEXT, `notifications_enabled` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "accountName", + "columnName": "account_name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "displayedName", + "columnName": "displayed_name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "accountType", + "columnName": "account_type", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lastModified", + "columnName": "last_modified", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "currentAccount", + "columnName": "current_account", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "writeToken", + "columnName": "writeToken", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "notificationsEnabled", + "columnName": "notifications_enabled", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [], + "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, '09ffedb5d59c0709ed6662d9f068c91f')" + ] + } +} \ No newline at end of file diff --git a/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTests.kt b/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTests.kt index af720558..5e08dea7 100644 --- a/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTests.kt +++ b/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTests.kt @@ -1,12 +1,9 @@ -package com.readrops.readropsdb +package com.readrops.db import androidx.room.testing.MigrationTestHelper import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.readrops.readropsdb.entities.Feed -import com.readrops.readropsdb.entities.account.Account -import com.readrops.readropsdb.entities.account.AccountType import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/db/src/main/AndroidManifest.xml b/db/src/main/AndroidManifest.xml index 6cce97a5..aa1258a6 100644 --- a/db/src/main/AndroidManifest.xml +++ b/db/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="com.readrops.db" /> diff --git a/db/src/main/java/com/readrops/db/Converters.java b/db/src/main/java/com/readrops/db/Converters.java index 9d9e5c18..1939315f 100644 --- a/db/src/main/java/com/readrops/db/Converters.java +++ b/db/src/main/java/com/readrops/db/Converters.java @@ -1,8 +1,8 @@ -package com.readrops.readropsdb; +package com.readrops.db; import androidx.room.TypeConverter; -import com.readrops.readropsdb.entities.account.AccountType; +import com.readrops.db.entities.account.AccountType; import org.joda.time.LocalDateTime; diff --git a/db/src/main/java/com/readrops/db/Database.java b/db/src/main/java/com/readrops/db/Database.java index 30a63098..f9cd69f8 100644 --- a/db/src/main/java/com/readrops/db/Database.java +++ b/db/src/main/java/com/readrops/db/Database.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb; +package com.readrops.db; import android.content.Context; @@ -9,14 +9,14 @@ import androidx.room.TypeConverters; import androidx.room.migration.Migration; import androidx.sqlite.db.SupportSQLiteDatabase; -import com.readrops.readropsdb.dao.AccountDao; -import com.readrops.readropsdb.dao.FeedDao; -import com.readrops.readropsdb.dao.FolderDao; -import com.readrops.readropsdb.dao.ItemDao; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.dao.AccountDao; +import com.readrops.db.dao.FeedDao; +import com.readrops.db.dao.FolderDao; +import com.readrops.db.dao.ItemDao; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; +import com.readrops.db.entities.account.Account; @androidx.room.Database(entities = {Feed.class, Item.class, Folder.class, Account.class}, version = 2) diff --git a/db/src/main/java/com/readrops/db/ItemsListQueryBuilder.java b/db/src/main/java/com/readrops/db/ItemsListQueryBuilder.java index a301e46d..60a2ca9a 100644 --- a/db/src/main/java/com/readrops/db/ItemsListQueryBuilder.java +++ b/db/src/main/java/com/readrops/db/ItemsListQueryBuilder.java @@ -1,10 +1,10 @@ -package com.readrops.readropsdb; +package com.readrops.db; import androidx.sqlite.db.SupportSQLiteQuery; import androidx.sqlite.db.SupportSQLiteQueryBuilder; -import com.readrops.readropsdb.filters.FilterType; -import com.readrops.readropsdb.filters.ListSortType; +import com.readrops.db.filters.FilterType; +import com.readrops.db.filters.ListSortType; public class ItemsListQueryBuilder { diff --git a/db/src/main/java/com/readrops/db/RoomFactoryWrapper.java b/db/src/main/java/com/readrops/db/RoomFactoryWrapper.java index 8bcf51b5..467f63b0 100644 --- a/db/src/main/java/com/readrops/db/RoomFactoryWrapper.java +++ b/db/src/main/java/com/readrops/db/RoomFactoryWrapper.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb; +package com.readrops.db; import androidx.annotation.NonNull; import androidx.paging.DataSource; diff --git a/db/src/main/java/com/readrops/db/dao/AccountDao.java b/db/src/main/java/com/readrops/db/dao/AccountDao.java index e296ce2b..0b64c95d 100644 --- a/db/src/main/java/com/readrops/db/dao/AccountDao.java +++ b/db/src/main/java/com/readrops/db/dao/AccountDao.java @@ -1,10 +1,10 @@ -package com.readrops.readropsdb.dao; +package com.readrops.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; import androidx.room.Query; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; import java.util.List; diff --git a/db/src/main/java/com/readrops/db/dao/BaseDao.java b/db/src/main/java/com/readrops/db/dao/BaseDao.java index 5f290e8a..3eebfe1c 100644 --- a/db/src/main/java/com/readrops/db/dao/BaseDao.java +++ b/db/src/main/java/com/readrops/db/dao/BaseDao.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.dao; +package com.readrops.db.dao; import androidx.room.Delete; import androidx.room.Insert; diff --git a/db/src/main/java/com/readrops/db/dao/FeedDao.java b/db/src/main/java/com/readrops/db/dao/FeedDao.java index 0fc1a7ad..9ff6a5b7 100644 --- a/db/src/main/java/com/readrops/db/dao/FeedDao.java +++ b/db/src/main/java/com/readrops/db/dao/FeedDao.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.dao; +package com.readrops.db.dao; import androidx.lifecycle.LiveData; @@ -7,9 +7,9 @@ import androidx.room.Query; import androidx.room.RoomWarnings; import androidx.room.Transaction; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FeedWithFolder; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.account.Account; +import com.readrops.db.pojo.FeedWithFolder; import java.util.ArrayList; import java.util.List; diff --git a/db/src/main/java/com/readrops/db/dao/FolderDao.java b/db/src/main/java/com/readrops/db/dao/FolderDao.java index c86304f0..b527c4df 100644 --- a/db/src/main/java/com/readrops/db/dao/FolderDao.java +++ b/db/src/main/java/com/readrops/db/dao/FolderDao.java @@ -1,13 +1,13 @@ -package com.readrops.readropsdb.dao; +package com.readrops.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; import androidx.room.Query; import androidx.room.Transaction; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FolderWithFeedCount; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.account.Account; +import com.readrops.db.pojo.FolderWithFeedCount; import java.util.ArrayList; import java.util.List; diff --git a/db/src/main/java/com/readrops/db/dao/ItemDao.java b/db/src/main/java/com/readrops/db/dao/ItemDao.java index 276327bd..b0eb1f45 100644 --- a/db/src/main/java/com/readrops/db/dao/ItemDao.java +++ b/db/src/main/java/com/readrops/db/dao/ItemDao.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.dao; +package com.readrops.db.dao; import androidx.lifecycle.LiveData; @@ -9,10 +9,10 @@ import androidx.room.RawQuery; import androidx.room.RoomWarnings; import androidx.sqlite.db.SupportSQLiteQuery; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; -import com.readrops.readropsdb.pojo.ItemWithFeed; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; +import com.readrops.db.pojo.ItemWithFeed; import java.util.List; diff --git a/db/src/main/java/com/readrops/db/entities/Feed.java b/db/src/main/java/com/readrops/db/entities/Feed.java index 536fa164..10e112be 100644 --- a/db/src/main/java/com/readrops/db/entities/Feed.java +++ b/db/src/main/java/com/readrops/db/entities/Feed.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities; +package com.readrops.db.entities; import android.os.Parcel; @@ -11,7 +11,7 @@ import androidx.room.ForeignKey; import androidx.room.Ignore; import androidx.room.PrimaryKey; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; @Entity(foreignKeys = {@ForeignKey(entity = Folder.class, parentColumns = "id", childColumns = "folder_id", onDelete = ForeignKey.SET_NULL), diff --git a/db/src/main/java/com/readrops/db/entities/Folder.java b/db/src/main/java/com/readrops/db/entities/Folder.java index 0aad2185..0889b6f7 100644 --- a/db/src/main/java/com/readrops/db/entities/Folder.java +++ b/db/src/main/java/com/readrops/db/entities/Folder.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities; +package com.readrops.db.entities; import android.os.Parcel; import android.os.Parcelable; @@ -9,7 +9,7 @@ import androidx.room.ForeignKey; import androidx.room.Ignore; import androidx.room.PrimaryKey; -import com.readrops.readropsdb.entities.account.Account; +import com.readrops.db.entities.account.Account; @Entity(foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "id", childColumns = "account_id", onDelete = ForeignKey.CASCADE)) diff --git a/db/src/main/java/com/readrops/db/entities/Item.java b/db/src/main/java/com/readrops/db/entities/Item.java index 92738557..a56f01a7 100644 --- a/db/src/main/java/com/readrops/db/entities/Item.java +++ b/db/src/main/java/com/readrops/db/entities/Item.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities; +package com.readrops.db.entities; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/db/src/main/java/com/readrops/db/entities/account/Account.java b/db/src/main/java/com/readrops/db/entities/account/Account.java index 0e3d3129..950acd84 100644 --- a/db/src/main/java/com/readrops/db/entities/account/Account.java +++ b/db/src/main/java/com/readrops/db/entities/account/Account.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities.account; +package com.readrops.db.entities.account; import android.os.Parcel; import android.os.Parcelable; diff --git a/db/src/main/java/com/readrops/db/entities/account/AccountConfig.java b/db/src/main/java/com/readrops/db/entities/account/AccountConfig.java index 520c864b..b05c8bf7 100644 --- a/db/src/main/java/com/readrops/db/entities/account/AccountConfig.java +++ b/db/src/main/java/com/readrops/db/entities/account/AccountConfig.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities.account; +package com.readrops.db.entities.account; public class AccountConfig { diff --git a/db/src/main/java/com/readrops/db/entities/account/AccountType.java b/db/src/main/java/com/readrops/db/entities/account/AccountType.java index e0cea488..c724893e 100644 --- a/db/src/main/java/com/readrops/db/entities/account/AccountType.java +++ b/db/src/main/java/com/readrops/db/entities/account/AccountType.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.entities.account; +package com.readrops.db.entities.account; import android.os.Parcel; import android.os.Parcelable; @@ -6,7 +6,7 @@ import android.os.Parcelable; import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; -import com.readrops.readropsdb.R; +import com.readrops.db.R; public enum AccountType implements Parcelable { diff --git a/db/src/main/java/com/readrops/db/filters/FilterType.java b/db/src/main/java/com/readrops/db/filters/FilterType.java index 9adfd1cc..7ed9eb9f 100644 --- a/db/src/main/java/com/readrops/db/filters/FilterType.java +++ b/db/src/main/java/com/readrops/db/filters/FilterType.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.filters; +package com.readrops.db.filters; public enum FilterType { FEED_FILTER, diff --git a/db/src/main/java/com/readrops/db/filters/ListSortType.java b/db/src/main/java/com/readrops/db/filters/ListSortType.java index 0aea2281..a348b03f 100644 --- a/db/src/main/java/com/readrops/db/filters/ListSortType.java +++ b/db/src/main/java/com/readrops/db/filters/ListSortType.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb.filters; +package com.readrops.db.filters; public enum ListSortType { NEWEST_TO_OLDEST, diff --git a/db/src/main/java/com/readrops/db/pojo/FeedWithFolder.java b/db/src/main/java/com/readrops/db/pojo/FeedWithFolder.java index f2ac5ca4..6f0316b9 100644 --- a/db/src/main/java/com/readrops/db/pojo/FeedWithFolder.java +++ b/db/src/main/java/com/readrops/db/pojo/FeedWithFolder.java @@ -1,12 +1,12 @@ -package com.readrops.readropsdb.pojo; +package com.readrops.db.pojo; import android.os.Parcel; import android.os.Parcelable; import androidx.room.Embedded; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.Folder; +import com.readrops.db.entities.Feed; +import com.readrops.db.entities.Folder; public class FeedWithFolder implements Parcelable { diff --git a/db/src/main/java/com/readrops/db/pojo/FolderWithFeedCount.java b/db/src/main/java/com/readrops/db/pojo/FolderWithFeedCount.java index 11bddc8c..a4fda1ba 100644 --- a/db/src/main/java/com/readrops/db/pojo/FolderWithFeedCount.java +++ b/db/src/main/java/com/readrops/db/pojo/FolderWithFeedCount.java @@ -1,9 +1,9 @@ -package com.readrops.readropsdb.pojo; +package com.readrops.db.pojo; import androidx.room.ColumnInfo; import androidx.room.Embedded; -import com.readrops.readropsdb.entities.Folder; +import com.readrops.db.entities.Folder; public class FolderWithFeedCount { diff --git a/db/src/main/java/com/readrops/db/pojo/ItemWithFeed.java b/db/src/main/java/com/readrops/db/pojo/ItemWithFeed.java index fbf121a7..6a23e6f8 100644 --- a/db/src/main/java/com/readrops/db/pojo/ItemWithFeed.java +++ b/db/src/main/java/com/readrops/db/pojo/ItemWithFeed.java @@ -1,11 +1,11 @@ -package com.readrops.readropsdb.pojo; +package com.readrops.db.pojo; import androidx.room.ColumnInfo; import androidx.room.Embedded; import androidx.annotation.ColorInt; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.Item; +import com.readrops.db.entities.Folder; +import com.readrops.db.entities.Item; public class ItemWithFeed { diff --git a/db/src/test/java/com/readrops/db/ExampleUnitTest.java b/db/src/test/java/com/readrops/db/ExampleUnitTest.java index 9c256896..f8cec603 100644 --- a/db/src/test/java/com/readrops/db/ExampleUnitTest.java +++ b/db/src/test/java/com/readrops/db/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.readrops.readropsdb; +package com.readrops.db; import org.junit.Test; diff --git a/settings.gradle b/settings.gradle index 9da6bbfa..3836269d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':api', ':readropsdb' +include ':app', ':api', ':db'