FreshRSS/Readrops
1
0
Fork 0
mirror of https://github.com/readrops/Readrops.git synced 2025-02-02 19:56:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize app module files by feature

Browse Source
This commit is contained in:
Shinokuni 2020-10-23 23:00:43 +02:00
parent 412ec3f1b8
commit ecdc714316
60 changed files with 115 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import android.content.Context
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.app.notifications.sync.SyncResultAnalyser
import com.readrops.db.Database
import com.readrops.db.entities.Feed
import com.readrops.db.entities.Item

30
app/src/main/AndroidManifest.xml
View File

@ -32,21 +32,21 @@
</provider>
<activity
android:name=".activities.NotificationPermissionActivity"
android:name=".notifications.NotificationPermissionActivity"
android:theme="@style/AppTheme" />
<activity
android:name=".activities.WebViewActivity"
android:name=".item.WebViewActivity"
android:theme="@style/AppTheme.NoActionBar" />
<service android:name=".utils.feedscolors.FeedsColorsIntentService" />
<receiver android:name=".utils.SyncWorker$MarkReadReceiver" />
<receiver android:name=".utils.SyncWorker$ReadLaterReceiver" />
<receiver android:name=".notifications.sync.SyncWorker$MarkReadReceiver" />
<receiver android:name=".notifications.sync.SyncWorker$ReadLaterReceiver" />
<activity android:name=".activities.SettingsActivity" />
<activity android:name=".settings.SettingsActivity" />
<activity
android:name=".activities.SplashActivity"
android:name=".SplashActivity"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -54,28 +54,28 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".activities.AccountTypeListActivity" />
<activity android:name=".account.AccountTypeListActivity" />
<activity
android:name=".activities.AddAccountActivity"
android:name=".account.AddAccountActivity"
android:label="@string/add_account" />
<activity
android:name=".activities.ManageFeedsFoldersActivity"
android:name=".feedsfolders.ManageFeedsFoldersActivity"
android:label="@string/manage_feeds_folders"
android:parentActivityName=".activities.MainActivity"
android:parentActivityName=".itemslist.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.MainActivity"
android:name=".itemslist.MainActivity"
android:label="@string/articles"
android:launchMode="singleTask"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.ItemActivity"
android:parentActivityName=".activities.MainActivity"
android:name=".item.ItemActivity"
android:parentActivityName=".itemslist.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.AddFeedActivity"
android:name=".addfeed.AddFeedActivity"
android:label="@string/add_feed_title"
android:parentActivityName=".activities.MainActivity">
android:parentActivityName=".itemslist.MainActivity">
<intent-filter android:label="@string/new_feed">
<action android:name="android.intent.action.SEND" />

7
app/src/main/java/com/readrops/app/AppModule.kt
View File

@ -1,11 +1,16 @@
package com.readrops.app
import androidx.preference.PreferenceManager
import com.readrops.app.account.AccountViewModel
import com.readrops.app.addfeed.AddFeedsViewModel
import com.readrops.app.feedsfolders.ManageFeedsFoldersViewModel
import com.readrops.app.item.ItemViewModel
import com.readrops.app.itemslist.MainViewModel
import com.readrops.app.notifications.NotificationPermissionViewModel
import com.readrops.app.repositories.FreshRSSRepository
import com.readrops.app.repositories.LocalFeedRepository
import com.readrops.app.repositories.NextNewsRepository
import com.readrops.app.utils.GlideApp
import com.readrops.app.viewmodels.*
import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType
import org.koin.android.ext.koin.androidApplication

7
app/src/main/java/com/readrops/app/activities/SplashActivity.java → app/src/main/java/com/readrops/app/SplashActivity.java
View File

@ -1,12 +1,13 @@
package com.readrops.app.activities;
package com.readrops.app;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import com.readrops.app.R;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.app.account.AccountTypeListActivity;
import com.readrops.app.account.AccountViewModel;
import com.readrops.app.itemslist.MainActivity;
import org.koin.androidx.viewmodel.compat.ViewModelCompat;

