diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 19d15c10..c7aaf49b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
alias: ${{ secrets.KEY_ALIAS }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- BUILD_TOOLS_VERSION: "34.0.0"
+ BUILD_TOOLS_VERSION: "35.0.1"
- name: Sign Bundle
uses: r0adkll/sign-android-release@v1
@@ -46,7 +46,7 @@ jobs:
alias: ${{ secrets.KEY_ALIAS }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- BUILD_TOOLS_VERSION: "34.0.0"
+ BUILD_TOOLS_VERSION: "35.0.1"
- name: Rename APK and Bundle
run: |
@@ -59,7 +59,7 @@ jobs:
serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}
packageName: com.rtbishop.look4sat
releaseFiles: app/build/outputs/apk/release/look4sat.aab
- track: production
+ track: beta
whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
- name: Create release
diff --git a/app/build.gradle b/app/build.gradle
index e15ee298..7e5d7b8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,13 +8,13 @@ plugins {
android {
namespace 'com.rtbishop.look4sat'
- compileSdk 34
+ compileSdk 35
defaultConfig {
applicationId "com.rtbishop.look4sat"
minSdk 21
- targetSdk 34
- versionCode 320
- versionName '3.2.0'
+ targetSdk 35
+ versionCode 321
+ versionName '3.2.1'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/BTReporter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/BTReporter.kt
index 61a722c0..e08217ec 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/BTReporter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/BTReporter.kt
@@ -23,7 +23,6 @@ class BTReporter(private val manager: BluetoothManager, private val reporterScop
fun isConnecting(): Boolean = connecting
- @Suppress("BlockingMethodInNonBlockingContext")
fun connectBTDevice(deviceId: String) {
if (!connected) {
rotationConnectionJob = reporterScope.launch {
@@ -47,13 +46,13 @@ class BTReporter(private val manager: BluetoothManager, private val reporterScop
}
}
- @Suppress("BlockingMethodInNonBlockingContext")
fun reportRotation(format: String, azimuth: Int, elevation: Int) {
if (connected) {
rotationReportingJob = reporterScope.launch {
+ val newElevation = if (elevation > 0) elevation else 0
try {
val azimuthString = intToStringWithLeadingZeroes(azimuth)
- val elevationString = intToStringWithLeadingZeroes(elevation)
+ val elevationString = intToStringWithLeadingZeroes(newElevation)
val crChar = '\r'
val nlChar = '\n'
val tbChar = '\t'
diff --git a/app/src/main/res/layout/card_data.xml b/app/src/main/res/layout/card_data.xml
index 826b8a1c..028cd056 100644
--- a/app/src/main/res/layout/card_data.xml
+++ b/app/src/main/res/layout/card_data.xml
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
- android:text="@string/btn_file"
+ android:text="@string/btn_import"
app:layout_constraintBaseline_toBaselineOf="@+id/data_btn_web"
app:layout_constraintEnd_toStartOf="@+id/data_btn_clear"
app:layout_constraintStart_toEndOf="@+id/data_btn_web" />
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b9880f16..6e7458ab 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -28,7 +28,7 @@
Ввести
QTH
Онлайн
- Файл
+ Импорт
GitHub
Поддержать
F-Droid
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 86979800..e42dc554 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -28,7 +28,7 @@
අතින්
QTH
මාර්ගගතව
- File
+ Import
GitHub
දායකත්ව
F-Droid
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9d02564c..b5aeaae5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -28,7 +28,7 @@
Ввести вручну
QTH
Онлайн
- Файл
+ Импорт
GitHub
Підтримка
F-Droid
diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xml
new file mode 100644
index 00000000..e57b349b
--- /dev/null
+++ b/app/src/main/res/values-v35/styles.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5a9f0312..d96cedf3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,7 +28,7 @@
手动输入
QTH 网格
在线更新
- 本地文件
+ 進口
GitHub
支持
F-Droid
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e54139e..a1fe2d01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
Manual
QTH
Online
- File
+ Import
GitHub
Support
F-Droid
diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt b/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt
index 805c4d17..643b8190 100644
--- a/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt
+++ b/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt
@@ -52,11 +52,12 @@ class DataReporter(private val reporterScope: CoroutineScope) {
fun reportRotation(server: String, port: Int, azimuth: Double, elevation: Double) {
rotationReporting = reporterScope.launch {
+ val newElevation = if (elevation > 0.0) elevation else 0.0
runCatching {
if (rotationSocketChannel == null) {
rotationSocketChannel = SocketChannel.open(InetSocketAddress(server, port))
} else {
- val buffer = ByteBuffer.wrap("\\P $azimuth $elevation\n".toByteArray())
+ val buffer = ByteBuffer.wrap("\\P $azimuth $newElevation\n".toByteArray())
rotationSocketChannel?.write(buffer)
}
}.onFailure { error ->
diff --git a/fastlane/metadata/android/en-US/changelogs/321.txt b/fastlane/metadata/android/en-US/changelogs/321.txt
new file mode 100644
index 00000000..3a024c39
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/321.txt
@@ -0,0 +1,3 @@
+Added Ukrainian translation by KristobalJunta #165
+Added per-app language switching feature by KristobalJunta #166
+Added negative elevation filtering when sent via BT/Network #164
diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
index 3ec9bb22..3a024c39 100644
--- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
+++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
@@ -1,2 +1,3 @@
-Added calendar reminder support by zhou2008
-Added Sinhala translation by Dilshan Hapuarachchi
\ No newline at end of file
+Added Ukrainian translation by KristobalJunta #165
+Added per-app language switching feature by KristobalJunta #166
+Added negative elevation filtering when sent via BT/Network #164