Skip to content

Commit 277f21d

Browse files
committed
Move Classes related to InfoItemDIalog into own package
1 parent a7d5d9a commit 277f21d

8 files changed

Lines changed: 19 additions & 17 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
3030
import org.schabi.newpipe.fragments.BaseStateFragment;
3131
import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
32-
import org.schabi.newpipe.info_list.InfoListAdapter;
3332
import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
33+
import org.schabi.newpipe.info_list.InfoListAdapter;
3434
import org.schabi.newpipe.util.NavigationHelper;
3535
import org.schabi.newpipe.util.OnClickGesture;
3636
import org.schabi.newpipe.util.StateSaver;

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
3636
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
3737
import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
38-
import org.schabi.newpipe.info_list.InfoItemDialog;
38+
import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
3939
import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
4040
import org.schabi.newpipe.player.MainPlayer.PlayerType;
4141
import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -44,7 +44,7 @@
4444
import org.schabi.newpipe.util.Localization;
4545
import org.schabi.newpipe.util.NavigationHelper;
4646
import org.schabi.newpipe.util.PicassoHelper;
47-
import org.schabi.newpipe.util.StreamDialogDefaultEntry;
47+
import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
4848
import org.schabi.newpipe.util.external_communication.ShareUtils;
4949

5050
import java.util.ArrayList;

app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java renamed to app/src/main/java/org/schabi/newpipe/info_list/dialog/InfoItemDialog.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.info_list;
1+
package org.schabi.newpipe.info_list.dialog;
22

33
import static org.schabi.newpipe.MainActivity.DEBUG;
44

@@ -24,8 +24,6 @@
2424
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
2525
import org.schabi.newpipe.extractor.stream.StreamType;
2626
import org.schabi.newpipe.player.helper.PlayerHolder;
27-
import org.schabi.newpipe.util.StreamDialogDefaultEntry;
28-
import org.schabi.newpipe.util.StreamDialogEntry;
2927
import org.schabi.newpipe.util.external_communication.KoreUtils;
3028

3129
import java.util.ArrayList;

app/src/main/java/org/schabi/newpipe/util/StreamDialogDefaultEntry.java renamed to app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.schabi.newpipe.util;
1+
package org.schabi.newpipe.info_list.dialog;
22

3-
import static org.schabi.newpipe.util.StreamDialogEntry.fetchItemInfoIfSparse;
4-
import static org.schabi.newpipe.util.StreamDialogEntry.openChannelFragment;
3+
import static org.schabi.newpipe.info_list.dialog.StreamDialogEntry.fetchItemInfoIfSparse;
4+
import static org.schabi.newpipe.info_list.dialog.StreamDialogEntry.openChannelFragment;
55

66
import android.net.Uri;
77

@@ -13,6 +13,8 @@
1313
import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
1414
import org.schabi.newpipe.local.dialog.PlaylistDialog;
1515
import org.schabi.newpipe.local.history.HistoryRecordManager;
16+
import org.schabi.newpipe.util.NavigationHelper;
17+
import org.schabi.newpipe.util.SaveUploaderUrlHelper;
1618
import org.schabi.newpipe.util.external_communication.KoreUtils;
1719
import org.schabi.newpipe.util.external_communication.ShareUtils;
1820

@@ -23,15 +25,15 @@
2325
/**
2426
* <p>
2527
* This enum provides entries that are accepted
26-
* by the {@link org.schabi.newpipe.info_list.InfoItemDialog.Builder}.
28+
* by the {@link InfoItemDialog.Builder}.
2729
* </p>
2830
* <p>
2931
* These entries contain a String {@link #resource} which is displayed in the dialog and
3032
* a default {@link #action} that is executed
3133
* when the entry is selected (via <code>onClick()</code>).
3234
* <br/>
3335
* They action can be overridden by using the Builder's
34-
* {@link org.schabi.newpipe.info_list.InfoItemDialog.Builder#setAction(
36+
* {@link InfoItemDialog.Builder#setAction(
3537
* StreamDialogDefaultEntry, StreamDialogEntry.StreamDialogEntryAction)}
3638
* method.
3739
* </p>

app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java renamed to app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.util;
1+
package org.schabi.newpipe.info_list.dialog;
22

33
import android.content.Context;
44

@@ -13,6 +13,8 @@
1313
import org.schabi.newpipe.extractor.stream.StreamType;
1414
import org.schabi.newpipe.local.history.HistoryRecordManager;
1515
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
16+
import org.schabi.newpipe.util.ExtractorHelper;
17+
import org.schabi.newpipe.util.NavigationHelper;
1618

1719
import java.util.function.Consumer;
1820

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
7070
import org.schabi.newpipe.extractor.stream.StreamInfoItem
7171
import org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty
7272
import org.schabi.newpipe.fragments.BaseStateFragment
73-
import org.schabi.newpipe.info_list.InfoItemDialog
73+
import org.schabi.newpipe.info_list.dialog.InfoItemDialog
7474
import org.schabi.newpipe.ktx.animate
7575
import org.schabi.newpipe.ktx.animateHideRecyclerViewAllowingScrolling
7676
import org.schabi.newpipe.ktx.slideUp

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import org.schabi.newpipe.error.ErrorInfo;
2929
import org.schabi.newpipe.error.UserAction;
3030
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
31-
import org.schabi.newpipe.info_list.InfoItemDialog;
31+
import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
3232
import org.schabi.newpipe.local.BaseLocalListFragment;
3333
import org.schabi.newpipe.player.playqueue.PlayQueue;
3434
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
3535
import org.schabi.newpipe.settings.HistorySettingsFragment;
3636
import org.schabi.newpipe.util.NavigationHelper;
3737
import org.schabi.newpipe.util.OnClickGesture;
38-
import org.schabi.newpipe.util.StreamDialogDefaultEntry;
38+
import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
3939

4040
import java.util.ArrayList;
4141
import java.util.Collections;

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.schabi.newpipe.error.ErrorInfo;
4141
import org.schabi.newpipe.error.UserAction;
4242
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
43-
import org.schabi.newpipe.info_list.InfoItemDialog;
43+
import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
4444
import org.schabi.newpipe.local.BaseLocalListFragment;
4545
import org.schabi.newpipe.local.history.HistoryRecordManager;
4646
import org.schabi.newpipe.player.MainPlayer.PlayerType;
@@ -49,7 +49,7 @@
4949
import org.schabi.newpipe.util.Localization;
5050
import org.schabi.newpipe.util.NavigationHelper;
5151
import org.schabi.newpipe.util.OnClickGesture;
52-
import org.schabi.newpipe.util.StreamDialogDefaultEntry;
52+
import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
5353

5454
import java.util.ArrayList;
5555
import java.util.Collections;

0 commit comments

Comments
 (0)