diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt index a1bb95f3..62ad7993 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt @@ -22,8 +22,6 @@ package com.rtbishop.look4sat.ui.fragments import android.animation.ObjectAnimator import android.os.Bundle import android.view.View -import android.widget.EditText -import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager @@ -37,7 +35,6 @@ import com.rtbishop.look4sat.ui.adapters.PassesAdapter import com.rtbishop.look4sat.utility.PrefsManager import com.rtbishop.look4sat.utility.Utilities import com.rtbishop.look4sat.utility.Utilities.getRotationAnimator -import com.rtbishop.look4sat.utility.Utilities.snack import dagger.hilt.android.AndroidEntryPoint import java.util.* import javax.inject.Inject @@ -88,10 +85,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes) { (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false setHasFixedSize(true) } - passesFilter.setOnClickListener { - val passPrefs = prefsManager.getPassPrefs() - showSatPassPrefsDialog(passPrefs.hoursAhead, passPrefs.minEl) - } animator = passesFab.getRotationAnimator() passesFab.setOnClickListener { if (animator.isRunning) { @@ -104,44 +97,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes) { viewModel.triggerCalculation() } - private fun showSatPassPrefsDialog(hoursAhead: Int, minEl: Double) { - val satPassPrefView = View.inflate(requireContext(), R.layout.dialog_passes, null) - val etHoursAhead = satPassPrefView.findViewById(R.id.pref_et_hoursAhead) - val etMinEl = satPassPrefView.findViewById(R.id.pref_et_minEl) - etHoursAhead.setText(hoursAhead.toString()) - etMinEl.setText(minEl.toString()) - - AlertDialog.Builder(requireContext()).apply { - setPositiveButton(getString(android.R.string.ok)) { _, _ -> - val hoursString = etHoursAhead.text.toString() - val minElString = etMinEl.text.toString() - if (hoursString.isNotEmpty() && minElString.isNotEmpty()) { - val hours = hoursString.toInt() - val elevation = minElString.toDouble() - when { - hours < 1 || hours > 168 -> { - getString(R.string.pref_hours_ahead_input_error).snack(requireView()) - } - elevation < 0 || elevation > 90 -> { - getString(R.string.pref_min_el_input_error).snack(requireView()) - } - else -> { - prefsManager.setPassPrefs(hours, elevation) - viewModel.calculatePasses() - } - } - } else getString(R.string.err_enter_value).snack(requireView()) - - } - setNegativeButton(getString(android.R.string.cancel)) { dialog, _ -> - dialog.cancel() - } - setView(satPassPrefView) - create() - show() - } - } - private fun tickMainTimer(timeNow: Long) { if (passes.isNotEmpty()) { try { diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt index dc37180e..a5fc2280 100644 --- a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt +++ b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt @@ -24,7 +24,6 @@ import android.location.LocationManager import androidx.core.content.edit import com.github.amsacode.predict4java.GroundStationPosition import com.rtbishop.look4sat.data.PassPrefs -import com.rtbishop.look4sat.utility.Utilities.putDouble import com.rtbishop.look4sat.utility.Utilities.round import javax.inject.Inject @@ -35,8 +34,6 @@ class PrefsManager @Inject constructor( companion object { const val hoursAhead = "hoursAhead" const val minimalElevation = "minimalElevation" - const val keyHoursAhead = "hoursAhead" - const val keyMinElevation = "minEl" const val keyLatitude = "latitude" const val keyLongitude = "longitude" const val keyAltitude = "altitude" @@ -52,14 +49,6 @@ class PrefsManager @Inject constructor( return PassPrefs(hoursAhead, minEl) } - fun setPassPrefs(hoursAhead: Int, minEl: Double) { - preferences.edit { - putInt(keyHoursAhead, hoursAhead) - putDouble(keyMinElevation, minEl) - apply() - } - } - fun getStationPosition(): GroundStationPosition { val lat = preferences.getString(keyLatitude, defaultGSP)!!.toDouble() val lon = preferences.getString(keyLongitude, defaultGSP)!!.toDouble() diff --git a/app/src/main/res/layout/dialog_passes.xml b/app/src/main/res/layout/dialog_passes.xml deleted file mode 100644 index 0b82109a..00000000 --- a/app/src/main/res/layout/dialog_passes.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml index fb011d87..6567341b 100644 --- a/app/src/main/res/layout/fragment_passes.xml +++ b/app/src/main/res/layout/fragment_passes.xml @@ -49,17 +49,6 @@ app:layout_constraintStart_toStartOf="@id/passes_bar" app:layout_constraintTop_toTopOf="parent" /> - - Настройки Инфо - Фильтровать пролеты Управление источниками TLE ID / Имя - Настройки пролетов - Количество часов - Показать пролеты за след. Х часов - Введите значение между 1ч и 168ч - Минимальная элевация - Показать пролеты с элевацией более - Введите значение между 0° и 90° + Настройки пролетов спутников + Количество часов + Минимальная элевация Местоположение наземной станции Широта, град diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 77a3af91..b61e39d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,17 +27,12 @@ Settings Info - Filter passes Manage TLE sources ID / Name - Passes preferences - Hours ahead - Show passes that occur within X hours - Set the value between 1h and 168h - Minimal elevation - Show passes with max elevation above - Set the value between 0° and 90° + Satellite pass preferences + Hours ahead + Minimal elevation Ground station position Latitude, deg diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index a2197337..aa5ceba1 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -42,12 +42,12 @@ app:useSimpleSummaryProvider="true" />