diff --git a/app/build.gradle b/app/build.gradle index 48c38e9d..c8de557a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ dependencies { debugImplementation "androidx.fragment:fragment-testing:1.4.1" debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1" testImplementation "junit:junit:4.13.2" - testImplementation "org.mockito:mockito-core:4.3.1" + testImplementation "org.mockito:mockito-core:4.4.0" testImplementation "org.robolectric:robolectric:4.7.3" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0" androidTestImplementation "androidx.test:core:1.4.0" @@ -86,6 +86,6 @@ dependencies { androidTestImplementation "androidx.test.ext:junit:1.1.3" androidTestImplementation "androidx.test.ext:truth:1.4.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0" - androidTestImplementation "org.mockito:mockito-android:4.3.1" + androidTestImplementation "org.mockito:mockito-android:4.4.0" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0" } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt index 3edcfb34..88c0cba0 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt @@ -121,12 +121,15 @@ class RadarFragment : Fragment(R.layout.fragment_radar) { val radarElev = getString(R.string.radar_el_value) val radarAlt = getString(R.string.radar_alt_value) val radarDist = getString(R.string.radar_dist_value) - val radarId = getString(R.string.radar_sat_id) radarAzValue.text = String.format(radarAzim, satPos.azimuth.toDegrees()) radarElValue.text = String.format(radarElev, satPos.elevation.toDegrees()) radarAltValue.text = String.format(radarAlt, satPos.altitude) radarDstValue.text = String.format(radarDist, satPos.distance) - radarSatId.text = String.format(radarId, satPass.catNum) + if (satPos.eclipsed) { + radarVisibility.text = getText(R.string.radar_eclipsed) + } else { + radarVisibility.text = getText(R.string.radar_visible) + } if (!satPass.isDeepSpace) { if (timeNow < satPass.aosTime) { val millisBeforeStart = satPass.aosTime.minus(timeNow) diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml index 21d75357..07faa1e5 100644 --- a/app/src/main/res/layout/fragment_radar.xml +++ b/app/src/main/res/layout/fragment_radar.xml @@ -201,14 +201,14 @@ android:text="@string/btn_notify" android:textColor="@color/textDisabled" app:layout_constraintBottom_toBottomOf="@+id/radar_coordinator" - app:layout_constraintEnd_toStartOf="@+id/radar_sat_id" + app:layout_constraintEnd_toStartOf="@+id/radar_visibility" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/radar_coordinator" app:layout_constraintStart_toStartOf="@+id/radar_coordinator" app:layout_constraintTop_toTopOf="@+id/radar_coordinator" /> + app:layout_constraintStart_toEndOf="@+id/radar_visibility" /> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9f09310c..49644bbd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -80,6 +80,8 @@ %.0f km Дальн. %.0f km + Видимый + В тени %s Id:%d diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee0109e9..d67f47ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,6 +81,8 @@ %.0f km Distance %.0f km + Visible + Eclipsed %s Id:%d