mirror of
https://github.com/rt-bishop/Look4Sat.git
synced 2026-10-02 19:17:22 +00:00
Removed unnecessary preferences and keys
This commit is contained in:
1 parent
3cd8516d88
commit
f943268035
7 files changed
+25
-79
No files matched your search
@@ -55,7 +55,6 @@ class SharedViewModel @Inject constructor(
|
||||
fun getGSP(): LiveData<Result<GroundStationPosition>> = _gsp
|
||||
|
||||
fun getCompass() = prefsManager.getCompass()
|
||||
fun getRefreshRate() = prefsManager.getRefreshRate()
|
||||
fun getHoursAhead() = prefsManager.getHoursAhead()
|
||||
fun getMinElevation() = prefsManager.getMinElevation()
|
||||
suspend fun getAllEntries() = repository.getAllEntries()
|
||||
|
||||
@@ -108,12 +108,11 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {
|
||||
private fun observePasses() {
|
||||
viewModel.getPassList().observe(viewLifecycleOwner, { result ->
|
||||
if (result is Result.Success) {
|
||||
val refreshRate = viewModel.getRefreshRate()
|
||||
satPass = result.data[args.satPassIndex]
|
||||
polarView = PolarView(mainActivity, satPass)
|
||||
binding.frame.addView(polarView)
|
||||
observeTransmitters()
|
||||
refreshText(refreshRate)
|
||||
refreshText()
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -147,13 +146,13 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {
|
||||
})
|
||||
}
|
||||
|
||||
private fun refreshText(rate: Long) {
|
||||
private fun refreshText() {
|
||||
lifecycleScope.launch {
|
||||
while (true) {
|
||||
setPassText()
|
||||
polarView?.invalidate()
|
||||
transmitterAdapter.notifyDataSetChanged()
|
||||
delay(rate)
|
||||
delay(3000)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,24 +26,16 @@ import androidx.preference.EditTextPreference
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import com.rtbishop.look4sat.R
|
||||
import com.rtbishop.look4sat.utility.Extensions.snack
|
||||
import com.rtbishop.look4sat.utility.PrefsManager
|
||||
|
||||
class PrefsFragment : PreferenceFragmentCompat(),
|
||||
SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
private lateinit var keyLat: String
|
||||
private lateinit var keyLon: String
|
||||
private lateinit var keyAlt: String
|
||||
private lateinit var keyDelay: String
|
||||
|
||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||
setPreferencesFromResource(R.xml.preference, rootKey)
|
||||
val provider = EditTextPreference.SimpleSummaryProvider.getInstance()
|
||||
keyLat = preferenceManager.context.getString(R.string.pref_lat_key)
|
||||
keyLon = preferenceManager.context.getString(R.string.pref_lon_key)
|
||||
keyAlt = preferenceManager.context.getString(R.string.pref_alt_key)
|
||||
keyDelay = preferenceManager.context.getString(R.string.pref_refresh_rate_key)
|
||||
|
||||
findPreference<EditTextPreference>(keyLat)?.apply {
|
||||
findPreference<EditTextPreference>(PrefsManager.keyLatitude)?.apply {
|
||||
summaryProvider = provider
|
||||
setOnBindEditTextListener {
|
||||
it.inputType = InputType.TYPE_CLASS_NUMBER or
|
||||
@@ -60,7 +52,7 @@ class PrefsFragment : PreferenceFragmentCompat(),
|
||||
}
|
||||
}
|
||||
|
||||
findPreference<EditTextPreference>(keyLon)?.apply {
|
||||
findPreference<EditTextPreference>(PrefsManager.keyLongitude)?.apply {
|
||||
summaryProvider = provider
|
||||
setOnBindEditTextListener {
|
||||
it.inputType = InputType.TYPE_CLASS_NUMBER or
|
||||
@@ -77,7 +69,7 @@ class PrefsFragment : PreferenceFragmentCompat(),
|
||||
}
|
||||
}
|
||||
|
||||
findPreference<EditTextPreference>(keyAlt)?.apply {
|
||||
findPreference<EditTextPreference>(PrefsManager.keyAltitude)?.apply {
|
||||
summaryProvider = provider
|
||||
setOnBindEditTextListener {
|
||||
it.inputType = InputType.TYPE_CLASS_NUMBER or
|
||||
@@ -93,19 +85,6 @@ class PrefsFragment : PreferenceFragmentCompat(),
|
||||
return@setOnPreferenceChangeListener true
|
||||
}
|
||||
}
|
||||
|
||||
findPreference<EditTextPreference>(keyDelay)?.apply {
|
||||
summaryProvider = provider
|
||||
setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER }
|
||||
setOnPreferenceChangeListener { _, newValue ->
|
||||
val valueStr = newValue.toString()
|
||||
if (valueStr.isEmpty() || valueStr.toLong() < 250 || valueStr.toLong() > 10000) {
|
||||
getString(R.string.pref_refresh_rate_input_error).snack(requireView())
|
||||
return@setOnPreferenceChangeListener false
|
||||
}
|
||||
return@setOnPreferenceChangeListener true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {}
|
||||
|
||||
@@ -30,21 +30,21 @@ class PrefsManager @Inject constructor(
|
||||
private val preferences: SharedPreferences,
|
||||
private val locationManager: LocationManager
|
||||
) {
|
||||
private val keyHoursAhead = "hoursAhead"
|
||||
private val keyMinElevation = "minEl"
|
||||
private val keyLatitude = "latitude"
|
||||
private val keyLongitude = "longitude"
|
||||
private val keyAltitude = "altitude"
|
||||
private val keyRefreshRate = "rate"
|
||||
private val keyCompass = "compass"
|
||||
private val keyTimeUtc = "timeUTC"
|
||||
private val defaultHoursAhead = 8
|
||||
private val defaultMinEl = 16.0
|
||||
private val defaultRefreshRate = "3000"
|
||||
private val defaultGSP = "0.0"
|
||||
companion object {
|
||||
const val keyHoursAhead = "hoursAhead"
|
||||
const val keyMinElevation = "minEl"
|
||||
const val keyLatitude = "latitude"
|
||||
const val keyLongitude = "longitude"
|
||||
const val keyAltitude = "altitude"
|
||||
const val keyCompass = "compass"
|
||||
const val keyTimeUtc = "timeUTC"
|
||||
const val defaultHoursAhead = 8
|
||||
const val defaultMinEl = 16.0
|
||||
const val defaultGSP = "0.0"
|
||||
const val keyIsFirstLaunch = "keyIsFirstLaunch"
|
||||
}
|
||||
|
||||
fun isFirstLaunch(): Boolean {
|
||||
val keyIsFirstLaunch = "keyIsFirstLaunch"
|
||||
val isFirstLaunch = preferences.getBoolean(keyIsFirstLaunch, true)
|
||||
return if (isFirstLaunch) {
|
||||
preferences.edit {
|
||||
@@ -67,10 +67,6 @@ class PrefsManager @Inject constructor(
|
||||
return preferences.getDouble(keyMinElevation, defaultMinEl)
|
||||
}
|
||||
|
||||
fun getRefreshRate(): Long {
|
||||
return preferences.getString(keyRefreshRate, defaultRefreshRate)!!.toLong()
|
||||
}
|
||||
|
||||
fun getCompass(): Boolean {
|
||||
return preferences.getBoolean(keyCompass, true)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user