Merge branch 'develop' into Login

# Conflicts:
#	app/src/main/res/values/strings.xml

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1015
-        versionName "1.0.15"
+        versionCode 1016
+        versionName "1.0.16"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         dependencies {
             implementation fileTree(dir: 'libs', include: ['*.jar'])

app/src/main/java/net/schueller/peertube/activity/AppCompatPreferenceActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import android.content.res.Configuration;

app/src/main/java/net/schueller/peertube/activity/LoginActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import android.content.SharedPreferences;

app/src/main/java/net/schueller/peertube/activity/SelectServerActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import androidx.annotation.NonNull;

app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import android.annotation.TargetApi;

app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import android.Manifest;
@@ -62,7 +80,7 @@ public class VideoListActivity extends AppCompatActivity {
     private int currentStart = 0;
     private int count = 12;
     private String sort = "-createdAt";
-    private String filter = "";
+    private String filter = null;
     private String searchQuery = "";
 
     private TextView emptyView;
@@ -90,7 +108,7 @@ public class VideoListActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_video_list);
 
-        filter = "";
+        filter = null;
 
         createBottomBarNavigation();
 
@@ -242,9 +260,9 @@ public class VideoListActivity extends AppCompatActivity {
 
         Call<VideoList> call;
         if (!searchQuery.equals("")) {
-            call = service.searchVideosData(start, count, sort, nsfw, searchQuery);
+            call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter);
         } else {
-            call = service.getVideosData(start, count, sort, nsfw);
+            call = service.getVideosData(start, count, sort, nsfw, filter);
         }
 
         /*Log the URL called*/
@@ -345,6 +363,8 @@ public class VideoListActivity extends AppCompatActivity {
                 new IconicsDrawable(this, FontAwesome.Icon.faw_home));
         navMenu.findItem(R.id.navigation_trending).setIcon(
                 new IconicsDrawable(this, FontAwesome.Icon.faw_fire));
+        navMenu.findItem(R.id.navigation_local).setIcon(
+                new IconicsDrawable(this, FontAwesome.Icon.faw_home));
         navMenu.findItem(R.id.navigation_subscriptions).setIcon(
                 new IconicsDrawable(this, FontAwesome.Icon.faw_folder));
         navMenu.findItem(R.id.navigation_account).setIcon(
@@ -359,6 +379,7 @@ public class VideoListActivity extends AppCompatActivity {
                     if (!isLoading) {
                         sort = "-createdAt";
                         currentStart = 0;
+                        filter = null;
                         loadVideos(currentStart, count, sort, filter);
                     }
 
@@ -369,6 +390,18 @@ public class VideoListActivity extends AppCompatActivity {
                     if (!isLoading) {
                         sort = "-trending";
                         currentStart = 0;
+                        filter = null;
+                        loadVideos(currentStart, count, sort, filter);
+                    }
+
+                    return true;
+                case R.id.navigation_local:
+                    //Log.v(TAG, "navigation_trending");
+
+                    if (!isLoading) {
+                        sort = "-publishedAt";
+                        filter = "local";
+                        currentStart = 0;
                         loadVideos(currentStart, count, sort, filter);
                     }
 

app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.activity;
 
 import android.content.ComponentName;
@@ -5,6 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
@@ -16,6 +35,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.PopupMenu;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
@@ -35,9 +55,11 @@ import com.github.se_bastiaan.torrentstream.TorrentStream;
 import com.github.se_bastiaan.torrentstream.listeners.TorrentListener;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
+import com.mikepenz.iconics.Iconics;
 import com.squareup.picasso.Picasso;
 import net.schueller.peertube.R;
 import net.schueller.peertube.fragment.VideoOptionsFragment;
@@ -53,6 +75,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+import static net.schueller.peertube.helper.Constants.BACKGROUND_PLAY_PREF_KEY;
 import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
 import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
 
@@ -64,6 +87,8 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     private PlayerView simpleExoPlayerView;
     private Intent videoPlayerIntent;
     private Context context = this;
+    private TextView fullscreenButton;
+    private Boolean isFullscreen = false;
 
     boolean mBound = false;
     VideoPlayerService mService;
@@ -111,8 +136,27 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
         simpleExoPlayerView = new PlayerView(this);
         simpleExoPlayerView = findViewById(R.id.video_view);
 
-        videoPlayerIntent = new Intent(this, VideoPlayerService.class);
-        bindService(videoPlayerIntent, mConnection, Context.BIND_AUTO_CREATE);
+        simpleExoPlayerView.setControllerShowTimeoutMs(1000);
+        simpleExoPlayerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);
+
+        // Full screen Icon
+        fullscreenButton = findViewById(R.id.exo_fullscreen);
+        fullscreenButton.setText(R.string.video_expand_icon);
+        new Iconics.IconicsBuilder().ctx(this).on(fullscreenButton).build();
+
+        fullscreenButton.setOnClickListener(view -> {
+            Log.d(TAG, "Fullscreen");
+            if (!isFullscreen) {
+                isFullscreen = true;
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                fullscreenButton.setText(R.string.video_compress_icon);
+            } else {
+                isFullscreen = false;
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                fullscreenButton.setText(R.string.video_expand_icon);
+            }
+            new Iconics.IconicsBuilder().ctx(this).on(fullscreenButton).build();
+        });
 
     }
 
@@ -204,7 +248,7 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
         } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT){
             RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) simpleExoPlayerView.getLayoutParams();
             params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-            params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+            params.height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
             simpleExoPlayerView.setLayoutParams(params);
 
             nameView.setVisibility(View.VISIBLE);
