From 705771b4ee43737094271f80c21886f160dddf09 Mon Sep 17 00:00:00 2001
From: birdbird <6892457-tzugen@users.noreply.gitlab.com>
Date: Sat, 1 Oct 2022 11:42:55 +0000
Subject: [PATCH] Fix format

---
 settings.gradle                                                | 2 --
 .../kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt   | 1 -
 .../org/moire/ultrasonic/util/TimeSpanPicker.kt                | 0
 .../ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt  | 3 ++-
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename ultrasonic/src/main/{java => kotlin}/org/moire/ultrasonic/util/TimeSpanPicker.kt (100%)
 rename ultrasonic/src/main/{java => kotlin}/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt (93%)

diff --git a/settings.gradle b/settings.gradle
index 272f548b..8fdc7dca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 include ':core:domain'
 include ':core:subsonic-api'
 include ':ultrasonic'
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 f72635d6..b5954746 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt
@@ -159,7 +159,6 @@ class CachedDataSource(
                 bytesTransferred(read)
             }
             return
-
         } catch (e: HttpDataSourceException) {
             throw e
         } catch (ignored: IOException) {
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt
similarity index 100%
rename from ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.kt
rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt
similarity index 93%
rename from ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt
rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt
index 0227a101..1ac4c895 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreferenceDialogFragmentCompat.kt
@@ -20,7 +20,8 @@ class TimeSpanPreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(),
 
     override fun onCreateDialogView(context: Context): View? {
         picker = TimeSpanPicker(context)
-        picker!!.setTimeSpanDisableText(requireContext().resources.getString(R.string.no_expiration))
+        val disabledText = requireContext().resources.getString(R.string.no_expiration)
+        picker!!.setTimeSpanDisableText(disabledText)
         val persisted = Settings.defaultShareExpiration
         if ("" != persisted) {
             val split = Settings.COLON_PATTERN.split(persisted)