5
app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java → app/src/main/java/com/readrops/app/account/AccountTypeListActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.account;
import android.content.Intent;
import android.net.Uri;
@ -17,10 +17,9 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.afollestad.materialdialogs.MaterialDialog;
import com.readrops.api.opml.OPMLHelper;
import com.readrops.app.R;
import com.readrops.app.adapters.AccountTypeListAdapter;
import com.readrops.app.databinding.ActivityAccountTypeListBinding;
import com.readrops.app.itemslist.MainActivity;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.db.entities.account.Account;
import com.readrops.db.entities.account.AccountType;

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

@ -1,4 +1,4 @@
package com.readrops.app.adapters;
package com.readrops.app.account;
import android.view.LayoutInflater;
import android.view.ViewGroup;

2
app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java → app/src/main/java/com/readrops/app/account/AccountViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels;
package com.readrops.app.account;
import android.content.Context;
import android.net.Uri;

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

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.account;
import android.content.Intent;
import android.os.Bundle;
@ -11,9 +11,9 @@ import androidx.appcompat.app.AppCompatActivity;
import com.readrops.app.R;
import com.readrops.app.databinding.ActivityAddAccountBinding;
import com.readrops.app.itemslist.MainActivity;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.db.entities.account.Account;
import com.readrops.db.entities.account.AccountType;

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

@ -1,4 +1,4 @@
package com.readrops.app.adapters;
package com.readrops.app.addfeed;
import android.content.Context;
import android.view.LayoutInflater;

8
app/src/main/java/com/readrops/app/activities/AddFeedActivity.java → app/src/main/java/com/readrops/app/addfeed/AddFeedActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.addfeed;
import android.annotation.SuppressLint;
import android.content.Intent;
@ -21,14 +21,10 @@ import com.mikepenz.fastadapter.adapters.ItemAdapter;
import com.mikepenz.fastadapter.commons.utils.DiffCallback;
import com.mikepenz.fastadapter.commons.utils.FastAdapterDiffUtil;
import com.readrops.app.R;
import com.readrops.app.adapters.AccountArrayAdapter;
import com.readrops.app.databinding.ActivityAddFeedBinding;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.ReadropsItemTouchCallback;
import com.readrops.app.utils.customviews.ReadropsItemTouchCallback;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AddFeedsViewModel;
import com.readrops.db.entities.Feed;
import com.readrops.db.entities.account.Account;

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

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels;
package com.readrops.app.addfeed;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
@ -6,9 +6,7 @@ import androidx.lifecycle.ViewModel;
import com.readrops.api.localfeed.LocalRSSDataSource;
import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.HtmlParser;
import com.readrops.app.utils.ParsingResult;
import com.readrops.db.Database;
import com.readrops.db.entities.account.Account;

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

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app.addfeed;
import android.view.View;
import android.widget.ImageView;

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

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app.addfeed;
import android.view.View;
import android.widget.CheckBox;

7
app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java → app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.feedsfolders;
import android.os.Bundle;
import android.view.Menu;
@ -15,10 +15,9 @@ import com.readrops.api.utils.exceptions.ConflictException;
import com.readrops.api.utils.exceptions.UnknownFormatException;
import com.readrops.app.R;
import com.readrops.app.databinding.ActivityManageFeedsFoldersBinding;
import com.readrops.app.fragments.FeedsFragment;
import com.readrops.app.fragments.FoldersFragment;
import com.readrops.app.feedsfolders.feeds.FeedsFragment;
import com.readrops.app.feedsfolders.folders.FoldersFragment;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.db.entities.Folder;
import com.readrops.db.entities.account.Account;

2
app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java → app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels;
package com.readrops.app.feedsfolders;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;

4
app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java → app/src/main/java/com/readrops/app/feedsfolders/feeds/EditFeedDialogFragment.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.fragments;
package com.readrops.app.feedsfolders.feeds;
import android.app.AlertDialog;
import android.app.Dialog;
@ -14,7 +14,7 @@ import androidx.fragment.app.DialogFragment;
import com.google.android.material.textfield.TextInputEditText;
import com.readrops.app.R;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.app.feedsfolders.ManageFeedsFoldersViewModel;
import com.readrops.db.entities.Feed;
import com.readrops.db.entities.Folder;
import com.readrops.db.entities.account.Account;

