Various tweaks and minor refactoring, fixed issue #84

app/src/main/res/layout/fragment_map.xml

@@ -89,8 +89,8 @@
                 android:layout_marginTop="4dp"
                 android:text="@string/map_azimuth"
                 app:layout_constraintBottom_toTopOf="@+id/map_data_alt"
-                app:layout_constraintStart_toStartOf="@+id/map_data_visibility"
-                app:layout_constraintTop_toBottomOf="@+id/map_data_visibility" />
+                app:layout_constraintStart_toStartOf="@+id/map_data_period"
+                app:layout_constraintTop_toBottomOf="@+id/map_data_period" />
 
             <TextView
                 android:id="@+id/map_data_lat"
@@ -142,13 +142,13 @@
                 app:layout_constraintEnd_toEndOf="@+id/map_data_phase" />
 
             <TextView
-                android:id="@+id/map_data_visibility"
+                android:id="@+id/map_data_period"
                 style="@style/WorldMapText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="6dp"
-                android:text="@string/map_visibility"
+                android:text="@string/map_period"
                 app:layout_constraintBottom_toTopOf="@+id/map_azimuth"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -160,7 +160,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
                 android:text="@string/map_phase"
-                app:layout_constraintBaseline_toBaselineOf="@+id/map_data_visibility"
+                app:layout_constraintBaseline_toBaselineOf="@+id/map_data_period"
                 app:layout_constraintEnd_toEndOf="parent" />
 
             <TextView
@@ -214,7 +214,7 @@
         app:layout_constraintTop_toTopOf="@+id/map_coordinator" />
 
     <TextView
-        android:id="@+id/map_data_id"
+        android:id="@+id/map_data_visibility"
         style="@style/WorldMapText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -223,7 +223,7 @@
         android:ellipsize="end"
         android:gravity="center_horizontal"
         android:maxLines="1"
-        android:text="@string/map_sat_id"
+        android:text="@string/map_visible"
         app:layout_constraintBaseline_toBaselineOf="@+id/map_btn_prev"
         app:layout_constraintEnd_toStartOf="@+id/map_btn_next"
         app:layout_constraintStart_toEndOf="@+id/map_btn_prev" />

app/src/main/res/layout/fragment_passes.xml

@@ -46,6 +46,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <ProgressBar
+            android:id="@+id/passes_progress"
+            style="@style/RecyclerProgress" />
+
         <LinearLayout
             android:id="@+id/passes_empty"
             android:layout_width="match_parent"
@@ -59,10 +63,10 @@
 
             <ImageView
                 android:id="@+id/passes_empty_img"
-                android:layout_width="180dp"
-                android:layout_height="180dp"
+                android:layout_width="160dp"
+                android:layout_height="160dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="24dp"
+                android:layout_marginBottom="32dp"
                 android:contentDescription="@string/passes_error"
                 android:src="@drawable/ic_list"
                 app:tint="@color/textDisabled" />
@@ -74,7 +78,7 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
                 android:text="@string/passes_error"
-                android:textSize="@dimen/text_size_large" />
+                android:textSize="@dimen/text_size_mediumLarge" />
 
         </LinearLayout>
 

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

@@ -109,6 +109,7 @@
     <string name="map_visible">Видимый</string>
     <string name="map_eclipsed">В тени</string>
     <string name="map_visibility">Видимость: %s</string>
+    <string name="map_period">Период: %.0fмин</string>
     <string name="map_phase">Фаза: %.1f°</string>
     <string name="map_altitude">Высота: %.0fкм</string>
     <string name="map_distance">Дистанция: %.0fкм</string>

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

@@ -110,6 +110,7 @@
     <string name="map_visible">Visible</string>
     <string name="map_eclipsed">Eclipsed</string>
     <string name="map_visibility">Visibility: %s</string>
+    <string name="map_period">Period: %.0f min</string>
     <string name="map_phase">Phase: %.1f°</string>
     <string name="map_altitude">Altitude: %.0f km</string>
     <string name="map_distance">Distance: %.0f km</string>

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

@@ -102,8 +102,8 @@
     </style>
 
     <style name="RecyclerProgress">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">72dp</item>
+        <item name="android:layout_height">72dp</item>
         <item name="android:layout_gravity">center</item>
     </style>