mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-03 11:17:25 +00:00
Removed pass prefs dialog, strings cleanup
This commit is contained in:
1 parent
6631f1e745
commit
c6aae706f9
7 files changed
+9
-165
No files matched your search
@@ -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<EditText>(R.id.pref_et_hoursAhead)
|
||||
val etMinEl = satPassPrefView.findViewById<EditText>(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 {
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user