2
app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt → app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedOptionsDialogFragment.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.fragments
package com.readrops.app.feedsfolders.feeds
import android.content.Intent
import android.net.Uri

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

@ -1,4 +1,4 @@
package com.readrops.app.adapters;
package com.readrops.app.feedsfolders.feeds;
import android.view.LayoutInflater;
import android.view.View;

5
app/src/main/java/com/readrops/app/fragments/FeedsFragment.java → app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsFragment.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.fragments;
package com.readrops.app.feedsfolders.feeds;
import android.content.res.Resources;
@ -14,11 +14,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.afollestad.materialdialogs.MaterialDialog;
import com.readrops.app.R;
import com.readrops.app.adapters.FeedsAdapter;
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.app.feedsfolders.ManageFeedsFoldersViewModel;
import com.readrops.db.entities.Feed;
import com.readrops.db.entities.account.Account;
import com.readrops.db.pojo.FeedWithFolder;

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

@ -1,4 +1,4 @@
package com.readrops.app.fragments
package com.readrops.app.feedsfolders.folders
import android.os.Bundle
import android.view.LayoutInflater

2
app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java → app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersAdapter.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.adapters;
package com.readrops.app.feedsfolders.folders;
import android.text.TextUtils;
import android.view.LayoutInflater;

5
app/src/main/java/com/readrops/app/fragments/FoldersFragment.java → app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersFragment.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.fragments;
package com.readrops.app.feedsfolders.folders;
import android.content.res.Resources;
@ -16,11 +16,10 @@ import com.afollestad.materialdialogs.MaterialDialog;
import com.readrops.api.utils.exceptions.ConflictException;
import com.readrops.api.utils.exceptions.UnknownFormatException;
import com.readrops.app.R;
import com.readrops.app.adapters.FoldersAdapter;
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.app.feedsfolders.ManageFeedsFoldersViewModel;
import com.readrops.db.entities.Folder;
import com.readrops.db.entities.account.Account;

3
app/src/main/java/com/readrops/app/activities/ItemActivity.java → app/src/main/java/com/readrops/app/item/ItemActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.item;
import android.Manifest;
import android.app.DownloadManager;
@ -37,7 +37,6 @@ import com.readrops.app.utils.GlideRequests;
import com.readrops.app.utils.PermissionManager;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ItemViewModel;
import com.readrops.db.entities.Item;
import com.readrops.db.pojo.ItemWithFeed;

2
app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java → app/src/main/java/com/readrops/app/item/ItemViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels;
package com.readrops.app.item;
import android.content.Context;
import android.graphics.Bitmap;

3
app/src/main/java/com/readrops/app/activities/WebViewActivity.kt → app/src/main/java/com/readrops/app/item/WebViewActivity.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities
package com.readrops.app.item
import android.annotation.SuppressLint
import android.content.Intent
@ -7,7 +7,6 @@ import android.graphics.Bitmap
import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuItem
import android.view.View

2
app/src/main/java/com/readrops/app/utils/DrawerManager.java → app/src/main/java/com/readrops/app/itemslist/DrawerManager.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app.itemslist;
import android.app.Activity;
import android.graphics.drawable.Drawable;

11
app/src/main/java/com/readrops/app/activities/MainActivity.java → app/src/main/java/com/readrops/app/itemslist/MainActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.itemslist;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@ -34,14 +34,15 @@ import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.readrops.app.R;
import com.readrops.app.adapters.MainItemListAdapter;
import com.readrops.app.account.AccountTypeListActivity;
import com.readrops.app.addfeed.AddFeedActivity;
import com.readrops.app.item.ItemActivity;
import com.readrops.app.settings.SettingsActivity;
import com.readrops.app.databinding.ActivityMainBinding;
import com.readrops.app.utils.DrawerManager;
import com.readrops.app.utils.GlideRequests;
import com.readrops.app.utils.ReadropsItemTouchCallback;
import com.readrops.app.utils.customviews.ReadropsItemTouchCallback;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.MainViewModel;
import com.readrops.db.entities.Feed;
import com.readrops.db.entities.Folder;
import com.readrops.db.entities.account.Account;

