some folders

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

@@ -3,6 +3,7 @@ package com.github.libretube
 import android.content.Context
 import android.support.v4.media.session.MediaSessionCompat
 import com.github.libretube.obj.Streams
+import com.github.libretube.util.RetrofitInstance
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem

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

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.adapters.TrendingAdapter
+import com.github.libretube.util.RetrofitInstance
 import java.io.IOException
 import retrofit2.HttpException
 

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

@@ -16,6 +16,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.adapters.PlaylistsAdapter
+import com.github.libretube.dialogs.CreatePlaylistDialog
+import com.github.libretube.util.RetrofitInstance
 import java.io.IOException
 import retrofit2.HttpException
 

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

@@ -30,7 +30,10 @@ import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
+import com.github.libretube.fragments.PlayerFragment
+import com.github.libretube.fragments.isFullScreen
 import com.github.libretube.util.CronetHelper
+import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.color.DynamicColors
 

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

@@ -27,6 +27,8 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.github.libretube.dialogs.LoginDialog
+import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.IOException

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

@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 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
 

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

@@ -9,9 +9,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.PlayerFragment
 import com.github.libretube.R
 import com.github.libretube.formatShort
+import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
 

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

@@ -13,12 +13,12 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.PlayerFragment
 import com.github.libretube.R
-import com.github.libretube.RetrofitInstance
+import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.VideoOptionsDialog
+import com.github.libretube.fragments.PlayerFragment
 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.GlobalScope

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

@@ -12,9 +12,9 @@ import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
-import com.github.libretube.RetrofitInstance
 import com.github.libretube.obj.PlaylistId
 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

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

@@ -12,10 +12,10 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
-import com.github.libretube.PlayerFragment
 import com.github.libretube.R
-import com.github.libretube.VideoOptionsDialog
+import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.formatShort
+import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.SearchItem
 import com.squareup.picasso.Picasso
 

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

@@ -13,10 +13,10 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
-import com.github.libretube.PlayerFragment
 import com.github.libretube.R
-import com.github.libretube.VideoOptionsDialog
+import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.formatShort
+import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
 

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

@@ -13,10 +13,10 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
-import com.github.libretube.PlayerFragment
 import com.github.libretube.R
-import com.github.libretube.VideoOptionsDialog
+import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.formatShort
+import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
 

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -15,7 +15,9 @@ import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+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

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -14,7 +14,9 @@ import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
+import com.github.libretube.R
 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

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.dialogs
 
 import android.app.Dialog
 import android.content.Intent
