Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for tabs #3201

Closed
wants to merge 22 commits into from
Closed

Add support for tabs #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5539606
Add initial support for tabs
wb9688 Mar 8, 2020
31650ed
Show subscriber count
wb9688 Mar 9, 2020
b6d4454
Show subscribe button
wb9688 Mar 13, 2020
6473bfc
Show 'No items' instead of 'No videos'
wb9688 Mar 14, 2020
9e0dc0f
Show tabs at the top instead of bottom
wb9688 Mar 14, 2020
76e5f8c
Display tab names
wb9688 Mar 14, 2020
a3c03ab
Fix crash when trying to open item from a channel in the homepage
wb9688 Mar 14, 2020
845a75a
Don't call cancelDisplayTask for the images
wb9688 Mar 14, 2020
d76fee8
Localize channel tab names
wb9688 Mar 14, 2020
bcc15cb
Change background color of tabs
wb9688 Mar 14, 2020
2f21614
Avoid duplicated translations
wb9688 Mar 15, 2020
7a14025
Clean up the code
wb9688 Mar 15, 2020
3a5fb0c
Use the proper error handling for channels
wb9688 Mar 15, 2020
5603026
Make tabs scrollable
wb9688 Mar 15, 2020
f1c2744
Fix location of loading animation and network error
Stypox Mar 15, 2020
b7faf75
Put REQUESTED_CHANNEL instead of REQUESTED_STREAM in the errors
wb9688 Mar 15, 2020
344b4e7
Add playlist control buttons for certain tabs
wb9688 Mar 15, 2020
c0a601a
Remove buggy custom stack implementation from ChannelDetailFragment
wb9688 Mar 15, 2020
2b7d697
Also show playlist controls for reposts, as it ignores playlists
wb9688 Mar 15, 2020
f63eb02
Fix updating feed
wb9688 Mar 15, 2020
93bc0e7
Lazy-load tabs
wb9688 Mar 19, 2020
9fed618
Fix updating feed
wb9688 Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ dependencies {
exclude module: 'support-annotations'
})

implementation 'com.github.TeamNewPipe:NewPipeExtractor:65a7eda'
implementation 'com.github.wb9688:NewPipeExtractor:a657d9763bcded5d40efc7f45ead234b63772398'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.23.0'

Expand Down Expand Up @@ -164,4 +164,4 @@ static String getGitWorkingBranch() {
// git was not found
return ""
}
}
}
4 changes: 3 additions & 1 deletion app/src/main/java/org/schabi/newpipe/BaseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ public void setTitle(String title) {
protected FragmentManager getFM() {
return getParentFragment() == null
? getFragmentManager()
: getParentFragment().getFragmentManager();
: (getParentFragment().getParentFragment() == null
? getParentFragment().getFragmentManager()
: getParentFragment().getParentFragment().getFragmentManager());
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ private void handleIntent(Intent intent) {
NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
break;
case CHANNEL:
NavigationHelper.openChannelFragment(getSupportFragmentManager(),
NavigationHelper.openChannelDetailFragment(getSupportFragmentManager(),
serviceId,
url,
title);
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/java/org/schabi/newpipe/RouterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.preference.PreferenceManager;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
Expand All @@ -26,6 +20,12 @@
import android.widget.RadioGroup;
import android.widget.Toast;

import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NotificationCompat;
import androidx.fragment.app.FragmentManager;

import org.schabi.newpipe.download.DownloadDialog;
Expand All @@ -38,7 +38,6 @@
import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
Expand Down Expand Up @@ -71,6 +70,8 @@
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;

//import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;

/**
* Get the url from the intent and open it in the chosen preferred player
*/
Expand Down Expand Up @@ -591,7 +592,8 @@ public Consumer<Info> getResultHandler(Choice choice) {
}

if (info instanceof ChannelInfo || info instanceof PlaylistInfo) {
playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);
// playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);
playQueue = new PlaylistPlayQueue((PlaylistInfo) info);

if (playerChoice.equals(videoPlayerKey)) {
NavigationHelper.playOnMainPlayer(this, playQueue, true);
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.Nullable;
import androidx.annotation.StringRes;

import com.jakewharton.rxbinding2.view.RxView;

import org.schabi.newpipe.BaseFragment;
Expand Down Expand Up @@ -52,7 +53,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
@Override
public void onViewCreated(View rootView, Bundle savedInstanceState) {
super.onViewCreated(rootView, savedInstanceState);
doInitialLoadLogic();
}

@Override
Expand All @@ -61,6 +61,13 @@ public void onPause() {
wasLoading.set(isLoading.get());
}

@Override
public void onStart() {
super.onStart();

doInitialLoadLogic();
}


/*//////////////////////////////////////////////////////////////////////////
// Init
Expand Down
Loading