2
app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java → app/src/main/java/com/readrops/app/itemslist/MainItemListAdapter.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.adapters;
package com.readrops.app.itemslist;
import android.content.Context;
import android.content.res.Resources;

2
app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java → app/src/main/java/com/readrops/app/itemslist/MainViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels;
package com.readrops.app.itemslist;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;

5
app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt → app/src/main/java/com/readrops/app/notifications/NotificationPermissionActivity.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities
package com.readrops.app.notifications
import android.content.Intent
import android.os.Bundle
@ -8,13 +8,12 @@ import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import com.afollestad.materialdialogs.MaterialDialog
import com.readrops.app.R
import com.readrops.app.adapters.NotificationPermissionListAdapter
import com.readrops.app.settings.SettingsActivity
import com.readrops.app.databinding.ActivityNotificationPermissionBinding
import com.readrops.app.utils.ReadropsKeys
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.db.entities.Feed
import com.readrops.db.entities.account.Account
import io.reactivex.android.schedulers.AndroidSchedulers

3
app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt → app/src/main/java/com/readrops/app/notifications/NotificationPermissionListAdapter.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.adapters
package com.readrops.app.notifications
import android.view.LayoutInflater
import android.view.ViewGroup
@ -8,7 +8,6 @@ import androidx.recyclerview.widget.RecyclerView
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.app.utils.GlideRequests
import com.readrops.db.entities.Feed
import org.koin.core.KoinComponent

2
app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt → app/src/main/java/com/readrops/app/notifications/NotificationPermissionViewModel.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.viewmodels
package com.readrops.app.notifications
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel

4
app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt → app/src/main/java/com/readrops/app/notifications/sync/SyncResultAnalyser.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.notifications.sync
import android.content.Context
import androidx.core.content.ContextCompat
@ -9,6 +9,8 @@ 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
import com.readrops.app.utils.GlideRequests
import com.readrops.app.utils.Utils
import org.koin.core.KoinComponent
import org.koin.core.get

3
app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt → app/src/main/java/com/readrops/app/notifications/sync/SyncResultDebugData.kt
View File

@ -1,6 +1,5 @@
package com.readrops.app.utils
package com.readrops.app.notifications.sync
import android.content.Context
import com.readrops.api.services.SyncResult
import com.readrops.db.Database
import com.readrops.db.entities.Item

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

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.notifications.sync
import android.graphics.Bitmap
import com.readrops.db.entities.Item

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

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.notifications.sync
import android.app.PendingIntent
import android.content.BroadcastReceiver
@ -12,8 +12,10 @@ import androidx.work.WorkerParameters
import com.readrops.api.services.SyncResult
import com.readrops.app.R
import com.readrops.app.ReadropsApp
import com.readrops.app.activities.MainActivity
import com.readrops.app.itemslist.MainActivity
import com.readrops.app.repositories.ARepository
import com.readrops.app.utils.ReadropsKeys
import com.readrops.app.utils.SharedPreferencesManager
import com.readrops.db.Database
import com.readrops.db.entities.Item
import com.readrops.db.entities.account.Account

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

@ -9,8 +9,8 @@ import androidx.annotation.Nullable;
import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult;
import com.readrops.api.utils.AuthInterceptor;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.addfeed.FeedInsertionResult;
import com.readrops.app.addfeed.ParsingResult;
import com.readrops.app.utils.feedscolors.FeedColorsKt;
import com.readrops.app.utils.feedscolors.FeedsColorsIntentService;
import com.readrops.db.Database;

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

@ -10,8 +10,8 @@ import androidx.annotation.Nullable;
import com.readrops.api.services.SyncType;
import com.readrops.api.services.freshrss.FreshRSSDataSource;
import com.readrops.api.services.freshrss.FreshRSSSyncData;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.addfeed.FeedInsertionResult;
import com.readrops.app.addfeed.ParsingResult;
import com.readrops.app.utils.Utils;
import com.readrops.db.Database;
import com.readrops.db.entities.Feed;

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

