diff --git a/app/app.iml b/app/app.iml
index 744ea53..3c80a4f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -118,38 +118,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/example/mear/activities/SongViewActivity.kt b/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
index 44b3220..e2a1865 100644
--- a/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
@@ -10,13 +10,14 @@ import java.lang.Exception
import kotlinx.android.synthetic.main.activity_song_view.*
import kotlinx.android.synthetic.main.content_song_view.*
+import com.example.mear.activities.BaseServiceActivity
import com.example.mear.adapters.RecyclerAdapter
import com.example.mear.models.TrackItems
import com.example.mear.R
import com.example.mear.repositories.TrackRepository
import com.example.mear.util.ExtractCover
-class SongViewActivity : AppCompatActivity() {
+class SongViewActivity : BaseServiceActivity() {
private var trackListItems = arrayListOf()
private lateinit var adapter: RecyclerAdapter
private lateinit var linearLayoutManager: LinearLayoutManager
@@ -31,6 +32,7 @@ class SongViewActivity : AppCompatActivity() {
try {
window.statusBarColor = resources.getColor(R.color.track_seek)
+ doBindService()
initializeAdapter()
}
catch (ex: Exception) {
@@ -57,9 +59,10 @@ class SongViewActivity : AppCompatActivity() {
trackListItems = retrieveTrackItems()
adapter = RecyclerAdapter(trackListItems)
+ adapter.musicService = musicService
trackList.adapter = adapter
trackList.setHasFixedSize(true)
- //trackList.setItemViewCacheSize(20);
+ trackList.setItemViewCacheSize(20);
//trackList.setDrawingCacheEnabled(true);
//trackList.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
}
@@ -102,8 +105,9 @@ class SongViewActivity : AppCompatActivity() {
}
*/
for (track in tracks) {
- val cover = ExtractCover(track.songPath)
+ //val cover = ExtractCover(track.songPath)
var trackCover = ByteArray(0)
+ /**
if (cover.hasCover() && !done) {
if (index < max ) {
trackCover = cover.retrieveCover()
@@ -116,7 +120,7 @@ class SongViewActivity : AppCompatActivity() {
if (done) {
return trackItems
}
-
+ */
val trackItem = TrackItems(track.id, track.title, track.artist, trackCover!!)
trackItems.add(trackItem)
}
diff --git a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
index e183b98..5abd9aa 100644
--- a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
+++ b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
@@ -15,9 +15,12 @@ import com.example.mear.constants.Filenames
import com.example.mear.inflate
import com.example.mear.models.TrackItems
import com.example.mear.R
+import com.example.mear.playback.service.MusicService
+import com.example.mear.repositories.TrackRepository
class RecyclerAdapter( private val trackItemsSourceInit: ArrayList) :
RecyclerView.Adapter() {
+ var musicService: MusicService? = null
override fun getItemCount(): Int {
return trackItemsSourceInit!!.size
@@ -30,12 +33,13 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList)
override fun onCreateViewHolder(parent: ViewGroup, position: Int): TrackItemsHolder {
val inflatedView = parent.inflate(R.layout.fragment_song_view, false)
- return TrackItemsHolder(inflatedView)
+ return TrackItemsHolder(inflatedView, musicService!!)
}
- class TrackItemsHolder(v: View) : RecyclerView.ViewHolder(v), View.OnClickListener {
+ class TrackItemsHolder(v: View, musicService: MusicService) : RecyclerView.ViewHolder(v), View.OnClickListener {
private var view: View = v
+ private var musicService: MusicService = musicService
private var trackItem: TrackItems? = null
private val imgWidth = 90
private val imgHeight = 90
@@ -50,6 +54,8 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList)
val context = itemView.context
val showPhotoIntent = Intent(context, SongViewActivity::class.java)
//showPhotoIntent.putExtra(PHOTO_KEY, trackItem)
+ val id = trackItem!!.id
+ musicService.playTrack(id)
context.startActivity(showPhotoIntent)
}
catch (ex: Exception) {
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index 7117d23..e90f496 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -65,6 +65,9 @@ class MusicService: Service() {
return super.onUnbind(intent)
}
+ fun playTrack(id: Int) {
+
+ }
fun goToPosition(progress: Int) {
trackPlayer!!.seekTo(progress)
diff --git a/local.properties b/local.properties
index 959465c..10de58c 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Thu Mar 07 22:21:30 EST 2019
-sdk.dir=/home/phoenix/Android/Sdk
+#Sun Mar 24 20:27:46 EDT 2019
+sdk.dir=/home/brahmix/Android/Sdk