FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot changed imports

Browse Source
This commit is contained in:
Shinokuni 2020-07-19 11:16:24 +02:00
parent 968e3b267d
commit 4956a7f3b9
85 changed files with 628 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/build.gradle
View File

@ -37,7 +37,7 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':readropsdb') implementation project(':db')
// xpp3 has a conflict with kxml when running connectedCheck task // xpp3 has a conflict with kxml when running connectedCheck task
configurations { configurations {

2
api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java
View File

@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext(); Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.readrops.readropslibrary.test", appContext.getPackageName()); assertEquals("com.readrops.api.test", appContext.getPackageName());
} }
} }

2
api/src/main/java/com/readrops/api/services/Credentials.java
View File

@ -2,7 +2,7 @@ package com.readrops.api.services;
import androidx.annotation.Nullable; 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.freshrss.FreshRSSCredentials;
import com.readrops.api.services.nextcloudnews.NextNewsCredentials; import com.readrops.api.services.nextcloudnews.NextNewsCredentials;

6
api/src/main/java/com/readrops/api/services/SyncResult.kt
View File

@ -1,8 +1,8 @@
package com.readrops.api.services package com.readrops.api.services
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.Folder import com.readrops.db.entities.Folder
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
class SyncResult { class SyncResult {

6
api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java
View File

@ -3,9 +3,9 @@ package com.readrops.api.services.freshrss;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.api.services.API; import com.readrops.api.services.API;
import com.readrops.api.services.Credentials; import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncResult;

6
api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java
View File

@ -1,8 +1,8 @@
package com.readrops.api.services.freshrss; package com.readrops.api.services.freshrss;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.api.services.freshrss.json.FreshRSSUserInfo; import com.readrops.api.services.freshrss.json.FreshRSSUserInfo;
import java.util.List; import java.util.List;

2
api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.freshrss.adapters package com.readrops.api.services.freshrss.adapters
import android.annotation.SuppressLint 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.FromJson
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson

2
api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.freshrss.adapters package com.readrops.api.services.freshrss.adapters
import android.annotation.SuppressLint 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.FromJson
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson

2
api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.freshrss.adapters package com.readrops.api.services.freshrss.adapters
import android.util.TimingLogger 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.readrops.api.services.freshrss.FreshRSSAPI.GOOGLE_READ
import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader

6
api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java
View File

@ -5,9 +5,9 @@ import android.content.res.Resources;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.api.services.API; import com.readrops.api.services.API;
import com.readrops.api.services.Credentials; import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncResult;

6
api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java
View File

@ -1,8 +1,8 @@
package com.readrops.api.services.nextcloudnews; package com.readrops.api.services.nextcloudnews;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.api.services.nextcloudnews.json.NextNewsUser; import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
import java.util.List; import java.util.List;

2
api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.nextcloudnews.adapters package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.api.utils.nextNullableString import com.readrops.api.utils.nextNullableString
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader

2
api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.nextcloudnews.adapters package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint 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.FromJson
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader
import com.squareup.moshi.ToJson import com.squareup.moshi.ToJson

2
api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
View File

@ -1,7 +1,7 @@
package com.readrops.api.services.nextcloudnews.adapters package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint 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.LibUtils
import com.readrops.api.utils.nextNullableString import com.readrops.api.utils.nextNullableString
import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonAdapter

2
app/build.gradle
View File

@ -54,7 +54,7 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':api') implementation project(':api')
implementation project(':readropsdb') implementation project(':db')
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0' implementation 'com.google.android.material:material:1.1.0'

10
app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
View File

@ -5,11 +5,11 @@ import androidx.room.Room
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import com.readrops.app.utils.SyncResultAnalyser import com.readrops.app.utils.SyncResultAnalyser
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.readropsdb.entities.account.AccountType import com.readrops.db.entities.account.AccountType
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import org.joda.time.LocalDateTime import org.joda.time.LocalDateTime
import org.junit.After import org.junit.After

4
app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java
View File

@ -21,8 +21,8 @@ import com.readrops.app.adapters.AccountTypeListAdapter;
import com.readrops.app.databinding.ActivityAccountTypeListBinding; import com.readrops.app.databinding.ActivityAccountTypeListBinding;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel; import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
app/src/main/java/com/readrops/app/activities/AddAccountActivity.java
View File

@ -15,8 +15,8 @@ import com.readrops.app.databinding.ActivityAddAccountBinding;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel; import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import io.reactivex.Completable; import io.reactivex.Completable;
import io.reactivex.CompletableObserver; import io.reactivex.CompletableObserver;

4
app/src/main/java/com/readrops/app/activities/AddFeedActivity.java
View File

@ -31,8 +31,8 @@ import com.readrops.app.utils.ReadropsItemTouchCallback;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AddFeedsViewModel; import com.readrops.app.viewmodels.AddFeedsViewModel;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

4
app/src/main/java/com/readrops/app/activities/ItemActivity.java
View File

@ -46,8 +46,8 @@ import com.readrops.app.utils.ReadropsWebView;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ItemViewModel; import com.readrops.app.viewmodels.ItemViewModel;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;

12
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -48,12 +48,12 @@ import com.readrops.app.utils.ReadropsItemTouchCallback;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.MainViewModel; import com.readrops.app.viewmodels.MainViewModel;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.filters.FilterType; import com.readrops.db.filters.FilterType;
import com.readrops.readropsdb.filters.ListSortType; import com.readrops.db.filters.ListSortType;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
View File

@ -18,8 +18,8 @@ import com.readrops.app.fragments.FeedsFragment;
import com.readrops.app.fragments.FoldersFragment; import com.readrops.app.fragments.FoldersFragment;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.api.utils.ConflictException; import com.readrops.api.utils.ConflictException;
import com.readrops.api.utils.UnknownFormatException; import com.readrops.api.utils.UnknownFormatException;

4
app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt
View File

@ -16,8 +16,8 @@ import com.readrops.app.utils.ReadropsKeys.ACCOUNT_ID
import com.readrops.app.utils.SharedPreferencesManager import com.readrops.app.utils.SharedPreferencesManager
import com.readrops.app.utils.Utils import com.readrops.app.utils.Utils
import com.readrops.app.viewmodels.NotificationPermissionViewModel import com.readrops.app.viewmodels.NotificationPermissionViewModel
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers

2
app/src/main/java/com/readrops/app/activities/SettingsActivity.java
View File

@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.readrops.app.R; 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.AccountSettingsFragment;
import com.readrops.app.fragments.settings.SettingsFragment; import com.readrops.app.fragments.settings.SettingsFragment;

2
app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java
View File

@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import java.util.List; import java.util.List;

2
app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java
View File

@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.readrops.app.databinding.AccountTypeItemBinding; import com.readrops.app.databinding.AccountTypeItemBinding;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import java.util.List; import java.util.List;

2
app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java
View File

@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.db.pojo.FeedWithFolder;
import com.readrops.app.utils.GlideApp; import com.readrops.app.utils.GlideApp;
import java.util.List; import java.util.List;

4
app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java
View File

@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.databinding.FolderLayoutBinding; import com.readrops.app.databinding.FolderLayoutBinding;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.pojo.FolderWithFeedCount; import com.readrops.db.pojo.FolderWithFeedCount;
import java.util.List; import java.util.List;

4
app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java
View File

@ -26,8 +26,8 @@ import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.transition.DrawableCrossFadeFactory; import com.bumptech.glide.request.transition.DrawableCrossFadeFactory;
import com.bumptech.glide.util.ViewPreloadSizeProvider; import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import com.readrops.app.databinding.ListItemBinding; import com.readrops.app.databinding.ListItemBinding;
import com.readrops.app.utils.DateUtils; import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.GlideRequests; import com.readrops.app.utils.GlideRequests;

2
app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt
View File

@ -9,7 +9,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.readrops.app.R import com.readrops.app.R
import com.readrops.app.databinding.NotificationPermissionLayoutBinding import com.readrops.app.databinding.NotificationPermissionLayoutBinding
import com.readrops.app.utils.GlideApp 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) : class NotificationPermissionListAdapter(var enableAll: Boolean, val listener: (feed: Feed) -> Unit) :
ListAdapter<Feed, NotificationPermissionListAdapter.NotificationPermissionViewHolder>(DIFF_CALLBACK) { ListAdapter<Feed, NotificationPermissionListAdapter.NotificationPermissionViewHolder>(DIFF_CALLBACK) {

8
app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java
View File

@ -16,10 +16,10 @@ import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.db.pojo.FeedWithFolder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;

4
app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt
View File

@ -9,8 +9,8 @@ import android.view.ViewGroup
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.readrops.app.databinding.FeedOptionsLayoutBinding import com.readrops.app.databinding.FeedOptionsLayoutBinding
import com.readrops.app.utils.ReadropsKeys.ACCOUNT import com.readrops.app.utils.ReadropsKeys.ACCOUNT
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.readropsdb.pojo.FeedWithFolder import com.readrops.db.pojo.FeedWithFolder
class FeedOptionsDialogFragment : BottomSheetDialogFragment() { class FeedOptionsDialogFragment : BottomSheetDialogFragment() {

6
app/src/main/java/com/readrops/app/fragments/FeedsFragment.java
View File

@ -20,9 +20,9 @@ import com.readrops.app.databinding.FragmentFeedsBinding;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.db.pojo.FeedWithFolder;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.observers.DisposableCompletableObserver; import io.reactivex.observers.DisposableCompletableObserver;

2
app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt
View File

@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.readrops.app.databinding.FolderOptionsLayoutBinding import com.readrops.app.databinding.FolderOptionsLayoutBinding
import com.readrops.readropsdb.entities.Folder import com.readrops.db.entities.Folder
class FolderOptionsDialogFragment : BottomSheetDialogFragment() { class FolderOptionsDialogFragment : BottomSheetDialogFragment() {

4
app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
View File

@ -20,8 +20,8 @@ import com.readrops.app.databinding.FragmentFoldersBinding;
import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.api.utils.ConflictException; import com.readrops.api.utils.ConflictException;
import com.readrops.api.utils.UnknownFormatException; import com.readrops.api.utils.UnknownFormatException;

4
app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
View File

@ -32,8 +32,8 @@ import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.utils.matchers.OPMLMatcher; import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.app.viewmodels.AccountViewModel; import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import com.readrops.api.opml.OPMLParser; import com.readrops.api.opml.OPMLParser;
import com.readrops.api.opml.model.OPML; import com.readrops.api.opml.model.OPML;

2
app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java
View File

@ -17,7 +17,7 @@ import androidx.work.WorkManager;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.app.utils.SyncWorker; import com.readrops.app.utils.SyncWorker;
import com.readrops.app.utils.feedscolors.FeedsColorsIntentService; import com.readrops.app.utils.feedscolors.FeedsColorsIntentService;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

12
app/src/main/java/com/readrops/app/repositories/ARepository.java
View File

@ -10,12 +10,12 @@ import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.feedscolors.FeedColorsKt; import com.readrops.app.utils.feedscolors.FeedColorsKt;
import com.readrops.app.utils.feedscolors.FeedsColorsIntentService; import com.readrops.app.utils.feedscolors.FeedsColorsIntentService;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncResult;
import java.util.ArrayList; import java.util.ArrayList;

8
app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
View File

@ -10,10 +10,10 @@ import androidx.annotation.Nullable;
import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.api.services.Credentials; import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncType; import com.readrops.api.services.SyncType;
import com.readrops.api.services.freshrss.FreshRSSAPI; import com.readrops.api.services.freshrss.FreshRSSAPI;

6
app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
View File

@ -13,9 +13,9 @@ import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.app.utils.matchers.FeedMatcher; import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.matchers.ItemMatcher; import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.api.localfeed.AFeed; import com.readrops.api.localfeed.AFeed;
import com.readrops.api.localfeed.RSSQuery; import com.readrops.api.localfeed.RSSQuery;
import com.readrops.api.localfeed.RSSQueryResult; import com.readrops.api.localfeed.RSSQueryResult;

8
app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
View File

@ -10,10 +10,10 @@ import androidx.annotation.Nullable;
import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.api.services.Credentials; import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncResult;
import com.readrops.api.services.SyncType; import com.readrops.api.services.SyncType;

6
app/src/main/java/com/readrops/app/utils/DrawerManager.java
View File

@ -26,9 +26,9 @@ import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IProfile; import com.mikepenz.materialdrawer.model.interfaces.IProfile;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java
View File

@ -10,7 +10,7 @@ import androidx.annotation.StringRes;
import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.items.AbstractItem; import com.mikepenz.fastadapter.items.AbstractItem;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
app/src/main/java/com/readrops/app/utils/ParsingResult.java
View File

@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
import com.mikepenz.fastadapter.FastAdapter; import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.items.AbstractItem; import com.mikepenz.fastadapter.items.AbstractItem;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
View File

@ -12,7 +12,7 @@ import androidx.annotation.ColorInt;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.readrops.app.R; import com.readrops.app.R;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;

8
app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
View File

@ -4,10 +4,10 @@ import android.content.Context
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.readrops.app.R import com.readrops.app.R
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
/** /**

8
app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt
View File

@ -1,10 +1,10 @@
package com.readrops.app.utils package com.readrops.app.utils
import android.content.Context import android.content.Context
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.readropsdb.entities.account.AccountType import com.readrops.db.entities.account.AccountType
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly

2
app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt
View File

@ -1,7 +1,7 @@
package com.readrops.app.utils package com.readrops.app.utils
import android.graphics.Bitmap import android.graphics.Bitmap
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
class SyncResultNotifContent { class SyncResultNotifContent {
var title: String? = null var title: String? = null

6
app/src/main/java/com/readrops/app/utils/SyncWorker.kt
View File

@ -13,9 +13,9 @@ import com.readrops.app.R
import com.readrops.app.ReadropsApp import com.readrops.app.ReadropsApp
import com.readrops.app.activities.MainActivity import com.readrops.app.activities.MainActivity
import com.readrops.app.repositories.ARepository import com.readrops.app.repositories.ARepository
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Item import com.readrops.db.entities.Item
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers

2
app/src/main/java/com/readrops/app/utils/feedscolors/FeedColors.kt
View File

@ -1,7 +1,7 @@
package com.readrops.app.utils.feedscolors package com.readrops.app.utils.feedscolors
import androidx.palette.graphics.Palette 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.HtmlParser
import com.readrops.app.utils.Utils import com.readrops.app.utils.Utils

4
app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt
View File

@ -6,8 +6,8 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import com.readrops.app.R import com.readrops.app.R
import com.readrops.app.ReadropsApp import com.readrops.app.ReadropsApp
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.app.utils.ReadropsKeys.FEEDS import com.readrops.app.utils.ReadropsKeys.FEEDS
class FeedsColorsIntentService : IntentService("FeedsColorsIntentService") { class FeedsColorsIntentService : IntentService("FeedsColorsIntentService") {

2
app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
View File

@ -1,6 +1,6 @@
package com.readrops.app.utils.matchers; 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.atom.ATOMFeed;
import com.readrops.api.localfeed.json.JSONFeed; import com.readrops.api.localfeed.json.JSONFeed;
import com.readrops.api.localfeed.rss.RSSChannel; import com.readrops.api.localfeed.rss.RSSChannel;

4
app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java
View File

@ -2,8 +2,8 @@ package com.readrops.app.utils.matchers;
import com.readrops.app.utils.DateUtils; import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.Utils; import com.readrops.app.utils.Utils;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.api.localfeed.atom.ATOMEntry; import com.readrops.api.localfeed.atom.ATOMEntry;
import com.readrops.api.localfeed.json.JSONItem; import com.readrops.api.localfeed.json.JSONItem;
import com.readrops.api.localfeed.rss.RSSEnclosure; import com.readrops.api.localfeed.rss.RSSEnclosure;

4
app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt
View File

@ -2,8 +2,8 @@ package com.readrops.app.utils.matchers
import android.content.Context import android.content.Context
import com.readrops.app.R import com.readrops.app.R
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.Folder import com.readrops.db.entities.Folder
import com.readrops.api.opml.model.Body import com.readrops.api.opml.model.Body
import com.readrops.api.opml.model.Head import com.readrops.api.opml.model.Head
import com.readrops.api.opml.model.OPML import com.readrops.api.opml.model.OPML

10
app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java
View File

@ -7,11 +7,11 @@ import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import com.readrops.app.repositories.ARepository; import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.matchers.OPMLMatcher; import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.api.opml.OPMLParser; import com.readrops.api.opml.OPMLParser;

4
app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java
View File

@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.app.repositories.ARepository; import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.HtmlParser; import com.readrops.app.utils.HtmlParser;

6
app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java
View File

@ -9,9 +9,9 @@ import androidx.core.content.FileProvider;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.dao.ItemDao; import com.readrops.db.dao.ItemDao;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;

18
app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java
View File

@ -9,15 +9,15 @@ import androidx.lifecycle.MediatorLiveData;
import androidx.paging.LivePagedListBuilder; import androidx.paging.LivePagedListBuilder;
import androidx.paging.PagedList; import androidx.paging.PagedList;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.ItemsListQueryBuilder; import com.readrops.db.ItemsListQueryBuilder;
import com.readrops.readropsdb.RoomFactoryWrapper; import com.readrops.db.RoomFactoryWrapper;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.filters.FilterType; import com.readrops.db.filters.FilterType;
import com.readrops.readropsdb.filters.ListSortType; import com.readrops.db.filters.ListSortType;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import com.readrops.app.repositories.ARepository; import com.readrops.app.repositories.ARepository;
import java.util.ArrayList; import java.util.ArrayList;

12
app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java
View File

@ -6,12 +6,12 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import com.readrops.readropsdb.Database; import com.readrops.db.Database;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.db.pojo.FeedWithFolder;
import com.readrops.readropsdb.pojo.FolderWithFeedCount; import com.readrops.db.pojo.FolderWithFeedCount;
import com.readrops.app.repositories.ARepository; import com.readrops.app.repositories.ARepository;
import java.util.List; import java.util.List;

6
app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt
View File

@ -3,9 +3,9 @@ package com.readrops.app.viewmodels
import android.app.Application import android.app.Application
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import com.readrops.readropsdb.Database import com.readrops.db.Database
import com.readrops.readropsdb.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.readropsdb.entities.account.Account import com.readrops.db.entities.account.Account
import io.reactivex.Completable import io.reactivex.Completable
class NotificationPermissionViewModel(application: Application) : AndroidViewModel(application) { class NotificationPermissionViewModel(application: Application) : AndroidViewModel(application) {

431
db/schemas/com.readrops.db.Database/2.json Normal file
View File

@ -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')"
]
}
}

5
db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTests.kt
View File

@ -1,12 +1,9 @@
package com.readrops.readropsdb package com.readrops.db
import androidx.room.testing.MigrationTestHelper import androidx.room.testing.MigrationTestHelper
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry 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.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith

2
db/src/main/AndroidManifest.xml
View File

@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.readrops.readropsdb" /> package="com.readrops.db" />

4
db/src/main/java/com/readrops/db/Converters.java
View File

@ -1,8 +1,8 @@
package com.readrops.readropsdb; package com.readrops.db;
import androidx.room.TypeConverter; import androidx.room.TypeConverter;
import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.db.entities.account.AccountType;
import org.joda.time.LocalDateTime; import org.joda.time.LocalDateTime;

18
db/src/main/java/com/readrops/db/Database.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb; package com.readrops.db;
import android.content.Context; import android.content.Context;
@ -9,14 +9,14 @@ import androidx.room.TypeConverters;
import androidx.room.migration.Migration; import androidx.room.migration.Migration;
import androidx.sqlite.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import com.readrops.readropsdb.dao.AccountDao; import com.readrops.db.dao.AccountDao;
import com.readrops.readropsdb.dao.FeedDao; import com.readrops.db.dao.FeedDao;
import com.readrops.readropsdb.dao.FolderDao; import com.readrops.db.dao.FolderDao;
import com.readrops.readropsdb.dao.ItemDao; import com.readrops.db.dao.ItemDao;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
@androidx.room.Database(entities = {Feed.class, Item.class, Folder.class, Account.class}, version = 2) @androidx.room.Database(entities = {Feed.class, Item.class, Folder.class, Account.class}, version = 2)

6
db/src/main/java/com/readrops/db/ItemsListQueryBuilder.java
View File

@ -1,10 +1,10 @@
package com.readrops.readropsdb; package com.readrops.db;
import androidx.sqlite.db.SupportSQLiteQuery; import androidx.sqlite.db.SupportSQLiteQuery;
import androidx.sqlite.db.SupportSQLiteQueryBuilder; import androidx.sqlite.db.SupportSQLiteQueryBuilder;
import com.readrops.readropsdb.filters.FilterType; import com.readrops.db.filters.FilterType;
import com.readrops.readropsdb.filters.ListSortType; import com.readrops.db.filters.ListSortType;
public class ItemsListQueryBuilder { public class ItemsListQueryBuilder {

2
db/src/main/java/com/readrops/db/RoomFactoryWrapper.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb; package com.readrops.db;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.paging.DataSource; import androidx.paging.DataSource;

4
db/src/main/java/com/readrops/db/dao/AccountDao.java
View File

@ -1,10 +1,10 @@
package com.readrops.readropsdb.dao; package com.readrops.db.dao;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.room.Dao; import androidx.room.Dao;
import androidx.room.Query; import androidx.room.Query;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import java.util.List; import java.util.List;

2
db/src/main/java/com/readrops/db/dao/BaseDao.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.dao; package com.readrops.db.dao;
import androidx.room.Delete; import androidx.room.Delete;
import androidx.room.Insert; import androidx.room.Insert;

8
db/src/main/java/com/readrops/db/dao/FeedDao.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.dao; package com.readrops.db.dao;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
@ -7,9 +7,9 @@ import androidx.room.Query;
import androidx.room.RoomWarnings; import androidx.room.RoomWarnings;
import androidx.room.Transaction; import androidx.room.Transaction;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.db.pojo.FeedWithFolder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

8
db/src/main/java/com/readrops/db/dao/FolderDao.java
View File

@ -1,13 +1,13 @@
package com.readrops.readropsdb.dao; package com.readrops.db.dao;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.room.Dao; import androidx.room.Dao;
import androidx.room.Query; import androidx.room.Query;
import androidx.room.Transaction; import androidx.room.Transaction;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.account.Account; import com.readrops.db.entities.account.Account;
import com.readrops.readropsdb.pojo.FolderWithFeedCount; import com.readrops.db.pojo.FolderWithFeedCount;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

10
db/src/main/java/com/readrops/db/dao/ItemDao.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.dao; package com.readrops.db.dao;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
@ -9,10 +9,10 @@ import androidx.room.RawQuery;
import androidx.room.RoomWarnings; import androidx.room.RoomWarnings;
import androidx.sqlite.db.SupportSQLiteQuery; import androidx.sqlite.db.SupportSQLiteQuery;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
import com.readrops.readropsdb.pojo.ItemWithFeed; import com.readrops.db.pojo.ItemWithFeed;
import java.util.List; import java.util.List;

4
db/src/main/java/com/readrops/db/entities/Feed.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities; package com.readrops.db.entities;
import android.os.Parcel; import android.os.Parcel;
@ -11,7 +11,7 @@ import androidx.room.ForeignKey;
import androidx.room.Ignore; import androidx.room.Ignore;
import androidx.room.PrimaryKey; 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", @Entity(foreignKeys = {@ForeignKey(entity = Folder.class, parentColumns = "id",
childColumns = "folder_id", onDelete = ForeignKey.SET_NULL), childColumns = "folder_id", onDelete = ForeignKey.SET_NULL),

4
db/src/main/java/com/readrops/db/entities/Folder.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities; package com.readrops.db.entities;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@ -9,7 +9,7 @@ import androidx.room.ForeignKey;
import androidx.room.Ignore; import androidx.room.Ignore;
import androidx.room.PrimaryKey; 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", @Entity(foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "id",
childColumns = "account_id", onDelete = ForeignKey.CASCADE)) childColumns = "account_id", onDelete = ForeignKey.CASCADE))

2
db/src/main/java/com/readrops/db/entities/Item.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities; package com.readrops.db.entities;
import androidx.room.ColumnInfo; import androidx.room.ColumnInfo;
import androidx.room.Entity; import androidx.room.Entity;

2
db/src/main/java/com/readrops/db/entities/account/Account.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities.account; package com.readrops.db.entities.account;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

2
db/src/main/java/com/readrops/db/entities/account/AccountConfig.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities.account; package com.readrops.db.entities.account;
public class AccountConfig { public class AccountConfig {

4
db/src/main/java/com/readrops/db/entities/account/AccountType.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.entities.account; package com.readrops.db.entities.account;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@ -6,7 +6,7 @@ import android.os.Parcelable;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import com.readrops.readropsdb.R; import com.readrops.db.R;
public enum AccountType implements Parcelable { public enum AccountType implements Parcelable {

2
db/src/main/java/com/readrops/db/filters/FilterType.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.filters; package com.readrops.db.filters;
public enum FilterType { public enum FilterType {
FEED_FILTER, FEED_FILTER,

2
db/src/main/java/com/readrops/db/filters/ListSortType.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb.filters; package com.readrops.db.filters;
public enum ListSortType { public enum ListSortType {
NEWEST_TO_OLDEST, NEWEST_TO_OLDEST,

6
db/src/main/java/com/readrops/db/pojo/FeedWithFolder.java
View File

@ -1,12 +1,12 @@
package com.readrops.readropsdb.pojo; package com.readrops.db.pojo;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import androidx.room.Embedded; import androidx.room.Embedded;
import com.readrops.readropsdb.entities.Feed; import com.readrops.db.entities.Feed;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
public class FeedWithFolder implements Parcelable { public class FeedWithFolder implements Parcelable {

4
db/src/main/java/com/readrops/db/pojo/FolderWithFeedCount.java
View File

@ -1,9 +1,9 @@
package com.readrops.readropsdb.pojo; package com.readrops.db.pojo;
import androidx.room.ColumnInfo; import androidx.room.ColumnInfo;
import androidx.room.Embedded; import androidx.room.Embedded;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
public class FolderWithFeedCount { public class FolderWithFeedCount {

6
db/src/main/java/com/readrops/db/pojo/ItemWithFeed.java
View File

@ -1,11 +1,11 @@
package com.readrops.readropsdb.pojo; package com.readrops.db.pojo;
import androidx.room.ColumnInfo; import androidx.room.ColumnInfo;
import androidx.room.Embedded; import androidx.room.Embedded;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import com.readrops.readropsdb.entities.Folder; import com.readrops.db.entities.Folder;
import com.readrops.readropsdb.entities.Item; import com.readrops.db.entities.Item;
public class ItemWithFeed { public class ItemWithFeed {

2
db/src/test/java/com/readrops/db/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropsdb; package com.readrops.db;
import org.junit.Test; import org.junit.Test;

2
settings.gradle
View File

@ -1 +1 @@
include ':app', ':api', ':readropsdb' include ':app', ':api', ':db'