From 8ed9d71e14ace861454df255ca1fb4a400006a8d Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sun, 15 Apr 2018 20:29:58 +0200 Subject: [PATCH] put local foo into local foo folder --- app/src/main/AndroidManifest.xml | 4 ++-- .../org/schabi/newpipe/fragments/MainFragment.java | 4 ++-- .../fragments/list/channel/ChannelFragment.java | 4 +--- .../list => local}/feed/FeedFragment.java | 4 ++-- .../subscription/ImportConfirmationDialog.java | 2 +- .../subscription/ImportExportEventListener.java | 2 +- .../subscription/ImportExportJsonHelper.java | 2 +- .../subscription/SubscriptionFragment.java | 14 ++++++-------- .../subscription/SubscriptionService.java | 2 +- .../subscription/SubscriptionsImportFragment.java | 12 ++++++------ .../services/BaseImportExportService.java | 6 +++--- .../services/SubscriptionsExportService.java | 6 +++--- .../services/SubscriptionsImportService.java | 6 +++--- .../newpipe/settings/SelectChannelFragment.java | 2 +- .../org/schabi/newpipe/util/NavigationHelper.java | 4 ++-- .../services/ImportExportJsonHelperTest.java | 4 ++-- 16 files changed, 37 insertions(+), 41 deletions(-) rename app/src/main/java/org/schabi/newpipe/{fragments/list => local}/feed/FeedFragment.java (99%) rename app/src/main/java/org/schabi/newpipe/{fragments => local}/subscription/ImportConfirmationDialog.java (97%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/ImportExportEventListener.java (89%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/ImportExportJsonHelper.java (99%) rename app/src/main/java/org/schabi/newpipe/{fragments => local}/subscription/SubscriptionFragment.java (96%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/SubscriptionService.java (99%) rename app/src/main/java/org/schabi/newpipe/{fragments => local}/subscription/SubscriptionsImportFragment.java (93%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/services/BaseImportExportService.java (97%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/services/SubscriptionsExportService.java (96%) rename app/src/main/java/org/schabi/newpipe/{ => local}/subscription/services/SubscriptionsImportService.java (97%) rename app/src/test/java/org/schabi/newpipe/{ => local}/subscription/services/ImportExportJsonHelperTest.java (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e55270be..33e0651e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -80,8 +80,8 @@ android:name=".history.HistoryActivity" android:label="@string/title_activity_history"/> - - + + . */ -package org.schabi.newpipe.subscription; +package org.schabi.newpipe.local.subscription; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java similarity index 96% rename from app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java index 610c74a01..5f6ea42ee 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.fragments.subscription; +package org.schabi.newpipe.local.subscription; import android.app.Activity; import android.content.BroadcastReceiver; @@ -39,9 +39,8 @@ import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; import org.schabi.newpipe.fragments.BaseStateFragment; import org.schabi.newpipe.info_list.InfoListAdapter; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.subscription.SubscriptionService; -import org.schabi.newpipe.subscription.services.SubscriptionsExportService; -import org.schabi.newpipe.subscription.services.SubscriptionsImportService; +import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService; +import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService; import org.schabi.newpipe.util.FilePickerActivityHelper; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; @@ -53,7 +52,6 @@ import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Locale; @@ -65,9 +63,9 @@ import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_MODE; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_VALUE; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE; import static org.schabi.newpipe.util.AnimationUtils.animateRotation; import static org.schabi.newpipe.util.AnimationUtils.animateView; diff --git a/app/src/main/java/org/schabi/newpipe/subscription/SubscriptionService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java similarity index 99% rename from app/src/main/java/org/schabi/newpipe/subscription/SubscriptionService.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java index 3220643b3..fc4230711 100644 --- a/app/src/main/java/org/schabi/newpipe/subscription/SubscriptionService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.subscription; +package org.schabi.newpipe.local.subscription; import android.content.Context; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionsImportFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java similarity index 93% rename from app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionsImportFragment.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java index 775777c81..ed694c70e 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionsImportFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java @@ -1,4 +1,4 @@ -package org.schabi.newpipe.fragments.subscription; +package org.schabi.newpipe.local.subscription; import android.app.Activity; import android.content.Intent; @@ -26,7 +26,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.subscription.services.SubscriptionsImportService; +import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService; import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.FilePickerActivityHelper; import org.schabi.newpipe.util.ServiceHelper; @@ -37,10 +37,10 @@ import java.util.List; import icepick.State; import static org.schabi.newpipe.extractor.subscription.SubscriptionExtractor.ContentSource.CHANNEL_URL; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.CHANNEL_URL_MODE; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.INPUT_STREAM_MODE; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_MODE; -import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_VALUE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.CHANNEL_URL_MODE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.INPUT_STREAM_MODE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE; +import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE; public class SubscriptionsImportFragment extends BaseFragment { private static final int REQUEST_IMPORT_FILE_CODE = 666; diff --git a/app/src/main/java/org/schabi/newpipe/subscription/services/BaseImportExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java similarity index 97% rename from app/src/main/java/org/schabi/newpipe/subscription/services/BaseImportExportService.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java index a26b7a6d1..9d055b82a 100644 --- a/app/src/main/java/org/schabi/newpipe/subscription/services/BaseImportExportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.schabi.newpipe.subscription.services; +package org.schabi.newpipe.local.subscription.services; import android.app.Service; import android.content.Intent; @@ -36,8 +36,8 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.subscription.ImportExportEventListener; -import org.schabi.newpipe.subscription.SubscriptionService; +import org.schabi.newpipe.local.subscription.ImportExportEventListener; +import org.schabi.newpipe.local.subscription.SubscriptionService; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java similarity index 96% rename from app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsExportService.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java index 069195c65..35da7dd4f 100644 --- a/app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsExportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.schabi.newpipe.subscription.services; +package org.schabi.newpipe.local.subscription.services; import android.content.Intent; import android.support.v4.content.LocalBroadcastManager; @@ -29,7 +29,7 @@ import org.reactivestreams.Subscription; import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.SubscriptionEntity; import org.schabi.newpipe.extractor.subscription.SubscriptionItem; -import org.schabi.newpipe.subscription.ImportExportJsonHelper; +import org.schabi.newpipe.local.subscription.ImportExportJsonHelper; import java.io.File; import java.io.FileNotFoundException; @@ -49,7 +49,7 @@ public class SubscriptionsExportService extends BaseImportExportService { /** * A {@link LocalBroadcastManager local broadcast} will be made with this action when the export is successfully completed. */ - public static final String EXPORT_COMPLETE_ACTION = "org.schabi.newpipe.subscription.services.SubscriptionsExportService.EXPORT_COMPLETE"; + public static final String EXPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription.services.SubscriptionsExportService.EXPORT_COMPLETE"; private Subscription subscription; private File outFile; diff --git a/app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java similarity index 97% rename from app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsImportService.java rename to app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java index 259b1c2bd..3fdc91358 100644 --- a/app/src/main/java/org/schabi/newpipe/subscription/services/SubscriptionsImportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.schabi.newpipe.subscription.services; +package org.schabi.newpipe.local.subscription.services; import android.content.Intent; import android.support.annotation.NonNull; @@ -33,7 +33,7 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.channel.ChannelInfo; import org.schabi.newpipe.extractor.subscription.SubscriptionItem; -import org.schabi.newpipe.subscription.ImportExportJsonHelper; +import org.schabi.newpipe.local.subscription.ImportExportJsonHelper; import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.ExtractorHelper; @@ -64,7 +64,7 @@ public class SubscriptionsImportService extends BaseImportExportService { /** * A {@link LocalBroadcastManager local broadcast} will be made with this action when the import is successfully completed. */ - public static final String IMPORT_COMPLETE_ACTION = "org.schabi.newpipe.subscription.services.SubscriptionsImportService.IMPORT_COMPLETE"; + public static final String IMPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.IMPORT_COMPLETE"; private Subscription subscription; private int currentMode; diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java index c0eadfaa8..107f8b7f0 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java @@ -20,7 +20,7 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.SubscriptionEntity; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.subscription.SubscriptionService; +import org.schabi.newpipe.local.subscription.SubscriptionService; import java.util.List; import java.util.Vector; diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index c3404bdbd..2e1f59d25 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -33,14 +33,14 @@ import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.fragments.MainFragment; import org.schabi.newpipe.fragments.detail.VideoDetailFragment; import org.schabi.newpipe.fragments.list.channel.ChannelFragment; -import org.schabi.newpipe.fragments.list.feed.FeedFragment; +import org.schabi.newpipe.local.feed.FeedFragment; import org.schabi.newpipe.fragments.list.kiosk.KioskFragment; import org.schabi.newpipe.fragments.list.playlist.PlaylistFragment; import org.schabi.newpipe.fragments.list.search.SearchFragment; import org.schabi.newpipe.fragments.local.history.LastPlayedFragment; import org.schabi.newpipe.local.playlist.LocalPlaylistFragment; import org.schabi.newpipe.fragments.local.history.MostPlayedFragment; -import org.schabi.newpipe.fragments.subscription.SubscriptionsImportFragment; +import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment; import org.schabi.newpipe.player.BackgroundPlayer; import org.schabi.newpipe.player.BackgroundPlayerActivity; import org.schabi.newpipe.player.BasePlayer; diff --git a/app/src/test/java/org/schabi/newpipe/subscription/services/ImportExportJsonHelperTest.java b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java similarity index 97% rename from app/src/test/java/org/schabi/newpipe/subscription/services/ImportExportJsonHelperTest.java rename to app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java index a5e6b659f..4a8b3d8c8 100644 --- a/app/src/test/java/org/schabi/newpipe/subscription/services/ImportExportJsonHelperTest.java +++ b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java @@ -1,9 +1,9 @@ -package org.schabi.newpipe.subscription.services; +package org.schabi.newpipe.local.subscription.services; import org.junit.Test; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; import org.schabi.newpipe.extractor.subscription.SubscriptionItem; -import org.schabi.newpipe.subscription.ImportExportJsonHelper; +import org.schabi.newpipe.local.subscription.ImportExportJsonHelper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;