Merge pull request #4277 from Bnyro/master

chore: fix project formatting

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

@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.ExistingPeriodicWorkPolicy
-import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
 import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
 import com.github.libretube.constants.PUSH_CHANNEL_ID

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

@@ -11,10 +11,12 @@ import retrofit2.create
 object RetrofitInstance {
     private val url get() = PreferenceHelper.getString(PreferenceKeys.FETCH_INSTANCE, PIPED_API_URL)
     private val authUrl
-        get() = when (PreferenceHelper.getBoolean(
+        get() = when (
+            PreferenceHelper.getBoolean(
                 PreferenceKeys.AUTH_INSTANCE_TOGGLE,
                 false
-        )) {
+            )
+        ) {
             true -> PreferenceHelper.getString(
                 PreferenceKeys.AUTH_INSTANCE,
                 PIPED_API_URL

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

@@ -15,7 +15,9 @@ fun Int.formatAsFileSize(): String {
 fun Long.formatAsFileSize(): String {
     return log2(if (this != 0L) toDouble() else 1.0).toInt().div(10).let {
         val precision = when (it) {
-            0 -> 0; 1 -> 1; else -> 2
+            0 -> 0
+            1 -> 1
+            else -> 2
         }
         val prefix = arrayOf("", "K", "M", "G", "T", "P", "E", "Z", "Y")
         String.format("%.${precision}f ${prefix[it]}B", toDouble() / 2.0.pow(it * 10.0))

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

@@ -92,7 +92,10 @@ object BackupHelper {
                     is Int -> {
                         when {
                             // we only use integers for SponsorBlock colors and the start fragment
-                            key == PreferenceKeys.START_FRAGMENT || key.orEmpty().contains("_color") -> putInt(key, value)
+                            key == PreferenceKeys.START_FRAGMENT || key.orEmpty().contains("_color") -> putInt(
+                                key,
+                                value
+                            )
                             else -> putLong(key, value.toLong())
                         }
                     }

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

@@ -41,10 +41,10 @@ import com.github.libretube.enums.SbSkipOptions
 import com.github.libretube.extensions.updateParameters
 import com.github.libretube.obj.PreviewFrame
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.runBlocking
 import java.util.Locale
 import kotlin.math.absoluteValue
 import kotlin.math.roundToInt
+import kotlinx.coroutines.runBlocking
 
 object PlayerHelper {
     private const val ACTION_MEDIA_CONTROL = "media_control"
@@ -662,12 +662,15 @@ object PlayerHelper {
         val audioLanguage = audioLanguageAndRoleFlags.first
         return context.getString(R.string.audio_track_format)
             .format(
-                if (audioLanguage == null) context.getString(R.string.unknown_audio_language)
+                if (audioLanguage == null) {
-                else Locale.forLanguageTag(audioLanguage)
+                    context.getString(R.string.unknown_audio_language)
+                } else {
+                    Locale.forLanguageTag(audioLanguage)
                         .getDisplayLanguage(
                             LocaleHelper.getAppLocale()
                         )
-                    .ifEmpty { context.getString(R.string.unknown_audio_language) },
+                        .ifEmpty { context.getString(R.string.unknown_audio_language) }
+                },
                 getDisplayAudioTrackTypeFromFormat(context, audioLanguageAndRoleFlags.second)
             )
     }
@@ -691,12 +694,15 @@ object PlayerHelper {
         // Filter unsupported tracks and keep only selected tracks if requested
         // Use a lambda expression to avoid checking on each audio format if we keep only selected
         // tracks or not
-        val trackFilter = if (keepOnlySelectedTracks)
+        val trackFilter = if (keepOnlySelectedTracks) {
             { group: Tracks.Group, trackIndex: Int ->
                 group.isTrackSupported(trackIndex) && group.isTrackSelected(
                     trackIndex
                 )
-            } else { group: Tracks.Group, trackIndex: Int -> group.isTrackSupported(trackIndex) }
+            }
+        } else {
+            { group: Tracks.Group, trackIndex: Int -> group.isTrackSupported(trackIndex) }
+        }
 
         return groups.filter {
             it.type == C.TRACK_TYPE_AUDIO
@@ -729,9 +735,9 @@ object PlayerHelper {
      * @return whether the provided ExoPlayer flags contain a flag used for audio track types
      */
     fun haveAudioTrackRoleFlagSet(@C.RoleFlags roleFlags: Int): Boolean {
-        return isFlagSet(roleFlags, C.ROLE_FLAG_DESCRIBES_VIDEO)
+        return isFlagSet(roleFlags, C.ROLE_FLAG_DESCRIBES_VIDEO) ||
-                || isFlagSet(roleFlags, C.ROLE_FLAG_DUB)
+            isFlagSet(roleFlags, C.ROLE_FLAG_DUB) ||
-                || isFlagSet(roleFlags, C.ROLE_FLAG_MAIN)
+            isFlagSet(roleFlags, C.ROLE_FLAG_MAIN) ||
-                || isFlagSet(roleFlags, C.ROLE_FLAG_ALTERNATE)
+            isFlagSet(roleFlags, C.ROLE_FLAG_ALTERNATE)
     }
 }

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

@@ -1,6 +1,5 @@
 package com.github.libretube.helpers
 
-import android.util.Log
 import com.github.libretube.api.CronetHelper
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.constants.PreferenceKeys

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

@@ -47,6 +47,11 @@ import java.net.URL
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
 import java.util.concurrent.Executors
+import kotlin.io.path.absolute
+import kotlin.io.path.createFile
+import kotlin.io.path.deleteIfExists
+import kotlin.io.path.fileSize
+import kotlin.math.min
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -61,11 +66,6 @@ import kotlinx.coroutines.withContext
 import okio.buffer
 import okio.sink
 import okio.source
-import kotlin.io.path.absolute
-import kotlin.io.path.createFile
-import kotlin.io.path.deleteIfExists
-import kotlin.io.path.fileSize
-import kotlin.math.min
 
 /**
  * Download service with custom implementation of downloading using [HttpURLConnection].

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

@@ -303,7 +303,9 @@ class OnlinePlayerService : LifecycleService() {
         val streams = streams ?: return
 
         val (uri, mimeType) = if (streams.audioStreams.isNotEmpty()) {
-            val disableProxy = ProxyHelper.useYouTubeSourceWithoutProxy(streams.videoStreams.first().url!!)
+            val disableProxy = ProxyHelper.useYouTubeSourceWithoutProxy(
+                streams.videoStreams.first().url!!
+            )
             PlayerHelper.createDashSource(
                 streams,
                 this,

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

@@ -20,10 +20,10 @@ import com.github.libretube.ui.sheets.DownloadOptionsBottomSheet
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
 import com.github.libretube.util.TextUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.fileSize
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 
 class DownloadsAdapter(
     private val context: Context,

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

@@ -104,8 +104,12 @@ class AddToPlaylistDialog(
             appContext.toastFromMainDispatcher(R.string.unknown_error)
             return
         }
-        if (success) appContext.toastFromMainDispatcher(
+        if (success) {
+            appContext.toastFromMainDispatcher(
                 appContext.getString(R.string.added_to_playlist, playlistName)
-        ) else appContext.toastFromMainDispatcher(R.string.fail)
+            )
+        } else {
+            appContext.toastFromMainDispatcher(R.string.fail)
+        }
     }
 }

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

@@ -13,7 +13,6 @@ import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.constraintlayout.motion.widget.TransitionAdapter
 import androidx.core.view.isVisible

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

@@ -25,12 +25,12 @@ import com.github.libretube.receivers.DownloadReceiver
 import com.github.libretube.services.DownloadService
 import com.github.libretube.ui.adapters.DownloadsAdapter
 import com.github.libretube.ui.viewholders.DownloadsViewHolder
+import kotlin.io.path.fileSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlin.io.path.fileSize
 
 class DownloadsFragment : Fragment() {
     private var _binding: FragmentDownloadsBinding? = null
@@ -113,7 +113,7 @@ class DownloadsFragment : Fragment() {
 
         binding.downloads.adapter = adapter
 
-        val itemTouchCallback = object: ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
+        val itemTouchCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
             override fun getMovementFlags(
                 recyclerView: RecyclerView,
                 viewHolder: RecyclerView.ViewHolder

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

@@ -115,16 +115,16 @@ import com.github.libretube.util.TextUtils
 import com.github.libretube.util.TextUtils.toTimeInSeconds
 import com.github.libretube.util.YoutubeHlsPlaylistParser
 import com.github.libretube.util.deArrow
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.Executors
+import kotlin.math.abs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import retrofit2.HttpException
-import java.io.IOException
-import java.util.*
-import java.util.concurrent.Executors
-import kotlin.math.abs
 
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 class PlayerFragment : Fragment(), OnlinePlayerOptions {
@@ -1298,9 +1298,11 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
             ) && streams.videoStreams.isNotEmpty() -> {
                 // only use the dash manifest generated by YT if either it's a livestream or no other source is available
                 val dashUri =
-                    if (streams.livestream && streams.dash != null) ProxyHelper.unwrapStreamUrl(
+                    if (streams.livestream && streams.dash != null) {
+                        ProxyHelper.unwrapStreamUrl(
                             streams.dash!!
-                    ).toUri() else {
+                        ).toUri()
+                    } else {
                         // skip LBRY urls when checking whether the stream source is usable
                         val urlToTest = streams.videoStreams.firstOrNull {
                             !it.quality.orEmpty().contains("LBRY")
@@ -1324,7 +1326,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
                 val mediaSource = hlsMediaSourceFactory.createMediaSource(
                     createMediaItem(
                         ProxyHelper.unwrapStreamUrl(streams.hls!!).toUri(),
-                        MimeTypes.APPLICATION_M3U8,
+                        MimeTypes.APPLICATION_M3U8
                     )
                 )
                 exoPlayer.setMediaSource(mediaSource)
@@ -1448,7 +1450,8 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
     override fun onAudioStreamClicked() {
         val context = requireContext()
         val audioLanguagesAndRoleFlags = PlayerHelper.getAudioLanguagesAndRoleFlagsFromTrackGroups(
-            exoPlayer.currentTracks.groups, false
+            exoPlayer.currentTracks.groups,
+            false
         )
         val audioLanguages = audioLanguagesAndRoleFlags.map {
             PlayerHelper.getAudioTrackNameFromFormat(context, it)
@@ -1460,9 +1463,9 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
                 listOf(context.getString(R.string.unknown_or_no_audio)),
                 null
             )
-        } else if (audioLanguagesAndRoleFlags.size == 1
+        } else if (audioLanguagesAndRoleFlags.size == 1 &&
-            && audioLanguagesAndRoleFlags[0].first == null
+            audioLanguagesAndRoleFlags[0].first == null &&
-            && !PlayerHelper.haveAudioTrackRoleFlagSet(
+            !PlayerHelper.haveAudioTrackRoleFlagSet(
                 audioLanguagesAndRoleFlags[0].second
             )
         ) {

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

@@ -2,12 +2,10 @@ package com.github.libretube.ui.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
-import android.widget.Toast
 import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isVisible

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

@@ -11,7 +11,6 @@ import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.obj.ShareData
 import com.github.libretube.services.OfflinePlayerService
 import com.github.libretube.ui.dialogs.ShareDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DownloadOptionsBottomSheet(
     private val download: Download,

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

@@ -84,7 +84,6 @@ open class CustomExoPlayerView(
             updateCurrentPosition()
         }
 
-
     /**
      * Preferences
      */

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

@@ -86,9 +86,9 @@ class OnlinePlayerView(
         // format or quality
         val firstSelectedAudioFormat = selectedAudioLanguagesAndRoleFlags[0]
 
-        if (selectedAudioLanguagesAndRoleFlags.size == 1
+        if (selectedAudioLanguagesAndRoleFlags.size == 1 &&
-            && firstSelectedAudioFormat.first == null
+            firstSelectedAudioFormat.first == null &&
-            && !PlayerHelper.haveAudioTrackRoleFlagSet(
+            !PlayerHelper.haveAudioTrackRoleFlagSet(
                 firstSelectedAudioFormat.second
             )
         ) {

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

@@ -121,7 +121,9 @@ class NowPlayingNotification(
     private fun processBitmap(bitmap: Bitmap): Bitmap {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             bitmap
-        } else ImageHelper.getSquareBitmap(bitmap)
+        } else {
+            ImageHelper.getSquareBitmap(bitmap)
+        }
     }
 
     private val legacyNotificationButtons