Added satellite visibility parameter to RadarFragment.kt #62

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"
 }

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)

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" />
 
     <TextView
-        android:id="@+id/radar_sat_id"
+        android:id="@+id/radar_visibility"
         style="@style/WorldMapText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -217,7 +217,7 @@
         android:ellipsize="end"
         android:gravity="center_horizontal"
         android:maxLines="1"
-        android:text="@string/radar_sat_id"
+        android:text="@string/radar_visible"
         app:layout_constraintBaseline_toBaselineOf="@+id/radar_btn_notify"
         app:layout_constraintEnd_toStartOf="@+id/radar_btn_settings"
         app:layout_constraintHorizontal_bias="0.5"
@@ -231,6 +231,6 @@
         android:text="@string/btn_settings"
         app:layout_constraintBaseline_toBaselineOf="@+id/radar_btn_notify"
         app:layout_constraintEnd_toEndOf="@+id/radar_coordinator"
-        app:layout_constraintStart_toEndOf="@+id/radar_sat_id" />
+        app:layout_constraintStart_toEndOf="@+id/radar_visibility" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-ru/strings.xml

@@ -80,6 +80,8 @@
     <string name="radar_alt_value">%.0f km</string>
     <string name="radar_dist_text">Дальн.</string>
     <string name="radar_dist_value">%.0f km</string>
+    <string name="radar_visible">Видимый</string>
+    <string name="radar_eclipsed">В тени</string>
     <string name="radar_sat_name">%s</string>
     <string name="radar_sat_id">Id:%d</string>
 

app/src/main/res/values/strings.xml

@@ -81,6 +81,8 @@
     <string name="radar_alt_value">%.0f km</string>
     <string name="radar_dist_text">Distance</string>
     <string name="radar_dist_value">%.0f km</string>
+    <string name="radar_visible">Visible</string>
+    <string name="radar_eclipsed">Eclipsed</string>
     <string name="radar_sat_name">%s</string>
     <string name="radar_sat_id">Id:%d</string>