Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

v2.5.4 - Added radar sweep animation, fixed update issue

Arty Bishope6d067181613
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 22131172..8a332d88 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
- name: Setup java environment
uses: actions/setup-java@v1
- with: {java-version: 1.8}
+ with: {java-version: 11}
- name: Assemble APK and Bundle
run: |
@@ -32,7 +32,7 @@ jobs:
alias: ${{ secrets.KEY_ALIAS }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- BUILD_TOOLS_VERSION: "30.0.3"
+ BUILD_TOOLS_VERSION: "31.0.0"
- name: Sign Bundle
uses: r0adkll/sign-android-release@v1
@@ -44,7 +44,7 @@ jobs:
alias: ${{ secrets.KEY_ALIAS }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- BUILD_TOOLS_VERSION: "30.0.3"
+ BUILD_TOOLS_VERSION: "31.0.0"
- name: Deploy Bundle to Play Store
uses: r0adkll/upload-google-play@v1
diff --git a/app/build.gradle b/app/build.gradle
index 402891ab..0e5f50b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
minSdkVersion 23
resConfigs "en,ru"
targetSdkVersion 31
- versionCode 253
- versionName "2.5.3"
+ versionCode 254
+ versionName "2.5.4"
javaCompileOptions {
annotationProcessorOptions {
@@ -38,11 +38,11 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "11"
}
buildFeatures {
viewBinding true
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt
index 92c84f75..b328d9ef 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt
@@ -69,6 +69,7 @@ class PreferencesProvider @Inject constructor(
const val keySources = "prefTleSourcesKey"
const val keyModes = "satModes"
const val keyCompass = "compass"
+ const val keyRadarSweep = "radarSweep"
const val keyTextLabels = "shouldUseTextLabels"
const val keyTimeUTC = "timeUTC"
const val keyHoursAhead = "hoursAhead"
@@ -156,6 +157,10 @@ class PreferencesProvider @Inject constructor(
return preferences.getBoolean(keyCompass, true)
}
+ override fun shouldShowSweep(): Boolean {
+ return preferences.getBoolean(keyRadarSweep, true)
+ }
+
override fun isSetupDone(): Boolean {
return preferences.getBoolean(keyInitialSetup, false)
}
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt
index dcce78c9..da83153f 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt
@@ -78,6 +78,7 @@ class PassInfoFragment : Fragment(R.layout.fragment_polar) {
setShowAim(preferences.shouldUseCompass())
setPass(pass)
setStationPos(stationPos)
+ setScanning(preferences.shouldShowSweep())
}
binding.frame.addView(passInfoView)
observeTransmitters(pass, satTransAdapter, binding)
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt
index cc83c47c..8b0f0d4d 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt
@@ -99,6 +99,10 @@ class PassInfoView(context: Context) : View(context) {
private var pitch: Float = 0f
private var roll: Float = 0f
+ fun setScanning(isScanning: Boolean) {
+ shouldShowSweep = isScanning
+ }
+
fun setPass(satPass: SatPass) {
this.satPass = satPass
}
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index cbe29640..8787603f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -59,6 +59,7 @@
<string name="pref_map_labels">Использовать текстовые метки</string>
<string name="pref_other_title">Другие настройки</string>
<string name="pref_compass_title">Использовать компас</string>
+ <string name="pref_radar_sweep">Показывать анимацию радара</string>
<string name="pref_time_utc_title">Показывать время пролета по UTC</string>
<string name="tracking_title">Настройки слежения</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b879ca86..ae87fa23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,7 @@
<string name="pref_map_labels">Use text labels instead of icons</string>
<string name="pref_other_title">Other</string>
<string name="pref_time_utc_title">Show pass time in UTC</string>
+ <string name="pref_radar_sweep">Enable radar sweep animation</string>
<string name="pref_compass_title">Use sensors to rotate radar view</string>
<string name="tracking_title">Tracking preferences</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index c249a72d..66460680 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -74,6 +74,11 @@
android:key="timeUTC"
android:title="@string/pref_time_utc_title"
app:iconSpaceReserved="false" />
+ <SwitchPreferenceCompat
+ android:defaultValue="true"
+ android:key="radarSweep"
+ android:title="@string/pref_radar_sweep"
+ app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="compass"
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/PreferencesSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/PreferencesSource.kt
index af6fa294..bbf17a2b 100644
--- a/core/src/main/java/com/rtbishop/look4sat/data/PreferencesSource.kt
+++ b/core/src/main/java/com/rtbishop/look4sat/data/PreferencesSource.kt
@@ -43,6 +43,8 @@ interface PreferencesSource {
fun shouldUseCompass(): Boolean
+ fun shouldShowSweep(): Boolean
+
fun isSetupDone(): Boolean
fun setSetupDone()