@@ -15,6 +15,8 @@ import android.widget.Spinner
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
+import com.github.libretube.DownloadService
+import com.github.libretube.R
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DownloadDialog : DialogFragment() {

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -13,7 +13,9 @@ import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
+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

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.dialogs
 
 import android.app.Dialog
 import android.content.Context
@@ -7,6 +7,8 @@ import android.os.Bundle
 import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
+import com.github.libretube.BackgroundMode
+import com.github.libretube.R
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**
@@ -44,8 +46,7 @@ class VideoOptionsDialog(private val videoId: String, context: Context) : Dialog
                 when (which) {
                     // This for example will be the "Background mode" option
                     0 -> {
-                        BackgroundMode
+                        BackgroundMode.getInstance()
-                            .getInstance()
                             .playOnBackgroundMode(requireContext(), videoId, 0)
                     }
                     // Add Video to Playlist Dialog

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -15,8 +15,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.github.libretube.R
 import com.github.libretube.adapters.ChannelAdapter
+import com.github.libretube.formatShort
 import com.github.libretube.obj.Subscribe
+import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
 import java.io.IOException

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.fragments
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -44,14 +44,23 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.IS_DOWNLOAD_RUNNING
+import com.github.libretube.MainActivity
+import com.github.libretube.R
+import com.github.libretube.SponsorBlockSettings
 import com.github.libretube.adapters.CommentsAdapter
 import com.github.libretube.adapters.TrendingAdapter
+import com.github.libretube.dialogs.AddtoPlaylistDialog
+import com.github.libretube.dialogs.DownloadDialog
+import com.github.libretube.formatShort
+import com.github.libretube.hideKeyboard
 import com.github.libretube.obj.PipedStream
 import com.github.libretube.obj.Segment
 import com.github.libretube.obj.Segments
 import com.github.libretube.obj.Streams
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.util.CronetHelper
+import com.github.libretube.util.RetrofitInstance
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.fragments
 
 import android.content.Context
 import android.os.Bundle
@@ -12,7 +12,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 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
 

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.fragments
 
 import android.content.Context
 import android.content.DialogInterface
@@ -24,8 +24,11 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.github.libretube.R
 import com.github.libretube.adapters.SearchAdapter
 import com.github.libretube.adapters.SearchHistoryAdapter
+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

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import android.annotation.SuppressLint
 import android.content.Context

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import android.content.Context
 import android.util.AttributeSet

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import com.github.libretube.obj.Channel
 import com.github.libretube.obj.CommentsPage

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

@@ -1,6 +1,6 @@
 package com.github.libretube
 
-import java.util.LinkedList
+import java.util.*
 import kotlin.reflect.KProperty
 
 class ResettableLazyManager {

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

@@ -1,5 +1,7 @@
-package com.github.libretube
+package com.github.libretube.util
 
+import com.github.libretube.resettableLazy
+import com.github.libretube.resettableManager
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
 

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

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import android.content.Context
 import android.graphics.Rect
@@ -7,6 +7,7 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import androidx.constraintlayout.motion.widget.MotionLayout
+import com.github.libretube.R
 
 /**
  *

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

@@ -8,7 +8,7 @@
     android:background="@color/black"
     >
 
-    <com.github.libretube.CustomExoPlayerView
+    <com.github.libretube.util.CustomExoPlayerView
         android:id="@+id/fullscreen_player"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.github.libretube.CustomSwipeToRefresh xmlns:android="http://schemas.android.com/apk/res/android"
+<com.github.libretube.util.CustomSwipeToRefresh xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/channel_refresh"
     android:layout_width="match_parent"
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".ChannelFragment"
+        tools:context=".fragments.ChannelFragment"
         android:visibility="invisible">
 
         <LinearLayout
@@ -115,4 +115,4 @@
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>
-</com.github.libretube.CustomSwipeToRefresh>
+</com.github.libretube.util.CustomSwipeToRefresh>

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

@@ -33,7 +33,7 @@
             android:textStyle="bold" />
     </RelativeLayout>
 
-    <com.github.libretube.CustomSwipeToRefresh
+    <com.github.libretube.util.CustomSwipeToRefresh
         android:id="@+id/playlist_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -62,7 +62,7 @@
                 </RelativeLayout>
             </LinearLayout>
         </ScrollView>
-    </com.github.libretube.CustomSwipeToRefresh>
+    </com.github.libretube.util.CustomSwipeToRefresh>
 
     <FrameLayout
         android:layout_width="match_parent"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.github.libretube.SingleViewTouchableMotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.github.libretube.util.SingleViewTouchableMotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/playerMotionLayout"
@@ -329,7 +329,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.github.libretube.CustomExoPlayerView
+    <com.github.libretube.util.CustomExoPlayerView
         android:id="@+id/player"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -379,4 +379,4 @@
         app:layout_constraintStart_toEndOf="@+id/player"
         app:layout_constraintTop_toTopOf="@+id/play_imageView" />
 
-</com.github.libretube.SingleViewTouchableMotionLayout>
+</com.github.libretube.util.SingleViewTouchableMotionLayout>

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".PlaylistFragment"
+    tools:context=".fragments.PlaylistFragment"
     android:id="@+id/playlist_scrollview">
 <LinearLayout
     android:orientation="vertical"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SearchFragment">
+    tools:context=".fragments.SearchFragment">
 
     <LinearLayout
         android:id="@+id/searchbar_holder"

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

@@ -39,7 +39,7 @@
             android:textStyle="bold" />
     </RelativeLayout>
 
-    <com.github.libretube.CustomSwipeToRefresh
+    <com.github.libretube.util.CustomSwipeToRefresh
         android:id="@+id/sub_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -103,5 +103,5 @@
                 </RelativeLayout>
             </LinearLayout>
         </ScrollView>
-    </com.github.libretube.CustomSwipeToRefresh>
+    </com.github.libretube.util.CustomSwipeToRefresh>
 </RelativeLayout>

app/src/main/res/navigation/nav.xml

@@ -23,12 +23,12 @@
     </fragment>
     <fragment
         android:id="@+id/searchFragment"
-        android:name="com.github.libretube.SearchFragment"
+        android:name="com.github.libretube.fragments.SearchFragment"
         android:label="fragment_search"
         tools:layout="@layout/fragment_search" />
     <fragment
         android:id="@+id/channel"
-        android:name="com.github.libretube.ChannelFragment"
+        android:name="com.github.libretube.fragments.ChannelFragment"
         android:label="channel"
         tools:layout="@layout/fragment_channel" >
         <argument
@@ -37,7 +37,7 @@
     </fragment>
     <fragment
         android:id="@+id/playlistFragment"
-        android:name="com.github.libretube.PlaylistFragment"
+        android:name="com.github.libretube.fragments.PlaylistFragment"
         android:label="fragment_playlist"
         tools:layout="@layout/fragment_playlist" >
         <argument