From 7dfaea3a4b51a0ac5424d2d078411b57e96d29c8 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Fri, 18 Oct 2024 15:41:06 -0600 Subject: [PATCH] all: cleanup --- app/src/main/AndroidManifest.xml | 3 +- .../java/org/oxycblt/auxio/AuxioService.kt | 2 - .../auxio/detail/ArtistDetailFragment.kt | 1 - .../auxio/detail/list/DetailListAdapter.kt | 1 - .../main/java/org/oxycblt/auxio/list/Data.kt | 1 - .../org/oxycblt/auxio/list/ListFragment.kt | 1 - .../java/org/oxycblt/auxio/list/Listeners.kt | 1 - .../auxio/list/adapter/FlexibleListAdapter.kt | 1 - .../list/adapter/PlayingIndicatorAdapter.kt | 1 - .../list/adapter/SelectionIndicatorAdapter.kt | 1 - .../auxio/list/adapter/SimpleDiffCallback.kt | 1 - .../auxio/list/recycler/ViewHolders.kt | 2 + .../java/org/oxycblt/auxio/music/Music.kt | 7 +-- .../org/oxycblt/auxio/music/external/M3U.kt | 4 +- .../java/org/oxycblt/auxio/music/info/Date.kt | 4 +- .../music/service/MusicServiceFragment.kt | 5 +- .../music/service/SystemContentObserver.kt | 2 +- .../playback/service/MediaButtonReceiver.kt | 2 +- .../playback/service/MediaSessionHolder.kt | 6 +- .../playback/service/MediaSessionInterface.kt | 33 +++++------ .../service/PlaybackServiceFragment.kt | 4 +- .../service/SystemPlaybackReceiver.kt | 1 + .../auxio/playback/state/PlaybackCommand.kt | 3 +- .../org/oxycblt/auxio/search/SearchEngine.kt | 2 +- .../java/org/oxycblt/auxio/tasker/Start.kt | 2 +- .../org/oxycblt/auxio/util/ContextUtil.kt | 1 - .../oxycblt/auxio/util/CopyleftNoticeTree.kt | 2 +- .../org/oxycblt/auxio/util/FrameworkUtil.kt | 2 + .../java/org/oxycblt/auxio/util/LangUtil.kt | 1 - .../widgets/WidgetBitmapTransformation.kt | 2 +- app/src/main/res/color/overlay_stroke.xml | 4 -- .../res/layout-h480dp/item_playback_song.xml | 56 ------------------- .../res/layout-sw600dp/item_playback_song.xml | 56 ------------------- .../main/res/layout/item_playback_song.xml | 55 ------------------ 34 files changed, 43 insertions(+), 227 deletions(-) delete mode 100644 app/src/main/res/color/overlay_stroke.xml delete mode 100644 app/src/main/res/layout-h480dp/item_playback_song.xml delete mode 100644 app/src/main/res/layout-sw600dp/item_playback_song.xml delete mode 100644 app/src/main/res/layout/item_playback_song.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91ca80093..7e3ff8019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -93,7 +93,8 @@ android:foregroundServiceType="mediaPlayback" android:icon="@mipmap/ic_launcher" android:exported="true" - android:roundIcon="@mipmap/ic_launcher"> + android:roundIcon="@mipmap/ic_launcher" + tools:ignore="ExportedService"> diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt index 7edcad1e9..cf8033f7d 100644 --- a/app/src/main/java/org/oxycblt/auxio/AuxioService.kt +++ b/app/src/main/java/org/oxycblt/auxio/AuxioService.kt @@ -36,7 +36,6 @@ import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import org.oxycblt.auxio.music.service.MusicServiceFragment import org.oxycblt.auxio.playback.service.PlaybackServiceFragment -import timber.log.Timber as T @AndroidEntryPoint class AuxioService : @@ -150,7 +149,6 @@ class AuxioService : } override fun invalidateMusic(mediaId: String) { - T.d(mediaId) notifyChildrenChanged(mediaId) } diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt index cf86c72d8..01201e33d 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt @@ -40,7 +40,6 @@ import org.oxycblt.auxio.music.resolveNames import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.util.collect import org.oxycblt.auxio.util.collectImmediately -import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.getPlural import org.oxycblt.auxio.util.navigateSafe import org.oxycblt.auxio.util.showToast diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt index c28dce1f2..87aebf5df 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt @@ -38,7 +38,6 @@ import org.oxycblt.auxio.list.recycler.DividerViewHolder import org.oxycblt.auxio.music.Music import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater -import timber.log.Timber as T /** * A [RecyclerView.Adapter] that implements shared behavior between lists of child items in the diff --git a/app/src/main/java/org/oxycblt/auxio/list/Data.kt b/app/src/main/java/org/oxycblt/auxio/list/Data.kt index 9c874b5b1..5507bb9fc 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/Data.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/Data.kt @@ -19,7 +19,6 @@ package org.oxycblt.auxio.list import androidx.annotation.StringRes -import timber.log.Timber as T // TODO: Consider breaking this up into sealed classes for individual adapters /** A marker for something that is a RecyclerView item. Has no functionality on it's own. */ diff --git a/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt b/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt index 49636b594..546b03a49 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt @@ -21,7 +21,6 @@ package org.oxycblt.auxio.list import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding import org.oxycblt.auxio.music.Music -import timber.log.Timber as T /** * A Fragment containing a selectable list. diff --git a/app/src/main/java/org/oxycblt/auxio/list/Listeners.kt b/app/src/main/java/org/oxycblt/auxio/list/Listeners.kt index 0b0b701d7..c7704e503 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/Listeners.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/Listeners.kt @@ -21,7 +21,6 @@ package org.oxycblt.auxio.list import android.view.MotionEvent import android.view.View import androidx.recyclerview.widget.RecyclerView -import timber.log.Timber as T /** * A basic listener for list interactions. diff --git a/app/src/main/java/org/oxycblt/auxio/list/adapter/FlexibleListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/list/adapter/FlexibleListAdapter.kt index 99bd112f3..34b219a64 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/adapter/FlexibleListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/adapter/FlexibleListAdapter.kt @@ -25,7 +25,6 @@ import androidx.recyclerview.widget.AsyncDifferConfig import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import java.util.concurrent.Executor -import timber.log.Timber as T /** * A variant of ListDiffer with more flexible updates. diff --git a/app/src/main/java/org/oxycblt/auxio/list/adapter/PlayingIndicatorAdapter.kt b/app/src/main/java/org/oxycblt/auxio/list/adapter/PlayingIndicatorAdapter.kt index 15e36be00..d494da0a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/adapter/PlayingIndicatorAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/adapter/PlayingIndicatorAdapter.kt @@ -21,7 +21,6 @@ package org.oxycblt.auxio.list.adapter import android.view.View import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import timber.log.Timber as T /** * A [RecyclerView.Adapter] that supports indicating the playback status of a particular item. diff --git a/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt b/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt index 0bd0a80ed..65b9bcef1 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt @@ -22,7 +22,6 @@ import android.view.View import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import org.oxycblt.auxio.music.Music -import timber.log.Timber as T /** * A [PlayingIndicatorAdapter] that also supports indicating the selection status of a group of diff --git a/app/src/main/java/org/oxycblt/auxio/list/adapter/SimpleDiffCallback.kt b/app/src/main/java/org/oxycblt/auxio/list/adapter/SimpleDiffCallback.kt index 53105d975..d1fdc8a7a 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/adapter/SimpleDiffCallback.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/adapter/SimpleDiffCallback.kt @@ -20,7 +20,6 @@ package org.oxycblt.auxio.list.adapter import androidx.recyclerview.widget.DiffUtil import org.oxycblt.auxio.list.Item -import timber.log.Timber as T /** * A [DiffUtil.ItemCallback] that automatically implements the [areItemsTheSame] method. Use this diff --git a/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt b/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt index d7f5e1d23..c99d87953 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt @@ -18,6 +18,7 @@ package org.oxycblt.auxio.list.recycler +import android.annotation.SuppressLint import android.view.View import androidx.recyclerview.widget.RecyclerView import com.google.android.material.divider.MaterialDivider @@ -382,6 +383,7 @@ class DividerViewHolder private constructor(divider: MaterialDivider) : /** A comparator that can be used with DiffUtil. */ val DIFF_CALLBACK = object : SimpleDiffCallback() { + @SuppressLint("DiffUtilEquals") override fun areContentsTheSame(oldItem: PlainDivider, newItem: PlainDivider) = oldItem.anchor == newItem.anchor } diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt index 384151936..e7916d02b 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt @@ -22,9 +22,6 @@ import android.content.Context import android.net.Uri import android.os.Parcelable import androidx.room.TypeConverter -import java.security.MessageDigest -import java.util.UUID -import kotlin.math.max import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import org.oxycblt.auxio.image.extractor.Cover @@ -39,7 +36,9 @@ import org.oxycblt.auxio.music.info.ReleaseType import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.util.concatLocalized import org.oxycblt.auxio.util.toUuidOrNull -import timber.log.Timber as T +import java.security.MessageDigest +import java.util.UUID +import kotlin.math.max /** * Abstract music data. This contains universal information about all concrete music diff --git a/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt b/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt index bb8318241..3cfd30487 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/external/M3U.kt @@ -261,7 +261,7 @@ constructor( } commonIndex == components.size -> { // The working directory is deeper in the path, backtrack. - for (i in 0..workingDirectory.components.size - commonIndex - 1) { + for (i in 0.. { // The paths are siblings. Backtrack and append as needed. - for (i in 0..workingDirectory.components.size - commonIndex - 1) { + for (i in 0..) : Comparable { val year = tokens[0] - val month = tokens.getOrNull(1) - val day = tokens.getOrNull(2) + private val month = tokens.getOrNull(1) + private val day = tokens.getOrNull(2) private val hour = tokens.getOrNull(3) private val minute = tokens.getOrNull(4) private val second = tokens.getOrNull(5) diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt index 7494878e3..79dfe384a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt @@ -23,7 +23,6 @@ import android.os.Bundle import android.support.v4.media.MediaBrowserCompat.MediaItem import androidx.media.MediaBrowserServiceCompat.BrowserRoot import androidx.media.MediaBrowserServiceCompat.Result -import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -31,12 +30,12 @@ import kotlinx.coroutines.launch import org.oxycblt.auxio.ForegroundListener import org.oxycblt.auxio.ForegroundServiceNotification import org.oxycblt.auxio.music.MusicRepository -import timber.log.Timber as T +import javax.inject.Inject class MusicServiceFragment @Inject constructor( - private val context: Context, + context: Context, foregroundListener: ForegroundListener, private val invalidator: Invalidator, indexerFactory: Indexer.Factory, diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt index b518e8f24..4bb23abd9 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt @@ -33,7 +33,7 @@ import timber.log.Timber as T /** * A [ContentObserver] that observes the [MediaStore] music database for changes, a behavior known * to the user as automatic rescanning. The active (and not passive) nature of observing the - * database is what requires [IndexerServiceFragment] to stay foreground when this is enabled. + * database is what requires [MusicServiceFragment] to stay foreground when this is enabled. */ class SystemContentObserver @Inject diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaButtonReceiver.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaButtonReceiver.kt index 2c32f25e2..c70b14a7e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaButtonReceiver.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaButtonReceiver.kt @@ -31,7 +31,7 @@ import timber.log.Timber as T /** * A [BroadcastReceiver] that forwards [Intent.ACTION_MEDIA_BUTTON] [Intent]s to - * [MediaSessionServiceFragment]. + * [PlaybackServiceFragment]. * * @author Alexander Capehart (OxygenCobalt) */ diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt index d5b0f43b3..54e5774c2 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt @@ -53,7 +53,7 @@ import timber.log.Timber as T /** * A component that mirrors the current playback state into the [MediaSessionCompat] and - * [NotificationComponent]. + * [PlaybackNotification]. * * @author Alexander Capehart (OxygenCobalt) */ @@ -109,7 +109,7 @@ private constructor( /** * Release this instance, closing the [MediaSessionCompat] and preventing any further updates to - * the [NotificationComponent]. + * the [PlaybackNotification]. */ fun release() { bitmapProvider.release() @@ -202,7 +202,7 @@ private constructor( /** * Upload a new [MediaMetadataCompat] based on the current playback state to the - * [MediaSessionCompat] and [NotificationComponent]. + * [MediaSessionCompat] and [PlaybackNotification]. * * @param song The current [Song] to create the [MediaMetadataCompat] from, or null if no [Song] * is currently playing. diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt index d9ec16787..13c57e97a 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt @@ -59,25 +59,22 @@ constructor( ) : MediaSessionCompat.Callback() { private val jaroWinkler = JaroWinklerSimilarity() - override fun onPrepare() { - super.onPrepare() - // STUB, we already automatically prepare playback. - } + // STUBS: We already automatically prepare playback. + // override fun onPrepare() { + // super.onPrepare() + // } - override fun onPrepareFromMediaId(mediaId: String?, extras: Bundle?) { - super.onPrepareFromMediaId(mediaId, extras) - // STUB, can't tell when this is called - } - - override fun onPrepareFromUri(uri: Uri?, extras: Bundle?) { - super.onPrepareFromUri(uri, extras) - // STUB, can't tell when this is called - } - - override fun onPlayFromUri(uri: Uri?, extras: Bundle?) { - super.onPlayFromUri(uri, extras) - // STUB, can't tell when this is called - } + // override fun onPrepareFromMediaId(mediaId: String?, extras: Bundle?) { + // super.onPrepareFromMediaId(mediaId, extras) + // } + // + // override fun onPrepareFromUri(uri: Uri?, extras: Bundle?) { + // super.onPrepareFromUri(uri, extras) + // } + // + // override fun onPlayFromUri(uri: Uri?, extras: Bundle?) { + // super.onPlayFromUri(uri, extras) + // } override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) { super.onPlayFromMediaId(mediaId, extras) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt index b21f43b97..f5025239f 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackServiceFragment.kt @@ -32,14 +32,14 @@ import timber.log.Timber as T class PlaybackServiceFragment private constructor( - private val context: Context, + context: Context, private val foregroundListener: ForegroundListener, private val playbackManager: PlaybackStateManager, exoHolderFactory: ExoPlaybackStateHolder.Factory, sessionHolderFactory: MediaSessionHolder.Factory, widgetComponentFactory: WidgetComponent.Factory, systemReceiverFactory: SystemPlaybackReceiver.Factory, -) : MediaSessionCompat.Callback(), PlaybackStateManager.Listener { +) : PlaybackStateManager.Listener { class Factory @Inject constructor( diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemPlaybackReceiver.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/SystemPlaybackReceiver.kt index 956800067..59ffad0d5 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemPlaybackReceiver.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/SystemPlaybackReceiver.kt @@ -54,6 +54,7 @@ private constructor( SystemPlaybackReceiver(context, playbackManager, playbackSettings, widgetComponent) } + @Suppress("WrongConstant") fun attach() { ContextCompat.registerReceiver( context, this, INTENT_FILTER, ContextCompat.RECEIVER_EXPORTED) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt index 61ff8087e..66ce48026 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt @@ -18,7 +18,6 @@ package org.oxycblt.auxio.playback.state -import javax.inject.Inject import org.oxycblt.auxio.list.ListSettings import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.music.Album @@ -29,7 +28,7 @@ import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.Playlist import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.playback.PlaybackSettings -import timber.log.Timber as T +import javax.inject.Inject /** * A playback command that can be passed to [PlaybackStateManager] to start new playback. diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt index 663f8accd..864e46785 100644 --- a/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt +++ b/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt @@ -61,7 +61,7 @@ interface SearchEngine { val artists: Collection? = null, val genres: Collection? = null, val playlists: Collection? = null - ) {} + ) } class SearchEngineImpl @Inject constructor(@ApplicationContext private val context: Context) : diff --git a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt b/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt index 174ffa884..5381b3383 100644 --- a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt +++ b/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt @@ -45,7 +45,7 @@ class StartActionHelper(config: TaskerPluginConfig) : } class ActivityConfigStartAction : Activity(), TaskerPluginConfigNoInput { - override val context + override val context: Context get() = applicationContext private val taskerHelper by lazy { StartActionHelper(this) } diff --git a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt index c97ccf1c9..d2321ab5c 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt @@ -40,7 +40,6 @@ import kotlin.reflect.KClass import org.oxycblt.auxio.IntegerTable import org.oxycblt.auxio.MainActivity import org.oxycblt.auxio.R -import timber.log.Timber as T /** * Get a [LayoutInflater] instance from this [Context]. diff --git a/app/src/main/java/org/oxycblt/auxio/util/CopyleftNoticeTree.kt b/app/src/main/java/org/oxycblt/auxio/util/CopyleftNoticeTree.kt index a191a4c14..e0b4cb588 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/CopyleftNoticeTree.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/CopyleftNoticeTree.kt @@ -3,7 +3,7 @@ package org.oxycblt.auxio.util import timber.log.Timber class CopyleftNoticeTree : Timber.DebugTree() { - // Feel free to remove this if you are forking the project in good faith. + // Feel free to remove this logger if you are forking the project in good faith. // // However, if you are stealing the source code to repackage it into a new closed-source app, // I will warn you that the One True, Living, Almighty God HATES thieves and WILL punish you diff --git a/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt index a23d33b8a..3dfb4f7d4 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt @@ -18,6 +18,7 @@ package org.oxycblt.auxio.util +import android.annotation.SuppressLint import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent @@ -117,6 +118,7 @@ val ViewBinding.context: Context * Override the behavior of a [MaterialToolbar]'s overflow menu to do something else. This is * extremely dumb, but required to hook overflow menus to bottom sheet menus. */ +@SuppressLint("RestrictedApi") fun Toolbar.overrideOnOverflowMenuClick(block: (View) -> Unit) { for (toolbarChild in children) { if (toolbarChild is ActionMenuView) { diff --git a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt index e1e38784a..8b8d8c6a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt @@ -23,7 +23,6 @@ import java.util.UUID import kotlin.reflect.KClass import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.music.info.Date -import timber.log.Timber as T /** * Sanitizes a value that is unlikely to be null. On debug builds, this aliases to [requireNotNull], diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetBitmapTransformation.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetBitmapTransformation.kt index ac44e418d..e705a3274 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetBitmapTransformation.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetBitmapTransformation.kt @@ -24,7 +24,7 @@ import coil.size.Size import coil.transform.Transformation import kotlin.math.sqrt -class WidgetBitmapTransformation(private val reduce: Float) : Transformation { +class WidgetBitmapTransformation(reduce: Float) : Transformation { private val metrics = Resources.getSystem().displayMetrics private val sw = metrics.widthPixels private val sh = metrics.heightPixels diff --git a/app/src/main/res/color/overlay_stroke.xml b/app/src/main/res/color/overlay_stroke.xml deleted file mode 100644 index 21337acc3..000000000 --- a/app/src/main/res/color/overlay_stroke.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-h480dp/item_playback_song.xml b/app/src/main/res/layout-h480dp/item_playback_song.xml deleted file mode 100644 index 9ce0bcf47..000000000 --- a/app/src/main/res/layout-h480dp/item_playback_song.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/item_playback_song.xml b/app/src/main/res/layout-sw600dp/item_playback_song.xml deleted file mode 100644 index 9ce0bcf47..000000000 --- a/app/src/main/res/layout-sw600dp/item_playback_song.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_playback_song.xml b/app/src/main/res/layout/item_playback_song.xml deleted file mode 100644 index 3e8c0c6a1..000000000 --- a/app/src/main/res/layout/item_playback_song.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file