Added LogUtil

2022-05-20 16:59:56 +05:30 · 2022-05-20 16:59:56 +05:30 · bc04472b6f
commit bc04472b6f
parent 1b544d62c3
23 changed files with 75 additions and 42 deletions
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@ -34,6 +34,7 @@ import code.name.monkey.retromusic.repository.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.AppRater
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logE
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.get
@ -219,7 +220,7 @@ class MainActivity : AbsCastActivity(), OnThemeChangedListener {
                try {
                    id = idString.toLong()
                } catch (e: NumberFormatException) {
-                    println(e.message)
+                    logE(e)
                }
            }
        }
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
@ -33,6 +33,7 @@ import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.rootView
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.snackbar.Snackbar

 abstract class AbsBaseActivity : AbsThemeActivity() {
@ -76,7 +77,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {

    protected open fun onHasPermissionsChanged(hasPermissions: Boolean) {
        // implemented by sub classes
-        println(hasPermissions)
+        logD(hasPermissions)
    }

    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
@ -33,6 +33,7 @@ import code.name.monkey.retromusic.service.MusicService.Companion.QUEUE_CHANGED
 import code.name.monkey.retromusic.service.MusicService.Companion.REPEAT_MODE_CHANGED
 import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logD
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
@ -185,7 +186,7 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
            true
        ) // just in case we need to know this at some point
        sendBroadcast(intent)
-        println("sendBroadcast $hasPermissions")
+        logD("sendBroadcast $hasPermissions")
    }

    override fun getPermissionsToRequest(): Array<String> {
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@ -65,6 +65,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.CategoryInfo
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
@ -134,7 +135,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
                        MusicPlayerRemote.clearQueue()
                    }
                    else -> {
-                        println("Do a flip")
+                        logD("Do a flip")
                    }
                }
            }
