v2.4.0 - Showing azimuth for respective maxElevation

This commit is contained in:
Arty Bishop committed 2021-04-18 19:58:08 +01:00
1 parent e27224d9a8
commit 5f7c3e3786
8 files changed
+29 -26

No files matched your search

+2 -2
View File
@@ -13,8 +13,8 @@ android {
applicationId "com.rtbishop.look4sat" applicationId "com.rtbishop.look4sat"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 232 versionCode 240
versionName "2.3.2" versionName "2.4.0"
kapt { kapt {
arguments { arguments {
arg("room.schemaLocation", "$projectDir/schemas") arg("room.schemaLocation", "$projectDir/schemas")
@@ -25,7 +25,6 @@ import androidx.navigation.ui.setupWithNavController
import com.rtbishop.look4sat.R import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.databinding.ActivityMainBinding import com.rtbishop.look4sat.databinding.ActivityMainBinding
import com.rtbishop.look4sat.utility.PrefsManager import com.rtbishop.look4sat.utility.PrefsManager
import com.rtbishop.look4sat.utility.navigateSafe
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject import javax.inject.Inject
@@ -45,7 +44,7 @@ class Look4SatActivity : AppCompatActivity() {
binding.navBottom.setupWithNavController(navHost.navController) binding.navBottom.setupWithNavController(navHost.navController)
if (prefsManager.isFirstLaunch()) { if (prefsManager.isFirstLaunch()) {
prefsManager.setFirstLaunchDone() prefsManager.setFirstLaunchDone()
navHost.navController.navigateSafe(R.id.nav_dialog_splash) navHost.navController.navigate(R.id.nav_dialog_splash)
} }
} }
} }
@@ -78,7 +78,7 @@ class PassesAdapter(private val isUTC: Boolean, private val clickListener: Passe
RecyclerView.ViewHolder(binding.root) { RecyclerView.ViewHolder(binding.root) {
private val satIdFormat = itemView.context.getString(R.string.pass_satId) private val satIdFormat = itemView.context.getString(R.string.pass_satId)
private val altFormat = itemView.context.getString(R.string.pat_altitude) private val tcaAzFormat = itemView.context.getString(R.string.pass_tcaAz)
private val aosAzFormat = itemView.context.getString(R.string.pass_aosAz) private val aosAzFormat = itemView.context.getString(R.string.pass_aosAz)
private val maxElFormat = itemView.context.getString(R.string.pass_maxEl) private val maxElFormat = itemView.context.getString(R.string.pass_maxEl)
private val losAzFormat = itemView.context.getString(R.string.pass_losAz) private val losAzFormat = itemView.context.getString(R.string.pass_losAz)
@@ -100,7 +100,7 @@ class PassesAdapter(private val isUTC: Boolean, private val clickListener: Passe
passLeoMaxEl.text = String.format(maxElFormat, satPass.maxElevation) passLeoMaxEl.text = String.format(maxElFormat, satPass.maxElevation)
passLeoLosAz.text = String.format(losAzFormat, satPass.losAzimuth) passLeoLosAz.text = String.format(losAzFormat, satPass.losAzimuth)
passLeoStart.text = startFormat.format(satPass.aosDate) passLeoStart.text = startFormat.format(satPass.aosDate)
passLeoAlt.text = String.format(altFormat, satPass.altitude) passLeoTcaAz.text = String.format(tcaAzFormat, satPass.tcaAzimuth)
passLeoEnd.text = endFormat.format(satPass.losDate) passLeoEnd.text = endFormat.format(satPass.losDate)
passLeoProgress.progress = satPass.progress passLeoProgress.progress = satPass.progress
} }
+9 -9
View File
@@ -59,9 +59,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pass_maxEl" android:text="@string/pass_maxEl"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz" app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz" app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" /> app:layout_constraintStart_toStartOf="@+id/pass_leo_start" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_losAz" android:id="@+id/pass_leo_losAz"
@@ -85,13 +85,13 @@
app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" /> app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_alt" android:id="@+id/pass_leo_tcaAz"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pat_altitude" android:text="@string/pass_tcaAz"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start" app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_end" app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
app:layout_constraintStart_toStartOf="@+id/pass_leo_start" /> app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_end" android:id="@+id/pass_leo_end"
@@ -112,7 +112,7 @@
app:layout_constraintBottom_toBottomOf="@+id/pass_leo_bg" app:layout_constraintBottom_toBottomOf="@+id/pass_leo_bg"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_end" app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
app:layout_constraintStart_toStartOf="@+id/pass_leo_start" app:layout_constraintStart_toStartOf="@+id/pass_leo_start"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_alt" /> app:layout_constraintTop_toBottomOf="@+id/pass_leo_maxEl" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
+1
View File
@@ -24,6 +24,7 @@
<string name="passes_error">Нет предстоящих пролётов</string> <string name="passes_error">Нет предстоящих пролётов</string>
<string name="pass_aosAz">НПС - %.1f°</string> <string name="pass_aosAz">НПС - %.1f°</string>
<string name="pass_tcaAz">Азимут: %.1f°</string>
<string name="pass_maxEl">МаксЭлев: %.1f°</string> <string name="pass_maxEl">МаксЭлев: %.1f°</string>
<string name="pass_losAz">%.1f° - КПС</string> <string name="pass_losAz">%.1f° - КПС</string>
+4 -3
View File
@@ -32,7 +32,8 @@
<string name="pass_satName" translatable="false">%s</string> <string name="pass_satName" translatable="false">%s</string>
<string name="pass_satId" translatable="false">Id:%d</string> <string name="pass_satId" translatable="false">Id:%d</string>
<string name="pass_aosAz">AOS - %.1f°</string> <string name="pass_aosAz">AOS - %.1f°</string>
<string name="pass_maxEl">MaxEl: %.1f°</string> <string name="pass_tcaAz">Azimuth: %.1f°</string>
<string name="pass_maxEl">MaxElev: %.1f°</string>
<string name="pass_losAz">%.1f° - LOS</string> <string name="pass_losAz">%.1f° - LOS</string>
<string name="pass_startTime" translatable="false">HH:mm:ss - EEE</string> <string name="pass_startTime" translatable="false">HH:mm:ss - EEE</string>
<string name="pass_endTime" translatable="false">EEE - HH:mm:ss</string> <string name="pass_endTime" translatable="false">EEE - HH:mm:ss</string>
@@ -50,8 +51,8 @@
<string name="map_coverage">Coverage: %.0f km</string> <string name="map_coverage">Coverage: %.0f km</string>
<string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string> <string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>
<string name="pat_azimuth">Az: %.1f°</string> <string name="pat_azimuth">Azimuth: %.1f°</string>
<string name="pat_elevation">El: %.1f°</string> <string name="pat_elevation">Elevation: %.1f°</string>
<string name="pat_distance">Range: %.0f km</string> <string name="pat_distance">Range: %.0f km</string>
<string name="pat_altitude">Altitude: %.0f km</string> <string name="pat_altitude">Altitude: %.0f km</string>
<string name="pat_osm_idName" translatable="false">Id:%s / %s</string> <string name="pat_osm_idName" translatable="false">Id:%s / %s</string>
@@ -0,0 +1,5 @@
Removed hardcoded screen orientation
Removed redundant permission from manifest
Added antenna rotator control via socket
Showing azimuth for respective maxElevation
Showing satellite name on the polar screen
@@ -1,8 +1,5 @@
Added satellite items filtering by transmitter mode Removed hardcoded screen orientation
Now updating recyclers views asyncronously Removed redundant permission from manifest
Switched to concurrent satellite data update Added antenna rotator control via socket
Minor visual changes to map info Showing azimuth for respective maxElevation
Separated application screens logic Showing satellite name on the polar screen
Bug fixes, huge code cleanup
Fixed recent InflatingException
Fixed transmitters doppler frequency update logic