diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt index 2a53ea6d..eb5b972a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt @@ -140,12 +140,7 @@ class MainActivity : AppCompatActivity(), TleSourcesDialogFragment.SourcesSubmit }) viewModel.getUpdateStatus().observe(this, Observer { result -> when (result) { - is Result.Success -> { - when (result.data) { - 0 -> getString(R.string.update_tle_success).toast(this) - 1 -> getString(R.string.update_trans_success).toast(this) - } - } + is Result.Success -> getString(R.string.update_tle_success).toast(this) is Result.Error -> getString(R.string.update_failure).toast(this) } }) @@ -166,14 +161,13 @@ class MainActivity : AppCompatActivity(), TleSourcesDialogFragment.SourcesSubmit it.lockButton() } drawerBinding.drawerBtnTleUrl.setOnClickListener { - showTleSourcesDialog() + TleSourcesDialogFragment(viewModel.getTleSources()).apply { + setSourcesListener(this@MainActivity) + show(supportFragmentManager, "TleSourcesDialog") + } mainBinding.drawerLayout.closeDrawers() it.lockButton() } - drawerBinding.drawerBtnTrans.setOnClickListener { - viewModel.updateTransmitters() - it.lockButton() - } drawerBinding.drawerBtnGithub.setOnClickListener { val gitHubUrl = "https://github.com/rt-bishop/LookingSat" val githubIntent = Intent(Intent.ACTION_VIEW, Uri.parse(gitHubUrl)) @@ -182,16 +176,8 @@ class MainActivity : AppCompatActivity(), TleSourcesDialogFragment.SourcesSubmit drawerBinding.drawerBtnExit.setOnClickListener { finish() } } - private fun showTleSourcesDialog() { - val sources = viewModel.getTleSources() - TleSourcesDialogFragment(sources).apply { - setSourcesListener(this@MainActivity) - show(supportFragmentManager, "TleSourcesDialog") - } - } - override fun onSourcesSubmit(list: List) { - viewModel.updateEntriesFromWeb(list) + viewModel.updateSatData(list) } private fun View.lockButton() { diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt index d347fa83..2882efe6 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt @@ -91,11 +91,12 @@ class SharedViewModel @Inject constructor( } } - fun updateEntriesFromWeb(list: List) { + fun updateSatData(list: List) { viewModelScope.launch(Dispatchers.IO) { try { - repository.updateSources(list) val selected = repository.getSelectedEntries().map { it.catNum } + repository.updateSources(list) + repository.updateTransmitters() repository.updateEntriesFromUrl(list) repository.updateEntriesSelection(selected) _updateStatus.postValue(Result.Success(0)) @@ -112,17 +113,6 @@ class SharedViewModel @Inject constructor( } } - fun updateTransmitters() { - viewModelScope.launch(Dispatchers.IO) { - try { - repository.updateTransmitters() - _updateStatus.postValue(Result.Success(1)) - } catch (e: Exception) { - _updateStatus.postValue(Result.Error(e)) - } - } - } - fun calculatePasses() { _satPassList.postValue(Result.InProgress) calculationJob?.cancel() diff --git a/app/src/main/res/drawable/ic_update_trans.xml b/app/src/main/res/drawable/ic_update_trans.xml deleted file mode 100644 index 870424f0..00000000 --- a/app/src/main/res/drawable/ic_update_trans.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 8391f955..82d8b922 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -118,21 +118,10 @@ android:layout_width="0dp" android:drawableEnd="@drawable/ic_update_tle" android:text="@string/update_tle_web" - app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans" - app:layout_constraintEnd_toStartOf="@+id/guidelineRight" - app:layout_constraintStart_toStartOf="@+id/guidelineLeft" - app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle_file" /> - - + app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle_file" /> + app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle_url" /> Проверьте настройки GPS Обновить TLE из файла Обновить TLE по ссылке - Файл TLE обновлен - Обновить трансиверы - База трансиверов обновлена + Данные спутников обновлены Проверьте интернет-подключение Выход diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 26ed2427..7138aa29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,9 +30,7 @@ Check your Location settings Import TLE from file Import TLE from web - TLE was updated - Update transceivers - Transceivers DB updated + Satellite data was updated Check your internet connection GitHub Exit