Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added negative elevation filtering when sent via BT/Network (#164)
Arty Bishopc910e37d00ae
diff --git a/.github/workflows/main.yml b/.github/workflows/main.ymlindex 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 Bundleuses: 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 Bundlerun: |@@ -59,7 +59,7 @@ jobs:serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}packageName: com.rtbishop.look4satreleaseFiles: app/build/outputs/apk/release/look4sat.aab- track: production+ track: betawhatsNewDirectory: fastlane/metadata/android/en-US/whatsnew- name: Create releasediff --git a/app/build.gradle b/app/build.gradleindex e15ee298..7e5d7b8e 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -8,13 +8,13 @@ plugins {android {namespace 'com.rtbishop.look4sat'- compileSdk 34+ compileSdk 35defaultConfig {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.ktindex 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 reporterScopfun 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 0try {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.xmlindex 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.xmlindex 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 @@<string name="btn_manual">Ввести</string><string name="btn_qth">QTH</string><string name="btn_web">Онлайн</string>- <string name="btn_file">Файл</string>+ <string name="btn_import">Импорт</string><string name="btn_github">GitHub</string><string name="btn_support">Поддержать</string><string name="btn_fdroid">F-Droid</string>diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xmlindex 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 @@<string name="btn_manual">අතින්</string><string name="btn_qth">QTH</string><string name="btn_web">මාර්ගගතව</string>- <string name="btn_file">File</string>+ <string name="btn_import">Import</string><string name="btn_github">GitHub</string><string name="btn_support">දායකත්ව</string><string name="btn_fdroid">F-Droid</string>diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xmlindex 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 @@<string name="btn_manual">Ввести вручну</string><string name="btn_qth">QTH</string><string name="btn_web">Онлайн</string>- <string name="btn_file">Файл</string>+ <string name="btn_import">Импорт</string><string name="btn_github">GitHub</string><string name="btn_support">Підтримка</string><string name="btn_fdroid">F-Droid</string>diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xmlnew file mode 100644index 00000000..e57b349b--- /dev/null+++ b/app/src/main/res/values-v35/styles.xml@@ -0,0 +1,26 @@+<?xml version="1.0" encoding="utf-8"?>+<resources xmlns:tools="http://schemas.android.com/tools">++ <style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">+ <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>+ <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>+ <item name="windowSplashScreenBackground">@color/background</item>+ <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>+ </style>++ <style name="Theme.Look4Sat.Main" parent="Theme.Material3.Dark.NoActionBar">+ <item name="colorAccent">@color/accent</item>+ <item name="colorControlNormal">@color/textMain</item>+ <item name="colorPrimary">@color/accent</item>+ <item name="colorSecondary">@color/accent</item>+ <item name="colorOnPrimaryContainer">@color/background</item>+ <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>+ <item name="android:listDivider">@drawable/item_divider</item>+ <item name="android:navigationBarColor">@color/background</item>+ <item name="android:textColorPrimary">@color/textMain</item>+ <item name="android:statusBarColor">@color/background</item>+ <item name="android:windowBackground">@color/background</item>+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>+ </style>+</resources>diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xmlindex 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 @@<string name="btn_manual">手动输入</string><string name="btn_qth">QTH 网格</string><string name="btn_web">在线更新</string>- <string name="btn_file">本地文件</string>+ <string name="btn_import">進口</string><string name="btn_github">GitHub</string><string name="btn_support">支持</string><string name="btn_fdroid">F-Droid</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 2e54139e..a1fe2d01 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -28,7 +28,7 @@<string name="btn_manual">Manual</string><string name="btn_qth">QTH</string><string name="btn_web">Online</string>- <string name="btn_file">File</string>+ <string name="btn_import">Import</string><string name="btn_github">GitHub</string><string name="btn_support">Support</string><string name="btn_fdroid">F-Droid</string>diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt b/base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.ktindex 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.0runCatching {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.txtnew file mode 100644index 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 #164diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-USindex 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