@ -12,8 +12,8 @@ import com.readrops.api.services.SyncResult;
import com.readrops.api.utils.ApiUtils;
import com.readrops.api.utils.exceptions.ParseException;
import com.readrops.api.utils.exceptions.UnknownFormatException;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.addfeed.FeedInsertionResult;
import com.readrops.app.addfeed.ParsingResult;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.db.Database;

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

@ -13,8 +13,8 @@ import com.readrops.api.services.nextcloudnews.NextNewsDataSource;
import com.readrops.api.services.nextcloudnews.NextNewsSyncData;
import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
import com.readrops.api.utils.exceptions.UnknownFormatException;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.addfeed.FeedInsertionResult;
import com.readrops.app.addfeed.ParsingResult;
import com.readrops.app.utils.Utils;
import com.readrops.db.Database;
import com.readrops.db.entities.Feed;

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

@ -1,4 +1,4 @@
package com.readrops.app.fragments.settings;
package com.readrops.app.settings;
import android.Manifest;
@ -24,14 +24,14 @@ import com.readrops.api.opml.OPMLHelper;
import com.readrops.api.opml.OPMLParser;
import com.readrops.app.R;
import com.readrops.app.ReadropsApp;
import com.readrops.app.activities.AddAccountActivity;
import com.readrops.app.activities.ManageFeedsFoldersActivity;
import com.readrops.app.activities.NotificationPermissionActivity;
import com.readrops.app.account.AddAccountActivity;
import com.readrops.app.feedsfolders.ManageFeedsFoldersActivity;
import com.readrops.app.notifications.NotificationPermissionActivity;
import com.readrops.app.utils.FileUtils;
import com.readrops.app.utils.PermissionManager;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.app.account.AccountViewModel;
import com.readrops.db.entities.account.Account;
import com.readrops.db.entities.account.AccountType;

4
app/src/main/java/com/readrops/app/activities/SettingsActivity.java → app/src/main/java/com/readrops/app/settings/SettingsActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.activities;
package com.readrops.app.settings;
import android.os.Bundle;
import android.view.MenuItem;
@ -8,8 +8,6 @@ import androidx.fragment.app.Fragment;
import com.readrops.app.R;
import com.readrops.db.entities.account.Account;
import com.readrops.app.fragments.settings.AccountSettingsFragment;
import com.readrops.app.fragments.settings.SettingsFragment;
import static com.readrops.app.utils.ReadropsKeys.ACCOUNT;
import static com.readrops.app.utils.ReadropsKeys.SETTINGS;

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

@ -1,4 +1,4 @@
package com.readrops.app.fragments.settings;
package com.readrops.app.settings;
import android.content.Intent;
import android.os.Bundle;
@ -15,7 +15,7 @@ import androidx.work.PeriodicWorkRequest;
import androidx.work.WorkManager;
import com.readrops.app.R;
import com.readrops.app.utils.SyncWorker;
import com.readrops.app.notifications.sync.SyncWorker;
import com.readrops.app.utils.feedscolors.FeedsColorsIntentService;
import com.readrops.db.Database;

1
app/src/main/java/com/readrops/app/utils/HtmlParser.java
View File

@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
import com.readrops.api.localfeed.LocalRSSHelper;
import com.readrops.api.utils.ApiUtils;
import com.readrops.app.addfeed.ParsingResult;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;

2
app/src/main/java/com/readrops/app/utils/EmptyListView.kt → app/src/main/java/com/readrops/app/utils/customviews/EmptyListView.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.utils.customviews
import android.content.Context
import android.util.AttributeSet

2
app/src/main/java/com/readrops/app/utils/ReadropsItemTouchCallback.kt → app/src/main/java/com/readrops/app/utils/customviews/ReadropsItemTouchCallback.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.utils.customviews
import android.content.Context
import android.graphics.Canvas

