v1.4.4 - Added custom TLE file import from file/url and PolarView rotation using sensors data

app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt

@@ -40,7 +40,7 @@ class RemoteDataSource @Inject constructor(
         withContext(Dispatchers.IO) {
             urlList.forEach {
                 val request = Request.Builder().url(it.url).build()
-                val stream = client.newCall(request).execute().body()?.byteStream()
+                val stream = client.newCall(request).execute().body?.byteStream()
                 streamTable[it.url] = stream
             }
         }

app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt

@@ -100,12 +100,12 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHo
             if (transmitter.isInverted) {
                 binding.transInverted.text = String.format(
                     context.getString(R.string.trans_inverted),
-                    context.getString(android.R.string.yes)
+                    context.getString(R.string.btn_yes)
                 )
             } else {
                 binding.transInverted.text = String.format(
                     context.getString(R.string.trans_inverted),
-                    context.getString(android.R.string.no)
+                    context.getString(R.string.btn_no)
                 )
             }
         }

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

@@ -69,7 +69,7 @@
         android:id="@+id/dialog_btn_negative"
         style="@style/DialogText"
         android:layout_marginEnd="24dp"
-        android:text="@android:string/cancel"
+        android:text="@string/btn_cancel"
         app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive"
         app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" />
 
@@ -80,7 +80,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:gravity="end"
-        android:text="@android:string/ok"
+        android:text="@string/btn_ok"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" />
 

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

@@ -61,8 +61,8 @@
     <TextView
         android:id="@+id/tleSourcesBtnNeg"
         style="@style/DialogText"
-        android:layout_marginEnd="32dp"
-        android:text="@android:string/cancel"
+        android:layout_marginEnd="24dp"
+        android:text="@string/btn_cancel"
         app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"
         app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"
         app:layout_constraintHorizontal_chainStyle="spread_inside" />
@@ -71,7 +71,7 @@
         android:id="@+id/tleSourcesBtnPos"
         style="@style/DialogText"
         android:layout_marginBottom="8dp"
-        android:text="@android:string/ok"
+        android:text="@string/btn_ok"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />
 

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

@@ -61,7 +61,7 @@
     <string name="pref_other_title">Другие настройки</string>
     <string name="pref_refresh_rate_title">Частота обновления, мс</string>
     <string name="pref_refresh_rate_input_error">Введите значение между 250мс и 10000мс</string>
-    <string name="pref_compass_title">Используйте компас при отображении полярных координат</string>
+    <string name="pref_compass_title">Использовать компас при отображении полярных координат</string>
 
     <string name="no_mode">Модуляция: нет</string>
     <string name="no_uplink">Восход.: нет</string>
@@ -80,8 +80,8 @@
     <string name="pat_elevation">Элев.: %.1f°</string>
     <string name="pat_latitude">Шир.: %.1f°</string>
     <string name="pat_longitude">Дол.: %.1f°</string>
-    <string name="pat_distance">Дист.: %.0f км</string>
-    <string name="pat_altitude">Выс.: %.0f км</string>
+    <string name="pat_distance">Дист.: %.0fкм</string>
+    <string name="pat_altitude">Выс.: %.0fкм</string>
 
     <string name="trans_mode">Модуляция: %s</string>
     <string name="trans_inverted">Инверсия: %s</string>
@@ -132,8 +132,13 @@
         в лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>.
     </string>
 
-    <string name="map_gsp">СТЦ</string>
+    <string name="btn_yes">Да</string>
+    <string name="btn_no">Нет</string>
+    <string name="btn_ok">OK</string>
+    <string name="btn_cancel">Отмена</string>
     <string name="btn_all_none">Все/Нет</string>
+
+    <string name="map_gsp">СТЦ</string>
     <string name="tle_source">Источник TLE</string>
-    <string name="https_only">Пожалуйста, используйте протокол HTTPS</string>
+    <string name="https_only">Используйте протокол HTTPS</string>
 </resources>

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

@@ -152,8 +152,13 @@
         <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.
     </string>
 
-    <string name="map_gsp">GSP</string>
+    <string name="btn_yes">Yes</string>
+    <string name="btn_no">No</string>
+    <string name="btn_ok">OK</string>
+    <string name="btn_cancel">Cancel</string>
     <string name="btn_all_none">All/None</string>
+
+    <string name="map_gsp">GSP</string>
     <string name="tle_source">TLE source</string>
     <string name="https_only">Please use HTTPS URLs only</string>
     <string name="placeholder" translatable="false">Placeholder</string>