@ -451,7 +452,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
                binding.slidingPanel.elevation = 0F
                binding.bottomNavigationView.elevation = 5F
                if (isBottomNavVisible) {
-                    println("List")
+                    logD("List")
                    if (animate) {
                        bottomSheetBehavior.peekHeightAnimate(heightOfBarWithTabs)
                    } else {
@ -459,7 +460,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
                    }
                    libraryViewModel.setFabMargin(this, dip(R.dimen.mini_player_height_expanded))
                } else {
-                    println("Details")
+                    logD("Details")
                    if (animate) {
                        bottomSheetBehavior.peekHeightAnimate(heightOfBar).doOnEnd {
                            binding.slidingPanel.bringToFront()
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@ -48,6 +48,7 @@ import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.AudioTagInfo
 import code.name.monkey.retromusic.repository.Repository
 import code.name.monkey.retromusic.util.SAFUtil
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.GlobalScope
@ -223,7 +224,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
        getIntentExtras()

        songPaths = getSongPaths()
-        println(songPaths?.size)
+        logD(songPaths?.size)
        if (songPaths!!.isEmpty()) {
            finish()
        }
@ -352,7 +353,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
        hideSoftKeyboard()

        hideFab()
-        println(fieldKeyValueMap)
+        logD(fieldKeyValueMap)
        GlobalScope.launch {
            if (VersionUtils.hasR()) {
                cacheFiles = TagWriter.writeTagsToFilesR(
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@ -39,6 +39,7 @@ import code.name.monkey.retromusic.util.ImageUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
+import code.name.monkey.retromusic.util.logD
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
@ -98,7 +99,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
        binding.albumArtistText.setText(albumArtistName)
        binding.genreTitle.setText(genreName)
        binding.yearTitle.setText(songYear)
-        println(albumTitle + albumArtistName)
+        logD(albumTitle + albumArtistName)
    }

    override fun loadCurrentImage() {
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
@ -38,6 +38,7 @@ import code.name.monkey.retromusic.repository.SongRepository
 import code.name.monkey.retromusic.util.ImageUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.retromusic.util.logD
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
@ -102,7 +103,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
        binding.discNumberText.setText(discNumber)
        binding.lyricsText.setText(lyrics)
        binding.songComposerText.setText(composer)
-        println(songTitle + songYear)
+        logD(songTitle + songYear)
    }

    override fun loadCurrentImage() {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
@ -29,6 +29,7 @@ import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.DensityUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logD
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
@ -140,40 +141,40 @@ class LibraryViewModel(
    }

    override fun onMediaStoreChanged() {
-        println("onMediaStoreChanged")
+        logD("onMediaStoreChanged")
        loadLibraryContent()
    }

    override fun onServiceConnected() {
-        println("onServiceConnected")
+        logD("onServiceConnected")
    }

    override fun onServiceDisconnected() {
-        println("onServiceDisconnected")
+        logD("onServiceDisconnected")
    }

    override fun onQueueChanged() {
-        println("onQueueChanged")
+        logD("onQueueChanged")
    }

    override fun onPlayingMetaChanged() {
-        println("onPlayingMetaChanged")
+        logD("onPlayingMetaChanged")
    }

    override fun onPlayStateChanged() {
-        println("onPlayStateChanged")
+        logD("onPlayStateChanged")
    }

    override fun onRepeatModeChanged() {
-        println("onRepeatModeChanged")
+        logD("onRepeatModeChanged")
    }

    override fun onShuffleModeChanged() {
-        println("onShuffleModeChanged")
+        logD("onShuffleModeChanged")
    }

    override fun onFavoriteStateChanged() {
-        println("onFavoriteStateChanged")
+        logD("onFavoriteStateChanged")
    }

    fun shuffleSongs() = viewModelScope.launch(IO) {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
@ -62,10 +62,7 @@ import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.network.Result
 import code.name.monkey.retromusic.network.model.LastFmAlbum
 import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.*
 import com.afollestad.materialcab.attached.AttachedCab
 import com.afollestad.materialcab.attached.destroy
 import com.afollestad.materialcab.attached.isActive
@ -245,10 +242,10 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
        detailsViewModel.getAlbumInfo(album).observe(viewLifecycleOwner) { result ->
            when (result) {
                is Result.Loading -> {
-                    println("Loading")
+                    logD("Loading")
                }
                is Result.Error -> {
-                    println("Error")
+                    logE("Error")
                }
                is Result.Success -> {
                    aboutAlbum(result.data)
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
@ -367,7 +367,6 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL

    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
        cab?.let {
-            println("Cab")
            if (it.isActive()) {
                it.destroy()
            }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
@ -180,8 +180,8 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
        detailsViewModel.getArtistInfo(name, lang, null)
            .observe(viewLifecycleOwner) { result ->
                when (result) {
-                    is Result.Loading -> println("Loading")
-                    is Result.Error -> println("Error")
+                    is Result.Loading -> logD("Loading")
+                    is Result.Error -> logE("Error")
                    is Result.Success -> artistInfo(result.data)
                }
            }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
@ -19,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.transition.MaterialFade

 abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
@ -73,7 +74,7 @@ abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>

    fun setAndSaveSortOrder(sortOrder: String) {
        this.sortOrder = sortOrder
-        println(sortOrder)
+        logD(sortOrder)
        saveSortOrder(sortOrder)
        setSortOrder(sortOrder)
    }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
@ -282,7 +282,6 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de

    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
        cab?.let {
-            println("Cab")
            if (it.isActive()) {
                it.destroy()
            }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
@ -47,6 +47,7 @@ import code.name.monkey.retromusic.util.LyricUtil
 import code.name.monkey.retromusic.util.LyricsType
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.util.logD
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@ -173,16 +174,19 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
    }

    override fun onServiceConnected() {
+        logD("Service Connected")
        updatePlayingQueue()
        updateLyrics()
    }

    override fun onPlayingMetaChanged() {
+        logD("Playing Meta Changed")
        binding.viewPager.currentItem = MusicPlayerRemote.position
        updateLyrics()
    }

    override fun onQueueChanged() {
+        logD("Queue Changed")
        updatePlayingQueue()
    }

--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@ -177,7 +177,6 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli

    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
        cab?.let {
-            println("Cab")
            if (it.isActive()) {
                it.destroy()
            }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
@ -38,7 +38,6 @@ class OtherSettingsFragment : AbsSettingsFragment() {
    override fun invalidateSettings() {
        val languagePreference: ATEListPreference? = findPreference(LANGUAGE_NAME)
        languagePreference?.setOnPreferenceChangeListener { _, _ ->
-            println("Invalidated")
            restartActivity()
            return@setOnPreferenceChangeListener true
        }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
@ -363,7 +363,6 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay

    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
        cab?.let {
-            println("Cab")
            if (it.isActive()) {
                it.destroy()
            }
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@ -30,6 +30,7 @@ import code.name.monkey.retromusic.repository.SongRepository
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.getExternalStorageDirectory
+import code.name.monkey.retromusic.util.logE
 import com.google.android.gms.cast.framework.CastSession
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@ -449,7 +450,7 @@ object MusicPlayerRemote : KoinComponent {
            } else {
                // TODO the file is not listed in the media store
                context.showToast(R.string.unplayable_file)
-                println("The file is not listed in the media store")
+                logE("The file is not listed in the media store")
            }
        }
    }
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
@ -28,6 +28,8 @@ import code.name.monkey.retromusic.network.Result.*
 import code.name.monkey.retromusic.network.model.LastFmAlbum
 import code.name.monkey.retromusic.network.model.LastFmArtist
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logD
+import code.name.monkey.retromusic.util.logE
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@ -194,7 +196,7 @@ class RealRepository(
        return try {
            Success(lastFMService.artistInfo(name, lang, cache))
        } catch (e: Exception) {
-            println(e)
+            logE(e)
            Error(e)
        }
    }
@ -207,7 +209,7 @@ class RealRepository(
            val lastFmAlbum = lastFMService.albumInfo(artist, album)
            Success(lastFmAlbum)
        } catch (e: Exception) {
-            println(e)
+            logE(e)
            Error(e)
        }
    }
@ -227,7 +229,7 @@ class RealRepository(
        )
        for (section in sections) {
            if (section.arrayList.isNotEmpty()) {
-                println("${section.homeSection} -> ${section.arrayList.size}")
+                logD("${section.homeSection} -> ${section.arrayList.size}")
                homeSections.add(section)
            }
        }
--- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
@ -115,7 +115,6 @@ class RealRoomRepository(
        return if (playlist != null) {
            playlist
        } else {
-            println("Playlist Created")
            createPlaylist(PlaylistEntity(playlistName = favorite))
            playlistDao.playlist(favorite).first()
        }
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
@ -31,6 +31,8 @@ import code.name.monkey.retromusic.service.MusicService.Companion.CYCLE_REPEAT
 import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
 import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_SHUFFLE
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.logD
+import code.name.monkey.retromusic.util.logE
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject

@ -52,7 +54,7 @@ class MediaSessionCallback(
    override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {
        super.onPlayFromMediaId(mediaId, extras)
        val musicId = AutoMediaIDHelper.extractMusicID(mediaId!!)
-        println(musicId)
+        logD(musicId)
        val itemId = musicId?.toLong() ?: -1
        val songs: ArrayList<Song> = ArrayList()
        when (val category = AutoMediaIDHelper.extractCategory(mediaId)) {
@ -192,7 +194,7 @@ class MediaSessionCallback(
                musicService.toggleFavorite()
            }
            else -> {
-                println("Unsupported action: $action")
+                logE("Unsupported action: $action")
            }
        }
    }
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@ -1339,8 +1339,8 @@ class MusicService : MediaBrowserServiceCompat(),
            this,
            "RetroMusicPlayer"
        )
-        val mediasessionCallback = MediaSessionCallback(this)
-        mediaSession?.setCallback(mediasessionCallback)
+        val mediaSessionCallback = MediaSessionCallback(this)
+        mediaSession?.setCallback(mediaSessionCallback)
        mediaSession?.isActive = true
    }

--- a/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
@ -0,0 +1,24 @@
+package code.name.monkey.retromusic.util
+
+import android.util.Log
+import code.name.monkey.retromusic.BuildConfig
+
+fun Any.logD(message: Any?) {
+    logD(message.toString())
+}
+
+fun Any.logD(message: String) {
+    if (BuildConfig.DEBUG) {
+        Log.d(name, message)
+    }
+}
+
+fun Any.logE(message: String) {
+    Log.e(name, message)
+}
+
+fun Any.logE(e: Exception) {
+    Log.e(name, e.message ?: "Error")
+}
+
+val Any.name: String get() = this::class.java.simpleName