diff --git a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt index 47d39ed8..085f8a13 100644 --- a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt @@ -73,6 +73,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { private val urlList = listOf( "https://celestrak.com/NORAD/elements/amateur.txt", + "https://celestrak.com/NORAD/elements/starlink.txt", "https://celestrak.com/NORAD/elements/weather.txt" ) diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt index c159c048..24d5cbf2 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt @@ -33,8 +33,6 @@ import java.util.* class SatPassAdapter : RecyclerView.Adapter() { - inner class PassHolder(itemView: View) : RecyclerView.ViewHolder(itemView) - private var satPassList = emptyList() fun setList(list: List) { @@ -53,31 +51,38 @@ class SatPassAdapter : RecyclerView.Adapter() { } override fun onBindViewHolder(holder: PassHolder, position: Int) { - val satPass = satPassList[position] + holder.bind(position) + } - val satName = holder.itemView.findViewById(R.id.pass_satName) - val satId = holder.itemView.findViewById(R.id.pass_satId) - val maxEl = holder.itemView.findViewById(R.id.pass_maxEl) - val passVector = holder.itemView.findViewById(R.id.pass_azVector) - val passStart = holder.itemView.findViewById(R.id.pass_aosTime) - val passEnd = holder.itemView.findViewById(R.id.pass_losTime) - val progressBar = holder.itemView.findViewById(R.id.pass_progress) + inner class PassHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val aosTime = - SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.startTime) - val losTime = - SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.endTime) - satName.text = satPass.tle.name - satId.text = String.format("Id: %d", satPass.tle.catnum) - maxEl.text = String.format("MaxEl: %.1f°", satPass.pass.maxEl) - passVector.text = - String.format("Az: %2d° -> %2d°", satPass.pass.aosAzimuth, satPass.pass.losAzimuth) - passStart.text = String.format("AOS - %s", aosTime) - passEnd.text = String.format("LOS - %s", losTime) + private val satName = itemView.findViewById(R.id.pass_satName) + private val satId = itemView.findViewById(R.id.pass_satId) + private val maxEl = itemView.findViewById(R.id.pass_maxEl) + private val passVector = itemView.findViewById(R.id.pass_azVector) + private val passStart = itemView.findViewById(R.id.pass_aosTime) + private val passEnd = itemView.findViewById(R.id.pass_losTime) + var progressBar = itemView.findViewById(R.id.pass_progress) - holder.itemView.setOnClickListener { - val action = SkyFragmentDirections.actionNavSkyToNavRadar(satPass) - holder.itemView.findNavController().navigate(action) + fun bind(position: Int) { + val satPass = satPassList[position] + + val aosTime = + SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.startTime) + val losTime = + SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.endTime) + satName.text = satPass.tle.name + satId.text = String.format("Id: %d", satPass.tle.catnum) + maxEl.text = String.format("MaxEl: %.1f°", satPass.pass.maxEl) + passVector.text = + String.format("Az: %2d° -> %2d°", satPass.pass.aosAzimuth, satPass.pass.losAzimuth) + passStart.text = String.format("AOS - %s", aosTime) + passEnd.text = String.format("LOS - %s", losTime) + + itemView.setOnClickListener { + val action = SkyFragmentDirections.actionNavSkyToNavRadar(satPass) + itemView.findNavController().navigate(action) + } } } } \ No newline at end of file