Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved the unnecessary code out of MainActivity.kt
Arty Bishop747a7620b044
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex b4cf7035..5d8f1c0c 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -2,31 +2,18 @@ package com.rtbishop.look4sat.uiimport android.os.Bundleimport androidx.appcompat.app.AppCompatActivity-import androidx.lifecycle.ViewModelProviderimport androidx.navigation.fragment.NavHostFragmentimport androidx.navigation.ui.setupWithNavController-import com.rtbishop.look4sat.Look4SatAppimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.dagger.ViewModelFactoryimport com.rtbishop.look4sat.databinding.ActivityMainBinding-import javax.inject.Injectclass MainActivity : AppCompatActivity() {- @Inject- lateinit var factory: ViewModelFactory-- private lateinit var binding: ActivityMainBinding- private lateinit var viewModel: SharedViewModel-override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)- binding = ActivityMainBinding.inflate(layoutInflater)+ val binding = ActivityMainBinding.inflate(layoutInflater)setContentView(binding.root)- val navHost = supportFragmentManager.findFragmentById(R.id.nav_frag) as NavHostFragment+ val navHost = supportFragmentManager.findFragmentById(R.id.nav_host) as NavHostFragmentbinding.navBottom.setupWithNavController(navHost.navController)- (application as Look4SatApp).appComponent.inject(this)- viewModel = ViewModelProvider(this, factory).get(SharedViewModel::class.java)- viewModel.setDefaultTleSources()}}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 02232dc8..9ee8c221 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -39,6 +39,12 @@ class SharedViewModel @Inject constructor(private val repository: Repository) : ViewModel() {+ init {+ if (prefsManager.isFirstLaunch()) {+ setDefaultTleSources()+ }+ }+val tleSources = repository.getSources()val allEntries = repository.getAllEntries()val selectedEntries = repository.getSelectedEntries()@@ -113,16 +119,12 @@ class SharedViewModel @Inject constructor(}}- fun setDefaultTleSources() {- if (prefsManager.isFirstLaunch()) {- viewModelScope.launch {- val defSourcesList = listOf(- TleSource("https://celestrak.com/NORAD/elements/active.txt"),- TleSource("https://amsat.org/tle/current/nasabare.txt")- )- repository.updateSources(defSourcesList)- }- }+ private fun setDefaultTleSources() {+ val defaultTleSources = listOf(+ TleSource("https://celestrak.com/NORAD/elements/active.txt"),+ TleSource("https://amsat.org/tle/current/nasabare.txt")+ )+ viewModelScope.launch { repository.updateSources(defaultTleSources) }}private fun getPassesForEntries(diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex 052a3f3f..bd306265 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -5,7 +5,7 @@android:layout_height="match_parent"><androidx.fragment.app.FragmentContainerView- android:id="@+id/nav_frag"+ android:id="@+id/nav_host"android:name="androidx.navigation.fragment.NavHostFragment"android:layout_width="match_parent"android:layout_height="0dp"