phoenix/mear
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed issue with functionality breaking when starting a SongViewActivity

Browse Source
This commit is contained in:
amazing-username
2019-03-26 21:47:53 -04:00
parent 65a05af308
commit 5b8227d6da
4 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/example/mear/activities/MainActivity.kt
+16
View File
@@ -56,6 +56,20 @@ class MainActivity : BaseServiceActivity() {
}
}
override fun onResume() {
super.onResume()
try {
if (musicService!! != null) {
val tr = musicService!!.getCurrentTrack().title
val artist = musicService!!.getCurrentTrack().artist
}
}
catch (ex: Exception) {
val exMsg = ex.message
}
}
override fun onDestroy() {
super.onDestroy()
try {
@@ -308,6 +322,8 @@ class MainActivity : BaseServiceActivity() {
CurrentPosition.text = dur
val tTitle = musicService!!.getCurrentTrack().title
if (!(TrackTitle.text.equals(musicService!!.getCurrentTrack().title))) {
configureTrackDisplay()
}
app/src/main/java/com/example/mear/activities/SongViewActivity.kt
+23 -1
View File
@@ -5,6 +5,7 @@ import android.os.Bundle
import android.support.annotation.RequiresApi
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.LinearLayoutManager
import android.view.View
import java.lang.Exception
import kotlinx.android.synthetic.main.activity_song_view.*
@@ -16,8 +17,17 @@ import com.example.mear.models.TrackItems
import com.example.mear.R
import com.example.mear.repositories.TrackRepository
import com.example.mear.util.ExtractCover
import org.jetbrains.anko.act
class SongViewActivity : BaseServiceActivity() {
/**
override fun onItemClick(position: Int) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
val sds = "ddddd"
}
*/
private var trackListItems = arrayListOf<TrackItems>()
private lateinit var adapter: RecyclerAdapter
private lateinit var linearLayoutManager: LinearLayoutManager
@@ -58,9 +68,16 @@ class SongViewActivity : BaseServiceActivity() {
trackListItems = retrieveTrackItems()
adapter = RecyclerAdapter(trackListItems, this)
//adapter = RecyclerAdapter(trackListItems)
//adapter = RecyclerAdapter(this, trackListItems)
adapter = RecyclerAdapter({trackItem: TrackItems -> playTrack(trackItem)}, trackListItems)
adapter.configureActivity(this)
trackList.adapter = adapter
trackList.setOnClickListener {
val temp = "dddd"
}
trackList.setHasFixedSize(true)
trackList.setItemViewCacheSize(20);
//trackList.setDrawingCacheEnabled(true);
@@ -132,4 +149,9 @@ class SongViewActivity : BaseServiceActivity() {
return trackItems!!
}
fun playTrack(trackItems: TrackItems) {
val id = trackItems.id
musicService!!.playTrack(id)
}
}
app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
+53 -32
View File
@@ -24,10 +24,21 @@ import com.example.mear.models.TrackItems
import com.example.mear.R
import com.example.mear.playback.service.MusicService
import com.example.mear.repositories.TrackRepository
//import android.R
class RecyclerAdapter( private val trackItemsSourceInit: ArrayList<TrackItems>, private var act: Activity) :
RecyclerView.Adapter<RecyclerAdapter.TrackItemsHolder>(),
Application.ActivityLifecycleCallbacks {
//class RecyclerAdapter(private val mOnClickListenerI: trackItemClickListener, private val trackItemsSourceInit: ArrayList<TrackItems>) :
//class RecyclerAdapter(private val mOnClickListenerI: trackItemClickListener, private val trackItemsSourceInit: ArrayList<TrackItems>) :
class RecyclerAdapter(val mOnClickListenerI: (TrackItems) -> Unit , private val trackItemsSourceInit: ArrayList<TrackItems>) :
RecyclerView.Adapter<RecyclerView.ViewHolder>()
//Application.ActivityLifecycleCallbacks {
{
//private val mOnClickListenerI: trackItemClickListener? = null
private val mOnClick = mOnClickListenerI
/**
override fun onActivityPaused(activity: Activity?) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
@@ -56,32 +67,48 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList<TrackItems>,
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
var activityInst: Activity? = act
var musicService: MusicService? = null
*/
init {
}
//var activityInst: Activity? = act
//var musicService: MusicService? = null
open interface trackItemClickListener{
fun onClick(view: View)
}
override fun getItemCount(): Int {
return trackItemsSourceInit!!.size
}
override fun onBindViewHolder(holder: TrackItemsHolder, position: Int) {
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
val itemPhoto = trackItemsSourceInit!![position]
holder.bindTrackItems(itemPhoto)
//(holder as TrackItemsHolder).bindTrackItems(itemPhoto)
(holder as TrackItemsHolder).bindTrackItems(itemPhoto, mOnClickListenerI)
}
override fun onCreateViewHolder(parent: ViewGroup, position: Int): TrackItemsHolder {
// override fun onCreateViewHolder(parent: ViewGroup, position: Int): TrackItemsHolder {
override fun onCreateViewHolder(parent: ViewGroup, position: Int): RecyclerView.ViewHolder {
val inflatedView = parent.inflate(R.layout.fragment_song_view, false)
return TrackItemsHolder(inflatedView, activityInst)
//inflatedView.setOnClickListener(parent.parent)
return TrackItemsHolder(inflatedView)
//return TrackItemsHolder(inflatedView, mOnClick)
}
fun configureActivity(actvity: Activity) {
activityInst = actvity
activityInst!!.application.registerActivityLifecycleCallbacks(this)
//activityInst = actvity
//activityInst!!.application.registerActivityLifecycleCallbacks(this)
}
class TrackItemsHolder(v: View, activity: Activity?) : RecyclerView.ViewHolder(v), View.OnClickListener {
class TrackItemsHolder(v: View) : RecyclerView.ViewHolder(v) {
private var view: View = v
private var act = activity
private var musicService: MusicService? = null
//private var act = activity
//private var musicService: MusicService? = null
private var trackItem: TrackItems? = null
private val imgWidth = 90
private val imgHeight = 90
@@ -89,10 +116,14 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList<TrackItems>,
init {
v.setOnClickListener(this)
//v.setOnClickListener(this)
}
//constructor(vi: View) : super(this)
//constructor(vi: View) : super(this)
/**
private val connection = object : ServiceConnection {
override fun onServiceConnected(className: ComponentName, service: IBinder) {
@@ -106,34 +137,23 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList<TrackItems>,
mBound = false
}
}
*/
/**
override fun onClick(v: View) {
try {
val context = itemView.context
val showPhotoIntent = Intent(context, SongViewActivity::class.java)
//val context = itemView.context
//val showPhotoIntent = Intent(context, SongViewActivity::class.java)
//showPhotoIntent.putExtra(PHOTO_KEY, trackItem)
val id = trackItem!!.id
//context.startActivity(showPhotoIntent)
if (!mBound) {
val intent = Intent(act, MusicService::class.java)
act!!.bindService(intent, connection, Context.BIND_AUTO_CREATE)
/**
Intent(this, MusicService::class.java).also { intent ->
act!!.applicationContext(intent, connection, Context.BIND_AUTO_CREATE)
act.applicationContext
}
*/
}
}
catch (ex: Exception) {
val exMsg = ex.message
}
}
*/
fun bindTrackItems(trackItems: TrackItems) {
fun bindTrackItems(trackItems: TrackItems, clickList: (TrackItems) -> Unit) {
try {
var context = view.context
this.trackItem = trackItems
@@ -144,6 +164,7 @@ class RecyclerAdapter( private val trackItemsSourceInit: ArrayList<TrackItems>,
var trackCoverPath = "${context.filesDir}/${Filenames.TRACK_COVERS}"
trackCoverPath = "${trackCoverPath}${id}.bmp"
Picasso.get().load(trackCoverPath).into(view.trackCover)
view.setOnClickListener { clickList(trackItem!!) }
}
catch (ex:Exception) {
val exMsg = ex.message
app/src/main/java/com/example/mear/playback/service/MusicService.kt
+9 -1
View File
@@ -66,7 +66,10 @@ class MusicService: Service() {
}
fun playTrack(id: Int) {
trackPlayer!!.reset()
trackPlayer!!.setDataSource(TrackRepository(this).getTrack(id).songPath)
trackPlayer!!.prepare()
trackPlayer!!.start()
}
fun goToPosition(progress: Int) {
@@ -175,6 +178,11 @@ class MusicService: Service() {
var track: Track? = null
track = TrackRepository(this).getTrack(currentSongIndex!!)
val info = trackPlayer!!.trackInfo
if (trackPlayer!!.isPlaying) {
val res = "songs are being played"
}
return track!!
}