Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved to viewBinding instead of findViewById
Arty Bishop38b9feb82952
diff --git a/app/build.gradle b/app/build.gradleindex 236c79e6..e4c001ff 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -50,12 +50,15 @@ android {kotlinOptions {jvmTarget = "1.8"}+ viewBinding {+ enabled = true+ }}dependencies {implementation fileTree(dir: 'libs', include: ['*.jar'])implementation "com.google.android.material:material:$material"- implementation "androidx.appcompat:appcompat:$supportLib"+ implementation "androidx.appcompat:appcompat:$appCompat"implementation "androidx.legacy:legacy-support-v4:$supportLib"implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.ktindex 767d7e42..3e286383 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt@@ -24,31 +24,34 @@ import android.text.method.LinkMovementMethodimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.TextViewimport androidx.fragment.app.Fragmentimport com.rtbishop.look4sat.BuildConfigimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.FragmentAboutBindingclass AboutFragment : Fragment() {- private lateinit var textVersion: TextView- private lateinit var textThanks: TextView+ private var _binding: FragmentAboutBinding? = null+ private val binding get() = _binding!!override fun onCreateView(inflater: LayoutInflater,container: ViewGroup?,savedInstanceState: Bundle?): View? {- return inflater.inflate(R.layout.fragment_about, container, false)+ _binding = FragmentAboutBinding.inflate(inflater, container, false)+ return binding.root}override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)+ binding.tvAboutVersion.text =+ String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)+ binding.tvAboutMessage.movementMethod = LinkMovementMethod.getInstance()+ }- textVersion = view.findViewById(R.id.about_title_version)- textThanks = view.findViewById(R.id.about_thanks_to)-- textVersion.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)- textThanks.movementMethod = LinkMovementMethod.getInstance()+ override fun onDestroyView() {+ _binding = null+ super.onDestroyView()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex 3f0d10fe..a67e00e6 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -27,15 +27,10 @@ import android.content.pm.PackageManagerimport android.net.Uriimport android.os.Bundleimport android.view.View-import android.widget.Button-import android.widget.TextViewimport android.widget.Toastimport androidx.appcompat.app.AppCompatActivity-import androidx.appcompat.widget.Toolbar-import androidx.constraintlayout.widget.ConstraintLayoutimport androidx.core.app.ActivityCompatimport androidx.core.content.ContextCompat-import androidx.drawerlayout.widget.DrawerLayoutimport androidx.lifecycle.Observerimport androidx.lifecycle.ViewModelProviderimport androidx.navigation.findNavController@@ -43,9 +38,10 @@ import androidx.navigation.ui.AppBarConfigurationimport androidx.navigation.ui.navigateUpimport androidx.navigation.ui.setupActionBarWithNavControllerimport androidx.navigation.ui.setupWithNavController-import com.google.android.material.navigation.NavigationViewimport com.rtbishop.look4sat.MainViewModelimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.ActivityMainBinding+import com.rtbishop.look4sat.databinding.DrawerHeaderBindingclass MainActivity : AppCompatActivity() {@@ -54,22 +50,17 @@ class MainActivity : AppCompatActivity() {private val permGranted = PackageManager.PERMISSION_GRANTEDprivate val githubUrl = "https://github.com/rt-bishop/LookingSat"+ private lateinit var mainBinding: ActivityMainBinding+ private lateinit var drawerBinding: DrawerHeaderBindingprivate lateinit var viewModel: MainViewModel- private lateinit var timerLayout: ConstraintLayout- private lateinit var drawerLayout: DrawerLayout- private lateinit var drawerLat: TextView- private lateinit var drawerLon: TextView- private lateinit var drawerBtnLoc: Button- private lateinit var drawerBtnTle: Button- private lateinit var drawerBtnTrans: Button- private lateinit var drawerBtnGithub: Button- private lateinit var drawerBtnExit: Buttonprivate lateinit var appBarConfig: AppBarConfigurationoverride fun onCreate(savedInstanceState: Bundle?) {setTheme(R.style.AppTheme)super.onCreate(savedInstanceState)- setContentView(R.layout.activity_main)+ mainBinding = ActivityMainBinding.inflate(layoutInflater)+ drawerBinding = DrawerHeaderBinding.inflate(layoutInflater, mainBinding.navView, true)+ setContentView(mainBinding.root)viewModel = ViewModelProvider(this).get(MainViewModel::class.java)setupComponents()setupObservers()@@ -79,24 +70,13 @@ class MainActivity : AppCompatActivity() {@SuppressLint("SourceLockedOrientationActivity")private fun setupComponents() {val navController = findNavController(R.id.nav_host)- val navView: NavigationView = findViewById(R.id.nav_view)- val header = navView.getHeaderView(0)- val toolbar: Toolbar = findViewById(R.id.toolbar)+ val navView = mainBinding.navView+ val toolbar = mainBinding.includeAppBar.toolbarsetSupportActionBar(toolbar)- timerLayout = findViewById(R.id.toolbar_layout)- drawerLayout = findViewById(R.id.drawer_layout)- drawerLat = header.findViewById(R.id.drawer_lat_value)- drawerLon = header.findViewById(R.id.drawer_lon_value)- drawerBtnLoc = header.findViewById(R.id.drawer_btn_loc)- drawerBtnTle = header.findViewById(R.id.drawer_btn_tle)- drawerBtnTrans = header.findViewById(R.id.drawer_btn_trans)- drawerBtnGithub = header.findViewById(R.id.drawer_btn_github)- drawerBtnExit = header.findViewById(R.id.drawer_btn_exit)-appBarConfig = AppBarConfiguration(setOf(R.id.nav_pass_list, R.id.nav_map_view, R.id.nav_settings, R.id.nav_about),- drawerLayout+ mainBinding.drawerLayout)setupActionBarWithNavController(navController, appBarConfig)@@ -107,7 +87,7 @@ class MainActivity : AppCompatActivity() {R.id.nav_pass_list -> {this.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAITtoolbar.visibility = View.VISIBLE- timerLayout.visibility = View.VISIBLE+ mainBinding.includeAppBar.toolbarLayout.visibility = View.VISIBLE}R.id.nav_map_view -> {this.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE@@ -116,7 +96,7 @@ class MainActivity : AppCompatActivity() {else -> {this.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAITtoolbar.visibility = View.VISIBLE- timerLayout.visibility = View.GONE+ mainBinding.includeAppBar.toolbarLayout.visibility = View.GONE}}}@@ -126,40 +106,45 @@ class MainActivity : AppCompatActivity() {viewModel.debugMessage.observe(this, Observer { message ->Toast.makeText(this, message, Toast.LENGTH_SHORT).show()when (message) {- getString(R.string.update_loc_success) -> drawerBtnLoc.isEnabled = true- getString(R.string.update_tle_success) -> drawerBtnTle.isEnabled = true- getString(R.string.update_trans_success) -> drawerBtnTrans.isEnabled = true+ getString(R.string.update_loc_success) -> drawerBinding.drawerBtnLoc.isEnabled =+ true+ getString(R.string.update_tle_success) -> drawerBinding.drawerBtnTle.isEnabled =+ true+ getString(R.string.update_trans_success) -> drawerBinding.drawerBtnTrans.isEnabled =+ truegetString(R.string.update_failure) -> {- drawerBtnTle.isEnabled = true- drawerBtnTrans.isEnabled = true+ drawerBinding.drawerBtnTle.isEnabled = true+ drawerBinding.drawerBtnTrans.isEnabled = true}}})viewModel.gsp.observe(this, Observer { gsp ->- drawerLat.text = String.format(getString(R.string.pat_location), gsp.latitude)- drawerLon.text = String.format(getString(R.string.pat_location), gsp.longitude)+ drawerBinding.drawerLatValue.text =+ String.format(getString(R.string.pat_location), gsp.latitude)+ drawerBinding.drawerLonValue.text =+ String.format(getString(R.string.pat_location), gsp.longitude)})}private fun setupDrawer() {- drawerBtnLoc.setOnClickListener {+ drawerBinding.drawerBtnLoc.setOnClickListener {it.isEnabled = falserequestLocationUpdate()}- drawerBtnTle.setOnClickListener {+ drawerBinding.drawerBtnTle.setOnClickListener {it.isEnabled = falseviewModel.updateAndSaveTleFile()}- drawerBtnTrans.setOnClickListener {+ drawerBinding.drawerBtnTrans.setOnClickListener {it.isEnabled = falseviewModel.updateTransmittersDatabase()}- drawerBtnGithub.setOnClickListener {+ drawerBinding.drawerBtnGithub.setOnClickListener {val githubIntent = Intent(Intent.ACTION_VIEW, Uri.parse(githubUrl))startActivity(githubIntent)}- drawerBtnExit.setOnClickListener { finish() }+ drawerBinding.drawerBtnExit.setOnClickListener { finish() }}private fun requestLocationUpdate() {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.ktindex 72c6e497..446b7be4 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt@@ -25,8 +25,6 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.FrameLayout-import android.widget.TextViewimport android.widget.Toastimport androidx.appcompat.app.AlertDialogimport androidx.core.content.ContextCompat@@ -36,9 +34,9 @@ import com.github.amsacode.predict4java.GroundStationPositionimport com.github.amsacode.predict4java.Positionimport com.github.amsacode.predict4java.SatPosimport com.github.amsacode.predict4java.TLE-import com.google.android.material.floatingactionbutton.FloatingActionButtonimport com.rtbishop.look4sat.MainViewModelimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.FragmentMapViewBindingimport com.rtbishop.look4sat.predict4kotlin.PassPredictorimport com.rtbishop.look4sat.repo.SatPassimport java.util.*@@ -49,15 +47,13 @@ import kotlin.math.absclass MapViewFragment : Fragment() {+ private var _binding: FragmentMapViewBinding? = null+ private val binding get() = _binding!!+private lateinit var service: ScheduledExecutorServiceprivate lateinit var mainActivity: MainActivityprivate lateinit var viewModel: MainViewModel- private lateinit var mapFrame: FrameLayout- private lateinit var mapFab: FloatingActionButtonprivate lateinit var mapView: MapView- private lateinit var mapLat: TextView- private lateinit var mapLon: TextView- private lateinit var mapRng: TextViewprivate lateinit var predictor: PassPredictorprivate lateinit var selectedSat: TLEprivate lateinit var gsp: GroundStationPosition@@ -76,23 +72,15 @@ class MapViewFragment : Fragment() {container: ViewGroup?,savedInstanceState: Bundle?): View? {- return inflater.inflate(R.layout.fragment_map_view, container, false)+ _binding = FragmentMapViewBinding.inflate(layoutInflater, container, false)+ return binding.root}override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- findViews(view)setupComponents()}- private fun findViews(view: View) {- mapFrame = view.findViewById(R.id.map_frame)- mapFab = view.findViewById(R.id.map_fab)- mapLat = view.findViewById(R.id.map_lat)- mapLon = view.findViewById(R.id.map_lon)- mapRng = view.findViewById(R.id.map_rng)- }-private fun setupComponents() {val delay = viewModel.delaygsp = viewModel.gsp.value ?: GroundStationPosition(0.0, 0.0, 0.0)@@ -101,11 +89,11 @@ class MapViewFragment : Fragment() {if (satPassList.isNotEmpty()) {satPassList = satPassList.distinctBy { it.tle }satPassList = satPassList.sortedBy { it.tle.name }- mapFab.setOnClickListener { showSelectSatDialog(satPassList) }+ binding.fabMap.setOnClickListener { showSelectSatDialog(satPassList) }selectedSat = satPassList.first().tlepredictor = satPassList.first().predictormapView = MapView(mainActivity)- mapFrame.addView(mapView)+ binding.frameMap.addView(mapView)service.scheduleAtFixedRate({ mapView.invalidate() },delay,@@ -113,7 +101,7 @@ class MapViewFragment : Fragment() {TimeUnit.MILLISECONDS)} else {- mapFab.setOnClickListener {+ binding.fabMap.setOnClickListener {Toast.makeText(mainActivity,getString(R.string.err_no_sat_selected),@@ -209,9 +197,9 @@ class MapViewFragment : Fragment() {if (lon > 180f) lon -= 360f- mapLat.text = String.format(context.getString(R.string.pat_latitude), lat)- mapLon.text = String.format(context.getString(R.string.pat_longitude), lon)- mapRng.text = String.format(context.getString(R.string.pat_range), rng)+ binding.tvMapLat.text = String.format(context.getString(R.string.pat_latitude), lat)+ binding.tvMapLon.text = String.format(context.getString(R.string.pat_longitude), lon)+ binding.tvMapRng.text = String.format(context.getString(R.string.pat_range), rng)}private fun drawGroundTrack(@@ -313,4 +301,9 @@ class MapViewFragment : Fragment() {return value * 180 / Math.PI}}++ override fun onDestroyView() {+ _binding = null+ super.onDestroyView()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.ktindex 4bbc28eb..90e43653 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt@@ -29,18 +29,15 @@ import android.widget.ImageButtonimport android.widget.TextViewimport android.widget.Toastimport androidx.appcompat.app.AlertDialog-import androidx.constraintlayout.widget.ConstraintLayoutimport androidx.fragment.app.Fragmentimport androidx.lifecycle.Observerimport androidx.lifecycle.ViewModelProviderimport androidx.recyclerview.widget.LinearLayoutManager-import androidx.recyclerview.widget.RecyclerViewimport androidx.recyclerview.widget.SimpleItemAnimator-import androidx.swiperefreshlayout.widget.SwipeRefreshLayoutimport com.github.amsacode.predict4java.TLE-import com.google.android.material.floatingactionbutton.FloatingActionButtonimport com.rtbishop.look4sat.MainViewModelimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.FragmentPassListBindingimport com.rtbishop.look4sat.repo.SatEntryimport com.rtbishop.look4sat.repo.SatPassimport com.rtbishop.look4sat.ui.adapters.SatPassAdapter@@ -49,15 +46,14 @@ import java.util.concurrent.TimeUnitclass PassListFragment : Fragment() {+ private var _binding: FragmentPassListBinding? = null+ private val binding get() = _binding!!+private lateinit var viewModel: MainViewModel- private lateinit var satPassRecycler: RecyclerViewprivate lateinit var satPassAdapter: SatPassAdapterprivate lateinit var btnPassPrefs: ImageButton- private lateinit var passListFab: FloatingActionButtonprivate lateinit var aosTimer: CountDownTimerprivate lateinit var aosTimerText: TextView- private lateinit var swipeLayout: SwipeRefreshLayout- private lateinit var infoLayout: ConstraintLayoutprivate lateinit var mainActivity: MainActivityprivate lateinit var satPassList: MutableList<SatPass>private var isTimerSet: Boolean = false@@ -75,27 +71,20 @@ class PassListFragment : Fragment() {container: ViewGroup?,savedInstanceState: Bundle?): View? {- return inflater.inflate(R.layout.fragment_pass_list, container, false)+ _binding = FragmentPassListBinding.inflate(layoutInflater, container, false)+ return binding.root}override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- findViews(view)- setupComponents()- setupObservers()- }-- private fun findViews(view: View) {aosTimerText = mainActivity.findViewById(R.id.toolbar_timer)btnPassPrefs = mainActivity.findViewById(R.id.toolbar_filter)- swipeLayout = view.findViewById(R.id.pass_list_refresh)- infoLayout = view.findViewById(R.id.pass_info_layout)- satPassRecycler = view.findViewById(R.id.pass_list_recycler)- passListFab = view.findViewById(R.id.pass_list_fab)+ setupComponents()+ setupObservers()}private fun setupComponents() {- satPassRecycler.apply {+ binding.recPassList.apply {layoutManager = LinearLayoutManager(mainActivity)adapter = satPassAdapterisVerticalScrollBarEnabled = false@@ -104,13 +93,13 @@ class PassListFragment : Fragment() {satPassAdapter.setList(satPassList)setTimer()- swipeLayout.setProgressBackgroundColorSchemeResource(R.color.themeAccent)- swipeLayout.setColorSchemeResources(R.color.backgroundDark)- swipeLayout.setOnRefreshListener { calculatePasses() }+ binding.refLayoutPassList.setProgressBackgroundColorSchemeResource(R.color.themeAccent)+ binding.refLayoutPassList.setColorSchemeResources(R.color.backgroundDark)+ binding.refLayoutPassList.setOnRefreshListener { calculatePasses() }btnPassPrefs.setOnClickListener {showSatPassPrefsDialog(viewModel.hoursAhead, viewModel.minEl)}- passListFab.setOnClickListener {+ binding.fabSatSelect.setOnClickListener {showSelectSatDialog(viewModel.tleMainList, viewModel.tleSelection)}}@@ -120,19 +109,19 @@ class PassListFragment : Fragment() {satPassList = itsatPassAdapter.setList(satPassList)if (satPassList.isNotEmpty()) {- infoLayout.visibility = View.INVISIBLE- satPassRecycler.visibility = View.VISIBLE+ binding.layoutInfo.visibility = View.INVISIBLE+ binding.recPassList.visibility = View.VISIBLE} else {- infoLayout.visibility = View.VISIBLE- satPassRecycler.visibility = View.INVISIBLE+ binding.layoutInfo.visibility = View.VISIBLE+ binding.recPassList.visibility = View.INVISIBLE}setTimer()- swipeLayout.isRefreshing = false+ binding.refLayoutPassList.isRefreshing = false})}private fun calculatePasses() {- swipeLayout.isRefreshing = true+ binding.refLayoutPassList.isRefreshing = trueviewModel.getPasses()}@@ -278,4 +267,9 @@ class PassListFragment : Fragment() {if (resetToNull) aosTimerText.text =String.format(getString(R.string.pat_timer), 0, 0, 0)}++ override fun onDestroyView() {+ _binding = null+ super.onDestroyView()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.ktindex f9b16d59..8da12736 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt@@ -27,18 +27,16 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.FrameLayout-import android.widget.TextViewimport androidx.core.content.ContextCompatimport androidx.fragment.app.Fragmentimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.navigation.fragment.navArgsimport androidx.recyclerview.widget.LinearLayoutManager-import androidx.recyclerview.widget.RecyclerViewimport com.github.amsacode.predict4java.SatPosimport com.rtbishop.look4sat.MainViewModelimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.FragmentPolarViewBindingimport com.rtbishop.look4sat.repo.SatPassimport com.rtbishop.look4sat.ui.adapters.TransmitterAdapterimport kotlinx.coroutines.launch@@ -53,17 +51,13 @@ class PolarViewFragment : Fragment() {private val service = Executors.newSingleThreadScheduledExecutor()private val args: PolarViewFragmentArgs by navArgs()+ private var _binding: FragmentPolarViewBinding? = null+ private val binding get() = _binding!!+private lateinit var viewModel: MainViewModelprivate lateinit var satPass: SatPassprivate lateinit var polarView: PolarView- private lateinit var polarViewFrame: FrameLayout- private lateinit var transRecycler: RecyclerViewprivate lateinit var transmitterAdapter: TransmitterAdapter- private lateinit var polarAzimuth: TextView- private lateinit var polarElevation: TextView- private lateinit var polarRange: TextView- private lateinit var polarAltitude: TextView- private lateinit var noTransFound: TextViewprivate lateinit var mainActivity: MainActivityoverride fun onCreate(savedInstanceState: Bundle?) {@@ -77,27 +71,20 @@ class PolarViewFragment : Fragment() {container: ViewGroup?,savedInstanceState: Bundle?): View? {- return inflater.inflate(R.layout.fragment_polar_view, container, false)+ _binding = FragmentPolarViewBinding.inflate(layoutInflater, container, false)+ return binding.root}override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- polarViewFrame = view.findViewById(R.id.polar_view_frame)- transRecycler = view.findViewById(R.id.polar_recycler)- polarAzimuth = view.findViewById(R.id.polar_azimuth)- polarElevation = view.findViewById(R.id.polar_elevation)- polarRange = view.findViewById(R.id.polar_range)- polarAltitude = view.findViewById(R.id.polar_altitude)- noTransFound = view.findViewById(R.id.polar_no_trans)-viewModel.satPassList.value?.let {val refreshRate = viewModel.delaysatPass = it[args.satPassIndex]mainActivity.supportActionBar?.title = satPass.tle.namepolarView = PolarView(mainActivity, refreshRate)- polarViewFrame.addView(polarView)+ binding.framePolar.addView(polarView)service.scheduleAtFixedRate({ polarView.invalidate() },refreshRate,@@ -111,7 +98,7 @@ class PolarViewFragment : Fragment() {private fun setupTransRecycler() {transmitterAdapter = TransmitterAdapter()- transRecycler.apply {+ binding.recPolar.apply {layoutManager = LinearLayoutManager(mainActivity)adapter = transmitterAdapter}@@ -121,8 +108,8 @@ class PolarViewFragment : Fragment() {transmitterAdapter.setList(transList)transmitterAdapter.notifyDataSetChanged()} else {- transRecycler.visibility = View.INVISIBLE- noTransFound.visibility = View.VISIBLE+ binding.recPolar.visibility = View.INVISIBLE+ binding.tvPolarNoTrans.visibility = View.VISIBLE}}}@@ -178,13 +165,13 @@ class PolarViewFragment : Fragment() {private fun setPassText() {satPos = satPass.predictor.getSatPos(Date())- polarAzimuth.text =+ binding.tvPolarAz.text =String.format(context.getString(R.string.pat_azimuth), rad2Deg(satPos.azimuth))- polarElevation.text =+ binding.tvPolarEl.text =String.format(context.getString(R.string.pat_elevation), rad2Deg(satPos.elevation))- polarRange.text =+ binding.tvPolarRng.text =String.format(context.getString(R.string.pat_range), satPos.range)- polarAltitude.text =+ binding.tvPolarAlt.text =String.format(context.getString(R.string.pat_altitude), satPos.altitude)}@@ -266,4 +253,9 @@ class PolarViewFragment : Fragment() {return value * 180 / Math.PI}}++ override fun onDestroyView() {+ _binding = null+ super.onDestroyView()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.ktindex 93ea5763..2835338f 100755--- a/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt@@ -24,33 +24,30 @@ import android.os.Bundleimport android.view.ViewGroupimport android.view.Windowimport android.widget.SearchView-import android.widget.TextViewimport androidx.appcompat.app.AppCompatDialogFragmentimport androidx.recyclerview.widget.LinearLayoutManager-import androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.DialogSatEntryBindingimport com.rtbishop.look4sat.repo.SatEntryimport com.rtbishop.look4sat.ui.adapters.SatEntryAdapterimport java.util.*class SatEntryDialog : AppCompatDialogFragment(), SearchView.OnQueryTextListener {- private lateinit var searchView: SearchView- private lateinit var recyclerView: RecyclerView- private lateinit var dialogBtnPositive: TextView- private lateinit var dialogBtnNegative: TextView- private lateinit var dialogBtnNeutral: TextViewprivate lateinit var satEntryAdapter: SatEntryAdapterprivate lateinit var entriesListener: EntriesSubmitListener+ private var _binding: DialogSatEntryBinding? = null+ private val binding get() = _binding!!+private var entriesList = mutableListOf<SatEntry>()private var selectionList = mutableListOf<Int>()private var selectAllToggle = trueoverride fun onCreateDialog(savedInstanceState: Bundle?): Dialog {+ _binding = DialogSatEntryBinding.inflate(requireActivity().layoutInflater)val satEntryDialog = Dialog(requireActivity()).apply {window?.requestFeature(Window.FEATURE_NO_TITLE)- setContentView(R.layout.dialog_sat_entry)+ setContentView(binding.root)window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT@@ -60,20 +57,21 @@ class SatEntryDialog : AppCompatDialogFragment(), SearchView.OnQueryTextListenerentriesList = checkSelectedEntries(entriesList, selectionList)satEntryAdapter = SatEntryAdapter(entriesList)- findViews(satEntryDialog)- setListeners()-- searchView.apply {+ binding.dialogSearch.apply {setOnQueryTextListener(this@SatEntryDialog)onActionViewExpanded()clearFocus()}- recyclerView.apply {+ binding.dialogRecycler.apply {layoutManager = LinearLayoutManager(activity)adapter = satEntryAdapter}+ binding.dialogBtnPositive.setOnClickListener { onPositiveClicked() }+ binding.dialogBtnNegative.setOnClickListener { onNegativeClicked() }+ binding.dialogBtnNeutral.setOnClickListener { onNeutralClicked() }+return satEntryDialog}@@ -93,20 +91,6 @@ class SatEntryDialog : AppCompatDialogFragment(), SearchView.OnQueryTextListenerreturn this}- private fun findViews(dialog: Dialog) {- searchView = dialog.findViewById(R.id.dialog_search)- recyclerView = dialog.findViewById(R.id.dialog_recycler)- dialogBtnPositive = dialog.findViewById(R.id.dialog_btn_positive)- dialogBtnNegative = dialog.findViewById(R.id.dialog_btn_negative)- dialogBtnNeutral = dialog.findViewById(R.id.dialog_btn_neutral)- }-- private fun setListeners() {- dialogBtnPositive.setOnClickListener { onPositiveClicked() }- dialogBtnNegative.setOnClickListener { onNegativeClicked() }- dialogBtnNeutral.setOnClickListener { onNeutralClicked() }- }-private fun checkSelectedEntries(entries: MutableList<SatEntry>, selection: MutableList<Int>): MutableList<SatEntry> {selection.forEach { entries[it].isSelected = true }@@ -163,4 +147,9 @@ class SatEntryDialog : AppCompatDialogFragment(), SearchView.OnQueryTextListenerinterface EntriesSubmitListener {fun onEntriesSubmit(list: MutableList<Int>)}++ override fun onDestroyView() {+ _binding = null+ super.onDestroyView()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.ktindex afcca097..ded8edf7 100755--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt@@ -22,19 +22,17 @@ package com.rtbishop.look4sat.ui.adaptersimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.CheckBoximport androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.ItemSatEntryBindingimport com.rtbishop.look4sat.repo.SatEntryinternal class SatEntryAdapter(private var entriesList: MutableList<SatEntry>) :RecyclerView.Adapter<SatEntryAdapter.SatEntryHolder>() {override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SatEntryHolder {- val view = LayoutInflater- .from(parent.context)- .inflate(R.layout.sat_entry_item, parent, false)- return SatEntryHolder(view)+ val binding = ItemSatEntryBinding+ .inflate(LayoutInflater.from(parent.context), parent, false)+ return SatEntryHolder(binding.root, binding)}override fun onBindViewHolder(holder: SatEntryHolder, position: Int) {@@ -50,13 +48,13 @@ internal class SatEntryAdapter(private var entriesList: MutableList<SatEntry>) :notifyDataSetChanged()}- internal inner class SatEntryHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {- private val satEntryItem: CheckBox = itemView.findViewById(R.id.sat_entry_item)+ internal inner class SatEntryHolder(itemView: View, private val binding: ItemSatEntryBinding) :+ RecyclerView.ViewHolder(itemView) {fun bind(satEntry: SatEntry) {- satEntryItem.text = satEntry.name- satEntryItem.isChecked = satEntry.isSelected- itemView.setOnClickListener { satEntry.isSelected = satEntryItem.isChecked }+ binding.satEntryCheckbox.text = satEntry.name+ binding.satEntryCheckbox.isChecked = satEntry.isSelected+ itemView.setOnClickListener { satEntry.isSelected = binding.satEntryCheckbox.isChecked }}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.ktindex 3147c52e..367663a8 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt@@ -23,13 +23,12 @@ import android.content.Contextimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.ImageView-import android.widget.ProgressBar-import android.widget.TextViewimport androidx.navigation.findNavControllerimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.MainViewModelimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.ItemPassGeoBinding+import com.rtbishop.look4sat.databinding.ItemPassLeoBindingimport com.rtbishop.look4sat.repo.SatPassimport com.rtbishop.look4sat.ui.PassListFragmentDirectionsimport java.text.SimpleDateFormat@@ -80,60 +79,48 @@ class SatPassAdapter(val viewModel: MainViewModel) :override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {return if (viewType == 0) {- val itemView = LayoutInflater- .from(parent.context)- .inflate(R.layout.card_pass, parent, false)- return SatPassHolder(itemView)+ val bindingLeo = ItemPassLeoBinding+ .inflate(LayoutInflater.from(parent.context), parent, false)+ SatPassLeoHolder(bindingLeo.root, bindingLeo)} else {- val itemView = LayoutInflater- .from(parent.context)- .inflate(R.layout.card_pass_geo, parent, false)- SatPassGeoHolder(itemView)+ val bindingGeo = ItemPassGeoBinding+ .inflate(LayoutInflater.from(parent.context), parent, false)+ SatPassGeoHolder(bindingGeo.root, bindingGeo)}}override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {if (holder.itemViewType == 0) {- (holder as SatPassHolder).bind(satPassList[position])+ (holder as SatPassLeoHolder).bind(satPassList[position])} else {(holder as SatPassGeoHolder).bind(satPassList[position])}}- inner class SatPassHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {-- private val context: Context = itemView.context- private val passImg = itemView.findViewById<ImageView>(R.id.pass_img)- private val satName = itemView.findViewById<TextView>(R.id.pass_satName)- private val satId = itemView.findViewById<TextView>(R.id.pass_satId)- private val maxEl = itemView.findViewById<TextView>(R.id.pass_maxEl)- private val aosAz = itemView.findViewById<TextView>(R.id.pass_aosAz)- private val losAz = itemView.findViewById<TextView>(R.id.pass_losAz)- private val aosTime = itemView.findViewById<TextView>(R.id.pass_aosTime)- private val losTime = itemView.findViewById<TextView>(R.id.pass_losTime)- private var progressBar = itemView.findViewById<ProgressBar>(R.id.pass_progress)+ inner class SatPassLeoHolder(itemView: View, private val binding: ItemPassLeoBinding) :+ RecyclerView.ViewHolder(itemView) {fun bind(satPass: SatPass) {+ val context: Context = itemView.context+ if (satPass.active) binding.passLeoImg.setImageResource(R.drawable.ic_pass_active)+ else binding.passLeoImg.setImageResource(R.drawable.ic_pass_inactive)- if (satPass.active) passImg.setImageResource(R.drawable.ic_pass_active)- else passImg.setImageResource(R.drawable.ic_pass_inactive)-- satName.text = satPass.tle.name- satId.text =+ binding.passLeoSatName.text = satPass.tle.name+ binding.passLeoSatId.text =String.format(context.getString(R.string.pass_satId), satPass.tle.catnum)- maxEl.text =+ binding.passLeoMaxEl.text =String.format(context.getString(R.string.pass_maxEl), satPass.pass.maxEl)- aosAz.text =+ binding.passLeoAosAz.text =String.format(context.getString(R.string.pass_aos_az), satPass.pass.aosAzimuth)- losAz.text =+ binding.passLeoLosAz.text =String.format(context.getString(R.string.pass_los_az), satPass.pass.losAzimuth)- aosTime.text =+ binding.passLeoAosTime.text =SimpleDateFormat(context.getString(R.string.pass_dateTime), Locale.getDefault()).format(satPass.pass.startTime)- losTime.text =+ binding.passLeoLosTime.text =SimpleDateFormat(context.getString(R.string.pass_dateTime), Locale.getDefault()).format(satPass.pass.endTime)- progressBar.progress = satPass.progress+ binding.passLeoProgress.progress = satPass.progressitemView.setOnClickListener {viewModel.satPassList.value?.let {@@ -145,22 +132,19 @@ class SatPassAdapter(val viewModel: MainViewModel) :}}- inner class SatPassGeoHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {-- private val context: Context = itemView.context- private val satName = itemView.findViewById<TextView>(R.id.pass_geo_name)- private val satId = itemView.findViewById<TextView>(R.id.pass_geo_id)- private val satAz = itemView.findViewById<TextView>(R.id.pass_geo_az)- private val satEl = itemView.findViewById<TextView>(R.id.pass_geo_el)+ inner class SatPassGeoHolder(itemView: View, private val binding: ItemPassGeoBinding) :+ RecyclerView.ViewHolder(itemView) {fun bind(satPass: SatPass) {+ val context: Context = itemView.contextval satPos = satPass.predictor.getSatPos(satPass.pass.startTime)val azimuth = satPos.azimuth * 180 / Math.PI- satName.text = satPass.tle.name- satId.text = String.format(context.getString(R.string.pass_satId), satPass.tle.catnum)- satAz.text = String.format(context.getString(R.string.pat_azimuth), azimuth)- satEl.text =+ binding.passGeoName.text = satPass.tle.name+ binding.passGeoId.text =+ String.format(context.getString(R.string.pass_satId), satPass.tle.catnum)+ binding.passGeoAz.text = String.format(context.getString(R.string.pat_azimuth), azimuth)+ binding.passGeoEl.text =String.format(context.getString(R.string.pat_elevation), satPass.pass.maxEl)itemView.setOnClickListener {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.ktindex 19b08cf2..3af59189 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt@@ -23,9 +23,9 @@ import android.content.Contextimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.widget.TextViewimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.ItemTransmitterBindingimport com.rtbishop.look4sat.repo.Transmitterclass TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHolder>() {@@ -41,72 +41,69 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHo}override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TransmitterHolder {- val itemView = LayoutInflater- .from(parent.context)- .inflate(R.layout.card_trans, parent, false)- return TransmitterHolder(itemView)+ val binding = ItemTransmitterBinding+ .inflate(LayoutInflater.from(parent.context), parent, false)+ return TransmitterHolder(binding.root, binding)}override fun onBindViewHolder(holder: TransmitterHolder, position: Int) {holder.bind(transmittersList[position])}- inner class TransmitterHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {-- private val context: Context = itemView.context- private val description = itemView.findViewById<TextView>(R.id.trans_description)- private val downlink = itemView.findViewById<TextView>(R.id.trans_downlink)- private val uplink = itemView.findViewById<TextView>(R.id.trans_uplink)- private val mode = itemView.findViewById<TextView>(R.id.trans_mode)- private val inverted = itemView.findViewById<TextView>(R.id.trans_inverted)- private val freqDivider = 1000000f+ inner class TransmitterHolder(itemView: View, private val binding: ItemTransmitterBinding) :+ RecyclerView.ViewHolder(itemView) {fun bind(transmitter: Transmitter) {- description.text = transmitter.description+ val context: Context = itemView.context+ val freqDivider = 1000000f++ binding.transDescription.text = transmitter.descriptionif (transmitter.downlinkLow != null && transmitter.downlinkHigh == null) {- downlink.text = String.format(- context.getString(R.string.trans_down_low),- transmitter.downlinkLow / freqDivider- )+ binding.transDownlink.text = String+ .format(+ context.getString(R.string.trans_down_low),+ transmitter.downlinkLow / freqDivider+ )} else if (transmitter.downlinkLow != null && transmitter.downlinkHigh != null) {- downlink.text = String.format(- context.getString(R.string.trans_down_lowHigh),- transmitter.downlinkLow / freqDivider,- transmitter.downlinkHigh / freqDivider- )+ binding.transDownlink.text = String+ .format(+ context.getString(R.string.trans_down_lowHigh),+ transmitter.downlinkLow / freqDivider,+ transmitter.downlinkHigh / freqDivider+ )} else {- downlink.text = context.getString(R.string.no_downlink)+ binding.transDownlink.text = context.getString(R.string.no_downlink)}if (transmitter.uplinkLow != null && transmitter.uplinkHigh == null) {- uplink.text = String.format(+ binding.transUplink.text = String.format(context.getString(R.string.trans_up_low),transmitter.uplinkLow / freqDivider)} else if (transmitter.uplinkLow != null && transmitter.uplinkHigh != null) {- uplink.text = String.format(+ binding.transUplink.text = String.format(context.getString(R.string.trans_up_lowHigh),transmitter.uplinkLow / freqDivider,transmitter.uplinkHigh / freqDivider)} else {- uplink.text = context.getString(R.string.no_uplink)+ binding.transUplink.text = context.getString(R.string.no_uplink)}if (transmitter.mode != null) {- mode.text =+ binding.transMode.text =String.format(context.getString(R.string.trans_mode), transmitter.mode)} else {- mode.text = context.getString(R.string.no_mode)+ binding.transMode.text = context.getString(R.string.no_mode)}if (transmitter.isInverted) {- inverted.text = String.format(+ binding.transInverted.text = String.format(context.getString(R.string.trans_inverted),context.getString(R.string.btn_yes))} else {- inverted.text = String.format(+ binding.transInverted.text = String.format(context.getString(R.string.trans_inverted),context.getString(R.string.btn_no))diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex 9d78f793..81a29d70 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -27,6 +27,7 @@tools:openDrawer="start"><include+ android:id="@+id/include_app_bar"layout="@layout/app_bar_main"android:layout_width="match_parent"android:layout_height="match_parent" />diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xmlindex 2ba65ffa..084d2b76 100644--- a/app/src/main/res/layout/app_bar_main.xml+++ b/app/src/main/res/layout/app_bar_main.xml@@ -64,6 +64,8 @@</com.google.android.material.appbar.AppBarLayout>- <include layout="@layout/content_main" />+ <include+ android:id="@+id/include_main_content"+ layout="@layout/content_main" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xmlindex 64bbe2c2..6fcefad9 100644--- a/app/src/main/res/layout/drawer_header.xml+++ b/app/src/main/res/layout/drawer_header.xml@@ -20,6 +20,7 @@<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"+ android:id="@+id/drawer_layout"android:layout_width="match_parent"android:layout_height="wrap_content"android:background="@drawable/ic_launcher_background"@@ -86,7 +87,7 @@android:text="@string/pat_location"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.1"- app:layout_constraintStart_toEndOf="@+id/barrier"+ app:layout_constraintStart_toEndOf="@+id/mainBarrier"app:layout_constraintTop_toBottomOf="@+id/drawer_lat_value" /><androidx.appcompat.widget.AppCompatButton@@ -131,14 +132,14 @@android:drawableEnd="@drawable/ic_goto_github"android:text="@string/goto_github"app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"- app:layout_constraintEnd_toStartOf="@+id/guideline_center"+ app:layout_constraintEnd_toStartOf="@+id/guidelineCenter"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="@+id/guidelineLeft"app:layout_constraintTop_toBottomOf="@+id/drawer_btn_trans" /><androidx.appcompat.widget.AppCompatButton- android:id="@+id/drawer_btn_exit"+ android:id="@+id/drawerBtnExit"style="@style/DrawerHeader.Button"android:layout_width="0dp"android:layout_marginStart="1dp"@@ -147,17 +148,17 @@app:layout_constraintBaseline_toBaselineOf="@+id/drawer_btn_github"app:layout_constraintEnd_toStartOf="@+id/guidelineRight"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toStartOf="@+id/guideline_center" />+ app:layout_constraintStart_toStartOf="@+id/guidelineCenter" /><androidx.constraintlayout.widget.Guideline- android:id="@+id/guideline_center"+ android:id="@+id/guidelineCenter"android:layout_width="wrap_content"android:layout_height="wrap_content"android:orientation="vertical"app:layout_constraintGuide_percent="0.5" /><androidx.constraintlayout.widget.Barrier- android:id="@+id/barrier"+ android:id="@+id/mainBarrier"android:layout_width="wrap_content"android:layout_height="wrap_content"app:barrierDirection="end"diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xmlindex ca58b665..7ce09874 100644--- a/app/src/main/res/layout/fragment_about.xml+++ b/app/src/main/res/layout/fragment_about.xml@@ -29,19 +29,19 @@android:layout_height="wrap_content"><TextView- android:id="@+id/about_title"+ android:id="@+id/tv_about_title"style="@style/AboutTitle"android:layout_marginStart="4dp"android:layout_marginEnd="16dp"android:text="@string/app_name"- app:layout_constraintBottom_toBottomOf="@+id/about_title_img"+ app:layout_constraintBottom_toBottomOf="@+id/img_about"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toEndOf="@+id/about_title_img"- app:layout_constraintTop_toTopOf="@+id/about_title_img" />+ app:layout_constraintStart_toEndOf="@+id/img_about"+ app:layout_constraintTop_toTopOf="@+id/img_about" /><ImageView- android:id="@+id/about_title_img"+ android:id="@+id/img_about"android:layout_width="42dp"android:layout_height="42dp"android:layout_marginStart="16dp"@@ -49,14 +49,14 @@android:layout_marginEnd="4dp"android:contentDescription="@string/placeholder"android:src="@drawable/ic_sputnik"- app:layout_constraintEnd_toStartOf="@+id/about_title"+ app:layout_constraintEnd_toStartOf="@+id/tv_about_title"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="packed"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" /><TextView- android:id="@+id/about_title_version"+ android:id="@+id/tv_about_version"style="@style/AboutSubtitle"android:layout_marginStart="32dp"android:layout_marginTop="8dp"@@ -64,10 +64,10 @@android:text="@string/app_version"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/about_title" />+ app:layout_constraintTop_toBottomOf="@+id/tv_about_title" /><TextView- android:id="@+id/about_subtitle"+ android:id="@+id/tv_about_subtitle"style="@style/AboutSubtitle"android:layout_marginStart="32dp"android:layout_marginTop="8dp"@@ -75,19 +75,19 @@android:text="@string/about_subtitle"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/about_title_version" />+ app:layout_constraintTop_toBottomOf="@+id/tv_about_version" /><TextView- android:id="@+id/about_thanks"+ android:id="@+id/tv_about_thanks"style="@style/AboutSubtitle"android:layout_marginTop="16dp"android:text="@string/about_thanks_to"- app:layout_constraintEnd_toEndOf="@+id/about_subtitle"- app:layout_constraintStart_toStartOf="@+id/about_subtitle"- app:layout_constraintTop_toBottomOf="@+id/about_subtitle" />+ app:layout_constraintEnd_toEndOf="@+id/tv_about_subtitle"+ app:layout_constraintStart_toStartOf="@+id/tv_about_subtitle"+ app:layout_constraintTop_toBottomOf="@+id/tv_about_subtitle" /><TextView- android:id="@+id/about_thanks_to"+ android:id="@+id/tv_about_message"style="@style/AboutRegular"android:layout_marginStart="16dp"android:layout_marginTop="16dp"@@ -97,7 +97,7 @@app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/about_thanks" />+ app:layout_constraintTop_toBottomOf="@+id/tv_about_thanks" /></androidx.constraintlayout.widget.ConstraintLayout></ScrollView>diff --git a/app/src/main/res/layout/fragment_map_view.xml b/app/src/main/res/layout/fragment_map_view.xmlindex ebc1aa2f..077a3f2e 100644--- a/app/src/main/res/layout/fragment_map_view.xml+++ b/app/src/main/res/layout/fragment_map_view.xml@@ -25,7 +25,7 @@tools:context=".ui.MapViewFragment"><FrameLayout- android:id="@+id/map_frame"+ android:id="@+id/frameMap"android:layout_width="match_parent"android:layout_height="match_parent"android:background="@drawable/worldmap_bg_dark"@@ -35,7 +35,7 @@app:layout_constraintTop_toTopOf="parent" /><com.google.android.material.floatingactionbutton.FloatingActionButton- android:id="@+id/map_fab"+ android:id="@+id/fabMap"android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_gravity="bottom|start"@@ -46,7 +46,7 @@app:srcCompat="@drawable/ic_sat_asc_right" /><TextView- android:id="@+id/map_lat"+ android:id="@+id/tvMapLat"style="@style/MapText"android:layout_marginStart="4dp"android:layout_marginTop="4dp"@@ -55,7 +55,7 @@app:layout_constraintTop_toTopOf="parent" /><TextView- android:id="@+id/map_lon"+ android:id="@+id/tvMapLon"style="@style/MapText"android:layout_marginTop="4dp"android:layout_marginEnd="4dp"@@ -64,7 +64,7 @@app:layout_constraintTop_toTopOf="parent" /><TextView- android:id="@+id/map_rng"+ android:id="@+id/tvMapRng"style="@style/MapText"android:layout_marginEnd="4dp"android:layout_marginBottom="4dp"diff --git a/app/src/main/res/layout/fragment_pass_list.xml b/app/src/main/res/layout/fragment_pass_list.xmlindex 5afe218b..f6f8e8a1 100644--- a/app/src/main/res/layout/fragment_pass_list.xml+++ b/app/src/main/res/layout/fragment_pass_list.xml@@ -19,7 +19,7 @@<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/pass_list_refresh"+ android:id="@+id/refLayoutPassList"android:layout_width="match_parent"android:layout_height="match_parent">@@ -28,7 +28,7 @@android:layout_height="match_parent"><androidx.recyclerview.widget.RecyclerView- android:id="@+id/pass_list_recycler"+ android:id="@+id/recPassList"android:layout_width="0dp"android:layout_height="0dp"android:paddingBottom="4dp"@@ -41,7 +41,7 @@</androidx.recyclerview.widget.RecyclerView><androidx.constraintlayout.widget.ConstraintLayout- android:id="@+id/pass_info_layout"+ android:id="@+id/layoutInfo"android:layout_width="match_parent"android:layout_height="match_parent"android:visibility="visible"@@ -51,7 +51,7 @@app:layout_constraintTop_toTopOf="parent"><ImageView- android:id="@+id/info_swipe_img"+ android:id="@+id/imgInfoSwipe"android:layout_width="36dp"android:layout_height="36dp"android:contentDescription="@string/placeholder"@@ -61,7 +61,7 @@app:srcCompat="@drawable/ic_arrow_swipe" /><TextView- android:id="@+id/info_swipe_text"+ android:id="@+id/tvInfoSwipe"style="@style/PassInfoText"android:layout_width="0dp"android:layout_height="wrap_content"@@ -70,10 +70,10 @@android:text="@string/info_swipe_text"app:layout_constraintEnd_toStartOf="@+id/guideRight"app:layout_constraintStart_toStartOf="@+id/guideLeft"- app:layout_constraintTop_toBottomOf="@+id/info_swipe_img" />+ app:layout_constraintTop_toBottomOf="@+id/imgInfoSwipe" /><ImageView- android:id="@+id/info_img_sputnik"+ android:id="@+id/imgInfoSputnik"android:layout_width="0dp"android:layout_height="0dp"android:layout_marginStart="16dp"@@ -81,22 +81,22 @@android:layout_marginEnd="16dp"android:layout_marginBottom="16dp"android:contentDescription="@string/placeholder"- app:layout_constraintBottom_toTopOf="@+id/info_main_text"+ app:layout_constraintBottom_toTopOf="@+id/tvInfoMain"app:layout_constraintDimensionRatio="1:1"app:layout_constraintEnd_toStartOf="@+id/guideRight"app:layout_constraintStart_toStartOf="@+id/guideLeft"- app:layout_constraintTop_toBottomOf="@+id/info_swipe_text"+ app:layout_constraintTop_toBottomOf="@+id/tvInfoSwipe"app:layout_constraintVertical_chainStyle="packed"app:srcCompat="@drawable/ic_sputnik" /><TextView- android:id="@+id/info_main_text"+ android:id="@+id/tvInfoMain"style="@style/PassInfoText"android:layout_width="0dp"android:layout_height="wrap_content"android:gravity="center"android:text="@string/info_main_text"- app:layout_constraintBottom_toTopOf="@+id/info_select_text"+ app:layout_constraintBottom_toTopOf="@+id/tvSatSelect"app:layout_constraintEnd_toStartOf="@+id/guideRight"app:layout_constraintStart_toStartOf="@+id/guideLeft"app:layout_constraintTop_toTopOf="@+id/guideCenter"@@ -104,7 +104,7 @@app:layout_constraintVertical_chainStyle="spread" /><TextView- android:id="@+id/info_select_text"+ android:id="@+id/tvSatSelect"style="@style/PassInfoText"android:layout_width="0dp"android:layout_height="wrap_content"@@ -152,7 +152,7 @@</androidx.constraintlayout.widget.ConstraintLayout><com.google.android.material.floatingactionbutton.FloatingActionButton- android:id="@+id/pass_list_fab"+ android:id="@+id/fabSatSelect"android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_gravity="bottom|end"diff --git a/app/src/main/res/layout/fragment_polar_view.xml b/app/src/main/res/layout/fragment_polar_view.xmlindex 915a63ac..1cfbebda 100644--- a/app/src/main/res/layout/fragment_polar_view.xml+++ b/app/src/main/res/layout/fragment_polar_view.xml@@ -25,7 +25,7 @@tools:context=".ui.PolarViewFragment"><FrameLayout- android:id="@+id/polar_view_frame"+ android:id="@+id/frame_polar"android:layout_width="match_parent"android:layout_height="0dp"app:layout_constraintDimensionRatio="1:1"@@ -34,49 +34,49 @@app:layout_constraintTop_toTopOf="parent" /><TextView- android:id="@+id/polar_azimuth"+ android:id="@+id/tv_polar_az"style="@style/PolarViewText"android:layout_marginStart="4dp"android:text="@string/pat_azimuth"- app:layout_constraintStart_toStartOf="@+id/polar_view_frame"- app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />+ app:layout_constraintStart_toStartOf="@+id/frame_polar"+ app:layout_constraintTop_toTopOf="@+id/frame_polar" /><TextView- android:id="@+id/polar_elevation"+ android:id="@+id/tv_polar_el"style="@style/PolarViewText"android:layout_marginEnd="4dp"android:text="@string/pat_elevation"- app:layout_constraintEnd_toEndOf="@+id/polar_view_frame"- app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />+ app:layout_constraintEnd_toEndOf="@+id/frame_polar"+ app:layout_constraintTop_toTopOf="@+id/frame_polar" /><TextView- android:id="@+id/polar_altitude"+ android:id="@+id/tv_polar_alt"style="@style/PolarViewText"android:layout_marginStart="4dp"android:text="@string/pat_altitude"- app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"- app:layout_constraintStart_toStartOf="@+id/polar_view_frame" />+ app:layout_constraintBottom_toBottomOf="@+id/frame_polar"+ app:layout_constraintStart_toStartOf="@+id/frame_polar" /><TextView- android:id="@+id/polar_range"+ android:id="@+id/tv_polar_rng"style="@style/PolarViewText"android:layout_marginEnd="4dp"android:text="@string/pat_range"- app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"- app:layout_constraintEnd_toEndOf="@+id/polar_view_frame" />+ app:layout_constraintBottom_toBottomOf="@+id/frame_polar"+ app:layout_constraintEnd_toEndOf="@+id/frame_polar" /><androidx.recyclerview.widget.RecyclerView- android:id="@+id/polar_recycler"+ android:id="@+id/rec_polar"android:layout_width="0dp"android:layout_height="0dp"android:paddingBottom="4dp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />+ app:layout_constraintTop_toBottomOf="@+id/frame_polar" /><TextView- android:id="@+id/polar_no_trans"+ android:id="@+id/tv_polar_noTrans"style="@style/PolarViewText"android:layout_width="0dp"android:layout_marginTop="8dp"@@ -86,5 +86,5 @@app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />+ app:layout_constraintTop_toBottomOf="@+id/frame_polar" /></androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/layout/card_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xmlsimilarity index 98%rename from app/src/main/res/layout/card_pass_geo.xmlrename to app/src/main/res/layout/item_pass_geo.xmlindex e3e0ba27..374088d3 100644--- a/app/src/main/res/layout/card_pass_geo.xml+++ b/app/src/main/res/layout/item_pass_geo.xml@@ -19,7 +19,7 @@<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/card_pass_geo"+ android:id="@+id/pass_geo_card"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginStart="4dp"@@ -32,7 +32,7 @@android:layout_height="match_parent"><ImageView- android:id="@+id/pass_geo_background"+ android:id="@+id/pass_geo_bg"android:layout_width="0dp"android:layout_height="0dp"android:contentDescription="@string/placeholder"diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/item_pass_leo.xmlsimilarity index 70%rename from app/src/main/res/layout/card_pass.xmlrename to app/src/main/res/layout/item_pass_leo.xmlindex 1f92789a..723f31f6 100644--- a/app/src/main/res/layout/card_pass.xml+++ b/app/src/main/res/layout/item_pass_leo.xml@@ -19,7 +19,7 @@<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/card_pass"+ android:id="@+id/pass_leo_card"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginStart="4dp"@@ -32,7 +32,7 @@android:layout_height="wrap_content"><ImageView- android:id="@+id/pass_background"+ android:id="@+id/pass_leo_bg"android:layout_width="0dp"android:layout_height="0dp"android:contentDescription="@string/placeholder"@@ -44,86 +44,86 @@app:srcCompat="@drawable/card_pass_bg" /><TextView- android:id="@+id/pass_losAz"+ android:id="@+id/pass_leo_losAz"style="@style/CardPassText"android:text="@string/pass_los_az"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"- app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"+ app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintHorizontal_bias="1.0"- app:layout_constraintStart_toEndOf="@+id/pass_maxEl" />+ app:layout_constraintStart_toEndOf="@+id/pass_leo_maxEl" /><TextView- android:id="@+id/pass_satId"+ android:id="@+id/pass_leo_satId"style="@style/CardPassName"android:layout_marginTop="4dp"android:text="@string/pass_satId"- app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintTop_toTopOf="parent" /><TextView- android:id="@+id/pass_maxEl"+ android:id="@+id/pass_leo_maxEl"style="@style/CardPassText"android:layout_marginTop="2dp"android:text="@string/pass_maxEl"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/pass_satId" />+ app:layout_constraintTop_toBottomOf="@+id/pass_leo_satId" /><ImageView- android:id="@+id/pass_img"+ android:id="@+id/pass_leo_img"android:layout_width="20dp"android:layout_height="20dp"android:contentDescription="@string/placeholder"- app:layout_constraintBottom_toBottomOf="@+id/pass_satName"- app:layout_constraintStart_toStartOf="@+id/pass_progress"- app:layout_constraintTop_toTopOf="@+id/pass_satName"+ app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satName"+ app:layout_constraintStart_toStartOf="@+id/pass_leo_progress"+ app:layout_constraintTop_toTopOf="@+id/pass_leo_satName"app:srcCompat="@drawable/ic_pass_inactive" /><TextView- android:id="@+id/pass_satName"+ android:id="@+id/pass_leo_satName"style="@style/CardPassName"android:layout_width="wrap_content"android:layout_height="wrap_content"android:text="@string/pass_satName"- app:layout_constraintBottom_toBottomOf="@+id/pass_satId"- app:layout_constraintEnd_toStartOf="@+id/pass_satId"+ app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satId"+ app:layout_constraintEnd_toStartOf="@+id/pass_leo_satId"app:layout_constraintHorizontal_bias="0.02"- app:layout_constraintStart_toEndOf="@+id/pass_img"- app:layout_constraintTop_toTopOf="@+id/pass_satId" />+ app:layout_constraintStart_toEndOf="@+id/pass_leo_img"+ app:layout_constraintTop_toTopOf="@+id/pass_leo_satId" /><TextView- android:id="@+id/pass_aosAz"+ android:id="@+id/pass_leo_aosAz"style="@style/CardPassText"android:text="@string/pass_aos_az"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"- app:layout_constraintEnd_toStartOf="@+id/pass_maxEl"+ app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"+ app:layout_constraintEnd_toStartOf="@+id/pass_leo_maxEl"app:layout_constraintHorizontal_bias="0.0"- app:layout_constraintStart_toStartOf="@+id/pass_progress" />+ app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" /><TextView- android:id="@+id/pass_aosTime"+ android:id="@+id/pass_leo_aosTime"style="@style/CardPassText"android:text="@string/pass_dateTime"- app:layout_constraintBaseline_toBaselineOf="@+id/pass_losTime"- app:layout_constraintEnd_toStartOf="@+id/pass_losTime"+ app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_losTime"+ app:layout_constraintEnd_toStartOf="@+id/pass_leo_losTime"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="spread_inside"- app:layout_constraintStart_toStartOf="@+id/pass_progress" />+ app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" /><TextView- android:id="@+id/pass_losTime"+ android:id="@+id/pass_leo_losTime"style="@style/CardPassText"android:layout_marginBottom="4dp"android:text="@string/pass_dateTime"app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="@+id/pass_progress"+ app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toEndOf="@+id/pass_aosTime"- app:layout_constraintTop_toBottomOf="@+id/pass_progress" />+ app:layout_constraintStart_toEndOf="@+id/pass_leo_aosTime"+ app:layout_constraintTop_toBottomOf="@+id/pass_leo_progress" /><ProgressBar- android:id="@+id/pass_progress"+ android:id="@+id/pass_leo_progress"style="?android:attr/progressBarStyleHorizontal"android:layout_width="0dp"android:layout_height="14dp"@@ -131,7 +131,7 @@android:layout_marginEnd="6dp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/pass_maxEl" />+ app:layout_constraintTop_toBottomOf="@+id/pass_leo_maxEl" /></androidx.constraintlayout.widget.ConstraintLayout></com.google.android.material.card.MaterialCardView>diff --git a/app/src/main/res/layout/sat_entry_item.xml b/app/src/main/res/layout/item_sat_entry.xmlsimilarity index 96%rename from app/src/main/res/layout/sat_entry_item.xmlrename to app/src/main/res/layout/item_sat_entry.xmlindex 73e2b687..3d40aa1f 100644--- a/app/src/main/res/layout/sat_entry_item.xml+++ b/app/src/main/res/layout/item_sat_entry.xml@@ -18,7 +18,7 @@--><CheckBox xmlns:android="http://schemas.android.com/apk/res/android"- android:id="@+id/sat_entry_item"+ android:id="@+id/sat_entry_checkbox"android:layout_width="match_parent"android:layout_height="36dp"android:text="@string/placeholder"diff --git a/app/src/main/res/layout/card_trans.xml b/app/src/main/res/layout/item_transmitter.xmlsimilarity index 99%rename from app/src/main/res/layout/card_trans.xmlrename to app/src/main/res/layout/item_transmitter.xmlindex 7dda13c9..3c1b747a 100644--- a/app/src/main/res/layout/card_trans.xml+++ b/app/src/main/res/layout/item_transmitter.xml@@ -20,7 +20,7 @@<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/card_trans"+ android:id="@+id/trans_card"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginStart="4dp"diff --git a/build.gradle b/build.gradleindex bf562464..7d7977d1 100644--- a/build.gradle+++ b/build.gradle@@ -45,6 +45,7 @@ task clean(type: Delete) {ext {material = '1.2.0-alpha05'+ appCompat = '1.1.0'supportLib = '1.0.0'constraintLayout = '1.1.3'@@ -56,9 +57,9 @@ ext {room = '2.2.4'- retrofit = '2.6.2'+ retrofit = '2.7.1'- dagger = '2.25.2'+ dagger = '2.26'predict4java = '1.3.1'}