From a4b1b0a0850bbf73c811b2da4d0ad876e194d61d Mon Sep 17 00:00:00 2001
From: Hemanth S <hemanths@live.com>
Date: Tue, 15 Sep 2020 23:45:35 +0530
Subject: [PATCH] Code refactor

---
 app/build.gradle                                       |  1 +
 .../name/monkey/retromusic/activities/MainActivity.kt  | 10 ----------
 .../fragments/albums/AlbumDetailsFragment.kt           |  1 -
 .../fragments/albums/AlbumDetailsViewModel.kt          |  3 +--
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 37bcac79..a75cecfd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,6 +107,7 @@ dependencies {
     implementation 'androidx.palette:palette-ktx:1.0.0'
 
     def nav_version = "2.3.0"
+    implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index eef1b393..517c8254 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -28,8 +28,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         const val APP_UPDATE_REQUEST_CODE = 9002
     }
 
-    private var blockRequestPermissions = false
-
     override fun createContentView(): View {
         return wrapSlidingMusicPanel(R.layout.activity_main_content)
     }
@@ -64,14 +62,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         }
     }
 
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (!hasPermissions()) {
-            //requestPermissions()
-        }
-    }
-
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         if (key == GENERAL_THEME || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES
         ) {
diff --git 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
index fefdf40a..bade59ff 100644
--- 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
@@ -79,7 +79,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         toolbar.title = " "
         postponeEnterTransition()
         detailsViewModel.getAlbum().observe(viewLifecycleOwner, Observer {
-            println(Thread.currentThread().name)
             startPostponedEnterTransition()
             showAlbum(it)
         })
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
index 8f4e4197..0cb4860a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
@@ -17,8 +17,7 @@ class AlbumDetailsViewModel(
 ) : ViewModel(), MusicServiceEventListener {
 
     fun getAlbum(): LiveData<Album> = liveData(IO) {
-        val album = repository.albumByIdAsync(albumId)
-        emit(album)
+        emit(repository.albumByIdAsync(albumId))
     }
 
     fun getArtist(artistId: Int): LiveData<Artist> = liveData(IO) {