Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.schabi.newpipe;

import android.app.DownloadManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceManager;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBar;
Expand All @@ -19,8 +17,6 @@
import android.view.MenuItem;
import android.widget.ArrayAdapter;

import java.io.File;

/**
* Created by Christian Schabesberger on 18.08.15.
*
Expand Down Expand Up @@ -48,7 +44,7 @@ public class ActionBarHandler {
private static ActionBarHandler handler = null;

private Context context = null;
private String webisteUrl = "";
private String websiteUrl = "";
private AppCompatActivity activity;
private VideoInfo.VideoStream[] videoStreams = null;
private VideoInfo.AudioStream audioStream = null;
Expand All @@ -64,7 +60,7 @@ public static ActionBarHandler getHandler() {
return handler;
}

class ForamatItemSelectListener implements ActionBar.OnNavigationListener {
class FormatItemSelectListener implements ActionBar.OnNavigationListener {
@Override
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
selectFormatItem((int)itemId);
Expand Down Expand Up @@ -98,7 +94,7 @@ public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStre
if(activity != null) {
ActionBar ab = activity.getSupportActionBar();
ab.setListNavigationCallbacks(itemAdapter
,new ForamatItemSelectListener());
,new FormatItemSelectListener());
ab.setSelectedNavigationItem(defaultResolutionPos);
}

Expand All @@ -114,9 +110,9 @@ public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStre
}
} else if(preferedFormat.equals("m4a")){
for(VideoInfo.AudioStream s : audioStreams) {
Log.d(TAG, VideoInfo.getMimeById(s.format) + " : " + Integer.toString(s.bandWidth));
Log.d(TAG, VideoInfo.getMimeById(s.format) + " : " + Integer.toString(s.bandwidth));
if(s.format == VideoInfo.I_M4A &&
(audioStream == null || audioStream.bandWidth > s.bandWidth)) {
(audioStream == null || audioStream.bandwidth > s.bandwidth)) {
audioStream = s;
Log.d(TAG, "last choosen");
}
Expand Down Expand Up @@ -162,7 +158,7 @@ public boolean onItemSelected(MenuItem item, Context context) {
if(!videoTitle.isEmpty()) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_TEXT, webisteUrl);
intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
intent.setType("text/plain");
context.startActivity(Intent.createChooser(intent, context.getString(R.string.shareDialogTitle)));
}
Expand Down Expand Up @@ -192,7 +188,7 @@ public boolean onItemSelected(MenuItem item, Context context) {
}

public void setVideoInfo(String websiteUrl, String videoTitle) {
this.webisteUrl = websiteUrl;
this.websiteUrl = websiteUrl;
this.videoTitle = videoTitle;
}

Expand Down Expand Up @@ -239,7 +235,7 @@ public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(context, PlayVideoActivity.class);
intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
intent.putExtra(PlayVideoActivity.VIDEO_URL, webisteUrl);
intent.putExtra(PlayVideoActivity.VIDEO_URL, websiteUrl);
context.startActivity(intent);
}
}
Expand Down Expand Up @@ -267,7 +263,7 @@ public void openInBrowser() {
if(!videoTitle.isEmpty()) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse(webisteUrl));
intent.setData(Uri.parse(websiteUrl));

context.startActivity(Intent.createChooser(intent, context.getString(R.string.chooseBrowser)));
}
Expand All @@ -278,7 +274,7 @@ public void playWithKodi() {
try {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setPackage(KORE_PACKET);
intent.setData(Uri.parse(webisteUrl.replace("https", "http")));
intent.setData(Uri.parse(websiteUrl.replace("https", "http")));
context.startActivity(intent);
} catch (Exception e) {
e.printStackTrace();
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/schabi/newpipe/Extractor.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.schabi.newpipe;

import android.graphics.Bitmap;

/**
* Created by Christian Schabesberger on 10.08.15.
*
Expand Down
17 changes: 6 additions & 11 deletions app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Build;
Expand All @@ -19,15 +18,11 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.Surface;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.MediaController;
import android.widget.ProgressBar;
import android.widget.SeekBar;
import android.widget.VideoView;

/**
Expand Down Expand Up @@ -84,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_play_video);

isLandscape = checkIfLandscape();
hasSoftKeys = checkIfhasSoftKeys();
hasSoftKeys = checkIfHasSoftKeys();

actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
Expand Down Expand Up @@ -203,10 +198,10 @@ public void onConfigurationChanged(Configuration config) {

if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
isLandscape = true;
adjustMediaControllMetrics();
adjustMediaControlMetrics();
} else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
isLandscape = false;
adjustMediaControllMetrics();
adjustMediaControlMetrics();
}
}

Expand All @@ -229,7 +224,7 @@ private void showUi() {
uiIsHidden = false;
mediaController.show(100000);
actionBar.show();
adjustMediaControllMetrics();
adjustMediaControlMetrics();
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
Expand Down Expand Up @@ -259,7 +254,7 @@ private void hideUi() {
WindowManager.LayoutParams.FLAG_FULLSCREEN);
}

private void adjustMediaControllMetrics() {
private void adjustMediaControlMetrics() {
MediaController.LayoutParams mediaControllerLayout
= new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
MediaController.LayoutParams.WRAP_CONTENT);
Expand All @@ -274,7 +269,7 @@ private void adjustMediaControllMetrics() {
mediaController.setLayoutParams(mediaControllerLayout);
}

private boolean checkIfhasSoftKeys(){
private boolean checkIfHasSoftKeys(){
if(Build.VERSION.SDK_INT >= 17) {
return getNavigationBarHeight() != 0 || getNavigationBarWidth() != 0;
} else {
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/schabi/newpipe/SearchEngine.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.schabi.newpipe;

import android.graphics.Bitmap;

import java.util.Vector;

/**
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/schabi/newpipe/VideoInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ public VideoStream(String url, int format, String res) {
}

public static class AudioStream {
public AudioStream(String url, int format, int bandWidth, int samplingRate) {
public AudioStream(String url, int format, int bandwidth, int samplingRate) {
this.url = url; this.format = format;
this.bandWidth = bandWidth; this.samplingRate = samplingRate;
this.bandwidth = bandwidth; this.samplingRate = samplingRate;
}
public String url = "";
public int format = -1;
public int bandWidth = -1;
public int bandwidth = -1;
public int samplingRate = -1;

}
Expand Down
13 changes: 2 additions & 11 deletions app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
package org.schabi.newpipe;

import android.content.ContentProviderOperation;
import android.content.res.Configuration;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.NavUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.WindowManager;

import org.schabi.newpipe.youtube.YoutubeExtractor;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,23 @@
import android.app.Activity;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.media.Image;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.GridLayout;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;


import java.net.URL;
import java.util.Vector;

Expand Down Expand Up @@ -216,7 +211,7 @@ public void updateInfo(VideoInfo info) {
thumbnailView.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.not_available_monkey));
break;
default:
Log.e(TAG, "Video Availeble Status not known.");
Log.e(TAG, "Video Available Status not known.");
}

if(autoPlayEnabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,14 @@

import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.util.DisplayMetrics;
import android.util.Log;
import android.support.v7.widget.SearchView;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.support.v7.widget.SearchView;
import android.widget.ImageView;

/**
Expand Down
11 changes: 5 additions & 6 deletions app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.widget.Toast;

import java.net.URL;
import java.util.List;
import java.util.Vector;


Expand Down Expand Up @@ -54,14 +53,14 @@ public class VideoItemListFragment extends ListFragment {

private class ResultRunnable implements Runnable {
private SearchEngine.Result result;
private int reuqestId;
private int requestId;
public ResultRunnable(SearchEngine.Result result, int requestId) {
this.result = result;
this.reuqestId = requestId;
this.requestId = requestId;
}
@Override
public void run() {
updateListOnResult(result, reuqestId);
updateListOnResult(result, requestId);
}
}

Expand Down Expand Up @@ -213,7 +212,7 @@ private void updateList(Vector<VideoInfoItem> list) {
loadThumbsThread = new Thread(loadThumbsRunnable);
loadThumbsThread.start();
} catch(java.lang.IllegalStateException e) {
Log.w(TAG, "Trying to set value while activity is not existing anymore.");
Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
} catch(Exception e) {
e.printStackTrace();
}
Expand All @@ -230,7 +229,7 @@ public void terminateThreads() {
}
if(searchThread != null) {
searchRunnable.terminate();
// No need to join, since we don't realy terminate the thread. We just demand
// No need to join, since we don't really terminate the thread. We just demand
// it to post its result runnable into the gui main loop.
}
}
Expand Down
Loading