From ecdc7143169a84c18845c2823a2dd33241ed68d7 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Fri, 23 Oct 2020 23:00:43 +0200 Subject: [PATCH] Reorganize app module files by feature --- .../readrops/app/SyncResultAnalyserTest.kt | 2 +- app/src/main/AndroidManifest.xml | 30 +++++++++---------- .../main/java/com/readrops/app/AppModule.kt | 7 ++++- .../app/{activities => }/SplashActivity.java | 7 +++-- .../AccountTypeListActivity.java | 5 ++-- .../AccountTypeListAdapter.java | 2 +- .../AccountViewModel.java | 2 +- .../AddAccountActivity.java | 4 +-- .../AccountArrayAdapter.java | 2 +- .../AddFeedActivity.java | 8 ++--- .../AddFeedsViewModel.java | 4 +-- .../FeedInsertionResult.java | 2 +- .../app/{utils => addfeed}/ParsingResult.java | 2 +- .../ManageFeedsFoldersActivity.java | 7 ++--- .../ManageFeedsFoldersViewModel.java | 2 +- .../feeds}/EditFeedDialogFragment.java | 4 +-- .../feeds}/FeedOptionsDialogFragment.kt | 2 +- .../feeds}/FeedsAdapter.java | 2 +- .../feeds}/FeedsFragment.java | 5 ++-- .../folders}/FolderOptionsDialogFragment.kt | 2 +- .../folders}/FoldersAdapter.java | 2 +- .../folders}/FoldersFragment.java | 5 ++-- .../{activities => item}/ItemActivity.java | 3 +- .../{viewmodels => item}/ItemViewModel.java | 2 +- .../{activities => item}/WebViewActivity.kt | 3 +- .../{utils => itemslist}/DrawerManager.java | 2 +- .../MainActivity.java | 11 +++---- .../MainItemListAdapter.java | 2 +- .../MainViewModel.java | 2 +- .../NotificationPermissionActivity.kt | 5 ++-- .../NotificationPermissionListAdapter.kt | 3 +- .../NotificationPermissionViewModel.kt | 2 +- .../sync}/SyncResultAnalyser.kt | 4 ++- .../sync}/SyncResultDebugData.kt | 3 +- .../sync}/SyncResultNotifContent.kt | 2 +- .../sync}/SyncWorker.kt | 6 ++-- .../app/repositories/ARepository.java | 4 +-- .../app/repositories/FreshRSSRepository.java | 4 +-- .../app/repositories/LocalFeedRepository.java | 4 +-- .../app/repositories/NextNewsRepository.java | 4 +-- .../settings/AccountSettingsFragment.java | 10 +++---- .../SettingsActivity.java | 4 +-- .../settings/SettingsFragment.java | 4 +-- .../com/readrops/app/utils/HtmlParser.java | 1 + .../utils/{ => customviews}/EmptyListView.kt | 2 +- .../ReadropsItemTouchCallback.kt | 2 +- .../{ => customviews}/ReadropsWebView.java | 3 +- .../res/layout/activity_account_type_list.xml | 2 +- .../main/res/layout/activity_add_account.xml | 2 +- app/src/main/res/layout/activity_add_feed.xml | 2 +- app/src/main/res/layout/activity_item.xml | 4 +-- app/src/main/res/layout/activity_main.xml | 4 +-- .../layout/activity_manage_feeds_folders.xml | 2 +- .../activity_notification_permission.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 2 +- app/src/main/res/layout/activity_web_view.xml | 2 +- app/src/main/res/layout/fragment_feeds.xml | 4 +-- app/src/main/res/layout/fragment_folders.xml | 4 +-- .../java/com/readrops/app/HtmlParserTest.kt | 2 +- 60 files changed, 115 insertions(+), 119 deletions(-) rename app/src/main/java/com/readrops/app/{activities => }/SplashActivity.java (91%) rename app/src/main/java/com/readrops/app/{activities => account}/AccountTypeListActivity.java (97%) rename app/src/main/java/com/readrops/app/{adapters => account}/AccountTypeListAdapter.java (98%) rename app/src/main/java/com/readrops/app/{viewmodels => account}/AccountViewModel.java (98%) rename app/src/main/java/com/readrops/app/{activities => account}/AddAccountActivity.java (99%) rename app/src/main/java/com/readrops/app/{adapters => addfeed}/AccountArrayAdapter.java (97%) rename app/src/main/java/com/readrops/app/{activities => addfeed}/AddFeedActivity.java (97%) rename app/src/main/java/com/readrops/app/{viewmodels => addfeed}/AddFeedsViewModel.java (93%) rename app/src/main/java/com/readrops/app/{utils => addfeed}/FeedInsertionResult.java (99%) rename app/src/main/java/com/readrops/app/{utils => addfeed}/ParsingResult.java (99%) rename app/src/main/java/com/readrops/app/{activities => feedsfolders}/ManageFeedsFoldersActivity.java (96%) rename app/src/main/java/com/readrops/app/{viewmodels => feedsfolders}/ManageFeedsFoldersViewModel.java (98%) rename app/src/main/java/com/readrops/app/{fragments => feedsfolders/feeds}/EditFeedDialogFragment.java (97%) rename app/src/main/java/com/readrops/app/{fragments => feedsfolders/feeds}/FeedOptionsDialogFragment.kt (98%) rename app/src/main/java/com/readrops/app/{adapters => feedsfolders/feeds}/FeedsAdapter.java (99%) rename app/src/main/java/com/readrops/app/{fragments => feedsfolders/feeds}/FeedsFragment.java (97%) rename app/src/main/java/com/readrops/app/{fragments => feedsfolders/folders}/FolderOptionsDialogFragment.kt (97%) rename app/src/main/java/com/readrops/app/{adapters => feedsfolders/folders}/FoldersAdapter.java (98%) rename app/src/main/java/com/readrops/app/{fragments => feedsfolders/folders}/FoldersFragment.java (97%) rename app/src/main/java/com/readrops/app/{activities => item}/ItemActivity.java (99%) rename app/src/main/java/com/readrops/app/{viewmodels => item}/ItemViewModel.java (97%) rename app/src/main/java/com/readrops/app/{activities => item}/WebViewActivity.kt (98%) rename app/src/main/java/com/readrops/app/{utils => itemslist}/DrawerManager.java (99%) rename app/src/main/java/com/readrops/app/{activities => itemslist}/MainActivity.java (98%) rename app/src/main/java/com/readrops/app/{adapters => itemslist}/MainItemListAdapter.java (99%) rename app/src/main/java/com/readrops/app/{viewmodels => itemslist}/MainViewModel.java (99%) rename app/src/main/java/com/readrops/app/{activities => notifications}/NotificationPermissionActivity.kt (97%) rename app/src/main/java/com/readrops/app/{adapters => notifications}/NotificationPermissionListAdapter.kt (97%) rename app/src/main/java/com/readrops/app/{viewmodels => notifications}/NotificationPermissionViewModel.kt (96%) rename app/src/main/java/com/readrops/app/{utils => notifications/sync}/SyncResultAnalyser.kt (97%) rename app/src/main/java/com/readrops/app/{utils => notifications/sync}/SyncResultDebugData.kt (98%) rename app/src/main/java/com/readrops/app/{utils => notifications/sync}/SyncResultNotifContent.kt (85%) rename app/src/main/java/com/readrops/app/{utils => notifications/sync}/SyncWorker.kt (97%) rename app/src/main/java/com/readrops/app/{fragments => }/settings/AccountSettingsFragment.java (97%) rename app/src/main/java/com/readrops/app/{activities => settings}/SettingsActivity.java (91%) rename app/src/main/java/com/readrops/app/{fragments => }/settings/SettingsFragment.java (98%) rename app/src/main/java/com/readrops/app/utils/{ => customviews}/EmptyListView.kt (94%) rename app/src/main/java/com/readrops/app/utils/{ => customviews}/ReadropsItemTouchCallback.kt (99%) rename app/src/main/java/com/readrops/app/utils/{ => customviews}/ReadropsWebView.java (97%) diff --git a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt index 9b3d9b4f..782c724d 100644 --- a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt +++ b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt @@ -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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9d47cb49..fb1ff613 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,21 +32,21 @@ - - + + - + @@ -54,28 +54,28 @@ - + + android:parentActivityName=".itemslist.MainActivity"> diff --git a/app/src/main/java/com/readrops/app/AppModule.kt b/app/src/main/java/com/readrops/app/AppModule.kt index ee0b5696..0202b6ba 100644 --- a/app/src/main/java/com/readrops/app/AppModule.kt +++ b/app/src/main/java/com/readrops/app/AppModule.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/activities/SplashActivity.java b/app/src/main/java/com/readrops/app/SplashActivity.java similarity index 91% rename from app/src/main/java/com/readrops/app/activities/SplashActivity.java rename to app/src/main/java/com/readrops/app/SplashActivity.java index 33edd643..6af8cfb3 100644 --- a/app/src/main/java/com/readrops/app/activities/SplashActivity.java +++ b/app/src/main/java/com/readrops/app/SplashActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java b/app/src/main/java/com/readrops/app/account/AccountTypeListActivity.java similarity index 97% rename from app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java rename to app/src/main/java/com/readrops/app/account/AccountTypeListActivity.java index 1ae20d00..c197eba7 100644 --- a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java +++ b/app/src/main/java/com/readrops/app/account/AccountTypeListActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java b/app/src/main/java/com/readrops/app/account/AccountTypeListAdapter.java similarity index 98% rename from app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java rename to app/src/main/java/com/readrops/app/account/AccountTypeListAdapter.java index 8eea5135..3b93d325 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java +++ b/app/src/main/java/com/readrops/app/account/AccountTypeListAdapter.java @@ -1,4 +1,4 @@ -package com.readrops.app.adapters; +package com.readrops.app.account; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java b/app/src/main/java/com/readrops/app/account/AccountViewModel.java similarity index 98% rename from app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java rename to app/src/main/java/com/readrops/app/account/AccountViewModel.java index e93677e0..353e1cea 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/readrops/app/account/AccountViewModel.java @@ -1,4 +1,4 @@ -package com.readrops.app.viewmodels; +package com.readrops.app.account; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java b/app/src/main/java/com/readrops/app/account/AddAccountActivity.java similarity index 99% rename from app/src/main/java/com/readrops/app/activities/AddAccountActivity.java rename to app/src/main/java/com/readrops/app/account/AddAccountActivity.java index f952c5bd..051949f7 100644 --- a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java +++ b/app/src/main/java/com/readrops/app/account/AddAccountActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java b/app/src/main/java/com/readrops/app/addfeed/AccountArrayAdapter.java similarity index 97% rename from app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java rename to app/src/main/java/com/readrops/app/addfeed/AccountArrayAdapter.java index d2369167..af594ea1 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java +++ b/app/src/main/java/com/readrops/app/addfeed/AccountArrayAdapter.java @@ -1,4 +1,4 @@ -package com.readrops.app.adapters; +package com.readrops.app.addfeed; import android.content.Context; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java b/app/src/main/java/com/readrops/app/addfeed/AddFeedActivity.java similarity index 97% rename from app/src/main/java/com/readrops/app/activities/AddFeedActivity.java rename to app/src/main/java/com/readrops/app/addfeed/AddFeedActivity.java index 5828ce1a..a8b5cb33 100644 --- a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java +++ b/app/src/main/java/com/readrops/app/addfeed/AddFeedActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java b/app/src/main/java/com/readrops/app/addfeed/AddFeedsViewModel.java similarity index 93% rename from app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java rename to app/src/main/java/com/readrops/app/addfeed/AddFeedsViewModel.java index 905fdd9d..18e71d2d 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java +++ b/app/src/main/java/com/readrops/app/addfeed/AddFeedsViewModel.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java b/app/src/main/java/com/readrops/app/addfeed/FeedInsertionResult.java similarity index 99% rename from app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java rename to app/src/main/java/com/readrops/app/addfeed/FeedInsertionResult.java index 1ffb4976..fd2e8379 100644 --- a/app/src/main/java/com/readrops/app/utils/FeedInsertionResult.java +++ b/app/src/main/java/com/readrops/app/addfeed/FeedInsertionResult.java @@ -1,4 +1,4 @@ -package com.readrops.app.utils; +package com.readrops.app.addfeed; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/readrops/app/utils/ParsingResult.java b/app/src/main/java/com/readrops/app/addfeed/ParsingResult.java similarity index 99% rename from app/src/main/java/com/readrops/app/utils/ParsingResult.java rename to app/src/main/java/com/readrops/app/addfeed/ParsingResult.java index c5b594c1..09e05489 100644 --- a/app/src/main/java/com/readrops/app/utils/ParsingResult.java +++ b/app/src/main/java/com/readrops/app/addfeed/ParsingResult.java @@ -1,4 +1,4 @@ -package com.readrops.app.utils; +package com.readrops.app.addfeed; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersActivity.java similarity index 96% rename from app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java rename to app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersActivity.java index 888534c4..7b79f1a4 100644 --- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java b/app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersViewModel.java similarity index 98% rename from app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java rename to app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersViewModel.java index 802006b3..91bd9581 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/ManageFeedsFoldersViewModel.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/ManageFeedsFoldersViewModel.java @@ -1,4 +1,4 @@ -package com.readrops.app.viewmodels; +package com.readrops.app.feedsfolders; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; diff --git a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java b/app/src/main/java/com/readrops/app/feedsfolders/feeds/EditFeedDialogFragment.java similarity index 97% rename from app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java rename to app/src/main/java/com/readrops/app/feedsfolders/feeds/EditFeedDialogFragment.java index 5fc3c2f6..c9819336 100644 --- a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/feeds/EditFeedDialogFragment.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedOptionsDialogFragment.kt similarity index 98% rename from app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt rename to app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedOptionsDialogFragment.kt index ac7b9736..eea856e6 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedOptionsDialogFragment.kt @@ -1,4 +1,4 @@ -package com.readrops.app.fragments +package com.readrops.app.feedsfolders.feeds import android.content.Intent import android.net.Uri diff --git a/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsAdapter.java similarity index 99% rename from app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java rename to app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsAdapter.java index 9363b85e..8df74301 100644 --- a/app/src/main/java/com/readrops/app/adapters/FeedsAdapter.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsAdapter.java @@ -1,4 +1,4 @@ -package com.readrops.app.adapters; +package com.readrops.app.feedsfolders.feeds; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsFragment.java similarity index 97% rename from app/src/main/java/com/readrops/app/fragments/FeedsFragment.java rename to app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsFragment.java index ff9a31e2..50ac70a5 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/feeds/FeedsFragment.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/feedsfolders/folders/FolderOptionsDialogFragment.kt similarity index 97% rename from app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt rename to app/src/main/java/com/readrops/app/feedsfolders/folders/FolderOptionsDialogFragment.kt index ce04a350..853e6ce5 100644 --- a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/feedsfolders/folders/FolderOptionsDialogFragment.kt @@ -1,4 +1,4 @@ -package com.readrops.app.fragments +package com.readrops.app.feedsfolders.folders import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java b/app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersAdapter.java similarity index 98% rename from app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java rename to app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersAdapter.java index f4a0f266..85266e92 100644 --- a/app/src/main/java/com/readrops/app/adapters/FoldersAdapter.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersAdapter.java @@ -1,4 +1,4 @@ -package com.readrops.app.adapters; +package com.readrops.app.feedsfolders.folders; import android.text.TextUtils; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersFragment.java similarity index 97% rename from app/src/main/java/com/readrops/app/fragments/FoldersFragment.java rename to app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersFragment.java index 444c0d0a..0fca4c42 100644 --- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java +++ b/app/src/main/java/com/readrops/app/feedsfolders/folders/FoldersFragment.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/activities/ItemActivity.java b/app/src/main/java/com/readrops/app/item/ItemActivity.java similarity index 99% rename from app/src/main/java/com/readrops/app/activities/ItemActivity.java rename to app/src/main/java/com/readrops/app/item/ItemActivity.java index 14a96800..2e7c8057 100644 --- a/app/src/main/java/com/readrops/app/activities/ItemActivity.java +++ b/app/src/main/java/com/readrops/app/item/ItemActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java b/app/src/main/java/com/readrops/app/item/ItemViewModel.java similarity index 97% rename from app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java rename to app/src/main/java/com/readrops/app/item/ItemViewModel.java index a3a94a25..102d66a8 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/ItemViewModel.java +++ b/app/src/main/java/com/readrops/app/item/ItemViewModel.java @@ -1,4 +1,4 @@ -package com.readrops.app.viewmodels; +package com.readrops.app.item; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt b/app/src/main/java/com/readrops/app/item/WebViewActivity.kt similarity index 98% rename from app/src/main/java/com/readrops/app/activities/WebViewActivity.kt rename to app/src/main/java/com/readrops/app/item/WebViewActivity.kt index 2a41a876..a64a2464 100644 --- a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt +++ b/app/src/main/java/com/readrops/app/item/WebViewActivity.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/utils/DrawerManager.java b/app/src/main/java/com/readrops/app/itemslist/DrawerManager.java similarity index 99% rename from app/src/main/java/com/readrops/app/utils/DrawerManager.java rename to app/src/main/java/com/readrops/app/itemslist/DrawerManager.java index a1354f62..57a70ebf 100644 --- a/app/src/main/java/com/readrops/app/utils/DrawerManager.java +++ b/app/src/main/java/com/readrops/app/itemslist/DrawerManager.java @@ -1,4 +1,4 @@ -package com.readrops.app.utils; +package com.readrops.app.itemslist; import android.app.Activity; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/readrops/app/activities/MainActivity.java b/app/src/main/java/com/readrops/app/itemslist/MainActivity.java similarity index 98% rename from app/src/main/java/com/readrops/app/activities/MainActivity.java rename to app/src/main/java/com/readrops/app/itemslist/MainActivity.java index e8dac12f..5c68db04 100644 --- a/app/src/main/java/com/readrops/app/activities/MainActivity.java +++ b/app/src/main/java/com/readrops/app/itemslist/MainActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java b/app/src/main/java/com/readrops/app/itemslist/MainItemListAdapter.java similarity index 99% rename from app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java rename to app/src/main/java/com/readrops/app/itemslist/MainItemListAdapter.java index 30520174..9fac99cf 100644 --- a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java +++ b/app/src/main/java/com/readrops/app/itemslist/MainItemListAdapter.java @@ -1,4 +1,4 @@ -package com.readrops.app.adapters; +package com.readrops.app.itemslist; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java b/app/src/main/java/com/readrops/app/itemslist/MainViewModel.java similarity index 99% rename from app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java rename to app/src/main/java/com/readrops/app/itemslist/MainViewModel.java index d2071308..9ca634a3 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java +++ b/app/src/main/java/com/readrops/app/itemslist/MainViewModel.java @@ -1,4 +1,4 @@ -package com.readrops.app.viewmodels; +package com.readrops.app.itemslist; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; diff --git a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionActivity.kt similarity index 97% rename from app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt rename to app/src/main/java/com/readrops/app/notifications/NotificationPermissionActivity.kt index a0b2ff07..e6c720e5 100644 --- a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt +++ b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionActivity.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionListAdapter.kt similarity index 97% rename from app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt rename to app/src/main/java/com/readrops/app/notifications/NotificationPermissionListAdapter.kt index 146ba029..dade0c3a 100644 --- a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt +++ b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionListAdapter.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionViewModel.kt similarity index 96% rename from app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt rename to app/src/main/java/com/readrops/app/notifications/NotificationPermissionViewModel.kt index 1e2fd243..d555f8a0 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt +++ b/app/src/main/java/com/readrops/app/notifications/NotificationPermissionViewModel.kt @@ -1,4 +1,4 @@ -package com.readrops.app.viewmodels +package com.readrops.app.notifications import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultAnalyser.kt similarity index 97% rename from app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt rename to app/src/main/java/com/readrops/app/notifications/sync/SyncResultAnalyser.kt index a95c37dd..9b90df50 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt +++ b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultAnalyser.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultDebugData.kt similarity index 98% rename from app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt rename to app/src/main/java/com/readrops/app/notifications/sync/SyncResultDebugData.kt index e80de538..9931db0b 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt +++ b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultDebugData.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultNotifContent.kt similarity index 85% rename from app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt rename to app/src/main/java/com/readrops/app/notifications/sync/SyncResultNotifContent.kt index 3552e1c6..0e1891cf 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncResultNotifContent.kt +++ b/app/src/main/java/com/readrops/app/notifications/sync/SyncResultNotifContent.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt b/app/src/main/java/com/readrops/app/notifications/sync/SyncWorker.kt similarity index 97% rename from app/src/main/java/com/readrops/app/utils/SyncWorker.kt rename to app/src/main/java/com/readrops/app/notifications/sync/SyncWorker.kt index e788690b..acd187f8 100644 --- a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt +++ b/app/src/main/java/com/readrops/app/notifications/sync/SyncWorker.kt @@ -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 diff --git a/app/src/main/java/com/readrops/app/repositories/ARepository.java b/app/src/main/java/com/readrops/app/repositories/ARepository.java index 47425232..b20261c1 100644 --- a/app/src/main/java/com/readrops/app/repositories/ARepository.java +++ b/app/src/main/java/com/readrops/app/repositories/ARepository.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java index 0ab8a89c..77fcd385 100644 --- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java index 874644fe..63ffddf6 100644 --- a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java index 18adc41a..8d850a91 100644 --- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java b/app/src/main/java/com/readrops/app/settings/AccountSettingsFragment.java similarity index 97% rename from app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java rename to app/src/main/java/com/readrops/app/settings/AccountSettingsFragment.java index b0f1cc95..767c5241 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java +++ b/app/src/main/java/com/readrops/app/settings/AccountSettingsFragment.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/activities/SettingsActivity.java b/app/src/main/java/com/readrops/app/settings/SettingsActivity.java similarity index 91% rename from app/src/main/java/com/readrops/app/activities/SettingsActivity.java rename to app/src/main/java/com/readrops/app/settings/SettingsActivity.java index 0a259894..06b0a639 100644 --- a/app/src/main/java/com/readrops/app/activities/SettingsActivity.java +++ b/app/src/main/java/com/readrops/app/settings/SettingsActivity.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java b/app/src/main/java/com/readrops/app/settings/SettingsFragment.java similarity index 98% rename from app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java rename to app/src/main/java/com/readrops/app/settings/SettingsFragment.java index 4a28bad7..c0a02dcd 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/SettingsFragment.java +++ b/app/src/main/java/com/readrops/app/settings/SettingsFragment.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/utils/HtmlParser.java b/app/src/main/java/com/readrops/app/utils/HtmlParser.java index 180ff2bd..9964aa9c 100644 --- a/app/src/main/java/com/readrops/app/utils/HtmlParser.java +++ b/app/src/main/java/com/readrops/app/utils/HtmlParser.java @@ -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; diff --git a/app/src/main/java/com/readrops/app/utils/EmptyListView.kt b/app/src/main/java/com/readrops/app/utils/customviews/EmptyListView.kt similarity index 94% rename from app/src/main/java/com/readrops/app/utils/EmptyListView.kt rename to app/src/main/java/com/readrops/app/utils/customviews/EmptyListView.kt index dadd5c20..c353c825 100644 --- a/app/src/main/java/com/readrops/app/utils/EmptyListView.kt +++ b/app/src/main/java/com/readrops/app/utils/customviews/EmptyListView.kt @@ -1,4 +1,4 @@ -package com.readrops.app.utils +package com.readrops.app.utils.customviews import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/readrops/app/utils/ReadropsItemTouchCallback.kt b/app/src/main/java/com/readrops/app/utils/customviews/ReadropsItemTouchCallback.kt similarity index 99% rename from app/src/main/java/com/readrops/app/utils/ReadropsItemTouchCallback.kt rename to app/src/main/java/com/readrops/app/utils/customviews/ReadropsItemTouchCallback.kt index 07357416..8c61fb14 100644 --- a/app/src/main/java/com/readrops/app/utils/ReadropsItemTouchCallback.kt +++ b/app/src/main/java/com/readrops/app/utils/customviews/ReadropsItemTouchCallback.kt @@ -1,4 +1,4 @@ -package com.readrops.app.utils +package com.readrops.app.utils.customviews import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java b/app/src/main/java/com/readrops/app/utils/customviews/ReadropsWebView.java similarity index 97% rename from app/src/main/java/com/readrops/app/utils/ReadropsWebView.java rename to app/src/main/java/com/readrops/app/utils/customviews/ReadropsWebView.java index 554503d8..60d35341 100644 --- a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java +++ b/app/src/main/java/com/readrops/app/utils/customviews/ReadropsWebView.java @@ -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; diff --git a/app/src/main/res/layout/activity_account_type_list.xml b/app/src/main/res/layout/activity_account_type_list.xml index 32d7fb03..8ce3e3a1 100644 --- a/app/src/main/res/layout/activity_account_type_list.xml +++ b/app/src/main/res/layout/activity_account_type_list.xml @@ -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"> + tools:context=".account.AddAccountActivity"> + tools:context=".addfeed.AddFeedActivity"> + tools:context=".item.ItemActivity"> - + tools:context=".itemslist.MainActivity"> - diff --git a/app/src/main/res/layout/activity_notification_permission.xml b/app/src/main/res/layout/activity_notification_permission.xml index b8a52082..fa78aa28 100644 --- a/app/src/main/res/layout/activity_notification_permission.xml +++ b/app/src/main/res/layout/activity_notification_permission.xml @@ -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"> + tools:context=".settings.SettingsActivity"> + tools:context=".SplashActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml index 0c79eee6..2854e005 100644 --- a/app/src/main/res/layout/activity_web_view.xml +++ b/app/src/main/res/layout/activity_web_view.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/fragment_feeds.xml b/app/src/main/res/layout/fragment_feeds.xml index 487b0244..3358c261 100644 --- a/app/src/main/res/layout/fragment_feeds.xml +++ b/app/src/main/res/layout/fragment_feeds.xml @@ -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"> - + tools:context=".feedsfolders.folders.FoldersFragment"> -