mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Minor fixes to resources and UI
This commit is contained in:
Arty Bishop committed
1 parent
e9eba47429
commit
62f8a4a534
10 files changed
+40
-36
No files matched your search
@@ -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
|
||||
|
||||
@@ -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<GroundStationPosition> = _gsp
|
||||
|
||||
private val _selectedPass = MutableLiveData<SatPass?>()
|
||||
fun getSelectedPass(): LiveData<SatPass?> = _selectedPass
|
||||
private val _selectedPass = MutableLiveData<SatPass>()
|
||||
fun getSelectedPass(): LiveData<SatPass> = _selectedPass
|
||||
|
||||
private val _satMarkers = MutableLiveData<Map<SatPass, Position>>()
|
||||
fun getSatMarkers(): LiveData<Map<SatPass, Position>> = _satMarkers
|
||||
@@ -36,16 +37,15 @@ class MapViewModel @ViewModelInject constructor(prefsManager: PrefsManager) : Vi
|
||||
}
|
||||
|
||||
private fun calculateSatPos(passes: List<SatPass>) {
|
||||
viewModelScope.launch {
|
||||
viewModelScope.launch(Dispatchers.Default) {
|
||||
while (true) {
|
||||
val passesMap = mutableMapOf<SatPass, Position>()
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
@@ -2,13 +2,10 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:width="16dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="884"
|
||||
android:viewportHeight="1279">
|
||||
<path
|
||||
android:fillColor="@color/themeLight"
|
||||
android:pathData="M472.62,590.84C426.68,610.5 374.55,632.8 306.98,632.8C278.71,632.75 250.58,628.87 223.35,621.27L270.09,1101.08C271.74,1121.13 280.88,1139.83 295.68,1153.46C310.48,1167.09 329.87,1174.65 349.99,1174.65C349.99,1174.65 416.25,1178.09 438.36,1178.09C462.16,1178.09 533.52,1174.65 533.52,1174.65C553.64,1174.65 573.02,1167.08 587.82,1153.45C602.62,1139.82 611.75,1121.13 613.41,1101.08L663.46,570.88C641.09,563.24 618.52,558.16 593.07,558.16C549.05,558.14 513.59,573.3 472.62,590.84Z" />
|
||||
<path
|
||||
android:fillColor="@color/themeLight"
|
||||
android:pathData="M879.57,341.85L872.53,306.35C866.22,274.5 851.88,244.41 819.19,232.9C808.71,229.21 796.82,227.63 788.79,220.01C780.75,212.39 778.38,200.55 776.52,189.57C773.08,169.42 769.84,149.26 766.31,129.14C763.27,111.85 760.86,92.42 752.93,76.56C742.6,55.26 721.18,42.8 699.88,34.56C688.97,30.48 677.83,27.04 666.52,24.24C613.3,10.19 557.34,5.03 502.59,2.09C436.88,-1.54 370.98,-0.44 305.42,5.36C256.63,9.8 205.23,15.17 158.86,32.05C141.91,38.22 124.44,45.64 111.56,58.73C95.74,74.82 90.58,99.7 102.13,119.76C110.34,134.01 124.24,144.08 138.99,150.74C158.19,159.32 178.25,165.85 198.83,170.21C256.13,182.88 315.47,187.85 374.01,189.97C438.89,192.59 503.87,190.46 568.44,183.62C584.41,181.86 600.35,179.76 616.26,177.3C634.99,174.43 647.02,149.93 641.5,132.86C634.89,112.45 617.13,104.54 597.05,107.62C594.09,108.08 591.15,108.51 588.19,108.94L586.06,109.25C579.26,110.11 572.46,110.92 565.65,111.66C551.6,113.18 537.52,114.41 523.39,115.38C491.77,117.58 460.06,118.6 428.36,118.65C397.22,118.65 366.06,117.77 334.98,115.72C320.8,114.79 306.66,113.61 292.55,112.18C286.13,111.51 279.73,110.8 273.33,110.01L267.24,109.24L265.92,109.05L259.6,108.13C246.7,106.19 233.79,103.95 221.02,101.25C219.74,100.96 218.58,100.25 217.76,99.22C216.93,98.19 216.48,96.91 216.48,95.59C216.48,94.27 216.93,92.99 217.76,91.96C218.58,90.93 219.74,90.22 221.02,89.93H221.27C232.33,87.57 243.48,85.56 254.66,83.8C258.39,83.22 262.13,82.65 265.88,82.08H265.98C272.99,81.62 280.03,80.36 286.99,79.54C347.62,73.23 408.61,71.08 469.54,73.1C499.11,73.96 528.68,75.7 558.12,78.69C564.45,79.35 570.75,80.04 577.04,80.81C579.45,81.1 581.88,81.45 584.3,81.74L589.19,82.44C603.44,84.57 617.61,87.14 631.71,90.17C652.6,94.71 679.42,96.19 688.71,119.08C691.67,126.34 693.02,134.41 694.65,142.03L696.73,151.75C696.79,151.93 696.83,152.1 696.85,152.29C701.77,175.23 706.7,198.17 711.63,221.11C711.99,222.81 712,224.56 711.66,226.26C711.31,227.95 710.62,229.56 709.63,230.98C708.63,232.4 707.35,233.6 705.88,234.5C704.4,235.41 702.75,236 701.03,236.24H700.9L697.88,236.65L694.91,237.04C685.48,238.27 676.04,239.42 666.59,240.49C647.97,242.61 629.32,244.44 610.65,245.99C573.54,249.08 536.36,251.1 499.1,252.07C480.11,252.57 461.14,252.81 442.16,252.77C366.64,252.71 291.19,248.32 216.17,239.63C208.05,238.66 199.93,237.63 191.81,236.58C198.11,237.39 187.23,235.96 185.03,235.65C179.87,234.93 174.71,234.18 169.54,233.4C152.22,230.8 134.99,227.6 117.7,224.79C96.79,221.35 76.8,223.07 57.89,233.4C42.37,241.89 29.81,254.92 21.88,270.73C13.72,287.6 11.3,305.96 7.65,324.08C4,342.19 -1.68,361.69 0.47,380.29C5.1,420.43 33.17,453.05 73.53,460.35C111.51,467.23 149.69,472.81 187.97,477.56C338.36,495.98 490.29,498.18 641.16,484.13C653.44,482.98 665.71,481.73 677.96,480.38C681.79,479.96 685.66,480.4 689.29,481.67C692.93,482.94 696.23,485.01 698.96,487.72C701.69,490.43 703.78,493.72 705.08,497.34C706.38,500.97 706.85,504.84 706.45,508.67L702.63,545.8C694.94,620.83 687.24,695.85 679.54,770.87C671.51,849.66 663.43,928.43 655.3,1007.2C653,1029.39 650.71,1051.57 648.42,1073.74C646.21,1095.58 645.9,1118.1 641.76,1139.68C635.22,1173.61 612.25,1194.45 578.73,1202.07C548.02,1209.06 516.65,1212.73 485.16,1213.01C450.25,1213.2 415.36,1211.65 380.44,1211.84C343.17,1212.05 297.52,1208.61 268.76,1180.87C243.48,1156.51 239.99,1118.36 236.54,1085.37C231.96,1041.7 227.41,998.04 222.9,954.38L197.61,711.61L181.24,554.54C180.97,551.94 180.69,549.38 180.43,546.76C178.47,528.02 165.21,509.68 144.3,510.63C126.41,511.42 106.07,526.63 108.17,546.76L120.3,663.21L145.38,904.1C152.53,972.53 159.66,1040.96 166.77,1109.41C168.15,1122.52 169.44,1135.67 170.88,1148.78C178.75,1220.43 233.46,1259.04 301.22,1269.91C340.8,1276.28 381.34,1277.59 421.5,1278.24C472.98,1279.07 524.98,1281.05 575.61,1271.72C650.65,1257.95 706.95,1207.85 714.99,1130.13C717.28,1107.69 719.58,1085.25 721.87,1062.8C729.5,988.56 737.11,914.31 744.72,840.06L769.6,597.45L781.01,486.26C781.58,480.75 783.91,475.57 787.65,471.48C791.39,467.39 796.35,464.62 801.79,463.57C823.25,459.39 843.76,452.24 859.02,435.92C883.32,409.92 888.15,376.02 879.57,341.85ZM72.43,365.83C72.76,365.68 72.15,368.48 71.9,369.79C71.85,367.81 71.95,366.06 72.43,365.83ZM74.51,381.94C74.68,381.82 75.2,382.51 75.73,383.33C74.93,382.58 74.41,382.01 74.49,381.94H74.51ZM76.56,384.64C77.3,385.9 77.7,386.69 76.56,384.64V384.64ZM80.67,387.98H80.78C80.78,388.1 80.96,388.22 81.03,388.34C80.92,388.21 80.79,388.09 80.65,387.98H80.67ZM800.8,382.99C793.09,390.32 781.47,393.73 770,395.43C641.29,414.53 510.71,424.2 380.6,419.93C287.48,416.75 195.34,406.41 103.14,393.38C94.11,392.11 84.32,390.46 78.11,383.8C66.41,371.24 72.15,345.94 75.2,330.77C77.99,316.86 83.32,298.33 99.86,296.36C125.67,293.33 155.64,304.22 181.18,308.09C211.92,312.78 242.77,316.54 273.74,319.36C405.92,331.4 540.33,329.53 671.92,311.91C695.91,308.69 719.8,304.94 743.62,300.67C764.84,296.87 788.36,289.73 801.17,311.7C809.97,326.67 811.14,346.7 809.78,363.61C809.36,370.98 806.14,377.92 800.78,382.99H800.8Z"
|
||||
tools:ignore="VectorPath" />
|
||||
android:viewportWidth="233.76132"
|
||||
android:viewportHeight="338.40268">
|
||||
<path
|
||||
android:pathData="m113.404,0c-10.877,-0.015 -21.753,0.458 -32.594,1.417 -12.911,1.175 -26.51,2.595 -38.779,7.061 -4.484,1.634 -9.105,3.597 -12.514,7.061 -4.184,4.257 -5.55,10.84 -2.495,16.148 2.172,3.77 5.85,6.432 9.752,8.194 5.082,2.27 10.389,3.998 15.834,5.154 15.16,3.351 30.861,4.666 46.349,5.227 17.166,0.693 34.36,0.131 51.444,-1.68 4.225,-0.464 8.442,-1.021 12.651,-1.671 4.958,-0.76 8.14,-7.243 6.679,-11.759 -1.748,-5.399 -6.446,-7.493 -11.759,-6.678 -0.783,0.123 -1.561,0.236 -2.345,0.35l-0.564,0.082c-1.8,0.228 -3.6,0.44 -5.4,0.638 -3.718,0.401 -7.445,0.728 -11.181,0.983 -8.368,0.583 -16.758,0.851 -25.144,0.865 -8.24,0 -16.485,-0.232 -24.707,-0.774 -3.751,-0.246 -7.493,-0.559 -11.226,-0.938 -1.698,-0.178 -3.392,-0.364 -5.085,-0.574l-1.612,-0.205 -0.35,-0.05 -1.671,-0.241c-3.414,-0.515 -6.829,-1.106 -10.207,-1.821 -0.341,-0.076 -0.646,-0.266 -0.865,-0.538 -0.219,-0.272 -0.337,-0.611 -0.337,-0.96 0,-0.349 0.119,-0.688 0.337,-0.96 0.219,-0.272 0.524,-0.462 0.865,-0.537l0.064,0c2.927,-0.624 5.877,-1.156 8.836,-1.621 0.987,-0.155 1.976,-0.307 2.968,-0.455l0.027,0c1.853,-0.123 3.715,-0.455 5.559,-0.674 16.042,-1.669 32.178,-2.238 48.298,-1.703 7.826,0.228 15.647,0.687 23.436,1.479 1.675,0.173 3.342,0.355 5.008,0.56 0.637,0.077 1.279,0.169 1.921,0.246l1.293,0.187c3.77,0.561 7.519,1.243 11.249,2.044 5.527,1.202 12.625,1.594 15.083,7.649 0.783,1.921 1.138,4.056 1.57,6.072l0.551,2.572c0.015,0.046 0.025,0.093 0.032,0.141 1.302,6.07 2.605,12.14 3.91,18.21 0.096,0.448 0.098,0.912 0.007,1.361 -0.091,0.45 -0.274,0.875 -0.537,1.251 -0.263,0.375 -0.601,0.693 -0.992,0.932 -0.391,0.239 -0.827,0.395 -1.282,0.458l-0.037,0l-0.797,0.109 -0.787,0.105c-2.495,0.325 -4.993,0.628 -7.494,0.911 -4.926,0.561 -9.86,1.047 -14.801,1.457 -9.818,0.816 -19.656,1.352 -29.514,1.607 -5.023,0.133 -10.044,0.196 -15.064,0.187 -19.981,-0.016 -39.945,-1.177 -59.793,-3.478 -2.149,-0.255 -4.298,-0.528 -6.447,-0.806 1.666,0.214 -1.211,-0.164 -1.793,-0.246 -1.366,-0.191 -2.732,-0.39 -4.098,-0.596 -4.584,-0.688 -9.142,-1.534 -13.717,-2.276 -5.531,-0.91 -10.821,-0.455 -15.824,2.276 -4.107,2.247 -7.431,5.694 -9.529,9.879 -2.158,4.461 -2.799,9.319 -3.765,14.113 -0.965,4.794 -2.468,9.952 -1.899,14.873 1.225,10.621 8.65,19.252 19.33,21.183 10.047,1.821 20.149,3.296 30.279,4.553 39.791,4.873 79.99,5.456 119.905,1.739 3.25,-0.303 6.496,-0.634 9.738,-0.992 1.013,-0.111 2.037,0.005 2.998,0.341 0.962,0.336 1.836,0.883 2.558,1.6 0.723,0.718 1.276,1.588 1.619,2.547 0.343,0.959 0.467,1.983 0.363,2.996l-1.011,9.824c-2.037,19.852 -4.073,39.703 -6.11,59.552 -2.124,20.845 -4.263,41.687 -6.415,62.527 -0.607,5.871 -1.214,11.74 -1.821,17.606 -0.583,5.778 -0.665,11.737 -1.762,17.446 -1.73,8.977 -7.807,14.491 -16.675,16.508 -8.125,1.849 -16.425,2.82 -24.757,2.894 -9.237,0.05 -18.469,-0.36 -27.706,-0.31 -9.861,0.056 -21.939,-0.854 -29.551,-8.194 -6.688,-6.445 -7.612,-16.539 -8.522,-25.268 -1.214,-11.554 -2.417,-23.107 -3.61,-34.658L52.284,188.281 47.954,146.722c-0.073,-0.687 -0.146,-1.366 -0.214,-2.058 -0.519,-4.957 -4.029,-9.81 -9.561,-9.56 -4.734,0.209 -10.116,4.234 -9.56,9.56l3.209,30.812 6.638,63.735c1.891,18.104 3.777,36.21 5.659,54.321 0.364,3.469 0.705,6.948 1.088,10.416 2.081,18.957 16.558,29.173 34.486,32.049 10.471,1.685 21.196,2.032 31.822,2.204 13.621,0.22 27.379,0.744 40.777,-1.725 19.854,-3.643 34.749,-16.899 36.875,-37.462 0.607,-5.937 1.214,-11.875 1.821,-17.814 2.018,-19.643 4.034,-39.288 6.046,-58.933l6.583,-64.19 3.018,-29.418c0.15,-1.459 0.766,-2.831 1.756,-3.912 0.99,-1.081 2.303,-1.816 3.742,-2.093 5.677,-1.106 11.104,-2.995 15.142,-7.316 6.428,-6.879 7.707,-15.847 5.435,-24.888l-1.862,-9.392C229.186,72.629 225.394,64.666 216.744,61.621 213.971,60.646 210.825,60.228 208.699,58.211c-2.126,-2.017 -2.754,-5.149 -3.246,-8.053 -0.911,-5.331 -1.766,-10.667 -2.7,-15.989 -0.806,-4.575 -1.443,-9.715 -3.542,-13.912 -2.732,-5.636 -8.4,-8.932 -14.036,-11.113 -2.888,-1.078 -5.835,-1.99 -8.827,-2.731 -14.081,-3.715 -28.886,-5.081 -43.373,-5.86 -6.52,-0.36 -13.047,-0.544 -19.573,-0.552zM29.029,78.272c6.185,0.029 12.996,2.347 18.907,3.243 8.134,1.241 16.298,2.235 24.492,2.982 34.973,3.187 70.533,2.691 105.351,-1.971 6.346,-0.853 12.67,-1.844 18.97,-2.973 5.613,-1.006 11.837,-2.895 15.229,2.918 2.326,3.961 2.635,9.26 2.276,13.735 -0.111,1.95 -0.963,3.783 -2.381,5.126l0.004,0c-2.039,1.939 -5.112,2.841 -8.149,3.292 -34.053,5.053 -68.602,7.612 -103.028,6.483 -24.638,-0.842 -49.017,-3.578 -73.409,-7.024 -2.39,-0.337 -4.981,-0.774 -6.624,-2.536C17.57,98.223 19.091,91.531 19.896,87.515 20.634,83.837 22.046,78.934 26.421,78.411c0.854,-0.1 1.725,-0.143 2.608,-0.138zM19.164,96.794c-0.127,0.059 -0.155,0.523 -0.141,1.047 0.068,-0.346 0.228,-1.088 0.141,-1.047zM19.736,101.053c0.059,0.016 0.179,0.18 0.302,0.371 -0.214,-0.201 -0.351,-0.351 -0.328,-0.369l0.005,0c0.006,-0.004 0.013,-0.004 0.021,-0.002zM21.34,102.652l0.005,0 0.027,0c0,0.032 0.05,0.064 0.068,0.096 -0.03,-0.035 -0.064,-0.068 -0.1,-0.096zM156.916,147.68c-11.645,-0.005 -21.028,4.006 -31.868,8.645 -12.155,5.204 -25.9Line truncated
|
||||
android:fillColor="@color/themeLight"
|
||||
tools:ignore="VectorPath" />
|
||||
</vector>
|
||||
@@ -20,9 +20,7 @@
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:opacity="opaque">
|
||||
<item android:drawable="@drawable/ic_launcher_background" />
|
||||
<item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/splash_front" />
|
||||
</item>
|
||||
</layer-list>
|
||||
<item
|
||||
android:drawable="@drawable/splash_foreground"
|
||||
android:gravity="center" />
|
||||
</layer-list>
|
||||
@@ -0,0 +1,11 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:width="192dp"
|
||||
android:height="200dp"
|
||||
android:viewportWidth="105.83323"
|
||||
android:viewportHeight="114.01299">
|
||||
<path
|
||||
android:fillColor="@color/themeLight"
|
||||
android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755 0.8Line truncated
|
||||
tools:ignore="VectorPath" />
|
||||
</vector>
|
||||
@@ -38,7 +38,7 @@
|
||||
<string name="entries_no_data">Пожалуйста, обновите спутники</string>
|
||||
<string name="entries_update_error">Ошибка обновления спутников</string>
|
||||
|
||||
<string name="passes_error">Нет выбранных спутников</string>
|
||||
<string name="passes_error">Нет предстоящих пролётов</string>
|
||||
|
||||
<string name="pass_aosAz">НПС - %2d°</string>
|
||||
<string name="pass_maxEl">МаксЭлев: %.1f°</string>
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
<color name="greyDivider">#808080</color>
|
||||
<color name="greySurface">#1e1e1e</color>
|
||||
<!-- map colors -->
|
||||
<color name="satTrack">#D50000</color>
|
||||
<color name="satFootprint">#26FFE082</color>
|
||||
<color name="mapInfoLayout">#66000000</color>
|
||||
</resources>
|
||||
@@ -44,7 +44,7 @@
|
||||
<string name="timer_zero" translatable="false">00:00:00</string>
|
||||
<string name="timer_placeholder" translatable="false">-</string>
|
||||
|
||||
<string name="passes_error">No satellites were selected</string>
|
||||
<string name="passes_error">No upcoming passes</string>
|
||||
|
||||
<string name="pass_satName" translatable="false">%s</string>
|
||||
<string name="pass_satId" translatable="false">Id:%d</string>
|
||||
|
||||
Reference in new issue
Block a user