Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Ktlint

This commit is contained in:
tzugen 2021-11-02 09:07:38 +01:00
parent c4e2c786d1
commit a6e76e9d53
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
View File

@ -45,7 +45,6 @@ import org.moire.ultrasonic.service.MediaPlayerController
import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport import org.moire.ultrasonic.service.MediaPlayerLifecycleSupport
import org.moire.ultrasonic.subsonic.ImageLoaderProvider import org.moire.ultrasonic.subsonic.ImageLoaderProvider
import org.moire.ultrasonic.util.Constants import org.moire.ultrasonic.util.Constants
import org.moire.ultrasonic.util.FileUtil
import org.moire.ultrasonic.util.NowPlayingEventDistributor import org.moire.ultrasonic.util.NowPlayingEventDistributor
import org.moire.ultrasonic.util.NowPlayingEventListener import org.moire.ultrasonic.util.NowPlayingEventListener
import org.moire.ultrasonic.util.ServerColor import org.moire.ultrasonic.util.ServerColor

8
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt
View File

@ -20,6 +20,8 @@ import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceCategory import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import java.io.File
import kotlin.math.ceil
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent
import org.koin.java.KoinJavaComponent.get import org.koin.java.KoinJavaComponent.get
import org.koin.java.KoinJavaComponent.inject import org.koin.java.KoinJavaComponent.inject
@ -49,8 +51,6 @@ import org.moire.ultrasonic.util.TimeSpanPreference
import org.moire.ultrasonic.util.TimeSpanPreferenceDialogFragmentCompat import org.moire.ultrasonic.util.TimeSpanPreferenceDialogFragmentCompat
import org.moire.ultrasonic.util.Util.toast import org.moire.ultrasonic.util.Util.toast
import timber.log.Timber import timber.log.Timber
import java.io.File
import kotlin.math.ceil
/** /**
* Shows main app settings. * Shows main app settings.
@ -177,12 +177,10 @@ class SettingsFragment :
contentResolver.takePersistableUriPermission(uri, RW_FLAG) contentResolver.takePersistableUriPermission(uri, RW_FLAG)
setCacheLocation(uri) setCacheLocation(uri)
} }
} }
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val preferences = preferences val preferences = preferences
@ -475,7 +473,7 @@ class SettingsFragment :
companion object { companion object {
const val SELECT_CACHE_ACTIVITY = 161161 const val SELECT_CACHE_ACTIVITY = 161161
const val RW_FLAG = Intent.FLAG_GRANT_READ_URI_PERMISSION or const val RW_FLAG = Intent.FLAG_GRANT_READ_URI_PERMISSION or
Intent.FLAG_GRANT_WRITE_URI_PERMISSION Intent.FLAG_GRANT_WRITE_URI_PERMISSION
const val PERSISTABLE_FLAG = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION const val PERSISTABLE_FLAG = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
} }
} }

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
View File

@ -25,10 +25,8 @@ import java.util.Locale
import java.util.SortedSet import java.util.SortedSet
import java.util.TreeSet import java.util.TreeSet
import java.util.regex.Pattern import java.util.regex.Pattern
import org.koin.java.KoinJavaComponent.inject
import org.moire.ultrasonic.app.UApp import org.moire.ultrasonic.app.UApp
import org.moire.ultrasonic.domain.MusicDirectory import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.service.MediaPlayerController
import timber.log.Timber import timber.log.Timber
object FileUtil { object FileUtil {