Merge pull request #2927 from Bnyro/master

Minor repo structure cleanup

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

@@ -13,11 +13,11 @@ import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
 import com.github.libretube.constants.PUSH_CHANNEL_ID
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.util.ExceptionHandler
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NotificationHelper
+import com.github.libretube.helpers.NotificationHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.ProxyHelper
+import com.github.libretube.helpers.ProxyHelper
-import com.github.libretube.util.ShortcutHelper
+import com.github.libretube.helpers.ShortcutHelper
 
 class LibreTubeApp : Application() {
     override fun onCreate() {

app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt

@@ -17,9 +17,8 @@ import com.github.libretube.extensions.toLocalPlaylistItem
 import com.github.libretube.extensions.toStreamItem
 import com.github.libretube.extensions.toastFromMainThread
 import com.github.libretube.obj.ImportPlaylist
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.ProxyHelper
+import com.github.libretube.helpers.ProxyHelper
-import gen._base._base_java__assetres.srcjar.R.id.async
 import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async

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

@@ -2,7 +2,7 @@ package com.github.libretube.api
 
 import com.github.libretube.constants.PIPED_API_URL
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit

app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt

@@ -10,7 +10,7 @@ import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.db.obj.LocalSubscription
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking

app/src/main/java/com/github/libretube/db/DatabaseHelper.kt

@@ -7,7 +7,7 @@ import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.db.obj.WatchHistoryItem
 import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 object DatabaseHelper {
     private const val MAX_SEARCH_HISTORY_SIZE = 20

app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt

@@ -3,7 +3,7 @@ package com.github.libretube.extensions
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.db.obj.LocalPlaylistItem
-import com.github.libretube.util.ProxyHelper
+import com.github.libretube.helpers.ProxyHelper
 
 fun Streams.toStreamItem(videoId: String): StreamItem {
     return StreamItem(

app/src/main/java/com/github/libretube/helpers/AudioHelper.kt

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

app/src/main/java/com/github/libretube/helpers/BackgroundHelper.kt

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

app/src/main/java/com/github/libretube/helpers/BackupHelper.kt

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

app/src/main/java/com/github/libretube/helpers/BrightnessHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.view.WindowManager

app/src/main/java/com/github/libretube/helpers/ClipboardHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.ClipData
 import android.content.ClipboardManager

app/src/main/java/com/github/libretube/helpers/DashHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import com.github.libretube.api.obj.PipedStream
 import com.github.libretube.api.obj.Streams

app/src/main/java/com/github/libretube/helpers/DownloadHelper.kt

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

app/src/main/java/com/github/libretube/helpers/ImageHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -13,6 +13,7 @@ import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.util.DataSaverMode
 import java.io.File
 import java.io.FileOutputStream
 import okio.use

app/src/main/java/com/github/libretube/helpers/ImportHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.net.Uri

app/src/main/java/com/github/libretube/helpers/LocaleHelper.kt

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

app/src/main/java/com/github/libretube/helpers/NavBarHelper.kt

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

app/src/main/java/com/github/libretube/helpers/NavigationHelper.kt

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

app/src/main/java/com/github/libretube/helpers/NetworkHelper.kt

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

app/src/main/java/com/github/libretube/helpers/NotificationHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.content.Context
 import androidx.work.Constraints

app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.app.PendingIntent

app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt

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

app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys

app/src/main/java/com/github/libretube/helpers/ShortcutHelper.kt

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

app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.app.Activity
 import android.content.ComponentName

app/src/main/java/com/github/libretube/helpers/WindowHelper.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.helpers
 
 import android.os.Build
 import android.view.WindowManager

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

@@ -30,8 +30,8 @@ import com.github.libretube.extensions.query
 import com.github.libretube.extensions.toID
 import com.github.libretube.extensions.toStreamItem
 import com.github.libretube.util.NowPlayingNotification
-import com.github.libretube.util.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
 import com.github.libretube.util.PlayingQueue
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem

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

@@ -30,9 +30,9 @@ import com.github.libretube.receivers.NotificationReceiver
 import com.github.libretube.receivers.NotificationReceiver.Companion.ACTION_DOWNLOAD_PAUSE
 import com.github.libretube.receivers.NotificationReceiver.Companion.ACTION_DOWNLOAD_RESUME
 import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
-import com.github.libretube.util.DownloadHelper.getNotificationId
+import com.github.libretube.helpers.DownloadHelper.getNotificationId
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
 import java.io.File
 import java.net.HttpURLConnection
 import java.net.SocketTimeoutException

app/src/main/java/com/github/libretube/services/UpdateService.kt

@@ -11,7 +11,7 @@ import android.os.Environment
 import android.os.IBinder
 import android.widget.Toast
 import com.github.libretube.R
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
 import java.io.File
 
 class UpdateService : Service() {

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

@@ -36,12 +36,12 @@ import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.models.SearchViewModel
 import com.github.libretube.ui.models.SubscriptionsViewModel
 import com.github.libretube.ui.tools.SleepTimer
-import com.github.libretube.util.NavBarHelper
+import com.github.libretube.helpers.NavBarHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
-import com.github.libretube.util.NetworkHelper
+import com.github.libretube.helpers.NetworkHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
-import com.github.libretube.util.WindowHelper
+import com.github.libretube.helpers.WindowHelper
 import com.google.android.material.elevation.SurfaceColors
 
 class MainActivity : BaseActivity() {

app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt

@@ -8,8 +8,8 @@ import com.github.libretube.R
 import com.github.libretube.databinding.ActivityNointernetBinding
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.fragments.DownloadsFragment
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
-import com.github.libretube.util.NetworkHelper
+import com.github.libretube.helpers.NetworkHelper
 import com.google.android.material.snackbar.Snackbar
 
 class NoInternetActivity : BaseActivity() {

app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt

@@ -19,9 +19,9 @@ import com.github.libretube.extensions.updateParameters
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setAspectRatio
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
-import com.github.libretube.util.WindowHelper
+import com.github.libretube.helpers.WindowHelper
 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/ui/activities/RouterActivity.kt

@@ -8,7 +8,7 @@ import android.util.Log
 import com.github.libretube.constants.IntentData
 import com.github.libretube.extensions.TAG
 import com.github.libretube.ui.base.BaseActivity
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.TextUtils
 
 class RouterActivity : BaseActivity() {

app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt

@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.api.obj.ChapterSegment
 import com.github.libretube.databinding.ChapterColumnBinding
 import com.github.libretube.ui.viewholders.ChaptersViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.google.android.exoplayer2.ExoPlayer
 
 class ChaptersAdapter(

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

@@ -21,11 +21,11 @@ import com.github.libretube.databinding.CommentsRowBinding
 import com.github.libretube.extensions.formatShort
 import com.github.libretube.ui.fragments.CommentsRepliesFragment
 import com.github.libretube.ui.viewholders.CommentsViewHolder
-import com.github.libretube.util.ClipboardHelper
+import com.github.libretube.helpers.ClipboardHelper
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.TextUtils
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 class CommentsAdapter(
     private val fragment: Fragment?,

app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt

@@ -16,7 +16,7 @@ import com.github.libretube.extensions.formatAsFileSize
 import com.github.libretube.extensions.query
 import com.github.libretube.ui.activities.OfflinePlayerActivity
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
 

app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt

@@ -9,8 +9,8 @@ import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.AppIconItemBinding
 import com.github.libretube.ui.viewholders.IconsSheetViewHolder
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 class IconsSheetAdapter : RecyclerView.Adapter<IconsSheetViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IconsSheetViewHolder {

app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt

@@ -8,8 +8,8 @@ import com.github.libretube.extensions.toID
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.viewholders.LegacySubscriptionViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 
 class LegacySubscriptionAdapter(
     private val subscriptions: List<com.github.libretube.api.obj.Subscription>

app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt

@@ -9,9 +9,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.databinding.QueueRowBinding
 import com.github.libretube.extensions.toID
 import com.github.libretube.ui.viewholders.PlayingQueueViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 class PlayingQueueAdapter : RecyclerView.Adapter<PlayingQueueViewHolder>() {
 

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

@@ -18,8 +18,8 @@ import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/github/libretube/ui/adapters/PlaylistBookmarkAdapter.kt

@@ -14,8 +14,8 @@ import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.query
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistBookmarkViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 
 class PlaylistBookmarkAdapter(
     private val bookmarks: List<PlaylistBookmark>,

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

@@ -11,8 +11,8 @@ import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.dialogs.DeletePlaylistDialog
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.viewholders.PlaylistsViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 
 class PlaylistsAdapter(
     private val playlists: MutableList<Playlists>,

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

@@ -21,8 +21,8 @@ import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.SearchViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.TextUtils
 
 class SearchAdapter(

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

@@ -10,8 +10,8 @@ import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.extensions.setupSubscriptionButton
 import com.github.libretube.ui.sheets.ChannelOptionsBottomSheet
 import com.github.libretube.ui.viewholders.SubscriptionChannelViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 
 class SubscriptionChannelAdapter(
     private val subscriptions: MutableList<Subscription>

app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt

@@ -25,9 +25,9 @@ import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.VideosViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.util.TextUtils
 
 class VideosAdapter(

app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt

@@ -13,8 +13,8 @@ import com.github.libretube.ui.extensions.setFormattedDuration
 import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
 import com.github.libretube.ui.viewholders.WatchHistoryViewHolder
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 
 class WatchHistoryAdapter(
     private val watchHistory: MutableList<WatchHistoryItem>

app/src/main/java/com/github/libretube/ui/base/BaseActivity.kt

@@ -2,8 +2,8 @@ package com.github.libretube.ui.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.github.libretube.util.LocaleHelper
+import com.github.libretube.helpers.LocaleHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 /**
  * Activity that applies the LibreTube theme and the in-app language

app/src/main/java/com/github/libretube/ui/base/BasePreferenceFragment.kt

@@ -8,7 +8,7 @@ import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogTextPreferenceBinding
 import com.github.libretube.ui.activities.SettingsActivity
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**

app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt

@@ -9,7 +9,7 @@ import com.github.libretube.R
 import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.obj.PreferenceItem
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/github/libretube/ui/dialogs/DeleteAccountDialog.kt

@@ -12,7 +12,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.DeleteUserRequest
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DeleteAccountDialog : DialogFragment() {

app/src/main/java/com/github/libretube/ui/dialogs/DeletePlaylistDialog.kt

@@ -11,7 +11,7 @@ import com.github.libretube.api.obj.PlaylistId
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.enums.PlaylistType
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

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

@@ -15,7 +15,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
 import com.github.libretube.util.TextUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.IOException

app/src/main/java/com/github/libretube/ui/dialogs/ErrorDialog.kt

@@ -6,8 +6,8 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.util.ClipboardHelper
+import com.github.libretube.helpers.ClipboardHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ErrorDialog : DialogFragment() {

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

@@ -12,7 +12,7 @@ import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.Login
 import com.github.libretube.databinding.DialogLoginBinding
 import com.github.libretube.extensions.TAG
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.util.TextUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 

app/src/main/java/com/github/libretube/ui/dialogs/LogoutDialog.kt

@@ -8,7 +8,7 @@ import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogLogoutBinding
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class LogoutDialog : DialogFragment() {

app/src/main/java/com/github/libretube/ui/dialogs/NavBarOptionsDialog.kt

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogNavbarOptionsBinding
 import com.github.libretube.ui.adapters.NavBarOptionsAdapter
-import com.github.libretube.util.NavBarHelper
+import com.github.libretube.helpers.NavBarHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class NavBarOptionsDialog : DialogFragment() {

app/src/main/java/com/github/libretube/ui/dialogs/RequireRestartDialog.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class RequireRestartDialog : DialogFragment() {

app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt

@@ -14,7 +14,7 @@ import com.github.libretube.db.DatabaseHolder.Companion.Database
 import com.github.libretube.enums.ShareObjectType
 import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.obj.ShareData
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ShareDialog(

app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt

@@ -1,7 +1,7 @@
 package com.github.libretube.ui.extensions
 
 import com.github.libretube.R
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.button.MaterialButton
 
 fun MaterialButton.setupNotificationBell(channelId: String) {

app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt

@@ -26,9 +26,9 @@ import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.ui.sheets.PlaybackOptionsSheet
 import com.github.libretube.ui.sheets.PlayingQueueSheet
 import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
-import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.helpers.BackgroundHelper
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.PlayingQueue
 
 class AudioPlayerFragment : BaseFragment() {

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

@@ -26,7 +26,7 @@ import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.ShareDialog
 import com.github.libretube.ui.extensions.setupSubscriptionButton
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
 import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt

@@ -25,7 +25,7 @@ import com.github.libretube.services.DownloadService
 import com.github.libretube.ui.adapters.DownloadsAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
-import com.github.libretube.util.DownloadHelper
+import com.github.libretube.helpers.DownloadHelper
 import java.io.File
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collectLatest

app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt

@@ -22,7 +22,7 @@ import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
 import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.LocaleHelper
+import com.github.libretube.helpers.LocaleHelper
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt

@@ -26,8 +26,8 @@ import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.CreatePlaylistDialog
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.NavBarHelper
+import com.github.libretube.helpers.NavBarHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class LibraryFragment : BaseFragment() {
 

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

@@ -86,19 +86,19 @@ import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
 import com.github.libretube.ui.sheets.CommentsSheet
 import com.github.libretube.ui.sheets.PlayingQueueSheet
-import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.helpers.BackgroundHelper
-import com.github.libretube.util.DashHelper
+import com.github.libretube.helpers.DashHelper
 import com.github.libretube.util.DataSaverMode
 import com.github.libretube.util.HtmlParser
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.util.LinkHandler
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.NowPlayingNotification
-import com.github.libretube.util.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper
-import com.github.libretube.util.PlayerHelper.loadPlaybackParams
+import com.github.libretube.helpers.PlayerHelper.loadPlaybackParams
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.SeekbarPreviewListener
+import com.github.libretube.ui.listeners.SeekbarPreviewListener
 import com.github.libretube.util.TextUtils
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer

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

@@ -31,8 +31,8 @@ import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.extensions.serializable
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.PlayingQueue
 import com.github.libretube.util.TextUtils
 

app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt

@@ -18,7 +18,7 @@ import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.hideKeyboard
 import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import java.io.IOException
 import retrofit2.HttpException
 

app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt

@@ -19,7 +19,7 @@ import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.models.SubscriptionsViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class SubscriptionsFragment : BaseFragment() {
     private lateinit var binding: FragmentSubscriptionsBinding

app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt

@@ -15,7 +15,7 @@ import com.github.libretube.extensions.TAG
 import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.util.LocaleHelper
+import com.github.libretube.helpers.LocaleHelper
 import com.google.android.material.snackbar.Snackbar
 import java.io.IOException
 import retrofit2.HttpException

app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt

@@ -22,9 +22,9 @@ import com.github.libretube.extensions.query
 import com.github.libretube.ui.adapters.WatchHistoryAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.models.PlayerViewModel
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.util.PlayingQueue
-import com.github.libretube.util.ProxyHelper
+import com.github.libretube.helpers.ProxyHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class WatchHistoryFragment : BaseFragment() {

app/src/main/java/com/github/libretube/ui/listeners/PlayerGestureController.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.ui.listeners
 
 import android.annotation.SuppressLint
 import android.content.res.Configuration
@@ -15,6 +15,7 @@ import androidx.core.os.postDelayed
 import com.github.libretube.ui.base.BaseActivity
 import com.github.libretube.ui.interfaces.PlayerGestureOptions
 import com.github.libretube.ui.models.PlayerViewModel
+import com.github.libretube.helpers.PlayerHelper
 import kotlin.math.abs
 
 class PlayerGestureController(activity: BaseActivity, private val listener: PlayerGestureOptions) :

app/src/main/java/com/github/libretube/ui/listeners/SeekbarPreviewListener.kt

@@ -1,4 +1,4 @@
-package com.github.libretube.util
+package com.github.libretube.ui.listeners
 
 import android.graphics.Bitmap
 import android.view.View
@@ -10,6 +10,7 @@ import androidx.core.view.updateLayoutParams
 import coil.request.ImageRequest
 import com.github.libretube.api.obj.PreviewFrames
 import com.github.libretube.obj.PreviewFrame
+import com.github.libretube.helpers.ImageHelper
 import com.google.android.exoplayer2.ui.TimeBar
 
 class SeekbarPreviewListener(

app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt

@@ -9,7 +9,7 @@ import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.api.obj.Subscription
 import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

app/src/main/java/com/github/libretube/ui/preferences/AdvancedSettings.kt

@@ -7,8 +7,8 @@ import androidx.preference.Preference
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.base.BasePreferenceFragment
-import com.github.libretube.util.ImageHelper
+import com.github.libretube.helpers.ImageHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AdvancedSettings : BasePreferenceFragment() {

app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt

@@ -12,7 +12,7 @@ import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.NavBarOptionsDialog
 import com.github.libretube.ui.dialogs.RequireRestartDialog
 import com.github.libretube.ui.sheets.IconsBottomSheet
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class AppearanceSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.appearance

app/src/main/java/com/github/libretube/ui/preferences/BackupRestoreSettings.kt

@@ -10,8 +10,8 @@ import com.github.libretube.R
 import com.github.libretube.obj.BackupFile
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.BackupDialog
-import com.github.libretube.util.BackupHelper
+import com.github.libretube.helpers.BackupHelper
-import com.github.libretube.util.ImportHelper
+import com.github.libretube.helpers.ImportHelper
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt

@@ -9,8 +9,8 @@ import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.dialogs.RequireRestartDialog
-import com.github.libretube.util.LocaleHelper
+import com.github.libretube.helpers.LocaleHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class GeneralSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.general

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

@@ -20,7 +20,7 @@ import com.github.libretube.ui.dialogs.CustomInstanceDialog
 import com.github.libretube.ui.dialogs.DeleteAccountDialog
 import com.github.libretube.ui.dialogs.LoginDialog
 import com.github.libretube.ui.dialogs.LogoutDialog
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class InstanceSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.instance

app/src/main/java/com/github/libretube/ui/preferences/NotificationSettings.kt

@@ -8,7 +8,7 @@ import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.base.BasePreferenceFragment
 import com.github.libretube.ui.views.TimePickerPreference
-import com.github.libretube.util.NotificationHelper
+import com.github.libretube.helpers.NotificationHelper
 
 class NotificationSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.notifications

app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt

@@ -13,8 +13,8 @@ import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.base.BasePreferenceFragment
-import com.github.libretube.util.LocaleHelper
+import com.github.libretube.helpers.LocaleHelper
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 class PlayerSettings : BasePreferenceFragment() {
     override val titleResourceId: Int = R.string.player

app/src/main/java/com/github/libretube/ui/sheets/ChannelOptionsBottomSheet.kt

@@ -9,8 +9,8 @@ import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
 import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.helpers.BackgroundHelper
-import com.github.libretube.util.NavigationHelper
+import com.github.libretube.helpers.NavigationHelper
 import kotlinx.coroutines.runBlocking
 
 /**

app/src/main/java/com/github/libretube/ui/sheets/PlaybackOptionsSheet.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.PlaybackBottomSheetBinding
 import com.github.libretube.extensions.round
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.PlaybackParameters
 

app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt

@@ -16,7 +16,7 @@ import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.DeletePlaylistDialog
 import com.github.libretube.ui.dialogs.RenamePlaylistDialog
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.helpers.BackgroundHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt

@@ -9,7 +9,7 @@ import com.github.libretube.obj.ShareData
 import com.github.libretube.ui.dialogs.AddToPlaylistDialog
 import com.github.libretube.ui.dialogs.DownloadDialog
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.github.libretube.util.BackgroundHelper
+import com.github.libretube.helpers.BackgroundHelper
 import com.github.libretube.util.PlayingQueue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/github/libretube/ui/tools/SleepTimer.kt

@@ -8,7 +8,7 @@ import androidx.core.os.postDelayed
 import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.activities.MainActivity
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.snackbar.Snackbar
 
 object SleepTimer {

app/src/main/java/com/github/libretube/ui/views/AppNameTextView.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.TypedValue
 import androidx.appcompat.widget.AppCompatTextView
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 
 class AppNameTextView : AppCompatTextView {
     constructor(context: Context, attributeSet: AttributeSet?) : super(context, attributeSet)

app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt

@@ -32,10 +32,10 @@ import com.github.libretube.ui.interfaces.PlayerOptions
 import com.github.libretube.ui.models.PlayerViewModel
 import com.github.libretube.ui.sheets.BaseBottomSheet
 import com.github.libretube.ui.sheets.PlaybackOptionsSheet
-import com.github.libretube.util.AudioHelper
+import com.github.libretube.helpers.AudioHelper
-import com.github.libretube.util.BrightnessHelper
+import com.github.libretube.helpers.BrightnessHelper
-import com.github.libretube.util.PlayerGestureController
+import com.github.libretube.ui.listeners.PlayerGestureController
-import com.github.libretube.util.PlayerHelper
+import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.util.PlayingQueue
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player

app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt

@@ -8,7 +8,7 @@ import android.view.MotionEvent.ACTION_MOVE
 import android.view.ViewConfiguration
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 import kotlin.math.abs
 
 class CustomSwipeToRefresh(context: Context?, attrs: AttributeSet?) :

app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt

@@ -11,8 +11,8 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.Segment
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.extensions.dpToPx
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
-import com.github.libretube.util.ThemeHelper
+import com.github.libretube.helpers.ThemeHelper
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.DefaultTimeBar
 

app/src/main/java/com/github/libretube/ui/views/SliderPreference.kt

@@ -7,7 +7,7 @@ import androidx.preference.Preference
 import com.github.libretube.R
 import com.github.libretube.databinding.DialogSliderBinding
 import com.github.libretube.extensions.round
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**

app/src/main/java/com/github/libretube/ui/views/TimePickerPreference.kt

@@ -5,7 +5,7 @@ import android.text.format.DateFormat.is24HourFormat
 import android.util.AttributeSet
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import java.time.LocalTime

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

@@ -2,6 +2,8 @@ package com.github.libretube.util
 
 import android.content.Context
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.helpers.NetworkHelper
+import com.github.libretube.helpers.PreferenceHelper
 
 object DataSaverMode {
     fun isEnabled(context: Context): Boolean {

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

@@ -1,5 +1,7 @@
 package com.github.libretube.util
 
+import com.github.libretube.helpers.PreferenceHelper
+
 class ExceptionHandler(
     private val defaultExceptionHandler: Thread.UncaughtExceptionHandler?
 ) : Thread.UncaughtExceptionHandler {

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

@@ -24,6 +24,8 @@ import com.github.libretube.compat.PendingIntentCompat
 import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
+import com.github.libretube.helpers.ImageHelper
+import com.github.libretube.helpers.PlayerHelper
 import com.github.libretube.ui.activities.MainActivity
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player

app/src/main/java/com/github/libretube/workers/NotificationWorker.kt

@@ -21,7 +21,7 @@ import com.github.libretube.extensions.TAG
 import com.github.libretube.extensions.toID
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.views.TimePickerPreference
-import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.helpers.PreferenceHelper
 import java.time.LocalTime
 import kotlinx.coroutines.runBlocking