diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt index 17ff9fa4..8dccf182 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt @@ -64,7 +64,7 @@ class MapFragment : Fragment(R.layout.fragment_map) { trackPaint = Paint().apply { strokeWidth = 2f style = Paint.Style.STROKE - color = ContextCompat.getColor(requireContext(), R.color.satTrack) + color = Color.RED strokeCap = Paint.Cap.ROUND strokeJoin = Paint.Join.ROUND isAntiAlias = true @@ -112,11 +112,9 @@ class MapFragment : Fragment(R.layout.fragment_map) { } }) viewModel.getSelectedPass().observe(viewLifecycleOwner, { satPass -> - satPass?.let { - selectedSat = satPass - setSelectedSatDetails(satPass) - scrollToSat(satPass) - } + selectedSat = satPass + setSelectedSatDetails(satPass) + scrollToSat(satPass) }) viewModel.getSatMarkers().observe(viewLifecycleOwner, { setMarkers(it) @@ -223,7 +221,7 @@ class MapFragment : Fragment(R.layout.fragment_map) { } private fun getColorFilter(): ColorMatrixColorFilter { - val targetColor = ContextCompat.getColor(requireContext(), R.color.satTrack) + val targetColor = Color.RED val newR = Color.red(targetColor) / 255f val newG = Color.green(targetColor) / 255f val newB = Color.blue(targetColor) / 255f diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt index d2ae426b..244dc528 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt @@ -9,6 +9,7 @@ import com.github.amsacode.predict4java.GroundStationPosition import com.github.amsacode.predict4java.Position import com.rtbishop.look4sat.data.SatPass import com.rtbishop.look4sat.utility.PrefsManager +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import java.util.* @@ -23,8 +24,8 @@ class MapViewModel @ViewModelInject constructor(prefsManager: PrefsManager) : Vi private val _gsp = MutableLiveData(prefsManager.getStationPosition()) fun getGSP(): LiveData = _gsp - private val _selectedPass = MutableLiveData() - fun getSelectedPass(): LiveData = _selectedPass + private val _selectedPass = MutableLiveData() + fun getSelectedPass(): LiveData = _selectedPass private val _satMarkers = MutableLiveData>() fun getSatMarkers(): LiveData> = _satMarkers @@ -36,16 +37,15 @@ class MapViewModel @ViewModelInject constructor(prefsManager: PrefsManager) : Vi } private fun calculateSatPos(passes: List) { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.Default) { while (true) { val passesMap = mutableMapOf() dateNow.time = System.currentTimeMillis() passes.forEach { val satPos = it.predictor.getSatPos(dateNow) - val osmPos = getOsmPosition(satPos.latitude, satPos.longitude, true) - passesMap[it] = osmPos + passesMap[it] = getOsmPosition(satPos.latitude, satPos.longitude, true) } - _satMarkers.value = passesMap + _satMarkers.postValue(passesMap) delay(2000) } } diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt index 53e71274..0aa05ac7 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt @@ -2,6 +2,7 @@ package com.rtbishop.look4sat.ui.views import android.content.Context import android.graphics.Canvas +import android.graphics.Color import android.graphics.Paint import android.graphics.Path import android.view.View @@ -23,7 +24,7 @@ class PolarView(context: Context) : View(context) { private val polarCenter = polarWidth / 2f private val scale = resources.displayMetrics.density private val radius = polarWidth * 0.48f - private val txtSize = scale * 16 + private val txtSize = scale * 16f private val path: Path = Path() private val piDiv2 = Math.PI / 2.0 @@ -31,7 +32,7 @@ class PolarView(context: Context) : View(context) { isAntiAlias = true color = ContextCompat.getColor(context, R.color.greyLight) style = Paint.Style.STROKE - strokeWidth = scale * 1.6f + strokeWidth = scale * 2f } private val txtPaint = Paint().apply { isAntiAlias = true @@ -40,9 +41,9 @@ class PolarView(context: Context) : View(context) { } private val trackPaint = Paint().apply { isAntiAlias = true - color = ContextCompat.getColor(context, R.color.satTrack) + color = Color.RED style = Paint.Style.STROKE - strokeWidth = scale * 1.6f + strokeWidth = scale * 2f } private val satPaint = Paint().apply { isAntiAlias = true @@ -96,7 +97,7 @@ class PolarView(context: Context) : View(context) { if (satPos.elevation > 0) { val x = sph2CartX(satPos.azimuth, satPos.elevation, radius.toDouble()) val y = sph2CartY(satPos.azimuth, satPos.elevation, radius.toDouble()) - cvs.drawCircle(x, -y, txtSize / 2.6f, satPaint) + cvs.drawCircle(x, -y, txtSize / 2.4f, satPaint) } } diff --git a/app/src/main/res/drawable-nodpi/splash_front.webp b/app/src/main/res/drawable-nodpi/splash_front.webp deleted file mode 100644 index c694aa09..00000000 Binary files a/app/src/main/res/drawable-nodpi/splash_front.webp and /dev/null differ diff --git a/app/src/main/res/drawable/ic_bmc.xml b/app/src/main/res/drawable/ic_bmc.xml index cce090aa..f4988fe2 100644 --- a/app/src/main/res/drawable/ic_bmc.xml +++ b/app/src/main/res/drawable/ic_bmc.xml @@ -2,13 +2,10 @@ xmlns:tools="http://schemas.android.com/tools" android:width="16dp" android:height="24dp" - android:viewportWidth="884" - android:viewportHeight="1279"> - - + android:viewportWidth="233.76132" + android:viewportHeight="338.40268"> + diff --git a/app/src/main/res/drawable/splash_drawable.xml b/app/src/main/res/drawable/splash_drawable.xml index 34e5c42b..5b43825d 100644 --- a/app/src/main/res/drawable/splash_drawable.xml +++ b/app/src/main/res/drawable/splash_drawable.xml @@ -20,9 +20,7 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/splash_foreground.xml b/app/src/main/res/drawable/splash_foreground.xml new file mode 100644 index 00000000..b32aa96b --- /dev/null +++ b/app/src/main/res/drawable/splash_foreground.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 55dc33fd..add7dd6d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -38,7 +38,7 @@ Пожалуйста, обновите спутники Ошибка обновления спутников - Нет выбранных спутников + Нет предстоящих пролётов НПС - %2d° МаксЭлев: %.1f° diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ce357a1f..6a90ba89 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -26,7 +26,6 @@ #808080 #1e1e1e - #D50000 #26FFE082 #66000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 714c36a3..938a127f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ 00:00:00 - - No satellites were selected + No upcoming passes %s Id:%d