From 54659033d373282da136aed4a92455581b404f62 Mon Sep 17 00:00:00 2001 From: birdbird <6892457-tzugen@users.noreply.gitlab.com> Date: Sat, 24 Sep 2022 20:59:08 +0000 Subject: [PATCH] Formatting --- detekt-config.yml | 8 +------- .../TimeSpanPreferenceDialogFragmentCompat.kt | 6 +++--- .../ultrasonic/fragment/EqualizerFragment.kt | 1 - .../ultrasonic/fragment/SettingsFragment.kt | 1 - .../fragment/legacy/SharesFragment.kt | 14 +++++++------- .../imageloader/ArtworkBitmapLoader.kt | 4 ++-- .../ultrasonic/playback/CachedDataSource.kt | 19 +++++++++---------- .../ultrasonic/service/RESTMusicService.kt | 6 ++---- .../ultrasonic/subsonic/DownloadHandler.kt | 1 + .../org/moire/ultrasonic/util/Settings.kt | 1 - .../kotlin/org/moire/ultrasonic/util/Util.kt | 1 - 11 files changed, 25 insertions(+), 37 deletions(-) diff --git a/detekt-config.yml b/detekt-config.yml index df3b8a00..f7ba6e9e 100644 --- a/detekt-config.yml +++ b/detekt-config.yml @@ -2,7 +2,6 @@ build: maxIssues: 0 weights: complexity: 2 - formatting: 1 LongParameterList: 1 comments: 1 @@ -49,18 +48,13 @@ complexity: LabeledExpression: active: false - -formatting: - autoCorrect: true - active: false - style: active: true NewLineAtEndOfFile: active: true ForbiddenComment: active: true - values: 'FIXME:,STOPSHIP:' + values: ['FIXME:', 'STOPSHIP:'] WildcardImport: active: true MaxLineLength: diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt index 7700a7d7..0227a101 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt @@ -9,11 +9,11 @@ package org.moire.ultrasonic.util import android.content.Context import android.view.View -import androidx.preference.PreferenceDialogFragmentCompat import androidx.preference.DialogPreference.TargetFragment import androidx.preference.Preference -import org.moire.ultrasonic.R +import androidx.preference.PreferenceDialogFragmentCompat import java.util.Locale +import org.moire.ultrasonic.R class TimeSpanPreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(), TargetFragment { var picker: TimeSpanPicker? = null @@ -55,4 +55,4 @@ class TimeSpanPreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(), override fun findPreference(p0: CharSequence): T { return preference as T } -} \ No newline at end of file +} diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt index b27750a2..6e729045 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt @@ -28,7 +28,6 @@ import org.moire.ultrasonic.R import org.moire.ultrasonic.audiofx.EqualizerController import org.moire.ultrasonic.fragment.FragmentTitle.Companion.setTitle import org.moire.ultrasonic.util.Util.applyTheme -import org.w3c.dom.Text import timber.log.Timber /** diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt index 75973908..74e810c0 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt @@ -18,7 +18,6 @@ import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan import android.view.View import androidx.annotation.StringRes -import androidx.fragment.app.DialogFragment import androidx.preference.CheckBoxPreference import androidx.preference.EditTextPreference import androidx.preference.ListPreference diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt index e53b6f4e..4657ead2 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt @@ -272,19 +272,19 @@ class SharesFragment : Fragment() { Entry Count: ${share.getEntries().size} Visit Count: ${share.visitCount} """.trimIndent() + - ( - if (share.created == null) "" else """ + ( + if (share.created == null) "" else """ Creation Date: ${share.created!!.replace('T', ' ')} """.trimIndent() - ) + - ( - if (share.lastVisited == null) "" else """ + ) + + ( + if (share.lastVisited == null) "" else """ Last Visited Date: ${share.lastVisited!!.replace('T', ' ')} """.trimIndent() - ) + - if (share.expires == null) "" else """ + ) + + if (share.expires == null) "" else """ Expiration Date: ${share.expires!!.replace('T', ' ')} """.trimIndent() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ArtworkBitmapLoader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ArtworkBitmapLoader.kt index be92785b..ee060a2a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ArtworkBitmapLoader.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ArtworkBitmapLoader.kt @@ -11,7 +11,6 @@ import android.annotation.SuppressLint import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri -import androidx.media3.common.util.UnstableApi import androidx.media3.session.BitmapLoader import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListeningExecutorService @@ -54,7 +53,8 @@ class ArtworkBitmapLoader : BitmapLoader, KoinComponent { @Throws(IOException::class) private fun load(uri: Uri): Bitmap { val parts = uri.path?.trim('/')?.split('|') - if (parts?.count() != 2) throw IllegalArgumentException("Invalid bitmap Uri") + + require(parts!!.count() == 2) { "Invalid bitmap Uri" } return imageLoader.getImage(parts[0], parts[1], false, 0) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt index 8bbebc3c..f72635d6 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt @@ -159,16 +159,15 @@ class CachedDataSource( bytesTransferred(read) } return - } catch (e: IOException) { - if (e is HttpDataSourceException) { - throw e - } else { - throw HttpDataSourceException( - dataSpec, - PlaybackException.ERROR_CODE_IO_UNSPECIFIED, - HttpDataSourceException.TYPE_OPEN - ) - } + + } catch (e: HttpDataSourceException) { + throw e + } catch (ignored: IOException) { + throw HttpDataSourceException( + dataSpec, + PlaybackException.ERROR_CODE_IO_UNSPECIFIED, + HttpDataSourceException.TYPE_OPEN + ) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt index a6e2e034..eddf1d9f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt @@ -280,9 +280,7 @@ open class RESTMusicService( name: String?, tracks: List ) { - if (id == null && name == null) - throw IllegalArgumentException("Either id or name is required.") - + require(id != null || name != null) { "Either id or name is required." } val pSongIds: MutableList = ArrayList(tracks.size) for ((id1) in tracks) { @@ -488,7 +486,7 @@ open class RESTMusicService( return url.toString() } - val streamClient by lazy { + private val streamClient by lazy { // Create a new modified okhttp client to intercept the URL val builder = subsonicAPIClient.okHttpClient.newBuilder() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt index ff531995..16685364 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt @@ -241,6 +241,7 @@ class DownloadHandler( return songs } + @Suppress("DestructuringDeclarationWithTooManyEntries") @Throws(Exception::class) private fun getSongsRecursively( parent: MusicDirectory, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt index 09886b7d..bce819ad 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt @@ -19,7 +19,6 @@ import org.moire.ultrasonic.app.UApp */ object Settings { - @JvmStatic var theme by StringSetting( getKey(R.string.setting_key_theme), diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt index 965af68b..eeada628 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt @@ -38,7 +38,6 @@ import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.AnyRes -import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.media3.common.C import androidx.media3.common.MediaItem