@@ -381,6 +425,16 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     @Override
     protected void onStop() {
         super.onStop();
+
+//        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+//
+//        Log.v(TAG, "" + sharedPref.getBoolean(BACKGROUND_PLAY_PREF_KEY, false));
+//
+//        if (!sharedPref.getBoolean(BACKGROUND_PLAY_PREF_KEY, false)) {
+//            Log.v(TAG, "BACKGROUND_PLAY_PREF_KEY...");
+//            stopService(new Intent(this, VideoPlayerService.class));
+//        }
+
         if (mBound) {
             unbindService(mConnection);
             mBound = false;
@@ -391,6 +445,11 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     @Override
     protected void onStart() {
         super.onStart();
+
+        if (!mBound) {
+            videoPlayerIntent = new Intent(this, VideoPlayerService.class);
+            bindService(videoPlayerIntent, mConnection, Context.BIND_AUTO_CREATE);
+        }
         Log.v(TAG, "onStart()...");
     }
 

app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.adapter;
 
 import android.content.Context;

app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.fragment;
 
 import android.os.Bundle;

app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.helper;
 
 import android.content.Context;

app/src/main/java/net/schueller/peertube/helper/Constants.java

@@ -1,6 +1,24 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.helper;
 
 public class Constants {
     public static final String THEME_PREF_KEY = "pref_theme";
     public static final String DEFAULT_THEME = "AppTheme.ORANGE";
+    public static final String BACKGROUND_PLAY_PREF_KEY = "pref_background_play";
 }

app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.helper;
 
 import android.content.Context;

app/src/main/java/net/schueller/peertube/intents/Intents.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.intents;
 
 import android.content.Context;

app/src/main/java/net/schueller/peertube/model/Account.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.schueller.peertube.model;
 
 import java.util.Date;

app/src/main/java/net/schueller/peertube/model/Avatar.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import java.util.Date;

app/src/main/java/net/schueller/peertube/model/Category.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Category {

app/src/main/java/net/schueller/peertube/model/Channel.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import java.util.Date;

app/src/main/java/net/schueller/peertube/model/Config.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Config {

app/src/main/java/net/schueller/peertube/model/File.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class File {

app/src/main/java/net/schueller/peertube/model/Language.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Language {

app/src/main/java/net/schueller/peertube/model/Licence.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Licence {

app/src/main/java/net/schueller/peertube/model/OauthClient.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import com.google.gson.annotations.SerializedName;

app/src/main/java/net/schueller/peertube/model/Privacy.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Privacy {

app/src/main/java/net/schueller/peertube/model/Resolution.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Resolution {

app/src/main/java/net/schueller/peertube/model/Server.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 public class Server {

app/src/main/java/net/schueller/peertube/model/ServerList.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import com.google.gson.annotations.SerializedName;

app/src/main/java/net/schueller/peertube/model/Token.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import com.google.gson.annotations.SerializedName;

app/src/main/java/net/schueller/peertube/model/Video.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import android.content.Context;

app/src/main/java/net/schueller/peertube/model/VideoList.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.model;
 
 import com.google.gson.annotations.SerializedName;

app/src/main/java/net/schueller/peertube/network/AuthenticationService.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.network;
 
 import net.schueller.peertube.model.OauthClient;

app/src/main/java/net/schueller/peertube/network/GetConfigDataService.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.network;
 
 import net.schueller.peertube.model.Config;

app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.network;
 
 import net.schueller.peertube.model.ServerList;

app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.network;
 
 import net.schueller.peertube.model.Video;
@@ -14,8 +31,8 @@ public interface GetVideoDataService {
             @Query("start") int start,
             @Query("count") int count,
             @Query("sort") String sort,
-            @Query("nsfw") String nsfw
-            //@Query("filter") String filter
+            @Query("nsfw") String nsfw,
+            @Query("filter") String filter
     );
 
     @GET("videos/{id}")
@@ -29,7 +46,7 @@ public interface GetVideoDataService {
             @Query("count") int count,
             @Query("sort") String sort,
             @Query("nsfw") String nsfw,
-            @Query("search") String search
-//            @Query("filter") String filter
+            @Query("search") String search,
+            @Query("filter") String filter
     );
 }

app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.network;
 
 import okhttp3.OkHttpClient;

app/src/main/java/net/schueller/peertube/provider/SearchSuggestionsProvider.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.provider;
 
 import android.content.SearchRecentSuggestionsProvider;

app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.schueller.peertube.service;
 
 import android.app.Notification;

app/src/main/res/layout/activity_video_play.xml

@@ -18,11 +18,10 @@
             android:layout_width="match_parent"
             android:layout_height="250dp"
             android:background="@color/videoBackgroundColor"
+            app:resize_mode="fixed_width"
+            app:controller_layout_id="@layout/video_playback_controls"
 
-            app:layout_constraintDimensionRatio="H,3:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            />
 
         <ProgressBar
             android:id="@+id/progress"

app/src/main/res/layout/video_playback_controls.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="center"
-    android:layoutDirection="ltr"
     android:background="#CC000000"
+    android:layoutDirection="ltr"
     android:orientation="vertical"
     tools:targetApi="28">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,14 +22,14 @@
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <ImageButton android:src="@drawable/ic_action_more_vert"
+        <ImageButton
             android:id="@+id/exo_more"
-            android:tint="#ffffff"
-            android:background="@null"
-            android:paddingTop="0dp"
             android:layout_width="wrap_content"
             android:layout_height="48dp"
-            />
+            android:background="@null"
+            android:paddingTop="0dp"
+            android:src="@drawable/ic_action_more_vert"
+            android:tint="#ffffff" />
 
     </LinearLayout>
 
@@ -44,23 +43,28 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="4dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingTop="4dp">
 
-        <ImageButton android:id="@id/exo_rew"
-            style="@style/ExoMediaButton.Rewind"/>
+        <ImageButton
+            android:id="@id/exo_rew"
+            style="@style/ExoMediaButton.Rewind" />
 
-        <ImageButton android:id="@id/exo_repeat_toggle"
-            style="@style/ExoMediaButton"/>
+        <ImageButton
+            android:id="@id/exo_repeat_toggle"
+            style="@style/ExoMediaButton" />
 
-        <ImageButton android:id="@id/exo_play"
-            style="@style/ExoMediaButton.Play"/>
+        <ImageButton
+            android:id="@id/exo_play"
+            style="@style/ExoMediaButton.Play" />
 
-        <ImageButton android:id="@id/exo_pause"
-            style="@style/ExoMediaButton.Pause"/>
+        <ImageButton
+            android:id="@id/exo_pause"
+            style="@style/ExoMediaButton.Pause" />
 
-        <ImageButton android:id="@id/exo_ffwd"
-            style="@style/ExoMediaButton.FastForward"/>
+        <ImageButton
+            android:id="@id/exo_ffwd"
+            style="@style/ExoMediaButton.FastForward" />
 
     </LinearLayout>
 
@@ -70,7 +74,6 @@
         android:layout_weight="1" />
 
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -78,30 +81,52 @@
         android:gravity="bottom"
         android:orientation="horizontal">
 
-        <TextView android:id="@id/exo_position"
+        <TextView
+            android:id="@id/exo_position"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textStyle="bold"
+            android:includeFontPadding="false"
+            android:layout_gravity="center"
             android:paddingLeft="12dp"
             android:paddingRight="12dp"
-            android:includeFontPadding="false"
-            android:textColor="#FFBEBEBE"/>
+            android:textColor="#FFBEBEBE"
+            android:textSize="14sp" />
 
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <TextView android:id="@id/exo_duration"
+        <TextView
+            android:id="@id/exo_duration"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:paddingLeft="12dp"
-            android:paddingRight="12dp"
             android:includeFontPadding="false"
-            android:textColor="#FFBEBEBE"/>
+            android:layout_gravity="center"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:textColor="#FFBEBEBE"
+            android:textSize="14sp" />
+
+
+
+        <FrameLayout
+            android:id="@+id/exo_fullscreen_button"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="end">
+
+            <TextView
+                android:id="@+id/exo_fullscreen"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center"
+                android:adjustViewBounds="true"
+                android:scaleType="fitCenter"
+                android:textColor="#FFBEBEBE"
+                android:textSize="12sp" />
+
+        </FrameLayout>
 
     </LinearLayout>
 
@@ -116,9 +141,9 @@
         <com.google.android.exoplayer2.ui.DefaultTimeBar
             android:id="@id/exo_progress"
             android:layout_width="0dp"
-            android:layout_weight="1"
             android:layout_height="26dp"
-            app:played_color="?attr/colorPrimary"/>
+            android:layout_weight="1"
+            app:played_color="?attr/colorPrimary" />
 
     </LinearLayout>
 

app/src/main/res/menu/menu_bottom.xml

@@ -12,6 +12,11 @@
         android:title="@string/bottom_nav_title_trending"
         app:showAsAction="always|withText"/>
 
+    <item
+        android:id="@+id/navigation_local"
+        android:title="@string/bottom_nav_title_local"
+        app:showAsAction="ifRoom|withText"/>
+
     <item
         android:id="@+id/navigation_subscriptions"
         android:title="@string/bottom_nav_title_subscriptions"

app/src/main/res/values/strings.xml

@@ -91,6 +91,11 @@
 
 
     <string name="video_speed_active_icon">{faw-check}</string>
+    <string name="video_expand_icon">{faw-expand}</string>
+    <string name="video_compress_icon">{faw-compress}</string>
+    <string name="pref_title_background_play">Background Playback</string>
+    <string name="pref_description_background_play">If enabled, continues to play video in background.</string>
+    <string name="bottom_nav_title_local">Local</string>
     <string name="pref_token_access">pref_token_access</string>
     <string name="pref_token_refresh">pref_token_refresh</string>
     <string name="pref_token_expiration">pref_token_expiration</string>

app/src/main/res/xml/pref_general.xml

@@ -10,6 +10,12 @@
         android:singleLine="true"
         android:title="@string/pref_title_peertube_server" />
 
+    <!--<SwitchPreference-->
+        <!--android:key="pref_background_play"-->
+        <!--android:title="@string/pref_title_background_play"-->
+        <!--android:summary="@string/pref_description_background_play"-->
+        <!--android:defaultValue="true" />-->
+
     <SwitchPreference
         android:key="pref_show_nsfw"
         android:title="@string/pref_title_show_nsfw"