Merge branch 'libre-tube:master' into master

README.md

@@ -62,3 +62,4 @@ WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OP
 
 ## Mirrors (read-only)
 <a href="https://gitlab.com/libretube/LibreTube">GitLab</a></p>
+<a href="https://notabug.org/LibreTube/LibreTube">NotABug</a></p>

app/src/main/java/com/github/libretube/DownloadService.kt

@@ -69,7 +69,6 @@ class DownloadService : Service() {
     }
 
     private fun downloadManager() {
-
         // create folder for temporary files
         tempDir = File(
             applicationContext.getExternalFilesDir(DIRECTORY_DOWNLOADS),
@@ -255,7 +254,8 @@ class DownloadService : Service() {
                 if (returnCode.toString() != "0") downloadFailedNotification()
                 else downloadSucceededNotification()
                 onDestroy()
-            }, {
+            },
+            {
                 // CALLED WHEN SESSION PRINTS LOGS
                 Log.e(TAG, it.message.toString())
             }

app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt

@@ -19,11 +19,11 @@ import com.github.libretube.obj.CommentsPage
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class CommentsAdapter(
     private val videoId: String,

app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt

@@ -20,11 +20,11 @@ import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.RetrofitInstance
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistAdapter(
     private val videoFeed: MutableList<StreamItem>,

app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt

@@ -17,10 +17,10 @@ import com.github.libretube.obj.Playlists
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistsAdapter(
     private val playlists: MutableList<Playlists>,

app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt

@@ -85,10 +85,11 @@ class SearchViewHolder(
         val viewsString = if (item.views?.toInt() != -1) item.views.formatShort() else ""
         val uploadDate = if (item.uploadedDate != null) item.uploadedDate else ""
         views.text =
-            if (viewsString != "" && uploadDate != "")
+            if (viewsString != "" && uploadDate != "") {
                 "$viewsString • $uploadDate"
-            else
+            } else {
                 viewsString + uploadDate
+            }
         val channelName = v.findViewById<TextView>(R.id.search_channel_name)
         channelName.text = item.uploaderName
         v.setOnClickListener {
@@ -145,9 +146,10 @@ class SearchViewHolder(
         val playlistChannelName = v.findViewById<TextView>(R.id.search_name)
         playlistChannelName.text = item.uploaderName
         val playlistVideosNumber = v.findViewById<TextView>(R.id.search_playlist_videos)
-        if (item.videos?.toInt() != -1)
+        if (item.videos?.toInt() != -1) {
             playlistVideosNumber.text =
                 v.context.getString(R.string.videoCount, item.videos.toString())
+        }
         v.setOnClickListener {
             // playlist clicked
             val activity = v.context as MainActivity

app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt

@@ -34,8 +34,9 @@ class SubscriptionAdapter(
     fun updateItems() {
         // limitedVideoFeed.add("")
         i += 10
-        if (i > videoFeed.size)
+        if (i > videoFeed.size) {
             i = videoFeed.size
+        }
         notifyDataSetChanged()
     }
 

app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt

@@ -15,11 +15,11 @@ import com.github.libretube.obj.Subscribe
 import com.github.libretube.obj.Subscription
 import com.github.libretube.util.RetrofitInstance
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscription>) :
     RecyclerView.Adapter<SubscriptionChannelViewHolder>() {

app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt

@@ -19,8 +19,8 @@ import com.github.libretube.R
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class AddtoPlaylistDialog : DialogFragment() {
     private val TAG = "AddToPlaylistDialog"

app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt

@@ -19,8 +19,8 @@ import com.github.libretube.obj.Playlists
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class CreatePlaylistDialog : DialogFragment() {
     val TAG = "CreatePlaylistDialog"

app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt

@@ -52,13 +52,17 @@ class CustomInstanceDialog : DialogFragment() {
                     } catch (e: Exception) {
                         // invalid URL
                         Toast.makeText(
-                            context, getString(R.string.invalid_url), Toast.LENGTH_SHORT
+                            context,
+                            getString(R.string.invalid_url),
+                            Toast.LENGTH_SHORT
                         ).show()
                     }
                 } else {
                     // at least one empty input
                     Toast.makeText(
-                        context, context?.getString(R.string.empty_instance), Toast.LENGTH_SHORT
+                        context,
+                        context?.getString(R.string.empty_instance),
+                        Toast.LENGTH_SHORT
                     ).show()
                 }
             }

app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt

@@ -17,8 +17,8 @@ import com.github.libretube.R
 import com.github.libretube.obj.Login
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class LoginDialog : DialogFragment() {
     private val TAG = "LoginDialog"

app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt

@@ -11,11 +11,11 @@ import com.github.libretube.R
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistOptionsDialog(
     private val playlistId: String,

app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt

@@ -22,8 +22,8 @@ import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class ChannelFragment : Fragment() {
 
@@ -201,7 +201,10 @@ class ChannelFragment : Fragment() {
                     channelName.text = response.name
                     if (response.verified) {
                         channelName.setCompoundDrawablesWithIntrinsicBounds(
-                            0, 0, R.drawable.ic_verified, 0
+                            0,
+                            0,
+                            R.drawable.ic_verified,
+                            0
                         )
                     }
                     view.findViewById<TextView>(R.id.channel_subs).text = resources.getString(
@@ -231,7 +234,6 @@ class ChannelFragment : Fragment() {
 
     private fun fetchNextPage() {
         fun run() {
-
             lifecycleScope.launchWhenCreated {
                 val response = try {
                     RetrofitInstance.api.getChannelNextPage(channel_id!!, nextPage!!)

app/src/main/java/com/github/libretube/fragments/Home.kt

@@ -16,8 +16,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.TrendingAdapter
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Home : Fragment() {
 
@@ -34,7 +34,6 @@ class Home : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_home, container, false)
     }

app/src/main/java/com/github/libretube/fragments/Library.kt

@@ -19,8 +19,8 @@ import com.github.libretube.adapters.PlaylistsAdapter
 import com.github.libretube.dialogs.CreatePlaylistDialog
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Library : Fragment() {
 

app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt

@@ -18,6 +18,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -84,11 +85,11 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
+import org.chromium.net.CronetEngine
+import retrofit2.HttpException
 import java.io.IOException
 import java.util.concurrent.Executors
 import kotlin.math.abs
-import org.chromium.net.CronetEngine
-import retrofit2.HttpException
 
 var isFullScreen = false
 
@@ -118,6 +119,7 @@ class PlayerFragment : Fragment() {
     private lateinit var segmentData: Segments
     private var relatedStreams: List<StreamItem>? = arrayListOf()
     private var relatedStreamsEnabled = true
+    private var isPlayerLocked: Boolean = false
 
     private lateinit var relDownloadVideo: LinearLayout
 
@@ -182,6 +184,7 @@ class PlayerFragment : Fragment() {
                 val mainMotionLayout =
                     mainActivity.findViewById<MotionLayout>(R.id.mainMotionLayout)
                 mainMotionLayout.progress = abs(progress)
+                exoPlayerView.hideController()
                 eId = endId
                 sId = startId
             }
@@ -192,13 +195,11 @@ class PlayerFragment : Fragment() {
                 val mainMotionLayout =
                     mainActivity.findViewById<MotionLayout>(R.id.mainMotionLayout)
                 if (currentId == eId) {
-                    exoPlayerView.hideController()
                     exoPlayerView.useController = false
-                    mainMotionLayout.progress = 1.toFloat()
+                    mainMotionLayout.progress = 1F
                 } else if (currentId == sId) {
-                    exoPlayerView.showController()
                     exoPlayerView.useController = true
-                    mainMotionLayout.progress = 0.toFloat()
+                    mainMotionLayout.progress = 0F
                 }
             }
 
@@ -259,8 +260,9 @@ class PlayerFragment : Fragment() {
             }
 
         // FullScreen button trigger
-        view.findViewById<ImageButton>(R.id.fullscreen).setOnClickListener {
+        val fullScreenButton = view.findViewById<ImageButton>(R.id.fullscreen)
-            // remember to hide everything when new thing added
+        fullScreenButton.setOnClickListener {
+            exoPlayerView.hideController()
             if (!isFullScreen) {
                 with(motionLayout) {
                     getConstraintSet(R.id.start).constrainHeight(R.id.player, -1)
@@ -268,6 +270,7 @@ class PlayerFragment : Fragment() {
                 }
                 view.findViewById<ConstraintLayout>(R.id.main_container).isClickable = true
                 view.findViewById<LinearLayout>(R.id.linLayout).visibility = View.GONE
+                fullScreenButton.setImageResource(R.drawable.ic_fullscreen_exit)
                 val mainActivity = activity as MainActivity
                 mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
                 isFullScreen = true
@@ -278,6 +281,7 @@ class PlayerFragment : Fragment() {
                 }
                 view.findViewById<ConstraintLayout>(R.id.main_container).isClickable = false
                 view.findViewById<LinearLayout>(R.id.linLayout).visibility = View.VISIBLE
+                fullScreenButton.setImageResource(R.drawable.ic_fullscreen)
                 val mainActivity = activity as MainActivity
                 mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
                 isFullScreen = false
@@ -295,6 +299,23 @@ class PlayerFragment : Fragment() {
             }
         }
 
+        // lock and unlock the player
+        val lockPlayerButton = view.findViewById<ImageButton>(R.id.lock_player)
+        lockPlayerButton.setOnClickListener {
+            // change the locked/unlocked icon
+            if (!isPlayerLocked) {
+                lockPlayerButton.setImageResource(R.drawable.ic_locked)
+            } else {
+                lockPlayerButton.setImageResource(R.drawable.ic_unlocked)
+            }
+
+            // show/hide all the controls
+            lockPlayer(isPlayerLocked)
+
+            // change locked status
+            isPlayerLocked = !isPlayerLocked
+        }
+
         val scrollView = view.findViewById<ScrollView>(R.id.player_scrollView)
         scrollView.viewTreeObserver
             .addOnScrollChangedListener {
@@ -362,8 +383,9 @@ class PlayerFragment : Fragment() {
 
         exoPlayerView.postDelayed(this::checkForSegments, 100)
 
-        if (!::segmentData.isInitialized || segmentData.segments.isEmpty())
+        if (!::segmentData.isInitialized || segmentData.segments.isEmpty()) {
             return
+        }
 
         segmentData.segments.forEach { segment: Segment ->
             val segmentStart = (segment.segment!![0] * 1000.0f).toLong()
@@ -458,7 +480,6 @@ class PlayerFragment : Fragment() {
                     }
                     if (categories.size > 0) {
                         segmentData = try {
-
                             RetrofitInstance.api.getSegments(
                                 videoId!!,
                                 "[\"" + TextUtils.join("\",\"", categories) + "\"]"
@@ -523,7 +544,6 @@ class PlayerFragment : Fragment() {
                 playWhenReady: Boolean,
                 playbackState: Int
             ) {
-
                 exoPlayerView.keepScreenOn = !(
                     playbackState == Player.STATE_IDLE ||
                         playbackState == Player.STATE_ENDED ||
@@ -627,7 +647,6 @@ class PlayerFragment : Fragment() {
             }
 
         view.findViewById<RelativeLayout>(R.id.player_channel).setOnClickListener {
-
             val activity = view.context as MainActivity
             val bundle = bundleOf("channel_id" to response.uploaderUrl)
             activity.navController.navigate(R.id.channel, bundle)
@@ -717,7 +736,6 @@ class PlayerFragment : Fragment() {
         }
 
         for (vid in response.videoStreams!!) {
-            Log.e(TAG, vid.toString())
             // append quality to list if it has the preferred format (e.g. MPEG)
             if (vid.format.equals(videoFormatPreference)) { // preferred format
                 videosNameArray += vid.quality!!
@@ -863,7 +881,6 @@ class PlayerFragment : Fragment() {
     }
 
     private fun initializePlayerNotification(c: Context) {
-
         mediaSession = MediaSessionCompat(c, this.javaClass.name)
         mediaSession.apply {
             isActive = true
@@ -887,6 +904,15 @@ class PlayerFragment : Fragment() {
         }
     }
 
+    private fun lockPlayer(isLocked: Boolean) {
+        val visibility = if (isLocked) View.VISIBLE else View.GONE
+        exoPlayerView.findViewById<LinearLayout>(R.id.controls_top_right).visibility = visibility
+        exoPlayerView.findViewById<ImageButton>(R.id.exo_play_pause).visibility = visibility
+        exoPlayerView.findViewById<Button>(R.id.exo_ffwd_with_amount).visibility = visibility
+        exoPlayerView.findViewById<Button>(R.id.exo_rew_with_amount).visibility = visibility
+        exoPlayerView.findViewById<FrameLayout>(R.id.exo_bottom_bar).visibility = visibility
+    }
+
     private fun isSubscribed(button: MaterialButton, channel_id: String) {
         @SuppressLint("ResourceAsColor")
         fun run() {

app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt

@@ -16,8 +16,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.adapters.PlaylistAdapter
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistFragment : Fragment() {
     private val TAG = "PlaylistFragment"
@@ -113,7 +113,6 @@ class PlaylistFragment : Fragment() {
 
     private fun fetchNextPage() {
         fun run() {
-
             lifecycleScope.launchWhenCreated {
                 val response = try {
                     RetrofitInstance.api.getPlaylistNextPage(playlistId!!, nextPage!!)

app/src/main/java/com/github/libretube/fragments/SearchFragment.kt

@@ -29,10 +29,10 @@ import com.github.libretube.adapters.SearchSuggestionsAdapter
 import com.github.libretube.hideKeyboard
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class SearchFragment : Fragment() {
     private val TAG = "SearchFragment"
@@ -94,7 +94,7 @@ class SearchFragment : Fragment() {
                     tempSelectedItem = id
                 }
                 .setPositiveButton(
-                    getString(R.string.okay),
+                    getString(R.string.okay)
                 ) { _, _ ->
                     selectedFilter = tempSelectedItem
                     apiSearchFilter = when (selectedFilter) {

app/src/main/java/com/github/libretube/fragments/Subscriptions.kt

@@ -24,8 +24,8 @@ import com.github.libretube.R
 import com.github.libretube.adapters.SubscriptionAdapter
 import com.github.libretube.adapters.SubscriptionChannelAdapter
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Subscriptions : Fragment() {
     val TAG = "SubFragment"
@@ -65,7 +65,8 @@ class Subscriptions : Fragment() {
             var feedRecView = view.findViewById<RecyclerView>(R.id.sub_feed)
             val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
             val grid = sharedPreferences.getString(
-                "grid", resources.getInteger(R.integer.grid_items).toString()
+                "grid",
+                resources.getInteger(R.integer.grid_items).toString()
             )!!
             feedRecView.layoutManager = GridLayoutManager(view.context, grid.toInt())
             fetchFeed(feedRecView, progressBar, view)

app/src/main/java/com/github/libretube/obj/CommentsPage.kt

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 data class CommentsPage(
     val comments: MutableList<Comment> = arrayListOf(),
     val disabled: Boolean? = null,
-    val nextpage: String? = "",
+    val nextpage: String? = ""
 ) {
     constructor() : this(arrayListOf(), null, "")
 }

app/src/main/java/com/github/libretube/obj/Playlist.kt

@@ -12,5 +12,5 @@ data class Playlist(
     var uploaderUrl: String? = null,
     var uploaderAvatar: String? = null,
     var videos: Int? = 0,
-    var relatedStreams: List<StreamItem>? = null,
+    var relatedStreams: List<StreamItem>? = null
 )

app/src/main/java/com/github/libretube/obj/PlaylistId.kt

@@ -6,5 +6,5 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 data class PlaylistId(
     var playlistId: String? = null,
     var videoId: String? = null,
-    var index: Int = -1,
+    var index: Int = -1
 )

app/src/main/java/com/github/libretube/obj/Playlists.kt

@@ -7,5 +7,5 @@ data class Playlists(
     var id: String? = null,
     var name: String? = null,
     var shortDescription: String? = null,
-    var thumbnail: String? = null,
+    var thumbnail: String? = null
 )

app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt

@@ -25,13 +25,13 @@ import com.github.libretube.dialogs.CustomInstanceDialog
 import com.github.libretube.dialogs.LoginDialog
 import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.RetrofitInstance
+import org.json.JSONObject
+import org.json.JSONTokener
+import retrofit2.HttpException
 import java.io.IOException
 import java.io.InputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
-import org.json.JSONObject
-import org.json.JSONTokener
-import retrofit2.HttpException
 
 class InstanceSettings : PreferenceFragmentCompat() {
     val TAG = "InstanceSettings"
@@ -85,11 +85,12 @@ class InstanceSettings : PreferenceFragmentCompat() {
                             inputStream?.bufferedReader()?.readLines()?.forEach {
                                 if (it.isNotBlank()) {
                                     val channelId = it.substringBefore(",")
-                                    if (channelId.length == 24)
+                                    if (channelId.length == 24) {
                                         channels.add(channelId)
                                     }
                                 }
                             }
+                        }
                         inputStream?.close()
 
                         subscribe(channels)

app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt

@@ -82,7 +82,10 @@ class DescriptionAdapter(
          */
         return try {
             val resizedBitmap = Bitmap.createScaledBitmap(
-                bitmap, 1080, 1080, false
+                bitmap,
+                1080,
+                1080,
+                false
             )
             resizedBitmap
         } catch (e: Exception) {

app/src/main/java/com/github/libretube/util/UpdateChecker.kt

@@ -7,12 +7,12 @@ import com.github.libretube.GITHUB_API_URL
 import com.github.libretube.dialogs.NoUpdateAvailableDialog
 import com.github.libretube.dialogs.UpdateAvailableDialog
 import com.github.libretube.obj.UpdateInfo
+import org.json.JSONArray
+import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
-import org.json.JSONArray
-import org.json.JSONObject
 
 fun checkUpdate(childFragmentManager: FragmentManager) {
     var updateInfo: UpdateInfo? = UpdateInfo("", "")

app/src/main/res/drawable/ic_fullscreen.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z" />
+</vector>

app/src/main/res/drawable/ic_fullscreen_exit.xml

@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z" />
+</vector>

app/src/main/res/drawable/ic_locked.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/holo_green_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>

app/src/main/res/drawable/ic_unlocked.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
+</vector>

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

@@ -46,16 +46,27 @@
             android:layoutDirection="ltr">
 
             <ImageButton
+                android:visibility="gone"
                 android:id="@+id/close_imageButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_close"
                 android:padding="@dimen/exo_icon_padding"
                 android:background="#00FFFFFF"
-                app:tint="@android:color/white" />
+                app:tint="@android:color/white"
+                android:layout_marginRight="10dp"/>
+
+            <ImageButton
+                android:id="@+id/lock_player"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_unlocked"
+                android:padding="@dimen/exo_icon_padding"
+                android:background="#00FFFFFF" />
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/controls_top_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
@@ -136,14 +147,6 @@
             android:layout_marginBottom="10dp"
             android:layoutDirection="ltr">
 
-            <ImageButton
-                android:id="@id/exo_vr"
-                style="@style/ExoStyledControls.Button.Bottom.VR" />
-
-            <ImageButton
-                android:id="@id/exo_shuffle"
-                style="@style/ExoStyledControls.Button.Bottom.Shuffle" />
-
             <ImageButton
                 android:id="@id/exo_repeat_toggle"
                 style="@style/ExoStyledControls.Button.Bottom.RepeatToggle" />
@@ -158,15 +161,8 @@
 
             <ImageButton
                 android:id="@+id/fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
+                style="@style/ExoStyledControls.Button.Bottom.FullScreen"
-
+                android:src="@drawable/ic_fullscreen"/>
-            <ImageButton
-                android:id="@id/exo_fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
-
-            <ImageButton
-                android:id="@id/exo_overflow_show"
-                style="@style/ExoStyledControls.Button.Bottom.OverflowShow" />
 
         </LinearLayout>
 
@@ -191,8 +187,6 @@
 
         </HorizontalScrollView>
 
-    </FrameLayout>
-
         <LinearLayout
             android:id="@+id/progress_bar"
             android:layout_gravity="bottom"
@@ -216,6 +210,8 @@
 
         </LinearLayout>
 
+    </FrameLayout>
+
     <LinearLayout
         android:id="@id/exo_minimal_controls"
         android:layout_width="wrap_content"
@@ -226,10 +222,6 @@
         android:gravity="center_vertical"
         android:layoutDirection="ltr">
 
-        <ImageButton
-            android:id="@id/exo_minimal_fullscreen"
-            style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
-
     </LinearLayout>
 
     <LinearLayout
@@ -244,18 +236,22 @@
 
         <Button
             android:id="@id/exo_rew_with_amount"
-            android:paddingLeft="4dp"
+            android:layout_marginRight="25dp"
-            android:paddingRight="4dp"
+            android:scaleX="1.1"
+            android:scaleY="1.1"
             style="@style/ExoStyledControls.Button.Center.RewWithAmount" />
 
         <ImageButton
             android:id="@id/exo_play_pause"
+            android:scaleX="1.1"
+            android:scaleY="1.1"
             style="@style/ExoStyledControls.Button.Center.PlayPause" />
 
         <Button
             android:id="@id/exo_ffwd_with_amount"
-            android:paddingLeft="4dp"
+            android:layout_marginLeft="25dp"
-            android:paddingRight="4dp"
+            android:scaleX="1.1"
+            android:scaleY="1.1"
             style="@style/ExoStyledControls.Button.Center.FfwdWithAmount" />
 
     </LinearLayout>