From 057cf3f02f463be39cb80bcf4d6283f75f731d0d Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Sat, 21 May 2022 09:02:04 +0100 Subject: [PATCH] Fix all linting errors. --- .../libretube/ExampleInstrumentedTest.kt | 2 +- .../github/libretube/AddtoPlaylistDialog.kt | 18 +- .../com/github/libretube/ChannelFragment.kt | 32 +++- .../github/libretube/CreatePlaylistDialog.kt | 3 +- .../com/github/libretube/DownloadDialog.kt | 23 ++- .../com/github/libretube/DownloadService.kt | 34 +++- .../main/java/com/github/libretube/Home.kt | 10 +- .../main/java/com/github/libretube/Library.kt | 16 +- .../java/com/github/libretube/LoginDialog.kt | 14 +- .../java/com/github/libretube/MainActivity.kt | 63 +++++-- .../java/com/github/libretube/PipedApi.kt | 55 +++++- .../main/java/com/github/libretube/Player.kt | 6 +- .../com/github/libretube/PlayerFragment.kt | 165 +++++++++++------- .../com/github/libretube/PlaylistFragment.kt | 14 +- .../com/github/libretube/ResettableLazy.kt | 11 +- .../com/github/libretube/SearchFragment.kt | 32 ++-- .../com/github/libretube/SettingsActivity.kt | 140 ++++++++------- .../SingleViewTouchableMotionLayout.kt | 3 +- .../github/libretube/SponsorBlockSettings.kt | 1 + .../com/github/libretube/Subscriptions.kt | 28 +-- .../java/com/github/libretube/ThemeChanger.kt | 8 +- .../libretube/adapters/ChannelAdapter.kt | 12 +- .../libretube/adapters/CommentsAdapter.kt | 16 +- .../libretube/adapters/PlaylistAdapter.kt | 16 +- .../libretube/adapters/PlaylistsAdapter.kt | 10 +- .../libretube/adapters/SearchAdapter.kt | 24 ++- .../libretube/adapters/SubscriptionAdapter.kt | 12 +- .../adapters/SubscriptionChannelAdapter.kt | 7 +- .../libretube/adapters/TrendingAdapter.kt | 12 +- .../com/github/libretube/ExampleUnitTest.kt | 2 +- 30 files changed, 536 insertions(+), 253 deletions(-) diff --git a/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt index e89f1b40c..8c8b6aa33 100644 --- a/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt @@ -2,7 +2,7 @@ package com.github.libretube import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/main/java/com/github/libretube/AddtoPlaylistDialog.kt b/app/src/main/java/com/github/libretube/AddtoPlaylistDialog.kt index 2e1ad5499..580087318 100644 --- a/app/src/main/java/com/github/libretube/AddtoPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/AddtoPlaylistDialog.kt @@ -6,15 +6,19 @@ import android.os.Bundle import android.util.Log import android.util.TypedValue import android.view.View -import android.widget.* +import android.widget.ArrayAdapter +import android.widget.Button +import android.widget.Spinner +import android.widget.TextView +import android.widget.Toast import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.github.libretube.obj.PlaylistId import com.google.android.material.dialog.MaterialAlertDialogBuilder -import retrofit2.HttpException import java.io.IOException +import retrofit2.HttpException class AddtoPlaylistDialog : DialogFragment() { private val TAG = "AddToPlaylistDialog" @@ -49,6 +53,7 @@ class AddtoPlaylistDialog : DialogFragment() { builder.create() } ?: throw IllegalStateException("Activity cannot be null") } + private fun fetchPlaylists() { fun run() { lifecycleScope.launchWhenCreated { @@ -69,8 +74,11 @@ class AddtoPlaylistDialog : DialogFragment() { for (playlist in response) { names.add(playlist.name!!) } - val arrayAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, names) - arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + val arrayAdapter = + ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, names) + arrayAdapter.setDropDownViewResource( + android.R.layout.simple_spinner_dropdown_item + ) spinner.adapter = arrayAdapter runOnUiThread { button.setOnClickListener { @@ -83,6 +91,7 @@ class AddtoPlaylistDialog : DialogFragment() { } run() } + private fun addToPlaylist(playlistId: String) { fun run() { lifecycleScope.launchWhenCreated { @@ -108,6 +117,7 @@ class AddtoPlaylistDialog : DialogFragment() { } run() } + private fun Fragment?.runOnUiThread(action: () -> Unit) { this ?: return if (!isAdded) return // Fragment not attached to an Activity diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index d9af3e2d0..2ef90184a 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -3,7 +3,6 @@ package com.github.libretube import android.annotation.SuppressLint import android.content.Context import android.os.Bundle -import android.text.TextUtils.substring import android.util.Log import android.view.LayoutInflater import android.view.View @@ -94,7 +93,10 @@ class ChannelFragment : Fragment() { lifecycleScope.launchWhenCreated { val response = try { val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE) - RetrofitInstance.api.isSubscribed(channel_id!!, sharedPref?.getString("token", "")!!) + RetrofitInstance.api.isSubscribed( + channel_id!!, + sharedPref?.getString("token", "")!! + ) } catch (e: IOException) { println(e) Log.e(TAG, "IOException, you might not have internet connection") @@ -131,7 +133,10 @@ class ChannelFragment : Fragment() { lifecycleScope.launchWhenCreated { val response = try { val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE) - RetrofitInstance.api.subscribe(sharedPref?.getString("token", "")!!, Subscribe(channel_id)) + RetrofitInstance.api.subscribe( + sharedPref?.getString("token", "")!!, + Subscribe(channel_id) + ) } catch (e: IOException) { println(e) Log.e(TAG, "IOException, you might not have internet connection") @@ -145,12 +150,16 @@ class ChannelFragment : Fragment() { } run() } + private fun unsubscribe() { fun run() { lifecycleScope.launchWhenCreated { val response = try { val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE) - RetrofitInstance.api.unsubscribe(sharedPref?.getString("token", "")!!, Subscribe(channel_id)) + RetrofitInstance.api.unsubscribe( + sharedPref?.getString("token", "")!!, + Subscribe(channel_id) + ) } catch (e: IOException) { println(e) Log.e(TAG, "IOException, you might not have internet connection") @@ -186,12 +195,19 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE val channelName = view.findViewById(R.id.channel_name) - channelName.text = if (response.name?.length!! > 18) response.name.toString().substring(0, 16) + "..." else response.name + channelName.text = if (response.name?.length!! > 18) response.name.toString() + .substring(0, 16) + "..." else response.name val channelVerified = view.findViewById(R.id.channel_verified) if (response.verified) channelVerified.visibility = View.VISIBLE - view.findViewById(R.id.channel_subs).text = resources.getString(R.string.subscribers, response.subscriberCount.formatShort()) + view.findViewById(R.id.channel_subs).text = resources.getString( + R.string.subscribers, + response.subscriberCount.formatShort() + ) val channelDescription = view.findViewById(R.id.channel_description) - if (response.description?.trim() == "") channelDescription.visibility = View.GONE else channelDescription.text = response.description?.trim() + if (response.description?.trim() == "") + channelDescription.visibility = View.GONE + else + channelDescription.text = response.description?.trim() val bannerImage = view.findViewById(R.id.channel_banner) val channelImage = view.findViewById(R.id.channel_image) Picasso.get().load(response.bannerUrl).into(bannerImage) @@ -203,6 +219,7 @@ class ChannelFragment : Fragment() { } run() } + private fun fetchNextPage() { fun run() { @@ -227,6 +244,7 @@ class ChannelFragment : Fragment() { } run() } + private fun Fragment?.runOnUiThread(action: () -> Unit) { this ?: return if (!isAdded) return // Fragment not attached to an Activity diff --git a/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt index 05c629852..bfbfa70f2 100644 --- a/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt @@ -12,6 +12,7 @@ import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult +import com.google.android.material.textfield.TextInputEditText class CreatePlaylistDialog : DialogFragment() { override fun onCreateView( @@ -35,7 +36,7 @@ class CreatePlaylistDialog : DialogFragment() { dismiss() } - val playlistName = rootView.findViewById(R.id.playlist_name) + val playlistName = rootView.findViewById(R.id.playlist_name) val createPlaylistBtn = rootView.findViewById