From 8be5a293bc6287b7507cbdb0fa5241a3be34b313 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 18 Sep 2022 19:17:38 +0200 Subject: [PATCH] format --- .../com/github/libretube/activities/MainActivity.kt | 3 ++- .../github/libretube/adapters/BottomSheetAdapter.kt | 10 ++++++++-- .../java/com/github/libretube/dialogs/BackupDialog.kt | 7 ++++--- .../com/github/libretube/fragments/PlayerFragment.kt | 6 ++++-- .../java/com/github/libretube/util/NetworkHelper.kt | 6 ++++-- .../com/github/libretube/views/CustomExoPlayerView.kt | 3 ++- app/src/main/res/layout/activity_offline_player.xml | 4 ++-- app/src/main/res/layout/fragment_player.xml | 2 +- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt index 58751d4d4..0ad54fdc3 100644 --- a/app/src/main/java/com/github/libretube/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt @@ -247,7 +247,8 @@ class MainActivity : BaseActivity() { lastSeenVideoId == it.url?.toID() } ?: return@observe if (lastSeenVideoIndex < 1) return@observe - binding.bottomNav.getOrCreateBadge(R.id.subscriptionsFragment).number = lastSeenVideoIndex + binding.bottomNav.getOrCreateBadge(R.id.subscriptionsFragment).number = + lastSeenVideoIndex } } diff --git a/app/src/main/java/com/github/libretube/adapters/BottomSheetAdapter.kt b/app/src/main/java/com/github/libretube/adapters/BottomSheetAdapter.kt index 14120381b..80fff9c24 100644 --- a/app/src/main/java/com/github/libretube/adapters/BottomSheetAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/BottomSheetAdapter.kt @@ -23,8 +23,14 @@ class BottomSheetAdapter( override fun onBindViewHolder(holder: BottomSheetViewHolder, position: Int) { val item = items[position] holder.binding.apply { - title.text = if (item.currentValue != null) "${item.title} (${item.currentValue})" else item.title - if (item.drawable != null) drawable.setImageResource(item.drawable) else drawable.visibility = View.GONE + title.text = + if (item.currentValue != null) "${item.title} (${item.currentValue})" else item.title + if (item.drawable != null) { + drawable.setImageResource(item.drawable) + } else { + drawable.visibility = + View.GONE + } root.setOnClickListener { listener.invoke(position) diff --git a/app/src/main/java/com/github/libretube/dialogs/BackupDialog.kt b/app/src/main/java/com/github/libretube/dialogs/BackupDialog.kt index 68a22686c..0a6ffad96 100644 --- a/app/src/main/java/com/github/libretube/dialogs/BackupDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/BackupDialog.kt @@ -32,9 +32,10 @@ class BackupDialog( binding = DialogBackupBinding.inflate(layoutInflater) binding.backupOptionsRecycler.layoutManager = LinearLayoutManager(context) - binding.backupOptionsRecycler.adapter = BackupOptionsAdapter(backupOptions) { position, isChecked -> - selected[position] = isChecked - } + binding.backupOptionsRecycler.adapter = + BackupOptionsAdapter(backupOptions) { position, isChecked -> + selected[position] = isChecked + } return MaterialAlertDialogBuilder(requireContext()) .setTitle(R.string.backup) diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index f3637c1eb..9674680fb 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -477,7 +477,8 @@ class PlayerFragment : BaseFragment() { exoPlayer.setMediaItem(mediaItem) } else { val videoUri = videosUrlArray[which] - val audioUrl = PlayerHelper.getAudioSource(requireContext(), streams.audioStreams!!) + val audioUrl = + PlayerHelper.getAudioSource(requireContext(), streams.audioStreams!!) setMediaSource(videoUri, audioUrl) } exoPlayer.seekTo(lastPosition) @@ -1290,7 +1291,8 @@ class PlayerFragment : BaseFragment() { // search for quality preference in the available stream sources if (pipedStream.contains(defRes)) { val videoUri = videosUrlArray[index] - val audioUrl = PlayerHelper.getAudioSource(requireContext(), streams.audioStreams!!) + val audioUrl = + PlayerHelper.getAudioSource(requireContext(), streams.audioStreams!!) setMediaSource(videoUri, audioUrl) return } diff --git a/app/src/main/java/com/github/libretube/util/NetworkHelper.kt b/app/src/main/java/com/github/libretube/util/NetworkHelper.kt index 9d098ae3c..ff25b608d 100644 --- a/app/src/main/java/com/github/libretube/util/NetworkHelper.kt +++ b/app/src/main/java/com/github/libretube/util/NetworkHelper.kt @@ -47,12 +47,14 @@ object NetworkHelper { */ @Suppress("DEPRECATION") fun isNetworkMobile(context: Context): Boolean { - val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val connectivityManager = + context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { val networkCapabilities = connectivityManager.getNetworkCapabilities( connectivityManager.activeNetwork ?: return false ) - return networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ?: false + return networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) + ?: false } else { val activeNetwork = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE) return activeNetwork != null && activeNetwork.isConnected diff --git a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt index 0c94e9a72..adfe27c03 100644 --- a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt @@ -173,7 +173,8 @@ internal class CustomExoPlayerView( BottomSheetItem( context.getString(R.string.playback_speed), R.drawable.ic_speed, - "${player?.playbackParameters?.speed + "${ + player?.playbackParameters?.speed .toString() .replace(".0", "") }x" diff --git a/app/src/main/res/layout/activity_offline_player.xml b/app/src/main/res/layout/activity_offline_player.xml index 12376754e..eedd37404 100644 --- a/app/src/main/res/layout/activity_offline_player.xml +++ b/app/src/main/res/layout/activity_offline_player.xml @@ -1,9 +1,9 @@ + android:layout_height="match_parent" + android:orientation="vertical">