3
app/src/main/java/com/readrops/app/utils/ReadropsWebView.java → app/src/main/java/com/readrops/app/utils/customviews/ReadropsWebView.java
View File

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app.utils.customviews;
import android.annotation.SuppressLint;
import android.content.Context;
@ -12,6 +12,7 @@ import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import com.readrops.app.R;
import com.readrops.app.utils.Utils;
import com.readrops.db.pojo.ItemWithFeed;
import org.jsoup.Jsoup;

2
app/src/main/res/layout/activity_account_type_list.xml
View File

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.AccountTypeListActivity">
tools:context=".account.AccountTypeListActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/account_type_list_root"

2
app/src/main/res/layout/activity_add_account.xml
View File

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.AddAccountActivity">
tools:context=".account.AddAccountActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/add_account_root"

2
app/src/main/res/layout/activity_add_feed.xml
View File

@ -6,7 +6,7 @@
android:id="@+id/add_feed_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.AddFeedActivity">
tools:context=".addfeed.AddFeedActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

4
app/src/main/res/layout/activity_item.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activities.ItemActivity">
tools:context=".item.ItemActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
@ -152,7 +152,7 @@
</RelativeLayout>
<com.readrops.app.utils.ReadropsWebView
<com.readrops.app.utils.customviews.ReadropsWebView
android:id="@+id/item_webview"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/layout/activity_main.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/main_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.MainActivity">
tools:context=".itemslist.MainActivity">
<LinearLayout
android:layout_width="match_parent"
@ -85,7 +85,7 @@
android:layout_height="match_parent"
android:animateLayoutChanges="true">
<com.readrops.app.utils.EmptyListView
<com.readrops.app.utils.customviews.EmptyListView
android:id="@+id/empty_list_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/activity_manage_feeds_folders.xml
View File

@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activities.ManageFeedsFoldersActivity"
tools:context=".feedsfolders.ManageFeedsFoldersActivity"
android:id="@+id/manage_feeds_folders_root"
android:layout_width="match_parent"
android:layout_height="match_parent">

2
app/src/main/res/layout/activity_notification_permission.xml
View File

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.readrops.app.activities.NotificationPermissionActivity">
tools:context="com.readrops.app.notifications.NotificationPermissionActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_settings.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.SettingsActivity">
tools:context=".settings.SettingsActivity">
<FrameLayout
android:id="@+id/settings_activity_fragment"

2
app/src/main/res/layout/activity_splash.xml
View File

@ -4,6 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.SplashActivity">
tools:context=".SplashActivity">
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/activity_web_view.xml
View File

@ -2,7 +2,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.readrops.app.activities.WebViewActivity"
tools:context="com.readrops.app.item.WebViewActivity"
android:layout_width="match_parent"
android:layout_height="match_parent">

4
app/src/main/res/layout/fragment_feeds.xml
View File

@ -6,7 +6,7 @@
android:id="@+id/feeds_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragments.FeedsFragment">
tools:context=".feedsfolders.feeds.FeedsFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/feeds_recyclerview"
@ -15,7 +15,7 @@
tools:itemCount="5"
tools:listitem="@layout/feed_layout" />
<com.readrops.app.utils.EmptyListView
<com.readrops.app.utils.customviews.EmptyListView
android:id="@+id/feeds_empty_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/fragment_folders.xml
View File

@ -6,7 +6,7 @@
android:id="@+id/folders_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragments.FoldersFragment">
tools:context=".feedsfolders.folders.FoldersFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/folders_list"
@ -15,7 +15,7 @@
tools:itemCount="5"
tools:listitem="@layout/folder_layout" />
<com.readrops.app.utils.EmptyListView
<com.readrops.app.utils.customviews.EmptyListView
android:id="@+id/folders_empty_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/test/java/com/readrops/app/HtmlParserTest.kt
View File

@ -1,7 +1,7 @@
package com.readrops.app
import com.readrops.app.utils.HtmlParser
import com.readrops.app.utils.ParsingResult
import com.readrops.app.addfeed.ParsingResult
import junit.framework.TestCase
import okhttp3.OkHttpClient
import org.junit.Assert