From 62f8a4a5345017a0ceacb4cb61df47864a8e0bb6 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Fri, 27 Nov 2020 23:07:24 +0000 Subject: [PATCH] Minor fixes to resources and UI --- .../look4sat/ui/mainScreen/MapFragment.kt | 12 +++++------- .../look4sat/ui/mainScreen/MapViewModel.kt | 12 ++++++------ .../com/rtbishop/look4sat/ui/views/PolarView.kt | 11 ++++++----- .../main/res/drawable-nodpi/splash_front.webp | Bin 16966 -> 0 bytes app/src/main/res/drawable/ic_bmc.xml | 15 ++++++--------- app/src/main/res/drawable/splash_drawable.xml | 10 ++++------ app/src/main/res/drawable/splash_foreground.xml | 11 +++++++++++ app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values/colors.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 10 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/splash_front.webp create mode 100644 app/src/main/res/drawable/splash_foreground.xml 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 c694aa09a4414699817f4c8e27ac8f4592d75a90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16966 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 - - + 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