fixed improper imports

BimmerGestalt · Oct 26, 2021 · 077ef26 · 077ef26
1 parent 6cbd588
commit 077ef26
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/me/hufman/androidautoidrive/phoneui/fragments/MusicBrowsePageFragment.kt b/app/src/main/java/me/hufman/androidautoidrive/phoneui/fragments/MusicBrowsePageFragment.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -24,6 +23,7 @@ import me.hufman.androidautoidrive.phoneui.viewmodels.MusicActivityIconsModel
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicActivityModel
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicPlayerBrowseItem
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicPlayerItem
+import me.hufman.androidautoidrive.phoneui.viewmodels.activityViewModels
 import kotlin.coroutines.CoroutineContext
 
 class MusicBrowsePageFragment : Fragment(), CoroutineScope {

diff --git a/app/src/main/java/me/hufman/androidautoidrive/phoneui/fragments/MusicSearchFragment.kt b/app/src/main/java/me/hufman/androidautoidrive/phoneui/fragments/MusicSearchFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import android.widget.SearchView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.CoroutineScope
@@ -22,6 +21,7 @@ import me.hufman.androidautoidrive.phoneui.viewmodels.MusicActivityIconsModel
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicActivityModel
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicPlayerItem
 import me.hufman.androidautoidrive.phoneui.viewmodels.MusicPlayerSearchItem
+import me.hufman.androidautoidrive.phoneui.viewmodels.activityViewModels
 import kotlin.coroutines.CoroutineContext
 
 class MusicSearchFragment : Fragment(), CoroutineScope {

diff --git a/.../test/java/me/hufman/androidautoidrive/music/controllers/SpotifyMusicAppControllerTest.kt b/.../test/java/me/hufman/androidautoidrive/music/controllers/SpotifyMusicAppControllerTest.kt
@@ -14,7 +14,6 @@ import com.nhaarman.mockito_kotlin.never
 import com.nhaarman.mockito_kotlin.times
 import com.nhaarman.mockito_kotlin.verify
 import com.nhaarman.mockito_kotlin.whenever
-import com.soywiz.korio.async.async
 import com.spotify.android.appremote.api.ConnectApi
 import com.spotify.android.appremote.api.ContentApi
 import com.spotify.android.appremote.api.ImagesApi
@@ -36,7 +35,7 @@ import com.spotify.protocol.types.PlayerRestrictions
 import com.spotify.protocol.types.PlayerState
 import com.spotify.protocol.types.Repeat
 import com.spotify.protocol.types.Track
-import junit.framework.Assert.assertEquals
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestCoroutineDispatcher
@@ -55,6 +54,7 @@ import me.hufman.androidautoidrive.music.spotify.SpotifyWebApi
 import me.hufman.androidautoidrive.music.spotify.TemporaryPlaylistState
 import me.hufman.androidautoidrive.utils.Utils
 import org.junit.After
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNotNull