mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-06 04:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to strings and ui, crash fixed #63

Browse Source
This commit is contained in:
Arty Bishop committed 2022-05-18 19:00:48 +01:00
1 parent a2f37e6b9f
commit 278c06170b
16 files changed
+157 -177
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/card_btremote.xml
+15 -15
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -38,27 +37,28 @@
android:id="@+id/BTremote_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/BTremote_switch"
app:layout_constraintEnd_toEndOf="@+id/BTremote_title"
app:layout_constraintStart_toStartOf="@+id/BTremote_title"
tools:layout_editor_absoluteY="70dp">
app:layout_constraintEnd_toEndOf="@+id/BTremote_switch"
app:layout_constraintStart_toStartOf="@+id/BTremote_switch"
app:layout_constraintTop_toBottomOf="@id/BTremote_switch">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/BT_address_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/BTremote_device_hint"
android:textColorHint="@color/textMain" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/BT_address_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/BTremote_device_hint"
android:textColorHint="@color/textMain" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/BTremote_format"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/BTremote_address"
app:layout_constraintEnd_toEndOf="@+id/BTremote_title"
app:layout_constraintStart_toStartOf="@+id/BTremote_title"
tools:layout_editor_absoluteY="70dp">
android:layout_marginTop="6dp"
android:layout_marginBottom="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/BTremote_address"
app:layout_constraintStart_toStartOf="@+id/BTremote_address"
app:layout_constraintTop_toBottomOf="@id/BTremote_address">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/BT_format_edit"
app/src/main/res/layout/card_remote.xml
+3
View File
@@ -48,7 +48,9 @@
android:id="@+id/remote_ip_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:digits="0123456789."
android:hint="@string/remote_ip_hint"
android:inputType="number"
android:textColorHint="@color/textMain" />
</com.google.android.material.textfield.TextInputLayout>
@@ -67,6 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/remote_port_hint"
android:inputType="number"
android:textColorHint="@color/textMain" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/layout/dialog_position.xml
+4 -2
View File
@@ -57,7 +57,8 @@
android:id="@+id/position_lat_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="textUri" />
android:digits="0123456789."
android:inputType="number" />
</com.google.android.material.textfield.TextInputLayout>
@@ -94,7 +95,8 @@
android:id="@+id/position_lon_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="textUri" />
android:digits="0123456789."
android:inputType="number" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/values-ru/strings.xml
+6
View File
@@ -138,6 +138,12 @@
<string name="remote_ip_hint">IP адрес</string>
<string name="remote_port_hint">Порт</string>
<string name="BTremote_title">Передача данных по Bluetooth</string>
<string name="BTremote_switch">Включить передачу</string>
<string name="BTremote_device_hint">Id устройства</string>
<string name="BTremote_output_hint">Формат данных</string>
<string name="BTremote_perm_error">Нет разрешения использовать bluetooth</string>
<string name="other_title">Другие настройки</string>
<string name="other_switch_utc">Показывать время по UTC</string>
<string name="other_switch_sweep">Показывать анимацию радара</string>
app/src/main/res/values/strings.xml
+5 -4
View File
@@ -139,10 +139,11 @@
<string name="remote_ip_hint">IP address</string>
<string name="remote_port_hint">Port</string>
<string name="BTremote_title">Bluetooth Output</string>
<string name="BTremote_switch">Enable Bluetooth</string>
<string name="BTremote_device_hint">Device</string>
<string name="BTremote_output_hint">Output format</string>
<string name="BTremote_title">Bluetooth data output</string>
<string name="BTremote_switch">Enable output</string>
<string name="BTremote_device_hint">Device id</string>
<string name="BTremote_output_hint">Data format</string>
<string name="BTremote_perm_error">Check your bluetooth permission</string>
<string name="other_title">Other preferences</string>
<string name="other_switch_utc">Show pass time in UTC</string>